diff --git a/CMakeLists.txt b/CMakeLists.txt
index 277d5edef..9552fe9f0 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,8 +48,7 @@ option(ACE_USE_EXTERNAL     "Use external ACE"                              OFF)
 option(POSTGRESQL           "Use PostgreSQL instead of MySQL"               OFF)
 option(BUILD_TOOLS          "Build the map/vmap/mmap extractors"            ON)
 option(SCRIPT_LIB_ELUNA     "Compile with support for Eluna scripts"        OFF)
-option(SCRIPT_LIB_SD2       "Compile with support for ScriptDev2 scripts"   ON)
-#option(SCRIPT_LIB_SD3       "Compile with support for ScriptDev3 scripts"   OFF)
+option(SCRIPT_LIB_SD3       "Compile with support for ScriptDev2 scripts"   ON)
 option(PLAYERBOTS           "Enable Player Bots"                            OFF)
 option(SOAP                 "Enable remote access via SOAP"                 OFF)
 # Hidden option to enable/disable PCH. DEV ONLY!
@@ -70,8 +69,7 @@ message(
     SOAP                    Enable remote access via SOAP
    Scripting engines:
     SCRIPT_LIB_ELUNA        Compile with support for Eluna scripts
-    SCRIPT_LIB_SD2          Compile with support for ScriptDev2 scripts
-    SCRIPT_LIB_SD3          Compile with support for ScriptDev3 scripts
+    SCRIPT_LIB_SD3          Compile with support for ScriptDev2 scripts
    Modules:
     PLAYERBOTS              Enable Player Bots
   To set an option simply type -D<OPTION>=<VALUE> after 'cmake <srcs>'.
@@ -173,20 +171,13 @@ else()
     message(STATUS "Script engine Eluna   : No (default)")
 endif()
 
-if(SCRIPT_LIB_SD2)
-    message(STATUS "Script engine SD2     : Yes  (default)")
-    add_definitions(-DENABLE_SD2)
+if(SCRIPT_LIB_SD3)
+    message(STATUS "Script engine SD3     : Yes (default)")
+    add_definitions(-DENABLE_SD3)
 else()
-    message(STATUS "Script engine SD2     : No")
+    message(STATUS "Script engine SD3     : No")
 endif()
 
-#if(SCRIPT_LIB_SD3)
-#    message(STATUS "Script engine SD3     : Yes")
-#    add_definitions(-DENABLE_SD3)
-#else()
-#    message(STATUS "Script engine SD3     : No (default)")
-#endif()
-
 #if(PLAYERBOTS)
 #    message(STATUS "Enable Player Bots    : Yes (default)")
 #    add_definitions(-DENABLE_PLAYERBOTS)
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index 743cc5da7..e529d8361 100644
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -85,7 +85,7 @@ source_group("Movement" FILES ${SRC_GRP_MOVEMENT})
 
 #Object group
 file(GLOB SRC_GRP_OBJECT Object/*.cpp Object/*.h)
-source_group("Object" FILES ${SRC_GRP_OBJECT})    
+source_group("Object" FILES ${SRC_GRP_OBJECT})
 
 #Outdoors PvP group
 file(GLOB SRC_GRP_OUTDOOR_PVP OutdoorPvP/*.cpp OutdoorPvP/*.h)
@@ -98,7 +98,7 @@ source_group("References" FILES ${SRC_GRP_REFERENCES})
 #Server group
 file(GLOB SRC_GRP_SERVER Server/*.cpp Server/*.h)
 source_group("Server" FILES ${SRC_GRP_SERVER})
-    
+
 #Tools group
 file(GLOB SRC_GRP_TOOL Tools/*.cpp Tools/*.h)
 source_group("Tool" FILES ${SRC_GRP_TOOL})
@@ -114,11 +114,11 @@ source_group("Warden" FILES ${SRC_GRP_WARDEN})
 #Warden Modules group
 file(GLOB SRC_GRP_WARDEN_MODULES Warden/Modules/*.cpp Warden/Modules/*.h)
 source_group("Warden\\Modules" FILES ${SRC_GRP_WARDEN_MODULES})
-    
+
 #World and Handlers group
 file(GLOB SRC_GRP_WORLD_HANDLERS WorldHandlers/*.cpp WorldHandlers/*.h)
 source_group("World/Handlers" FILES ${SRC_GRP_WORLD_HANDLERS})
-    
+
 set(LIBRARY_SRCS
     ${SRC_GRP_AHBOT}
     ${SRC_GRP_BATTLEGROUND}
@@ -172,8 +172,8 @@ endif()
 #    add_dependencies(${LIBRARY_NAME} Bots)
 #endif()
 
-if(SCRIPT_LIB_SD2)
-    include_directories(${CMAKE_SOURCE_DIR}/src/modules/SD2)
+if(SCRIPT_LIB_SD3)
+    include_directories(${CMAKE_SOURCE_DIR}/src/modules/SD3)
     target_link_libraries(${LIBRARY_NAME} mangosscript)
     add_dependencies(${LIBRARY_NAME} mangosscript)
 endif()
diff --git a/src/game/ChatCommands/Level1.cpp b/src/game/ChatCommands/Level1.cpp
index 00cac55d1..001e1f8d3 100644
--- a/src/game/ChatCommands/Level1.cpp
+++ b/src/game/ChatCommands/Level1.cpp
@@ -358,7 +358,7 @@ bool ChatHandler::HandleGPSCommand(char* args)
     GridMapLiquidStatus res = terrain->getLiquidStatus(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), MAP_ALL_LIQUIDS, &liquid_status);
     if (res)
     {
-        PSendSysMessage(LANG_LIQUID_STATUS, liquid_status.level, liquid_status.depth_level, liquid_status.type_flags, res);
+        PSendSysMessage(LANG_LIQUID_STATUS, liquid_status.level, liquid_status.depth_level, liquid_status.CreatureTypeFlags, res);
     }
 
     // Additional vmap debugging help
diff --git a/src/game/ChatCommands/Level2.cpp b/src/game/ChatCommands/Level2.cpp
index 060bd64b3..6f74994d0 100644
--- a/src/game/ChatCommands/Level2.cpp
+++ b/src/game/ChatCommands/Level2.cpp
@@ -2180,12 +2180,12 @@ bool ChatHandler::HandleNpcFactionIdCommand(char* args)
     // update in memory
     if (CreatureInfo const* cinfo = pCreature->GetCreatureInfo())
     {
-        const_cast<CreatureInfo*>(cinfo)->faction_A = factionId;
-        const_cast<CreatureInfo*>(cinfo)->faction_H = factionId;
+        const_cast<CreatureInfo*>(cinfo)->FactionAlliance = factionId;
+        const_cast<CreatureInfo*>(cinfo)->FactionHorde = factionId;
     }
 
     // and DB
-    WorldDatabase.PExecuteLog("UPDATE creature_template SET faction_A = '%u', faction_H = '%u' WHERE entry = '%u'", factionId, factionId, pCreature->GetEntry());
+    WorldDatabase.PExecuteLog("UPDATE creature_template SET factionAlliance = '%u', factionHorde = '%u' WHERE entry = '%u'", factionId, factionId, pCreature->GetEntry());
 
     return true;
 }
diff --git a/src/game/MotionGenerators/PathFinder.cpp b/src/game/MotionGenerators/PathFinder.cpp
index 5c573a23e..90c3cf075 100644
--- a/src/game/MotionGenerators/PathFinder.cpp
+++ b/src/game/MotionGenerators/PathFinder.cpp
@@ -533,7 +533,7 @@ NavTerrain PathFinder::getNavTerrain(float x, float y, float z)
     GridMapLiquidData data;
     m_sourceUnit->GetTerrain()->getLiquidStatus(x, y, z, MAP_ALL_LIQUIDS, &data);
 
-    switch (data.type_flags)
+    switch (data.CreatureTypeFlags)
     {
         case MAP_LIQUID_TYPE_WATER:
         case MAP_LIQUID_TYPE_OCEAN:
diff --git a/src/game/Object/Creature.cpp b/src/game/Object/Creature.cpp
index 81b8d2b39..13e5a802b 100644
--- a/src/game/Object/Creature.cpp
+++ b/src/game/Object/Creature.cpp
@@ -55,6 +55,9 @@
 #include "CellImpl.h"
 #include "movement/MoveSplineInit.h"
 #include "CreatureLinkingMgr.h"
+#ifdef ENABLE_ELUNA
+#include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 // apply implementation of the singletons
 #include "Policies/Singleton.h"
@@ -69,7 +72,7 @@ TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const
 {
     TrainerSpellMap::const_iterator itr = spellList.find(spell_id);
     if (itr != spellList.end())
-        return &itr->second;
+        { return &itr->second; }
 
     return NULL;
 }
@@ -165,7 +168,7 @@ Creature::Creature(CreatureSubtype subtype) : Unit(),
     m_corpseDecayTimer(0), m_respawnTime(0), m_respawnDelay(25), m_corpseDelay(60), m_respawnradius(5.0f),
     m_subtype(subtype), m_defaultMovementType(IDLE_MOTION_TYPE), m_equipmentId(0),
     m_AlreadyCallAssistance(false), m_AlreadySearchedAssistance(false),
-    m_regenHealth(true), m_AI_locked(false), m_isDeadByDefault(false),
+    m_regenHealth(true), m_AI_locked(false), m_IsDeadByDefault(false),
     m_temporaryFactionFlags(TEMPFACTION_NONE),
     m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL), m_originalEntry(0),
     m_creatureInfo(NULL)
@@ -175,10 +178,11 @@ Creature::Creature(CreatureSubtype subtype) : Unit(),
     m_valuesCount = UNIT_END;
 
     for (int i = 0; i < CREATURE_MAX_SPELLS; ++i)
-        m_spells[i] = 0;
+        { m_spells[i] = 0; }
 
     m_CreatureSpellCooldowns.clear();
     m_CreatureCategoryCooldowns.clear();
+    DisableReputationGain = false;
 
     SetWalk(true, true);
 }
@@ -195,18 +199,28 @@ Creature::~Creature()
 
 void Creature::AddToWorld()
 {
+#ifdef ENABLE_ELUNA
+    if (!IsInWorld())
+        sEluna->OnAddToWorld(this);
+#endif /* ENABLE_ELUNA */
+
     ///- Register the creature for guid lookup
     if (!IsInWorld() && GetObjectGuid().IsCreatureOrVehicle())
-        GetMap()->GetObjectsStore().insert<Creature>(GetObjectGuid(), (Creature*)this);
+        { GetMap()->GetObjectsStore().insert<Creature>(GetObjectGuid(), (Creature*)this); }
 
     Unit::AddToWorld();
 }
 
 void Creature::RemoveFromWorld()
 {
+#ifdef ENABLE_ELUNA
+    if (IsInWorld())
+        sEluna->OnRemoveFromWorld(this);
+#endif /* ENABLE_ELUNA */
+
     ///- Remove the creature from the accessor
     if (IsInWorld() && GetObjectGuid().IsCreatureOrVehicle())
-        GetMap()->GetObjectsStore().erase<Creature>(GetObjectGuid(), (Creature*)NULL);
+        { GetMap()->GetObjectsStore().erase<Creature>(GetObjectGuid(), (Creature*)NULL); }
 
     Unit::RemoveFromWorld();
 }
@@ -215,13 +229,13 @@ void Creature::RemoveCorpse()
 {
     // since pool system can fail to roll unspawned object, this one can remain spawned, so must set respawn nevertheless
     if (uint16 poolid = sPoolMgr.IsPartOfAPool<Creature>(GetGUIDLow()))
-        sPoolMgr.UpdatePool<Creature>(*GetMap()->GetPersistentState(), poolid, GetGUIDLow());
+        { sPoolMgr.UpdatePool<Creature>(*GetMap()->GetPersistentState(), poolid, GetGUIDLow()); }
 
-    if (!IsInWorld())                                       // can be despawned by update pool
-        return;
+    if (!IsInWorld())                            // can be despawned by update pool
+        { return; }
 
-    if ((getDeathState() != CORPSE && !m_isDeadByDefault) || (getDeathState() != ALIVE && m_isDeadByDefault))
-        return;
+    if ((getDeathState() != CORPSE && !m_IsDeadByDefault) || (getDeathState() != ALIVE && m_IsDeadByDefault))
+        { return; }
 
     DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "Removing corpse of %s ", GetGuidStr().c_str());
 
@@ -236,11 +250,11 @@ void Creature::RemoveCorpse()
     uint32 respawnDelay = 0;
 
     if (AI())
-        AI()->CorpseRemoved(respawnDelay);
+        { AI()->CorpseRemoved(respawnDelay); }
 
     // script can set time (in seconds) explicit, override the original
     if (respawnDelay)
-        m_respawnTime = time(NULL) + respawnDelay;
+        { m_respawnTime = time(NULL) + respawnDelay; }
 
     float x, y, z, o;
     GetRespawnCoord(x, y, z, &o);
@@ -254,14 +268,14 @@ void Creature::RemoveCorpse()
     UpdateObjectVisibility();
 }
 
-/*
+/**
  * change the entry of creature until respawn
  */
 bool Creature::InitEntry(uint32 Entry, CreatureData const* data /*=NULL*/, GameEventCreatureData const* eventData /*=NULL*/)
 {
     // use game event entry if any instead default suggested
     if (eventData && eventData->entry_id)
-        Entry = eventData->entry_id;
+        { Entry = eventData->entry_id; }
 
     CreatureInfo const* normalInfo = ObjectMgr::GetCreatureTemplate(Entry);
     if (!normalInfo)
@@ -270,6 +284,8 @@ bool Creature::InitEntry(uint32 Entry, CreatureData const* data /*=NULL*/, GameE
         return false;
     }
 
+    // difficulties for dungeons/battleground ordered in normal way
+    // and if more high version not exist must be used lesser version
     CreatureInfo const* cinfo = normalInfo;
     for (Difficulty diff = GetMap()->GetDifficulty(); diff > REGULAR_DIFFICULTY; diff = GetPrevDifficulty(diff, GetMap()->IsRaid()))
     {
@@ -288,7 +304,7 @@ bool Creature::InitEntry(uint32 Entry, CreatureData const* data /*=NULL*/, GameE
     SetEntry(Entry);                                        // normal entry always
     m_creatureInfo = cinfo;                                 // map mode related always
 
-    SetObjectScale(cinfo->scale);
+    SetObjectScale(cinfo->Scale);
 
     // equal to player Race field, but creature does not have race
     SetByteValue(UNIT_FIELD_BYTES_0, 0, 0);
@@ -326,10 +342,10 @@ bool Creature::InitEntry(uint32 Entry, CreatureData const* data /*=NULL*/, GameE
     }
     else if (!data || data->equipmentId == 0)
     {
-        if (cinfo->equipmentId == 0)
-            LoadEquipment(normalInfo->equipmentId);         // use default from normal template if diff does not have any
+        if (cinfo->EquipmentTemplateId == 0)
+            LoadEquipment(normalInfo->EquipmentTemplateId);         // use default from normal template if diff does not have any
         else
-            LoadEquipment(cinfo->equipmentId);              // else use from diff template
+            LoadEquipment(cinfo->EquipmentTemplateId);              // else use from diff template
     }
     else if (data && data->equipmentId != -1)
     {
@@ -366,9 +382,9 @@ bool Creature::UpdateEntry(uint32 Entry, Team team, const CreatureData* data /*=
     SelectLevel(GetCreatureInfo(), preserveHPAndPower ? GetHealthPercent() : 100.0f, 100.0f);
 
     if (team == HORDE)
-        setFaction(GetCreatureInfo()->faction_H);
+        setFaction(GetCreatureInfo()->FactionHorde);
     else
-        setFaction(GetCreatureInfo()->faction_A);
+        setFaction(GetCreatureInfo()->FactionAlliance);
 
     SetUInt32Value(UNIT_NPC_FLAGS, GetCreatureInfo()->npcflag);
 
@@ -404,7 +420,7 @@ bool Creature::UpdateEntry(uint32 Entry, Team team, const CreatureData* data /*=
     UpdateAllStats();
 
     // checked and error show at loading templates
-    if (FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(GetCreatureInfo()->faction_A))
+    if (FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(GetCreatureInfo()->FactionAlliance))
     {
         if (factionTemplate->factionFlags & FACTION_TEMPLATE_FLAG_PVP)
             SetPvP(true);
@@ -420,7 +436,7 @@ bool Creature::UpdateEntry(uint32 Entry, Team team, const CreatureData* data /*=
         for (int i = 0; i < CREATURE_MAX_SPELLS; ++i)
             m_spells[i] = templateSpells->spells[i];
 
-    SetVehicleId(GetCreatureInfo()->vehicleId, 0);
+    SetVehicleId(GetCreatureInfo()->VehicleTemplateId, 0);
 
     // if eventData set then event active and need apply spell_start
     if (eventData)
@@ -520,7 +536,7 @@ void Creature::Update(uint32 update_diff, uint32 diff)
 
                 SelectLevel(cinfo);
                 SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_NONE);
-                if (m_isDeadByDefault)
+                if (m_IsDeadByDefault)
                 {
                     SetDeathState(JUST_DIED);
                     SetHealth(0);
@@ -546,7 +562,7 @@ void Creature::Update(uint32 update_diff, uint32 diff)
         {
             Unit::Update(update_diff, diff);
 
-            if (m_isDeadByDefault)
+            if (m_IsDeadByDefault)
                 break;
 
             if (m_corpseDecayTimer <= update_diff)
@@ -568,7 +584,7 @@ void Creature::Update(uint32 update_diff, uint32 diff)
         }
         case ALIVE:
         {
-            if (m_isDeadByDefault)
+            if (m_IsDeadByDefault)
             {
                 if (m_corpseDecayTimer <= update_diff)
                 {
@@ -764,7 +780,7 @@ bool Creature::Create(uint32 guidlow, CreatureCreatePos& cPos, CreatureInfo cons
     if (InstanceData* iData = GetMap()->GetInstanceData())
         iData->OnCreatureCreate(this);
 
-    switch (GetCreatureInfo()->rank)
+    switch (GetCreatureInfo()->Rank)
     {
         case CREATURE_ELITE_RARE:
             m_corpseDelay = sWorld.getConfig(CONFIG_UINT32_CORPSE_DECAY_RARE);
@@ -1110,7 +1126,7 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
     data.currentwaypoint = 0;
     data.curhealth = GetHealth();
     data.curmana = GetPower(POWER_MANA);
-    data.is_dead = m_isDeadByDefault;
+    data.is_dead = m_IsDeadByDefault;
     // prevent add data integrity problems
     data.movementType = !m_respawnradius && GetDefaultMovementType() == RANDOM_MOTION_TYPE
                         ? IDLE_MOTION_TYPE : GetDefaultMovementType();
@@ -1148,7 +1164,7 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
 
 void Creature::SelectLevel(const CreatureInfo* cinfo, float percentHealth, float percentMana)
 {
-    uint32 rank = IsPet() ? 0 : cinfo->rank;
+    uint32 rank = IsPet() ? 0 : cinfo->Rank;
 
     // level
     uint32 minlevel = std::min(cinfo->maxlevel, cinfo->minlevel);
@@ -1304,8 +1320,8 @@ bool Creature::LoadFromDB(uint32 guidlow, Map* map)
 
     m_respawnDelay = data->spawntimesecs;
     m_corpseDelay = std::min(m_respawnDelay * 9 / 10, m_corpseDelay); // set corpse delay to 90% of the respawn delay
-    m_isDeadByDefault = data->is_dead;
-    m_deathState = m_isDeadByDefault ? DEAD : ALIVE;
+    m_IsDeadByDefault = data->is_dead;
+    m_deathState = m_IsDeadByDefault ? DEAD : ALIVE;
 
     m_respawnTime  = map->GetPersistentState()->GetCreatureRespawnTime(GetGUIDLow());
 
@@ -1329,7 +1345,7 @@ bool Creature::LoadFromDB(uint32 guidlow, Map* map)
     uint32 curhealth = data->curhealth;
     if (curhealth)
     {
-        curhealth = uint32(curhealth * _GetHealthMod(GetCreatureInfo()->rank));
+        curhealth = uint32(curhealth * _GetHealthMod(GetCreatureInfo()->Rank));
         if (curhealth < 1)
             curhealth = 1;
     }
@@ -1505,7 +1521,7 @@ float Creature::GetAttackDistance(Unit const* pl) const
 
 void Creature::SetDeathState(DeathState s)
 {
-    if ((s == JUST_DIED && !m_isDeadByDefault) || (s == JUST_ALIVED && m_isDeadByDefault))
+    if ((s == JUST_DIED && !m_IsDeadByDefault) || (s == JUST_ALIVED && m_IsDeadByDefault))
     {
         m_corpseDecayTimer = m_corpseDelay * IN_MILLISECONDS; // the max/default time for corpse decay (before creature is looted/AllLootRemovedFromCorpse() is called)
         m_respawnTime = time(NULL) + m_respawnDelay;        // respawn delay (spawntimesecs)
@@ -1618,7 +1634,7 @@ bool Creature::IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectInd
         return true;
 
     // Taunt immunity special flag check
-    if (GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NOT_TAUNTABLE)
+    if (GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NOT_TAUNTABLE)
     {
         // Taunt aura apply check
         if (spellEffect->Effect == SPELL_EFFECT_APPLY_AURA)
@@ -1759,13 +1775,13 @@ bool Creature::IsVisibleInGridForPlayer(Player* pl) const
     if (pl->isGameMaster())
         return true;
 
-    if (GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_INVISIBLE)
+    if (GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_INVISIBLE)
         return false;
 
     // Live player (or with not release body see live creatures or death creatures with corpse disappearing time > 0
     if (pl->IsAlive() || pl->GetDeathTimer() > 0)
     {
-        return (IsAlive() || m_corpseDecayTimer > 0 || (m_isDeadByDefault && m_deathState == CORPSE));
+        return (IsAlive() || m_corpseDecayTimer > 0 || (m_IsDeadByDefault && m_deathState == CORPSE));
     }
 
     // Dead player see live creatures near own corpse
@@ -1781,7 +1797,7 @@ bool Creature::IsVisibleInGridForPlayer(Player* pl) const
     }
 
     // Dead player can see ghosts
-    if (GetCreatureInfo()->type_flags & CREATURE_TYPEFLAGS_GHOST_VISIBLE)
+    if (GetCreatureInfo()->CreatureTypeFlags & CREATURE_TYPEFLAGS_GHOST_VISIBLE)
         return true;
 
     // and not see any other
@@ -2450,7 +2466,7 @@ void Creature::ClearTemporaryFaction()
         return;
 
     // Reset to original faction
-    setFaction(GetCreatureInfo()->faction_A);
+    setFaction(GetCreatureInfo()->FactionAlliance);
     // Reset UNIT_FLAG_NON_ATTACKABLE, UNIT_FLAG_OOC_NOT_ATTACKABLE or UNIT_FLAG_PASSIVE flags
     if (m_temporaryFactionFlags & TEMPFACTION_TOGGLE_NON_ATTACKABLE && GetCreatureInfo()->unit_flags & UNIT_FLAG_NON_ATTACKABLE)
         SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
diff --git a/src/game/Object/Creature.h b/src/game/Object/Creature.h
index dab3f5dc5..e27b38aca 100644
--- a/src/game/Object/Creature.h
+++ b/src/game/Object/Creature.h
@@ -90,13 +90,13 @@ struct CreatureInfo
     uint32  minmana;
     uint32  maxmana;
     uint32  armor;
-    uint32  faction_A;
-    uint32  faction_H;
+    uint32  FactionAlliance;
+    uint32  FactionHorde;
     uint32  npcflag;
     float   speed_walk;
     float   speed_run;
-    float   scale;
-    uint32  rank;
+    float   Scale;
+    uint32  Rank;
     float   mindmg;
     float   maxdmg;
     uint32  dmgschool;
@@ -117,7 +117,7 @@ struct CreatureInfo
     float   maxrangedmg;
     uint32  rangedattackpower;
     uint32  type;                                           // enum CreatureType values
-    uint32  type_flags;                                     // enum CreatureTypeFlags mask values
+    uint32  CreatureTypeFlags;                                     // enum CreatureTypeFlags mask values
     uint32  lootid;
     uint32  pickpocketLootId;
     uint32  SkinLootId;
@@ -139,42 +139,42 @@ struct CreatureInfo
     uint32  questItems[6];
     uint32  movementId;
     bool    RegenHealth;
-    uint32  vehicleId;
-    uint32  equipmentId;
+    uint32  VehicleTemplateId;
+    uint32  EquipmentTemplateId;
     uint32  trainerId;
     uint32  vendorId;
     uint32  MechanicImmuneMask;
-    uint32  flags_extra;
+    uint32  ExtraFlags;
     uint32  ScriptID;
 
     // helpers
     HighGuid GetHighGuid() const
     {
-        return vehicleId ? HIGHGUID_VEHICLE : HIGHGUID_UNIT;
+        return VehicleTemplateId ? HIGHGUID_VEHICLE : HIGHGUID_UNIT;
     }
 
     ObjectGuid GetObjectGuid(uint32 lowguid) const { return ObjectGuid(GetHighGuid(), Entry, lowguid); }
 
     SkillType GetRequiredLootSkill() const
     {
-        if (type_flags & CREATURE_TYPEFLAGS_HERBLOOT)
-            return SKILL_HERBALISM;
-        else if (type_flags & CREATURE_TYPEFLAGS_MININGLOOT)
-            return SKILL_MINING;
-        else if (type_flags & CREATURE_TYPEFLAGS_ENGINEERLOOT)
+        if (CreatureTypeFlags & CREATURE_TYPEFLAGS_HERBLOOT)
+            { return SKILL_HERBALISM; }
+        else if (CreatureTypeFlags & CREATURE_TYPEFLAGS_MININGLOOT)
+            { return SKILL_MINING; }
+        else if (CreatureTypeFlags & CREATURE_TYPEFLAGS_ENGINEERLOOT)
             return SKILL_ENGINEERING;
         else
-            return SKILL_SKINNING;                          // normal case
+            { return SKILL_SKINNING; }                          // normal case
     }
 
     bool IsExotic() const
     {
-        return (type_flags & CREATURE_TYPEFLAGS_EXOTIC);
+        return (CreatureTypeFlags & CREATURE_TYPEFLAGS_EXOTIC);
     }
 
     bool isTameable(bool exotic) const
     {
-        if (type != CREATURE_TYPE_BEAST || family == 0 || (type_flags & CREATURE_TYPEFLAGS_TAMEABLE) == 0)
+        if (type != CREATURE_TYPE_BEAST || family == 0 || (CreatureTypeFlags & CREATURE_TYPEFLAGS_TAMEABLE) == 0)
             return false;
 
         // if can tame exotic then can tame any temable
@@ -376,7 +376,7 @@ struct VendorItemData
     void Clear()
     {
         for (VendorItemList::const_iterator itr = m_items.begin(); itr != m_items.end(); ++itr)
-            delete(*itr);
+            { delete(*itr); }
         m_items.clear();
     }
 };
@@ -488,7 +488,7 @@ enum TemporaryFactionFlags                                  // Used at real fact
     TEMPFACTION_ALL,
 };
 
-class  Creature : public Unit
+class Creature : public Unit
 {
         CreatureAI* i_AI;
 
@@ -521,15 +521,15 @@ class  Creature : public Unit
 
         bool IsCorpse() const { return getDeathState() ==  CORPSE; }
         bool IsDespawned() const { return getDeathState() ==  DEAD; }
-		void SetCorpseDelay(uint32 delay) { m_corpseDelay = delay; }
-		uint32 GetCorpseDelay() const { return m_corpseDelay; }
+        void SetCorpseDelay(uint32 delay) { m_corpseDelay = delay; }
+        uint32 GetCorpseDelay() const { return m_corpseDelay; }
         bool IsRacialLeader() const { return GetCreatureInfo()->RacialLeader; }
-        bool IsCivilian() const { return GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_CIVILIAN; }
-        bool IsGuard() const { return GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_GUARD; }
+        bool IsCivilian() const { return GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_CIVILIAN; }
+        bool IsGuard() const { return GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_GUARD; }
 
         bool CanWalk() const { return GetCreatureInfo()->InhabitType & INHABIT_GROUND; }
         virtual bool CanSwim() const { return GetCreatureInfo()->InhabitType & INHABIT_WATER; }
-        bool CanFly()  const { return (GetCreatureInfo()->InhabitType & INHABIT_AIR) || (GetByteValue(UNIT_FIELD_BYTES_1, 3) & UNIT_BYTE1_FLAG_UNK_2) || HasAuraType(SPELL_AURA_FLY); }
+        bool CanFly()  const { return (GetCreatureInfo()->InhabitType & INHABIT_AIR) || (GetByteValue(UNIT_FIELD_BYTES_1, 3) & UNIT_BYTE1_FLAG_FLY_ANIM) || HasAuraType(SPELL_AURA_FLY); }
 
         bool IsTrainerOf(Player* player, bool msg) const;
         bool CanInteractWithBattleMaster(Player* player, bool msg) const;
@@ -545,18 +545,18 @@ class  Creature : public Unit
         bool IsElite() const
         {
             if (IsPet())
-                return false;
+                { return false; }
 
-            uint32 rank = GetCreatureInfo()->rank;
-            return rank != CREATURE_ELITE_NORMAL && rank != CREATURE_ELITE_RARE;
+            uint32 Rank = GetCreatureInfo()->Rank;
+            return Rank != CREATURE_ELITE_NORMAL && Rank != CREATURE_ELITE_RARE;
         }
 
         bool IsWorldBoss() const
         {
             if (IsPet())
-                return false;
+                { return false; }
 
-            return GetCreatureInfo()->rank == CREATURE_ELITE_WORLDBOSS;
+            return GetCreatureInfo()->Rank == CREATURE_ELITE_WORLDBOSS;
         }
 
         uint32 GetLevelForTarget(Unit const* target) const override; // overwrite Unit::GetLevelForTarget for boss level support
@@ -634,17 +634,50 @@ class  Creature : public Unit
         virtual void DeleteFromDB();                        // overwrited in Pet
         static void DeleteFromDB(uint32 lowguid, CreatureData const* data);
 
+        /// Represent the loots available on the creature.
         Loot loot;
+
+        /// Indicates whether the creature has has been pickpocked.
         bool lootForPickPocketed;
+
+        /// Indicates whether the creature has been checked.
         bool lootForBody;
+
+        /// Indicates whether the creature has been skinned.
         bool lootForSkin;
 
+        /**
+        * Method preparing the creature for the loot state. Based on the previous loot state, the loot ID provided in the database and the creature's type,
+        * this method updates the state of the creature for loots.
+        *
+        * At the end of this method, the creature loot state may be:
+        * Lootable: UNIT_DYNFLAG_LOOTABLE
+        * Skinnable: UNIT_FLAG_SKINNABLE
+        * Not lootable: No flag
+        */
         void PrepareBodyLootState();
+
+        /**
+        * function returning the GUID of the loot recipient (a player GUID).
+        *
+        * \return ObjectGuid Player GUID.
+        */
         ObjectGuid GetLootRecipientGuid() const { return m_lootRecipientGuid; }
         uint32 GetLootGroupRecipientId() const { return m_lootGroupRecipientId; }
         Player* GetLootRecipient() const;                   // use group cases as prefered
         Group* GetGroupLootRecipient() const;
+        /**
+        * function indicating whether the whether the creature has a looter recipient defined (either a group ID, either a player GUID).
+        *
+        * \return boolean true if the creature has a recipient defined, false otherwise.
+        */
         bool HasLootRecipient() const { return m_lootGroupRecipientId || m_lootRecipientGuid; }
+
+        /**
+        * function indicating whether the recipient is a group.
+        * 
+        * \return boolean true if the creature's recipient is a group, false otherwise.
+        */
         bool IsGroupLootRecipient() const { return m_lootGroupRecipientId; }
         void SetLootRecipient(Unit* unit);
         void AllLootRemovedFromCorpse();
@@ -680,7 +713,7 @@ class  Creature : public Unit
         bool IsVisibleInGridForPlayer(Player* pl) const override;
 
         void RemoveCorpse();
-        bool IsDeadByDefault() const { return m_isDeadByDefault; };
+        bool IsDeadByDefault() const { return m_IsDeadByDefault; };
 
         void ForcedDespawn(uint32 timeMSToDespawn = 0);
 
@@ -718,9 +751,9 @@ class  Creature : public Unit
         virtual uint32 GetPetAutoSpellOnPos(uint8 pos) const
         {
             if (pos >= CREATURE_MAX_SPELLS || m_charmInfo->GetCharmSpell(pos)->GetType() != ACT_ENABLED)
-                return 0;
+                { return 0; }
             else
-                return m_charmInfo->GetCharmSpell(pos)->GetAction();
+                { return m_charmInfo->GetCharmSpell(pos)->GetAction(); }
         }
 
         void SetCombatStartPosition(float x, float y, float z) { m_combatStartX = x; m_combatStartY = y; m_combatStartZ = z; }
@@ -731,7 +764,7 @@ class  Creature : public Unit
         void GetRespawnCoord(float& x, float& y, float& z, float* ori = NULL, float* dist = NULL) const;
         void ResetRespawnCoord();
 
-        void SetDeadByDefault(bool death_state) { m_isDeadByDefault = death_state; }
+        void SetDeadByDefault(bool death_state) { m_IsDeadByDefault = death_state; }
 
         void SetFactionTemporary(uint32 factionId, uint32 tempFactionFlags = TEMPFACTION_ALL);
         void ClearTemporaryFaction();
@@ -739,11 +772,10 @@ class  Creature : public Unit
 
         void SendAreaSpiritHealerQueryOpcode(Player* pl);
 
-		void SetVirtualItem(VirtualItemSlot slot, uint32 item_id) { SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + slot, item_id); }
-
-		void SetDisableReputationGain(bool disable) { DisableReputationGain = disable; }
-		bool IsReputationGainDisabled() { return DisableReputationGain; }
+        void SetVirtualItem(VirtualItemSlot slot, uint32 item_id) { SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + slot, item_id); }
 
+        void SetDisableReputationGain(bool disable) { DisableReputationGain = disable; }
+        bool IsReputationGainDisabled() { return DisableReputationGain; }
     protected:
         bool MeetsSelectAttackingRequirement(Unit* pTarget, SpellEntry const* pSpellInfo, uint32 selectFlags) const;
 
@@ -785,7 +817,7 @@ class  Creature : public Unit
         bool m_AlreadySearchedAssistance;
         bool m_regenHealth;
         bool m_AI_locked;
-        bool m_isDeadByDefault;
+        bool m_IsDeadByDefault;
         uint32 m_temporaryFactionFlags;                     // used for real faction changes (not auras etc)
 
         SpellSchoolMask m_meleeDamageSchoolMask;
@@ -795,9 +827,9 @@ class  Creature : public Unit
         float m_combatStartY;
         float m_combatStartZ;
 
-		Position m_respawnPos;
+        Position m_respawnPos;
 
-		bool DisableReputationGain;
+        bool DisableReputationGain;
 
     private:
         GridReference<Creature> m_gridRef;
diff --git a/src/game/Object/CreatureAI.cpp b/src/game/Object/CreatureAI.cpp
index e1d80c336..7dd4916c2 100644
--- a/src/game/Object/CreatureAI.cpp
+++ b/src/game/Object/CreatureAI.cpp
@@ -30,6 +30,8 @@
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 
+static_assert(MAXIMAL_AI_EVENT_EVENTAI <= 32, "Maximal 32 AI_EVENTs supported with EventAI");
+
 CreatureAI::~CreatureAI()
 {
 }
@@ -37,7 +39,7 @@ CreatureAI::~CreatureAI()
 void CreatureAI::AttackedBy(Unit* attacker)
 {
     if (!m_creature->getVictim())
-        AttackStart(attacker);
+        { AttackStart(attacker); }
 }
 
 CanCastResult CreatureAI::CanCastSpell(Unit* pTarget, const SpellEntry* pSpell, bool isTriggered)
@@ -47,17 +49,17 @@ CanCastResult CreatureAI::CanCastSpell(Unit* pTarget, const SpellEntry* pSpell,
     {
         // State does not allow
         if (m_creature->hasUnitState(UNIT_STAT_CAN_NOT_REACT_OR_LOST_CONTROL))
-            return CAST_FAIL_STATE;
+            { return CAST_FAIL_STATE; }
 
         if (pSpell->GetPreventionType() == SPELL_PREVENTION_TYPE_SILENCE && m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED))
-            return CAST_FAIL_STATE;
+            { return CAST_FAIL_STATE; }
 
         if (pSpell->GetPreventionType() == SPELL_PREVENTION_TYPE_PACIFY && m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
-            return CAST_FAIL_STATE;
+            { return CAST_FAIL_STATE; }
 
         // Check for power (also done by Spell::CheckCast())
         if (m_creature->GetPower((Powers)pSpell->powerType) < Spell::CalculatePowerCost(pSpell, m_creature))
-            return CAST_FAIL_POWER;
+            { return CAST_FAIL_POWER; }
     }
 
     if (const SpellRangeEntry* pSpellRange = sSpellRangeStore.LookupEntry(pSpell->rangeIndex))
@@ -68,18 +70,18 @@ CanCastResult CreatureAI::CanCastSpell(Unit* pTarget, const SpellEntry* pSpell,
             float fDistance = m_creature->GetCombatDistance(pTarget, pSpell->rangeIndex == SPELL_RANGE_IDX_COMBAT);
 
             if (fDistance > (m_creature->IsHostileTo(pTarget) ? pSpellRange->maxRange : pSpellRange->maxRangeFriendly))
-                return CAST_FAIL_TOO_FAR;
+                { return CAST_FAIL_TOO_FAR; }
 
             float fMinRange = m_creature->IsHostileTo(pTarget) ? pSpellRange->minRange : pSpellRange->minRangeFriendly;
 
             if (fMinRange && fDistance < fMinRange)
-                return CAST_FAIL_TOO_CLOSE;
+                { return CAST_FAIL_TOO_CLOSE; }
         }
 
         return CAST_OK;
     }
     else
-        return CAST_FAIL_OTHER;
+        { return CAST_FAIL_OTHER; }
 }
 
 CanCastResult CreatureAI::DoCastSpellIfCan(Unit* pTarget, uint32 uiSpell, uint32 uiCastFlags, ObjectGuid uiOriginalCasterGUID)
@@ -87,7 +89,7 @@ CanCastResult CreatureAI::DoCastSpellIfCan(Unit* pTarget, uint32 uiSpell, uint32
     Unit* pCaster = m_creature;
 
     if (uiCastFlags & CAST_FORCE_TARGET_SELF)
-        pCaster = pTarget;
+        { pCaster = pTarget; }
 
     // Allowed to cast only if not casting (unless we interrupt ourself) or if spell is triggered
     if (!pCaster->IsNonMeleeSpellCasted(false) || (uiCastFlags & (CAST_TRIGGERED | CAST_INTERRUPT_PREVIOUS)))
@@ -98,21 +100,21 @@ CanCastResult CreatureAI::DoCastSpellIfCan(Unit* pTarget, uint32 uiSpell, uint32
             if (uiCastFlags & CAST_AURA_NOT_PRESENT)
             {
                 if (pTarget->HasAura(uiSpell))
-                    return CAST_FAIL_TARGET_AURA;
+                    { return CAST_FAIL_TARGET_AURA; }
             }
 
-            // Check if cannot cast spell
+            // Check if can not cast spell
             if (!(uiCastFlags & (CAST_FORCE_TARGET_SELF | CAST_FORCE_CAST)))
             {
                 CanCastResult castResult = CanCastSpell(pTarget, pSpell, uiCastFlags & CAST_TRIGGERED);
 
                 if (castResult != CAST_OK)
-                    return castResult;
+                    { return castResult; }
             }
 
             // Interrupt any previous spell
             if (uiCastFlags & CAST_INTERRUPT_PREVIOUS && pCaster->IsNonMeleeSpellCasted(false))
-                pCaster->InterruptNonMeleeSpells(false);
+                { pCaster->InterruptNonMeleeSpells(false); }
 
             pCaster->CastSpell(pTarget, pSpell, uiCastFlags & CAST_TRIGGERED, NULL, NULL, uiOriginalCasterGUID);
             return CAST_OK;
@@ -124,7 +126,7 @@ CanCastResult CreatureAI::DoCastSpellIfCan(Unit* pTarget, uint32 uiSpell, uint32
         }
     }
     else
-        return CAST_FAIL_IS_CASTING;
+        { return CAST_FAIL_IS_CASTING; }
 }
 
 bool CreatureAI::DoMeleeAttackIfReady()
@@ -179,7 +181,7 @@ class AiDelayEventAround : public BasicEvent
             // Pushing guids because in delay can happen some creature gets despawned => invalid pointer
             m_receiverGuids.reserve(receivers.size());
             for (std::list<Creature*>::const_iterator itr = receivers.begin(); itr != receivers.end(); ++itr)
-                m_receiverGuids.push_back((*itr)->GetObjectGuid());
+                { m_receiverGuids.push_back((*itr)->GetObjectGuid()); }
         }
 
         bool Execute(uint64 /*e_time*/, uint32 /*p_time*/) override
@@ -207,12 +209,12 @@ class AiDelayEventAround : public BasicEvent
     private:
         AiDelayEventAround();
 
-        ObjectGuid m_invokerGuid;
-        GuidVector m_receiverGuids;
-        Creature&  m_owner;
-
         AIEventType m_eventType;
+        ObjectGuid m_invokerGuid;
+        Creature&  m_owner;
         uint32 m_miscValue;
+
+        GuidVector m_receiverGuids;
 };
 
 void CreatureAI::SendAIEventAround(AIEventType eventType, Unit* pInvoker, uint32 uiDelay, float fRadius, uint32 miscValue /*=0*/) const
diff --git a/src/game/Object/CreatureAI.h b/src/game/Object/CreatureAI.h
index 1c81b8780..bcb9d00ec 100644
--- a/src/game/Object/CreatureAI.h
+++ b/src/game/Object/CreatureAI.h
@@ -52,7 +52,8 @@ enum CanCastResult
     CAST_FAIL_TOO_CLOSE         = 4,
     CAST_FAIL_POWER             = 5,
     CAST_FAIL_STATE             = 6,
-    CAST_FAIL_TARGET_AURA       = 7
+    CAST_FAIL_TARGET_AURA       = 7,
+    CAST_FAIL_NO_LOS            = 8
 };
 
 enum CastFlags
@@ -65,6 +66,14 @@ enum CastFlags
     CAST_AURA_NOT_PRESENT       = 0x20,                     // Only casts the spell if the target does not have an aura from the spell
 };
 
+enum CombatMovementFlags
+{
+    COMBAT_MOVEMENT_SCRIPT      = 0x01,                      // Combat movement enforced by script
+    COMBAT_MOVEMENT_LOS         = 0x02,                      // Combat movement triggered by LoS issues
+    COMBAT_MOVEMENT_OOM         = 0x04,                      // Combat movement triggered by power exhaustion
+    COMBAT_MOVEMENT_DISTANCE    = 0x08                       // Combat movement triggered by distance checks
+};
+
 enum AIEventType
 {
     // Usable with Event AI
@@ -77,18 +86,18 @@ enum AIEventType
     AI_EVENT_CUSTOM_EVENTAI_B   = 6,                        // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
     AI_EVENT_GOT_CCED           = 7,                        // Sender = CCed Npc, Invoker = Caster that CCed
     MAXIMAL_AI_EVENT_EVENTAI    = 8,
- 
+
     // Internal Use
     AI_EVENT_CALL_ASSISTANCE    = 10,                       // Sender = Attacked Npc, Invoker = Enemy
 
-    // Predefined for SD2
+    // Predefined for SD3
     AI_EVENT_START_ESCORT       = 100,                      // Invoker = Escorting Player
     AI_EVENT_START_ESCORT_B     = 101,                      // Invoker = Escorting Player
     AI_EVENT_START_EVENT        = 102,                      // Invoker = EventStarter
     AI_EVENT_START_EVENT_A      = 103,                      // Invoker = EventStarter
     AI_EVENT_START_EVENT_B      = 104,                      // Invoker = EventStarter
 
-    // Some IDs for special cases in SD2
+    // Some IDs for special cases in SD3
     AI_EVENT_CUSTOM_A           = 1000,
     AI_EVENT_CUSTOM_B           = 1001,
     AI_EVENT_CUSTOM_C           = 1002,
@@ -97,7 +106,7 @@ enum AIEventType
     AI_EVENT_CUSTOM_F           = 1005,
 };
 
-class  CreatureAI
+class CreatureAI
 {
     public:
         explicit CreatureAI(Creature* creature) :
@@ -111,7 +120,7 @@ class  CreatureAI
 
         ///== Information about AI ========================
         /**
-         * This funcion is used to display information about the AI.
+         * This function is used to display information about the AI.
          * It is called when the .npc aiinfo command is used.
          * Use this for on-the-fly debugging
          * @param reader is a ChatHandler to send messages to.
@@ -150,7 +159,7 @@ class  CreatureAI
          * @param pHealer Unit* which deals the heal
          * @param uiHealedAmount Amount of healing received
          */
-        virtual void HealedBy(Unit* /*pHealer*/, uint32& /*uiHealedAmount*/) {}
+        virtual void HealedBy(Unit * /*pHealer*/, uint32& /*uiHealedAmount*/) {}
 
         /**
          * Called at any Damage to any victim (before damage apply)
@@ -342,6 +351,8 @@ class  CreatureAI
          */
         virtual void ReceiveAIEvent(AIEventType /*eventType*/, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 /*miscValue*/) {}
 
+        virtual void Reset() {}
+
     protected:
         void HandleMovementOnAttackStart(Unit* victim);
 
diff --git a/src/game/Object/Formulas.h b/src/game/Object/Formulas.h
index 7cfd4adcd..7be483fd7 100644
--- a/src/game/Object/Formulas.h
+++ b/src/game/Object/Formulas.h
@@ -119,7 +119,7 @@ namespace MaNGOS
         {
             if (u->GetTypeId() == TYPEID_UNIT && (
                         ((Creature*)u)->IsTotem() || ((Creature*)u)->IsPet() ||
-                        (((Creature*)u)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL)))
+                        (((Creature*)u)->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL)))
                 return 0;
 
             uint32 xp_gain = BaseGain(pl->getLevel(), u->getLevel(), GetContentLevelsForMapAndZone(pl->GetMapId(), pl->GetZoneId()));
diff --git a/src/game/Object/GameObject.cpp b/src/game/Object/GameObject.cpp
index 516aede44..4451dda73 100644
--- a/src/game/Object/GameObject.cpp
+++ b/src/game/Object/GameObject.cpp
@@ -46,7 +46,11 @@
 #include "Util.h"
 #include "ScriptMgr.h"
 #include "vmap/GameObjectModel.h"
+#include "CreatureAISelector.h"
 #include "SQLStorages.h"
+#ifdef ENABLE_ELUNA
+#include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 #include <G3D/Quat.h>
 
 GameObject::GameObject() : WorldObject(),
@@ -84,12 +88,17 @@ GameObject::~GameObject()
 
 void GameObject::AddToWorld()
 {
+#ifdef ENABLE_ELUNA
+    if (!IsInWorld())
+        sEluna->OnAddToWorld(this);
+#endif /* ENABLE_ELUNA */
+
     ///- Register the gameobject for guid lookup
     if (!IsInWorld())
-        GetMap()->GetObjectsStore().insert<GameObject>(GetObjectGuid(), (GameObject*)this);
+        { GetMap()->GetObjectsStore().insert<GameObject>(GetObjectGuid(), (GameObject*)this); }
 
     if (m_model)
-        GetMap()->InsertGameObjectModel(*m_model);
+        { GetMap()->InsertGameObjectModel(*m_model); }
 
     Object::AddToWorld();
 
@@ -102,15 +111,19 @@ void GameObject::RemoveFromWorld()
     ///- Remove the gameobject from the accessor
     if (IsInWorld())
     {
+#ifdef ENABLE_ELUNA
+        sEluna->OnRemoveFromWorld(this);
+#endif /* ENABLE_ELUNA */
+
         // Notify the outdoor pvp script
         if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(GetZoneId()))
-            outdoorPvP->HandleGameObjectRemove(this);
+            { outdoorPvP->HandleGameObjectRemove(this); }
 
         // Remove GO from owner
         if (ObjectGuid owner_guid = GetOwnerGuid())
         {
             if (Unit* owner = ObjectAccessor::GetUnit(*this, owner_guid))
-                owner->RemoveGameObject(this, false);
+                { owner->RemoveGameObject(this, false); }
             else
             {
                 sLog.outError("Delete %s with SpellId %u LinkedGO %u that lost references to owner %s GO list. Crash possible later.",
@@ -119,7 +132,7 @@ void GameObject::RemoveFromWorld()
         }
 
         if (m_model && GetMap()->ContainsGameObjectModel(*m_model))
-            GetMap()->RemoveGameObjectModel(*m_model);
+            { GetMap()->RemoveGameObjectModel(*m_model); }
 
         GetMap()->GetObjectsStore().erase<GameObject>(GetObjectGuid(), (GameObject*)NULL);
     }
@@ -182,7 +195,7 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map* map, uint32 phaseMa
     SetUInt32Value(GAMEOBJECT_FLAGS, goinfo->flags);
 
     if (goinfo->type == GAMEOBJECT_TYPE_TRANSPORT)
-        SetFlag(GAMEOBJECT_FLAGS, (GO_FLAG_TRANSPORT | GO_FLAG_NODESPAWN));
+        { SetFlag(GAMEOBJECT_FLAGS, (GO_FLAG_TRANSPORT | GO_FLAG_NODESPAWN)); }
 
     SetEntry(goinfo->id);
     SetDisplayId(goinfo->displayId);
@@ -209,17 +222,22 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map* map, uint32 phaseMa
             break;
     }
 
+    // Used by Eluna
+#ifdef ENABLE_ELUNA
+    sEluna->OnSpawn(this);
+#endif /* ENABLE_ELUNA */
+
     // Notify the battleground or outdoor pvp script
     if (map->IsBattleGroundOrArena())
-        ((BattleGroundMap*)map)->GetBG()->HandleGameObjectCreate(this);
+        { ((BattleGroundMap*)map)->GetBG()->HandleGameObjectCreate(this); }
     else if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(GetZoneId()))
-        outdoorPvP->HandleGameObjectCreate(this);
+        { outdoorPvP->HandleGameObjectCreate(this); }
 
     // Notify the map's instance data.
     // Only works if you create the object in it, not if it is moves to that map.
     // Normally non-players do not teleport to other maps.
     if (InstanceData* iData = map->GetInstanceData())
-        iData->OnObjectCreate(this);
+        { iData->OnObjectCreate(this); }
 
     return true;
 }
@@ -232,6 +250,11 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
         return;
     }
 
+    // Used by Eluna
+#ifdef ENABLE_ELUNA
+    sEluna->UpdateAI(this, update_diff);
+#endif /* ENABLE_ELUNA */
+
     switch (m_lootState)
     {
         case GO_NOT_READY:
@@ -243,7 +266,7 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
                     // Arming Time for GAMEOBJECT_TYPE_TRAP (6)
                     Unit* owner = GetOwner();
                     if (owner && owner->IsInCombat())
-                        m_cooldownTime = time(NULL) + GetGOInfo()->trap.startDelay;
+                        { m_cooldownTime = time(NULL) + GetGOInfo()->trap.startDelay; }
                     m_lootState = GO_READY;
                     break;
                 }
@@ -268,6 +291,8 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
                     }
                     break;
                 }
+                default:
+                    break;
             }
             break;
         }
@@ -300,7 +325,7 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
                         case GAMEOBJECT_TYPE_BUTTON:
                             // we need to open doors if they are closed (add there another condition if this code breaks some usage, but it need to be here for battlegrounds)
                             if (GetGoState() != GO_STATE_READY)
-                                ResetDoorOrButton();
+                                { ResetDoorOrButton(); }
                             // flags in AB are type_button and we need to add them here so no break!
                         default:
                             if (!m_spawnedByDefault)        // despawn timer
@@ -311,9 +336,9 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
                                 if (!HasStaticDBSpawnData())
                                 {
                                     if (Unit* owner = GetOwner())
-                                        owner->RemoveGameObject(this, false);
+                                        { owner->RemoveGameObject(this, false); }
                                     Delete();
-                                } 
+                                }
                                 return;
                             }
 
@@ -331,7 +356,7 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
                 if (goInfo->type == GAMEOBJECT_TYPE_TRAP)   // traps
                 {
                     if (m_cooldownTime >= time(NULL))
-                        return;
+                        { return; }
 
                     // FIXME: this is activation radius (in different casting radius that must be selected from spell data)
                     // TODO: move activated state code (cast itself) to GO_ACTIVATED, in this place only check activating and set state
@@ -339,11 +364,11 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
                     if (!radius)
                     {
                         if (goInfo->trap.cooldown != 3)     // cast in other case (at some triggering/linked go/etc explicit call)
-                            return;
+                            { return; }
                         else
                         {
                             if (m_respawnTime > 0)
-                                break;
+                                { break; }
 
                             // battlegrounds gameobjects has data2 == 0 && data5 == 3
                             radius = float(goInfo->trap.cooldown);
@@ -356,7 +381,7 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
                     MaNGOS::UnitSearcher<MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck> checker(enemy, u_check);
                     Cell::VisitAllObjects(this, checker, radius);
                     if (enemy)
-                        Use(enemy);
+                        { Use(enemy); }
                 }
 
                 if (uint32 max_charges = goInfo->GetCharges())
@@ -377,7 +402,7 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
                 case GAMEOBJECT_TYPE_DOOR:
                 case GAMEOBJECT_TYPE_BUTTON:
                     if (GetGOInfo()->GetAutoCloseTime() && (m_cooldownTime < time(NULL)))
-                        ResetDoorOrButton();
+                        { ResetDoorOrButton(); }
                     break;
                 case GAMEOBJECT_TYPE_CHEST:
                     if (m_groupLootId)
@@ -421,7 +446,7 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
                         for (GuidSet::const_iterator itr = m_UniqueUsers.begin(); itr != m_UniqueUsers.end(); ++itr)
                         {
                             if (Player* owner = GetMap()->GetPlayer(*itr))
-                                owner->CastSpell(owner, spellId, false, NULL, NULL, GetObjectGuid());
+                                { owner->CastSpell(owner, spellId, false, NULL, NULL, GetObjectGuid()); }
                         }
 
                         ClearAllUsesData();
@@ -431,12 +456,13 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
 
                     // any return here in case battleground traps
                     break;
+
                 case GAMEOBJECT_TYPE_CAPTURE_POINT:
                     // remove capturing players because slider wont be displayed if capture point is being locked
                     for (GuidSet::const_iterator itr = m_UniqueUsers.begin(); itr != m_UniqueUsers.end(); ++itr)
                     {
                         if (Player* owner = GetMap()->GetPlayer(*itr))
-                            owner->SendUpdateWorldState(GetGOInfo()->capturePoint.worldState1, WORLD_STATE_REMOVE);
+                            { owner->SendUpdateWorldState(GetGOInfo()->capturePoint.worldState1, WORLD_STATE_REMOVE); }
                     }
 
                     m_UniqueUsers.clear();
@@ -450,7 +476,7 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
             if (!HasStaticDBSpawnData() && (!GetSpellId() || GetGOInfo()->GetDespawnPossibility()))
             {
                 if (Unit* owner = GetOwner())
-                    owner->RemoveGameObject(this, false); 
+                    { owner->RemoveGameObject(this, false); }
                 Delete();
                 return;
             }
@@ -464,10 +490,10 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
                 {
                     // In Instances GO_FLAG_LOCKED, GO_FLAG_INTERACT_COND or GO_FLAG_NO_INTERACT are not changed
                     uint32 currentLockOrInteractFlags = GetUInt32Value(GAMEOBJECT_FLAGS) & (GO_FLAG_LOCKED | GO_FLAG_INTERACT_COND | GO_FLAG_NO_INTERACT);
-                    SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags & ~(GO_FLAG_LOCKED | GO_FLAG_INTERACT_COND | GO_FLAG_NO_INTERACT) | currentLockOrInteractFlags);
+                    SetUInt32Value(GAMEOBJECT_FLAGS, (GetGOInfo()->flags & ~(GO_FLAG_LOCKED | GO_FLAG_INTERACT_COND | GO_FLAG_NO_INTERACT)) | currentLockOrInteractFlags);
                 }
                 else
-                    SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags);
+                    { SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags); }
             }
 
             loot.clear();
@@ -475,22 +501,22 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
             SetLootState(GO_READY);
 
             if (!m_respawnDelayTime)
-                return;
+                { return; }
 
             // since pool system can fail to roll unspawned object, this one can remain spawned, so must set respawn nevertheless
             m_respawnTime = m_spawnedByDefault ? time(NULL) + m_respawnDelayTime : 0;
 
             // if option not set then object will be saved at grid unload
             if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY))
-                SaveRespawnTime();
+                { SaveRespawnTime(); }
 
             // if part of pool, let pool system schedule new spawn instead of just scheduling respawn
             if (uint16 poolid = sPoolMgr.IsPartOfAPool<GameObject>(GetGUIDLow()))
-                sPoolMgr.UpdatePool<GameObject>(*GetMap()->GetPersistentState(), poolid, GetGUIDLow());
+                { sPoolMgr.UpdatePool<GameObject>(*GetMap()->GetPersistentState(), poolid, GetGUIDLow()); }
 
             // can be not in world at pool despawn
             if (IsInWorld())
-                UpdateObjectVisibility();
+                { UpdateObjectVisibility(); }
 
             break;
         }
@@ -501,10 +527,10 @@ void GameObject::Refresh()
 {
     // not refresh despawned not casted GO (despawned casted GO destroyed in all cases anyway)
     if (m_respawnTime > 0 && m_spawnedByDefault)
-        return;
+        { return; }
 
     if (isSpawned())
-        GetMap()->Add(this);
+        { GetMap()->Add(this); }
 }
 
 void GameObject::AddUniqueUse(Player* player)
@@ -512,7 +538,7 @@ void GameObject::AddUniqueUse(Player* player)
     AddUse();
 
     if (!m_firstUser)
-        m_firstUser = player->GetObjectGuid();
+        { m_firstUser = player->GetObjectGuid(); }
 
     m_UniqueUsers.insert(player->GetObjectGuid());
 }
@@ -525,9 +551,9 @@ void GameObject::Delete()
     SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags);
 
     if (uint16 poolid = sPoolMgr.IsPartOfAPool<GameObject>(GetGUIDLow()))
-        sPoolMgr.UpdatePool<GameObject>(*GetMap()->GetPersistentState(), poolid, GetGUIDLow());
+        { sPoolMgr.UpdatePool<GameObject>(*GetMap()->GetPersistentState(), poolid, GetGUIDLow()); }
     else
-        AddObjectToRemoveList();
+        { AddObjectToRemoveList(); }
 }
 
 void GameObject::SaveToDB()
@@ -537,7 +563,7 @@ void GameObject::SaveToDB()
     GameObjectData const* data = sObjectMgr.GetGOData(GetGUIDLow());
     if (!data)
     {
-        sLog.outError("GameObject::SaveToDB failed, cannot get gameobject data!");
+        sLog.outError("GameObject::SaveToDB failed, can not get gameobject data!");
         return;
     }
 
@@ -549,7 +575,7 @@ void GameObject::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
     const GameObjectInfo* goI = GetGOInfo();
 
     if (!goI)
-        return;
+        { return; }
 
     // update in loaded data (changing data only in this place)
     GameObjectData& data = sObjectMgr.NewGOData(GetGUIDLow());
@@ -619,7 +645,7 @@ bool GameObject::LoadFromDB(uint32 guid, Map* map)
     GOState go_state = data->go_state;
 
     if (!Create(guid, entry, map, phaseMask, x, y, z, ang, data->rotation, animprogress, go_state))
-        return false;
+        { return false; }
 
     if (!GetGOInfo()->GetDespawnPossibility() && !GetGOInfo()->IsDespawnAtAction() && data->spawntimesecs >= 0)
     {
@@ -667,6 +693,7 @@ struct GameObjectRespawnDeleteWorker
     uint32 i_guid;
 };
 
+
 void GameObject::DeleteFromDB()
 {
     if (!HasStaticDBSpawnData())
@@ -698,7 +725,7 @@ bool GameObject::HasQuest(uint32 quest_id) const
     for (QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
     {
         if (itr->second == quest_id)
-            return true;
+            { return true; }
     }
     return false;
 }
@@ -709,7 +736,7 @@ bool GameObject::HasInvolvedQuest(uint32 quest_id) const
     for (QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
     {
         if (itr->second == quest_id)
-            return true;
+            { return true; }
     }
     return false;
 }
@@ -718,7 +745,7 @@ bool GameObject::IsTransport() const
 {
     // If something is marked as a transport, don't transmit an out of range packet for it.
     GameObjectInfo const* gInfo = GetGOInfo();
-    if (!gInfo) return false;
+    if (!gInfo) { return false; }
     return gInfo->type == GAMEOBJECT_TYPE_TRANSPORT || gInfo->type == GAMEOBJECT_TYPE_MO_TRANSPORT;
 }
 
@@ -730,14 +757,14 @@ Unit* GameObject::GetOwner() const
 void GameObject::SaveRespawnTime()
 {
     if (m_respawnTime > time(NULL) && m_spawnedByDefault)
-        GetMap()->GetPersistentState()->SaveGORespawnTime(GetGUIDLow(), m_respawnTime);
+        { GetMap()->GetPersistentState()->SaveGORespawnTime(GetGUIDLow(), m_respawnTime); }
 }
 
 bool GameObject::isVisibleForInState(Player const* u, WorldObject const* viewPoint, bool inVisibleList) const
 {
     // Not in world
     if (!IsInWorld() || !u->IsInWorld())
-        return false;
+        { return false; }
 
     // invisible at client always
     if (!GetGOInfo()->displayId)
@@ -745,14 +772,14 @@ bool GameObject::isVisibleForInState(Player const* u, WorldObject const* viewPoi
 
     // Transport always visible at this step implementation
     if (IsTransport() && IsInMap(u))
-        return true;
+        { return true; }
 
     // quick check visibility false cases for non-GM-mode
     if (!u->isGameMaster())
     {
         // despawned and then not visible for non-GM in GM-mode
         if (!isSpawned())
-            return false;
+            { return false; }
 
         // special invisibility cases
         /* TODO: implement trap stealth, take look at spell 2836
@@ -781,10 +808,10 @@ bool GameObject::ActivateToQuest(Player* pTarget) const
 {
     // if GO is ReqCreatureOrGoN for quest
     if (pTarget->HasQuestForGO(GetEntry()))
-        return true;
+        { return true; }
 
     if (!sObjectMgr.IsGameObjectForQuests(GetEntry()))
-        return false;
+        { return false; }
 
     switch (GetGoType())
     {
@@ -802,7 +829,7 @@ bool GameObject::ActivateToQuest(Player* pTarget) const
                 const Quest* qInfo = sObjectMgr.GetQuestTemplate(itr->second);
 
                 if (pTarget->CanTakeQuest(qInfo, false))
-                    return true;
+                    { return true; }
             }
 
             bounds = sObjectMgr.GetGOQuestInvolvedRelationsMapBounds(GetEntry());
@@ -810,8 +837,8 @@ bool GameObject::ActivateToQuest(Player* pTarget) const
             for (QuestRelationsMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
             {
                 if ((pTarget->GetQuestStatus(itr->second) == QUEST_STATUS_INCOMPLETE || pTarget->GetQuestStatus(itr->second) == QUEST_STATUS_COMPLETE)
-                        && !pTarget->GetQuestRewardStatus(itr->second))
-                    return true;
+                    && !pTarget->GetQuestRewardStatus(itr->second))
+                    { return true; }
             }
 
             break;
@@ -820,7 +847,7 @@ bool GameObject::ActivateToQuest(Player* pTarget) const
         case GAMEOBJECT_TYPE_CHEST:
         {
             if (pTarget->GetQuestStatus(GetGOInfo()->chest.questId) == QUEST_STATUS_INCOMPLETE)
-                return true;
+                { return true; }
 
             if (LootTemplates_Gameobject.HaveQuestLootForPlayer(GetGOInfo()->GetLootId(), pTarget))
             {
@@ -828,7 +855,7 @@ bool GameObject::ActivateToQuest(Player* pTarget) const
                 if (GetEntry() == BG_AV_OBJECTID_MINE_N || GetEntry() == BG_AV_OBJECTID_MINE_S)
                     if (BattleGround* bg = pTarget->GetBattleGround())
                         if (bg->GetTypeID() == BATTLEGROUND_AV && !(((BattleGroundAV*)bg)->PlayerCanDoMineQuest(GetEntry(), pTarget->GetTeam())))
-                            return false;
+                            { return false; }
                 return true;
             }
             break;
@@ -836,19 +863,19 @@ bool GameObject::ActivateToQuest(Player* pTarget) const
         case GAMEOBJECT_TYPE_GENERIC:
         {
             if (pTarget->GetQuestStatus(GetGOInfo()->_generic.questID) == QUEST_STATUS_INCOMPLETE)
-                return true;
+                { return true; }
             break;
         }
         case GAMEOBJECT_TYPE_SPELL_FOCUS:
         {
             if (pTarget->GetQuestStatus(GetGOInfo()->spellFocus.questID) == QUEST_STATUS_INCOMPLETE)
-                return true;
+                { return true; }
             break;
         }
         case GAMEOBJECT_TYPE_GOOBER:
         {
             if (pTarget->GetQuestStatus(GetGOInfo()->goober.questId) == QUEST_STATUS_INCOMPLETE)
-                return true;
+                { return true; }
             break;
         }
         default:
@@ -862,7 +889,7 @@ void GameObject::SummonLinkedTrapIfAny()
 {
     uint32 linkedEntry = GetGOInfo()->GetLinkedGameObjectEntry();
     if (!linkedEntry)
-        return;
+        { return; }
 
     GameObject* linkedGO = new GameObject;
     if (!linkedGO->Create(GetMap()->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), linkedEntry, GetMap(),
@@ -889,11 +916,11 @@ void GameObject::TriggerLinkedGameObject(Unit* target)
     uint32 trapEntry = GetGOInfo()->GetLinkedGameObjectEntry();
 
     if (!trapEntry)
-        return;
+        { return; }
 
     GameObjectInfo const* trapInfo = sGOStorage.LookupEntry<GameObjectInfo>(trapEntry);
     if (!trapInfo || trapInfo->type != GAMEOBJECT_TYPE_TRAP)
-        return;
+        { return; }
 
     SpellEntry const* trapSpell = sSpellStore.LookupEntry(trapInfo->trap.spellId);
 
@@ -903,7 +930,7 @@ void GameObject::TriggerLinkedGameObject(Unit* target)
     float range = 0.5f;
 
     if (trapSpell)                                          // checked at load already
-        range = GetSpellMaxRange(sSpellRangeStore.LookupEntry(trapSpell->rangeIndex));
+        { range = GetSpellMaxRange(sSpellRangeStore.LookupEntry(trapSpell->rangeIndex)); }
 
     // search nearest linked GO
     GameObject* trapGO = NULL;
@@ -918,7 +945,7 @@ void GameObject::TriggerLinkedGameObject(Unit* target)
 
     // found correct GO
     if (trapGO)
-        trapGO->Use(target);
+        { trapGO->Use(target); }
 }
 
 GameObject* GameObject::LookupFishingHoleAround(float range)
@@ -935,7 +962,7 @@ GameObject* GameObject::LookupFishingHoleAround(float range)
 bool GameObject::IsCollisionEnabled() const
 {
     if (!isSpawned())
-        return false;
+        { return false; }
 
     // TODO: Possible that this function must consider multiple checks
     switch (GetGoType())
@@ -952,7 +979,7 @@ bool GameObject::IsCollisionEnabled() const
 void GameObject::ResetDoorOrButton()
 {
     if (m_lootState == GO_READY || m_lootState == GO_JUST_DEACTIVATED)
-        return;
+        { return; }
 
     SwitchDoorOrButton(false);
     SetLootState(GO_JUST_DEACTIVATED);
@@ -962,10 +989,10 @@ void GameObject::ResetDoorOrButton()
 void GameObject::UseDoorOrButton(uint32 time_to_restore, bool alternative /* = false */)
 {
     if (m_lootState != GO_READY)
-        return;
+        { return; }
 
     if (!time_to_restore)
-        time_to_restore = GetGOInfo()->GetAutoCloseTime();
+        { time_to_restore = GetGOInfo()->GetAutoCloseTime(); }
 
     SwitchDoorOrButton(true, alternative);
     SetLootState(GO_ACTIVATED);
@@ -976,14 +1003,14 @@ void GameObject::UseDoorOrButton(uint32 time_to_restore, bool alternative /* = f
 void GameObject::SwitchDoorOrButton(bool activate, bool alternative /* = false */)
 {
     if (activate)
-        SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
+        { SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); }
     else
-        RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
+        { RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); }
 
     if (GetGoState() == GO_STATE_READY)                     // if closed -> open
-        SetGoState(alternative ? GO_STATE_ACTIVE_ALTERNATIVE : GO_STATE_ACTIVE);
+        { SetGoState(alternative ? GO_STATE_ACTIVE_ALTERNATIVE : GO_STATE_ACTIVE); }
     else                                                    // if open -> close
-        SetGoState(GO_STATE_READY);
+        { SetGoState(GO_STATE_READY); }
 }
 
 void GameObject::Use(Unit* user)
@@ -1000,14 +1027,14 @@ void GameObject::Use(Unit* user)
     if (uint32 cooldown = GetGOInfo()->GetCooldown())
     {
         if (m_cooldownTime > sWorld.GetGameTime())
-            return;
+            { return; }
 
         m_cooldownTime = sWorld.GetGameTime() + cooldown;
     }
 
     bool scriptReturnValue = user->GetTypeId() == TYPEID_PLAYER && sScriptMgr.OnGameObjectUse((Player*)user, this);
     if (!scriptReturnValue)
-        GetMap()->ScriptsStart(sGameObjectTemplateScripts, GetEntry(), spellCaster, this);
+        { GetMap()->ScriptsStart(sGameObjectTemplateScripts, GetEntry(), spellCaster, this); }
 
     switch (GetGoType())
     {
@@ -1018,7 +1045,7 @@ void GameObject::Use(Unit* user)
 
             // activate script
             if (!scriptReturnValue)
-                GetMap()->ScriptsStart(sGameObjectScripts, GetGUIDLow(), spellCaster, this);
+                { GetMap()->ScriptsStart(sGameObjectScripts, GetGUIDLow(), spellCaster, this); }
             return;
         }
         case GAMEOBJECT_TYPE_BUTTON:                        // 1
@@ -1030,14 +1057,14 @@ void GameObject::Use(Unit* user)
 
             // activate script
             if (!scriptReturnValue)
-                GetMap()->ScriptsStart(sGameObjectScripts, GetGUIDLow(), spellCaster, this);
+                { GetMap()->ScriptsStart(sGameObjectScripts, GetGUIDLow(), spellCaster, this); }
 
             return;
         }
         case GAMEOBJECT_TYPE_QUESTGIVER:                    // 2
         {
             if (user->GetTypeId() != TYPEID_PLAYER)
-                return;
+                { return; }
 
             Player* player = (Player*)user;
 
@@ -1052,7 +1079,7 @@ void GameObject::Use(Unit* user)
         case GAMEOBJECT_TYPE_CHEST:                         // 3
         {
             if (user->GetTypeId() != TYPEID_PLAYER)
-                return;
+                { return; }
 
             TriggerLinkedGameObject(user);
 
@@ -1068,7 +1095,7 @@ void GameObject::Use(Unit* user)
         case GAMEOBJECT_TYPE_GENERIC:                       // 5
         {
             if (scriptReturnValue)
-                return;
+                { return; }
 
             // No known way to exclude some - only different approach is to select despawnable GOs by Entry
             SetLootState(GO_JUST_DEACTIVATED);
@@ -1077,7 +1104,7 @@ void GameObject::Use(Unit* user)
         case GAMEOBJECT_TYPE_TRAP:                          // 6
         {
             if (scriptReturnValue)
-                return;
+                { return; }
 
             Unit* owner = GetOwner();
             Unit* caster = owner ? owner : user;
@@ -1094,13 +1121,13 @@ void GameObject::Use(Unit* user)
 
             // count charges
             if (goInfo->trap.charges > 0)
-                AddUse();
+                { AddUse(); }
 
             if (IsBattleGroundTrap && user->GetTypeId() == TYPEID_PLAYER)
             {
                 // BattleGround gameobjects case
                 if (BattleGround* bg = ((Player*)user)->GetBattleGround())
-                    bg->HandleTriggerBuff(GetObjectGuid());
+                    { bg->HandleTriggerBuff(GetObjectGuid()); }
             }
 
             // TODO: all traps can be activated, also those without spell.
@@ -1108,7 +1135,7 @@ void GameObject::Use(Unit* user)
 
             // TODO: Improve this when more information is available, currently these traps are known that must send the anim (Onyxia/ Heigan Fissures/ Trap in DireMaul)
             if (GetDisplayId() == 4392 || GetDisplayId() == 4472 || GetDisplayId() == 6785 || GetDisplayId() == 3073)
-                SendGameObjectCustomAnim(GetObjectGuid());
+                { SendGameObjectCustomAnim(GetObjectGuid()); }
 
             // TODO: Despawning of traps? (Also related to code in ::Update)
             return;
@@ -1117,10 +1144,10 @@ void GameObject::Use(Unit* user)
         {
             GameObjectInfo const* info = GetGOInfo();
             if (!info)
-                return;
+                { return; }
 
             if (user->GetTypeId() != TYPEID_PLAYER)
-                return;
+                { return; }
 
             Player* player = (Player*)user;
 
@@ -1188,7 +1215,7 @@ void GameObject::Use(Unit* user)
             {
                 Player* player = (Player*)user;
                 if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(player->GetCachedZoneId()))
-                    outdoorPvP->HandleGameObjectUse(player, this);
+                    { outdoorPvP->HandleGameObjectUse(player, this); }
             }
 
             GameObjectInfo const* info = GetGOInfo();
@@ -1200,9 +1227,9 @@ void GameObject::Use(Unit* user)
 
             // this appear to be ok, however others exist in addition to this that should have custom (ex: 190510, 188692, 187389)
             if (info->goober.customAnim)
-                SendGameObjectCustomAnim(GetObjectGuid());
+                { SendGameObjectCustomAnim(GetObjectGuid()); }
             else
-                SetGoState(GO_STATE_ACTIVE);
+                { SetGoState(GO_STATE_ACTIVE); }
 
             m_cooldownTime = time(NULL) + info->GetAutoCloseTime();
 
@@ -1236,14 +1263,14 @@ void GameObject::Use(Unit* user)
                 {
                     // Quest require to be active for GO using
                     if (player->GetQuestStatus(info->goober.questId) != QUEST_STATUS_INCOMPLETE)
-                        break;
+                        { break; }
                 }
 
                 player->RewardPlayerAndGroupAtCast(this);
             }
 
             if (scriptReturnValue)
-                return;
+                { return; }
 
             // cast this spell later if provided
             spellId = info->goober.spellId;
@@ -1264,30 +1291,30 @@ void GameObject::Use(Unit* user)
         {
             GameObjectInfo const* info = GetGOInfo();
             if (!info)
-                return;
+                { return; }
 
             if (user->GetTypeId() != TYPEID_PLAYER)
-                return;
+                { return; }
 
             Player* player = (Player*)user;
 
             if (info->camera.cinematicId)
-                player->SendCinematicStart(info->camera.cinematicId);
+                { player->SendCinematicStart(info->camera.cinematicId); }
 
             if (info->camera.eventID)
-                StartEvents_Event(GetMap(), info->camera.eventID, player, this);
+                { StartEvents_Event(GetMap(), info->camera.eventID, player, this); }
 
             return;
         }
         case GAMEOBJECT_TYPE_FISHINGNODE:                   // 17 fishing bobber
         {
             if (user->GetTypeId() != TYPEID_PLAYER)
-                return;
+                { return; }
 
             Player* player = (Player*)user;
 
             if (player->GetObjectGuid() != GetOwnerGuid())
-                return;
+                { return; }
 
             switch (getLootState())
             {
@@ -1302,11 +1329,11 @@ void GameObject::Use(Unit* user)
 
                     int32 zone_skill = sObjectMgr.GetFishingBaseSkillLevel(subzone);
                     if (!zone_skill)
-                        zone_skill = sObjectMgr.GetFishingBaseSkillLevel(zone);
+                        { zone_skill = sObjectMgr.GetFishingBaseSkillLevel(zone); }
 
                     // provide error, no fishable zone or area should be 0
                     if (!zone_skill)
-                        sLog.outErrorDb("Fishable areaId %u are not properly defined in `skill_fishing_base_level`.", subzone);
+                        { sLog.outErrorDb("Fishable areaId %u are not properly defined in `skill_fishing_base_level`.", subzone); }
 
                     int32 skill = player->GetSkillValue(SKILL_FISHING);
                     int32 chance = skill - zone_skill + 5;
@@ -1326,16 +1353,16 @@ void GameObject::Use(Unit* user)
                             // TODO: find reasonable value for fishing hole search
                             fishingHole = LookupFishingHoleAround(20.0f + CONTACT_DISTANCE);
                             if (fishingHole)
-                                success = true;
+                                { success = true; }
                         }
                     }
                     // just search fishhole for success case
                     else
                         // TODO: find reasonable value for fishing hole search
-                        fishingHole = LookupFishingHoleAround(20.0f + CONTACT_DISTANCE);
+                        { fishingHole = LookupFishingHoleAround(20.0f + CONTACT_DISTANCE); }
 
                     if (success || sWorld.getConfig(CONFIG_BOOL_SKILL_FAIL_GAIN_FISHING))
-                        player->UpdateFishingSkill();
+                        { player->UpdateFishingSkill(); }
 
                     // fish catch or fail and junk allowed (after 3.1.0)
                     if (success || sWorld.getConfig(CONFIG_BOOL_SKILL_FAIL_LOOT_FISHING))
@@ -1350,7 +1377,7 @@ void GameObject::Use(Unit* user)
                             SetLootState(GO_JUST_DEACTIVATED);
                         }
                         else
-                            player->SendLoot(GetObjectGuid(), success ? LOOT_FISHING : LOOT_FISHING_FAIL);
+                            { player->SendLoot(GetObjectGuid(), success ? LOOT_FISHING : LOOT_FISHING_FAIL); }
                     }
                     else
                     {
@@ -1380,7 +1407,7 @@ void GameObject::Use(Unit* user)
         case GAMEOBJECT_TYPE_SUMMONING_RITUAL:              // 18
         {
             if (user->GetTypeId() != TYPEID_PLAYER)
-                return;
+                { return; }
 
             Player* player = (Player*)user;
 
@@ -1391,15 +1418,15 @@ void GameObject::Use(Unit* user)
             if (owner)
             {
                 if (owner->GetTypeId() != TYPEID_PLAYER)
-                    return;
+                    { return; }
 
                 // accept only use by player from same group as owner, excluding owner itself (unique use already added in spell effect)
                 if (player == (Player*)owner || (info->summoningRitual.castersGrouped && !player->IsInSameRaidWith(((Player*)owner))))
-                    return;
+                    { return; }
 
                 // expect owner to already be channeling, so if not...
                 if (!owner->GetCurrentSpell(CURRENT_CHANNELED_SPELL))
-                    return;
+                    { return; }
 
                 // in case summoning ritual caster is GO creator
                 spellCaster = owner;
@@ -1411,10 +1438,10 @@ void GameObject::Use(Unit* user)
                     if (Group* group = player->GetGroup())
                     {
                         if (!group->IsMember(m_firstUser))
-                            return;
+                            { return; }
                     }
                     else
-                        return;
+                        { return; }
                 }
 
                 spellCaster = player;
@@ -1432,12 +1459,12 @@ void GameObject::Use(Unit* user)
 
             // full amount unique participants including original summoner, need more
             if (GetUniqueUseCount() < info->summoningRitual.reqParticipants)
-                return;
+                { return; }
 
             // owner is first user for non-wild GO objects, if it offline value already set to current user
             if (!GetOwnerGuid())
                 if (Player* firstUser = GetMap()->GetPlayer(m_firstUser))
-                    spellCaster = firstUser;
+                    { spellCaster = firstUser; }
 
             spellId = info->summoningRitual.spellId;
 
@@ -1450,14 +1477,14 @@ void GameObject::Use(Unit* user)
 
             // finish owners spell
             if (owner)
-                owner->FinishSpell(CURRENT_CHANNELED_SPELL);
+                { owner->FinishSpell(CURRENT_CHANNELED_SPELL); }
 
             // can be deleted now, if
             if (!info->summoningRitual.ritualPersistent)
-                SetLootState(GO_JUST_DEACTIVATED);
+                { SetLootState(GO_JUST_DEACTIVATED); }
             // reset ritual for this GO
             else
-                ClearAllUsesData();
+                { ClearAllUsesData(); }
 
             // go to end function to spell casting
             break;
@@ -1468,16 +1495,16 @@ void GameObject::Use(Unit* user)
 
             GameObjectInfo const* info = GetGOInfo();
             if (!info)
-                return;
+                { return; }
 
             if (info->spellcaster.partyOnly)
             {
                 Unit* caster = GetOwner();
                 if (!caster || caster->GetTypeId() != TYPEID_PLAYER)
-                    return;
+                    { return; }
 
                 if (user->GetTypeId() != TYPEID_PLAYER || !((Player*)user)->IsInSameRaidWith((Player*)caster))
-                    return;
+                    { return; }
             }
 
             spellId = info->spellcaster.spellId;
@@ -1490,7 +1517,7 @@ void GameObject::Use(Unit* user)
             GameObjectInfo const* info = GetGOInfo();
 
             if (user->GetTypeId() != TYPEID_PLAYER)
-                return;
+                { return; }
 
             Player* player = (Player*)user;
 
@@ -1498,16 +1525,16 @@ void GameObject::Use(Unit* user)
 
             // accept only use by player from same group for caster except caster itself
             if (!targetPlayer || targetPlayer == player || !targetPlayer->IsInSameGroupWith(player))
-                return;
+                { return; }
 
             // required lvl checks!
             uint8 level = player->getLevel();
             if (level < info->meetingstone.minLevel || level > info->meetingstone.maxLevel)
-                return;
+                { return; }
 
             level = targetPlayer->getLevel();
             if (level < info->meetingstone.minLevel || level > info->meetingstone.maxLevel)
-                return;
+                { return; }
 
             if (info->id == 194097)
                 spellId = 61994;                            // Ritual of Summoning
@@ -1516,10 +1543,10 @@ void GameObject::Use(Unit* user)
 
             break;
         }
-        case GAMEOBJECT_TYPE_FLAGSTAND:                     // 24
+        case GAMEOBJECT_CreatureTypeFlagsTAND:                     // 24
         {
             if (user->GetTypeId() != TYPEID_PLAYER)
-                return;
+                { return; }
 
             Player* player = (Player*)user;
 
@@ -1528,7 +1555,7 @@ void GameObject::Use(Unit* user)
                 // in battleground check
                 BattleGround* bg = player->GetBattleGround();
                 if (!bg)
-                    return;
+                    { return; }
                 // BG flag click
                 // AB:
                 // 15001
@@ -1544,7 +1571,7 @@ void GameObject::Use(Unit* user)
         case GAMEOBJECT_TYPE_FISHINGHOLE:                   // 25
         {
             if (user->GetTypeId() != TYPEID_PLAYER)
-                return;
+                { return; }
 
             Player* player = (Player*)user;
 
@@ -1555,7 +1582,7 @@ void GameObject::Use(Unit* user)
         case GAMEOBJECT_TYPE_FLAGDROP:                      // 26
         {
             if (user->GetTypeId() != TYPEID_PLAYER)
-                return;
+                { return; }
 
             Player* player = (Player*)user;
 
@@ -1564,7 +1591,7 @@ void GameObject::Use(Unit* user)
                 // in battleground check
                 BattleGround* bg = player->GetBattleGround();
                 if (!bg)
-                    return;
+                    { return; }
                 // BG flag dropped
                 // WS:
                 // 179785 - Silverwing Flag
@@ -1580,7 +1607,7 @@ void GameObject::Use(Unit* user)
                         case 179786:                        // Warsong Flag
                             // check if it's correct bg
                             if (bg->GetTypeID() == BATTLEGROUND_WS)
-                                bg->EventPlayerClickedOnFlag(player, this);
+                                { bg->EventPlayerClickedOnFlag(player, this); }
                             break;
                         case 184142:                        // Netherstorm Flag
                             if (bg->GetTypeID() == BATTLEGROUND_EY)
@@ -1620,7 +1647,7 @@ void GameObject::Use(Unit* user)
     }
 
     if (!spellId)
-        return;
+        { return; }
 
     SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
     if (!spellInfo)
@@ -1647,7 +1674,7 @@ const char* GameObject::GetNameForLocaleIdx(int32 loc_idx) const
         if (cl)
         {
             if (cl->Name.size() > (size_t)loc_idx && !cl->Name[loc_idx].empty())
-                return cl->Name[loc_idx].c_str();
+                { return cl->Name[loc_idx].c_str(); }
         }
     }
 
@@ -1724,24 +1751,24 @@ bool GameObject::IsHostileTo(Unit const* unit) const
 {
     // always non-hostile to GM in GM mode
     if (unit->GetTypeId() == TYPEID_PLAYER && ((Player const*)unit)->isGameMaster())
-        return false;
+        { return false; }
 
     // test owner instead if have
     if (Unit const* owner = GetOwner())
-        return owner->IsHostileTo(unit);
+        { return owner->IsHostileTo(unit); }
 
     if (Unit const* targetOwner = unit->GetCharmerOrOwner())
-        return IsHostileTo(targetOwner);
+        { return IsHostileTo(targetOwner); }
 
     // for not set faction case: be hostile towards player, not hostile towards not-players
     if (!GetGOInfo()->faction)
-        return unit->IsControlledByPlayer();
+        { return unit->IsControlledByPlayer(); }
 
     // faction base cases
     FactionTemplateEntry const* tester_faction = sFactionTemplateStore.LookupEntry(GetGOInfo()->faction);
     FactionTemplateEntry const* target_faction = unit->getFactionTemplateEntry();
     if (!tester_faction || !target_faction)
-        return false;
+        { return false; }
 
     // GvP forced reaction and reputation case
     if (unit->GetTypeId() == TYPEID_PLAYER)
@@ -1750,12 +1777,12 @@ bool GameObject::IsHostileTo(Unit const* unit) const
         {
             // forced reaction
             if (ReputationRank const* force = ((Player*)unit)->GetReputationMgr().GetForcedRankIfAny(tester_faction))
-                return *force <= REP_HOSTILE;
+                { return *force <= REP_HOSTILE; }
 
             // apply reputation state
             FactionEntry const* raw_tester_faction = sFactionStore.LookupEntry(tester_faction->faction);
             if (raw_tester_faction && raw_tester_faction->reputationListID >= 0)
-                return ((Player const*)unit)->GetReputationMgr().GetRank(raw_tester_faction) <= REP_HOSTILE;
+                { return ((Player const*)unit)->GetReputationMgr().GetRank(raw_tester_faction) <= REP_HOSTILE; }
         }
     }
 
@@ -1767,24 +1794,24 @@ bool GameObject::IsFriendlyTo(Unit const* unit) const
 {
     // always friendly to GM in GM mode
     if (unit->GetTypeId() == TYPEID_PLAYER && ((Player const*)unit)->isGameMaster())
-        return true;
+        { return true; }
 
     // test owner instead if have
     if (Unit const* owner = GetOwner())
-        return owner->IsFriendlyTo(unit);
+        { return owner->IsFriendlyTo(unit); }
 
     if (Unit const* targetOwner = unit->GetCharmerOrOwner())
-        return IsFriendlyTo(targetOwner);
+        { return IsFriendlyTo(targetOwner); }
 
     // for not set faction case (wild object) use hostile case
     if (!GetGOInfo()->faction)
-        return false;
+        { return false; }
 
     // faction base cases
     FactionTemplateEntry const* tester_faction = sFactionTemplateStore.LookupEntry(GetGOInfo()->faction);
     FactionTemplateEntry const* target_faction = unit->getFactionTemplateEntry();
     if (!tester_faction || !target_faction)
-        return false;
+        { return false; }
 
     // GvP forced reaction and reputation case
     if (unit->GetTypeId() == TYPEID_PLAYER)
@@ -1793,12 +1820,12 @@ bool GameObject::IsFriendlyTo(Unit const* unit) const
         {
             // forced reaction
             if (ReputationRank const* force = ((Player*)unit)->GetReputationMgr().GetForcedRankIfAny(tester_faction))
-                return *force >= REP_FRIENDLY;
+                { return *force >= REP_FRIENDLY; }
 
             // apply reputation state
             if (FactionEntry const* raw_tester_faction = sFactionStore.LookupEntry(tester_faction->faction))
                 if (raw_tester_faction->reputationListID >= 0)
-                    return ((Player const*)unit)->GetReputationMgr().GetRank(raw_tester_faction) >= REP_FRIENDLY;
+                    { return ((Player const*)unit)->GetReputationMgr().GetRank(raw_tester_faction) >= REP_FRIENDLY; }
         }
     }
 
@@ -1809,12 +1836,18 @@ bool GameObject::IsFriendlyTo(Unit const* unit) const
 void GameObject::SetLootState(LootState state)
 {
     m_lootState = state;
+#ifdef ENABLE_ELUNA
+    sEluna->OnLootStateChanged(this, state);
+#endif /* ENABLE_ELUNA */
     UpdateCollisionState();
 }
 
 void GameObject::SetGoState(GOState state)
 {
     SetByteValue(GAMEOBJECT_BYTES_1, 0, state);
+#ifdef ENABLE_ELUNA
+    sEluna->OnGameObjectStateChanged(this, state);
+#endif /* ENABLE_ELUNA */
     UpdateCollisionState();
 }
 
@@ -1834,7 +1867,7 @@ void GameObject::SetPhaseMask(uint32 newPhaseMask, bool update)
 void GameObject::UpdateCollisionState() const
 {
     if (!m_model || !IsInWorld())
-        return;
+        { return; }
 
     m_model->enable(IsCollisionEnabled() ? GetPhaseMask() : 0);
 }
@@ -1842,12 +1875,12 @@ void GameObject::UpdateCollisionState() const
 void GameObject::UpdateModel()
 {
     if (m_model && IsInWorld() && GetMap()->ContainsGameObjectModel(*m_model))
-        GetMap()->RemoveGameObjectModel(*m_model);
+        { GetMap()->RemoveGameObjectModel(*m_model); }
     delete m_model;
 
     m_model = GameObjectModel::construct(this);
     if (m_model)
-        GetMap()->InsertGameObjectModel(*m_model);
+        { GetMap()->InsertGameObjectModel(*m_model); }
 }
 
 void GameObject::StartGroupLoot(Group* group, uint32 timer)
@@ -1859,10 +1892,10 @@ void GameObject::StartGroupLoot(Group* group, uint32 timer)
 void GameObject::StopGroupLoot()
 {
     if (!m_groupLootId)
-        return;
+        { return; }
 
     if (Group* group = sObjectMgr.GetGroupById(m_groupLootId))
-        group->EndRoll();
+        { group->EndRoll(); }
 
     m_groupLootTimer = 0;
     m_groupLootId = 0;
@@ -1889,18 +1922,18 @@ Player* GameObject::GetLootRecipient() const
 
     // if group not set or disbanded return original recipient player if any
     if (!group)
-        return player;
+        { return player; }
 
     // group case
 
     // return player if it still be in original recipient group
     if (player && player->GetGroup() == group)
-        return player;
+        { return player; }
 
     // find any in group
     for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
         if (Player* newPlayer = itr->getSource())
-            return newPlayer;
+            { return newPlayer; }
 
     return NULL;
 }
@@ -1920,14 +1953,14 @@ void GameObject::SetLootRecipient(Unit* pUnit)
 
     Player* player = pUnit->GetCharmerOrOwnerPlayerOrPlayerItself();
     if (!player)                                            // normal creature, no player involved
-        return;
+        { return; }
 
     // set player for non group case or if group will disbanded
     m_lootRecipientGuid = player->GetObjectGuid();
 
     // set group for group existed case including if player will leave group at loot time
     if (Group* group = player->GetGroup())
-        m_lootGroupRecipientId = group->GetId();
+        { m_lootGroupRecipientId = group->GetId(); }
 }
 
 float GameObject::GetObjectBoundingRadius() const
@@ -1964,7 +1997,7 @@ struct AddGameObjectToRemoveListInMapsWorker
     void operator()(Map* map)
     {
         if (GameObject* pGameobject = map->GetGameObject(i_guid))
-            pGameobject->AddObjectToRemoveList();
+            { pGameobject->AddObjectToRemoveList(); }
     }
 
     ObjectGuid i_guid;
@@ -1995,7 +2028,7 @@ struct SpawnGameObjectInMapsWorker
             else
             {
                 if (pGameobject->isSpawnedByDefault())
-                    map->Add(pGameobject);
+                    { map->Add(pGameobject); }
             }
         }
     }
@@ -2023,22 +2056,22 @@ void GameObject::SetCapturePointSlider(float value)
     if (value >= 0)
     {
         m_captureSlider = value;
-        SetLootState(GO_ACTIVATED);
+        { SetLootState(GO_ACTIVATED); }
     }
     else
         m_captureSlider = -value;
 
     // set the state of the capture point based on the slider value
     if ((int)m_captureSlider == CAPTURE_SLIDER_ALLIANCE)
-        m_captureState = CAPTURE_STATE_WIN_ALLIANCE;
+        { m_captureState = CAPTURE_STATE_WIN_ALLIANCE; }
     else if ((int)m_captureSlider == CAPTURE_SLIDER_HORDE)
-        m_captureState = CAPTURE_STATE_WIN_HORDE;
+        { m_captureState = CAPTURE_STATE_WIN_HORDE; }
     else if (m_captureSlider > CAPTURE_SLIDER_MIDDLE + info->capturePoint.neutralPercent * 0.5f)
-        m_captureState = CAPTURE_STATE_PROGRESS_ALLIANCE;
+        { m_captureState = CAPTURE_STATE_PROGRESS_ALLIANCE; }
     else if (m_captureSlider < CAPTURE_SLIDER_MIDDLE - info->capturePoint.neutralPercent * 0.5f)
-        m_captureState = CAPTURE_STATE_PROGRESS_HORDE;
+        { m_captureState = CAPTURE_STATE_PROGRESS_HORDE; }
     else
-        m_captureState = CAPTURE_STATE_NEUTRAL;
+        { m_captureState = CAPTURE_STATE_NEUTRAL; }
 }
 
 void GameObject::TickCapturePoint()
@@ -2062,9 +2095,9 @@ void GameObject::TickCapturePoint()
     for (std::list<Player*>::iterator itr = capturingPlayers.begin(); itr != capturingPlayers.end(); ++itr)
     {
         if ((*itr)->GetTeam() == ALLIANCE)
-            ++rangePlayers;
+            { ++rangePlayers; }
         else
-            --rangePlayers;
+            { --rangePlayers; }
 
         ObjectGuid guid = (*itr)->GetObjectGuid();
         if (!tempUsers.erase(guid))
@@ -2084,7 +2117,7 @@ void GameObject::TickCapturePoint()
     {
         // send capture point leave packet
         if (Player* owner = GetMap()->GetPlayer(*itr))
-            owner->SendUpdateWorldState(info->capturePoint.worldState1, WORLD_STATE_REMOVE);
+            { owner->SendUpdateWorldState(info->capturePoint.worldState1, WORLD_STATE_REMOVE); }
 
         // player left capture point zone
         m_UniqueUsers.erase(*itr);
@@ -2095,7 +2128,7 @@ void GameObject::TickCapturePoint()
     {
         // set to inactive if all players left capture point zone
         if (m_UniqueUsers.empty())
-            SetActiveObjectState(false);
+            { SetActiveObjectState(false); }
         return;
     }
 
@@ -2105,15 +2138,15 @@ void GameObject::TickCapturePoint()
     // cap speed
     int maxSuperiority = info->capturePoint.maxSuperiority;
     if (rangePlayers > maxSuperiority)
-        rangePlayers = maxSuperiority;
+        { rangePlayers = maxSuperiority; }
     else if (rangePlayers < -maxSuperiority)
-        rangePlayers = -maxSuperiority;
+        { rangePlayers = -maxSuperiority; }
 
     // time to capture from 0% to 100% is maxTime for minSuperiority amount of players and minTime for maxSuperiority amount of players (linear function: y = dy/dx*x+d)
     float deltaSlider = info->capturePoint.minTime;
 
     if (int deltaSuperiority = maxSuperiority - info->capturePoint.minSuperiority)
-        deltaSlider += (float)(maxSuperiority - abs(rangePlayers)) / deltaSuperiority * (info->capturePoint.maxTime - info->capturePoint.minTime);
+        { deltaSlider += (float)(maxSuperiority - abs(rangePlayers)) / deltaSuperiority * (info->capturePoint.maxTime - info->capturePoint.minTime); }
 
     // calculate changed slider value for a duration of 5 seconds (5 * 100%)
     deltaSlider = 500.0f / deltaSlider;
@@ -2124,23 +2157,23 @@ void GameObject::TickCapturePoint()
         progressFaction = ALLIANCE;
         m_captureSlider += deltaSlider;
         if (m_captureSlider > CAPTURE_SLIDER_ALLIANCE)
-            m_captureSlider = CAPTURE_SLIDER_ALLIANCE;
+            { m_captureSlider = CAPTURE_SLIDER_ALLIANCE; }
     }
     else
     {
         progressFaction = HORDE;
         m_captureSlider -= deltaSlider;
         if (m_captureSlider < CAPTURE_SLIDER_HORDE)
-            m_captureSlider = CAPTURE_SLIDER_HORDE;
+            { m_captureSlider = CAPTURE_SLIDER_HORDE; }
     }
 
     // return if slider did not move a whole percent
     if ((int)m_captureSlider == oldValue)
-        return;
+        { return; }
 
     // on retail this is also sent to newly added players even though they already received a slider value
     for (std::list<Player*>::iterator itr = capturingPlayers.begin(); itr != capturingPlayers.end(); ++itr)
-        (*itr)->SendUpdateWorldState(info->capturePoint.worldState2, (uint32)m_captureSlider);
+        { (*itr)->SendUpdateWorldState(info->capturePoint.worldState2, (uint32)m_captureSlider); }
 
     // send capture point events
     uint32 eventId = 0;
@@ -2168,7 +2201,7 @@ void GameObject::TickCapturePoint()
         // handle objective complete
         if (m_captureState == CAPTURE_STATE_NEUTRAL)
             if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript((*capturingPlayers.begin())->GetCachedZoneId()))
-                outdoorPvP->HandleObjectiveComplete(eventId, capturingPlayers, progressFaction);
+                { outdoorPvP->HandleObjectiveComplete(eventId, capturingPlayers, progressFaction); }
 
         // set capture state to alliance
         m_captureState = CAPTURE_STATE_PROGRESS_ALLIANCE;
@@ -2181,7 +2214,7 @@ void GameObject::TickCapturePoint()
         // handle objective complete
         if (m_captureState == CAPTURE_STATE_NEUTRAL)
             if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript((*capturingPlayers.begin())->GetCachedZoneId()))
-                outdoorPvP->HandleObjectiveComplete(eventId, capturingPlayers, progressFaction);
+                { outdoorPvP->HandleObjectiveComplete(eventId, capturingPlayers, progressFaction); }
 
         // set capture state to horde
         m_captureState = CAPTURE_STATE_PROGRESS_HORDE;
@@ -2216,7 +2249,7 @@ void GameObject::TickCapturePoint()
     }
 
     if (eventId)
-        StartEvents_Event(GetMap(), eventId, this, this, true, *capturingPlayers.begin());
+        { StartEvents_Event(GetMap(), eventId, this, this, true, *capturingPlayers.begin()); }
 }
 
 // ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2257,7 +2290,10 @@ void GameObject::ForceGameObjectHealth(int32 diff, Unit* caster)
     if (diff < 0)                                           // Taken damage
     {
         DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "DestructibleGO: %s taken damage %u dealt by %s", GetGuidStr().c_str(), uint32(-diff), caster->GetGuidStr().c_str());
-
+#ifdef ENABLE_ELUNA
+        if (caster && caster->ToPlayer())
+            sEluna->OnDamaged(this, caster->ToPlayer());
+#endif
         if (m_useTimes > uint32(-diff))
             m_useTimes += diff;
         else
@@ -2295,7 +2331,10 @@ void GameObject::ForceGameObjectHealth(int32 diff, Unit* caster)
         if (!HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK_11))     // Was not destroyed before
         {
             DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "DestructibleGO: %s got destroyed", GetGuidStr().c_str());
-
+#ifdef ENABLE_ELUNA
+            if(caster && caster->ToPlayer())
+                sEluna->OnDestroyed(this, caster->ToPlayer());
+#endif
             RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK_9 | GO_FLAG_UNK_10);
             SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK_11);
 
@@ -2345,3 +2384,8 @@ void GameObject::ForceGameObjectHealth(int32 diff, Unit* caster)
     // Set health
     SetGoAnimProgress(GetMaxHealth() ? m_useTimes * 255 / GetMaxHealth() : 255);
 }
+
+uint32 GameObject::GetScriptId()
+{
+    return sScriptMgr.GetBoundScriptId(SCRIPTED_GAMEOBJECT, -int32(GetGUIDLow())) ? sScriptMgr.GetBoundScriptId(SCRIPTED_GAMEOBJECT, -int32(GetGUIDLow())) : sScriptMgr.GetBoundScriptId(SCRIPTED_GAMEOBJECT, GetEntry());
+}
diff --git a/src/game/Object/GameObject.h b/src/game/Object/GameObject.h
index 9d948f998..8e54f7565 100644
--- a/src/game/Object/GameObject.h
+++ b/src/game/Object/GameObject.h
@@ -30,6 +30,7 @@
 #include "Object.h"
 #include "LootMgr.h"
 #include "Database/DatabaseEnv.h"
+#include "Utilities/EventProcessor.h"
 
 // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
@@ -294,7 +295,7 @@ struct GameObjectInfo
             uint32 maxLevel;                                // 1
             uint32 areaID;                                  // 2
         } meetingstone;
-        // 24 GAMEOBJECT_TYPE_FLAGSTAND
+        // 24 GAMEOBJECT_CreatureTypeFlagsTAND
         struct
         {
             uint32 lockId;                                  // 0
@@ -450,7 +451,7 @@ struct GameObjectInfo
             case GAMEOBJECT_TYPE_GOOBER:     return goober.lockId;
             case GAMEOBJECT_TYPE_AREADAMAGE: return areadamage.lockId;
             case GAMEOBJECT_TYPE_CAMERA:     return camera.lockId;
-            case GAMEOBJECT_TYPE_FLAGSTAND:  return flagstand.lockId;
+            case GAMEOBJECT_CreatureTypeFlagsTAND:  return flagstand.lockId;
             case GAMEOBJECT_TYPE_FISHINGHOLE: return fishinghole.lockId;
             case GAMEOBJECT_TYPE_FLAGDROP:   return flagdrop.lockId;
             default: return 0;
@@ -465,7 +466,7 @@ struct GameObjectInfo
             case GAMEOBJECT_TYPE_BUTTON:     return button.noDamageImmune;
             case GAMEOBJECT_TYPE_QUESTGIVER: return questgiver.noDamageImmune;
             case GAMEOBJECT_TYPE_GOOBER:     return goober.noDamageImmune;
-            case GAMEOBJECT_TYPE_FLAGSTAND:  return flagstand.noDamageImmune;
+            case GAMEOBJECT_CreatureTypeFlagsTAND:  return flagstand.noDamageImmune;
             case GAMEOBJECT_TYPE_FLAGDROP:   return flagdrop.noDamageImmune;
             default: return true;
         }
@@ -691,9 +692,9 @@ class  GameObject : public WorldObject
         {
             time_t now = time(NULL);
             if (m_respawnTime > now)
-                return m_respawnTime;
+                { return m_respawnTime; }
             else
-                return now;
+                { return now; }
         }
 
         void SetRespawnTime(time_t respawn)
@@ -799,9 +800,14 @@ class  GameObject : public WorldObject
         void SetCapturePointSlider(float value);
         float GetCapturePointSlider() const { return m_captureSlider; }
 
+        uint32 GetScriptId();
+
         GridReference<GameObject>& GetGridRef() { return m_gridRef; }
 
         GameObjectModel* m_model;
+        
+        // Event Handler
+        EventProcessor m_Events;
 
     protected:
         uint32      m_spellId;
diff --git a/src/game/Object/Item.cpp b/src/game/Object/Item.cpp
index b27557849..026b76a95 100644
--- a/src/game/Object/Item.cpp
+++ b/src/game/Object/Item.cpp
@@ -29,6 +29,9 @@
 #include "Database/DatabaseEnv.h"
 #include "ItemEnchantmentMgr.h"
 #include "SQLStorages.h"
+#ifdef ENABLE_ELUNA
+#include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 void AddItemsSetItem(Player* player, Item* item)
 {
@@ -44,7 +47,7 @@ void AddItemsSetItem(Player* player, Item* item)
     }
 
     if (set->required_skill_id && player->GetSkillValue(set->required_skill_id) < set->required_skill_value)
-        return;
+        { return; }
 
     ItemSetEffect* eff = NULL;
 
@@ -66,12 +69,12 @@ void AddItemsSetItem(Player* player, Item* item)
         size_t x = 0;
         for (; x < player->ItemSetEff.size(); ++x)
             if (!player->ItemSetEff[x])
-                break;
+                { break; }
 
         if (x < player->ItemSetEff.size())
-            player->ItemSetEff[x] = eff;
+            { player->ItemSetEff[x] = eff; }
         else
-            player->ItemSetEff.push_back(eff);
+            { player->ItemSetEff.push_back(eff); }
     }
 
     ++eff->item_count;
@@ -79,18 +82,18 @@ void AddItemsSetItem(Player* player, Item* item)
     for (uint32 x = 0; x < 8; ++x)
     {
         if (!set->spells[x])
-            continue;
+            { continue; }
         // not enough for  spell
         if (set->items_to_triggerspell[x] > eff->item_count)
-            continue;
+            { continue; }
 
         uint32 z = 0;
         for (; z < 8; ++z)
             if (eff->spells[z] && eff->spells[z]->Id == set->spells[x])
-                break;
+                { break; }
 
         if (z < 8)
-            continue;
+            { continue; }
 
         // new spell
         for (uint32 y = 0; y < 8; ++y)
@@ -138,18 +141,18 @@ void RemoveItemsSetItem(Player* player, ItemPrototype const* proto)
 
     // can be in case now enough skill requirement for set appling but set has been appliend when skill requirement not enough
     if (!eff)
-        return;
+        { return; }
 
     --eff->item_count;
 
     for (uint32 x = 0; x < 8; ++x)
     {
         if (!set->spells[x])
-            continue;
+            { continue; }
 
         // enough for spell
         if (set->items_to_triggerspell[x] <= eff->item_count)
-            continue;
+            { continue; }
 
         for (uint32 z = 0; z < 8; ++z)
         {
@@ -174,7 +177,7 @@ void RemoveItemsSetItem(Player* player, ItemPrototype const* proto)
 bool ItemCanGoIntoBag(ItemPrototype const* pProto, ItemPrototype const* pBagProto)
 {
     if (!pProto || !pBagProto)
-        return false;
+        { return false; }
 
     switch (pBagProto->Class)
     {
@@ -185,15 +188,15 @@ bool ItemCanGoIntoBag(ItemPrototype const* pProto, ItemPrototype const* pBagProt
                     return true;
                 case ITEM_SUBCLASS_SOUL_CONTAINER:
                     if (!(pProto->BagFamily & BAG_FAMILY_SOUL_SHARDS))
-                        return false;
+                        { return false; }
                     return true;
                 case ITEM_SUBCLASS_HERB_CONTAINER:
                     if (!(pProto->BagFamily & BAG_FAMILY_HERBS))
-                        return false;
+                        { return false; }
                     return true;
                 case ITEM_SUBCLASS_ENCHANTING_CONTAINER:
                     if (!(pProto->BagFamily & BAG_FAMILY_ENCHANTING_SUPP))
-                        return false;
+                        { return false; }
                     return true;
                 case ITEM_SUBCLASS_MINING_CONTAINER:
                     if (!(pProto->BagFamily & BAG_FAMILY_MINING_SUPP))
@@ -201,7 +204,7 @@ bool ItemCanGoIntoBag(ItemPrototype const* pProto, ItemPrototype const* pBagProt
                     return true;
                 case ITEM_SUBCLASS_ENGINEERING_CONTAINER:
                     if (!(pProto->BagFamily & BAG_FAMILY_ENGINEERING_SUPP))
-                        return false;
+                        { return false; }
                     return true;
                 case ITEM_SUBCLASS_GEM_CONTAINER:
                     if (!(pProto->BagFamily & BAG_FAMILY_GEMS))
@@ -227,11 +230,11 @@ bool ItemCanGoIntoBag(ItemPrototype const* pProto, ItemPrototype const* pBagProt
             {
                 case ITEM_SUBCLASS_QUIVER:
                     if (!(pProto->BagFamily & BAG_FAMILY_ARROWS))
-                        return false;
+                        { return false; }
                     return true;
                 case ITEM_SUBCLASS_AMMO_POUCH:
                     if (!(pProto->BagFamily & BAG_FAMILY_BULLETS))
-                        return false;
+                        { return false; }
                     return true;
                 default:
                     return false;
@@ -383,6 +386,10 @@ Item::Item() :
     m_lootState = ITEM_LOOT_NONE;
 }
 
+Item::~Item()
+{
+}
+
 bool Item::Create(uint32 guidlow, uint32 itemid, Player const* owner)
 {
     Object::_Create(guidlow, 0, HIGHGUID_ITEM);
@@ -395,14 +402,14 @@ bool Item::Create(uint32 guidlow, uint32 itemid, Player const* owner)
 
     ItemPrototype const* itemProto = ObjectMgr::GetItemPrototype(itemid);
     if (!itemProto)
-        return false;
+        { return false; }
 
     SetUInt32Value(ITEM_FIELD_STACK_COUNT, 1);
     SetUInt32Value(ITEM_FIELD_MAXDURABILITY, itemProto->MaxDurability);
     SetUInt32Value(ITEM_FIELD_DURABILITY, itemProto->MaxDurability);
 
     for (int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
-        SetSpellCharges(i, itemProto->Spells[i].SpellCharges);
+        { SetSpellCharges(i, itemProto->Spells[i].SpellCharges); }
 
     SetUInt32Value(ITEM_FIELD_DURATION, itemProto->Duration);
 
@@ -419,12 +426,17 @@ bool Item::IsNotEmptyBag() const
 void Item::UpdateDuration(Player* owner, uint32 diff)
 {
     if (!GetUInt32Value(ITEM_FIELD_DURATION))
-        return;
+        { return; }
 
     // DEBUG_LOG("Item::UpdateDuration Item (Entry: %u Duration %u Diff %u)", GetEntry(), GetUInt32Value(ITEM_FIELD_DURATION), diff);
 
     if (GetUInt32Value(ITEM_FIELD_DURATION) <= diff)
     {
+        // Used by Eluna
+#ifdef ENABLE_ELUNA
+        sEluna->OnExpire(owner, GetProto());
+#endif /* ENABLE_ELUNA */
+        
         if (uint32 newItemId = sObjectMgr.GetItemExpireConvert(GetEntry()))
             owner->ConvertItem(this, newItemId);
         else
@@ -451,7 +463,7 @@ void Item::SaveToDB()
 
             std::ostringstream ss;
             for (uint16 i = 0; i < m_valuesCount; ++i)
-                ss << GetUInt32Value(i) << " ";
+                { ss << GetUInt32Value(i) << " "; }
 
             stmt = CharacterDatabase.CreateStatement(insItem, "INSERT INTO item_instance (guid,owner_guid,data,text) VALUES (?, ?, ?, ?)");
             stmt.PExecute(guid, GetOwnerGuid().GetCounter(), ss.str().c_str(), m_text.c_str());
@@ -465,7 +477,7 @@ void Item::SaveToDB()
 
             std::ostringstream ss;
             for (uint16 i = 0; i < m_valuesCount; ++i)
-                ss << GetUInt32Value(i) << " ";
+                { ss << GetUInt32Value(i) << " "; }
 
             stmt.PExecute(ss.str().c_str(), GetOwnerGuid().GetCounter(), m_text.c_str(), guid);
 
@@ -534,11 +546,11 @@ void Item::SaveToDB()
 
                 LootItem* item = loot.LootItemInSlot(i, owner, &qitem);
                 if (!item)
-                    continue;
+                    { continue; }
 
                 // questitems use the blocked field for other purposes
                 if (!qitem && item->is_blocked)
-                    continue;
+                    { continue; }
 
                 stmt.addUInt32(GetGUIDLow());
                 stmt.addUInt32(owner->GetGUIDLow());
@@ -553,7 +565,7 @@ void Item::SaveToDB()
     }
 
     if (m_lootState != ITEM_LOOT_NONE && m_lootState != ITEM_LOOT_TEMPORARY)
-        SetLootState(ITEM_LOOT_UNCHANGED);
+        { SetLootState(ITEM_LOOT_UNCHANGED); }
 
     SetState(ITEM_UNCHANGED);
 }
@@ -584,14 +596,14 @@ bool Item::LoadFromDB(uint32 guidLow, Field* fields, ObjectGuid ownerGuid)
 
     ItemPrototype const* proto = GetProto();
     if (!proto)
-        return false;
+        { return false; }
 
     // update max durability (and durability) if need
     if (proto->MaxDurability != GetUInt32Value(ITEM_FIELD_MAXDURABILITY))
     {
         SetUInt32Value(ITEM_FIELD_MAXDURABILITY, proto->MaxDurability);
         if (GetUInt32Value(ITEM_FIELD_DURABILITY) > proto->MaxDurability)
-            SetUInt32Value(ITEM_FIELD_DURABILITY, proto->MaxDurability);
+            { SetUInt32Value(ITEM_FIELD_DURABILITY, proto->MaxDurability); }
 
         need_save = true;
     }
@@ -649,7 +661,7 @@ bool Item::LoadFromDB(uint32 guidLow, Field* fields, ObjectGuid ownerGuid)
 
         std::ostringstream ss;
         for (uint16 i = 0; i < m_valuesCount; ++i)
-            ss << GetUInt32Value(i) << " ";
+            { ss << GetUInt32Value(i) << " "; }
 
         stmt.addString(ss);
         stmt.addUInt32(GetOwnerGuid().GetCounter());
@@ -756,15 +768,15 @@ uint32 Item::GetSkill()
     {
         case ITEM_CLASS_WEAPON:
             if (proto->SubClass >= MAX_ITEM_SUBCLASS_WEAPON)
-                return 0;
+                { return 0; }
             else
-                return item_weapon_skills[proto->SubClass];
+                { return item_weapon_skills[proto->SubClass]; }
 
         case ITEM_CLASS_ARMOR:
             if (proto->SubClass >= MAX_ITEM_SUBCLASS_ARMOR)
-                return 0;
+                { return 0; }
             else
-                return item_armor_skills[proto->SubClass];
+                { return item_armor_skills[proto->SubClass]; }
 
         default:
             return 0;
@@ -776,7 +788,7 @@ int32 Item::GenerateItemRandomPropertyId(uint32 item_id)
     ItemPrototype const* itemProto = sItemStorage.LookupEntry<ItemPrototype>(item_id);
 
     if (!itemProto)
-        return 0;
+        { return 0; }
 
     // item must have one from this field values not null if it can have random enchantments
     if ((!itemProto->RandomProperty) && (!itemProto->RandomSuffix))
@@ -813,7 +825,7 @@ int32 Item::GenerateItemRandomPropertyId(uint32 item_id)
 void Item::SetItemRandomProperties(int32 randomPropId)
 {
     if (!randomPropId)
-        return;
+        { return; }
 
     if (randomPropId > 0)
     {
@@ -863,7 +875,7 @@ void Item::SetState(ItemUpdateState state, Player* forplayer)
     {
         // pretend the item never existed
         if (forplayer || GetOwnerGuid())
-            RemoveFromUpdateQueueOf(forplayer);
+            { RemoveFromUpdateQueueOf(forplayer); }
         delete this;
         return;
     }
@@ -871,10 +883,10 @@ void Item::SetState(ItemUpdateState state, Player* forplayer)
     if (state != ITEM_UNCHANGED)
     {
         // new items must stay in new state until saved
-        if (uState != ITEM_NEW) uState = state;
+        if (uState != ITEM_NEW) { uState = state; }
 
         if (forplayer || GetOwnerGuid())
-            AddToUpdateQueueOf(forplayer);
+            { AddToUpdateQueueOf(forplayer); }
     }
     else
     {
@@ -888,7 +900,7 @@ void Item::SetState(ItemUpdateState state, Player* forplayer)
 void Item::AddToUpdateQueueOf(Player* player)
 {
     if (IsInUpdateQueue())
-        return;
+        { return; }
 
     if (!player)
     {
@@ -909,7 +921,7 @@ void Item::AddToUpdateQueueOf(Player* player)
     }
 
     if (player->m_itemUpdateQueueBlocked)
-        return;
+        { return; }
 
     player->m_itemUpdateQueue.push_back(this);
     uQueuePos = player->m_itemUpdateQueue.size() - 1;
@@ -918,7 +930,7 @@ void Item::AddToUpdateQueueOf(Player* player)
 void Item::RemoveFromUpdateQueueOf(Player* player)
 {
     if (!IsInUpdateQueue())
-        return;
+        { return; }
 
     if (!player)
     {
@@ -939,7 +951,7 @@ void Item::RemoveFromUpdateQueueOf(Player* player)
     }
 
     if (player->m_itemUpdateQueueBlocked)
-        return;
+        { return; }
 
     player->m_itemUpdateQueue[uQueuePos] = NULL;
     uQueuePos = -1;
@@ -958,24 +970,23 @@ bool Item::IsEquipped() const
 bool Item::CanBeTraded(bool mail) const
 {
     if ((!mail || !IsBoundAccountWide()) && IsSoulBound())
-        return false;
-
+        { return false; }
     if (IsBag() && (Player::IsBagPos(GetPos()) || !((Bag const*)this)->IsEmpty()))
-        return false;
+        { return false; }
 
     if (Player* owner = GetOwner())
     {
         if (owner->CanUnequipItem(GetPos(), false) !=  EQUIP_ERR_OK)
-            return false;
+            { return false; }
         if (owner->GetLootGuid() == GetObjectGuid())
-            return false;
+            { return false; }
     }
 
     if (HasGeneratedLoot())
-        return false;
+        { return false; }
 
     if (IsBoundByEnchant())
-        return false;
+        { return false; }
 
     return true;
 }
@@ -987,7 +998,7 @@ bool Item::IsBoundByEnchant() const
     {
         uint32 enchant_id = GetEnchantmentId(EnchantmentSlot(enchant_slot));
         if (!enchant_id)
-            continue;
+            { continue; }
 
         if (enchant_slot == TRANSMOGRIFY_ENCHANTMENT_SLOT)
             return true;
@@ -997,10 +1008,10 @@ bool Item::IsBoundByEnchant() const
 
         SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
         if (!enchantEntry)
-            continue;
+            { continue; }
 
         if (enchantEntry->slot & ENCHANTMENT_CAN_SOULBOUND)
-            return true;
+            { return true; }
     }
     return false;
 }
@@ -1032,12 +1043,12 @@ bool Item::IsFitToSpellRequirements(SpellEntry const* spellInfo) const
     if (equippedItems->EquippedItemClass != -1)             // -1 == any item class
     {
         if (equippedItems->EquippedItemClass != int32(proto->Class))
-            return false;                                   //  wrong item class
+            { return false; }                                   //  wrong item class
 
         if (equippedItems->EquippedItemSubClassMask != 0)   // 0 == any subclass
         {
             if ((equippedItems->EquippedItemSubClassMask & (1 << proto->SubClass)) == 0)
-                return false;                               // subclass not present in mask
+                { return false; }                               // subclass not present in mask
         }
     }
 
@@ -1047,7 +1058,7 @@ bool Item::IsFitToSpellRequirements(SpellEntry const* spellInfo) const
     if (equippedItems->EquippedItemInventoryTypeMask != 0 && (spellInfo->GetTargets() & TARGET_FLAG_ITEM))    // 0 == any inventory type
     {
         if ((equippedItems->EquippedItemInventoryTypeMask  & (1 << proto->InventoryType)) == 0)
-            return false;                                   // inventory type not present in mask
+            { return false; }                                   // inventory type not present in mask
     }
 
     return true;
@@ -1058,24 +1069,23 @@ bool Item::IsTargetValidForItemUse(Unit* pUnitTarget)
     ItemRequiredTargetMapBounds bounds = sObjectMgr.GetItemRequiredTargetMapBounds(GetProto()->ItemId);
 
     if (bounds.first == bounds.second)
-        return true;
+        { return true; }
 
     if (!pUnitTarget)
-        return false;
+        { return false; }
 
     for (ItemRequiredTargetMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
         if (itr->second.IsFitToRequirements(pUnitTarget))
-            return true;
+            { return true; }
 
     return false;
 }
 
-
 void Item::SetEnchantment(EnchantmentSlot slot, uint32 id, uint32 duration, uint32 charges, ObjectGuid casterGuid /*= ObjectGuid()*/)
 {
     // Better lost small time at check in comparison lost time at item save to DB.
     if ((GetEnchantmentId(slot) == id) && (GetEnchantmentDuration(slot) == duration) && (GetEnchantmentCharges(slot) == charges))
-        return;
+        { return; }
 
     if (slot < MAX_INSPECTED_ENCHANTMENT_SLOT)
     {
@@ -1096,7 +1106,7 @@ void Item::SetEnchantment(EnchantmentSlot slot, uint32 id, uint32 duration, uint
 void Item::SetEnchantmentDuration(EnchantmentSlot slot, uint32 duration)
 {
     if (GetEnchantmentDuration(slot) == duration)
-        return;
+        { return; }
 
     SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot * MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_DURATION_OFFSET, duration);
     SetState(ITEM_CHANGED);
@@ -1105,7 +1115,7 @@ void Item::SetEnchantmentDuration(EnchantmentSlot slot, uint32 duration)
 void Item::SetEnchantmentCharges(EnchantmentSlot slot, uint32 charges)
 {
     if (GetEnchantmentCharges(slot) == charges)
-        return;
+        { return; }
 
     SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot * MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_CHARGES_OFFSET, charges);
     SetState(ITEM_CHANGED);
@@ -1114,7 +1124,7 @@ void Item::SetEnchantmentCharges(EnchantmentSlot slot, uint32 charges)
 void Item::ClearEnchantment(EnchantmentSlot slot)
 {
     if (!GetEnchantmentId(slot))
-        return;
+        { return; }
 
     for (uint8 x = 0; x < 3; ++x)
         SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot * MAX_ENCHANTMENT_OFFSET + x, 0);
@@ -1136,7 +1146,7 @@ bool Item::GemsFitSockets() const
     bool fits = true;
     for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT + MAX_GEM_SOCKETS; ++enchant_slot)
     {
-        uint8 SocketColor = GetProto()->Socket[enchant_slot - SOCK_ENCHANTMENT_SLOT].Color;
+        uint8 SocketColor = GetProto()->Socket[enchant_slot-SOCK_ENCHANTMENT_SLOT].Color;
 
         uint32 enchant_id = GetEnchantmentId(EnchantmentSlot(enchant_slot));
         if (!enchant_id)
@@ -1226,7 +1236,7 @@ void Item::SendTimeUpdate(Player* owner)
 {
     uint32 duration = GetUInt32Value(ITEM_FIELD_DURATION);
     if (!duration)
-        return;
+        { return; }
 
     WorldPacket data(SMSG_ITEM_TIME_UPDATE, (8 + 4));
     data << ObjectGuid(GetObjectGuid());
@@ -1237,12 +1247,12 @@ void Item::SendTimeUpdate(Player* owner)
 Item* Item::CreateItem(uint32 item, uint32 count, Player const* player, uint32 randomPropertyId)
 {
     if (count < 1)
-        return NULL;                                        // don't create item at zero count
+        { return NULL; }                                        // don't create item at zero count
 
     if (ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(item))
     {
         if (count > pProto->GetMaxStackSize())
-            count = pProto->GetMaxStackSize();
+            { count = pProto->GetMaxStackSize(); }
 
         MANGOS_ASSERT(count != 0 && "pProto->Stackable == 0 but checked at loading already");
 
@@ -1251,12 +1261,12 @@ Item* Item::CreateItem(uint32 item, uint32 count, Player const* player, uint32 r
         {
             pItem->SetCount(count);
             if (uint32 randId = randomPropertyId ? randomPropertyId : Item::GenerateItemRandomPropertyId(item))
-                pItem->SetItemRandomProperties(randId);
+                { pItem->SetItemRandomProperties(randId); }
 
             return pItem;
         }
         else
-            delete pItem;
+            { delete pItem; }
     }
     return NULL;
 }
@@ -1265,7 +1275,7 @@ Item* Item::CloneItem(uint32 count, Player const* player) const
 {
     Item* newItem = CreateItem(GetEntry(), count, player, GetItemRandomPropertyId());
     if (!newItem)
-        return NULL;
+        { return NULL; }
 
     newItem->SetGuidValue(ITEM_FIELD_CREATOR,     GetGuidValue(ITEM_FIELD_CREATOR));
     newItem->SetGuidValue(ITEM_FIELD_GIFTCREATOR, GetGuidValue(ITEM_FIELD_GIFTCREATOR));
@@ -1278,15 +1288,15 @@ bool Item::IsBindedNotWith(Player const* player) const
 {
     // own item
     if (GetOwnerGuid() == player->GetObjectGuid())
-        return false;
+        { return false; }
 
     // has loot with diff owner
     if (HasGeneratedLoot())
-        return true;
+        { return true; }
 
     // not binded item
     if (!IsSoulBound())
-        return false;
+        { return false; }
 
     // not BOA item case
     if (!IsBoundAccountWide())
@@ -1307,19 +1317,19 @@ bool Item::IsBindedNotWith(Player const* player) const
 void Item::AddToClientUpdateList()
 {
     if (Player* pl = GetOwner())
-        pl->GetMap()->AddUpdateObject(this);
+        { pl->GetMap()->AddUpdateObject(this); }
 }
 
 void Item::RemoveFromClientUpdateList()
 {
     if (Player* pl = GetOwner())
-        pl->GetMap()->RemoveUpdateObject(this);
+        { pl->GetMap()->RemoveUpdateObject(this); }
 }
 
 void Item::BuildUpdateData(UpdateDataMapType& update_players)
 {
     if (Player* pl = GetOwner())
-        BuildUpdateDataForPlayer(pl, update_players);
+        { BuildUpdateDataForPlayer(pl, update_players); }
 
     ClearUpdateMask(false);
 }
@@ -1328,15 +1338,15 @@ InventoryResult Item::CanBeMergedPartlyWith(ItemPrototype const* proto) const
 {
     // check item type
     if (GetEntry() != proto->ItemId)
-        return EQUIP_ERR_ITEM_CANT_STACK;
+        { return EQUIP_ERR_ITEM_CANT_STACK; }
 
     // check free space (full stacks can't be target of merge
     if (GetCount() >= proto->GetMaxStackSize())
-        return EQUIP_ERR_ITEM_CANT_STACK;
+        { return EQUIP_ERR_ITEM_CANT_STACK; }
 
     // not allow merge looting currently items
     if (HasGeneratedLoot())
-        return EQUIP_ERR_ALREADY_LOOTED;
+        { return EQUIP_ERR_ALREADY_LOOTED; }
 
     return EQUIP_ERR_OK;
 }
@@ -1344,10 +1354,10 @@ InventoryResult Item::CanBeMergedPartlyWith(ItemPrototype const* proto) const
 bool ItemRequiredTarget::IsFitToRequirements(Unit* pUnitTarget) const
 {
     if (pUnitTarget->GetTypeId() != TYPEID_UNIT)
-        return false;
+        { return false; }
 
     if (pUnitTarget->GetEntry() != m_uiTargetEntry)
-        return false;
+        { return false; }
 
     switch (m_uiType)
     {
@@ -1403,15 +1413,15 @@ void Item::SetLootState(ItemLootUpdateState state)
         case ITEM_LOOT_CHANGED:
             // new loot must stay in new state until saved, temporary must stay until remove
             if (m_lootState != ITEM_LOOT_NEW && m_lootState != ITEM_LOOT_TEMPORARY)
-                m_lootState = m_lootState == ITEM_LOOT_NONE ? ITEM_LOOT_NEW : state;
+                { m_lootState = m_lootState == ITEM_LOOT_NONE ? ITEM_LOOT_NEW : state; }
             break;
         case ITEM_LOOT_UNCHANGED:
             // expected that called after DB update or load
             if (m_lootState == ITEM_LOOT_REMOVED)
-                m_lootState = ITEM_LOOT_NONE;
+                { m_lootState = ITEM_LOOT_NONE; }
             // temporary must stay until remove (ignore any changes)
             else if (m_lootState != ITEM_LOOT_TEMPORARY)
-                m_lootState = ITEM_LOOT_UNCHANGED;
+                { m_lootState = ITEM_LOOT_UNCHANGED; }
             break;
         case ITEM_LOOT_REMOVED:
             // if loot not saved then it existence in past can be just ignored
@@ -1426,7 +1436,12 @@ void Item::SetLootState(ItemLootUpdateState state)
     }
 
     if (m_lootState != ITEM_LOOT_NONE && m_lootState != ITEM_LOOT_UNCHANGED && m_lootState != ITEM_LOOT_TEMPORARY)
-        SetState(ITEM_CHANGED);
+        { SetState(ITEM_CHANGED); }
+}
+
+uint32 Item::GetScriptId() const
+{
+    return sScriptMgr.GetBoundScriptId(SCRIPTED_ITEM, GetEntry());
 }
 
 uint32 Item::GetSpecialPrice(ItemPrototype const* proto, uint32 minimumPrice /*= 10000*/)
diff --git a/src/game/Object/Item.h b/src/game/Object/Item.h
index 4ee7cd03c..80ffd61f5 100644
--- a/src/game/Object/Item.h
+++ b/src/game/Object/Item.h
@@ -283,13 +283,14 @@ struct ItemRequiredTarget
 
 bool ItemCanGoIntoBag(ItemPrototype const* proto, ItemPrototype const* pBagProto);
 
-class  Item : public Object
+class Item : public Object
 {
     public:
         static Item* CreateItem(uint32 item, uint32 count, Player const* player = NULL, uint32 randomPropertyId = 0);
         Item* CloneItem(uint32 count, Player const* player = NULL) const;
 
         Item();
+        ~Item();
 
         virtual bool Create(uint32 guidlow, uint32 itemid, Player const* owner);
 
@@ -397,6 +398,7 @@ class  Item : public Object
         bool HasInvolvedQuest(uint32 /*quest_id*/) const override { return false; }
         bool IsPotion() const { return GetProto()->IsPotion(); }
         bool IsConjuredConsumable() const { return GetProto()->IsConjuredConsumable(); }
+        uint32 GetScriptId() const;
 
         void AddToClientUpdateList() override;
         void RemoveFromClientUpdateList() override;
diff --git a/src/game/Object/Object.cpp b/src/game/Object/Object.cpp
index 0e275df8b..06b56e981 100644
--- a/src/game/Object/Object.cpp
+++ b/src/game/Object/Object.cpp
@@ -49,6 +49,10 @@
 #include "TemporarySummon.h"
 #include "movement/packet_builder.h"
 #include "CreatureLinkingMgr.h"
+#ifdef ENABLE_ELUNA
+#include "LuaEngine.h"
+#include "ElunaEventMgr.h"
+#endif /* ENABLE_ELUNA */
 
 Object::Object()
 {
@@ -93,7 +97,7 @@ void Object::_InitValues()
 void Object::_Create(uint32 guidlow, uint32 entry, HighGuid guidhigh)
 {
     if (!m_uint32Values)
-        _InitValues();
+        { _InitValues(); }
 
     ObjectGuid guid = ObjectGuid(guidhigh, entry, guidlow);
     SetGuidValue(OBJECT_FIELD_GUID, guid);
@@ -109,7 +113,7 @@ void Object::SetObjectScale(float newScale)
 void Object::SendForcedObjectUpdate()
 {
     if (!m_inWorld || !m_objectUpdated)
-        return;
+        { return; }
 
     UpdateDataMapType update_players;
 
@@ -128,14 +132,14 @@ void Object::SendForcedObjectUpdate()
 void Object::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) const
 {
     if (!target)
-        return;
+        { return; }
 
     uint8  updatetype   = UPDATETYPE_CREATE_OBJECT;
     uint16 updateFlags  = m_updateFlag;
 
     /** lower flag1 **/
     if (target == this)                                     // building packet for yourself
-        updateFlags |= UPDATEFLAG_SELF;
+        { updateFlags |= UPDATEFLAG_SELF; }
 
     switch (GetObjectGuid().GetHigh())
     {
@@ -168,7 +172,7 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) c
             {
                 case GAMEOBJECT_TYPE_TRAP:
                 case GAMEOBJECT_TYPE_DUEL_ARBITER:
-                case GAMEOBJECT_TYPE_FLAGSTAND:
+                case GAMEOBJECT_CreatureTypeFlagsTAND:
                 case GAMEOBJECT_TYPE_FLAGDROP:
                     updatetype = UPDATETYPE_CREATE_OBJECT2;
                     break;
@@ -245,7 +249,7 @@ void Object::DestroyForPlayer(Player* target, bool anim) const
     target->GetSession()->SendPacket(&data);
 }
 
-void Object::BuildMovementUpdate(ByteBuffer * data, uint16 updateFlags) const
+void Object::BuildMovementUpdate(ByteBuffer* data, uint16 updateFlags) const
 {
     ObjectGuid Guid = GetObjectGuid();
 
@@ -542,7 +546,7 @@ void Object::BuildMovementUpdate(ByteBuffer * data, uint16 updateFlags) const
 void Object::BuildValuesUpdate(uint8 updatetype, ByteBuffer* data, UpdateMask* updateMask, Player* target) const
 {
     if (!target)
-        return;
+        { return; }
 
     uint32 valuesCount = m_valuesCount;
     if(GetTypeId() == TYPEID_PLAYER && target != this)
@@ -556,7 +560,7 @@ void Object::BuildValuesUpdate(uint8 updatetype, ByteBuffer* data, UpdateMask* u
         if (isType(TYPEMASK_GAMEOBJECT) && !((GameObject*)this)->IsTransport())
         {
             if (((GameObject*)this)->ActivateToQuest(target) || target->isGameMaster())
-                IsActivateToQuest = true;
+                { IsActivateToQuest = true; }
 
             updateMask->SetBit(GAMEOBJECT_DYNAMIC);
         }
@@ -574,7 +578,7 @@ void Object::BuildValuesUpdate(uint8 updatetype, ByteBuffer* data, UpdateMask* u
         if (isType(TYPEMASK_GAMEOBJECT) && !((GameObject*)this)->IsTransport())
         {
             if (((GameObject*)this)->ActivateToQuest(target) || target->isGameMaster())
-                IsActivateToQuest = true;
+                { IsActivateToQuest = true; }
 
             updateMask->SetBit(GAMEOBJECT_DYNAMIC);
             updateMask->SetBit(GAMEOBJECT_BYTES_1);         // why do we need this here?
@@ -619,7 +623,7 @@ void Object::BuildValuesUpdate(uint8 updatetype, ByteBuffer* data, UpdateMask* u
                         if (appendValue & UNIT_NPC_FLAG_STABLEMASTER)
                         {
                             if (target->getClass() != CLASS_HUNTER)
-                                appendValue &= ~UNIT_NPC_FLAG_STABLEMASTER;
+                                { appendValue &= ~UNIT_NPC_FLAG_STABLEMASTER; }
                         }
                     }
 
@@ -731,7 +735,7 @@ void Object::BuildValuesUpdate(uint8 updatetype, ByteBuffer* data, UpdateMask* u
                         *data << uint32(m_uint32Values[index]);
                 }
                 else
-                    *data << m_uint32Values[index];         // other cases
+                    { *data << m_uint32Values[index]; }         // other cases
             }
         }
     }
@@ -753,25 +757,25 @@ void Object::ClearUpdateMask(bool remove)
     if (m_uint32Values)
     {
         for (uint16 index = 0; index < m_valuesCount; ++index)
-            m_changedValues[index] = false;
+            { m_changedValues[index] = false; }
     }
 
     if (m_objectUpdated)
     {
         if (remove)
-            RemoveFromClientUpdateList();
+            { RemoveFromClientUpdateList(); }
         m_objectUpdated = false;
     }
 }
 
 bool Object::LoadValues(const char* data)
 {
-    if (!m_uint32Values) _InitValues();
+    if (!m_uint32Values) { _InitValues(); }
 
     Tokens tokens = StrSplit(data, " ");
 
     if (tokens.size() != m_valuesCount)
-        return false;
+        { return false; }
 
     Tokens::iterator iter;
     int index;
@@ -783,7 +787,7 @@ bool Object::LoadValues(const char* data)
     return true;
 }
 
-void Object::_SetUpdateBits(UpdateMask *updateMask, Player* target) const
+void Object::_SetUpdateBits(UpdateMask* updateMask, Player* target) const
 {
     uint32 valuesCount = m_valuesCount;
     if(GetTypeId() == TYPEID_PLAYER && target != this)
@@ -791,10 +795,10 @@ void Object::_SetUpdateBits(UpdateMask *updateMask, Player* target) const
 
     for (uint16 index = 0; index < valuesCount; ++index )
         if (m_changedValues[index])
-            updateMask->SetBit(index);
+            { updateMask->SetBit(index); }
 }
 
-void Object::_SetCreateBits(UpdateMask *updateMask, Player* target) const
+void Object::_SetCreateBits(UpdateMask* updateMask, Player* target) const
 {
     uint32 valuesCount = m_valuesCount;
     if(GetTypeId() == TYPEID_PLAYER && target != this)
@@ -802,7 +806,7 @@ void Object::_SetCreateBits(UpdateMask *updateMask, Player* target) const
 
     for (uint16 index = 0; index < valuesCount; ++index)
         if (GetUInt32Value(index) != 0)
-            updateMask->SetBit(index);
+            { updateMask->SetBit(index); }
 }
 
 void Object::SetInt32Value(uint16 index, int32 value)
@@ -903,7 +907,7 @@ void Object::SetUInt16Value(uint16 index, uint8 offset, uint16 value)
 void Object::SetStatFloatValue(uint16 index, float value)
 {
     if (value < 0)
-        value = 0.0f;
+        { value = 0.0f; }
 
     SetFloatValue(index, value);
 }
@@ -911,7 +915,7 @@ void Object::SetStatFloatValue(uint16 index, float value)
 void Object::SetStatInt32Value(uint16 index, int32 value)
 {
     if (value < 0)
-        value = 0;
+        { value = 0; }
 
     SetUInt32Value(index, uint32(value));
 }
@@ -921,7 +925,7 @@ void Object::ApplyModUInt32Value(uint16 index, int32 val, bool apply)
     int32 cur = GetUInt32Value(index);
     cur += (apply ? val : -val);
     if (cur < 0)
-        cur = 0;
+        { cur = 0; }
     SetUInt32Value(index, cur);
 }
 
@@ -944,7 +948,7 @@ void Object::ApplyModPositiveFloatValue(uint16 index, float  val, bool apply)
     float cur = GetFloatValue(index);
     cur += (apply ? val : -val);
     if (cur < 0)
-        cur = 0;
+        { cur = 0; }
     SetFloatValue(index, cur);
 }
 
@@ -1052,7 +1056,6 @@ bool Object::PrintEntryError(char const* descr) const
     return false;
 }
 
-
 void Object::BuildUpdateDataForPlayer(Player* pl, UpdateDataMapType& update_players)
 {
     UpdateDataMapType::iterator iter = update_players.find(pl);
@@ -1098,17 +1101,36 @@ void Object::MarkForClientUpdate()
 }
 
 WorldObject::WorldObject() :
-    m_transportInfo(NULL), m_currMap(NULL),
+#ifdef ENABLE_ELUNA
+    elunaEvents(NULL),
+#endif /* ENABLE_ELUNA */
+    m_transportInfo(NULL),
+    m_currMap(NULL),
     m_mapId(0), m_InstanceId(0), m_phaseMask(PHASEMASK_NORMAL),
     m_isActiveObject(false)
 {
 }
 
+WorldObject::~WorldObject()
+{
+#ifdef ENABLE_ELUNA
+    delete elunaEvents;
+    elunaEvents = NULL;
+#endif /* ENABLE_ELUNA */
+}
+
 void WorldObject::CleanupsBeforeDelete()
 {
     RemoveFromWorld();
 }
 
+void WorldObject::Update(uint32 update_diff, uint32 time_diff)
+{
+#ifdef ENABLE_ELUNA
+    elunaEvents->Update(update_diff);
+#endif /* ENABLE_ELUNA */
+}
+
 void WorldObject::_Create(uint32 guidlow, HighGuid guidhigh, uint32 phaseMask)
 {
     Object::_Create(guidlow, 0, guidhigh);
@@ -1123,7 +1145,7 @@ void WorldObject::Relocate(float x, float y, float z, float orientation)
     m_position.o = NormalizeOrientation(orientation);
 
     if (isType(TYPEMASK_UNIT))
-        ((Unit*)this)->m_movementInfo.ChangePosition(x, y, z, orientation);
+        { ((Unit*)this)->m_movementInfo.ChangePosition(x, y, z, orientation); }
 }
 
 void WorldObject::Relocate(float x, float y, float z)
@@ -1133,7 +1155,7 @@ void WorldObject::Relocate(float x, float y, float z)
     m_position.z = z;
 
     if (isType(TYPEMASK_UNIT))
-        ((Unit*)this)->m_movementInfo.ChangePosition(x, y, z, GetOrientation());
+        { ((Unit*)this)->m_movementInfo.ChangePosition(x, y, z, GetOrientation()); }
 }
 
 void WorldObject::SetOrientation(float orientation)
@@ -1141,7 +1163,7 @@ void WorldObject::SetOrientation(float orientation)
     m_position.o = NormalizeOrientation(orientation);
 
     if (isType(TYPEMASK_UNIT))
-        ((Unit*)this)->m_movementInfo.ChangeOrientation(orientation);
+        { ((Unit*)this)->m_movementInfo.ChangeOrientation(orientation); }
 }
 
 uint32 WorldObject::GetZoneId() const
@@ -1254,11 +1276,10 @@ bool WorldObject::_IsWithinDist(WorldObject const* obj, float dist2compare, bool
 
 bool WorldObject::IsWithinLOSInMap(const WorldObject* obj) const
 {
-    if (!IsInMap(obj))
-        return false;
+    if (!IsInMap(obj)) { return false; }
     float ox, oy, oz;
     obj->GetPosition(ox, oy, oz);
-    return IsWithinLOS(ox, oy, oz);
+    return(IsWithinLOS(ox, oy, oz));
 }
 
 bool WorldObject::IsWithinLOS(float ox, float oy, float oz) const
@@ -1309,7 +1330,7 @@ bool WorldObject::IsInRange(WorldObject const* obj, float minRange, float maxRan
     {
         float mindist = minRange + sizefactor;
         if (distsq < mindist * mindist)
-            return false;
+            { return false; }
     }
 
     float maxdist = maxRange + sizefactor;
@@ -1329,7 +1350,7 @@ bool WorldObject::IsInRange2d(float x, float y, float minRange, float maxRange)
     {
         float mindist = minRange + sizefactor;
         if (distsq < mindist * mindist)
-            return false;
+            { return false; }
     }
 
     float maxdist = maxRange + sizefactor;
@@ -1350,7 +1371,7 @@ bool WorldObject::IsInRange3d(float x, float y, float z, float minRange, float m
     {
         float mindist = minRange + sizefactor;
         if (distsq < mindist * mindist)
-            return false;
+            { return false; }
     }
 
     float maxdist = maxRange + sizefactor;
@@ -1360,7 +1381,7 @@ bool WorldObject::IsInRange3d(float x, float y, float z, float minRange, float m
 float WorldObject::GetAngle(const WorldObject* obj) const
 {
     if (!obj)
-        return 0.0f;
+        { return 0.0f; }
 
     // Rework the assert, when more cases where such a call can happen have been fixed
     // MANGOS_ASSERT(obj != this || PrintEntryError("GetAngle (for self)"));
@@ -1387,7 +1408,7 @@ bool WorldObject::HasInArc(const float arcangle, const WorldObject* obj) const
 {
     // always have self in arc
     if (obj == this)
-        return true;
+        { return true; }
 
     float arc = arcangle;
 
@@ -1400,7 +1421,7 @@ bool WorldObject::HasInArc(const float arcangle, const WorldObject* obj) const
     // move angle to range -pi ... +pi
     angle = NormalizeOrientation(angle);
     if (angle > M_PI_F)
-        angle -= 2.0f * M_PI_F;
+        { angle -= 2.0f * M_PI_F; }
 
     float lborder =  -1 * (arc / 2.0f);                     // in range -pi..0
     float rborder = (arc / 2.0f);                           // in range 0..pi
@@ -1454,7 +1475,7 @@ void WorldObject::UpdateGroundPositionZ(float x, float y, float& z) const
 {
     float new_z = GetMap()->GetHeight(GetPhaseMask(), x, y, z);
     if (new_z > INVALID_HEIGHT)
-        z = new_z + 0.05f;                                  // just to be sure that we are not a few pixel under the surface
+        { z = new_z + 0.05f; }                                  // just to be sure that we are not a few pixel under the surface
 }
 
 void WorldObject::UpdateAllowedPositionZ(float x, float y, float& z) const
@@ -1475,16 +1496,16 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float& z) const
                 if (max_z > INVALID_HEIGHT)
                 {
                     if (z > max_z)
-                        z = max_z;
+                        { z = max_z; }
                     else if (z < ground_z)
-                        z = ground_z;
+                        { z = ground_z; }
                 }
             }
             else
             {
                 float ground_z = GetMap()->GetHeight(GetPhaseMask(), x, y, z);
                 if (z < ground_z)
-                    z = ground_z;
+                    { z = ground_z; }
             }
             break;
         }
@@ -1498,9 +1519,9 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float& z) const
                 if (max_z > INVALID_HEIGHT)
                 {
                     if (z > max_z)
-                        z = max_z;
+                        { z = max_z; }
                     else if (z < ground_z)
-                        z = ground_z;
+                        { z = ground_z; }
                 }
             }
             else
@@ -1515,7 +1536,7 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float& z) const
         {
             float ground_z = GetMap()->GetHeight(GetPhaseMask(), x, y, z);
             if (ground_z > INVALID_HEIGHT)
-                z = ground_z;
+                { z = ground_z; }
             break;
         }
     }
@@ -1551,7 +1572,7 @@ void WorldObject::MonsterTextEmote(const char* text, Unit const* target, bool Is
 void WorldObject::MonsterWhisper(const char* text, Unit const* target, bool IsBossWhisper) const
 {
     if (!target || target->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     WorldPacket data(SMSG_MESSAGECHAT, 200);
     BuildMonsterChat(&data, GetObjectGuid(), IsBossWhisper ? CHAT_MSG_RAID_BOSS_WHISPER : CHAT_MSG_MONSTER_WHISPER, text, LANG_UNIVERSAL,
@@ -1666,14 +1687,14 @@ void WorldObject::SendMessageToSet(WorldPacket* data, bool /*bToSelf*/) const
 {
     // if object is in world, map for it already created!
     if (IsInWorld())
-        GetMap()->MessageBroadcast(this, data);
+        { GetMap()->MessageBroadcast(this, data); }
 }
 
 void WorldObject::SendMessageToSetInRange(WorldPacket* data, float dist, bool /*bToSelf*/) const
 {
     // if object is in world, map for it already created!
     if (IsInWorld())
-        GetMap()->MessageDistBroadcast(this, data, dist);
+        { GetMap()->MessageDistBroadcast(this, data, dist); }
 }
 
 void WorldObject::SendMessageToSetExcept(WorldPacket* data, Player const* skipped_receiver) const
@@ -1708,6 +1729,17 @@ void WorldObject::SetMap(Map* map)
     // lets save current map's Id/instanceId
     m_mapId = map->GetId();
     m_InstanceId = map->GetInstanceId();
+
+#ifdef ENABLE_ELUNA
+    delete elunaEvents;
+    // On multithread replace this with a pointer to map's Eluna pointer stored in a map
+    elunaEvents = new ElunaEventProcessor(&Eluna::GEluna, this);
+#endif
+
+#ifdef ENABLE_ELUNA
+    delete elunaEvents;
+    elunaEvents = NULL;
+#endif
 }
 
 TerrainInfo const* WorldObject::GetTerrain() const
@@ -1734,12 +1766,12 @@ Creature* WorldObject::SummonCreature(uint32 id, float x, float y, float z, floa
 
     Team team = TEAM_NONE;
     if (GetTypeId() == TYPEID_PLAYER)
-        team = ((Player*)this)->GetTeam();
+        { team = ((Player*)this)->GetTeam(); }
 
     CreatureCreatePos pos(GetMap(), x, y, z, ang, GetPhaseMask());
 
     if (x == 0.0f && y == 0.0f && z == 0.0f)
-        pos = CreatureCreatePos(this, GetOrientation(), CONTACT_DISTANCE, ang);
+        { pos = CreatureCreatePos(this, GetOrientation(), CONTACT_DISTANCE, ang); }
 
     if (!pCreature->Create(GetMap()->GenerateLocalLowGuid(cinfo->GetHighGuid()), pos, cinfo, team))
     {
@@ -1755,11 +1787,16 @@ Creature* WorldObject::SummonCreature(uint32 id, float x, float y, float z, floa
     pCreature->Summon(spwtype, despwtime);                  // Also initializes the AI and MMGen
 
     if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->AI())
-        ((Creature*)this)->AI()->JustSummoned(pCreature);
+        { ((Creature*)this)->AI()->JustSummoned(pCreature); }
+    
+#ifdef ENABLE_ELUNA
+    if (Unit* summoner = ToUnit())
+        sEluna->OnSummoned(pCreature, summoner);
+#endif /* ENABLE_ELUNA */
 
     // Creature Linking, Initial load is handled like respawn
     if (pCreature->IsLinkingEventTrigger())
-        GetMap()->GetCreatureLinkingHolder()->DoCreatureLinkingEvent(LINKING_EVENT_RESPAWN, pCreature);
+        { GetMap()->GetCreatureLinkingHolder()->DoCreatureLinkingEvent(LINKING_EVENT_RESPAWN, pCreature); }
 
     // return the creature therewith the summoner has access to it
     return pCreature;
@@ -1771,7 +1808,7 @@ GameObject* WorldObject::SummonGameObject(uint32 id, float x, float y, float z,
 
     Map *map = GetMap();
 
-    if (!map)
+    if(!map)
         return NULL;
 
     if (!pGameObj->Create(map->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), id, map, GetPhaseMask(), x, y, z, angle))
@@ -1780,7 +1817,7 @@ GameObject* WorldObject::SummonGameObject(uint32 id, float x, float y, float z,
         return NULL;
     }
 
-    pGameObj->SetRespawnTime(despwtime / IN_MILLISECONDS);
+    pGameObj->SetRespawnTime(despwtime/IN_MILLISECONDS);
 
     map->Add(pGameObj);
 
@@ -1805,7 +1842,7 @@ namespace MaNGOS
             {
                 // skip self or target
                 if (c == i_searcher || c == &i_object)
-                    return;
+                    { return; }
 
                 float x, y, z;
 
@@ -1823,7 +1860,7 @@ namespace MaNGOS
             {
                 // skip self or target
                 if (u == i_searcher || u == &i_object)
-                    return;
+                    { return; }
 
                 float x, y;
 
@@ -1843,21 +1880,21 @@ namespace MaNGOS
                 // It is ok for the objects to require a bit more space
                 float delta = u->GetObjectBoundingRadius();
                 if (i_selector.m_searchPosFor && i_selector.m_searchPosFor != u)
-                    delta += i_selector.m_searchPosFor->GetObjectBoundingRadius();
+                    { delta += i_selector.m_searchPosFor->GetObjectBoundingRadius(); }
 
                 delta *= OCCUPY_POS_DEPTH_FACTOR;           // Increase by factor
 
                 // u is too near/far away from i_object. Do not consider it to occupy space
                 if (fabs(i_selector.m_searcherDist - dist2d) > delta)
-                    return;
+                    { return; }
 
                 float angle = i_object.GetAngle(u) - i_absAngle;
 
                 // move angle to range -pi ... +pi, range before is -2Pi..2Pi
                 if (angle > M_PI_F)
-                    angle -= 2.0f * M_PI_F;
+                    { angle -= 2.0f * M_PI_F; }
                 else if (angle < -M_PI_F)
-                    angle += 2.0f * M_PI_F;
+                    { angle += 2.0f * M_PI_F; }
 
                 i_selector.AddUsedArea(u, angle, dist2d);
             }
@@ -1891,7 +1928,7 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float& x, float& y,
         if (searcher)
             searcher->UpdateAllowedPositionZ(x, y, z);      // update to LOS height if available
         else
-            UpdateGroundPositionZ(x, y, z);
+            { UpdateGroundPositionZ(x, y, z); }
         return;
     }
 
@@ -1919,10 +1956,10 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float& x, float& y,
         if (searcher)
             searcher->UpdateAllowedPositionZ(x, y, z);      // update to LOS height if available
         else
-            UpdateGroundPositionZ(x, y, z);
+            { UpdateGroundPositionZ(x, y, z); }
 
         if (fabs(init_z - z) < dist && IsWithinLOS(x, y, z))
-            return;
+            { return; }
 
         first_los_conflict = true;                          // first point have LOS problems
     }
@@ -1941,10 +1978,10 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float& x, float& y,
         if (searcher)
             searcher->UpdateAllowedPositionZ(x, y, z);      // update to LOS height if available
         else
-            UpdateGroundPositionZ(x, y, z);
+            { UpdateGroundPositionZ(x, y, z); }
 
         if (fabs(init_z - z) < dist && IsWithinLOS(x, y, z))
-            return;
+            { return; }
     }
 
     // BAD NEWS: not free pos (or used or have LOS problems)
@@ -1957,7 +1994,7 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float& x, float& y,
         if (searcher)
             searcher->UpdateAllowedPositionZ(x, y, z);      // update to LOS height if available
         else
-            UpdateGroundPositionZ(x, y, z);
+            { UpdateGroundPositionZ(x, y, z); }
         return;
     }
 
@@ -1973,10 +2010,10 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float& x, float& y,
         if (searcher)
             searcher->UpdateAllowedPositionZ(x, y, z);      // update to LOS height if available
         else
-            UpdateGroundPositionZ(x, y, z);
+            { UpdateGroundPositionZ(x, y, z); }
 
         if (fabs(init_z - z) < dist && IsWithinLOS(x, y, z))
-            return;
+            { return; }
     }
 
     // BAD BAD NEWS: all found pos (free and used) have LOS problem :(
@@ -1986,7 +2023,7 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float& x, float& y,
     if (searcher)
         searcher->UpdateAllowedPositionZ(x, y, z);          // update to LOS height if available
     else
-        UpdateGroundPositionZ(x, y, z);
+        { UpdateGroundPositionZ(x, y, z); }
 }
 
 void WorldObject::SetPhaseMask(uint32 newPhaseMask, bool update)
@@ -2004,9 +2041,9 @@ void WorldObject::PlayDistanceSound(uint32 sound_id, Player const* target /*= NU
     data << GetObjectGuid();
     data << GetObjectGuid();
     if (target)
-        target->SendDirectMessage(&data);
+        { target->SendDirectMessage(&data); }
     else
-        SendMessageToSet(&data, true);
+        { SendMessageToSet(&data, true); }
 }
 
 void WorldObject::PlayDirectSound(uint32 sound_id, Player const* target /*= NULL*/) const
@@ -2020,6 +2057,16 @@ void WorldObject::PlayDirectSound(uint32 sound_id, Player const* target /*= NULL
         SendMessageToSet(&data, true);
 }
 
+void WorldObject::PlayMusic(uint32 sound_id, Player const* target /*= NULL*/) const
+{
+    WorldPacket data(SMSG_PLAY_MUSIC, 4);
+    data << uint32(sound_id);
+    if (target)
+        { target->SendDirectMessage(&data); }
+    else
+        { SendMessageToSet(&data, true); }
+}
+
 void WorldObject::UpdateVisibilityAndView()
 {
     GetViewPoint().Call_UpdateVisibilityForOwner();
@@ -2054,7 +2101,7 @@ struct WorldObjectChangeAccumulator
         // send self fields changes in another way, otherwise
         // with new camera system when player's camera too far from player, camera wouldn't receive packets and changes from player
         if (i_object.isType(TYPEMASK_PLAYER))
-            i_object.BuildUpdateDataForPlayer((Player*)&i_object, i_updateDatas);
+            { i_object.BuildUpdateDataForPlayer((Player*)&i_object, i_updateDatas); }
     }
 
     void Visit(CameraMapType& m)
@@ -2063,7 +2110,7 @@ struct WorldObjectChangeAccumulator
         {
             Player* owner = iter->getSource()->GetOwner();
             if (owner != &i_object && owner->HaveAtClient(&i_object))
-                i_object.BuildUpdateDataForPlayer(owner, i_updateDatas);
+                { i_object.BuildUpdateDataForPlayer(owner, i_updateDatas); }
         }
     }
 
@@ -2105,16 +2152,16 @@ bool WorldObject::PrintCoordinatesError(float x, float y, float z, char const* d
 void WorldObject::SetActiveObjectState(bool active)
 {
     if (m_isActiveObject == active || (isType(TYPEMASK_PLAYER) && !active))  // player shouldn't became inactive, never
-        return;
+        { return; }
 
     if (IsInWorld() && !isType(TYPEMASK_PLAYER))
         // player's update implemented in a different from other active worldobject's way
         // it's considired to use generic way in future
     {
         if (isActiveObject() && !active)
-            GetMap()->RemoveFromActive(this);
+            { GetMap()->RemoveFromActive(this); }
         else if (!isActiveObject() && active)
-            GetMap()->AddToActive(this);
+            { GetMap()->AddToActive(this); }
     }
     m_isActiveObject = active;
 }
diff --git a/src/game/Object/Object.h b/src/game/Object/Object.h
index c7cdaab69..492f81911 100644
--- a/src/game/Object/Object.h
+++ b/src/game/Object/Object.h
@@ -22,8 +22,8 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#ifndef _OBJECT_H
-#define _OBJECT_H
+#ifndef MANGOS_H_OBJECT
+#define MANGOS_H_OBJECT
 
 #include "Common.h"
 #include "ByteBuffer.h"
@@ -39,13 +39,13 @@
 #define CONTACT_DISTANCE            0.5f
 #define INTERACTION_DISTANCE        5.0f
 #define ATTACK_DISTANCE             5.0f
-#define MAX_VISIBILITY_DISTANCE     333.0f      // max distance for visible object show, limited in 333 yards
-#define DEFAULT_VISIBILITY_DISTANCE 90.0f       // default visible distance, 90 yards on continents
-#define DEFAULT_VISIBILITY_INSTANCE 120.0f      // default visible distance in instances, 120 yards
-#define DEFAULT_VISIBILITY_BGARENAS 180.0f      // default visible distance in BG/Arenas, 180 yards
+#define MAX_VISIBILITY_DISTANCE     333.0f                  // max distance for visible object show, limited in 333 yards
+#define DEFAULT_VISIBILITY_DISTANCE 90.0f                   // default visible distance, 90 yards on continents
+#define DEFAULT_VISIBILITY_INSTANCE 120.0f                  // default visible distance in instances, 120 yards
+#define DEFAULT_VISIBILITY_BGARENAS 180.0f                  // default visible distance in BG/Arenas, 180 yards
 
 #define DEFAULT_WORLD_OBJECT_SIZE   0.388999998569489f      // currently used (correctly?) for any non Unit world objects. This is actually the bounding_radius, like player/creature from creature_model_data
-#define DEFAULT_OBJECT_SCALE        1.0f                    // player/item scale as default, npc/go from database, pets from dbc
+#define DEFAULT_OBJECT_SCALE        1.0f                    // player/item Scale as default, npc/go from database, pets from dbc
 
 #define MAX_STEALTH_DETECT_RANGE    45.0f
 
@@ -73,6 +73,7 @@ class WorldPacket;
 class UpdateData;
 class WorldSession;
 class Creature;
+class GameObject;
 class Player;
 class Unit;
 class Group;
@@ -84,6 +85,7 @@ class TerrainInfo;
 class ElunaEventProcessor;
 #endif /* ENABLE_ELUNA */
 class TransportInfo;
+struct MangosStringLocale;
 
 typedef UNORDERED_MAP<Player*, UpdateData> UpdateDataMapType;
 
@@ -107,6 +109,7 @@ struct WorldLocation
         : mapid(loc.mapid), coord_x(loc.coord_x), coord_y(loc.coord_y), coord_z(loc.coord_z), orientation(NormalizeOrientation(loc.orientation)) {}
 };
 
+
 // use this class to measure time between world update ticks
 // essential for units updating their spells after cells become active
 class WorldUpdateCounter
@@ -117,7 +120,7 @@ class WorldUpdateCounter
         time_t timeElapsed()
         {
             if (!m_tmStart)
-                m_tmStart = WorldTimer::tickPrevTime();
+                { m_tmStart = WorldTimer::tickPrevTime(); }
 
             return WorldTimer::getMSTimeDiff(m_tmStart, WorldTimer::tickTime());
         }
@@ -128,7 +131,7 @@ class WorldUpdateCounter
         uint32 m_tmStart;
 };
 
-class  Object
+class Object
 {
     public:
         virtual ~Object();
@@ -137,7 +140,7 @@ class  Object
         virtual void AddToWorld()
         {
             if (m_inWorld)
-                return;
+                { return; }
 
             m_inWorld = true;
 
@@ -243,8 +246,8 @@ class  Object
         DynamicObject const* ToDynObject() const { if (GetTypeId() == TYPEID_DYNAMICOBJECT) return reinterpret_cast<DynamicObject const*>(this); else return NULL; }
 
         void SetInt32Value(uint16 index,        int32  value);
-        void SetUInt32Value(uint16 index, uint32  value);
-        void UpdateUInt32Value(uint16 index, uint32  value);
+        void SetUInt32Value(uint16 index,       uint32  value);
+        void UpdateUInt32Value(uint16 index,    uint32  value);
         void SetUInt64Value(uint16 index, const uint64& value);
         void SetFloatValue(uint16 index,       float   value);
         void SetByteValue(uint16 index, uint8 offset, uint8 value);
@@ -272,11 +275,19 @@ class  Object
         void ToggleFlag(uint16 index, uint32 flag)
         {
             if (HasFlag(index, flag))
-                RemoveFlag(index, flag);
+                { RemoveFlag(index, flag); }
             else
-                SetFlag(index, flag);
+                { SetFlag(index, flag); }
         }
 
+        /**
+         * Checks if a certain flag is set.
+         * @param index The index to check, values may originate from at least \ref EUnitFields
+         * @param flag Which flag to check, value may originate from a lot of places, see code
+         * for examples of what
+         * @return true if the flag is set, false otherwise
+         * \todo More info on these flags and where they come from, also, which indexes can be used?
+         */
         bool HasFlag(uint16 index, uint32 flag) const
         {
             MANGOS_ASSERT(index < m_valuesCount || PrintIndexError(index , false));
@@ -286,9 +297,9 @@ class  Object
         void ApplyModFlag(uint16 index, uint32 flag, bool apply)
         {
             if (apply)
-                SetFlag(index, flag);
+                { SetFlag(index, flag); }
             else
-                RemoveFlag(index, flag);
+                { RemoveFlag(index, flag); }
         }
 
         void SetByteFlag(uint16 index, uint8 offset, uint8 newFlag);
@@ -297,9 +308,9 @@ class  Object
         void ToggleByteFlag(uint16 index, uint8 offset, uint8 flag)
         {
             if (HasByteFlag(index, offset, flag))
-                RemoveByteFlag(index, offset, flag);
+                { RemoveByteFlag(index, offset, flag); }
             else
-                SetByteFlag(index, offset, flag);
+                { SetByteFlag(index, offset, flag); }
         }
 
         bool HasByteFlag(uint16 index, uint8 offset, uint8 flag) const
@@ -312,9 +323,9 @@ class  Object
         void ApplyModByteFlag(uint16 index, uint8 offset, uint32 flag, bool apply)
         {
             if (apply)
-                SetByteFlag(index, offset, flag);
+                { SetByteFlag(index, offset, flag); }
             else
-                RemoveByteFlag(index, offset, flag);
+                { RemoveByteFlag(index, offset, flag); }
         }
 
         void SetShortFlag(uint16 index, bool highpart, uint16 newFlag);
@@ -323,9 +334,9 @@ class  Object
         void ToggleShortFlag(uint16 index, bool highpart, uint8 flag)
         {
             if (HasShortFlag(index, highpart, flag))
-                RemoveShortFlag(index, highpart, flag);
+                { RemoveShortFlag(index, highpart, flag); }
             else
-                SetShortFlag(index, highpart, flag);
+                { SetShortFlag(index, highpart, flag); }
         }
 
         bool HasShortFlag(uint16 index, bool highpart, uint8 flag) const
@@ -337,9 +348,9 @@ class  Object
         void ApplyModShortFlag(uint16 index, bool highpart, uint32 flag, bool apply)
         {
             if (apply)
-                SetShortFlag(index, highpart, flag);
+                { SetShortFlag(index, highpart, flag); }
             else
-                RemoveShortFlag(index, highpart, flag);
+                { RemoveShortFlag(index, highpart, flag); }
         }
 
         void SetFlag64(uint16 index, uint64 newFlag)
@@ -359,9 +370,9 @@ class  Object
         void ToggleFlag64(uint16 index, uint64 flag)
         {
             if (HasFlag64(index, flag))
-                RemoveFlag64(index, flag);
+                { RemoveFlag64(index, flag); }
             else
-                SetFlag64(index, flag);
+                { SetFlag64(index, flag); }
         }
 
         bool HasFlag64(uint16 index, uint64 flag) const
@@ -373,9 +384,9 @@ class  Object
         void ApplyModFlag64(uint16 index, uint64 flag, bool apply)
         {
             if (apply)
-                SetFlag64(index, flag);
+                { SetFlag64(index, flag); }
             else
-                RemoveFlag64(index, flag);
+                { RemoveFlag64(index, flag); }
         }
 
         void ClearUpdateMask(bool remove);
@@ -435,7 +446,7 @@ class  Object
 
 struct WorldObjectChangeAccumulator;
 
-class  WorldObject : public Object
+class WorldObject : public Object
 {
         friend struct WorldObjectChangeAccumulator;
 
@@ -443,7 +454,7 @@ class  WorldObject : public Object
 
         // class is used to manipulate with WorldUpdateCounter
         // it is needed in order to get time diff between two object's Update() calls
-        class  UpdateHelper
+        class UpdateHelper
         {
             public:
                 explicit UpdateHelper(WorldObject* obj) : m_obj(obj) {}
@@ -462,9 +473,9 @@ class  WorldObject : public Object
                 WorldObject* const m_obj;
         };
 
-        virtual ~WorldObject() {}
+        virtual ~WorldObject();
 
-        virtual void Update(uint32 /*update_diff*/, uint32 /*time_diff*/) {}
+        virtual void Update(uint32 /*update_diff*/, uint32 /*time_diff*/);
 
         void _Create(uint32 guidlow, HighGuid guidhigh, uint32 phaseMask);
 
@@ -485,6 +496,7 @@ class  WorldObject : public Object
         void GetPosition(WorldLocation& loc) const
         { loc.mapid = m_mapId; GetPosition(loc.coord_x, loc.coord_y, loc.coord_z); loc.orientation = GetOrientation(); }
         float GetOrientation() const { return m_position.o; }
+
         /// Gives a 2d-point in distance distance2d in direction absAngle around the current position (point-to-point)
         void GetNearPoint2D(float& x, float& y, float distance2d, float absAngle) const;
         /** Gives a "free" spot for searcher in distance distance2d in direction absAngle on "good" height
@@ -602,6 +614,7 @@ class  WorldObject : public Object
 
         void PlayDistanceSound(uint32 sound_id, Player const* target = NULL) const;
         void PlayDirectSound(uint32 sound_id, Player const* target = NULL) const;
+        void PlayMusic(uint32 sound_id, Player const* target = NULL) const;
 
         void SendObjectDeSpawnAnim(ObjectGuid guid);
         void SendGameObjectCustomAnim(ObjectGuid guid, uint32 animId = 0);
@@ -645,8 +658,7 @@ class  WorldObject : public Object
         // ASSERT print helper
         bool PrintCoordinatesError(float x, float y, float z, char const* descr) const;
 
-        virtual void StartGroupLoot(Group* /*group*/, uint32 /*timer*/) {}
-
+        virtual void StartGroupLoot(Group* /*group*/, uint32 /*timer*/) { }
 #ifdef ENABLE_ELUNA
         ElunaEventProcessor* elunaEvents;
 #endif /* ENABLE_ELUNA */
diff --git a/src/game/Object/ObjectMgr.cpp b/src/game/Object/ObjectMgr.cpp
index a6394361b..478f9f864 100644
--- a/src/game/Object/ObjectMgr.cpp
+++ b/src/game/Object/ObjectMgr.cpp
@@ -585,13 +585,13 @@ void ObjectMgr::LoadCreatureTemplates()
         if (!ok)
             continue;
 
-        FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(cInfo->faction_A);
+        FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(cInfo->FactionAlliance);
         if (!factionTemplate)
-            sLog.outErrorDb("Creature (Entry: %u) has nonexistent faction_A template (%u)", cInfo->Entry, cInfo->faction_A);
+            sLog.outErrorDb("Creature (Entry: %u) has nonexistent factionAlliance template (%u)", cInfo->Entry, cInfo->FactionAlliance);
 
-        factionTemplate = sFactionTemplateStore.LookupEntry(cInfo->faction_H);
+        factionTemplate = sFactionTemplateStore.LookupEntry(cInfo->FactionHorde);
         if (!factionTemplate)
-            sLog.outErrorDb("Creature (Entry: %u) has nonexistent faction_H template (%u)", cInfo->Entry, cInfo->faction_H);
+            sLog.outErrorDb("Creature (Entry: %u) has nonexistent factionHorde template (%u)", cInfo->Entry, cInfo->FactionHorde);
 
         for (int k = 0; k < MAX_KILL_CREDIT; ++k)
         {
@@ -605,7 +605,7 @@ void ObjectMgr::LoadCreatureTemplates()
             }
         }
 
-        // used later for scale
+        // used later for Scale
         CreatureDisplayInfoEntry const* displayScaleEntry = NULL;
 
         for (int i = 0; i < MAX_CREATURE_MODEL; ++i)
@@ -701,18 +701,18 @@ void ObjectMgr::LoadCreatureTemplates()
             const_cast<CreatureInfo*>(cInfo)->MovementType = IDLE_MOTION_TYPE;
         }
 
-        if (cInfo->vehicleId && !sVehicleStore.LookupEntry(cInfo->vehicleId))
+        if (cInfo->VehicleTemplateId && !sVehicleStore.LookupEntry(cInfo->VehicleTemplateId))
         {
-            sLog.outErrorDb("Creature (Entry: %u) has non-existing vehicle_id (%u), set to 0.", cInfo->Entry, cInfo->vehicleId);
-            const_cast<CreatureInfo*>(cInfo)->vehicleId = 0;
+            sLog.outErrorDb("Creature (Entry: %u) has non-existing vehicle_id (%u), set to 0.", cInfo->Entry, cInfo->VehicleTemplateId);
+            const_cast<CreatureInfo*>(cInfo)->VehicleTemplateId = 0;
         }
 
-        if (cInfo->equipmentId > 0)                         // 0 no equipment
+        if (cInfo->EquipmentTemplateId > 0)                         // 0 no equipment
         {
-            if (!GetEquipmentInfo(cInfo->equipmentId))
+            if (!GetEquipmentInfo(cInfo->EquipmentTemplateId))
             {
-                sLog.outErrorDb("Table `creature_template` have creature (Entry: %u) with equipment_id %u not found in table `creature_equip_template`, set to no equipment.", cInfo->Entry, cInfo->equipmentId);
-                const_cast<CreatureInfo*>(cInfo)->equipmentId = 0;
+                sLog.outErrorDb("Table `creature_template` have creature (Entry: %u) with equipment_id %u not found in table `creature_equip_template`, set to no equipment.", cInfo->Entry, cInfo->EquipmentTemplateId);
+                const_cast<CreatureInfo*>(cInfo)->EquipmentTemplateId = 0;
             }
         }
 
@@ -722,13 +722,13 @@ void ObjectMgr::LoadCreatureTemplates()
                 sLog.outErrorDb("Table `creature_template` have creature (Entry: %u) with vendor_id %u but not have flag UNIT_NPC_FLAG_VENDOR (%u), vendor items will ignored.", cInfo->Entry, cInfo->vendorId, UNIT_NPC_FLAG_VENDOR);
         }
 
-        /// if not set custom creature scale then load scale from CreatureDisplayInfo.dbc
-        if (cInfo->scale <= 0.0f)
+        /// if not set custom creature Scale then load Scale from CreatureDisplayInfo.dbc
+        if (cInfo->Scale <= 0.0f)
         {
             if (displayScaleEntry)
-                const_cast<CreatureInfo*>(cInfo)->scale = displayScaleEntry->scale;
+                const_cast<CreatureInfo*>(cInfo)->Scale = displayScaleEntry->Scale;
             else
-                const_cast<CreatureInfo*>(cInfo)->scale = DEFAULT_OBJECT_SCALE;
+                const_cast<CreatureInfo*>(cInfo)->Scale = DEFAULT_OBJECT_SCALE;
         }
     }
 }
@@ -1403,17 +1403,17 @@ void ObjectMgr::LoadCreatures()
             data.curhealth = cInfo->minhealth;
         }
 
-        if (cInfo->flags_extra & CREATURE_FLAG_EXTRA_INSTANCE_BIND)
+        if (cInfo->ExtraFlags & CREATURE_FLAG_EXTRA_INSTANCE_BIND)
         {
             if (!mapEntry || !mapEntry->IsDungeon())
-                sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `creature_template`.`flags_extra` including CREATURE_FLAG_EXTRA_INSTANCE_BIND (%u) but creature are not in instance.",
+                sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `creature_template`.`ExtraFlags` including CREATURE_FLAG_EXTRA_INSTANCE_BIND (%u) but creature are not in instance.",
                                 guid, data.id, CREATURE_FLAG_EXTRA_INSTANCE_BIND);
         }
 
-        if (cInfo->flags_extra & CREATURE_FLAG_EXTRA_AGGRO_ZONE)
+        if (cInfo->ExtraFlags & CREATURE_FLAG_EXTRA_AGGRO_ZONE)
         {
             if (!mapEntry || !mapEntry->IsDungeon())
-                sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `creature_template`.`flags_extra` including CREATURE_FLAG_EXTRA_AGGRO_ZONE (%u) but creature are not in instance.",
+                sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `creature_template`.`ExtraFlags` including CREATURE_FLAG_EXTRA_AGGRO_ZONE (%u) but creature are not in instance.",
                                 guid, data.id, CREATURE_FLAG_EXTRA_AGGRO_ZONE);
         }
 
@@ -6273,7 +6273,7 @@ void ObjectMgr::LoadGameobjectInfo()
     {
         GameObjectInfo const* goInfo = itr.getValue();
 
-        if (goInfo->size <= 0.0f)                           // prevent use too small scales
+        if (goInfo->size <= 0.0f)                           // prevent use too small Scales
         {
             ERROR_DB_STRICT_LOG("Gameobject (Entry: %u GoType: %u) have too small size=%f",
                                 goInfo->id, goInfo->type, goInfo->size);
@@ -6449,7 +6449,7 @@ void ObjectMgr::LoadGameobjectInfo()
                 CheckGOSpellId(goInfo, goInfo->spellcaster.spellId, 0);
                 break;
             }
-            case GAMEOBJECT_TYPE_FLAGSTAND:                 // 24
+            case GAMEOBJECT_CreatureTypeFlagsTAND:                 // 24
             {
                 if (goInfo->flagstand.lockId)
                     CheckGOLockId(goInfo, goInfo->flagstand.lockId, 0);
diff --git a/src/game/Object/Pet.cpp b/src/game/Object/Pet.cpp
index 379d1aaee..9c7b3a157 100644
--- a/src/game/Object/Pet.cpp
+++ b/src/game/Object/Pet.cpp
@@ -902,15 +902,15 @@ bool Pet::InitStatsForLevel(uint32 petlevel, Unit* owner)
     CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cinfo->family);
     if (cFamily && cFamily->minScale > 0.0f && getPetType() == HUNTER_PET)
     {
-        float scale;
+        float Scale;
         if (getLevel() >= cFamily->maxScaleLevel)
-            scale = cFamily->maxScale;
+            Scale = cFamily->maxScale;
         else if (getLevel() <= cFamily->minScaleLevel)
-            scale = cFamily->minScale;
+            Scale = cFamily->minScale;
         else
-            scale = cFamily->minScale + float(getLevel() - cFamily->minScaleLevel) / cFamily->maxScaleLevel * (cFamily->maxScale - cFamily->minScale);
+            Scale = cFamily->minScale + float(getLevel() - cFamily->minScaleLevel) / cFamily->maxScaleLevel * (cFamily->maxScale - cFamily->minScale);
 
-        SetObjectScale(scale);
+        SetObjectScale(Scale);
         UpdateModelData();
     }
     m_bonusdamage = 0;
@@ -985,8 +985,8 @@ bool Pet::InitStatsForLevel(uint32 petlevel, Unit* owner)
                 sLog.outErrorDb("Summoned pet (Entry: %u) not have pet stats data in DB", cinfo->Entry);
 
                 // remove elite bonuses included in DB values
-                SetCreateHealth(uint32(((float(cinfo->maxhealth) / cinfo->maxlevel) / (1 + 2 * cinfo->rank)) * petlevel));
-                SetCreateMana(uint32(((float(cinfo->maxmana)   / cinfo->maxlevel) / (1 + 2 * cinfo->rank)) * petlevel));
+                SetCreateHealth(uint32(((float(cinfo->maxhealth) / cinfo->maxlevel) / (1 + 2 * cinfo->Rank)) * petlevel));
+                SetCreateMana(uint32(((float(cinfo->maxmana)   / cinfo->maxlevel) / (1 + 2 * cinfo->Rank)) * petlevel));
 
                 SetCreateStat(STAT_STRENGTH, 22);
                 SetCreateStat(STAT_AGILITY, 22);
@@ -1024,7 +1024,7 @@ bool Pet::InitStatsForLevel(uint32 petlevel, Unit* owner)
                 sLog.outErrorDb("Hunter pet levelstats missing in DB");
 
                 // remove elite bonuses included in DB values
-                SetCreateHealth(uint32(((float(cinfo->maxhealth) / cinfo->maxlevel) / (1 + 2 * cinfo->rank)) * petlevel));
+                SetCreateHealth(uint32(((float(cinfo->maxhealth) / cinfo->maxlevel) / (1 + 2 * cinfo->Rank)) * petlevel));
 
                 SetCreateStat(STAT_STRENGTH, 22);
                 SetCreateStat(STAT_AGILITY, 22);
diff --git a/src/game/Object/Player.cpp b/src/game/Object/Player.cpp
index 486940745..d0d2ba512 100644
--- a/src/game/Object/Player.cpp
+++ b/src/game/Object/Player.cpp
@@ -674,7 +674,7 @@ bool Player::Create(uint32 guidlow, const std::string& name, uint8 race, uint8 c
     SetByteValue(UNIT_FIELD_BYTES_0, 2, gender);
     SetByteValue(UNIT_FIELD_BYTES_0, 3, powertype);
 
-    InitDisplayIds();                                       // model, scale and model data
+    InitDisplayIds();                                       // model, Scale and model data
 
     SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP);
     SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
@@ -7151,13 +7151,13 @@ void Player::_ApplyItemMods(Item* item, uint8 slot, bool apply)
     DEBUG_LOG("_ApplyItemMods complete.");
 }
 
-void Player::_ApplyItemBonuses(ItemPrototype const* proto, uint8 slot, bool apply, bool only_level_scale /*= false*/)
+void Player::_ApplyItemBonuses(ItemPrototype const* proto, uint8 slot, bool apply, bool only_level_Scale /*= false*/)
 {
     if (slot >= INVENTORY_SLOT_BAG_END || !proto)
         return;
 
     ScalingStatDistributionEntry const* ssd = proto->ScalingStatDistribution ? sScalingStatDistributionStore.LookupEntry(proto->ScalingStatDistribution) : NULL;
-    if (only_level_scale && !ssd)
+    if (only_level_Scale && !ssd)
         return;
 
     // req. check at equip, but allow use for extended range if range limit max level, set proper level
@@ -7166,7 +7166,7 @@ void Player::_ApplyItemBonuses(ItemPrototype const* proto, uint8 slot, bool appl
         ssd_level = ssd->MaxLevel;
 
     ScalingStatValuesEntry const* ssv = proto->StatScalingFactor ? sScalingStatValuesStore.LookupEntry(ssd_level) : NULL;
-    if (only_level_scale && !ssv)
+    if (only_level_Scale && !ssv)
         return;
 
     for (uint32 i = 0; i < MAX_ITEM_PROTO_STATS; ++i)
@@ -15760,7 +15760,7 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder* holder)
     _LoadIntoDataField(fields[54].GetString(), PLAYER_EXPLORED_ZONES_1, PLAYER_EXPLORED_ZONES_SIZE);
     _LoadIntoDataField(fields[56].GetString(), PLAYER__FIELD_KNOWN_TITLES, KNOWN_TITLES_SIZE*2);
 
-    InitDisplayIds();                                       // model, scale and model data
+    InitDisplayIds();                                       // model, Scale and model data
 
     SetFloatValue(UNIT_FIELD_HOVERHEIGHT, 1.0f);
 
@@ -19449,7 +19449,7 @@ void Player::InitDisplayIds()
         return;
     }
 
-    // reset scale before reapply auras
+    // reset Scale before reapply auras
     SetObjectScale(DEFAULT_OBJECT_SCALE);
 
     uint8 gender = getGender();
@@ -21484,7 +21484,7 @@ bool Player::isHonorOrXPTarget(Unit* pVictim) const
     {
         if (((Creature*)pVictim)->IsTotem() ||
                 ((Creature*)pVictim)->IsPet() ||
-                ((Creature*)pVictim)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL)
+                ((Creature*)pVictim)->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL)
             return false;
     }
     return true;
@@ -21921,7 +21921,7 @@ void Player::UpdateUnderwaterState(Map* m, float x, float y, float z)
     }
 
     // All liquids type - check under water position
-    if (liquid_status.type_flags & (MAP_LIQUID_TYPE_WATER | MAP_LIQUID_TYPE_OCEAN | MAP_LIQUID_TYPE_MAGMA | MAP_LIQUID_TYPE_SLIME))
+    if (liquid_status.CreatureTypeFlags & (MAP_LIQUID_TYPE_WATER | MAP_LIQUID_TYPE_OCEAN | MAP_LIQUID_TYPE_MAGMA | MAP_LIQUID_TYPE_SLIME))
     {
         if (res & LIQUID_MAP_UNDER_WATER)
             m_MirrorTimerFlags |= UNDERWATER_INWATER;
@@ -21930,13 +21930,13 @@ void Player::UpdateUnderwaterState(Map* m, float x, float y, float z)
     }
 
     // Allow travel in dark water on taxi or transport
-    if ((liquid_status.type_flags & MAP_LIQUID_TYPE_DARK_WATER) && !IsTaxiFlying() && !GetTransport())
+    if ((liquid_status.CreatureTypeFlags & MAP_LIQUID_TYPE_DARK_WATER) && !IsTaxiFlying() && !GetTransport())
         m_MirrorTimerFlags |= UNDERWATER_INDARKWATER;
     else
         m_MirrorTimerFlags &= ~UNDERWATER_INDARKWATER;
 
     // in lava check, anywhere in lava level
-    if (liquid_status.type_flags & MAP_LIQUID_TYPE_MAGMA)
+    if (liquid_status.CreatureTypeFlags & MAP_LIQUID_TYPE_MAGMA)
     {
         if (res & (LIQUID_MAP_UNDER_WATER | LIQUID_MAP_IN_WATER | LIQUID_MAP_WATER_WALK))
             m_MirrorTimerFlags |= UNDERWATER_INLAVA;
@@ -21944,7 +21944,7 @@ void Player::UpdateUnderwaterState(Map* m, float x, float y, float z)
             m_MirrorTimerFlags &= ~UNDERWATER_INLAVA;
     }
     // in slime check, anywhere in slime level
-    if (liquid_status.type_flags & MAP_LIQUID_TYPE_SLIME)
+    if (liquid_status.CreatureTypeFlags & MAP_LIQUID_TYPE_SLIME)
     {
         if (res & (LIQUID_MAP_UNDER_WATER | LIQUID_MAP_IN_WATER | LIQUID_MAP_WATER_WALK))
             m_MirrorTimerFlags |= UNDERWATER_INSLIME;
diff --git a/src/game/Object/Player.h b/src/game/Object/Player.h
index 5a62d28b3..cbbb81b0a 100644
--- a/src/game/Object/Player.h
+++ b/src/game/Object/Player.h
@@ -22,8 +22,8 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#ifndef _PLAYER_H
-#define _PLAYER_H
+#ifndef MANGOS_H_PLAYER
+#define MANGOS_H_PLAYER
 
 #include "Common.h"
 #include "ItemPrototype.h"
@@ -194,8 +194,14 @@ struct ActionButton
     ActionButtonUpdateState uState;
 
     // helpers
-    ActionButtonType GetType() const { return ActionButtonType(ACTION_BUTTON_TYPE(packedData)); }
-    uint32 GetAction() const { return ACTION_BUTTON_ACTION(packedData); }
+    ActionButtonType GetType() const
+    {
+        return ActionButtonType(ACTION_BUTTON_TYPE(packedData));
+    }
+    uint32 GetAction() const
+    {
+        return ACTION_BUTTON_ACTION(packedData);
+    }
     void SetActionAndType(uint32 action, ActionButtonType type)
     {
         uint32 newData = action | (uint32(type) << 24);
@@ -203,7 +209,7 @@ struct ActionButton
         {
             packedData = newData;
             if (uState != ACTIONBUTTON_NEW)
-                uState = ACTIONBUTTON_CHANGED;
+                { uState = ACTIONBUTTON_CHANGED; }
         }
     }
 };
@@ -272,7 +278,10 @@ typedef std::list<PlayerCreateInfoItem> PlayerCreateInfoItems;
 
 struct PlayerLevelInfo
 {
-    PlayerLevelInfo() { for (int i = 0; i < MAX_STATS; ++i) stats[i] = 0; }
+    PlayerLevelInfo()
+    {
+        for (int i = 0; i < MAX_STATS; ++i) { stats[i] = 0; }
+    }
 
     uint8 stats[MAX_STATS];
 };
@@ -788,21 +797,6 @@ enum EnviromentalDamage
     DAMAGE_FALL_TO_VOID         = 6                         // custom case for fall without durability loss
 };
 
-/*
- * This is defined in Chat.h (just like Zero, One, and Two)
- * DELETE THIS IF ALL IS OK
-enum PlayerChatTag
-{
-    CHAT_TAG_NONE               = 0x00,
-    CHAT_TAG_AFK                = 0x01,
-    CHAT_TAG_DND                = 0x02,
-    CHAT_TAG_GM                 = 0x04,
-    CHAT_TAG_COM                = 0x08,                     // Commentator
-    CHAT_TAG_DEV                = 0x10,                     // Developer
-};
-
-*/
-
 enum PlayedTimeIndex
 {
     PLAYED_TIME_TOTAL           = 0,
@@ -886,7 +880,7 @@ enum PlayerRestState
     REST_STATE_RAF_LINKED       = 0x04                      // Exact use unknown
 };
 
-class  PlayerTaxi
+class PlayerTaxi
 {
     public:
         PlayerTaxi();
@@ -911,7 +905,7 @@ class  PlayerTaxi
                 return true;
             }
             else
-                return false;
+                { return false; }
         }
         void AppendTaximaskTo(ByteBuffer& data, bool all);
 
@@ -919,17 +913,32 @@ class  PlayerTaxi
         bool LoadTaxiDestinationsFromString(const std::string& values, Team team);
         std::string SaveTaxiDestinationsToString();
 
-        void ClearTaxiDestinations() { m_TaxiDestinations.clear(); }
-        void AddTaxiDestination(uint32 dest) { m_TaxiDestinations.push_back(dest); }
-        uint32 GetTaxiSource() const { return m_TaxiDestinations.empty() ? 0 : m_TaxiDestinations.front(); }
-        uint32 GetTaxiDestination() const { return m_TaxiDestinations.size() < 2 ? 0 : m_TaxiDestinations[1]; }
+        void ClearTaxiDestinations()
+        {
+            m_TaxiDestinations.clear();
+        }
+        void AddTaxiDestination(uint32 dest)
+        {
+            m_TaxiDestinations.push_back(dest);
+        }
+        uint32 GetTaxiSource() const
+        {
+            return m_TaxiDestinations.empty() ? 0 : m_TaxiDestinations.front();
+        }
+        uint32 GetTaxiDestination() const
+        {
+            return m_TaxiDestinations.size() < 2 ? 0 : m_TaxiDestinations[1];
+        }
         uint32 GetCurrentTaxiPath() const;
         uint32 NextTaxiDestination()
         {
             m_TaxiDestinations.pop_front();
             return GetTaxiDestination();
         }
-        bool empty() const { return m_TaxiDestinations.empty(); }
+        bool empty() const
+        {
+            return m_TaxiDestinations.empty();
+        }
 
         friend std::ostringstream& operator<< (std::ostringstream& ss, PlayerTaxi const& taxi);
     private:
@@ -975,20 +984,38 @@ class TradeData
 
     public:                                                 // access functions
 
-        Player* GetTrader() const { return m_trader; }
+        Player* GetTrader() const
+        {
+            return m_trader;
+        }
         TradeData* GetTraderData() const;
 
         Item* GetItem(TradeSlots slot) const;
         bool HasItem(ObjectGuid item_guid) const;
 
-        uint32 GetSpell() const { return m_spell; }
+        uint32 GetSpell() const
+        {
+            return m_spell;
+        }
         Item*  GetSpellCastItem() const;
-        bool HasSpellCastItem() const { return !m_spellCastItem.IsEmpty(); }
+        bool HasSpellCastItem() const
+        {
+            return !m_spellCastItem.IsEmpty();
+        }
 
-        uint64 GetMoney() const { return m_money; }
+        uint64 GetMoney() const
+        {
+            return m_money;
+        }
 
-        bool IsAccepted() const { return m_accepted; }
-        bool IsInAcceptProcess() const { return m_acceptProccess; }
+        bool IsAccepted() const
+        {
+            return m_accepted;
+        }
+        bool IsInAcceptProcess() const
+        {
+            return m_acceptProccess;
+        }
     public:                                                 // access functions
 
         void SetItem(TradeSlots slot, Item* item);
@@ -998,7 +1025,10 @@ class TradeData
         void SetAccepted(bool state, bool crosssend = false);
 
         // must be called only from accept handler helper functions
-        void SetInAcceptProcess(bool state) { m_acceptProccess = state; }
+        void SetInAcceptProcess(bool state)
+        {
+            m_acceptProccess = state;
+        }
 
     private:                                                // internal functions
 
@@ -1020,7 +1050,7 @@ class TradeData
         ObjectGuid m_items[TRADE_SLOT_COUNT];               // traded itmes from m_player side including non-traded slot
 };
 
-class  Player : public Unit
+class Player : public Unit
 {
         friend class WorldSession;
         friend void Item::AddToUpdateQueueOf(Player* player);
@@ -1086,14 +1116,23 @@ class  Player : public Unit
 
         void ToggleAFK();
         void ToggleDND();
-        bool isAFK() const { return HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_AFK); }
-        bool isDND() const { return HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_DND); }
+        bool isAFK() const
+        {
+            return HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_AFK);
+        }
+        bool isDND() const
+        {
+            return HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_DND);
+        }
         uint8 GetChatTag() const;
         std::string autoReplyMsg;
 
         uint32 GetBarberShopCost(uint8 newhairstyle, uint8 newhaircolor, uint8 newfacialhair, uint32 newskintone);
 
-        PlayerSocial* GetSocial() { return m_social; }
+        PlayerSocial* GetSocial()
+        {
+            return m_social;
+        }
 
         PlayerTaxi m_taxi;
         void InitTaxiNodesForLevel() { m_taxi.InitTaxiNodesForLevel(getRace(), getClass(), getLevel()); }
@@ -1102,15 +1141,15 @@ class  Player : public Unit
         // mount_id can be used in scripting calls
         void ContinueTaxiFlight();
         bool isAcceptTickets() const { return GetSession()->GetSecurity() >= SEC_GAMEMASTER && (m_ExtraFlags & PLAYER_EXTRA_GM_ACCEPT_TICKETS); }
-        void SetAcceptTicket(bool on) { if (on) m_ExtraFlags |= PLAYER_EXTRA_GM_ACCEPT_TICKETS; else m_ExtraFlags &= ~PLAYER_EXTRA_GM_ACCEPT_TICKETS; }
+        void SetAcceptTicket(bool on) { if (on) { m_ExtraFlags |= PLAYER_EXTRA_GM_ACCEPT_TICKETS; } else { m_ExtraFlags &= ~PLAYER_EXTRA_GM_ACCEPT_TICKETS; } }
         bool isAcceptWhispers() const { return m_ExtraFlags & PLAYER_EXTRA_ACCEPT_WHISPERS; }
-        void SetAcceptWhispers(bool on) { if (on) m_ExtraFlags |= PLAYER_EXTRA_ACCEPT_WHISPERS; else m_ExtraFlags &= ~PLAYER_EXTRA_ACCEPT_WHISPERS; }
+        void SetAcceptWhispers(bool on) { if (on) { m_ExtraFlags |= PLAYER_EXTRA_ACCEPT_WHISPERS; } else { m_ExtraFlags &= ~PLAYER_EXTRA_ACCEPT_WHISPERS; } }
         bool isGameMaster() const { return m_ExtraFlags & PLAYER_EXTRA_GM_ON; }
         void SetGameMaster(bool on);
         bool isGMChat() const { return GetSession()->GetSecurity() >= SEC_MODERATOR && (m_ExtraFlags & PLAYER_EXTRA_GM_CHAT); }
-        void SetGMChat(bool on) { if (on) m_ExtraFlags |= PLAYER_EXTRA_GM_CHAT; else m_ExtraFlags &= ~PLAYER_EXTRA_GM_CHAT; }
+        void SetGMChat(bool on) { if (on) { m_ExtraFlags |= PLAYER_EXTRA_GM_CHAT; } else { m_ExtraFlags &= ~PLAYER_EXTRA_GM_CHAT; } }
         bool IsTaxiCheater() const { return m_ExtraFlags & PLAYER_EXTRA_TAXICHEAT; }
-        void SetTaxiCheater(bool on) { if (on) m_ExtraFlags |= PLAYER_EXTRA_TAXICHEAT; else m_ExtraFlags &= ~PLAYER_EXTRA_TAXICHEAT; }
+        void SetTaxiCheater(bool on) { if (on) { m_ExtraFlags |= PLAYER_EXTRA_TAXICHEAT; } else { m_ExtraFlags &= ~PLAYER_EXTRA_TAXICHEAT; } }
         bool isGMVisible() const { return !(m_ExtraFlags & PLAYER_EXTRA_GM_INVISIBLE); }
         void SetGMVisible(bool on);
         void SetPvPDeath(bool on) { if (on) m_ExtraFlags |= PLAYER_EXTRA_PVP_DEATH; else m_ExtraFlags &= ~PLAYER_EXTRA_PVP_DEATH; }
@@ -1122,11 +1161,12 @@ class  Player : public Unit
             m_ExtraFlags &= ~(PLAYER_EXTRA_AUCTION_ENEMY | PLAYER_EXTRA_AUCTION_NEUTRAL);
 
             if (state < 0)
-                m_ExtraFlags |= PLAYER_EXTRA_AUCTION_ENEMY;
+                { m_ExtraFlags |= PLAYER_EXTRA_AUCTION_ENEMY; }
             else if (state > 0)
-                m_ExtraFlags |= PLAYER_EXTRA_AUCTION_NEUTRAL;
+                { m_ExtraFlags |= PLAYER_EXTRA_AUCTION_NEUTRAL; }
         }
 
+
         void GiveXP(uint32 xp, Unit* victim);
         void GiveLevel(uint32 level);
 
@@ -1137,22 +1177,39 @@ class  Player : public Unit
         time_t m_Last_tick;
 
         uint32 m_Played_time[MAX_PLAYED_TIME_INDEX];
-        uint32 GetTotalPlayedTime() { return m_Played_time[PLAYED_TIME_TOTAL]; }
-        uint32 GetLevelPlayedTime() { return m_Played_time[PLAYED_TIME_LEVEL]; }
-
+        uint32 GetTotalPlayedTime()
+        {
+            return m_Played_time[PLAYED_TIME_TOTAL];
+        }
+        uint32 GetLevelPlayedTime()
+        {
+            return m_Played_time[PLAYED_TIME_LEVEL];
+        }
         void ResetTimeSync();
         void SendTimeSync();
 
         void SetDeathState(DeathState s) override;          // overwrite Unit::SetDeathState
 
-        float GetRestBonus() const { return m_rest_bonus; }
+        float GetRestBonus() const
+        {
+            return m_rest_bonus;
+        }
         void SetRestBonus(float rest_bonus_new);
 
-        RestType GetRestType() const { return rest_type; }
+        RestType GetRestType() const
+        {
+            return rest_type;
+        }
         void SetRestType(RestType n_r_type, uint32 areaTriggerId = 0);
 
-        time_t GetTimeInnEnter() const { return time_inn_enter; }
-        void UpdateInnerTime(time_t time) { time_inn_enter = time; }
+        time_t GetTimeInnEnter() const
+        {
+            return time_inn_enter;
+        }
+        void UpdateInnerTime(time_t time)
+        {
+            time_inn_enter = time;
+        }
 
         void RemovePet(PetSaveMode mode);
 
@@ -1181,7 +1238,10 @@ class  Player : public Unit
         Item* GetItemByPos(uint16 pos) const;
         Item* GetItemByPos(uint8 bag, uint8 slot) const;
         uint32 GetItemDisplayIdInSlot(uint8 bag, uint8 slot) const;
-        Item* GetWeaponForAttack(WeaponAttackType attackType) const { return GetWeaponForAttack(attackType, false, false); }
+        Item* GetWeaponForAttack(WeaponAttackType attackType) const
+        {
+            return GetWeaponForAttack(attackType, false, false);
+        }
         Item* GetWeaponForAttack(WeaponAttackType attackType, bool nonbroken, bool useable) const;
         Item* GetShield(bool useable = false) const;
         static uint32 GetAttackBySlot(uint8 slot);          // MAX_ATTACK if not weapon slot
@@ -1211,7 +1271,7 @@ class  Player : public Unit
         InventoryResult CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec& dest, Item* pItem, bool swap = false) const
         {
             if (!pItem)
-                return EQUIP_ERR_ITEM_NOT_FOUND;
+                { return EQUIP_ERR_ITEM_NOT_FOUND; }
             uint32 count = pItem->GetCount();
             return _CanStoreItem(bag, slot, dest, pItem->GetEntry(), count, pItem, swap, NULL);
         }
@@ -1246,7 +1306,10 @@ class  Player : public Unit
         void ApplyEquipCooldown(Item* pItem);
         void SetAmmo(uint32 item);
         void RemoveAmmo();
-        float GetAmmoDPS() const { return m_ammoDPS; }
+        float GetAmmoDPS() const
+        {
+            return m_ammoDPS;
+        }
         bool CheckAmmoCompatibility(const ItemPrototype* ammo_proto) const;
         void QuickEquipItem(uint16 pos, Item* pItem);
         void VisualizeItem(uint8 slot, Item* pItem);
@@ -1278,10 +1341,22 @@ class  Player : public Unit
         void SendEquipError(InventoryResult msg, Item* pItem, Item* pItem2 = NULL, uint32 itemid = 0) const;
         void SendBuyError(BuyResult msg, Creature* pCreature, uint32 item, uint32 param);
         void SendSellError(SellResult msg, Creature* pCreature, ObjectGuid itemGuid, uint32 param);
-        void AddWeaponProficiency(uint32 newflag) { m_WeaponProficiency |= newflag; }
-        void AddArmorProficiency(uint32 newflag) { m_ArmorProficiency |= newflag; }
-        uint32 GetWeaponProficiency() const { return m_WeaponProficiency; }
-        uint32 GetArmorProficiency() const { return m_ArmorProficiency; }
+        void AddWeaponProficiency(uint32 newflag)
+        {
+            m_WeaponProficiency |= newflag;
+        }
+        void AddArmorProficiency(uint32 newflag)
+        {
+            m_ArmorProficiency |= newflag;
+        }
+        uint32 GetWeaponProficiency() const
+        {
+            return m_WeaponProficiency;
+        }
+        uint32 GetArmorProficiency() const
+        {
+            return m_ArmorProficiency;
+        }
         bool IsTwoHandUsed() const
         {
             Item* mainItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND);
@@ -1366,7 +1441,7 @@ class  Player : public Unit
         void AddQuest(Quest const* pQuest, Object* questGiver);
         void CompleteQuest(uint32 quest_id);
         void IncompleteQuest(uint32 quest_id);
-        void RewardQuest(Quest const* pQuest, uint32 reward, Object* questGiver, bool announce);
+        void RewardQuest(Quest const* pQuest, uint32 reward, Object* questGiver, bool announce = true);
 
         void FailQuest(uint32 quest_id);
         bool SatisfyQuestSkill(Quest const* qInfo, bool msg) const;
@@ -1509,8 +1584,14 @@ class  Player : public Unit
         void RegenerateAll(uint32 diff = REGEN_TIME_FULL);
         void Regenerate(Powers power, uint32 diff);
         void RegenerateHealth(uint32 diff);
-        void setRegenTimer(uint32 time) {m_regenTimer = time;}
-        void setWeaponChangeTimer(uint32 time) {m_weaponChangeTimer = time;}
+        void setRegenTimer(uint32 time)
+        {
+            m_regenTimer = time;
+        }
+        void setWeaponChangeTimer(uint32 time)
+        {
+            m_weaponChangeTimer = time;
+        }
 
         uint64 GetMoney() const { return GetUInt64Value(PLAYER_FIELD_COINAGE); }
         void ModifyMoney(int64 d)
@@ -1531,7 +1612,10 @@ class  Player : public Unit
             UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_GOLD_VALUE_OWNED);
         }
 
-        QuestStatusMap& getQuestStatusMap() { return mQuestStatus; };
+        QuestStatusMap& getQuestStatusMap()
+        {
+            return mQuestStatus;
+        };
 
         ObjectGuid const& GetSelectionGuid() const { return m_curSelectionGuid; }
         void SetSelectionGuid(ObjectGuid guid) { m_curSelectionGuid = guid; SetTargetGuid(guid); }
@@ -1550,12 +1634,24 @@ class  Player : public Unit
 
         void RemoveMail(uint32 id);
 
-        void AddMail(Mail* mail) { m_mail.push_front(mail);}// for call from WorldSession::SendMailTo
-        uint32 GetMailSize() { return m_mail.size(); }
+        void AddMail(Mail* mail)
+        {
+            m_mail.push_front(mail);   // for call from WorldSession::SendMailTo
+        }
+        uint32 GetMailSize()
+        {
+            return m_mail.size();
+        }
         Mail* GetMail(uint32 id);
 
-        PlayerMails::iterator GetMailBegin() { return m_mail.begin();}
-        PlayerMails::iterator GetMailEnd() { return m_mail.end();}
+        PlayerMails::iterator GetMailBegin()
+        {
+            return m_mail.begin();
+        }
+        PlayerMails::iterator GetMailEnd()
+        {
+            return m_mail.end();
+        }
 
         /*********************************************************/
         /*** MAILED ITEMS SYSTEM ***/
@@ -1647,10 +1743,19 @@ class  Player : public Unit
         void SetFreePrimaryProfessions(uint16 profs) { SetUInt32Value(PLAYER_CHARACTER_POINTS, profs); }
         void InitPrimaryProfessions();
 
-        PlayerSpellMap const& GetSpellMap() const { return m_spells; }
-        PlayerSpellMap&       GetSpellMap()       { return m_spells; }
+        PlayerSpellMap const& GetSpellMap() const
+        {
+            return m_spells;
+        }
+        PlayerSpellMap&       GetSpellMap()
+        {
+            return m_spells;
+        }
 
-        SpellCooldowns const& GetSpellCooldownMap() const { return m_spellCooldowns; }
+        SpellCooldowns const& GetSpellCooldownMap() const
+        {
+            return m_spellCooldowns;
+        }
 
         PlayerTalent const* GetKnownTalentById(int32 talentId) const;
         SpellEntry const* GetKnownTalentRankById(int32 talentId) const;
@@ -1679,8 +1784,10 @@ class  Player : public Unit
         void RemoveSpellCategoryCooldown(uint32 cat, bool update = false);
         void SendClearCooldown(uint32 spell_id, Unit* target);
 
-        GlobalCooldownMgr& GetGlobalCooldownMgr() { return m_GlobalCooldownMgr; }
-
+        GlobalCooldownMgr& GetGlobalCooldownMgr()
+        {
+            return m_GlobalCooldownMgr;
+        }
         void RemoveArenaSpellCooldowns();
         void RemoveAllSpellCooldown();
         void _LoadSpellCooldowns(QueryResult* result);
@@ -1704,8 +1811,14 @@ class  Player : public Unit
         bool isRessurectRequested() const { return !m_resurrectGuid.IsEmpty(); }
         void ResurectUsingRequestData();
 
-        uint32 getCinematic() { return m_cinematic; }
-        void setCinematic(uint32 cine) { m_cinematic = cine; }
+        uint32 getCinematic()
+        {
+            return m_cinematic;
+        }
+        void setCinematic(uint32 cine)
+        {
+            m_cinematic = cine;
+        }
 
         static bool IsActionButtonDataValid(uint8 button, uint32 action, uint8 type, Player* player, bool msg = true);
         ActionButton* addActionButton(uint8 spec, uint8 button, uint32 action, uint8 type);
@@ -1718,7 +1831,10 @@ class  Player : public Unit
         void UpdatePvP(bool state, bool ovrride = false);
         void UpdateZone(uint32 newZone, uint32 newArea);
         void UpdateArea(uint32 newArea);
-        uint32 GetCachedZoneId() const { return m_zoneUpdateId; }
+        uint32 GetCachedZoneId() const
+        {
+            return m_zoneUpdateId;
+        }
 
         void UpdateZoneDependentAuras();
         void UpdateAreaDependentAuras();                    // subzones
@@ -1727,7 +1843,10 @@ class  Player : public Unit
         void UpdateAfkReport(time_t currTime);
         void UpdatePvPFlag(time_t currTime);
         void UpdateContestedPvP(uint32 currTime);
-        void SetContestedPvPTimer(uint32 newTime) {m_contestedPvPTimer = newTime;}
+        void SetContestedPvPTimer(uint32 newTime)
+        {
+            m_contestedPvPTimer = newTime;
+        }
         void ResetContestedPvP()
         {
             clearUnitState(UNIT_STAT_ATTACK_PLAYER);
@@ -1737,7 +1856,10 @@ class  Player : public Unit
 
         /** todo: -maybe move UpdateDuelFlag+DuelComplete to independent DuelHandler.. **/
         DuelInfo* duel;
-        bool IsInDuelWith(Player const* player) const { return duel && duel->opponent == player && duel->startTime != 0; }
+        bool IsInDuelWith(Player const* player) const
+        {
+            return duel && duel->opponent == player && duel->startTime != 0;
+        }
         void UpdateDuelFlag(time_t currTime);
         void CheckDuelDistance(time_t currTime);
         void DuelComplete(DuelCompleteType type);
@@ -1745,7 +1867,10 @@ class  Player : public Unit
 
         bool IsGroupVisibleFor(Player* p) const;
         bool IsInSameGroupWith(Player const* p) const;
-        bool IsInSameRaidWith(Player const* p) const { return p == this || (GetGroup() != NULL && GetGroup() == p->GetGroup()); }
+        bool IsInSameRaidWith(Player const* p) const
+        {
+            return p == this || (GetGroup() != NULL && GetGroup() == p->GetGroup());
+        }
         void UninviteFromGroup();
         static void RemoveFromGroup(Group* group, ObjectGuid guid);
         void RemoveFromGroup() { RemoveFromGroup(GetGroup(), GetObjectGuid()); }
@@ -1858,20 +1983,38 @@ class  Player : public Unit
         void UpdateArmorSpecializations();
         bool FitArmorSpecializationRules(SpellEntry const * spellProto) const;
 
-        ObjectGuid const& GetLootGuid() const { return m_lootGuid; }
-        void SetLootGuid(ObjectGuid const& guid) { m_lootGuid = guid; }
+        ObjectGuid const& GetLootGuid() const
+        {
+            return m_lootGuid;
+        }
+        void SetLootGuid(ObjectGuid const& guid)
+        {
+            m_lootGuid = guid;
+        }
 
         void RemovedInsignia(Player* looterPlr);
 
-        WorldSession* GetSession() const { return m_session; }
-        void SetSession(WorldSession* s) { m_session = s; }
+        WorldSession* GetSession() const
+        {
+            return m_session;
+        }
+        void SetSession(WorldSession* s)
+        {
+            m_session = s;
+        }
 
         void BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) const override;
         void DestroyForPlayer(Player* target, bool anim = false) const override;
         void SendLogXPGain(uint32 GivenXP, Unit* victim, uint32 RestXP);
 
-        uint8 LastSwingErrorMsg() const { return m_swingErrorMsg; }
-        void SwingErrorMsg(uint8 val) { m_swingErrorMsg = val; }
+        uint8 LastSwingErrorMsg() const
+        {
+            return m_swingErrorMsg;
+        }
+        void SwingErrorMsg(uint8 val)
+        {
+            m_swingErrorMsg = val;
+        }
 
         // notifiers
         void SendAttackSwingCantAttack();
@@ -2094,7 +2237,7 @@ class  Player : public Unit
         {
             for (int i = 0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i)
                 if (m_bgBattleGroundQueueID[i].bgQueueTypeId != BATTLEGROUND_QUEUE_NONE)
-                    return true;
+                    { return true; }
             return false;
         }
 
@@ -2110,14 +2253,14 @@ class  Player : public Unit
         {
             for (int i = 0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i)
                 if (m_bgBattleGroundQueueID[i].bgQueueTypeId == bgQueueTypeId)
-                    return i;
+                    { return i; }
             return PLAYER_MAX_BATTLEGROUND_QUEUES;
         }
         bool IsInvitedForBattleGroundQueueType(BattleGroundQueueTypeId bgQueueTypeId) const
         {
             for (int i = 0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i)
                 if (m_bgBattleGroundQueueID[i].bgQueueTypeId == bgQueueTypeId)
-                    return m_bgBattleGroundQueueID[i].invitedToInstance != 0;
+                    { return m_bgBattleGroundQueueID[i].invitedToInstance != 0; }
             return false;
         }
         bool InBattleGroundQueueForBattleGroundQueueType(BattleGroundQueueTypeId bgQueueTypeId) const
@@ -2148,7 +2291,7 @@ class  Player : public Unit
         {
             for (int i = 0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i)
                 if (m_bgBattleGroundQueueID[i].bgQueueTypeId == BATTLEGROUND_QUEUE_NONE)
-                    return true;
+                    { return true; }
             return false;
         }
         void RemoveBattleGroundQueueId(BattleGroundQueueTypeId val)
@@ -2167,13 +2310,13 @@ class  Player : public Unit
         {
             for (int i = 0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i)
                 if (m_bgBattleGroundQueueID[i].bgQueueTypeId == bgQueueTypeId)
-                    m_bgBattleGroundQueueID[i].invitedToInstance = instanceId;
+                    { m_bgBattleGroundQueueID[i].invitedToInstance = instanceId; }
         }
         bool IsInvitedForBattleGroundInstance(uint32 instanceId) const
         {
             for (int i = 0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i)
                 if (m_bgBattleGroundQueueID[i].invitedToInstance == instanceId)
-                    return true;
+                    { return true; }
             return false;
         }
         WorldLocation const& GetBattleGroundEntryPoint() const { return m_bgData.joinPos; }
@@ -2207,7 +2350,7 @@ class  Player : public Unit
         void SetRestTime(uint32 v) { m_restTime = v; }
 
         /*********************************************************/
-        /***              ENVIROMENTAL SYSTEM                  ***/
+        /***              ENVIRONMENTAL SYSTEM                  ***/
         /*********************************************************/
 
         uint32 EnvironmentalDamage(EnviromentalDamage type, uint32 damage);
@@ -2612,7 +2755,7 @@ class  Player : public Unit
         uint32 m_questRewardTalentCount;
 
         // Social
-        PlayerSocial *m_social;
+        PlayerSocial* m_social;
 
         // Groups
         GroupReference m_group;
@@ -2664,7 +2807,7 @@ class  Player : public Unit
         void ScheduleDelayedOperation(uint32 operation)
         {
             if (operation < DELAYED_END)
-                m_DelayedOperations |= operation;
+                { m_DelayedOperations |= operation; }
         }
 
         void _fillGearScoreData(Item* item, GearScoreVec* gearScore, uint32& twoHandScore);
diff --git a/src/game/Object/Unit.cpp b/src/game/Object/Unit.cpp
index 7dd409a1c..b5ab0498c 100644
--- a/src/game/Object/Unit.cpp
+++ b/src/game/Object/Unit.cpp
@@ -58,6 +58,10 @@
 #include "movement/MoveSpline.h"
 #include "CreatureLinkingMgr.h"
 #include "movement/MovementStructures.h"
+#ifdef ENABLE_ELUNA
+#include "LuaEngine.h"
+#include "ElunaEventMgr.h"
+#endif /* ENABLE_ELUNA */
 
 #include <math.h>
 #include <stdarg.h>
@@ -511,7 +515,7 @@ Unit::Unit() :
     m_deathState = ALIVE;
 
     for (uint32 i = 0; i < CURRENT_MAX_SPELL; ++i)
-        m_currentSpells[i] = NULL;
+        { m_currentSpells[i] = NULL; }
 
     m_castCounter = 0;
 
@@ -530,7 +534,7 @@ Unit::Unit() :
     m_canModifyStats = false;
 
     for (int i = 0; i < MAX_SPELL_IMMUNITY; ++i)
-        m_spellImmune[i].clear();
+        { m_spellImmune[i].clear(); }
     for (int i = 0; i < UNIT_MOD_END; ++i)
     {
         m_auraModifiersGroup[i][BASE_VALUE] = 0.0f;
@@ -548,7 +552,7 @@ Unit::Unit() :
         m_weaponDamage[i][MAXDAMAGE] = BASE_MAXDAMAGE;
     }
     for (int i = 0; i < MAX_STATS; ++i)
-        m_createStats[i] = 0.0f;
+        { m_createStats[i] = 0.0f; }
 
     m_attacking = NULL;
     m_modMeleeHitChance = 0.0f;
@@ -560,14 +564,14 @@ Unit::Unit() :
 
     // m_victimThreat = 0.0f;
     for (int i = 0; i < MAX_SPELL_SCHOOL; ++i)
-        m_threatModifier[i] = 1.0f;
+        { m_threatModifier[i] = 1.0f; }
     m_isSorted = true;
     for (int i = 0; i < MAX_MOVE_TYPE; ++i)
-        m_speed_rate[i] = 1.0f;
+        { m_speed_rate[i] = 1.0f; }
 
     // remove aurastates allowing special moves
     for (int i = 0; i < MAX_REACTIVE; ++i)
-        m_reactiveTimer[i] = 0;
+        { m_reactiveTimer[i] = 0; }
 
     m_isCreatureLinkingTrigger = false;
     m_isSpawningLinked = false;
@@ -599,7 +603,7 @@ Unit::~Unit()
 void Unit::Update(uint32 update_diff, uint32 p_time)
 {
     if (!IsInWorld())
-        return;
+        { return; }
 
     /*if(p_time > m_AurasCheck)
     {
@@ -608,6 +612,10 @@ void Unit::Update(uint32 update_diff, uint32 p_time)
     }else
     m_AurasCheck -= p_time;*/
 
+#ifdef ENABLE_ELUNA
+    elunaEvents->Update(update_diff);
+#endif /* ENABLE_ELUNA */
+
     // WARNING! Order of execution here is important, do not change.
     // Spells must be processed with event system BEFORE they go to _UpdateSpells.
     // Or else we may have some SPELL_STATE_FINISHED spells stalled in pointers, that is bad.
@@ -616,6 +624,7 @@ void Unit::Update(uint32 update_diff, uint32 p_time)
 
     CleanupDeletedAuras();
 
+
     if (CanHaveThreatList())
         GetThreatManager().UpdateForClient(update_diff);
 
@@ -629,9 +638,9 @@ void Unit::Update(uint32 update_diff, uint32 p_time)
         {
             // m_CombatTimer set at aura start and it will be freeze until aura removing
             if (m_CombatTimer <= update_diff)
-                CombatStop();
+                { CombatStop(); }
             else
-                m_CombatTimer -= update_diff;
+                { m_CombatTimer -= update_diff; }
         }
     }
 
@@ -670,10 +679,10 @@ bool Unit::UpdateMeleeAttackingState()
 {
     Unit* victim = getVictim();
     if (!victim || IsNonMeleeSpellCasted(false))
-        return false;
+        { return false; }
 
     if (!isAttackReady(BASE_ATTACK) && !(isAttackReady(OFF_ATTACK) && haveOffhandWeapon()))
-        return false;
+        { return false; }
 
     uint8 swingError = 0;
     if (!CanReachWithMeleeAttack(victim))
@@ -697,7 +706,7 @@ bool Unit::UpdateMeleeAttackingState()
             if (haveOffhandWeapon())
             {
                 if (getAttackTimer(OFF_ATTACK) < ATTACK_DISPLAY_DELAY)
-                    setAttackTimer(OFF_ATTACK, ATTACK_DISPLAY_DELAY);
+                    { setAttackTimer(OFF_ATTACK, ATTACK_DISPLAY_DELAY); }
             }
             AttackerStateUpdate(victim, BASE_ATTACK);
             resetAttackTimer(BASE_ATTACK);
@@ -707,7 +716,7 @@ bool Unit::UpdateMeleeAttackingState()
             // prevent base and off attack in same time, delay attack at 0.2 sec
             uint32 base_att = getAttackTimer(BASE_ATTACK);
             if (base_att < ATTACK_DISPLAY_DELAY)
-                setAttackTimer(BASE_ATTACK, ATTACK_DISPLAY_DELAY);
+                { setAttackTimer(BASE_ATTACK, ATTACK_DISPLAY_DELAY); }
             // do attack
             AttackerStateUpdate(victim, OFF_ATTACK);
             resetAttackTimer(OFF_ATTACK);
@@ -718,9 +727,9 @@ bool Unit::UpdateMeleeAttackingState()
     if (player && swingError != player->LastSwingErrorMsg())
     {
         if (swingError == 1)
-            player->SendAttackSwingNotInRange();
+            { player->SendAttackSwingNotInRange(); }
         else if (swingError == 2)
-            player->SendAttackSwingBadFacingAttack();
+            { player->SendAttackSwingBadFacingAttack(); }
         player->SwingErrorMsg(swingError);
     }
 
@@ -730,10 +739,10 @@ bool Unit::UpdateMeleeAttackingState()
 bool Unit::haveOffhandWeapon() const
 {
     if (!CanUseEquippedWeapon(OFF_ATTACK))
-        return false;
+        { return false; }
 
     if (GetTypeId() == TYPEID_PLAYER)
-        return ((Player*)this)->GetWeaponForAttack(OFF_ATTACK, true, true);
+        { return ((Player*)this)->GetWeaponForAttack(OFF_ATTACK, true, true); }
     else
     {
         uint32 ItemId = GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1);
@@ -767,7 +776,7 @@ float Unit::GetCombatReach(Unit const* pVictim, bool forMeleeRange /*=true*/, fl
                   BASE_MELEERANGE_OFFSET + flat_mod;
 
     if (forMeleeRange && reach < ATTACK_DISTANCE)
-        reach = ATTACK_DISTANCE;
+        { reach = ATTACK_DISTANCE; }
 
     return reach;
 }
@@ -833,7 +842,7 @@ void Unit::RemoveSpellsCausingAura(AuraType auraType, ObjectGuid casterGuid)
             iter = m_modAuras[auraType].begin();
         }
         else
-            ++iter;
+            { ++iter; }
     }
 }
 
@@ -842,7 +851,7 @@ void Unit::DealDamageMods(Unit* pVictim, uint32& damage, uint32* absorb)
     if (!pVictim->IsAlive() || pVictim->IsTaxiFlying() || (pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode()))
     {
         if (absorb)
-            *absorb += damage;
+            { *absorb += damage; }
         damage = 0;
         return;
     }
@@ -860,13 +869,13 @@ void Unit::DealDamageMods(Unit* pVictim, uint32& damage, uint32* absorb)
 
     // Script Event damage Deal
     if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->AI())
-        ((Creature*)this)->AI()->DamageDeal(pVictim, damage);
+        { ((Creature*)this)->AI()->DamageDeal(pVictim, damage); }
     // Script Event damage taken
     if (pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->AI())
-        ((Creature*)pVictim)->AI()->DamageTaken(this, damage);
+        { ((Creature*)pVictim)->AI()->DamageTaken(this, damage); }
 
     if (absorb && originalDamage > damage)
-        *absorb += (originalDamage - damage);
+        { *absorb += (originalDamage - damage); }
 }
 
 uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDamage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask, SpellEntry const* spellProto, bool durabilityLoss)
@@ -881,7 +890,7 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
             RemoveSpellsCausingAura(SPELL_AURA_MOD_INVISIBILITY);
 
         if (pVictim->GetTypeId() == TYPEID_PLAYER && !pVictim->IsStandState() && !pVictim->hasUnitState(UNIT_STAT_STUNNED))
-            pVictim->SetStandState(UNIT_STAND_STATE_STAND);
+            { pVictim->SetStandState(UNIT_STAND_STATE_STAND); }
     }
 
     if (!damage)
@@ -991,7 +1000,7 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
         ((Player*)pVictim)->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_RECEIVED, damage);
 
     if (pVictim->GetTypeId() == TYPEID_UNIT && !((Creature*)pVictim)->IsPet() && !((Creature*)pVictim)->HasLootRecipient())
-        ((Creature*)pVictim)->SetLootRecipient(this);
+        { ((Creature*)pVictim)->SetLootRecipient(this); }
 
     if (health <= damage)
     {
@@ -1010,13 +1019,13 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
             group_tap = ((Creature*)pVictim)->GetGroupLootRecipient();
 
             if (Player* recipient = ((Creature*)pVictim)->GetOriginalLootRecipient())
-                player_tap = recipient;
+                { player_tap = recipient; }
         }
         // in player kill case group tap selected by player_tap (killer-player itself, or charmer, or owner, etc)
         else
         {
             if (player_tap)
-                group_tap = player_tap->GetGroup();
+                { group_tap = player_tap->GetGroup(); }
         }
 
         // Spirit of Redemtion Talent
@@ -1024,7 +1033,7 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
         // if talent known but not triggered (check priest class for speedup check)
         Aura* spiritOfRedemtionTalentReady = NULL;
         if (!damageFromSpiritOfRedemtionTalent &&           // not called from SPELL_AURA_SPIRIT_OF_REDEMPTION
-                pVictim->GetTypeId() == TYPEID_PLAYER && pVictim->getClass() == CLASS_PRIEST)
+            pVictim->GetTypeId() == TYPEID_PLAYER && pVictim->getClass() == CLASS_PRIEST)
         {
             AuraList const& vDummyAuras = pVictim->GetAurasByType(SPELL_AURA_DUMMY);
             for (AuraList::const_iterator itr = vDummyAuras.begin(); itr != vDummyAuras.end(); ++itr)
@@ -1050,7 +1059,7 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
             data << pVictim->GetObjectGuid();               // victim
 
             if (group_tap)
-                group_tap->BroadcastPacket(&data, false, group_tap->GetMemberGroup(player_tap->GetObjectGuid()), player_tap->GetObjectGuid());
+                { group_tap->BroadcastPacket(&data, false, group_tap->GetMemberGroup(player_tap->GetObjectGuid()), player_tap->GetObjectGuid()); }
 
             player_tap->SendDirectMessage(&data);
         }
@@ -1059,9 +1068,9 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
         if (player_tap != pVictim)
         {
             if (group_tap)
-                group_tap->RewardGroupAtKill(pVictim, player_tap);
+                { group_tap->RewardGroupAtKill(pVictim, player_tap); }
             else if (player_tap)
-                player_tap->RewardSinglePlayerAtKill(pVictim);
+                { player_tap->RewardSinglePlayerAtKill(pVictim); }
         }
 
         // stop combat
@@ -1079,7 +1088,7 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
             // save value before aura remove
             uint32 ressSpellId = pVictim->GetUInt32Value(PLAYER_SELF_RES_SPELL);
             if (!ressSpellId)
-                ressSpellId = ((Player*)pVictim)->GetResurrectionSpellId();
+                { ressSpellId = ((Player*)pVictim)->GetResurrectionSpellId(); }
 
             // Remove all expected to remove at death auras (most important negative case like DoT or periodic triggers)
             pVictim->RemoveAllAurasOnDeath();
@@ -1091,11 +1100,19 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
             pVictim->CastSpell(pVictim, 27827, true, NULL, spiritOfRedemtionTalentReady);
         }
         else
-            pVictim->SetHealth(0);
+            { pVictim->SetHealth(0); }
 
         // Call KilledUnit for creatures
         if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->AI())
-            ((Creature*)this)->AI()->KilledUnit(pVictim);
+            { ((Creature*)this)->AI()->KilledUnit(pVictim); }
+
+#ifdef ENABLE_ELUNA
+        if (Creature* killer = ToCreature())
+        {
+            if (Player* killed = pVictim->ToPlayer())
+                sEluna->OnPlayerKilledByCreature(killer, killed);
+        }
+#endif
 
         // Call AI OwnerKilledUnit (for any current summoned minipet/guardian/protector)
         PetOwnerKilledUnit(pVictim);
@@ -1110,7 +1127,7 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
             // remember victim PvP death for corpse type and corpse reclaim delay
             // at original death (not at SpiritOfRedemtionTalent timeout)
             if (!damageFromSpiritOfRedemtionTalent)
-                playerVictim->SetPvPDeath(player_tap != NULL);
+                { playerVictim->SetPvPDeath(player_tap != NULL); }
 
             // achievement stuff
             playerVictim->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED, health);
@@ -1158,12 +1175,16 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
                 {
                     // selfkills are not handled in outdoor pvp scripts
                     if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(playerVictim->GetCachedZoneId()))
-                        outdoorPvP->HandlePlayerKill(player_tap, playerVictim);
+                        { outdoorPvP->HandlePlayerKill(player_tap, playerVictim); }
                 }
+
+#ifdef ENABLE_ELUNA
+                sEluna->OnPVPKill(player_tap, playerVictim);
+#endif
             }
         }
         else                                                // Killed creature
-            JustKilledCreature((Creature*)pVictim, player_tap);
+            { JustKilledCreature((Creature*)pVictim, player_tap); }
     }
     else                                                    // if (health <= damage)
     {
@@ -1247,16 +1268,16 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
                 {
                     // skip channeled spell (processed differently below)
                     if (i == CURRENT_CHANNELED_SPELL)
-                        continue;
+                        { continue; }
 
                     if (Spell* spell = pVictim->GetCurrentSpell(CurrentSpellTypes(i)))
                     {
                         if (spell->getState() == SPELL_STATE_PREPARING)
                         {
                             if(spell->m_spellInfo->GetInterruptFlags() & SPELL_INTERRUPT_FLAG_ABORT_ON_DMG)
-                                pVictim->InterruptSpell(CurrentSpellTypes(i));
+                                { pVictim->InterruptSpell(CurrentSpellTypes(i)); }
                             else
-                                spell->Delayed();
+                                { spell->Delayed(); }
                         }
                     }
                 }
@@ -1267,10 +1288,10 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
                 if (spell->getState() == SPELL_STATE_CASTING)
                 {
                     uint32 channelInterruptFlags = spell->m_spellInfo->GetChannelInterruptFlags();
-                    if( channelInterruptFlags & CHANNEL_FLAG_DELAY )
+                    if (channelInterruptFlags & CHANNEL_FLAG_DELAY)
                     {
                         if (pVictim != this)                // don't shorten the duration of channeling if you damage yourself
-                            spell->DelayedChannel();
+                            { spell->DelayedChannel(); }
                     }
                     else if ((channelInterruptFlags & (CHANNEL_FLAG_DAMAGE | CHANNEL_FLAG_DAMAGE2)))
                     {
@@ -1318,7 +1339,7 @@ struct PetOwnerKilledUnitHelper
         if (pTarget->GetTypeId() == TYPEID_UNIT)
         {
             if (((Creature*)pTarget)->AI())
-                ((Creature*)pTarget)->AI()->OwnerKilledUnit(m_victim);
+                { ((Creature*)pTarget)->AI()->OwnerKilledUnit(m_victim); }
         }
     }
 
@@ -1327,14 +1348,14 @@ struct PetOwnerKilledUnitHelper
 
 void Unit::JustKilledCreature(Creature* victim, Player* responsiblePlayer)
 {
-    victim->m_deathState = DEAD;                            // so that isAlive, isDead return expected results in the called hooks of JustKilledCreature
+    victim->m_deathState = DEAD;                            // so that IsAlive, IsDead return expected results in the called hooks of JustKilledCreature
                                                             // must be used only shortly before SetDeathState(JUST_DIED) and only for Creatures or Pets
 
     // some critters required for quests (need normal entry instead possible heroic in any cases)
     if (victim->GetCreatureType() == CREATURE_TYPE_CRITTER && GetTypeId() == TYPEID_PLAYER)
     {
         if (CreatureInfo const* normalInfo = ObjectMgr::GetCreatureTemplate(victim->GetEntry()))
-            ((Player*)this)->KilledMonster(normalInfo, victim->GetObjectGuid());
+            { ((Player*)this)->KilledMonster(normalInfo, victim->GetObjectGuid()); }
     }
 
     // Interrupt channeling spell when a Possessed Summoned is killed
@@ -1346,14 +1367,14 @@ void Unit::JustKilledCreature(Creature* victim, Player* responsiblePlayer)
         {
             Spell* channeledSpell = creator->GetCurrentSpell(CURRENT_CHANNELED_SPELL);
             if (channeledSpell && channeledSpell->m_spellInfo->Id == spellInfo->Id)
-                creator->InterruptNonMeleeSpells(false);
+                { creator->InterruptNonMeleeSpells(false); }
         }
     }
 
     /* ******************************* Inform various hooks ************************************ */
     // Inform victim's AI
     if (victim->AI())
-        victim->AI()->JustDied(this);
+        { victim->AI()->JustDied(this); }
 
     // Inform Owner
     Unit* pOwner = victim->GetCharmerOrOwner();
@@ -1363,30 +1384,36 @@ void Unit::JustKilledCreature(Creature* victim, Player* responsiblePlayer)
         if (pSummon->GetSummonerGuid().IsCreatureOrVehicle())
             if (Creature* pSummoner = victim->GetMap()->GetCreature(pSummon->GetSummonerGuid()))
                 if (pSummoner->AI())
-                    pSummoner->AI()->SummonedCreatureJustDied(victim);
+                    { pSummoner->AI()->SummonedCreatureJustDied(victim); }
     }
     else if (pOwner && pOwner->GetTypeId() == TYPEID_UNIT)
     {
         if (((Creature*)pOwner)->AI())
-            ((Creature*)pOwner)->AI()->SummonedCreatureJustDied(victim);
+            { ((Creature*)pOwner)->AI()->SummonedCreatureJustDied(victim); }
     }
 
     // Inform Instance Data and Linking
     if (InstanceData* mapInstance = victim->GetInstanceData())
-        mapInstance->OnCreatureDeath(victim);
+        { mapInstance->OnCreatureDeath(victim); }
 
     if (responsiblePlayer)                                  // killedby Player, inform BG
         if (BattleGround* bg = responsiblePlayer->GetBattleGround())
             bg->HandleKillUnit(victim, responsiblePlayer);
+
+            // Used by Eluna
+#ifdef ENABLE_ELUNA
+            sEluna->OnCreatureKill(responsiblePlayer, victim);
+#endif /* ENABLE_ELUNA */
+
     // Notify the outdoor pvp script
     if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(responsiblePlayer ? responsiblePlayer->GetCachedZoneId() : GetZoneId()))
-        outdoorPvP->HandleCreatureDeath(victim);
+        { outdoorPvP->HandleCreatureDeath(victim); }
 
     // Start creature death script
     GetMap()->ScriptsStart(sCreatureDeathScripts, victim->GetEntry(), victim, responsiblePlayer ? responsiblePlayer : this);
 
     if (victim->IsLinkingEventTrigger())
-        victim->GetMap()->GetCreatureLinkingHolder()->DoCreatureLinkingEvent(LINKING_EVENT_DIE, victim);
+        { victim->GetMap()->GetCreatureLinkingHolder()->DoCreatureLinkingEvent(LINKING_EVENT_DIE, victim); }
 
     // Dungeon specific stuff
     if (victim->GetInstanceId())
@@ -1399,8 +1426,8 @@ void Unit::JustKilledCreature(Creature* victim, Player* responsiblePlayer)
         {
             if (m->IsRaidOrHeroicDungeon())
             {
-                if (victim->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_INSTANCE_BIND)
-                    ((DungeonMap*)m)->PermBindAllPlayers(creditedPlayer);
+                if (victim->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_INSTANCE_BIND)
+                    { ((DungeonMap*)m)->PermBindAllPlayers(creditedPlayer); }
             }
             else
             {
@@ -1409,9 +1436,8 @@ void Unit::JustKilledCreature(Creature* victim, Player* responsiblePlayer)
                 // until the players leave the instance
                 time_t resettime = victim->GetRespawnTimeEx() + 2 * HOUR;
                 if (save->GetResetTime() < resettime)
-                    save->SetResetTime(resettime);
+                    { save->SetResetTime(resettime); }
             }
-
             // update encounter state if needed
             ((DungeonMap*)m)->GetPersistanceState()->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, victim->GetEntry());
         }
@@ -1424,7 +1450,7 @@ void Unit::JustKilledCreature(Creature* victim, Player* responsiblePlayer)
     victim->SetDeathState(JUST_DIED);                       // if !spiritOfRedemtionTalentReady always true for unit
 
     if (isPet)
-        return;                                             // Pets might have been unsummoned at this place, do not handle them further!
+        { return; }                                             // Pets might have been unsummoned at this place, do not handle them further!
 
     /* ******************************** Prepare loot if can ************************************ */
     victim->DeleteThreatList();
@@ -1444,7 +1470,7 @@ void Unit::CastStop(uint32 except_spellid)
 {
     for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; ++i)
         if (m_currentSpells[i] && m_currentSpells[i]->m_spellInfo->Id != except_spellid)
-            InterruptSpell(CurrentSpellTypes(i), false);
+            { InterruptSpell(CurrentSpellTypes(i), false); }
 }
 
 void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item* castItem, Aura* triggeredByAura, ObjectGuid originalCaster, SpellEntry const* triggeredBy)
@@ -1454,9 +1480,9 @@ void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item* castIte
     if (!spellInfo)
     {
         if (triggeredByAura)
-            sLog.outError("CastSpell: unknown spell id %i by caster: %s triggered by aura %u (eff %u)", spellId, GetGuidStr().c_str(), triggeredByAura->GetId(), triggeredByAura->GetEffIndex());
+            { sLog.outError("CastSpell: unknown spell id %i by caster: %s triggered by aura %u (eff %u)", spellId, GetGuidStr().c_str(), triggeredByAura->GetId(), triggeredByAura->GetEffIndex()); }
         else
-            sLog.outError("CastSpell: unknown spell id %i by caster: %s", spellId, GetGuidStr().c_str());
+            { sLog.outError("CastSpell: unknown spell id %i by caster: %s", spellId, GetGuidStr().c_str()); }
         return;
     }
 
@@ -1468,19 +1494,19 @@ void Unit::CastSpell(Unit* Victim, SpellEntry const* spellInfo, bool triggered,
     if (!spellInfo)
     {
         if (triggeredByAura)
-            sLog.outError("CastSpell: unknown spell by caster: %s triggered by aura %u (eff %u)", GetGuidStr().c_str(), triggeredByAura->GetId(), triggeredByAura->GetEffIndex());
+            { sLog.outError("CastSpell: unknown spell by caster: %s triggered by aura %u (eff %u)", GetGuidStr().c_str(), triggeredByAura->GetId(), triggeredByAura->GetEffIndex()); }
         else
-            sLog.outError("CastSpell: unknown spell by caster: %s", GetGuidStr().c_str());
+            { sLog.outError("CastSpell: unknown spell by caster: %s", GetGuidStr().c_str()); }
         return;
     }
 
     if (castItem)
-        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "WORLD: cast Item spellId - %i", spellInfo->Id);
+        { DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "WORLD: cast Item spellId - %i", spellInfo->Id); }
 
     if (triggeredByAura)
     {
         if (!originalCaster)
-            originalCaster = triggeredByAura->GetCasterGuid();
+            { originalCaster = triggeredByAura->GetCasterGuid(); }
 
         triggeredBy = triggeredByAura->GetSpellProto();
     }
@@ -1500,7 +1526,7 @@ void Unit::CastSpell(Unit* Victim, SpellEntry const* spellInfo, bool triggered,
     targets.setUnitTarget(Victim);
 
     if (spellInfo->GetTargets() & TARGET_FLAG_DEST_LOCATION)
-        targets.setDestination(Victim->GetPositionX(), Victim->GetPositionY(), Victim->GetPositionZ());
+        { targets.setDestination(Victim->GetPositionX(), Victim->GetPositionY(), Victim->GetPositionZ()); }
     if (spellInfo->GetTargets() & TARGET_FLAG_SOURCE_LOCATION)
         if (WorldObject* caster = spell->GetCastingObject())
             targets.setSource(caster->GetPositionX(), caster->GetPositionY(), caster->GetPositionZ());
@@ -1518,7 +1544,7 @@ void Unit::CastCustomSpell(Unit* Victim, uint32 spellId, int32 const* bp0, int32
         if (triggeredByAura)
             sLog.outError("CastCustomSpell: unknown spell id %i by caster: %s triggered by aura %u (eff %u)", spellId, GetGuidStr().c_str(), triggeredByAura->GetId(), triggeredByAura->GetEffIndex());
         else
-            sLog.outError("CastCustomSpell: unknown spell id %i by caster: %s", spellId, GetGuidStr().c_str());
+            { sLog.outError("CastCustomSpell: unknown spell id %i by caster: %s", spellId, GetGuidStr().c_str()); }
         return;
     }
 
@@ -1537,12 +1563,12 @@ void Unit::CastCustomSpell(Unit* Victim, SpellEntry const* spellInfo, int32 cons
     }
 
     if (castItem)
-        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "WORLD: cast Item spellId - %i", spellInfo->Id);
+        { DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "WORLD: cast Item spellId - %i", spellInfo->Id); }
 
     if (triggeredByAura)
     {
         if (!originalCaster)
-            originalCaster = triggeredByAura->GetCasterGuid();
+            { originalCaster = triggeredByAura->GetCasterGuid(); }
 
         triggeredBy = triggeredByAura->GetSpellProto();
     }
@@ -1550,23 +1576,23 @@ void Unit::CastCustomSpell(Unit* Victim, SpellEntry const* spellInfo, int32 cons
     Spell* spell = new Spell(this, spellInfo, triggered, originalCaster, triggeredBy);
 
     if (bp0)
-        spell->m_currentBasePoints[EFFECT_INDEX_0] = *bp0;
+        { spell->m_currentBasePoints[EFFECT_INDEX_0] = *bp0; }
 
     if (bp1)
-        spell->m_currentBasePoints[EFFECT_INDEX_1] = *bp1;
+        { spell->m_currentBasePoints[EFFECT_INDEX_1] = *bp1; }
 
     if (bp2)
-        spell->m_currentBasePoints[EFFECT_INDEX_2] = *bp2;
+        { spell->m_currentBasePoints[EFFECT_INDEX_2] = *bp2; }
 
     SpellCastTargets targets;
     targets.setUnitTarget(Victim);
     spell->m_CastItem = castItem;
 
     if (spellInfo->GetTargets() & TARGET_FLAG_DEST_LOCATION)
-        targets.setDestination(Victim->GetPositionX(), Victim->GetPositionY(), Victim->GetPositionZ());
+        { targets.setDestination(Victim->GetPositionX(), Victim->GetPositionY(), Victim->GetPositionZ()); }
     if (spellInfo->GetTargets() & TARGET_FLAG_SOURCE_LOCATION)
         if (WorldObject* caster = spell->GetCastingObject())
-            targets.setSource(caster->GetPositionX(), caster->GetPositionY(), caster->GetPositionZ());
+            { targets.setSource(caster->GetPositionX(), caster->GetPositionY(), caster->GetPositionZ()); }
 
     spell->prepare(&targets, triggeredByAura);
 }
@@ -1601,12 +1627,12 @@ void Unit::CastSpell(float x, float y, float z, SpellEntry const* spellInfo, boo
     }
 
     if (castItem)
-        DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "WORLD: cast Item spellId - %i", spellInfo->Id);
+        { DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "WORLD: cast Item spellId - %i", spellInfo->Id); }
 
     if (triggeredByAura)
     {
         if (!originalCaster)
-            originalCaster = triggeredByAura->GetCasterGuid();
+            { originalCaster = triggeredByAura->GetCasterGuid(); }
 
         triggeredBy = triggeredByAura->GetSpellProto();
     }
@@ -1616,13 +1642,13 @@ void Unit::CastSpell(float x, float y, float z, SpellEntry const* spellInfo, boo
     SpellCastTargets targets;
 
     if (spellInfo->GetTargets() & TARGET_FLAG_DEST_LOCATION)
-        targets.setDestination(x, y, z);
+        { targets.setDestination(x, y, z); }
     if (spellInfo->GetTargets() & TARGET_FLAG_SOURCE_LOCATION)
-        targets.setSource(x, y, z);
+        { targets.setSource(x, y, z); }
 
     // Spell cast with x,y,z but without dbc target-mask, set destination
     if (!(targets.m_targetMask & (TARGET_FLAG_DEST_LOCATION | TARGET_FLAG_SOURCE_LOCATION)))
-        targets.setDestination(x, y, z);
+        { targets.setDestination(x, y, z); }
 
     spell->m_CastItem = castItem;
     spell->prepare(&targets, triggeredByAura);
@@ -1647,12 +1673,12 @@ void Unit::CalculateSpellDamage(SpellNonMeleeDamage* damageInfo, int32 damage, S
     Unit* pVictim = damageInfo->target;
 
     if (damage < 0)
-        return;
+        { return; }
 
     if (!this || !pVictim)
-        return;
+        { return; }
     if (!this->IsAlive() || !pVictim->IsAlive())
-        return;
+        { return; }
 
     // Check spell crit chance
     bool crit = IsSpellCrit(pVictim, spellInfo, damageSchoolMask, attackType);
@@ -1718,22 +1744,22 @@ void Unit::CalculateSpellDamage(SpellNonMeleeDamage* damageInfo, int32 damage, S
         }
     }
     else
-        damage = 0;
+        { damage = 0; }
     damageInfo->damage = damage;
 }
 
 void Unit::DealSpellDamage(SpellNonMeleeDamage* damageInfo, bool durabilityLoss)
 {
     if (!damageInfo)
-        return;
+        { return; }
 
     Unit* pVictim = damageInfo->target;
 
     if (!this || !pVictim)
-        return;
+        { return; }
 
     if (!pVictim->IsAlive() || pVictim->IsTaxiFlying() || (pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode()))
-        return;
+        { return; }
 
     SpellEntry const* spellProto = sSpellStore.LookupEntry(damageInfo->SpellID);
     if (spellProto == NULL)
@@ -1773,9 +1799,9 @@ void Unit::CalculateMeleeDamage(Unit* pVictim, uint32 damage, CalcDamageInfo* da
     damageInfo->hitOutCome       = MELEE_HIT_EVADE;
 
     if (!this || !pVictim)
-        return;
+        { return; }
     if (!this->IsAlive() || !pVictim->IsAlive())
-        return;
+        { return; }
 
     // Select HitInfo/procAttacker/procVictim flag based on attack type
     switch (attackType)
@@ -1914,7 +1940,7 @@ void Unit::CalculateMeleeDamage(Unit* pVictim, uint32 damage, CalcDamageInfo* da
                 damageInfo->procEx |= PROC_EX_FULL_BLOCK;
             }
             else
-                damageInfo->procEx |= PROC_EX_NORMAL_HIT;   // Partial blocks can still cause attacker procs
+                { damageInfo->procEx |= PROC_EX_NORMAL_HIT; }   // Partial blocks can still cause attacker procs
 
             damageInfo->damage      -= damageInfo->blocked_amount;
             damageInfo->cleanDamage += damageInfo->blocked_amount;
@@ -1956,17 +1982,17 @@ void Unit::CalculateMeleeDamage(Unit* pVictim, uint32 damage, CalcDamageInfo* da
 
             // apply max/min bounds
             if (lowEnd < 0.01f)                             // the low end must not go bellow 0.01f
-                lowEnd = 0.01f;
+                { lowEnd = 0.01f; }
             else if (lowEnd > maxLowEnd)                    // the smaller value of this and 0.6 is kept as the low end
-                lowEnd = maxLowEnd;
+                { lowEnd = maxLowEnd; }
 
             if (highEnd < 0.2f)                             // high end limits
-                highEnd = 0.2f;
+                { highEnd = 0.2f; }
             if (highEnd > 0.99f)
-                highEnd = 0.99f;
+                { highEnd = 0.99f; }
 
             if (lowEnd > highEnd)                           // prevent negative range size
-                lowEnd = highEnd;
+                { lowEnd = highEnd; }
 
             reducePercent = lowEnd + rand_norm_f() * (highEnd - lowEnd);
 
@@ -2012,22 +2038,22 @@ void Unit::CalculateMeleeDamage(Unit* pVictim, uint32 damage, CalcDamageInfo* da
             damageInfo->procEx |= PROC_EX_ABSORB;
         }
         if (damageInfo->resist)
-            damageInfo->HitInfo |= HITINFO_RESIST;
+            { damageInfo->HitInfo |= HITINFO_RESIST; }
     }
     else // Umpossible get negative result but....
-        damageInfo->damage = 0;
+        { damageInfo->damage = 0; }
 }
 
 void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
 {
-    if (damageInfo == 0) return;
+    if (damageInfo == 0) { return; }
     Unit* pVictim = damageInfo->target;
 
     if (!this || !pVictim)
-        return;
+        { return; }
 
     if (!pVictim->IsAlive() || pVictim->IsTaxiFlying() || (pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode()))
-        return;
+        { return; }
 
     // You don't lose health from damage taken from another player while in a sanctuary
     // You still see it in the combat log though
@@ -2036,10 +2062,11 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
 
     // Hmmmm dont like this emotes client must by self do all animations
     if (damageInfo->HitInfo & HITINFO_CRITICALHIT)
-        pVictim->HandleEmoteCommand(EMOTE_ONESHOT_WOUNDCRITICAL);
+        { pVictim->HandleEmoteCommand(EMOTE_ONESHOT_WOUNDCRITICAL); }
     if (damageInfo->blocked_amount && damageInfo->TargetState != VICTIMSTATE_BLOCKS)
-        pVictim->HandleEmoteCommand(EMOTE_ONESHOT_PARRYSHIELD);
+        { pVictim->HandleEmoteCommand(EMOTE_ONESHOT_PARRYSHIELD); }
 
+    // This seems to reduce the victims time until next attack if your attack was parried
     if (damageInfo->TargetState == VICTIMSTATE_PARRY)
     {
         // Get attack timers
@@ -2082,7 +2109,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
 
     // If this is a creature and it attacks from behind it has a probability to daze it's victim
     if ((damageInfo->hitOutCome == MELEE_HIT_CRIT || damageInfo->hitOutCome == MELEE_HIT_CRUSHING || damageInfo->hitOutCome == MELEE_HIT_NORMAL || damageInfo->hitOutCome == MELEE_HIT_GLANCING) &&
-            GetTypeId() != TYPEID_PLAYER && !((Creature*)this)->GetCharmerOrOwnerGuid() && !pVictim->HasInArc(M_PI_F, this))
+        GetTypeId() != TYPEID_PLAYER && !((Creature*)this)->GetCharmerOrOwnerGuid() && !pVictim->HasInArc(M_PI_F, this))
     {
         // -probability is between 0% and 40%
         // 20% base chance
@@ -2090,7 +2117,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
 
         // there is a newbie protection, at level 10 just 7% base chance; assuming linear function
         if (pVictim->getLevel() < 30)
-            Probability = 0.65f * pVictim->getLevel() + 0.5f;
+            { Probability = 0.65f * pVictim->getLevel() + 0.5f; }
 
         uint32 VictimDefense = pVictim->GetMaxSkillValueForLevel(this);
         uint32 AttackerMeleeSkill = GetMaxSkillValueForLevel();
@@ -2098,10 +2125,10 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
         Probability *= AttackerMeleeSkill / (float)VictimDefense;
 
         if (Probability > 40.0f)
-            Probability = 40.0f;
+            { Probability = 40.0f; }
 
         if (roll_chance_f(Probability))
-            CastSpell(pVictim, 1604, true);
+            { CastSpell(pVictim, 1604, true); }
     }
 
     // If not miss
@@ -2109,7 +2136,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
     {
         // on weapon hit casts
         if (GetTypeId() == TYPEID_PLAYER && pVictim->IsAlive())
-            ((Player*)this)->CastItemCombatSpell(pVictim, damageInfo->attackType);
+            { ((Player*)this)->CastItemCombatSpell(pVictim, damageInfo->attackType); }
 
         // victim's damage shield
         std::set<Aura*> alreadyDone;
@@ -2121,14 +2148,11 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
                 alreadyDone.insert(*i);
                 uint32 damage = (*i)->GetModifier()->m_amount;
                 SpellEntry const* i_spellProto = (*i)->GetSpellProto();
-
-                //uint32 absorb, resist;
-                //CalculateDamageAbsorbAndResist(pVictim, GetSpellSchoolMask(i_spellProto), SPELL_DIRECT_DAMAGE, damage, &absorb, &resist);
-
-                //if (damage >= absorb + resist)
-                //    damage -= absorb + resist;
-                //else
-                //    damage = 0;
+                // Calculate absorb resist ??? no data in opcode for this possibly unable to absorb or resist?
+                // uint32 absorb;
+                // uint32 resist;
+                // CalcAbsorbResist(pVictim, SpellSchools(spellProto->School), SPELL_DIRECT_DAMAGE, damage, &absorb, &resist);
+                // damage-=absorb + resist;
 
                 pVictim->DealDamageMods(this, damage, NULL);
 
@@ -2150,7 +2174,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
                 i = vDamageShields.begin();
             }
             else
-                ++i;
+                { ++i; }
         }
     }
 }
@@ -2172,13 +2196,13 @@ void Unit::HandleEmoteState(uint32 emote_id)
 void Unit::HandleEmote(uint32 emote_id)
 {
     if (!emote_id)
-        HandleEmoteState(0);
+        { HandleEmoteState(0); }
     else if (EmotesEntry const* emoteEntry = sEmotesStore.LookupEntry(emote_id))
     {
         if (emoteEntry->EmoteType)                          // 1,2 states, 0 command
-            HandleEmoteState(emote_id);
+            { HandleEmoteState(emote_id); }
         else
-            HandleEmoteCommand(emote_id);
+            { HandleEmoteCommand(emote_id); }
     }
 }
 
@@ -2235,7 +2259,7 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage)
     }
 
     if (armor < 0.0f)
-        armor = 0.0f;
+        { armor = 0.0f; }
 
     float levelModifier = (float)getLevel();
     if (levelModifier > 59)
@@ -2245,9 +2269,9 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage)
     tmpvalue = tmpvalue / (1.0f + tmpvalue);
 
     if (tmpvalue < 0.0f)
-        tmpvalue = 0.0f;
+        { tmpvalue = 0.0f; }
     if (tmpvalue > 0.75f)
-        tmpvalue = 0.75f;
+        { tmpvalue = 0.75f; }
 
     newdamage = uint32(damage - (damage * tmpvalue));
 
@@ -2257,7 +2281,7 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage)
 void Unit::CalculateDamageAbsorbAndResist(Unit* pCaster, SpellSchoolMask schoolMask, DamageEffectType damagetype, const uint32 damage, uint32* absorb, uint32* resist, bool canReflect)
 {
     if (!pCaster || !IsAlive() || !damage)
-        return;
+        { return; }
 
     // Magic damage, check for resists
     if ((schoolMask & SPELL_SCHOOL_MASK_NORMAL) == 0)
@@ -2272,9 +2296,9 @@ void Unit::CalculateDamageAbsorbAndResist(Unit* pCaster, SpellSchoolMask schoolM
 
         tmpvalue2 *= (float)(0.15f / getLevel());
         if (tmpvalue2 < 0.0f)
-            tmpvalue2 = 0.0f;
+            { tmpvalue2 = 0.0f; }
         if (tmpvalue2 > 0.75f)
-            tmpvalue2 = 0.75f;
+            { tmpvalue2 = 0.75f; }
         uint32 ran = urand(0, 100);
         float faq[4] = {24.0f, 6.0f, 4.0f, 6.0f};
         uint8 m = 0;
@@ -2283,19 +2307,19 @@ void Unit::CalculateDamageAbsorbAndResist(Unit* pCaster, SpellSchoolMask schoolM
         {
             Binom += 2400 * (powf(tmpvalue2, float(i)) * powf((1 - tmpvalue2), float(4 - i))) / faq[i];
             if (ran > Binom)
-                ++m;
+                { ++m; }
             else
-                break;
+                { break; }
         }
         if (damagetype == DOT && m == 4)
-            *resist += uint32(damage - 1);
+            { *resist += uint32(damage - 1); }
         else
-            *resist += uint32(damage * m / 4);
+            { *resist += uint32(damage * m / 4); }
         if (*resist > damage)
-            *resist = damage;
+            { *resist = damage; }
     }
     else
-        *resist = 0;
+        { *resist = 0; }
 
     int32 RemainingDamage = damage - *resist;
 
@@ -2573,7 +2597,7 @@ void Unit::CalculateDamageAbsorbAndResist(Unit* pCaster, SpellSchoolMask schoolM
         // currentAbsorb - damage can be absorbed by shield
         // If need absorb less damage
         if (RemainingDamage < currentAbsorb)
-            currentAbsorb = RemainingDamage;
+            { currentAbsorb = RemainingDamage; }
 
         RemainingDamage -= currentAbsorb;
 
@@ -2585,10 +2609,10 @@ void Unit::CalculateDamageAbsorbAndResist(Unit* pCaster, SpellSchoolMask schoolM
         // Reduce shield amount
         mod->m_amount -= currentAbsorb;
         if ((*i)->GetHolder()->DropAuraCharge())
-            mod->m_amount = 0;
+            { mod->m_amount = 0; }
         // Need remove it later
         if (mod->m_amount <= 0)
-            existExpired = true;
+            { existExpired = true; }
     }
 
     // Remove all expired absorb auras
@@ -2602,7 +2626,7 @@ void Unit::CalculateDamageAbsorbAndResist(Unit* pCaster, SpellSchoolMask schoolM
                 i = vSchoolAbsorb.begin();
             }
             else
-                ++i;
+                { ++i; }
         }
     }
 
@@ -2621,24 +2645,24 @@ void Unit::CalculateDamageAbsorbAndResist(Unit* pCaster, SpellSchoolMask schoolM
 
         // check damage school mask
         if (((*i)->GetModifier()->m_miscvalue & schoolMask) == 0)
-            continue;
+            { continue; }
 
         int32 currentAbsorb;
         if (RemainingDamage >= (*i)->GetModifier()->m_amount)
-            currentAbsorb = (*i)->GetModifier()->m_amount;
+            { currentAbsorb = (*i)->GetModifier()->m_amount; }
         else
-            currentAbsorb = RemainingDamage;
+            { currentAbsorb = RemainingDamage; }
 
         SpellEffectEntry const* spellEffect = (*i)->GetSpellProto()->GetSpellEffect((*i)->GetEffIndex());
 
         if (float manaMultiplier = (spellEffect ? spellEffect->EffectMultipleValue : 0))
         {
             if (Player* modOwner = GetSpellModOwner())
-                modOwner->ApplySpellMod((*i)->GetId(), SPELLMOD_MULTIPLE_VALUE, manaMultiplier);
+                { modOwner->ApplySpellMod((*i)->GetId(), SPELLMOD_MULTIPLE_VALUE, manaMultiplier); }
 
             int32 maxAbsorb = int32(GetPower(POWER_MANA) / manaMultiplier);
             if (currentAbsorb > maxAbsorb)
-                currentAbsorb = maxAbsorb;
+                { currentAbsorb = maxAbsorb; }
 
             int32 manaReduction = int32(currentAbsorb * manaMultiplier);
             ApplyPowerMod(POWER_MANA, manaReduction, false);
@@ -3004,7 +3028,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* pVictim, WeaponAttackT
         else
             parry_chance -= GetTotalAuraModifier(SPELL_AURA_MOD_EXPERTISE) * 25;
 
-        if (parry_chance > 0 && (pVictim->GetTypeId() == TYPEID_PLAYER || !(((Creature*)pVictim)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_PARRY)))
+        if (parry_chance > 0 && (pVictim->GetTypeId() == TYPEID_PLAYER || !(((Creature*)pVictim)->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NO_PARRY)))
         {
             parry_chance -= skillBonus;
 
@@ -3042,7 +3066,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* pVictim, WeaponAttackT
     // check if attack comes from behind, nobody can parry or block if attacker is behind
     if (!from_behind)
     {
-        if (pVictim->GetTypeId() == TYPEID_PLAYER || !(((Creature*)pVictim)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_BLOCK))
+        if (pVictim->GetTypeId() == TYPEID_PLAYER || !(((Creature*)pVictim)->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NO_BLOCK))
         {
             tmp = block_chance;
             if ((tmp > 0)                                   // check if unit _can_ block
@@ -3068,7 +3092,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* pVictim, WeaponAttackT
     if (GetLevelForTarget(pVictim) >= pVictim->GetLevelForTarget(this) + 4 &&
             // can be from by creature (if can) or from controlled player that considered as creature
             ((GetTypeId() != TYPEID_PLAYER && !((Creature*)this)->IsPet() &&
-              !(((Creature*)this)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_CRUSH)) ||
+              !(((Creature*)this)->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NO_CRUSH)) ||
              GetTypeId() == TYPEID_PLAYER && GetCharmerOrOwnerGuid()))
     {
         // when their weapon skill is 15 or more above victim's defense skill
@@ -3199,10 +3223,10 @@ bool Unit::IsSpellBlocked(Unit* pCaster, SpellEntry const* spellEntry, WeaponAtt
     }
     */
 
-    // Check creatures flags_extra for disable block
+    // Check creatures ExtraFlags for disable block
     if (GetTypeId() == TYPEID_UNIT)
     {
-        if (((Creature*)this)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_BLOCK)
+        if (((Creature*)this)->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_NO_BLOCK)
             return false;
     }
 
@@ -3335,10 +3359,10 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit* pVictim, SpellEntry const* spell)
         if (!pVictim->HasAuraType(SPELL_AURA_MOD_PARRY_FROM_BEHIND_PERCENT))
             canParry = false;
     }
-    // Check creatures flags_extra for disable parry
+    // Check creatures ExtraFlags for disable parry
     if (pVictim->GetTypeId() == TYPEID_UNIT)
     {
-        uint32 flagEx = ((Creature*)pVictim)->GetCreatureInfo()->flags_extra;
+        uint32 flagEx = ((Creature*)pVictim)->GetCreatureInfo()->ExtraFlags;
         if (flagEx & CREATURE_FLAG_EXTRA_NO_PARRY)
             canParry = false;
     }
@@ -6666,7 +6690,7 @@ uint32 Unit::SpellDamageBonusDone(Unit* pVictim, SpellEntry const* spellProto, u
 
     // Creature damage
     if (GetTypeId() == TYPEID_UNIT && !((Creature*)this)->IsPet())
-        DoneTotalMod *= ((Creature*)this)->GetSpellDamageMod(((Creature*)this)->GetCreatureInfo()->rank);
+        DoneTotalMod *= ((Creature*)this)->GetSpellDamageMod(((Creature*)this)->GetCreatureInfo()->Rank);
 
     AuraList const& mModDamagePercentDone = GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
     for (AuraList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i)
@@ -8219,10 +8243,60 @@ void Unit::Unmount(bool from_aura)
         if (Pet* pet = GetPet())
             pet->ApplyModeFlags(PET_MODE_DISABLE_ACTIONS, false);
         else
-            ((Player*)this)->ResummonPetTemporaryUnSummonedIfAny();
+            { ((Player*)this)->ResummonPetTemporaryUnSummonedIfAny(); }
     }
 }
 
+bool Unit::IsNearWaypoint(float currentPositionX, float currentPositionY, float currentPositionZ, float destinationPostionX, float destinationPostionY, float destinationPostionZ, float distanceX, float distanceY, float distanceZ)
+{
+    // actual distance between the creature's X ordinate and destination X ordinate
+    float xDifference = 0;
+    // actual distance between the creature's Y ordinate and destination Y ordinate
+    float yDifference = 0;
+    // actual distance between the creature's Z ordinate and destination Y ordinate
+    float zDifference = 0;
+
+    // distanceX == 0, means do not test the distance between the creature's current X ordinate and the destination X ordinate
+    // A test for 0 is used, because it is not worth testing for exact coordinates, seeing as we have to use an integar in the database for the event parameters that holds the cordinates.
+    // Therefore a test for the distance between waypoints does the job more than well enough
+    if (distanceX > 0)
+    {
+        if (currentPositionX > destinationPostionX)
+            xDifference = currentPositionX - destinationPostionX;
+        else
+            xDifference = destinationPostionX - currentPositionX;
+    }
+    // distanceY == 0, means do not test the distance between the creature's current Y ordinate and the destination Y ordinate
+    if (distanceY > 0)
+    {
+        if (currentPositionY > destinationPostionY)
+            yDifference = currentPositionY - destinationPostionY;
+        else
+            yDifference = destinationPostionY - currentPositionY;
+    }
+    // distanceZ == 0, means do not test the distance between the creature's current Z ordinate and the destination Z ordinate
+    if (distanceZ > 0)
+    {
+        if (currentPositionZ > destinationPostionZ)
+            zDifference = currentPositionZ - destinationPostionZ;
+        else
+            zDifference = destinationPostionZ - currentPositionZ;
+    }
+
+    // check based on which ordinates to test the current distance from (distance along the X, and/or Y, and/or Z ordinates)
+    if (((distanceX > 0 && xDifference < distanceX) && (distanceY > 0 && yDifference < distanceY) && (distanceZ > 0 && zDifference < distanceZ)) ||
+        ((distanceX == 0) && (distanceY > 0 && yDifference < distanceY) && (distanceZ > 0 && zDifference < distanceZ)) ||
+        ((distanceX > 0 && xDifference < distanceX) && (distanceY == 0) && (distanceZ > 0 && zDifference < distanceZ)) ||
+        ((distanceX > 0 && xDifference < distanceX) && (distanceY > 0 && yDifference < distanceY) && (distanceZ == 0)) ||
+        ((distanceX > 0 && xDifference < distanceX) && (distanceY == 0) && (distanceZ == 0)) ||
+        ((distanceX == 0) && (distanceY > 0 && yDifference < distanceY) && (distanceZ == 0)) ||
+        ((distanceX == 0) && (distanceY == 0) && (distanceZ > 0 && zDifference < distanceZ))
+        )
+        return true;
+
+    return false;
+}
+
 MountCapabilityEntry const* Unit::GetMountCapability(uint32 mountType) const
 {
     if (!mountType)
@@ -8321,23 +8395,23 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
 {
     // only alive units can be in combat
     if (!IsAlive())
-        return;
+        { return; }
 
     if (PvP)
-        m_CombatTimer = 5000;
+        { m_CombatTimer = 5000; }
 
     bool creatureNotInCombat = GetTypeId() == TYPEID_UNIT && !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
 
     SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
 
     if (IsCharmed() || (GetTypeId() != TYPEID_PLAYER && ((Creature*)this)->IsPet()))
-        SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PET_IN_COMBAT);
+        { SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PET_IN_COMBAT); }
 
     // interrupt all delayed non-combat casts
     for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; ++i)
         if (Spell* spell = GetCurrentSpell(CurrentSpellTypes(i)))
             if (IsNonCombatSpell(spell->m_spellInfo))
-                InterruptSpell(CurrentSpellTypes(i), false);
+                { InterruptSpell(CurrentSpellTypes(i), false); }
 
     if (getRace() == RACE_WORGEN && !IsInWorgenForm(true) && HasWorgenForm())
         CastSpell(this, 97709, true);   // cast Altered Form
@@ -8354,18 +8428,24 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
         Creature* pCreature = (Creature*)this;
 
         if (pCreature->AI())
-            pCreature->AI()->EnterCombat(enemy);
+            { pCreature->AI()->EnterCombat(enemy); }
 
         // Some bosses are set into combat with zone
-        if (GetMap()->IsDungeon() && (pCreature->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_AGGRO_ZONE) && enemy && enemy->IsControlledByPlayer())
-            pCreature->SetInCombatWithZone();
+        if (GetMap()->IsDungeon() && (pCreature->GetCreatureInfo()->ExtraFlags & CREATURE_FLAG_EXTRA_AGGRO_ZONE) && enemy && enemy->IsControlledByPlayer())
+            { pCreature->SetInCombatWithZone(); }
 
         if (InstanceData* mapInstance = GetInstanceData())
-            mapInstance->OnCreatureEnterCombat(pCreature);
+            { mapInstance->OnCreatureEnterCombat(pCreature); }
 
         if (m_isCreatureLinkingTrigger)
-            GetMap()->GetCreatureLinkingHolder()->DoCreatureLinkingEvent(LINKING_EVENT_AGGRO, pCreature, enemy);
+            { GetMap()->GetCreatureLinkingHolder()->DoCreatureLinkingEvent(LINKING_EVENT_AGGRO, pCreature, enemy); }
     }
+
+    // Used by Eluna
+#ifdef ENABLE_ELUNA
+    if (GetTypeId() == TYPEID_PLAYER)
+        sEluna->OnPlayerEnterCombat(ToPlayer(), enemy);
+#endif /* ENABLE_ELUNA */
 }
 
 void Unit::ClearInCombat()
@@ -8374,7 +8454,13 @@ void Unit::ClearInCombat()
     RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
 
     if (IsCharmed() || (GetTypeId() != TYPEID_PLAYER && ((Creature*)this)->IsPet()))
-        RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PET_IN_COMBAT);
+        { RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PET_IN_COMBAT); }
+
+    // Used by Eluna
+#ifdef ENABLE_ELUNA
+    if (GetTypeId() == TYPEID_PLAYER)
+        sEluna->OnPlayerLeaveCombat(ToPlayer());
+#endif /* ENABLE_ELUNA */
 
     // Player's state will be cleared in Player::UpdateContestedPvP
     if (GetTypeId() == TYPEID_UNIT)
@@ -9528,16 +9614,16 @@ int32 Unit::CalculateSpellDamage(Unit const* target, SpellEntry const* spellProt
 
     if (gtScalingEntry)
     {
-        float scale = gtScalingEntry->value;
+        float Scale = gtScalingEntry->value;
         if (uint32(scalingEntry->castTimeMax) > 0 && uint32(scalingEntry->castScalingMaxLevel) > level)
-            scale *= float(scalingEntry->castTimeMin + float(level - 1) * (scalingEntry->castTimeMax - scalingEntry->castTimeMin) / (scalingEntry->castScalingMaxLevel - 1)) / float(scalingEntry->castTimeMax);
+            Scale *= float(scalingEntry->castTimeMin + float(level - 1) * (scalingEntry->castTimeMax - scalingEntry->castTimeMin) / (scalingEntry->castScalingMaxLevel - 1)) / float(scalingEntry->castTimeMax);
         if (uint32(scalingEntry->coefLevelBase) > level)
-            scale *= (1.0f - scalingEntry->coefBase) * (level - 1) / (scalingEntry->coefLevelBase - 1) + scalingEntry->coefBase;
+            Scale *= (1.0f - scalingEntry->coefBase) * (level - 1) / (scalingEntry->coefLevelBase - 1) + scalingEntry->coefBase;
 
-        basePoints = int32(scalingEntry->coeff1[effect_index] * scale);
-        int32 randomPoints = int32(scalingEntry->coeff1[effect_index] * scale * scalingEntry->coeff2[effect_index]);
+        basePoints = int32(scalingEntry->coeff1[effect_index] * Scale);
+        int32 randomPoints = int32(scalingEntry->coeff1[effect_index] * Scale * scalingEntry->coeff2[effect_index]);
         basePoints += irand(-randomPoints, randomPoints) / 2;
-        comboDamage = uint32(scalingEntry->coeff3[effect_index] * scale);
+        comboDamage = uint32(scalingEntry->coeff3[effect_index] * Scale);
     }
     else
     {
@@ -11109,7 +11195,7 @@ void Unit::UpdateModelData()
 {
     if (CreatureModelInfo const* modelInfo = sObjectMgr.GetCreatureModelInfo(GetDisplayId()))
     {
-        // we expect values in database to be relative to scale = 1.0
+        // we expect values in database to be relative to Scale = 1.0
         SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, GetObjectScale() * modelInfo->bounding_radius);
 
         // never actually update combat_reach for player, it's always the same. Below player case is for initialization
diff --git a/src/game/Object/Unit.h b/src/game/Object/Unit.h
index 8b72d17de..04801a42f 100644
--- a/src/game/Object/Unit.h
+++ b/src/game/Object/Unit.h
@@ -1,4 +1,4 @@
-/**Unit::GetPower
+/**
  * MaNGOS is a full featured server for World of Warcraft, supporting
  * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
  *
@@ -27,10 +27,8 @@
  * @{
  * \file
  */
-
-
-#ifndef __UNIT_H
-#define __UNIT_H
+#ifndef MANGOS_H_UNIT
+#define MANGOS_H_UNIT
 
 #include "Common.h"
 #include "Object.h"
@@ -201,7 +199,7 @@ enum UnitStandFlags
 enum UnitBytes1_Flags
 {
     UNIT_BYTE1_FLAG_ALWAYS_STAND = 0x01,
-    UNIT_BYTE1_FLAG_UNK_2        = 0x02,                    // Creature that can fly and are not on the ground appear to have this flag. If they are on the ground, flag is not present.
+    UNIT_BYTE1_FLAG_FLY_ANIM     = 0x02,                    // Creature that can fly and are not on the ground appear to have this flag. If they are on the ground, flag is not present.
     UNIT_BYTE1_FLAG_UNTRACKABLE  = 0x04,
     UNIT_BYTE1_FLAG_ALL          = 0xFF
 };
@@ -358,17 +356,20 @@ enum DamageTypeToSchool
     DAMAGE_TAKEN
 };
 
+/**
+ * This is what decides how an \ref Aura was removed, the cause of it being removed.
+ */
 enum AuraRemoveMode
 {
     AURA_REMOVE_BY_DEFAULT,
-    AURA_REMOVE_BY_STACK,                                   // at replace by similar aura
-    AURA_REMOVE_BY_CANCEL,
-    AURA_REMOVE_BY_DISPEL,
-    AURA_REMOVE_BY_DEATH,
-    AURA_REMOVE_BY_DELETE,                                  // use for speedup and prevent unexpected effects at player logout/pet unsummon (must be used _only_ after save), delete.
-    AURA_REMOVE_BY_SHIELD_BREAK,                            // when absorb shield is removed by damage, heal absorb debuf
-    AURA_REMOVE_BY_EXPIRE,                                  // at duration end
-    AURA_REMOVE_BY_TRACKING,                                // aura is removed because of a conflicting tracked aura
+    AURA_REMOVE_BY_STACK,           ///< at replace by similar aura
+    AURA_REMOVE_BY_CANCEL,          ///< It was cancelled by the user (needs confirmation)
+    AURA_REMOVE_BY_DISPEL,          ///< It was dispelled by ie Remove Magic
+    AURA_REMOVE_BY_DEATH,           ///< The \ref Unit died and there for it was removed 
+    AURA_REMOVE_BY_DELETE,          ///< use for speedup and prevent unexpected effects at player logout/pet unsummon (must be used _only_ after save), delete.
+    AURA_REMOVE_BY_SHIELD_BREAK,    ///< when absorb shield is removed by damage
+    AURA_REMOVE_BY_EXPIRE,          ///< at duration end
+    AURA_REMOVE_BY_TRACKING         ///< aura is removed because of a conflicting tracked aura
 };
 
 enum UnitMods
@@ -866,10 +867,10 @@ namespace Movement
  */
 enum DiminishingLevels
 {
-    DIMINISHING_LEVEL_1             = 0,         //< Won't make a difference to stun duration
-    DIMINISHING_LEVEL_2             = 1,         //< Reduces stun time by 50%
-    DIMINISHING_LEVEL_3             = 2,         //< Reduces stun time by 75%
-    DIMINISHING_LEVEL_IMMUNE        = 3          //< The target is immune to the DiminishingGrouop
+    DIMINISHING_LEVEL_1             = 0,         ///<Won't make a difference to stun duration
+    DIMINISHING_LEVEL_2             = 1,         ///<Reduces stun time by 50%
+    DIMINISHING_LEVEL_3             = 2,         ///<Reduces stun time by 75%
+    DIMINISHING_LEVEL_IMMUNE        = 3          ///<The target is immune to the DiminishingGrouop
 };
 
 /**
@@ -909,14 +910,16 @@ struct DiminishingReturn
     uint32                  hitCount;
 };
 
-// At least some values expected fixed and used in auras field, other custom
+/**
+ * At least some values expected fixed and used in auras field, other custom
+ */
 enum MeleeHitOutcome
 {
     MELEE_HIT_EVADE     = 0,
     MELEE_HIT_MISS      = 1,
-    MELEE_HIT_DODGE     = 2,                                // used as misc in SPELL_AURA_IGNORE_COMBAT_RESULT
-    MELEE_HIT_BLOCK     = 3,                                // used as misc in SPELL_AURA_IGNORE_COMBAT_RESULT
-    MELEE_HIT_PARRY     = 4,                                // used as misc in SPELL_AURA_IGNORE_COMBAT_RESULT
+    MELEE_HIT_DODGE     = 2,     ///< used as misc in SPELL_AURA_IGNORE_COMBAT_RESULT
+    MELEE_HIT_BLOCK     = 3,     ///< used as misc in SPELL_AURA_IGNORE_COMBAT_RESULT
+    MELEE_HIT_PARRY     = 4,     ///< used as misc in SPELL_AURA_IGNORE_COMBAT_RESULT
     MELEE_HIT_GLANCING  = 5,
     MELEE_HIT_CRIT      = 6,
     MELEE_HIT_CRUSHING  = 7,
@@ -1012,6 +1015,10 @@ struct SpellNonMeleeDamage
     uint32 HitInfo;
 };
 
+/**
+ * Used as a convenience struct for the \ref Unit::SendPeriodicAuraLog
+ * \todo Is it used in more places? Check SpellAuras.cpp for some examples and document it
+ */
 struct SpellPeriodicAuraLogInfo
 {
     SpellPeriodicAuraLogInfo(Aura* _aura, uint32 _damage, uint32 _overDamage, uint32 _absorb, uint32 _resist, float _multiplier, bool _critical = false)
@@ -1153,6 +1160,11 @@ enum ActionBarIndex
 
 #define MAX_UNIT_ACTION_BAR_INDEX (ACTION_BAR_INDEX_END-ACTION_BAR_INDEX_START)
 
+/**
+ * This structure/class is used when someone is charming (ie: mind control spell and the like)
+ * someone else, to get the charmed ones action bar, the spells and such. It also takes care
+ * of pets the charmed one has etc. 
+ */
 struct CharmInfo
 {
     public:
@@ -1680,14 +1692,15 @@ class  Unit : public WorldObject
          * \see EUnitFields
          * \see GetUInt32Value
          */
+        bool HealthAbovePctHealed(int32 pct, uint32 heal) const { return uint64(GetHealth()) + uint64(heal) > CountPctFromMaxHealth(pct); }          
         uint32 GetMaxHealth() const { return GetUInt32Value(UNIT_FIELD_MAXHEALTH); }
 
         bool IsFullHealth() const { return GetHealth() == GetMaxHealth(); }
 
         bool HealthBelowPct(int32 pct) const { return GetHealth() < CountPctFromMaxHealth(pct); }
+        bool HealthBelowPctDamaged(int32 pct, uint32 damage) const { return int64(GetHealth()) - int64(damage) < int64(CountPctFromMaxHealth(pct)); }
         bool HealthAbovePct(int32 pct) const { return GetHealth() > CountPctFromMaxHealth(pct); }
-
-        /** 
+        /**
          * Gets the percent of the health. The formula: (GetHealth() * 100) / GetMaxHealth()
          * @return the current percent of the health
          * \see GetHealth
@@ -2185,26 +2198,119 @@ class  Unit : public WorldObject
         }
         bool IsSpiritService() const { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPIRITHEALER | UNIT_NPC_FLAG_SPIRITGUIDE); }
 
+        /**
+         * Is this unit flying in taxi?
+         * @return true if the Unit has the state \ref UNIT_STAT_TAXI_FLIGHT (is flying in taxi), false otherwise
+         * \see hasUnitState
+         */
         bool IsTaxiFlying()  const { return hasUnitState(UNIT_STAT_TAXI_FLIGHT); }
 
+        /**
+         * Checks to see if a creature, whilst moving along a path, has reached a specific waypoint, or near to
+         * @param currentPositionX is the creature's current X ordinate in the game world
+         * @param currentPositionY is the creature's current Y ordinate in the game world
+         * @param currentPositionZ is the creature's current Z ordinate in the game world
+         * @param destinationPositionX is the in game ordinate that we wish to check against the creature's current X ordinate (are they the same, or very close?)
+         * @param destinationPositionY is the in game ordinate that we wish to check against the creature's current Y ordinate (are they the same, or very close?)
+         * @param destinationPositionZ is the in game ordinate that we wish to check against the creature's current Z ordinate (are they the same, or very close?)
+         * @param distanceX is the distance from the creature's current X ordinate to the destination X ordinate 
+         * @param distanceY is the distance from the creature's current Y ordinate to the destination Y ordinate 
+         * @param distanceZ is the distance from the creature's current Z ordinate to the destination Z ordinate 
+         * 
+         */
+        bool IsNearWaypoint(float currentPositionX, float currentPositionY, float currentPositionZ, float destinationPositionX, float destinationPositionY, float destinationPositionZ, float distanceX, float distanceY, float distanceZ);
+
+
+        /**
+         * Is this unit in combat?
+         * @return true if the Unit has the flag \ref UNIT_FLAG_IN_COMBAT (is in combat), false otherwise
+         * \see EUnitFields
+         * \see UnitFlags
+         */
         bool IsInCombat()  const { return HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); }
+        /**
+         * Sets this \ref Unit into combat, if it already was this has no bigger meaning if the
+         * PvP flag hasn't changed since last time it was applied.
+         * @param PvP whether this was a PvP combat or not, this is important for how quick the combat flag will wear away and possibly more
+         * @param enemy Our target that we are attacking, only does something if the attacked one is a creature it seems
+         * \see ClearInCombat
+         * \see SetInCombatWith
+         */
         void SetInCombatState(bool PvP, Unit* enemy = NULL);
+        /**
+         * Sets us in combat with the given enemy, this in turn just does a few small checks for if
+         * it's a duel or PvP and then calls \ref Unit::SetInCombatState with the correct value for
+         * PvP and enemy
+         * @param enemy the enemy that we are attacking/engaging
+         * \see ClearInCombat
+         * \see SetInCombatState
+         */
         void SetInCombatWith(Unit* enemy);
+        /**
+         * Clears the combat flag for this unit using \ref Object::RemoveFlag and clears
+         * the Unit state \ref UnitState::UNIT_STAT_ATTACK_PLAYER. This is not where a
+         * \ref Player s PvP flags are cleared, that is handled in \ref Player::UpdateContestedPvP
+         * \see EUnitFields
+         */
         void ClearInCombat();
+        /**
+         * Probably returns how long it is until this Unit should get out of PvP combat again,
+         * although not used in that sense.
+         * @return the time we have left from our start of PvP combat
+         * \todo Find out what this actually does/means
+         */
         uint32 GetCombatTimer() const { return m_CombatTimer; }
 
+        /**
+         * Gets all \ref SpellAuraHolder s that have the same given spell_id
+         * @param spell_id the spell_id to search for
+         * @return 2 iterators to the range of \ref SpellAuraHolder s that were found
+         */
         SpellAuraHolderBounds GetSpellAuraHolderBounds(uint32 spell_id)
         {
             return m_spellAuraHolders.equal_range(spell_id);
         }
+        /**
+         * Same as \ref Unit::GetSpellAuraHolderBounds
+         */
         SpellAuraHolderConstBounds GetSpellAuraHolderBounds(uint32 spell_id) const
         {
             return m_spellAuraHolders.equal_range(spell_id);
         }
 
+        /**
+         * Checks if this \ref Unit has the given AuraType
+         * @param auraType the type of aura to look for
+         * @return true if this \ref Unit is affected by the given \ref AuraType, false otherwise
+         */
         bool HasAuraType(AuraType auraType) const;
+        /**
+         * Checks if the given \ref SpellEntry affects the \ref AuraType in some way, this is done
+         * by calling \ref Aura::isAffectedOnSpell which in turn seems to check if the spellProto
+         * and the \ref Aura s own \ref SpellEntry have the same \ref SpellEntry::SpellFamilyName.
+         * (The \ref Aura get's it's \ref SpellEntry by calling \ref Aura::GetSpellProto)
+         * @param auraType the type of aura we want to check
+         * @param spellProto the spell we want to check for affecting the aura type
+         * @return true if the spell affects the given aura type, false otherwise
+         * \todo Is this actually correct, also, make it more clear what it actually checks
+         */
         bool HasAffectedAura(AuraType auraType, SpellEntry const* spellProto) const;
+        /**
+         * Checks if we have at least one \ref Aura that is associated with the given spell id
+         * and \ref SpellEffectIndex.
+         * @param spellId the spell id to look for
+         * @param effIndex the effect index the \ref Aura should have
+         * @return true if there was at least one \ref Aura associated with the id that belonged to
+         * the correct \ref SpellEffectIndex, false otherwise
+         */
         bool HasAura(uint32 spellId, SpellEffectIndex effIndex) const;
+        /**
+         * Checks if we have at least one \ref Aura that is associated with the given spell id via
+         * the \ref Unit::m_spellAuraHolders multimap. Generalized version of the other
+         * \ref Unit::HasAura
+         * @param spellId the spell id to look for
+         * @return true if there was at least one \ref Aura associated with the id, false otherwise
+         */
         bool HasAura(uint32 spellId) const
         {
             return m_spellAuraHolders.find(spellId) != m_spellAuraHolders.end();
@@ -3197,7 +3303,7 @@ class  Unit : public WorldObject
         void setTransForm(uint32 spellid) { m_transform = spellid;}
         uint32 getTransForm() const { return m_transform;}
 
-        // at any changes to scale and/or displayId
+        // at any changes to Scale and/or displayId
         void UpdateModelData();
 
         DynamicObject* GetDynObject(uint32 spellId, SpellEffectIndex effIndex);
diff --git a/src/game/Server/DBCStructure.h b/src/game/Server/DBCStructure.h
index 9135753fe..507c41202 100644
--- a/src/game/Server/DBCStructure.h
+++ b/src/game/Server/DBCStructure.h
@@ -753,7 +753,7 @@ struct CreatureDisplayInfoEntry
     // 1        m_modelID
     // 2        m_soundID
     uint32      ExtendedDisplayInfoID;                      // 3        m_extendedDisplayInfoID -> CreatureDisplayInfoExtraEntry::DisplayExtraId
-    float       scale;                                      // 4        m_creatureModelScale
+    float       Scale;                                      // 4        m_creatureModelScale
     // 5        m_creatureModelAlpha
     // 6-8      m_textureVariation[3]
     // 9        m_portraitTextureName
diff --git a/src/game/Server/SharedDefines.h b/src/game/Server/SharedDefines.h
index d2482253f..5c41e0699 100644
--- a/src/game/Server/SharedDefines.h
+++ b/src/game/Server/SharedDefines.h
@@ -1627,7 +1627,7 @@ enum GameobjectTypes
     GAMEOBJECT_TYPE_GUARDPOST              = 21,
     GAMEOBJECT_TYPE_SPELLCASTER            = 22,
     GAMEOBJECT_TYPE_MEETINGSTONE           = 23,
-    GAMEOBJECT_TYPE_FLAGSTAND              = 24,
+    GAMEOBJECT_CreatureTypeFlagsTAND              = 24,
     GAMEOBJECT_TYPE_FISHINGHOLE            = 25,
     GAMEOBJECT_TYPE_FLAGDROP               = 26,
     GAMEOBJECT_TYPE_MINI_GAME              = 27,
@@ -3140,7 +3140,7 @@ inline SkillType SkillByLockType(LockType locktype)
 {
     switch (locktype)
     {
-        case LOCKTYPE_PICKLOCK:    return SkillType(MAX_SKILL_TYPE);    // no skill for such lock, 'skill' value scales with level
+        case LOCKTYPE_PICKLOCK:    return SkillType(MAX_SKILL_TYPE);    // no skill for such lock, 'skill' value Scales with level
         case LOCKTYPE_HERBALISM:   return SKILL_HERBALISM;
         case LOCKTYPE_MINING:      return SKILL_MINING;
         case LOCKTYPE_FISHING:     return SKILL_FISHING;
diff --git a/src/game/Server/WorldSocket.h b/src/game/Server/WorldSocket.h
index 003301044..f320a9c18 100644
--- a/src/game/Server/WorldSocket.h
+++ b/src/game/Server/WorldSocket.h
@@ -69,7 +69,7 @@ typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> WorldHandler;
  * a queue where it stores packet if there is no place on
  * the queue. The reason this is done, is because the server
  * does really a lot of small-size writes to it, and it doesn't
- * scale well to allocate memory for every. When something is
+ * Scale well to allocate memory for every. When something is
  * written to the output buffer the socket is not immediately
  * activated for output (again for the same reason), there
  * is 10ms celling (thats why there is Update() override method).
diff --git a/src/game/WorldHandlers/Chat.cpp b/src/game/WorldHandlers/Chat.cpp
index 6c0215009..e0177b7f9 100644
--- a/src/game/WorldHandlers/Chat.cpp
+++ b/src/game/WorldHandlers/Chat.cpp
@@ -429,7 +429,7 @@ ChatCommand* ChatHandler::getCommandTable()
         { "money",          SEC_MODERATOR,      false, &ChatHandler::HandleModifyMoneyCommand,         "", NULL },
         { "speed",          SEC_MODERATOR,      false, &ChatHandler::HandleModifySpeedCommand,         "", NULL },
         { "swim",           SEC_MODERATOR,      false, &ChatHandler::HandleModifySwimCommand,          "", NULL },
-        { "scale",          SEC_MODERATOR,      false, &ChatHandler::HandleModifyScaleCommand,         "", NULL },
+        { "Scale",          SEC_MODERATOR,      false, &ChatHandler::HandleModifyScaleCommand,         "", NULL },
         { "bwalk",          SEC_MODERATOR,      false, &ChatHandler::HandleModifyBWalkCommand,         "", NULL },
         { "fly",            SEC_MODERATOR,      false, &ChatHandler::HandleModifyFlyCommand,           "", NULL },
         { "aspeed",         SEC_MODERATOR,      false, &ChatHandler::HandleModifyASpeedCommand,        "", NULL },
diff --git a/src/game/WorldHandlers/GridMap.cpp b/src/game/WorldHandlers/GridMap.cpp
index 9a11e510f..954219ed6 100644
--- a/src/game/WorldHandlers/GridMap.cpp
+++ b/src/game/WorldHandlers/GridMap.cpp
@@ -584,7 +584,7 @@ GridMapLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 Re
     if (data)
     {
         data->entry = entry;
-        data->type_flags = type;
+        data->CreatureTypeFlags = type;
         data->level = liquid_level;
         data->depth_level = ground_level;
     }
@@ -1009,7 +1009,7 @@ GridMapLiquidStatus TerrainInfo::getLiquidStatus(float x, float y, float z, uint
                 data->depth_level = ground_level;
 
                 data->entry = liquid_type;
-                data->type_flags = 1 << liquidFlagType;
+                data->CreatureTypeFlags = 1 << liquidFlagType;
             }
 
             // For speed check as int values
diff --git a/src/game/WorldHandlers/GridMap.h b/src/game/WorldHandlers/GridMap.h
index 64cc53a76..52e928609 100644
--- a/src/game/WorldHandlers/GridMap.h
+++ b/src/game/WorldHandlers/GridMap.h
@@ -117,7 +117,7 @@ enum GridMapLiquidStatus
 
 struct GridMapLiquidData
 {
-    uint32 type_flags;
+    uint32 CreatureTypeFlags;
     uint32 entry;
     float level;
     float depth_level;
diff --git a/src/game/WorldHandlers/InstanceData.cpp b/src/game/WorldHandlers/InstanceData.cpp
index be2e6daf1..147e21157 100644
--- a/src/game/WorldHandlers/InstanceData.cpp
+++ b/src/game/WorldHandlers/InstanceData.cpp
@@ -26,23 +26,24 @@
 #include "Database/DatabaseEnv.h"
 #include "Map.h"
 #include "Log.h"
+#include "WorldPacket.h"
 
 void InstanceData::SaveToDB() const
 {
     // no reason to save BGs/Arenas
     if (instance->IsBattleGroundOrArena())
-        return;
+        { return; }
 
     if (!Save())
-        return;
+        { return; }
 
     std::string data = Save();
     CharacterDatabase.escape_string(data);
 
     if (instance->Instanceable())
-        CharacterDatabase.PExecute("UPDATE instance SET data = '%s' WHERE id = '%u'", data.c_str(), instance->GetInstanceId());
+        { CharacterDatabase.PExecute("UPDATE instance SET data = '%s' WHERE id = '%u'", data.c_str(), instance->GetInstanceId()); }
     else
-        CharacterDatabase.PExecute("UPDATE world SET data = '%s' WHERE map = '%u'", data.c_str(), instance->GetId());
+        { CharacterDatabase.PExecute("UPDATE world SET data = '%s' WHERE map = '%u'", data.c_str(), instance->GetId()); }
 }
 
 bool InstanceData::CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/ /*= NULL*/, uint32 /*miscvalue1*/ /*= 0*/) const
diff --git a/src/game/WorldHandlers/InstanceData.h b/src/game/WorldHandlers/InstanceData.h
index cd3fd94dd..fabe36f5b 100644
--- a/src/game/WorldHandlers/InstanceData.h
+++ b/src/game/WorldHandlers/InstanceData.h
@@ -55,7 +55,7 @@ enum InstanceConditionIDs                                   // Suggested values
     INSTANCE_CONDITION_ID_ULDUAR            = 33113,
 };
 
-class  InstanceData
+class InstanceData
 {
     public:
 
@@ -94,16 +94,19 @@ class  InstanceData
         virtual void OnObjectCreate(GameObject*) {}
 
         // called on creature creation
-        virtual void OnCreatureCreate(Creature * /*creature*/) {}
+        virtual void OnCreatureCreate(Creature* /*creature*/) {}
 
         // called on creature enter combat
-        virtual void OnCreatureEnterCombat(Creature * /*creature*/) {}
+        virtual void OnCreatureEnterCombat(Creature* /*creature*/) {}
 
         // called on creature evade
-        virtual void OnCreatureEvade(Creature * /*creature*/) {}
+        virtual void OnCreatureEvade(Creature* /*creature*/) {}
 
         // called on creature death
-        virtual void OnCreatureDeath(Creature * /*creature*/) {}
+        virtual void OnCreatureDeath(Creature* /*creature*/) {}
+
+        // called on creature despawn
+        virtual void OnCreatureDespawn(Creature* /*creature*/) {}
 
         // All-purpose data storage 64 bit
         virtual uint64 GetData64(uint32 /*Data*/) const { return 0; }
diff --git a/src/game/WorldHandlers/MailHandler.cpp b/src/game/WorldHandlers/MailHandler.cpp
index 17ef65847..331785fba 100644
--- a/src/game/WorldHandlers/MailHandler.cpp
+++ b/src/game/WorldHandlers/MailHandler.cpp
@@ -75,7 +75,7 @@ bool WorldSession::CheckMailBox(ObjectGuid guid)
             return false;
         }
 
-        if (!(creature->GetCreatureInfo()->type_flags & CREATURE_TYPEFLAGS_SQUIRE))
+        if (!(creature->GetCreatureInfo()->CreatureTypeFlags & CREATURE_TYPEFLAGS_SQUIRE))
         {
             DEBUG_LOG("%s not have access to mailbox.", creature->GetGuidStr().c_str());
             return false;
diff --git a/src/game/WorldHandlers/Map.h b/src/game/WorldHandlers/Map.h
index 416844d12..048780c9f 100644
--- a/src/game/WorldHandlers/Map.h
+++ b/src/game/WorldHandlers/Map.h
@@ -28,8 +28,8 @@
 #include "Common.h"
 #include "Platform/Define.h"
 #include "Policies/ThreadingModel.h"
-#include "ace/RW_Thread_Mutex.h"
-#include "ace/Thread_Mutex.h"
+#include <ace/RW_Thread_Mutex.h>
+#include <ace/Thread_Mutex.h>
 
 #include "DBCStructure.h"
 #include "GridDefines.h"
@@ -100,219 +100,219 @@ enum LevelRequirementVsMode
 
 #define MIN_UNLOAD_DELAY      1                             // immediate unload
 
-class  Map : public GridRefManager<NGridType>
+class Map : public GridRefManager<NGridType>
 {
-    friend class MapReference;
-    friend class ObjectGridLoader;
-    friend class ObjectWorldLoader;
+        friend class MapReference;
+        friend class ObjectGridLoader;
+        friend class ObjectWorldLoader;
 
-protected:
-    Map(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode);
+    protected:
+        Map(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode);
 
-public:
-    virtual ~Map();
+    public:
+        virtual ~Map();
 
-    // currently unused for normal maps
-    bool CanUnload(uint32 diff)
-    {
-        if (!m_unloadTimer) { return false; }
-        if (m_unloadTimer <= diff) { return true; }
-        m_unloadTimer -= diff;
-        return false;
-    }
+        // currently unused for normal maps
+        bool CanUnload(uint32 diff)
+        {
+            if (!m_unloadTimer) { return false; }
+            if (m_unloadTimer <= diff) { return true; }
+            m_unloadTimer -= diff;
+            return false;
+        }
 
-    virtual bool Add(Player*);
-    virtual void Remove(Player*, bool);
-    template<class T> void Add(T*);
-    template<class T> void Remove(T*, bool);
+        virtual bool Add(Player*);
+        virtual void Remove(Player*, bool);
+        template<class T> void Add(T*);
+        template<class T> void Remove(T*, bool);
 
-    static void DeleteFromWorld(Player* player);        // player object will deleted at call
+        static void DeleteFromWorld(Player* player);        // player object will deleted at call
 
-    virtual void Update(const uint32&);
+        virtual void Update(const uint32&);
 
-    void MessageBroadcast(Player const*, WorldPacket*, bool to_self);
-    void MessageBroadcast(WorldObject const*, WorldPacket*);
-    void MessageDistBroadcast(Player const*, WorldPacket*, float dist, bool to_self, bool own_team_only = false);
-    void MessageDistBroadcast(WorldObject const*, WorldPacket*, float dist);
+        void MessageBroadcast(Player const*, WorldPacket*, bool to_self);
+        void MessageBroadcast(WorldObject const*, WorldPacket*);
+        void MessageDistBroadcast(Player const*, WorldPacket*, float dist, bool to_self, bool own_team_only = false);
+        void MessageDistBroadcast(WorldObject const*, WorldPacket*, float dist);
 
-    float GetVisibilityDistance() const { return m_VisibleDistance; }
-    // function for setting up visibility distance for maps on per-type/per-Id basis
-    virtual void InitVisibilityDistance();
+        float GetVisibilityDistance() const { return m_VisibleDistance; }
+        // function for setting up visibility distance for maps on per-type/per-Id basis
+        virtual void InitVisibilityDistance();
 
-    void PlayerRelocation(Player*, float x, float y, float z, float angl);
-    void CreatureRelocation(Creature* creature, float x, float y, float z, float orientation);
+        void PlayerRelocation(Player*, float x, float y, float z, float angl);
+        void CreatureRelocation(Creature* creature, float x, float y, float z, float orientation);
 
-    template<class T, class CONTAINER> void Visit(const Cell& cell, TypeContainerVisitor<T, CONTAINER>& visitor);
+        template<class T, class CONTAINER> void Visit(const Cell& cell, TypeContainerVisitor<T, CONTAINER>& visitor);
 
-    bool IsRemovalGrid(float x, float y) const
-    {
-        GridPair p = MaNGOS::ComputeGridPair(x, y);
-        return(!getNGrid(p.x_coord, p.y_coord) || getNGrid(p.x_coord, p.y_coord)->GetGridState() == GRID_STATE_REMOVAL);
-    }
+        bool IsRemovalGrid(float x, float y) const
+        {
+            GridPair p = MaNGOS::ComputeGridPair(x, y);
+            return(!getNGrid(p.x_coord, p.y_coord) || getNGrid(p.x_coord, p.y_coord)->GetGridState() == GRID_STATE_REMOVAL);
+        }
 
-    bool IsLoaded(float x, float y) const
-    {
-        GridPair p = MaNGOS::ComputeGridPair(x, y);
-        return loaded(p);
-    }
+        bool IsLoaded(float x, float y) const
+        {
+            GridPair p = MaNGOS::ComputeGridPair(x, y);
+            return loaded(p);
+        }
 
-    bool GetUnloadLock(const GridPair& p) const { return getNGrid(p.x_coord, p.y_coord)->getUnloadLock(); }
-    void SetUnloadLock(const GridPair& p, bool on) { getNGrid(p.x_coord, p.y_coord)->setUnloadExplicitLock(on); }
-    void LoadGrid(const Cell& cell, bool no_unload = false);
-    bool UnloadGrid(const uint32& x, const uint32& y, bool pForce);
-    virtual void UnloadAll(bool pForce);
+        bool GetUnloadLock(const GridPair& p) const { return getNGrid(p.x_coord, p.y_coord)->getUnloadLock(); }
+        void SetUnloadLock(const GridPair& p, bool on) { getNGrid(p.x_coord, p.y_coord)->setUnloadExplicitLock(on); }
+        void LoadGrid(const Cell& cell, bool no_unload = false);
+        bool UnloadGrid(const uint32& x, const uint32& y, bool pForce);
+        virtual void UnloadAll(bool pForce);
 
-    void ResetGridExpiry(NGridType& grid, float factor = 1) const
-    {
-        grid.ResetTimeTracker((time_t)((float)i_gridExpiry * factor));
-    }
+        void ResetGridExpiry(NGridType& grid, float factor = 1) const
+        {
+            grid.ResetTimeTracker((time_t)((float)i_gridExpiry * factor));
+        }
 
-    time_t GetGridExpiry(void) const { return i_gridExpiry; }
-    uint32 GetId(void) const { return i_id; }
+        time_t GetGridExpiry(void) const { return i_gridExpiry; }
+        uint32 GetId(void) const { return i_id; }
 
-    // some calls like isInWater should not use vmaps due to processor power
-    // can return INVALID_HEIGHT if under z+2 z coord not found height
+        // some calls like isInWater should not use vmaps due to processor power
+        // can return INVALID_HEIGHT if under z+2 z coord not found height
 
-    virtual void RemoveAllObjectsInRemoveList();
+        virtual void RemoveAllObjectsInRemoveList();
 
-    bool CreatureRespawnRelocation(Creature* c);        // used only in CreatureRelocation and ObjectGridUnloader
+        bool CreatureRespawnRelocation(Creature* c);        // used only in CreatureRelocation and ObjectGridUnloader
 
-    bool CheckGridIntegrity(Creature* c, bool moved) const;
+        bool CheckGridIntegrity(Creature* c, bool moved) const;
 
-    uint32 GetInstanceId() const { return i_InstanceId; }
-    virtual bool CanEnter(Player* player);
-    const char* GetMapName() const;
+        uint32 GetInstanceId() const { return i_InstanceId; }
+        virtual bool CanEnter(Player* player);
+        const char* GetMapName() const;
 
-    // have meaning only for instanced map (that have set real difficulty), NOT USE its for BaseMap
-    // _currently_ spawnmode == difficulty, but this can be changes later, so use appropriate spawnmode/difficult functions
-    // for simplify later code support
-    // regular difficulty = continent/dungeon normal/first raid normal difficulty
-    uint8 GetSpawnMode() const { return (i_spawnMode); }
-    Difficulty GetDifficulty() const { return Difficulty(GetSpawnMode()); }
-    bool IsRegularDifficulty() const { return GetDifficulty() == REGULAR_DIFFICULTY; }
-    uint32 GetMaxPlayers() const;                       // dependent from map difficulty
-    uint32 GetMaxResetDelay() const;                    // dependent from map difficulty
-    MapDifficultyEntry const* GetMapDifficulty() const; // dependent from map difficulty
+        // have meaning only for instanced map (that have set real difficulty), NOT USE its for BaseMap
+        // _currently_ spawnmode == difficulty, but this can be changes later, so use appropriate spawnmode/difficult functions
+        // for simplify later code support
+        // regular difficulty = continent/dungeon normal/first raid normal difficulty
+        uint8 GetSpawnMode() const { return (i_spawnMode); }
+        Difficulty GetDifficulty() const { return Difficulty(GetSpawnMode()); }
+        bool IsRegularDifficulty() const { return GetDifficulty() == REGULAR_DIFFICULTY; }
+        uint32 GetMaxPlayers() const;                       // dependent from map difficulty
+        uint32 GetMaxResetDelay() const;                    // dependent from map difficulty
+        MapDifficultyEntry const* GetMapDifficulty() const; // dependent from map difficulty
 
-    bool Instanceable() const { return i_mapEntry && i_mapEntry->Instanceable(); }
-    // NOTE: this duplicate of Instanceable(), but Instanceable() can be changed when BG also will be instanceable
-    bool IsDungeon() const { return i_mapEntry && i_mapEntry->IsDungeon(); }
-    bool IsRaid() const { return i_mapEntry && i_mapEntry->IsRaid(); }
-    bool IsHeroic() const { return IsRaid() ? i_spawnMode >= RAID_DIFFICULTY_10MAN_HEROIC : i_spawnMode >= DUNGEON_DIFFICULTY_HEROIC; }
-    bool IsNonRaidDungeon() const { return i_mapEntry && i_mapEntry->IsNonRaidDungeon(); }
-    bool IsRaidOrHeroicDungeon() const { return IsRaid() || GetDifficulty() > DUNGEON_DIFFICULTY_NORMAL; }
-    bool IsBattleGround() const { return i_mapEntry && i_mapEntry->IsBattleGround(); }
-    bool IsBattleArena() const { return i_mapEntry && i_mapEntry->IsBattleArena(); }
-    bool IsBattleGroundOrArena() const { return i_mapEntry && i_mapEntry->IsBattleGroundOrArena(); }
+        bool Instanceable() const { return i_mapEntry && i_mapEntry->Instanceable(); }
+        // NOTE: this duplicate of Instanceable(), but Instanceable() can be changed when BG also will be instanceable
+        bool IsDungeon() const { return i_mapEntry && i_mapEntry->IsDungeon(); }
+        bool IsRaid() const { return i_mapEntry && i_mapEntry->IsRaid(); }
+        bool IsHeroic() const { return IsRaid() ? i_spawnMode >= RAID_DIFFICULTY_10MAN_HEROIC : i_spawnMode >= DUNGEON_DIFFICULTY_HEROIC; }
+        bool IsNonRaidDungeon() const { return i_mapEntry && i_mapEntry->IsNonRaidDungeon(); }
+        bool IsRaidOrHeroicDungeon() const { return IsRaid() || GetDifficulty() > DUNGEON_DIFFICULTY_NORMAL; }
+        bool IsBattleGround() const { return i_mapEntry && i_mapEntry->IsBattleGround(); }
+        bool IsBattleArena() const { return i_mapEntry && i_mapEntry->IsBattleArena(); }
+        bool IsBattleGroundOrArena() const { return i_mapEntry && i_mapEntry->IsBattleGroundOrArena(); }
 
-    // can't be NULL for loaded map
-    MapPersistentState* GetPersistentState() const { return m_persistentState; }
+        // can't be NULL for loaded map
+        MapPersistentState* GetPersistentState() const { return m_persistentState; }
 
-    void AddObjectToRemoveList(WorldObject* obj);
+        void AddObjectToRemoveList(WorldObject* obj);
 
-    void UpdateObjectVisibility(WorldObject* obj, Cell cell, CellPair cellpair);
+        void UpdateObjectVisibility(WorldObject* obj, Cell cell, CellPair cellpair);
 
-    void resetMarkedCells() { marked_cells.reset(); }
-    bool isCellMarked(uint32 pCellId) { return marked_cells.test(pCellId); }
-    void markCell(uint32 pCellId) { marked_cells.set(pCellId); }
+        void resetMarkedCells() { marked_cells.reset(); }
+        bool isCellMarked(uint32 pCellId) { return marked_cells.test(pCellId); }
+        void markCell(uint32 pCellId) { marked_cells.set(pCellId); }
 
-    bool HavePlayers() const { return !m_mapRefManager.isEmpty(); }
-    uint32 GetPlayersCountExceptGMs() const;
-    bool ActiveObjectsNearGrid(uint32 x, uint32 y) const;
+        bool HavePlayers() const { return !m_mapRefManager.isEmpty(); }
+        uint32 GetPlayersCountExceptGMs() const;
+        bool ActiveObjectsNearGrid(uint32 x, uint32 y) const;
 
-    /// Send a Packet to all players on a map
-    void SendToPlayers(WorldPacket const* data) const;
-    /// Send a Packet to all players in a zone. Return false if no player found
-    bool SendToPlayersInZone(WorldPacket const* data, uint32 zoneId) const;
+        /// Send a Packet to all players on a map
+        void SendToPlayers(WorldPacket const* data) const;
+        /// Send a Packet to all players in a zone. Return false if no player found
+        bool SendToPlayersInZone(WorldPacket const* data, uint32 zoneId) const;
 
-    typedef MapRefManager PlayerList;
-    PlayerList const& GetPlayers() const { return m_mapRefManager; }
+        typedef MapRefManager PlayerList;
+        PlayerList const& GetPlayers() const { return m_mapRefManager; }
 
-    // per-map script storage
-    enum ScriptExecutionParam
-    {
-        SCRIPT_EXEC_PARAM_NONE = 0x00,   // Start regardless if already started
-        SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE = 0x01,   // Start Script only if not yet started (uniqueness identified by id and source)
-        SCRIPT_EXEC_PARAM_UNIQUE_BY_TARGET = 0x02,   // Start Script only if not yet started (uniqueness identified by id and target)
-        SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE_TARGET = 0x03,   // Start Script only if not yet started (uniqueness identified by id, source and target)
-    };
-    bool ScriptsStart(ScriptMapMapName const& scripts, uint32 id, Object* source, Object* target, ScriptExecutionParam execParams = SCRIPT_EXEC_PARAM_NONE);
-    void ScriptCommandStart(ScriptInfo const& script, uint32 delay, Object* source, Object* target);
+        // per-map script storage
+        enum ScriptExecutionParam
+        {
+            SCRIPT_EXEC_PARAM_NONE                    = 0x00,   // Start regardless if already started
+            SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE        = 0x01,   // Start Script only if not yet started (uniqueness identified by id and source)
+            SCRIPT_EXEC_PARAM_UNIQUE_BY_TARGET        = 0x02,   // Start Script only if not yet started (uniqueness identified by id and target)
+            SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE_TARGET = 0x03,   // Start Script only if not yet started (uniqueness identified by id, source and target)
+        };
+        bool ScriptsStart(ScriptMapMapName const& scripts, uint32 id, Object* source, Object* target, ScriptExecutionParam execParams = SCRIPT_EXEC_PARAM_NONE);
+        void ScriptCommandStart(ScriptInfo const& script, uint32 delay, Object* source, Object* target);
 
-    // must called with AddToWorld
-    void AddToActive(WorldObject* obj);
-    // must called with RemoveFromWorld
-    void RemoveFromActive(WorldObject* obj);
+        // must called with AddToWorld
+        void AddToActive(WorldObject* obj);
+        // must called with RemoveFromWorld
+        void RemoveFromActive(WorldObject* obj);
 
-    Player* GetPlayer(ObjectGuid guid);
-    Creature* GetCreature(ObjectGuid guid);
-    Pet* GetPet(ObjectGuid guid);
-    Creature* GetAnyTypeCreature(ObjectGuid guid);      // normal creature or pet or vehicle
-    GameObject* GetGameObject(ObjectGuid guid);
-    DynamicObject* GetDynamicObject(ObjectGuid guid);
-    Corpse* GetCorpse(ObjectGuid guid);                 // !!! find corpse can be not in world
-    Unit* GetUnit(ObjectGuid guid);                     // only use if sure that need objects at current map, specially for player case
-    WorldObject* GetWorldObject(ObjectGuid guid);       // only use if sure that need objects at current map, specially for player case
+        Player* GetPlayer(ObjectGuid guid);
+        Creature* GetCreature(ObjectGuid guid);
+        Pet* GetPet(ObjectGuid guid);
+        Creature* GetAnyTypeCreature(ObjectGuid guid);      // normal creature or pet or vehicle
+        GameObject* GetGameObject(ObjectGuid guid);
+        DynamicObject* GetDynamicObject(ObjectGuid guid);
+        Corpse* GetCorpse(ObjectGuid guid);                 // !!! find corpse can be not in world
+        Unit* GetUnit(ObjectGuid guid);                     // only use if sure that need objects at current map, specially for player case
+        WorldObject* GetWorldObject(ObjectGuid guid);       // only use if sure that need objects at current map, specially for player case
 
-    typedef TypeUnorderedMapContainer<AllMapStoredObjectTypes, ObjectGuid> MapStoredObjectTypesContainer;
-    MapStoredObjectTypesContainer& GetObjectsStore() { return m_objectsStore; }
+        typedef TypeUnorderedMapContainer<AllMapStoredObjectTypes, ObjectGuid> MapStoredObjectTypesContainer;
+        MapStoredObjectTypesContainer& GetObjectsStore() { return m_objectsStore; }
 
-    void AddUpdateObject(Object* obj)
-    {
-        i_objectsToClientUpdate.insert(obj);
-    }
+        void AddUpdateObject(Object* obj)
+        {
+            i_objectsToClientUpdate.insert(obj);
+        }
 
-    void RemoveUpdateObject(Object* obj)
-    {
-        i_objectsToClientUpdate.erase(obj);
-    }
+        void RemoveUpdateObject(Object* obj)
+        {
+            i_objectsToClientUpdate.erase(obj);
+        }
 
-    // DynObjects currently
-    uint32 GenerateLocalLowGuid(HighGuid guidhigh);
+        // DynObjects currently
+        uint32 GenerateLocalLowGuid(HighGuid guidhigh);
 
-    // get corresponding TerrainData object for this particular map
-    const TerrainInfo* GetTerrain() const { return m_TerrainData; }
+        // get corresponding TerrainData object for this particular map
+        const TerrainInfo* GetTerrain() const { return m_TerrainData; }
 
-    void CreateInstanceData(bool load);
-    InstanceData* GetInstanceData() const { return i_data; }
-    virtual uint32 GetScriptId() const { return sScriptMgr.GetBoundScriptId(SCRIPTED_MAP, GetId()); }
+        void CreateInstanceData(bool load);
+        InstanceData* GetInstanceData() const { return i_data; }
+        virtual uint32 GetScriptId() const { return sScriptMgr.GetBoundScriptId(SCRIPTED_MAP, GetId()); }
 
-    void MonsterYellToMap(ObjectGuid guid, int32 textId, Language language, Unit const* target) const;
-    void MonsterYellToMap(CreatureInfo const* cinfo, int32 textId, Language language, Unit const* target, uint32 senderLowGuid = 0) const;
-    void PlayDirectSoundToMap(uint32 soundId, uint32 zoneId = 0) const;
+        void MonsterYellToMap(ObjectGuid guid, int32 textId, Language language, Unit const* target) const;
+        void MonsterYellToMap(CreatureInfo const* cinfo, int32 textId, Language language, Unit const* target, uint32 senderLowGuid = 0) const;
+        void PlayDirectSoundToMap(uint32 soundId, uint32 zoneId = 0) const;
 
-    // Dynamic VMaps
-    float GetHeight(uint32 phasemask, float x, float y, float z) const;
-    bool GetHeightInRange(uint32 phasemask, float x, float y, float& z, float maxSearchDist = 4.0f) const;
-    bool IsInLineOfSight(float x1, float y1, float z1, float x2, float y2, float z2, uint32 phasemask) const;
-    bool GetHitPosition(float srcX, float srcY, float srcZ, float& destX, float& destY, float& destZ, uint32 phasemask, float modifyDist) const;
+        // Dynamic VMaps
+        float GetHeight(uint32 phasemask, float x, float y, float z) const;
+        bool GetHeightInRange(uint32 phasemask, float x, float y, float& z, float maxSearchDist = 4.0f) const;
+        bool IsInLineOfSight(float x1, float y1, float z1, float x2, float y2, float z2, uint32 phasemask) const;
+        bool GetHitPosition(float srcX, float srcY, float srcZ, float& destX, float& destY, float& destZ, uint32 phasemask, float modifyDist) const;
 
-    // Object Model insertion/remove/test for dynamic vmaps use
-    void InsertGameObjectModel(const GameObjectModel& mdl);
-    void RemoveGameObjectModel(const GameObjectModel& mdl);
-    bool ContainsGameObjectModel(const GameObjectModel& mdl) const;
+        // Object Model insertion/remove/test for dynamic vmaps use
+        void InsertGameObjectModel(const GameObjectModel& mdl);
+        void RemoveGameObjectModel(const GameObjectModel& mdl);
+        bool ContainsGameObjectModel(const GameObjectModel& mdl) const;
 
-    // Get Holder for Creature Linking
-    CreatureLinkingHolder* GetCreatureLinkingHolder() { return &m_creatureLinkingHolder; }
+        // Get Holder for Creature Linking
+        CreatureLinkingHolder* GetCreatureLinkingHolder() { return &m_creatureLinkingHolder; }
 
-    // Teleport all players in that map to choosed location
-    void TeleportAllPlayersTo(TeleportLocation loc);
+        // Teleport all players in that map to choosed location
+        void TeleportAllPlayersTo(TeleportLocation loc);
 
-    // WeatherSystem
-    WeatherSystem* GetWeatherSystem() const { return m_weatherSystem; }
-    /** Set the weather in a zone on this map
-    * @param zoneId set the weather for which zone
-    * @param type What weather to set
-    * @param grade how strong the weather should be
-    * @param permanently set the weather permanently?
-    */
-    void SetWeather(uint32 zoneId, WeatherType type, float grade, bool permanently);
+        // WeatherSystem
+        WeatherSystem* GetWeatherSystem() const { return m_weatherSystem; }
+        /** Set the weather in a zone on this map
+         * @param zoneId set the weather for which zone
+         * @param type What weather to set
+         * @param grade how strong the weather should be
+         * @param permanently set the weather permanently?
+         */
+        void SetWeather(uint32 zoneId, WeatherType type, float grade, bool permanently);
 
-    // Random on map generation
-    bool GetReachableRandomPosition(Unit* unit, float& x, float& y, float& z, float radius);
-    bool GetReachableRandomPointOnGround(uint32 phaseMask, float& x, float& y, float& z, float radius);
-    bool GetRandomPointInTheAir(uint32 phaseMask, float& x, float& y, float& z, float radius);
-    bool GetRandomPointUnderWater(uint32 phaseMask, float& x, float& y, float& z, float radius, GridMapLiquidData& liquid_status);
+        // Random on map generation
+        bool GetReachableRandomPosition(Unit* unit, float& x, float& y, float& z, float radius);
+        bool GetReachableRandomPointOnGround(float& x, float& y, float& z, float radius);
+        bool GetRandomPointInTheAir(float& x, float& y, float& z, float radius);
+        bool GetRandomPointUnderWater(float& x, float& y, float& z, float radius, GridMapLiquidData& liquid_status);
 
     private:
         void LoadMapAndVMap(int gx, int gy);
@@ -414,69 +414,69 @@ public:
 
 class WorldMap : public Map
 {
-private:
-    using Map::GetPersistentState;                      // hide in subclass for overwrite
-public:
-    WorldMap(uint32 id, time_t expiry) : Map(id, expiry, 0, REGULAR_DIFFICULTY) {}
-    ~WorldMap() {}
+    private:
+        using Map::GetPersistentState;                      // hide in subclass for overwrite
+    public:
+        WorldMap(uint32 id, time_t expiry) : Map(id, expiry, 0, REGULAR_DIFFICULTY) {}
+        ~WorldMap() {}
 
-    // can't be NULL for loaded map
-    WorldPersistentState* GetPersistanceState() const;
+        // can't be NULL for loaded map
+        WorldPersistentState* GetPersistanceState() const;
 };
 
 class DungeonMap : public Map
 {
-private:
-    using Map::GetPersistentState;                      // hide in subclass for overwrite
-public:
-    DungeonMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode);
-    ~DungeonMap();
-    bool Add(Player*) override;
-    void Remove(Player*, bool) override;
-    void Update(const uint32&) override;
-    bool Reset(InstanceResetMethod method);
-    void PermBindAllPlayers(Player* player);
-    void UnloadAll(bool pForce) override;
-    void SendResetWarnings(uint32 timeLeft) const;
-    void SetResetSchedule(bool on);
+    private:
+        using Map::GetPersistentState;                      // hide in subclass for overwrite
+    public:
+        DungeonMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode);
+        ~DungeonMap();
+        bool Add(Player*) override;
+        void Remove(Player*, bool) override;
+        void Update(const uint32&) override;
+        bool Reset(InstanceResetMethod method);
+        void PermBindAllPlayers(Player* player);
+        void UnloadAll(bool pForce) override;
+        void SendResetWarnings(uint32 timeLeft) const;
+        void SetResetSchedule(bool on);
 
-    uint32 GetScriptId() const override { return sScriptMgr.GetBoundScriptId(SCRIPTED_INSTANCE, GetId()); }
+        uint32 GetScriptId() const override { return sScriptMgr.GetBoundScriptId(SCRIPTED_INSTANCE, GetId()); }
 
-    // can't be NULL for loaded map
-    DungeonPersistentState* GetPersistanceState() const;
+        // can't be NULL for loaded map
+        DungeonPersistentState* GetPersistanceState() const;
 
-    virtual void InitVisibilityDistance() override;
-private:
-    bool m_resetAfterUnload;
-    bool m_unloadWhenEmpty;
+        virtual void InitVisibilityDistance() override;
+    private:
+        bool m_resetAfterUnload;
+        bool m_unloadWhenEmpty;
 };
 
 class BattleGroundMap : public Map
 {
-private:
-    using Map::GetPersistentState;                      // hide in subclass for overwrite
-public:
-    BattleGroundMap(uint32 id, time_t, uint32 InstanceId, uint8 spawnMode);
-    ~BattleGroundMap();
+    private:
+        using Map::GetPersistentState;                      // hide in subclass for overwrite
+    public:
+        BattleGroundMap(uint32 id, time_t, uint32 InstanceId, uint8 spawnMode);
+        ~BattleGroundMap();
 
-    void Update(const uint32&) override;
-    bool Add(Player*) override;
-    void Remove(Player*, bool) override;
-    bool CanEnter(Player* player) override;
-    void SetUnload();
-    void UnloadAll(bool pForce) override;
+        void Update(const uint32&) override;
+        bool Add(Player*) override;
+        void Remove(Player*, bool) override;
+        bool CanEnter(Player* player) override;
+        void SetUnload();
+        void UnloadAll(bool pForce) override;
 
-    virtual void InitVisibilityDistance() override;
-    BattleGround* GetBG() { return m_bg; }
-    void SetBG(BattleGround* bg) { m_bg = bg; }
+        virtual void InitVisibilityDistance() override;
+        BattleGround* GetBG() { return m_bg; }
+        void SetBG(BattleGround* bg) { m_bg = bg; }
 
-    uint32 GetScriptId() const override { return sScriptMgr.GetBoundScriptId(SCRIPTED_BATTLEGROUND, GetId()); } //TODO bind BG scripts through script_binding, now these are broken!
+        uint32 GetScriptId() const override { return sScriptMgr.GetBoundScriptId(SCRIPTED_BATTLEGROUND, GetId()); } //TODO bind BG scripts through script_binding, now these are broken!
 
-    // can't be NULL for loaded map
-    BattleGroundPersistentState* GetPersistanceState() const;
+        // can't be NULL for loaded map
+        BattleGroundPersistentState* GetPersistanceState() const;
 
-private:
-    BattleGround* m_bg;
+    private:
+        BattleGround* m_bg;
 };
 
 template<class T, class CONTAINER>
diff --git a/src/game/WorldHandlers/QueryHandler.cpp b/src/game/WorldHandlers/QueryHandler.cpp
index 3a98baafc..a29b0f78e 100644
--- a/src/game/WorldHandlers/QueryHandler.cpp
+++ b/src/game/WorldHandlers/QueryHandler.cpp
@@ -180,11 +180,11 @@ void WorldSession::HandleCreatureQueryOpcode(WorldPacket& recv_data)
 
         data << subName;
         data << ci->IconName;                               // "Directions" for guard, string for Icons 2.3.0
-        data << uint32(ci->type_flags);                     // flags
+        data << uint32(ci->CreatureTypeFlags);                     // flags
         data << uint32(0);                                  // unk
         data << uint32(ci->type);                           // CreatureType.dbc
         data << uint32(ci->family);                         // CreatureFamily.dbc
-        data << uint32(ci->rank);                           // Creature Rank (elite, boss, etc)
+        data << uint32(ci->Rank);                           // Creature Rank (elite, boss, etc)
         data << uint32(ci->KillCredit[0]);                  // new in 3.1, kill credit
         data << uint32(ci->KillCredit[1]);                  // new in 3.1, kill credit
 
diff --git a/src/game/WorldHandlers/ScriptMgr.cpp b/src/game/WorldHandlers/ScriptMgr.cpp
index a66ab17de..b41b72941 100644
--- a/src/game/WorldHandlers/ScriptMgr.cpp
+++ b/src/game/WorldHandlers/ScriptMgr.cpp
@@ -37,6 +37,7 @@
 #include "BattleGround/BattleGround.h"
 #include "OutdoorPvP/OutdoorPvP.h"
 #include "WaypointMovementGenerator.h"
+#include "Mail.h"
 
 #ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
@@ -73,22 +74,43 @@ ScriptMgr::~ScriptMgr()
 // /////////////////////////////////////////////////////////
 //              DB SCRIPTS (loaders of static data)
 // /////////////////////////////////////////////////////////
-// returns priority (0 == cannot start script)
+// returns priority (0 == can not start script)
 uint8 GetSpellStartDBScriptPriority(SpellEntry const* spellinfo, SpellEffectIndex effIdx)
 {
+#if defined (CATA)
     SpellEffectEntry const* spellEffect = spellinfo->GetSpellEffect(effIdx);
     if (!spellEffect)
         return 0;
-
+#endif
+#if defined (CATA)
     if (spellEffect->Effect == SPELL_EFFECT_SCRIPT_EFFECT)
-        return 10;
+#else
+    if (spellinfo->Effect[effIdx] == SPELL_EFFECT_SCRIPT_EFFECT)
+#endif
+    { return 10; }
 
+#if defined (CATA)
     if (spellEffect->Effect == SPELL_EFFECT_DUMMY)
-        return 9;
+#else
+    if (spellinfo->Effect[effIdx] == )
+#endif
+    { return 9; }
 
     // NonExisting triggered spells can also start DB-Spell-Scripts
+#if defined (CATA)
     if (spellEffect->Effect == SPELL_EFFECT_TRIGGER_SPELL && !sSpellStore.LookupEntry(spellEffect->EffectTriggerSpell))
-        return 5;
+#else
+    if (spellinfo->Effect[effIdx] == SPELL_EFFECT_TRIGGER_SPELL && !sSpellStore.LookupEntry(spellinfo->EffectTriggerSpell[effIdx]))
+#endif
+    { return 5; }
+
+    // NonExisting trigger missile spells can also start DB-Spell-Scripts
+#if defined (CATA)
+    if (spellEffect->Effect == SPELL_EFFECT_TRIGGER_MISSILE && !sSpellStore.LookupEntry(spellEffect->EffectTriggerSpell))
+#else
+    if (spellinfo->Effect[effIdx] == SPELL_EFFECT_TRIGGER_MISSILE && !sSpellStore.LookupEntry(spellinfo->EffectTriggerSpell[effIdx]))
+#endif
+    { return 4; }
 
     // Can not start script
     return 0;
@@ -99,17 +121,17 @@ bool ScriptMgr::CanSpellEffectStartDBScript(SpellEntry const* spellinfo, SpellEf
 {
     uint8 priority = GetSpellStartDBScriptPriority(spellinfo, effIdx);
     if (!priority)
-        return false;
+        { return false; }
 
     for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
     {
         uint8 currentPriority = GetSpellStartDBScriptPriority(spellinfo, SpellEffectIndex(i));
         if (currentPriority < priority)                     // lower priority, continue checking
-            continue;
+            { continue; }
         if (currentPriority > priority)                     // take other index with higher priority
-            return false;
+            { return false; }
         if (i < effIdx)                                     // same priority at lower index
-            return false;
+            { return false; }
     }
 
     return true;
@@ -118,9 +140,7 @@ bool ScriptMgr::CanSpellEffectStartDBScript(SpellEntry const* spellinfo, SpellEf
 void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
 {
     if (IsScriptScheduled())                                // function don't must be called in time scripts use.
-        return;
-
-    sLog.outString("%s :", tablename);
+        { return; }
 
     scripts.first = tablename;
     scripts.second.clear();                                 // need for reload support
@@ -134,9 +154,8 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
     {
         BarGoLink bar(1);
         bar.step();
-
+        sLog.outString(">> Loaded %u script definitions from table %s", count, tablename);
         sLog.outString();
-        sLog.outString(">> Loaded %u script definitions", count);
         return;
     }
 
@@ -206,7 +225,7 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
             if (tmp.data_flags & SCRIPT_FLAG_BUDDY_BY_GUID) // Check guid
             {
                 if (tmp.IsCreatureBuddy())
-                 {
+                {
                     CreatureData const* data = sObjectMgr.GetCreatureData(tmp.searchRadiusOrGuid);
                     if (!data)
                     {
@@ -235,7 +254,7 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                 }
             }
         }
- 
+
         switch (tmp.command)
         {
             case SCRIPT_COMMAND_TALK:                       // 0
@@ -250,7 +269,7 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                 {
                     if (tmp.textId[i] && (tmp.textId[i] < MIN_DB_SCRIPT_STRING_ID || tmp.textId[i] >= MAX_DB_SCRIPT_STRING_ID))
                     {
-                        sLog.outErrorDb("Table `%s` has out of range text id (dataint = %i expected %u-%u) in SCRIPT_COMMAND_TALK for script id %u", tablename, tmp.textId[i], MIN_DB_SCRIPT_STRING_ID, MAX_DB_SCRIPT_STRING_ID, tmp.id);
+                        sLog.outErrorDb("Table `%s` has out of range text_id%u (dataint = %i expected %u-%u) in SCRIPT_COMMAND_TALK for script id %u", tablename, i + 1, tmp.textId[i], MIN_DB_SCRIPT_STRING_ID, MAX_DB_SCRIPT_STRING_ID, tmp.id);
                         continue;
                     }
                 }
@@ -265,6 +284,14 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                     sLog.outErrorDb("Table `%s` has invalid emote id (datalong = %u) in SCRIPT_COMMAND_EMOTE for script id %u", tablename, tmp.emote.emoteId, tmp.id);
                     continue;
                 }
+                for (int i = 0; i < MAX_TEXT_ID; ++i)
+                {
+                    if (tmp.textId[i] && !sEmotesStore.LookupEntry(tmp.textId[i]))
+                    {
+                        sLog.outErrorDb("Table `%s` has invalid emote id (text_id%u = %u) in SCRIPT_COMMAND_EMOTE for script id %u", tablename, i + 1, tmp.textId[i], tmp.id);
+                        continue;
+                    }
+                }
                 break;
             }
             case SCRIPT_COMMAND_FIELD_SET:                  // 2
@@ -371,9 +398,7 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
 
                 if (info->type == GAMEOBJECT_TYPE_FISHINGNODE ||
                         info->type == GAMEOBJECT_TYPE_FISHINGHOLE ||
-                        info->type == GAMEOBJECT_TYPE_DOOR        ||
-                        info->type == GAMEOBJECT_TYPE_BUTTON      ||
-                        info->type == GAMEOBJECT_TYPE_TRAP)
+                        info->type == GAMEOBJECT_TYPE_DOOR)
                 {
                     sLog.outErrorDb("Table `%s` have gameobject type (%u) unsupported by command SCRIPT_COMMAND_RESPAWN_GAMEOBJECT for script id %u", tablename, info->type, tmp.id);
                     continue;
@@ -455,6 +480,18 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                                     tablename, tmp.castSpell.spellId, tmp.id);
                     continue;
                 }
+                bool hasErrored = false;
+                for (uint8 i = 0; i < MAX_TEXT_ID; ++i)
+                {
+                    if (tmp.textId[i] && !sSpellStore.LookupEntry(uint32(tmp.textId[i])))
+                    {
+                        sLog.outErrorDb("Table `%s` using nonexistent spell (id: %u) in SCRIPT_COMMAND_CAST_SPELL for script id %u, dataint%u",
+                            tablename, uint32(tmp.textId[i]), tmp.id, i + 1);
+                        hasErrored = true;
+                    }
+                }
+                if (hasErrored)
+                    { continue; }
                 break;
             }
             case SCRIPT_COMMAND_PLAY_SOUND:                 // 16
@@ -467,9 +504,9 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                 }
                 // bitmask: 0/1=target-player, 0/2=with distance dependent, 0/4=map wide, 0/8=zone wide
                 if (tmp.playSound.flags & ~(1 | 2 | 4 | 8))
-                    sLog.outErrorDb("Table `%s` using unsupported sound flags (datalong2: %u) in SCRIPT_COMMAND_PLAY_SOUND for script id %u, unsupported flags will be ignored", tablename, tmp.playSound.flags, tmp.id);
+                    { sLog.outErrorDb("Table `%s` using unsupported sound flags (datalong2: %u) in SCRIPT_COMMAND_PLAY_SOUND for script id %u, unsupported flags will be ignored", tablename, tmp.playSound.flags, tmp.id); }
                 if ((tmp.playSound.flags & (1 | 2)) > 0 && (tmp.playSound.flags & (4 | 8)) > 0)
-                    sLog.outErrorDb("Table `%s` uses sound flags (datalong2: %u) in SCRIPT_COMMAND_PLAY_SOUND for script id %u, combining (1|2) with (4|8) makes no sense", tablename, tmp.playSound.flags, tmp.id);
+                    { sLog.outErrorDb("Table `%s` uses sound flags (datalong2: %u) in SCRIPT_COMMAND_PLAY_SOUND for script id %u, combining (1|2) with (4|8) makes no sense", tablename, tmp.playSound.flags, tmp.id); }
                 break;
             }
             case SCRIPT_COMMAND_CREATE_ITEM:                // 17
@@ -614,11 +651,15 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                         if (SpellEntry const* spell = sSpellStore.LookupEntry(i))
                             for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
                             {
+#if defined (CATA)
                                 SpellEffectEntry const* spellEffect = spell->GetSpellEffect(SpellEffectIndex(j));
                                 if (!spellEffect)
                                     continue;
 
                                 if (spellEffect->Effect == SPELL_EFFECT_SEND_TAXI && spellEffect->EffectMiscValue == tmp.sendTaxiPath.taxiPathId)
+#else
+                                if (spell->Effect[j] == SPELL_EFFECT_SEND_TAXI && spell->EffectMiscValue[j] == int32(tmp.sendTaxiPath.taxiPathId))
+#endif
                                 {
                                     taxiSpell = i;
                                     break;
@@ -661,6 +702,50 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                 }
                 break;
             }
+            case SCRIPT_COMMAND_SEND_AI_EVENT_AROUND:       // 35
+            {
+                if (tmp.sendAIEvent.eventType >= MAXIMAL_AI_EVENT_EVENTAI)
+                {
+                    sLog.outErrorDb("Table `%s` has invalid AI event (datalong = %u) in SCRIPT_COMMAND_SEND_AI_EVENT for script id %u", tablename, tmp.sendAIEvent.eventType, tmp.id);
+                    continue;
+                }
+                break;
+            }
+            case SCRIPT_COMMAND_TURN_TO:                    // 36
+                break;
+            case SCRIPT_COMMAND_MOVE_DYNAMIC:               // 37
+            {
+                if (tmp.moveDynamic.maxDist < tmp.moveDynamic.minDist)
+                {
+                    sLog.outErrorDb("Table `%s` has invalid min-dist (datalong2 = %u) less than max-dist (datalon = %u) in SCRIPT_COMMAND_MOVE_DYNAMIC for script id %u", tablename, tmp.moveDynamic.minDist, tmp.moveDynamic.maxDist, tmp.id);
+                    continue;
+                }
+                break;
+            }
+            case SCRIPT_COMMAND_SEND_MAIL:                  // 38
+            {
+                if (!sMailTemplateStore.LookupEntry(tmp.sendMail.mailTemplateId))
+                {
+                    sLog.outErrorDb("Table `%s` has invalid mailTemplateId (datalong = %u) in SCRIPT_COMMAND_SEND_MAIL for script id %u", tablename, tmp.sendMail.mailTemplateId, tmp.id);
+                    continue;
+                }
+                if (tmp.sendMail.altSender && !ObjectMgr::GetCreatureTemplate(tmp.sendMail.altSender))
+                {
+                    sLog.outErrorDb("Table `%s` has invalid alternativeSender (datalong2 = %u) in SCRIPT_COMMAND_SEND_MAIL for script id %u", tablename, tmp.sendMail.altSender, tmp.id);
+                    continue;
+                }
+                break;
+            }
+            case SCRIPT_COMMAND_CHANGE_ENTRY:              // 39
+            {
+                if (tmp.changeEntry.creatureEntry && !ObjectMgr::GetCreatureTemplate(tmp.changeEntry.creatureEntry))
+                    {
+                        sLog.outErrorDb("Table `%s` has datalong = %u in SCRIPT_COMMAND_CHANGE_ENTRY for script id %u, but this creature_template does not exist.", tablename, tmp.changeEntry.creatureEntry, tmp.id);
+                        continue;
+                    }
+                break;
+            }
+
             default:
             {
                 sLog.outErrorDb("Table `%s` unknown command %u, skipping.", tablename, tmp.command);
@@ -681,8 +766,8 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
 
     delete result;
 
+    sLog.outString(">> Loaded %u script definitions from table %s", count, tablename);
     sLog.outString();
-    sLog.outString(">> Loaded %u script definitions", count);
 }
 
 void ScriptMgr::LoadGameObjectScripts()
@@ -693,7 +778,7 @@ void ScriptMgr::LoadGameObjectScripts()
     for (ScriptMapMap::const_iterator itr = sGameObjectScripts.second.begin(); itr != sGameObjectScripts.second.end(); ++itr)
     {
         if (!sObjectMgr.GetGOData(itr->first))
-            sLog.outErrorDb("Table `dbscripts_on_go_use` has not existing gameobject (GUID: %u) as script id", itr->first);
+            { sLog.outErrorDb("Table `dbscripts_on_go_use` has not existing gameobject (GUID: %u) as script id", itr->first); }
     }
 }
 
@@ -705,7 +790,7 @@ void ScriptMgr::LoadGameObjectTemplateScripts()
     for (ScriptMapMap::const_iterator itr = sGameObjectTemplateScripts.second.begin(); itr != sGameObjectTemplateScripts.second.end(); ++itr)
     {
         if (!sObjectMgr.GetGameObjectInfo(itr->first))
-            sLog.outErrorDb("Table `dbscripts_on_go_template_use` has not existing gameobject (Entry: %u) as script id", itr->first);
+            { sLog.outErrorDb("Table `dbscripts_on_go_template_use` has not existing gameobject (Entry: %u) as script id", itr->first); }
     }
 }
 
@@ -717,7 +802,7 @@ void ScriptMgr::LoadQuestEndScripts()
     for (ScriptMapMap::const_iterator itr = sQuestEndScripts.second.begin(); itr != sQuestEndScripts.second.end(); ++itr)
     {
         if (!sObjectMgr.GetQuestTemplate(itr->first))
-            sLog.outErrorDb("Table `dbscripts_on_quest_end` has not existing quest (Id: %u) as script id", itr->first);
+            { sLog.outErrorDb("Table `dbscripts_on_quest_end` has not existing quest (Id: %u) as script id", itr->first); }
     }
 }
 
@@ -729,7 +814,7 @@ void ScriptMgr::LoadQuestStartScripts()
     for (ScriptMapMap::const_iterator itr = sQuestStartScripts.second.begin(); itr != sQuestStartScripts.second.end(); ++itr)
     {
         if (!sObjectMgr.GetQuestTemplate(itr->first))
-            sLog.outErrorDb("Table `dbscripts_on_quest_start` has not existing quest (Id: %u) as script id", itr->first);
+            { sLog.outErrorDb("Table `dbscripts_on_quest_start` has not existing quest (Id: %u) as script id", itr->first); }
     }
 }
 
@@ -759,7 +844,7 @@ void ScriptMgr::LoadSpellScripts()
         }
 
         if (!found)
-            sLog.outErrorDb("Table `dbscripts_on_spell` has unsupported spell (Id: %u)", itr->first);
+            { sLog.outErrorDb("Table `dbscripts_on_spell` has unsupported spell (Id: %u)", itr->first); }
     }
 }
 
@@ -802,7 +887,7 @@ void ScriptMgr::LoadCreatureDeathScripts()
     for (ScriptMapMap::const_iterator itr = sCreatureDeathScripts.second.begin(); itr != sCreatureDeathScripts.second.end(); ++itr)
     {
         if (!sObjectMgr.GetCreatureTemplate(itr->first))
-            sLog.outErrorDb("Table `dbscripts_on_creature_death` has not existing creature (Entry: %u) as script id", itr->first);
+            { sLog.outErrorDb("Table `dbscripts_on_creature_death` has not existing creature (Entry: %u) as script id", itr->first); }
     }
 }
 
@@ -814,7 +899,7 @@ void ScriptMgr::LoadDbScriptStrings()
 
     for (int32 i = MIN_DB_SCRIPT_STRING_ID; i < MAX_DB_SCRIPT_STRING_ID; ++i)
         if (sObjectMgr.GetMangosStringLocale(i))
-            ids.insert(i);
+            { ids.insert(i); }
 
     CheckScriptTexts(sQuestEndScripts, ids);
     CheckScriptTexts(sQuestStartScripts, ids);
@@ -829,7 +914,7 @@ void ScriptMgr::LoadDbScriptStrings()
     sWaypointMgr.CheckTextsExistance(ids);
 
     for (std::set<int32>::const_iterator itr = ids.begin(); itr != ids.end(); ++itr)
-        sLog.outErrorDb("Table `db_script_string` has unused string id %u", *itr);
+        { sLog.outErrorDb("Table `db_script_string` has unused string id %u", *itr); }
 }
 
 void ScriptMgr::CheckScriptTexts(ScriptMapMapName const& scripts, std::set<int32>& ids)
@@ -843,10 +928,10 @@ void ScriptMgr::CheckScriptTexts(ScriptMapMapName const& scripts, std::set<int32
                 for (int i = 0; i < MAX_TEXT_ID; ++i)
                 {
                     if (itrM->second.textId[i] && !sObjectMgr.GetMangosStringLocale(itrM->second.textId[i]))
-                        sLog.outErrorDb("Table `db_script_string` is missing string id %u, used in database script table %s id %u.", itrM->second.textId[i], scripts.first, itrMM->first);
+                        { sLog.outErrorDb("Table `db_script_string` is missing string id %u, used in database script table %s id %u.", itrM->second.textId[i], scripts.first, itrMM->first); }
 
                     if (ids.find(itrM->second.textId[i]) != ids.end())
-                        ids.erase(itrM->second.textId[i]);
+                        { ids.erase(itrM->second.textId[i]); }
                 }
             }
         }
@@ -864,7 +949,7 @@ bool ScriptAction::GetScriptCommandObject(const ObjectGuid guid, bool includeIte
     resultObject = NULL;
 
     if (!guid)
-        return true;
+        { return true; }
 
     switch (guid.GetHigh())
     {
@@ -890,7 +975,7 @@ bool ScriptAction::GetScriptCommandObject(const ObjectGuid guid, bool includeIte
             if (includeItem)
             {
                 if (Player* player = m_map->GetPlayer(m_ownerGuid))
-                    resultObject = player->GetItemByGuid(guid);
+                    { resultObject = player->GetItemByGuid(guid); }
                 break;
             }
             // else no break, but display error message
@@ -901,7 +986,7 @@ bool ScriptAction::GetScriptCommandObject(const ObjectGuid guid, bool includeIte
     }
 
     if (resultObject && !resultObject->IsInWorld())
-        resultObject = NULL;
+        { resultObject = NULL; }
 
     return true;
 }
@@ -919,11 +1004,20 @@ bool ScriptAction::GetScriptProcessTargets(WorldObject* pOrigSource, WorldObject
             if (m_script->IsCreatureBuddy())
             {
                 CreatureInfo const* cinfo = ObjectMgr::GetCreatureTemplate(m_script->buddyEntry);
-                pBuddy = m_map->GetCreature(cinfo->GetObjectGuid(m_script->searchRadiusOrGuid));
 
-                if (pBuddy && !((Creature*)pBuddy)->IsAlive())
+                if (cinfo != NULL)
                 {
-                    sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u has buddy %u by guid %u but buddy is dead, skipping.", m_table, m_script->id, m_script->command, m_script->buddyEntry, m_script->searchRadiusOrGuid);
+                    pBuddy = m_map->GetCreature(cinfo->GetObjectGuid(m_script->searchRadiusOrGuid));
+
+                    if (pBuddy && !((Creature*)pBuddy)->IsAlive())
+                    {
+                        sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u has buddy %u by guid %u but buddy is dead, skipping.", m_table, m_script->id, m_script->command, m_script->buddyEntry, m_script->searchRadiusOrGuid);
+                        return false;
+                    }
+                }
+                else
+                {
+                    sLog.outError(" DB-SCRIPTS: Process table `%s` id %u, command %u has no buddy %u by guid %u, skipping.", m_table, m_script->id, m_script->command, m_script->buddyEntry, m_script->searchRadiusOrGuid);
                     return false;
                 }
             }
@@ -950,23 +1044,22 @@ bool ScriptAction::GetScriptProcessTargets(WorldObject* pOrigSource, WorldObject
             // Prefer non-players as searcher
             WorldObject* pSearcher = pOrigSource ? pOrigSource : pOrigTarget;
             if (pSearcher->GetTypeId() == TYPEID_PLAYER && pOrigTarget && pOrigTarget->GetTypeId() != TYPEID_PLAYER)
-                pSearcher = pOrigTarget;
-
+                { pSearcher = pOrigTarget; }
 
             if (m_script->IsCreatureBuddy())
             {
                 Creature* pCreatureBuddy = NULL;
- 
+
                 MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck u_check(*pSearcher, m_script->buddyEntry, true, false, m_script->searchRadiusOrGuid, true);
                 MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(pCreatureBuddy, u_check);
- 
+
                 if (m_script->data_flags & SCRIPT_FLAG_BUDDY_IS_PET)
-                    Cell::VisitWorldObjects(pSearcher, searcher, m_script->searchRadiusOrGuid);
+                    { Cell::VisitWorldObjects(pSearcher, searcher, m_script->searchRadiusOrGuid); }
                 else                                        // Normal Creature
-                    Cell::VisitGridObjects(pSearcher, searcher, m_script->searchRadiusOrGuid);
- 
+                    { Cell::VisitGridObjects(pSearcher, searcher, m_script->searchRadiusOrGuid); }
+
                 pBuddy = pCreatureBuddy;
- 
+
                 // TODO: Remove this extra check output after a while - it might have false effects
                 if (!pBuddy && pSearcher->GetEntry() == m_script->buddyEntry)
                 {
@@ -977,7 +1070,7 @@ bool ScriptAction::GetScriptProcessTargets(WorldObject* pOrigSource, WorldObject
             else
             {
                 GameObject* pGOBuddy = NULL;
- 
+
                 MaNGOS::NearestGameObjectEntryInObjectRangeCheck u_check(*pSearcher, m_script->buddyEntry, m_script->searchRadiusOrGuid);
                 MaNGOS::GameObjectLastSearcher<MaNGOS::NearestGameObjectEntryInObjectRangeCheck> searcher(pGOBuddy, u_check);
 
@@ -1005,10 +1098,10 @@ bool ScriptAction::GetScriptProcessTargets(WorldObject* pOrigSource, WorldObject
     }
 
     if (m_script->data_flags & SCRIPT_FLAG_REVERSE_DIRECTION)
-        std::swap(pFinalSource, pFinalTarget);
+        { std::swap(pFinalSource, pFinalTarget); }
 
     if (m_script->data_flags & SCRIPT_FLAG_SOURCE_TARGETS_SELF)
-        pFinalTarget = pFinalSource;
+        { pFinalTarget = pFinalSource; }
 
     return true;
 }
@@ -1041,6 +1134,15 @@ bool ScriptAction::LogIfNotGameObject(WorldObject* pWorldObject)
     }
     return false;
 }
+bool ScriptAction::LogIfNotPlayer(WorldObject* pWorldObject)
+{
+    if (!pWorldObject || pWorldObject->GetTypeId() != TYPEID_PLAYER)
+    {
+        sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u call for non-player, skipping.", m_table, m_script->id, m_script->command);
+        return true;
+    }
+    return false;
+}
 
 /// Helper to get a player if possible (target preferred)
 Player* ScriptAction::GetPlayerTargetOrSourceAndLog(WorldObject* pSource, WorldObject* pTarget)
@@ -1062,13 +1164,14 @@ bool ScriptAction::HandleScriptStep()
     WorldObject* pTarget;
     Object* pSourceOrItem;                                  // Stores a provided pSource (if exists as WorldObject) or source-item
 
-    {                                                       // Add scope for source & target variables so that they are not used below
+    {
+        // Add scope for source & target variables so that they are not used below
         Object* source = NULL;
         Object* target = NULL;
         if (!GetScriptCommandObject(m_sourceGuid, true, source))
-            return false;
+            { return false; }
         if (!GetScriptCommandObject(m_targetGuid, false, target))
-            return false;
+            { return false; }
 
         // Give some debug log output for easier use
         DEBUG_LOG("DB-SCRIPTS: Process table `%s` id %u, command %u for source %s (%sin world), target %s (%sin world)", m_table, m_script->id, m_script->command, m_sourceGuid.GetString().c_str(), source ? "" : "not ", m_targetGuid.GetString().c_str(), target ? "" : "not ");
@@ -1077,7 +1180,7 @@ bool ScriptAction::HandleScriptStep()
         pSource = source && source->isType(TYPEMASK_WORLDOBJECT) ? (WorldObject*)source : NULL;
         pTarget = target && target->isType(TYPEMASK_WORLDOBJECT) ? (WorldObject*)target : NULL;
         if (!GetScriptProcessTargets(pSource, pTarget, pSource, pTarget))
-            return false;
+            { return false; }
 
         pSourceOrItem = pSource ? pSource : (source && source->isType(TYPEMASK_ITEM) ? source : NULL);
     }
@@ -1102,7 +1205,7 @@ bool ScriptAction::HandleScriptStep()
                 for (; i < MAX_TEXT_ID; ++i)
                 {
                     if (!m_script->textId[i])
-                        break;
+                        { break; }
                 }
 
                 // Use one random
@@ -1110,16 +1213,24 @@ bool ScriptAction::HandleScriptStep()
             }
 
             if (!DoDisplayText(pSource, textId, unitTarget))
-                sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, could not display text %i properly", m_table, m_script->id, textId);
-
+                { sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, could not display text %i properly", m_table, m_script->id, textId); }
             break;
         }
         case SCRIPT_COMMAND_EMOTE:                          // 1
         {
             if (LogIfNotUnit(pSource))
-                break;
+                { break; }
 
-            ((Unit*)pSource)->HandleEmote(m_script->emote.emoteId);
+            std::vector<uint32> emotes;
+            emotes.push_back(m_script->emote.emoteId);
+            for (int i = 0; i < MAX_TEXT_ID; ++i)
+            {
+                if (!m_script->textId[i])
+                    { break; }
+                emotes.push_back(uint32(m_script->textId[i]));
+            }
+
+            ((Unit*)pSource)->HandleEmote(emotes[urand(0, emotes.size() - 1)]);
             break;
         }
         case SCRIPT_COMMAND_FIELD_SET:                      // 2
@@ -1139,12 +1250,12 @@ bool ScriptAction::HandleScriptStep()
         case SCRIPT_COMMAND_MOVE_TO:                        // 3
         {
             if (LogIfNotUnit(pSource))
-                break;
+                { break; }
 
             // Just turn around
             if ((m_script->x == 0.0f && m_script->y == 0.0f && m_script->z == 0.0f) ||
-                    // Check point-to-point distance, hence revert effect of bounding radius
-                    ((Unit*)pSource)->IsWithinDist3d(m_script->x, m_script->y, m_script->z, 0.01f - ((Unit*)pSource)->GetObjectBoundingRadius()))
+                // Check point-to-point distance, hence revert effect of bounding radius
+                ((Unit*)pSource)->IsWithinDist3d(m_script->x, m_script->y, m_script->z, 0.01f - ((Unit*)pSource)->GetObjectBoundingRadius()))
             {
                 ((Unit*)pSource)->SetFacingTo(m_script->o);
                 break;
@@ -1159,7 +1270,7 @@ bool ScriptAction::HandleScriptStep()
 
             // Normal Movement
             if (m_script->moveTo.travelSpeed)
-                ((Unit*)pSource)->MonsterMoveWithSpeed(m_script->x, m_script->y, m_script->z, m_script->moveTo.travelSpeed * 0.01f);
+                { ((Unit*)pSource)->MonsterMoveWithSpeed(m_script->x, m_script->y, m_script->z, m_script->moveTo.travelSpeed * 0.01f); }
             else
             {
                 ((Unit*)pSource)->GetMotionMaster()->Clear();
@@ -1199,7 +1310,7 @@ bool ScriptAction::HandleScriptStep()
         {
             Player* pPlayer = GetPlayerTargetOrSourceAndLog(pSource, pTarget);
             if (!pPlayer)
-                break;
+                { break; }
 
             pPlayer->TeleportTo(m_script->teleportTo.mapId, m_script->x, m_script->y, m_script->z, m_script->o);
             break;
@@ -1208,13 +1319,13 @@ bool ScriptAction::HandleScriptStep()
         {
             Player* pPlayer = GetPlayerTargetOrSourceAndLog(pSource, pTarget);
             if (!pPlayer)
-                break;
+                { break; }
 
             WorldObject* pWorldObject = NULL;
             if (pSource && pSource->isType(TYPEMASK_CREATURE_OR_GAMEOBJECT))
-                pWorldObject = pSource;
+                { pWorldObject = pSource; }
             else if (pTarget && pTarget->isType(TYPEMASK_CREATURE_OR_GAMEOBJECT))
-                pWorldObject = pTarget;
+                { pWorldObject = pTarget; }
 
             // if we have a distance, we must have a worldobject
             if (m_script->questExplored.distance != 0 && !pWorldObject)
@@ -1226,15 +1337,15 @@ bool ScriptAction::HandleScriptStep()
             bool failQuest = false;
             // Creature must be alive for giving credit
             if (pWorldObject && pWorldObject->GetTypeId() == TYPEID_UNIT && !((Creature*)pWorldObject)->IsAlive())
-                failQuest = true;
+                { failQuest = true; }
             else if (m_script->questExplored.distance != 0 && !pWorldObject->IsWithinDistInMap(pPlayer, float(m_script->questExplored.distance)))
-                failQuest = true;
+                { failQuest = true; }
 
             // quest id and flags checked at script loading
             if (!failQuest)
-                pPlayer->AreaExploredOrEventHappens(m_script->questExplored.questId);
+                { pPlayer->AreaExploredOrEventHappens(m_script->questExplored.questId); }
             else
-                pPlayer->FailQuest(m_script->questExplored.questId);
+                { pPlayer->FailQuest(m_script->questExplored.questId); }
 
             break;
         }
@@ -1242,7 +1353,7 @@ bool ScriptAction::HandleScriptStep()
         {
             Player* pPlayer = GetPlayerTargetOrSourceAndLog(pSource, pTarget);
             if (!pPlayer)
-                break;
+                { break; }
 
             uint32 creatureEntry = m_script->killCredit.creatureEntry;
             WorldObject* pRewardSource = pSource && pSource->GetTypeId() == TYPEID_UNIT ? pSource : (pTarget && pTarget->GetTypeId() == TYPEID_UNIT ? pTarget : NULL);
@@ -1251,7 +1362,7 @@ bool ScriptAction::HandleScriptStep()
             if (!creatureEntry)
             {
                 if (pRewardSource)
-                    creatureEntry =  pRewardSource->GetEntry();
+                    { creatureEntry =  pRewardSource->GetEntry(); }
                 else
                 {
                     sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u called for dynamic killcredit without creature partner, skipping.", m_table, m_script->id, m_script->command);
@@ -1263,11 +1374,11 @@ bool ScriptAction::HandleScriptStep()
             {
                 WorldObject* pSearcher = pRewardSource ? pRewardSource : (pSource ? pSource : pTarget);
                 if (pSearcher != pRewardSource)
-                    sLog.outDebug(" DB-SCRIPTS: Process table `%s` id %u, SCRIPT_COMMAND_KILL_CREDIT called for groupCredit without creature as searcher, script might need adjustment.", m_table, m_script->id);
+                    { sLog.outDebug(" DB-SCRIPTS: Process table `%s` id %u, SCRIPT_COMMAND_KILL_CREDIT called for groupCredit without creature as searcher, script might need adjustment.", m_table, m_script->id); }
                 pPlayer->RewardPlayerAndGroupAtEvent(creatureEntry, pSearcher);
             }
             else
-                pPlayer->KilledMonsterCredit(creatureEntry, pRewardSource ? pRewardSource->GetObjectGuid() : ObjectGuid());
+                { pPlayer->KilledMonsterCredit(creatureEntry, pRewardSource ? pRewardSource->GetObjectGuid() : ObjectGuid()); }
 
             break;
         }
@@ -1280,7 +1391,7 @@ bool ScriptAction::HandleScriptStep()
             {
                 GameObjectData const* goData = sObjectMgr.GetGOData(m_script->respawnGo.goGuid);
                 if (!goData)
-                    break;                                  // checked at load
+                    { break; }                                  // checked at load
 
                 // TODO - This was a change, was before current map of source
                 pGo = m_map->GetGameObject(ObjectGuid(HIGHGUID_GAMEOBJECT, goData->id, m_script->respawnGo.goGuid));
@@ -1288,7 +1399,7 @@ bool ScriptAction::HandleScriptStep()
             else
             {
                 if (LogIfNotGameObject(pSource))
-                    break;
+                    { break; }
 
                 pGo = (GameObject*)pSource;
             }
@@ -1300,16 +1411,14 @@ bool ScriptAction::HandleScriptStep()
             }
 
             if (pGo->GetGoType() == GAMEOBJECT_TYPE_FISHINGNODE ||
-                    pGo->GetGoType() == GAMEOBJECT_TYPE_DOOR        ||
-                    pGo->GetGoType() == GAMEOBJECT_TYPE_BUTTON      ||
-                    pGo->GetGoType() == GAMEOBJECT_TYPE_TRAP)
+                    pGo->GetGoType() == GAMEOBJECT_TYPE_DOOR)
             {
                 sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u can not be used with gameobject of type %u (guid: %u, buddyEntry: %u).", m_table, m_script->id, m_script->command, uint32(pGo->GetGoType()), m_script->respawnGo.goGuid, m_script->buddyEntry);
                 break;
             }
 
             if (pGo->isSpawned())
-                break;                                      // gameobject already spawned
+                { break; }                                      // gameobject already spawned
 
             pGo->SetLootState(GO_READY);
             pGo->SetRespawnTime(time_to_despawn);           // despawn object in ? seconds
@@ -1348,7 +1457,7 @@ bool ScriptAction::HandleScriptStep()
             {
                 GameObjectData const* goData = sObjectMgr.GetGOData(m_script->changeDoor.goGuid);
                 if (!goData)                                // checked at load
-                    break;
+                    { break; }
 
                 // TODO - Was a change, before random map
                 pDoor = m_map->GetGameObject(ObjectGuid(HIGHGUID_GAMEOBJECT, goData->id, m_script->changeDoor.goGuid));
@@ -1356,7 +1465,7 @@ bool ScriptAction::HandleScriptStep()
             else
             {
                 if (LogIfNotGameObject(pSource))
-                    break;
+                    { break; }
 
                 pDoor = (GameObject*)pSource;
             }
@@ -1374,22 +1483,22 @@ bool ScriptAction::HandleScriptStep()
             }
 
             if ((m_script->command == SCRIPT_COMMAND_OPEN_DOOR && pDoor->GetGoState() != GO_STATE_READY) ||
-                    (m_script->command == SCRIPT_COMMAND_CLOSE_DOOR && pDoor->GetGoState() == GO_STATE_READY))
-                break;                                      // to be opened door already open, or to be closed door already closed
+                (m_script->command == SCRIPT_COMMAND_CLOSE_DOOR && pDoor->GetGoState() == GO_STATE_READY))
+                { break; }                                      // to be opened door already open, or to be closed door already closed
 
             pDoor->UseDoorOrButton(time_to_reset);
 
             if (pTarget && pTarget->isType(TYPEMASK_GAMEOBJECT) && ((GameObject*)pTarget)->GetGoType() == GAMEOBJECT_TYPE_BUTTON)
-                ((GameObject*)pTarget)->UseDoorOrButton(time_to_reset);
+                { ((GameObject*)pTarget)->UseDoorOrButton(time_to_reset); }
 
             break;
         }
         case SCRIPT_COMMAND_ACTIVATE_OBJECT:                // 13
         {
             if (LogIfNotUnit(pSource))
-                break;
+                { break; }
             if (LogIfNotGameObject(pTarget))
-                break;
+                { break; }
 
             ((GameObject*)pTarget)->Use((Unit*)pSource);
             break;
@@ -1397,7 +1506,7 @@ bool ScriptAction::HandleScriptStep()
         case SCRIPT_COMMAND_REMOVE_AURA:                    // 14
         {
             if (LogIfNotUnit(pSource))
-                break;
+                { break; }
 
             ((Unit*)pSource)->RemoveAurasDueToSpell(m_script->removeAura.spellId);
             break;
@@ -1405,18 +1514,27 @@ bool ScriptAction::HandleScriptStep()
         case SCRIPT_COMMAND_CAST_SPELL:                     // 15
         {
             if (LogIfNotUnit(pTarget))                      // TODO - Change when support for casting without victim will be supported
-                break;
+                { break; }
+
+            // Select Spell
+            uint32 spell = m_script->castSpell.spellId;
+            uint32 filledCount = 0;
+            while (filledCount < MAX_TEXT_ID && m_script->textId[filledCount])  // Count which dataint fields are filled
+                ++filledCount;
+            if (filledCount > 0)
+                if (uint32 randomField = urand(0, filledCount))               // Random selection resulted in one of the dataint fields
+                    spell = m_script->textId[randomField - 1];
 
             // TODO: when GO cast implemented, code below must be updated accordingly to also allow GO spell cast
             if (pSource && pSource->GetTypeId() == TYPEID_GAMEOBJECT)
             {
-                ((Unit*)pTarget)->CastSpell(((Unit*)pTarget), m_script->castSpell.spellId, true, NULL, NULL, pSource->GetObjectGuid());
-                break;
+                ((Unit*)pTarget)->CastSpell(((Unit*)pTarget), spell, true, NULL, NULL, pSource->GetObjectGuid());
+                { break; }
             }
 
             if (LogIfNotUnit(pSource))
-                break;
-            ((Unit*)pSource)->CastSpell(((Unit*)pTarget), m_script->castSpell.spellId, (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL) != 0);
+                { break; }
+            ((Unit*)pSource)->CastSpell(((Unit*)pTarget), spell, (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL) != 0);
 
             break;
         }
@@ -1434,26 +1552,30 @@ bool ScriptAction::HandleScriptStep()
             {
                 pSoundTarget = GetPlayerTargetOrSourceAndLog(pSource, pTarget);
                 if (!pSoundTarget)
-                    break;
+                    { break; }
             }
 
-            if (m_script->playSound.flags & 2)
-                pSource->PlayDistanceSound(m_script->playSound.soundId, pSoundTarget);
-            else if (m_script->playSound.flags & (4 | 8))
-                m_map->PlayDirectSoundToMap(m_script->playSound.soundId, m_script->playSound.flags & 8 ? pSource->GetZoneId() : 0);
+            if (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL)
+                pSource->PlayMusic(m_script->playSound.soundId, pSoundTarget);
             else
-                pSource->PlayDirectSound(m_script->playSound.soundId, pSoundTarget);
-
+            {
+                if (m_script->playSound.flags & 2)
+                    { pSource->PlayDistanceSound(m_script->playSound.soundId, pSoundTarget); }
+                else if (m_script->playSound.flags & (4 | 8))
+                    { m_map->PlayDirectSoundToMap(m_script->playSound.soundId, m_script->playSound.flags & 8 ? pSource->GetZoneId() : 0); }
+                else
+                    { pSource->PlayDirectSound(m_script->playSound.soundId, pSoundTarget); }
+            }
             break;
         }
         case SCRIPT_COMMAND_CREATE_ITEM:                    // 17
         {
             Player* pPlayer = GetPlayerTargetOrSourceAndLog(pSource, pTarget);
             if (!pPlayer)
-                break;
+                { break; }
 
             if (Item* pItem = pPlayer->StoreNewItemInInventorySlot(m_script->createItem.itemEntry, m_script->createItem.amount))
-                pPlayer->SendNewItem(pItem, m_script->createItem.amount, true, false);
+                { pPlayer->SendNewItem(pItem, m_script->createItem.amount, true, false); }
 
             break;
         }
@@ -1467,7 +1589,7 @@ bool ScriptAction::HandleScriptStep()
             }
 
             if (LogIfNotCreature(pTarget))
-                break;
+                { break; }
 
             ((Creature*)pTarget)->ForcedDespawn(m_script->despawn.despawnDelay);
 
@@ -1481,12 +1603,12 @@ bool ScriptAction::HandleScriptStep()
 
             pPlayer->SendMovieStart(m_script->playMovie.movieId);
 
-            break;
+            break;                                      // must be skipped at loading
         }
         case SCRIPT_COMMAND_MOVEMENT:                       // 20
         {
             if (LogIfNotCreature(pSource))
-                break;
+                { break; }
 
             // Consider add additional checks for cases where creature should not change movementType
             // (pet? in combat? already using same MMgen as script try to apply?)
@@ -1498,7 +1620,7 @@ bool ScriptAction::HandleScriptStep()
                     break;
                 case RANDOM_MOTION_TYPE:
                     if (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL)
-                        ((Creature*)pSource)->GetMotionMaster()->MoveRandomAroundPoint(pSource->GetPositionX(), pSource->GetPositionY(), pSource->GetPositionZ(), float(m_script->movement.wanderDistance));
+                        { ((Creature*)pSource)->GetMotionMaster()->MoveRandomAroundPoint(pSource->GetPositionX(), pSource->GetPositionY(), pSource->GetPositionZ(), float(m_script->movement.wanderDistance)); }
                     else
                     {
                         float respX, respY, respZ, respO, wander_distance;
@@ -1517,7 +1639,7 @@ bool ScriptAction::HandleScriptStep()
         case SCRIPT_COMMAND_SET_ACTIVEOBJECT:               // 21
         {
             if (LogIfNotCreature(pSource))
-                break;
+                { break; }
 
             ((Creature*)pSource)->SetActiveObjectState(m_script->activeObject.activate);
             break;
@@ -1525,24 +1647,24 @@ bool ScriptAction::HandleScriptStep()
         case SCRIPT_COMMAND_SET_FACTION:                    // 22
         {
             if (LogIfNotCreature(pSource))
-                break;
+                { break; }
 
             if (m_script->faction.factionId)
-                ((Creature*)pSource)->SetFactionTemporary(m_script->faction.factionId, m_script->faction.flags);
+                { ((Creature*)pSource)->SetFactionTemporary(m_script->faction.factionId, m_script->faction.flags); }
             else
-                ((Creature*)pSource)->ClearTemporaryFaction();
+                { ((Creature*)pSource)->ClearTemporaryFaction(); }
 
             break;
         }
         case SCRIPT_COMMAND_MORPH_TO_ENTRY_OR_MODEL:        // 23
         {
             if (LogIfNotCreature(pSource))
-                break;
+                { break; }
 
             if (!m_script->morph.creatureOrModelEntry)
-                ((Creature*)pSource)->DeMorph();
+                { ((Creature*)pSource)->DeMorph(); }
             else if (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL)
-                ((Creature*)pSource)->SetDisplayId(m_script->morph.creatureOrModelEntry);
+                { ((Creature*)pSource)->SetDisplayId(m_script->morph.creatureOrModelEntry); }
             else
             {
                 CreatureInfo const* ci = ObjectMgr::GetCreatureTemplate(m_script->morph.creatureOrModelEntry);
@@ -1556,12 +1678,12 @@ bool ScriptAction::HandleScriptStep()
         case SCRIPT_COMMAND_MOUNT_TO_ENTRY_OR_MODEL:        // 24
         {
             if (LogIfNotCreature(pSource))
-                break;
+                { break; }
 
             if (!m_script->mount.creatureOrModelEntry)
-                ((Creature*)pSource)->Unmount();
+                { ((Creature*)pSource)->Unmount(); }
             else if (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL)
-                ((Creature*)pSource)->Mount(m_script->mount.creatureOrModelEntry);
+                { ((Creature*)pSource)->Mount(m_script->mount.creatureOrModelEntry); }
             else
             {
                 CreatureInfo const* ci = ObjectMgr::GetCreatureTemplate(m_script->mount.creatureOrModelEntry);
@@ -1575,7 +1697,7 @@ bool ScriptAction::HandleScriptStep()
         case SCRIPT_COMMAND_SET_RUN:                        // 25
         {
             if (LogIfNotCreature(pSource))
-                break;
+                { break; }
 
             ((Creature*)pSource)->SetWalk(!m_script->run.run, true);
 
@@ -1584,9 +1706,9 @@ bool ScriptAction::HandleScriptStep()
         case SCRIPT_COMMAND_ATTACK_START:                   // 26
         {
             if (LogIfNotCreature(pSource))
-                break;
+                { break; }
             if (LogIfNotUnit(pTarget))
-                break;
+                { break; }
 
             Creature* pAttacker = static_cast<Creature*>(pSource);
             Unit* unitTarget = static_cast<Unit*>(pTarget);
@@ -1604,7 +1726,7 @@ bool ScriptAction::HandleScriptStep()
         case SCRIPT_COMMAND_GO_LOCK_STATE:                  // 27
         {
             if (LogIfNotGameObject(pSource))
-                break;
+                { break; }
 
             GameObject* pGo = static_cast<GameObject*>(pSource);
 
@@ -1617,21 +1739,21 @@ bool ScriptAction::HandleScriptStep()
 
             // Lock or Unlock
             if (m_script->goLockState.lockState & 0x01)
-                pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED);
+                { pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED); }
             else if (m_script->goLockState.lockState & 0x02)
-                pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED);
+                { pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED); }
             // Set Non Interactable or Set Interactable
             if (m_script->goLockState.lockState & 0x04)
-                pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                { pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT); }
             else if (m_script->goLockState.lockState & 0x08)
-                pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                { pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT); }
 
             break;
         }
         case SCRIPT_COMMAND_STAND_STATE:                    // 28
         {
             if (LogIfNotCreature(pSource))
-                break;
+                { break; }
 
             // Must be safe cast to Unit* here
             ((Unit*)pSource)->SetStandState(m_script->standState.stand_state);
@@ -1640,21 +1762,21 @@ bool ScriptAction::HandleScriptStep()
         case SCRIPT_COMMAND_MODIFY_NPC_FLAGS:               // 29
         {
             if (LogIfNotCreature(pSource))
-                break;
+                { break; }
 
             // Add Flags
             if (m_script->npcFlag.change_flag & 0x01)
-                pSource->SetFlag(UNIT_NPC_FLAGS, m_script->npcFlag.flag);
+                { pSource->SetFlag(UNIT_NPC_FLAGS, m_script->npcFlag.flag); }
             // Remove Flags
             else if (m_script->npcFlag.change_flag & 0x02)
-                pSource->RemoveFlag(UNIT_NPC_FLAGS, m_script->npcFlag.flag);
+                { pSource->RemoveFlag(UNIT_NPC_FLAGS, m_script->npcFlag.flag); }
             // Toggle Flags
             else
             {
                 if (pSource->HasFlag(UNIT_NPC_FLAGS, m_script->npcFlag.flag))
-                    pSource->RemoveFlag(UNIT_NPC_FLAGS, m_script->npcFlag.flag);
+                    { pSource->RemoveFlag(UNIT_NPC_FLAGS, m_script->npcFlag.flag); }
                 else
-                    pSource->SetFlag(UNIT_NPC_FLAGS, m_script->npcFlag.flag);
+                    { pSource->SetFlag(UNIT_NPC_FLAGS, m_script->npcFlag.flag); }
             }
 
             break;
@@ -1664,7 +1786,7 @@ bool ScriptAction::HandleScriptStep()
             // only Player
             Player* pPlayer = GetPlayerTargetOrSourceAndLog(pSource, pTarget);
             if (!pPlayer)
-                break;
+                { break; }
 
             pPlayer->ActivateTaxiPathTo(m_script->sendTaxiPath.taxiPathId);
             break;
@@ -1676,7 +1798,7 @@ bool ScriptAction::HandleScriptStep()
             {
                 WorldObject* pSearcher = pSource ? pSource : pTarget;
                 if (pSearcher->GetTypeId() == TYPEID_PLAYER && pTarget && pTarget->GetTypeId() != TYPEID_PLAYER)
-                    pSearcher = pTarget;
+                    { pSearcher = pTarget; }
 
                 Creature* pCreatureBuddy = NULL;
                 MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck u_check(*pSearcher, m_script->terminateScript.npcEntry, true, false, m_script->terminateScript.searchDist, true);
@@ -1695,7 +1817,7 @@ bool ScriptAction::HandleScriptStep()
                 }
             }
             else
-                result = true;
+                { result = true; }
 
             if (result)                                    // Terminate further steps of this script
             {
@@ -1703,7 +1825,7 @@ bool ScriptAction::HandleScriptStep()
                 {
                     Creature* cSource = static_cast<Creature*>(pSource);
                     if (cSource->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
-                        (static_cast<WaypointMovementGenerator<Creature>* >(cSource->GetMotionMaster()->top()))->AddToWaypointPauseTime(m_script->textId[0]);
+                        { (static_cast<WaypointMovementGenerator<Creature>* >(cSource->GetMotionMaster()->top()))->AddToWaypointPauseTime(m_script->textId[0]); }
                 }
 
                 return true;
@@ -1714,11 +1836,11 @@ bool ScriptAction::HandleScriptStep()
         case SCRIPT_COMMAND_PAUSE_WAYPOINTS:                // 32
         {
             if (LogIfNotCreature(pSource))
-                return false;
+                { return false; }
             if (m_script->pauseWaypoint.doPause)
-                ((Creature*)pSource)->addUnitState(UNIT_STAT_WAYPOINT_PAUSED);
+                { ((Creature*)pSource)->addUnitState(UNIT_STAT_WAYPOINT_PAUSED); }
             else
-                ((Creature*)pSource)->clearUnitState(UNIT_STAT_WAYPOINT_PAUSED);
+                { ((Creature*)pSource)->clearUnitState(UNIT_STAT_WAYPOINT_PAUSED); }
             break;
         }
         case SCRIPT_COMMAND_XP_USER:                        // 33
@@ -1733,13 +1855,13 @@ bool ScriptAction::HandleScriptStep()
                 pPlayer->RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_XP_USER_DISABLED);
             break;
         }
-        case SCRIPT_COMMAND_TERMINATE_COND:
+        case SCRIPT_COMMAND_TERMINATE_COND:                 // 34
         {
             Player* player = NULL;
             WorldObject* second = pSource;
             // First case: target is player
             if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
-                player = static_cast<Player*>(pTarget);
+                { player = static_cast<Player*>(pTarget); }
             // Second case: source is player
             else if (pSource && pSource->GetTypeId() == TYPEID_PLAYER)
             {
@@ -1749,9 +1871,9 @@ bool ScriptAction::HandleScriptStep()
 
             bool terminateResult;
             if (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL)
-                terminateResult = !sObjectMgr.IsPlayerMeetToCondition(m_script->terminateCond.conditionId, player, m_map, second, CONDITION_FROM_DBSCRIPTS);
+                { terminateResult = !sObjectMgr.IsPlayerMeetToCondition(m_script->terminateCond.conditionId, player, m_map, second, CONDITION_FROM_DBSCRIPTS); }
             else
-                terminateResult = sObjectMgr.IsPlayerMeetToCondition(m_script->terminateCond.conditionId, player, m_map, second, CONDITION_FROM_DBSCRIPTS);
+                { terminateResult = sObjectMgr.IsPlayerMeetToCondition(m_script->terminateCond.conditionId, player, m_map, second, CONDITION_FROM_DBSCRIPTS); }
 
             if (terminateResult && m_script->terminateCond.failQuest && player)
             {
@@ -1761,17 +1883,93 @@ bool ScriptAction::HandleScriptStep()
                     {
                         Player* member = groupRef->getSource();
                         if (member->GetQuestStatus(m_script->terminateCond.failQuest) == QUEST_STATUS_INCOMPLETE)
-                            member->FailQuest(m_script->terminateCond.failQuest);
+                            { member->FailQuest(m_script->terminateCond.failQuest); }
                     }
                 }
                 else
                 {
                     if (player->GetQuestStatus(m_script->terminateCond.failQuest) == QUEST_STATUS_INCOMPLETE)
-                        player->FailQuest(m_script->terminateCond.failQuest);
+                        { player->FailQuest(m_script->terminateCond.failQuest); }
                 }
             }
             return terminateResult;
         }
+        case SCRIPT_COMMAND_SEND_AI_EVENT_AROUND:           // 35
+        {
+            if (LogIfNotCreature(pSource))
+                return false;
+            if (LogIfNotUnit(pTarget))
+                break;
+
+            ((Creature*)pSource)->AI()->SendAIEventAround(AIEventType(m_script->sendAIEvent.eventType), (Unit*)pTarget, 0, float(m_script->sendAIEvent.radius));
+            break;
+        }
+        case SCRIPT_COMMAND_TURN_TO:                 // 36
+        {
+            if (LogIfNotUnit(pSource))
+                { break; }
+
+            ((Unit*)pSource)->SetFacingTo(pSource->GetAngle(pTarget));
+            break;
+        }
+        case SCRIPT_COMMAND_MOVE_DYNAMIC:                   // 37
+        {
+            //if (LogIfNotCreature(pSource))
+            //    return false;
+            //if (LogIfNotUnit(pTarget))
+            //    return false;
+
+            //float x, y, z;
+            //if (m_script->moveDynamic.maxDist == 0)         // Move to pTarget
+            //{
+            //    if (pTarget == pSource)
+            //    {
+            //        sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, _MOVE_DYNAMIC called with maxDist == 0, but resultingSource == resultingTarget (== %s)", m_table, m_script->id, pSource->GetGuidStr().c_str());
+            //        break;
+            //    }
+            //    pTarget->GetContactPoint(pSource, x, y, z);
+            //}
+            //else                                            // Calculate position
+            //{
+            //    float orientation;
+            //    if (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL)
+            //        orientation = pSource->GetOrientation() + m_script->o + 2 * M_PI_F;
+            //    else
+            //        orientation = m_script->o;
+
+            //    pSource->GetRandomPoint(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), m_script->moveDynamic.maxDist, x, y, z,
+            //                            m_script->moveDynamic.minDist, (orientation == 0.0f ? NULL : &orientation));
+            //    z = std::max(z, pTarget->GetPositionZ());
+            //    pSource->UpdateAllowedPositionZ(x, y, z);
+            //}
+            //((Creature*)pSource)->GetMotionMaster()->MovePoint(1, x, y, z);
+            break;
+        }
+        case SCRIPT_COMMAND_SEND_MAIL:                      // 38
+        {
+            if (LogIfNotPlayer(pTarget))
+                return false;
+            if (!m_script->sendMail.altSender && LogIfNotCreature(pSource))
+                return false;
+
+            MailSender sender;
+            if (m_script->sendMail.altSender)
+                sender = MailSender(MAIL_CREATURE, m_script->sendMail.altSender);
+            else
+                sender = MailSender(pSource);
+            uint32 deliverDelay = m_script->textId[0] > 0 ? (uint32)m_script->textId[0] : 0;
+
+            MailDraft(m_script->sendMail.mailTemplateId).SendMailTo(static_cast<Player*>(pTarget), sender, MAIL_CHECK_MASK_HAS_BODY, deliverDelay);
+            break;
+        }
+        case SCRIPT_COMMAND_CHANGE_ENTRY:                   // 39
+        {
+            if (LogIfNotCreature(pSource))
+                { break; }
+
+            ((Creature*)pSource)->UpdateEntry(m_script->changeEntry.creatureEntry);
+            break;
+        }
         default:
             sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u unknown command used.", m_table, m_script->id, m_script->command);
             break;
@@ -1783,7 +1981,6 @@ bool ScriptAction::HandleScriptStep()
 // /////////////////////////////////////////////////////////
 //              Scripting Library Hooks
 // /////////////////////////////////////////////////////////
-
 void ScriptMgr::LoadScriptBinding()
 {
 #ifdef ENABLE_SD3
@@ -1884,7 +2081,8 @@ void ScriptMgr::LoadScriptBinding()
             id |= uint32(data) << 24;   //incorporate spell effect number into the key
 
         m_scriptBind[type][id] = scriptId;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
 
     delete result;
     sLog.outString("Of the total %u script bindings, loaded succesfully:", count);
@@ -1903,6 +2101,18 @@ void ScriptMgr::LoadScriptBinding()
     return;
 }
 
+bool ScriptMgr::ReloadScriptBinding()
+{
+#ifdef _DEBUG
+    m_bindMutex.acquire_write();
+    LoadScriptBinding();
+    m_bindMutex.release();
+    return true;
+#else
+    return false;
+#endif /* _DEBUG */
+}
+
 void ScriptMgr::LoadScriptNames()
 {
     m_scriptNames.push_back("");
@@ -1925,7 +2135,8 @@ void ScriptMgr::LoadScriptNames()
         bar.step();
         m_scriptNames.push_back((*result)[0].GetString());
         ++count;
-    } while (result->NextRow());
+    }
+    while (result->NextRow());
     delete result;
 
     std::sort(m_scriptNames.begin(), m_scriptNames.end());
@@ -1939,21 +2150,37 @@ uint32 ScriptMgr::GetScriptId(const char* name) const
     // use binary search to find the script name in the sorted vector
     // assume "" is the first element
     if (!name)
-    {
-        return 0;
-    }
+        { return 0; }
 
     ScriptNameMap::const_iterator itr =
         std::lower_bound(m_scriptNames.begin(), m_scriptNames.end(), name);
 
     if (itr == m_scriptNames.end() || *itr != name)
-    {
-        return 0;
-    }
+        { return 0; }
 
     return uint32(itr - m_scriptNames.begin());
 }
 
+uint32 ScriptMgr::GetBoundScriptId(ScriptedObjectType entity, int32 entry)
+{
+#ifdef _DEBUG
+    m_bindMutex.acquire_read();
+#endif /* _DEBUG */
+    uint32 id = 0;
+    if (entity < SCRIPTED_MAX_TYPE)
+    {
+        EntryToScriptIdMap::iterator it = m_scriptBind[entity].find(entry);
+        if (it != m_scriptBind[entity].end())
+            id = it->second;
+    }
+    else
+        sLog.outErrorScriptLib("asking a script for non-existing entity type %u!", entity);
+#ifdef _DEBUG
+    m_bindMutex.release();
+#endif /* _DEBUG */
+    return id;
+}
+
 char const* ScriptMgr::GetScriptLibraryVersion() const
 {
 #ifdef ENABLE_SD3
@@ -1963,21 +2190,6 @@ char const* ScriptMgr::GetScriptLibraryVersion() const
 #endif
 }
 
-uint32 ScriptMgr::GetBoundScriptId(ScriptedObjectType entity, int32 entry)
-{
-    uint32 id = 0;
-    if (entity < SCRIPTED_MAX_TYPE)
-    {
-        EntryToScriptIdMap::const_iterator it = m_scriptBind[entity].find(entry);
-        if (it != m_scriptBind[entity].end())
-            id = it->second;
-    }
-    else
-        sLog.outErrorScriptLib("asking a script for non-existing entity type %u!", entity);
-
-    return id;
-}
-
 CreatureAI* ScriptMgr::GetCreatureAI(Creature* pCreature)
 {
     // Used by Eluna
@@ -2051,13 +2263,9 @@ bool ScriptMgr::OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 send
 
 #ifdef ENABLE_SD3
     if (code)
-    {
-        return SD3::GossipSelectWithCode(pPlayer, pCreature, sender, action, code);
-    }
+        { return SD3::GossipSelectWithCode(pPlayer, pCreature, sender, action, code); }
     else
-    {
-        return SD3::GossipSelect(pPlayer, pCreature, sender, action);
-    }
+        { return SD3::GossipSelect(pPlayer, pCreature, sender, action); }
 #else
     return false;
 #endif
@@ -2081,13 +2289,9 @@ bool ScriptMgr::OnGossipSelect(Player* pPlayer, GameObject* pGameObject, uint32
 
 #ifdef ENABLE_SD3
     if (code)
-    {
-        return SD3::GOGossipSelectWithCode(pPlayer, pGameObject, sender, action, code);
-    }
+        { return SD3::GOGossipSelectWithCode(pPlayer, pGameObject, sender, action, code); }
     else
-    {
-        return SD3::GOGossipSelect(pPlayer, pGameObject, sender, action);
-    }
+        { return SD3::GOGossipSelect(pPlayer, pGameObject, sender, action); }
 #else
     return false;
 #endif
@@ -2260,21 +2464,22 @@ bool ScriptMgr::OnProcessEvent(uint32 eventId, Object* pSource, Object* pTarget,
 #endif
 }
 
-bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Creature* pTarget, ObjectGuid originalCasterGuid)
+bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Unit* pTarget, ObjectGuid originalCasterGuid)
 {
     // Used by Eluna
 #ifdef ENABLE_ELUNA
-    if (sEluna->OnDummyEffect(pCaster, spellId, effIndex, pTarget))
-        return true;
+    if (pTarget->ToCreature())
+        if (sEluna->OnDummyEffect(pCaster, spellId, effIndex, pTarget->ToCreature()))
+            return true;
 #endif /* ENABLE_ELUNA */
 
 #ifdef ENABLE_SD3
-    return SD3::EffectDummyCreature(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
+    return SD3::EffectDummyUnit(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
 #else
     return false;
 #endif
 }
-
+  
 bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, GameObject* pTarget, ObjectGuid originalCasterGuid)
 {
     // Used by Eluna
@@ -2289,7 +2494,7 @@ bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex ef
     return false;
 #endif
 }
-
+  
 bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Item* pTarget, ObjectGuid originalCasterGuid)
 {
     // Used by Eluna
@@ -2302,13 +2507,13 @@ bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex ef
     return SD3::EffectDummyItem(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
 #else
     return false;
-#endif   
+#endif
 }
 
-bool ScriptMgr::OnEffectScriptEffect(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Creature* pTarget, ObjectGuid originalCasterGuid)
+bool ScriptMgr::OnEffectScriptEffect(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Unit* pTarget, ObjectGuid originalCasterGuid)
 {
 #ifdef ENABLE_SD3
-    return SD3::EffectScriptEffectCreature(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
+    return SD3::EffectScriptEffectUnit(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
 #else
     return false;
 #endif
@@ -2333,6 +2538,7 @@ ScriptLoadResult ScriptMgr::LoadScriptLibrary(const char* libName)
         return SCRIPT_LOAD_OK;
     }
 #endif
+
     return SCRIPT_LOAD_ERR_NOT_FOUND;
 }
 
@@ -2390,6 +2596,7 @@ void ScriptMgr::CollectPossibleEventIds(std::set<uint32>& eventIds)
         {
             for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
             {
+#if defined (CATA)
                 SpellEffectEntry const* spellEffect = spell->GetSpellEffect(SpellEffectIndex(j));
                 if (!spellEffect)
                     continue;
@@ -2399,10 +2606,17 @@ void ScriptMgr::CollectPossibleEventIds(std::set<uint32>& eventIds)
                     if (spellEffect->EffectMiscValue)
                         eventIds.insert(spellEffect->EffectMiscValue);
                 }
+#else
+                if (spell->Effect[j] == SPELL_EFFECT_SEND_EVENT)
+                {
+                    if (spell->EffectMiscValue[j])
+                        { eventIds.insert(spell->EffectMiscValue[j]); }
+                }
+#endif
             }
         }
     }
-
+#if defined(TBC) || defined (WOTLK) || defined (CATA)
     // Load all possible event entries from taxi path nodes
     for (size_t path_idx = 0; path_idx < sTaxiPathNodesByPath.size(); ++path_idx)
     {
@@ -2417,6 +2631,7 @@ void ScriptMgr::CollectPossibleEventIds(std::set<uint32>& eventIds)
                 eventIds.insert(node.departureEventID);
         }
     }
+#endif
 }
 
 // Starters for events
@@ -2424,9 +2639,9 @@ bool StartEvents_Event(Map* map, uint32 id, Object* source, Object* target, bool
 {
     MANGOS_ASSERT(source);
 
-    // Handle SD2 script
+    // Handle SD3 script
     if (sScriptMgr.OnProcessEvent(id, source, target, isStart))
-        return true;
+        { return true; }
 
     // Handle PvP Calls
     if (forwardToPvp && source->GetTypeId() == TYPEID_GAMEOBJECT)
@@ -2437,48 +2652,37 @@ bool StartEvents_Event(Map* map, uint32 id, Object* source, Object* target, bool
         {
             bg = ((Player*)forwardToPvp)->GetBattleGround();
             if (!bg)
-                opvp = sOutdoorPvPMgr.GetScript(((Player*)forwardToPvp)->GetCachedZoneId());
+                { opvp = sOutdoorPvPMgr.GetScript(((Player*)forwardToPvp)->GetCachedZoneId()); }
         }
         else
         {
+#if defined(CLASSIC)
+            if (map->IsBattleGround())
+#else
             if (map->IsBattleGroundOrArena())
-                bg = ((BattleGroundMap*)map)->GetBG();
+#endif
+                { bg = ((BattleGroundMap*)map)->GetBG(); }
             else                                            // Use the go, because GOs don't move
-                opvp = sOutdoorPvPMgr.GetScript(((GameObject*)source)->GetZoneId());
+                { opvp = sOutdoorPvPMgr.GetScript(((GameObject*)source)->GetZoneId()); }
         }
 
         if (bg && bg->HandleEvent(id, static_cast<GameObject*>(source)))
-            return true;
+            { return true; }
 
         if (opvp && opvp->HandleEvent(id, static_cast<GameObject*>(source)))
-            return true;
+            { return true; }
     }
 
     Map::ScriptExecutionParam execParam = Map::SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE_TARGET;
     if (source->isType(TYPEMASK_CREATURE_OR_GAMEOBJECT))
-        execParam = Map::SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE;
+        { execParam = Map::SCRIPT_EXEC_PARAM_UNIQUE_BY_SOURCE; }
     else if (target && target->isType(TYPEMASK_CREATURE_OR_GAMEOBJECT))
-        execParam = Map::SCRIPT_EXEC_PARAM_UNIQUE_BY_TARGET;
+        { execParam = Map::SCRIPT_EXEC_PARAM_UNIQUE_BY_TARGET; }
 
     return map->ScriptsStart(sEventScripts, id, source, target, execParam);
 }
 
 // Wrappers
-
-/*
- * commented out as not appearing in the previous versions of the core
- * delete this if it is found not to be needed (chucky)
-*/
-uint32 ScriptMgr::GetAreaTriggerScriptId(uint32 triggerId) const
-{
-    return sScriptMgr.GetAreaTriggerScriptId(triggerId);
-}
-
-uint32 ScriptMgr::GetEventIdScriptId(uint32 eventId) const
-{
-    return sScriptMgr.GetEventIdScriptId(eventId);
-}
-
 uint32 GetScriptId(const char* name)
 {
     return sScriptMgr.GetScriptId(name);
@@ -2493,4 +2697,3 @@ uint32 GetScriptIdsCount()
 {
     return sScriptMgr.GetScriptIdsCount();
 }
-
diff --git a/src/game/WorldHandlers/ScriptMgr.h b/src/game/WorldHandlers/ScriptMgr.h
index 69b3516b0..43bf75883 100644
--- a/src/game/WorldHandlers/ScriptMgr.h
+++ b/src/game/WorldHandlers/ScriptMgr.h
@@ -22,14 +22,14 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#ifndef _SCRIPTMGR_H
-#define _SCRIPTMGR_H
+#ifndef MANGOS_H_SCRIPTMGR
+#define MANGOS_H_SCRIPTMGR
 
 #include "Common.h"
 #include "Policies/Singleton.h"
 #include "ObjectGuid.h"
 #include "DBCEnums.h"
-#include "ace/Atomic_Op.h"
+#include <ace/Atomic_Op.h>
 
 struct AreaTriggerEntry;
 struct SpellEntry;
@@ -49,28 +49,35 @@ class WorldObject;
 
 enum ScriptedObjectType
 {
-    SCRIPTED_UNIT = 0,    //CreatureScript
-    SCRIPTED_GAMEOBJECT = 1,    //GameObjectScript
-    SCRIPTED_ITEM = 2,    //ItemScript
-    SCRIPTED_AREATRIGGER = 3,    //AreaTriggerScript
-    SCRIPTED_SPELL = 4,    //SpellScript
-    SCRIPTED_AURASPELL = 5,    //AuraScript
-    SCRIPTED_MAPEVENT = 6,    //MapEventScript
-    SCRIPTED_MAP = 7,    //ZoneScript
-    SCRIPTED_BATTLEGROUND = 8,    //BattleGroundScript
-    SCRIPTED_PVP_ZONE = 9,    //OutdoorPvPScript
-    SCRIPTED_INSTANCE = 10,   //InstanceScript
-    SCRIPTED_CONDITION = 11,   //ConditionScript
-    SCRIPTED_ACHIEVEMENT = 12,   //AchievementScript
+    SCRIPTED_UNIT           = 0,    //CreatureScript
+    SCRIPTED_GAMEOBJECT     = 1,    //GameObjectScript
+    SCRIPTED_ITEM           = 2,    //ItemScript
+    SCRIPTED_AREATRIGGER    = 3,    //AreaTriggerScript
+    SCRIPTED_SPELL          = 4,    //SpellScript
+    SCRIPTED_AURASPELL      = 5,    //AuraScript
+    SCRIPTED_MAPEVENT       = 6,    //MapEventScript
+    SCRIPTED_MAP            = 7,    //ZoneScript
+    SCRIPTED_BATTLEGROUND   = 8,    //BattleGroundScript
+    SCRIPTED_PVP_ZONE       = 9,    //OutdoorPvPScript
+    SCRIPTED_INSTANCE       = 10,   //InstanceScript
+    SCRIPTED_CONDITION      = 11,   //ConditionScript
+    SCRIPTED_ACHIEVEMENT    = 12,   //AchievementScript
     SCRIPTED_MAX_TYPE
 };
 
-enum ScriptCommand                                          // resSource, resTarget are the resulting Source/ Target after buddy search is done
+enum ScriptImplementation
+{
+    SCRIPT_FROM_DATABASE    = 0,
+    SCRIPT_FROM_CORE        = 1,
+    SCRIPT_FROM_ELUNA       = 2,
+};
+
+enum DBScriptCommand                                        // resSource, resTarget are the resulting Source/ Target after buddy search is done
 {
     SCRIPT_COMMAND_TALK                     = 0,            // resSource = WorldObject, resTarget = Unit/none
                                                             // dataint = text entry from db_script_string -table. dataint2-4 optional for random selected texts.
     SCRIPT_COMMAND_EMOTE                    = 1,            // resSource = Unit, resTarget = Unit/none
-                                                            // datalong1 = emote_id
+                                                            // datalong1 = emote_id, dataint1-4 optional for random selected emotes
     SCRIPT_COMMAND_FIELD_SET                = 2,            // source = any, datalong = field_id, datalong2 = value
     SCRIPT_COMMAND_MOVE_TO                  = 3,            // resSource = Creature, datalong2 = travel_speed*100, x/y/z
                                                             // data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL: teleport unit to position
@@ -88,6 +95,7 @@ enum ScriptCommand                                          // resSource, resTar
     SCRIPT_COMMAND_REMOVE_AURA              = 14,           // resSource = Unit, datalong = spell_id
     SCRIPT_COMMAND_CAST_SPELL               = 15,           // resSource = Unit, cast spell at resTarget = Unit
                                                             // datalong=spellid
+                                                            // dataint1-4 optional for random selected spell
                                                             // data_flags &  SCRIPT_FLAG_COMMAND_ADDITIONAL = cast triggered
     SCRIPT_COMMAND_PLAY_SOUND               = 16,           // resSource = WorldObject, target=any/player, datalong (sound_id), datalong2 (bitmask: 0/1=target-player, 0/2=with distance dependent, 0/4=map wide, 0/8=zone wide; so 1|2 = 3 is target with distance dependent)
     SCRIPT_COMMAND_CREATE_ITEM              = 17,           // source or target must be player, datalong = item entry, datalong2 = amount
@@ -124,9 +132,25 @@ enum ScriptCommand                                          // resSource, resTar
     SCRIPT_COMMAND_XP_USER                  = 33,           // source or target with Player, datalong = bool (0=off, 1=on)
     SCRIPT_COMMAND_TERMINATE_COND           = 34,           // datalong = condition_id, datalong2 = if != 0 then quest_id of quest that will be failed for player's group if the script is terminated
                                                             // data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL terminate when condition is false ELSE terminate when condition is true
+    SCRIPT_COMMAND_SEND_AI_EVENT_AROUND     = 35,           // resSource = Creature, resTarget = Unit
+                                                            // datalong = AIEventType
+                                                            // datalong2 = radius
+    SCRIPT_COMMAND_TURN_TO                  = 36,           // resSource = Unit, resTarget = Unit/none
+    SCRIPT_COMMAND_MOVE_DYNAMIC             = 37,           // resSource = Creature, resTarget Worldobject.
+                                                            // datalong = 0: Move resSource towards resTarget
+                                                            // datalong != 0: Move resSource to a random point between datalong2..datalong around resTarget.
+                                                            //      orientation != 0: Obtain a random point around resTarget in direction of orientation
+                                                            // data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL Obtain a random point around resTarget in direction of resTarget->GetOrientation + orientation
+                                                            // for resTarget == resSource and orientation == 0 this will mean resSource moving forward
+    SCRIPT_COMMAND_SEND_MAIL                = 38,           // resSource WorldObject, can be NULL, resTarget Player
+                                                            // datalong: Send mailTemplateId from resSource (if provided) to player resTarget
+                                                            // datalong2: AlternativeSenderEntry. Use as sender-Entry
+                                                            // dataint1: Delay (>= 0) in Seconds
+    SCRIPT_COMMAND_CHANGE_ENTRY             = 39,           // resSource = Creature, datalong=creature entry
+                                                            // dataint1 = entry
 };
 
-#define MAX_TEXT_ID 4                                       // used for SCRIPT_COMMAND_TALK
+#define MAX_TEXT_ID 4                                       // used for SCRIPT_COMMAND_TALK, SCRIPT_COMMAND_EMOTE, SCRIPT_COMMAND_CAST_SPELL, SCRIPT_COMMAND_TERMINATE_SCRIPT
 
 enum ScriptInfoDataFlags
 {
@@ -347,6 +371,36 @@ struct ScriptInfo
             uint32 failQuest;                               // datalong2
         } terminateCond;
 
+        struct                                              // SCRIPT_COMMAND_SEND_AI_EVENT_AROUND (35)
+        {
+            uint32 eventType;                               // datalong
+            uint32 radius;                                  // datalong2
+        } sendAIEvent;
+
+        struct                                              // SCRIPT_COMMAND_TURN_TO (36)
+        {
+            uint32 targetId;                                // datalong
+            uint32 empty1;                                  // datalong2
+        } turnTo;
+
+        struct                                              // SCRIPT_COMMAND_MOVE_DYNAMIC (37)
+        {
+            uint32 maxDist;                                 // datalong
+            uint32 minDist;                                 // datalong2
+        } moveDynamic;
+
+        struct                                              // SCRIPT_COMMAND_SEND_MAIL (38)
+        {
+            uint32 mailTemplateId;                          // datalong
+            uint32 altSender;                               // datalong2;
+        } sendMail;
+
+        struct                                              // SCRIPT_COMMAND_MORPH_TO_ENTRY_OR_MODEL (23)
+        {
+            uint32 creatureEntry;                           // datalong
+            uint32 empty1;                                  // datalong2
+        } changeEntry;
+
         struct
         {
             uint32 data[2];
@@ -402,11 +456,14 @@ struct ScriptInfo
             case SCRIPT_COMMAND_MOVE_TO:
             case SCRIPT_COMMAND_TEMP_SUMMON_CREATURE:
             case SCRIPT_COMMAND_CAST_SPELL:
+            case SCRIPT_COMMAND_PLAY_SOUND:
             case SCRIPT_COMMAND_MOVEMENT:
             case SCRIPT_COMMAND_MORPH_TO_ENTRY_OR_MODEL:
             case SCRIPT_COMMAND_MOUNT_TO_ENTRY_OR_MODEL:
             case SCRIPT_COMMAND_TERMINATE_SCRIPT:
             case SCRIPT_COMMAND_TERMINATE_COND:
+            case SCRIPT_COMMAND_TURN_TO:
+            case SCRIPT_COMMAND_MOVE_DYNAMIC:
                 return true;
             default:
                 return false;
@@ -423,11 +480,26 @@ class ScriptAction
 
         bool HandleScriptStep();                            // return true IF AND ONLY IF the script should be terminated
 
-        const char* GetTableName() const { return m_table; }
-        uint32 GetId() const { return m_script->id; }
-        ObjectGuid GetSourceGuid() const { return m_sourceGuid; }
-        ObjectGuid GetTargetGuid() const { return m_targetGuid; }
-        ObjectGuid GetOwnerGuid() const { return m_ownerGuid; }
+        const char* GetTableName() const
+        {
+            return m_table;
+        }
+        uint32 GetId() const
+        {
+            return m_script->id;
+        }
+        ObjectGuid GetSourceGuid() const
+        {
+            return m_sourceGuid;
+        }
+        ObjectGuid GetTargetGuid() const
+        {
+            return m_targetGuid;
+        }
+        ObjectGuid GetOwnerGuid() const
+        {
+            return m_ownerGuid;
+        }
 
         bool IsSameScript(const char* table, uint32 id, ObjectGuid sourceGuid, ObjectGuid targetGuid, ObjectGuid ownerGuid) const
         {
@@ -451,6 +523,7 @@ class ScriptAction
         bool LogIfNotCreature(WorldObject* pWorldObject);
         bool LogIfNotUnit(WorldObject* pWorldObject);
         bool LogIfNotGameObject(WorldObject* pWorldObject);
+        bool LogIfNotPlayer(WorldObject* pWorldObject);
         Player* GetPlayerTargetOrSourceAndLog(WorldObject* pSource, WorldObject* pTarget);
 };
 
@@ -482,6 +555,8 @@ class ScriptMgr
         ScriptMgr();
         ~ScriptMgr();
 
+        std::string GenerateNameToId(ScriptedObjectType sot, uint32 id);
+
         void LoadGameObjectScripts();
         void LoadGameObjectTemplateScripts();
         void LoadQuestEndScripts();
@@ -496,11 +571,11 @@ class ScriptMgr
 
         void LoadScriptNames();
         void LoadScriptBinding();
+        void LoadAreaTriggerScripts();
+        void LoadEventIdScripts();
+        void LoadSpellIdScripts();
 
-        uint32 GetAreaTriggerScriptId(uint32 triggerId) const;
-        uint32 GetEventIdScriptId(uint32 eventId) const;
-
-        uint32 GetBoundScriptId(ScriptedObjectType entity, int32 entry);
+        bool ReloadScriptBinding();
 
         const char* GetScriptName(uint32 id) const
         {
@@ -511,16 +586,17 @@ class ScriptMgr
         {
             return m_scriptNames.size();
         }
+        uint32 GetBoundScriptId(ScriptedObjectType entity, int32 entry);
 
         ScriptLoadResult LoadScriptLibrary(const char* libName);
         void UnloadScriptLibrary();
         bool IsScriptLibraryLoaded() const
         {
-    #ifdef ENABLE_SD3
+#ifdef ENABLE_SD3
             return true;
-    #else
+#else
             return false;
-    #endif
+#endif
         }
 
         uint32 IncreaseScheduledScriptsCount()
@@ -561,10 +637,10 @@ class ScriptMgr
         bool OnAreaTrigger(Player* pPlayer, AreaTriggerEntry const* atEntry);
         bool OnNpcSpellClick(Player* pPlayer, Creature* pClickedCreature, uint32 spellId);
         bool OnProcessEvent(uint32 eventId, Object* pSource, Object* pTarget, bool isStart);
-        bool OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Creature* pTarget, ObjectGuid originalCasterGuid);
+        bool OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Unit* pTarget, ObjectGuid originalCasterGuid);
         bool OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, GameObject* pTarget, ObjectGuid originalCasterGuid);
         bool OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Item* pTarget, ObjectGuid originalCasterGuid);
-        bool OnEffectScriptEffect(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Creature* pTarget, ObjectGuid originalCasterGuid);
+        bool OnEffectScriptEffect(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Unit* pTarget, ObjectGuid originalCasterGuid);
         bool OnAuraDummy(Aura const* pAura, bool apply);
 
     private:
@@ -579,6 +655,10 @@ class ScriptMgr
 
         ScriptNameMap           m_scriptNames;
 
+#ifdef _DEBUG
+        // mutex allowing to reload the script binding table; TODO just do it AWAY from any map update, e.g. right after sessions update 
+        ACE_RW_Thread_Mutex m_bindMutex;
+#endif /* _DEBUG */
         // atomic op counter for active scripts amount
         ACE_Atomic_Op<ACE_Thread_Mutex, long> m_scheduledScripts;
 };
@@ -588,10 +668,8 @@ bool StartEvents_Event(Map* map, uint32 id, Object* source, Object* target, bool
 
 #define sScriptMgr MaNGOS::Singleton<ScriptMgr>::Instance()
 
- uint32 GetAreaTriggerScriptId(uint32 triggerId);
- uint32 GetEventIdScriptId(uint32 eventId);
- uint32 GetScriptId(const char* name);
- char const* GetScriptName(uint32 id);
- uint32 GetScriptIdsCount();
+uint32 GetScriptId(const char* name);
+char const* GetScriptName(uint32 id);
+uint32 GetScriptIdsCount();
 
 #endif
diff --git a/src/game/WorldHandlers/Spell.cpp b/src/game/WorldHandlers/Spell.cpp
index 4fc19359a..9ec2c7694 100644
--- a/src/game/WorldHandlers/Spell.cpp
+++ b/src/game/WorldHandlers/Spell.cpp
@@ -7654,7 +7654,7 @@ SpellCastResult Spell::CanOpenLock(SpellEffectIndex effIndex, uint32 lockId, Ski
                     reqSkillValue = lockInfo->Skill[j];
 
                     // castitem check: rogue using skeleton keys. the skill values should not be added in this case.
-                    // MAX_SKILL_TYPE - skill value scales with caster level
+                    // MAX_SKILL_TYPE - skill value Scales with caster level
                     if (skillId == MAX_SKILL_TYPE)
                         skillValue = m_CastItem || m_caster->GetTypeId() != TYPEID_PLAYER ? 0 : m_caster->getLevel() * 5;
                     else
@@ -8223,10 +8223,10 @@ void Spell::GetSpellRangeAndRadius(SpellEffectEntry const* spellEffect, float& r
                         radius = 0.5f * (60000 - auraHolder->GetAuraDuration()) * 0.001f;
                     break;
                 }
-                case 66881:                                 // Slime Pool (ToCrusader, Acidmaw & Dreadscale)
-                case 67638:                                 // Slime Pool (ToCrusader, Acidmaw & Dreadscale) (Mode 1)
-                case 67639:                                 // Slime Pool (ToCrusader, Acidmaw & Dreadscale) (Mode 2)
-                case 67640:                                 // Slime Pool (ToCrusader, Acidmaw & Dreadscale) (Mode 3)
+                case 66881:                                 // Slime Pool (ToCrusader, Acidmaw & DreadScale)
+                case 67638:                                 // Slime Pool (ToCrusader, Acidmaw & DreadScale) (Mode 1)
+                case 67639:                                 // Slime Pool (ToCrusader, Acidmaw & DreadScale) (Mode 2)
+                case 67640:                                 // Slime Pool (ToCrusader, Acidmaw & DreadScale) (Mode 3)
                     if (SpellAuraHolder* auraHolder = m_caster->GetSpellAuraHolder(66882))
                         radius = 0.5f * (60000 - auraHolder->GetAuraDuration()) * 0.001f;
                     break;
diff --git a/src/game/WorldHandlers/SpellAuras.cpp b/src/game/WorldHandlers/SpellAuras.cpp
index d05dff5bb..8bf9a11fc 100644
--- a/src/game/WorldHandlers/SpellAuras.cpp
+++ b/src/game/WorldHandlers/SpellAuras.cpp
@@ -458,7 +458,7 @@ Aura::Aura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBas
 
     int32 damage;
     if (!caster)
-        damage = m_currentBasePoints;
+        { damage = m_currentBasePoints; }
     else
     {
         damage = caster->CalculateSpellDamage(target, spellproto, m_effIndex, &m_currentBasePoints);
@@ -499,7 +499,7 @@ Aura::Aura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBas
 
     // Apply periodic time mod
     if (modOwner && m_modifier.periodictime)
-        modOwner->ApplySpellMod(spellproto->Id, SPELLMOD_ACTIVATION_TIME, m_modifier.periodictime);
+        { modOwner->ApplySpellMod(spellproto->Id, SPELLMOD_ACTIVATION_TIME, m_modifier.periodictime); }
 
     // Start periodic on next tick or at aura apply
     if (!spellproto->HasAttribute(SPELL_ATTR_EX5_START_PERIODIC_AT_APPLY))
@@ -519,8 +519,8 @@ AreaAura::AreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* cu
     Unit* caster_ptr = caster ? caster : target;
 
     m_radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellEffect->GetRadiusIndex()));
-    if(Player* modOwner = caster_ptr->GetSpellModOwner())
-        modOwner->ApplySpellMod(spellproto->Id, SPELLMOD_RADIUS, m_radius);
+    if (Player* modOwner = caster_ptr->GetSpellModOwner())
+        { modOwner->ApplySpellMod(spellproto->Id, SPELLMOD_RADIUS, m_radius); }
 
     switch(m_spellEffect->Effect)
     {
@@ -557,7 +557,7 @@ AreaAura::AreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* cu
 
     // totems are immune to any kind of area auras
     if (target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->IsTotem())
-        m_modifier.m_auraname = SPELL_AURA_NONE;
+        { m_modifier.m_auraname = SPELL_AURA_NONE; }
 }
 
 AreaAura::~AreaAura()
@@ -578,7 +578,7 @@ SingleEnemyTargetAura::SingleEnemyTargetAura(SpellEntry const* spellproto, Spell
         Unit* caster, Item* castItem) : Aura(spellproto, eff, currentBasePoints, holder, target, caster, castItem)
 {
     if (caster)
-        m_castersTargetGuid = caster->GetTypeId() == TYPEID_PLAYER ? ((Player*)caster)->GetSelectionGuid() : caster->GetTargetGuid();
+        { m_castersTargetGuid = caster->GetTypeId() == TYPEID_PLAYER ? ((Player*)caster)->GetSelectionGuid() : caster->GetTargetGuid(); }
 }
 
 SingleEnemyTargetAura::~SingleEnemyTargetAura()
@@ -595,7 +595,7 @@ Aura* CreateAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* curr
     SpellEffectEntry const* effectEntry = spellproto->GetSpellEffect(eff);
 
     if (effectEntry && IsAreaAuraEffect(effectEntry->Effect))
-        return new AreaAura(spellproto, eff, currentBasePoints, holder, target, caster, castItem);
+        { return new AreaAura(spellproto, eff, currentBasePoints, holder, target, caster, castItem); }
 
     uint32 triggeredSpellId = effectEntry ? effectEntry->EffectTriggerSpell : 0;
 
@@ -650,7 +650,7 @@ void AreaAura::Update(uint32 diff)
         {
             Unit* owner = caster->GetCharmerOrOwner();
             if (!owner)
-                owner = caster;
+                { owner = caster; }
             Spell::UnitList targets;
 
             switch (m_areaAuraType)
@@ -660,7 +660,7 @@ void AreaAura::Update(uint32 diff)
                     Group* pGroup = NULL;
 
                     if (owner->GetTypeId() == TYPEID_PLAYER)
-                        pGroup = ((Player*)owner)->GetGroup();
+                        { pGroup = ((Player*)owner)->GetGroup(); }
 
                     if (pGroup)
                     {
@@ -671,10 +671,10 @@ void AreaAura::Update(uint32 diff)
                             if (Target && Target->IsAlive() && Target->GetSubGroup() == subgroup && caster->IsFriendlyTo(Target))
                             {
                                 if (caster->IsWithinDistInMap(Target, m_radius))
-                                    targets.push_back(Target);
+                                    { targets.push_back(Target); }
                                 Pet* pet = Target->GetPet();
                                 if (pet && pet->IsAlive() && caster->IsWithinDistInMap(pet, m_radius))
-                                    targets.push_back(pet);
+                                    { targets.push_back(pet); }
                             }
                         }
                     }
@@ -682,11 +682,11 @@ void AreaAura::Update(uint32 diff)
                     {
                         // add owner
                         if (owner != caster && caster->IsWithinDistInMap(owner, m_radius))
-                            targets.push_back(owner);
+                            { targets.push_back(owner); }
                         // add caster's pet
                         Unit* pet = caster->GetPet();
                         if (pet && caster->IsWithinDistInMap(pet, m_radius))
-                            targets.push_back(pet);
+                            { targets.push_back(pet); }
                     }
                     break;
                 }
@@ -742,14 +742,14 @@ void AreaAura::Update(uint32 diff)
                 case AREA_AURA_PET:
                 {
                     if (owner != caster && caster->IsWithinDistInMap(owner, m_radius))
-                        targets.push_back(owner);
+                        { targets.push_back(owner); }
                     break;
                 }
             }
 
             for (Spell::UnitList::iterator tIter = targets.begin(); tIter != targets.end(); ++tIter)
             {
-                // flag for seelction is need apply aura to current iteration target
+                // flag for selection is need apply aura to current iteration target
                 bool apply = true;
 
                 // we need ignore present caster self applied are auras sometime
@@ -758,12 +758,12 @@ void AreaAura::Update(uint32 diff)
                 for (Unit::SpellAuraHolderMap::const_iterator i = spair.first; i != spair.second; ++i)
                 {
                     if (i->second->IsDeleted())
-                        continue;
+                        { continue; }
 
                     Aura* aur = i->second->GetAuraByEffectIndex(m_effIndex);
 
                     if (!aur)
-                        continue;
+                        { continue; }
 
                     switch (m_areaAuraType)
                     {
@@ -788,18 +788,18 @@ void AreaAura::Update(uint32 diff)
                 }
 
                 if (!apply)
-                    continue;
+                    { continue; }
 
                 // Skip some targets (TODO: Might require better checks, also unclear how the actual caster must/can be handled)
                 if (GetSpellProto()->HasAttribute(SPELL_ATTR_EX3_TARGET_ONLY_PLAYER) && (*tIter)->GetTypeId() != TYPEID_PLAYER)
-                    continue;
+                    { continue; }
 
                 if (SpellEntry const* actualSpellInfo = sSpellMgr.SelectAuraRankForLevel(GetSpellProto(), (*tIter)->getLevel()))
                 {
                     int32 actualBasePoints = m_currentBasePoints;
                     // recalculate basepoints for lower rank (all AreaAura spell not use custom basepoints?)
                     if (actualSpellInfo != GetSpellProto())
-                        actualBasePoints = actualSpellInfo->CalculateSimpleValue(m_effIndex);
+                    { actualBasePoints = actualSpellInfo->CalculateSimpleValue(m_effIndex); }
 
                     SpellAuraHolder* holder = (*tIter)->GetSpellAuraHolder(actualSpellInfo->Id, GetCasterGuid());
 
@@ -860,10 +860,10 @@ void AreaAura::Update(uint32 diff)
                 {
                     Player* checkTarget = target->GetCharmerOrOwnerPlayerOrPlayerItself();
                     if (!checkTarget || !pGroup->SameSubGroup(check, checkTarget))
-                        target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetCasterGuid());
+                        { target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetCasterGuid()); }
                 }
                 else
-                    target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetCasterGuid());
+                    { target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetCasterGuid()); }
             }
         }
         else if (m_areaAuraType == AREA_AURA_RAID)          // TODO: fix me!
@@ -887,7 +887,7 @@ void AreaAura::Update(uint32 diff)
         else if (m_areaAuraType == AREA_AURA_PET || m_areaAuraType == AREA_AURA_OWNER)
         {
             if (target->GetObjectGuid() != caster->GetCharmerOrOwnerGuid())
-                target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetCasterGuid());
+                { target->RemoveSingleAuraFromSpellAuraHolder(GetId(), GetEffIndex(), GetCasterGuid()); }
         }
     }
 }
@@ -910,15 +910,15 @@ void PersistentAreaAura::Update(uint32 diff)
             }
         }
         else
-            remove = true;
+            { remove = true; }
     }
     else
-        remove = true;
+        { remove = true; }
 
     Aura::Update(diff);
 
     if (remove)
-        GetTarget()->RemoveAura(GetId(), GetEffIndex());
+        { GetTarget()->RemoveAura(GetId(), GetEffIndex()); }
 }
 
 void Aura::ApplyModifier(bool apply, bool Real)
@@ -928,7 +928,8 @@ void Aura::ApplyModifier(bool apply, bool Real)
     GetHolder()->SetInUse(true);
     SetInUse(true);
     if (aura < TOTAL_AURAS)
-        (*this.*AuraHandler [aura])(apply, Real);
+        { (*this.*AuraHandler [aura])(apply, Real); }
+
     SetInUse(false);
     GetHolder()->SetInUse(false);
 }
@@ -965,15 +966,15 @@ bool Aura::CanProcFrom(SpellEntry const* spell, uint32 /*procFlag*/, uint32 Even
             {
                 // No extra req, so can trigger only for active (damage/healing present) and hit/crit
                 if (((procEx & (PROC_EX_NORMAL_HIT | PROC_EX_CRITICAL_HIT)) && active) || procEx == PROC_EX_CAST_END)
-                    return true;
+                    { return true; }
                 else
-                    return false;
+                    { return false; }
             }
             else // Passive spells hits here only if resist/reflect/immune/evade
             {
                 // Passive spells can`t trigger if need hit (exclude cases when procExtra include non-active flags)
                 if ((EventProcEx & (PROC_EX_NORMAL_HIT | PROC_EX_CRITICAL_HIT) & procEx) && !active)
-                    return false;
+                    { return false; }
             }
         }
         return true;
@@ -1051,7 +1052,7 @@ void Aura::ReapplyAffectedPassiveAuras()
 {
     // not reapply spell mods with charges (use original value because processed and at remove)
     if (GetSpellProto()->GetProcCharges())
-        return;
+        { return; }
 
     // not reapply some spell mods ops (mostly speedup case)
     switch (m_modifier.m_miscvalue)
@@ -1087,10 +1088,10 @@ void Aura::ReapplyAffectedPassiveAuras()
 void Aura::HandleAddModifier(bool apply, bool Real)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER || !Real)
-        return;
+        { return; }
 
     if (m_modifier.m_miscvalue >= MAX_SPELLMOD)
-        return;
+        { return; }
 
     if (apply)
     {
@@ -1140,7 +1141,7 @@ void Aura::TriggerSpell()
     Unit* triggerTarget = GetTriggerTarget();
 
     if (!casterGUID || !triggerTarget)
-        return;
+        { return; }
 
     // generic casting code with custom spells and target/caster customs
     uint32 trigger_spell_id = m_spellEffect->EffectTriggerSpell;
@@ -1306,9 +1307,9 @@ void Aura::TriggerSpell()
                         // casted in left/right (but triggered spell have wide forward cone)
                         float forward = target->GetOrientation();
                         if (tick <= 3)
-                            target->SetOrientation(forward + 0.75f * M_PI_F - tick * M_PI_F / 8);       // Left
+                            { target->SetOrientation(forward + 0.75f * M_PI_F - tick * M_PI_F / 8); }       // Left
                         else
-                            target->SetOrientation(forward - 0.75f * M_PI_F + (8 - tick) * M_PI_F / 8); // Right
+                            { target->SetOrientation(forward - 0.75f * M_PI_F + (8 - tick) * M_PI_F / 8); } // Right
 
                         triggerTarget->CastSpell(triggerTarget, spellForTick[tick], true, NULL, this, casterGUID);
                         target->SetOrientation(forward);
@@ -1332,9 +1333,9 @@ void Aura::TriggerSpell()
                         float newAngle = target->GetOrientation();
 
                         if (auraId == 26009)
-                            newAngle += M_PI_F / 40;
+                            { newAngle += M_PI_F / 40; }
                         else
-                            newAngle -= M_PI_F / 40;
+                            { newAngle -= M_PI_F / 40; }
 
                         newAngle = NormalizeOrientation(newAngle);
 
@@ -1947,7 +1948,7 @@ void Aura::TriggerSpell()
 
                         int32 lRage = target->GetPower(POWER_RAGE);
                         if (lRage > 100)                    // rage stored as rage*10
-                            lRage = 100;
+                            { lRage = 100; }
                         target->ModifyPower(POWER_RAGE, -lRage);
                         int32 FRTriggerBasePoints = int32(lRage * LifePerRage / 10);
                         target->CastCustomSpell(target, 22845, &FRTriggerBasePoints, NULL, NULL, true, NULL, this);
@@ -2047,9 +2048,9 @@ void Aura::TriggerSpell()
                 if (WorldObject* channelTarget = target->GetMap()->GetWorldObject(target->GetChannelObjectGuid()))
                 {
                     if (channelTarget->isType(TYPEMASK_UNIT))
-                        triggerTarget = (Unit*)channelTarget;
+                        { triggerTarget = (Unit*)channelTarget; }
                     else
-                        triggerTargetObject = channelTarget;
+                        { triggerTargetObject = channelTarget; }
                 }
             }
             // or periodic aura at caster channel target
@@ -2069,11 +2070,11 @@ void Aura::TriggerSpell()
             case 9347:                                      // Mortal Strike
             {
                 if (target->GetTypeId() != TYPEID_UNIT)
-                    return;
+                    { return; }
                 // expected selection current fight target
                 triggerTarget = ((Creature*)target)->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0, triggeredSpellInfo);
                 if (!triggerTarget)
-                    return;
+                    { return; }
 
                 break;
             }
@@ -2087,7 +2088,7 @@ void Aura::TriggerSpell()
 
                 // prevent cast by triggered auras
                 if (casterGUID == triggerTarget->GetObjectGuid())
-                    return;
+                    { return; }
 
                 // stop triggering after each affected stats lost > 90
                 int32 intelectLoss = 0;
@@ -2108,7 +2109,7 @@ void Aura::TriggerSpell()
                 }
 
                 if (intelectLoss <= -90 && spiritLoss <= -90)
-                    return;
+                    { return; }
 
                 break;
             }
@@ -2188,14 +2189,14 @@ void Aura::TriggerSpell()
             triggerCaster->CastSpell(triggerTargetObject->GetPositionX(), triggerTargetObject->GetPositionY(), triggerTargetObject->GetPositionZ(),
                                      triggeredSpellInfo, true, NULL, this, casterGUID);
         else
-            triggerCaster->CastSpell(triggerTarget, triggeredSpellInfo, true, NULL, this, casterGUID);
+            { triggerCaster->CastSpell(triggerTarget, triggeredSpellInfo, true, NULL, this, casterGUID); }
     }
     else
     {
         if (Unit* caster = GetCaster())
         {
             if (triggerTarget->GetTypeId() != TYPEID_UNIT || !sScriptMgr.OnEffectDummy(caster, GetId(), GetEffIndex(), (Creature*)triggerTarget, ObjectGuid()))
-                sLog.outError("Aura::TriggerSpell: Spell %u have 0 in EffectTriggered[%d], not handled custom case?", GetId(), GetEffIndex());
+                { sLog.outError("Aura::TriggerSpell: Spell %u have 0 in EffectTriggered[%d], not handled custom case?", GetId(), GetEffIndex()); }
         }
     }
 }
@@ -2223,7 +2224,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
@@ -2255,7 +2256,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                         if (Unit* caster = GetCaster())
                         {
                             if (caster->GetTypeId() != TYPEID_UNIT)
-                                return;
+                                { return; }
 
                             caster->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                             caster->addUnitState(UNIT_STAT_ROOT);
@@ -2265,7 +2266,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                     case 13139:                             // net-o-matic
                         // root to self part of (root_target->charge->root_self sequence
                         if (Unit* caster = GetCaster())
-                            caster->CastSpell(caster, 13138, true, NULL, this);
+                            { caster->CastSpell(caster, 13138, true, NULL, this); }
                         return;
                     case 28832:                             // Mark of Korth'azz
                     case 28833:                             // Mark of Blaumeux
@@ -2288,7 +2289,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                         }
 
                         if (Unit* caster = GetCaster())
-                            caster->CastCustomSpell(target, 28836, &damage, NULL, NULL, true, NULL, this);
+                            { caster->CastCustomSpell(target, 28836, &damage, NULL, NULL, true, NULL, this); }
                         return;
                     }
                     case 31606:                             // Stormcrow Amulet
@@ -2631,7 +2632,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
         {
             Unit* caster = GetCaster();
             if (!caster || !caster->IsAlive())
-                return;
+                { return; }
 
             uint32 finalSpellId = 0;
             switch (GetId())
@@ -2657,7 +2658,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
             }
 
             if (finalSpellId)
-                caster->CastSpell(target, finalSpellId, true, NULL, this);
+                { caster->CastSpell(target, finalSpellId, true, NULL, this); }
 
             return;
         }
@@ -2669,7 +2670,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                 if (Unit* caster = GetCaster())
                 {
                     if (caster->GetTypeId() != TYPEID_UNIT)
-                        return;
+                        { return; }
 
                     // see dummy effect of spell 10254 for removal of flags etc
                     caster->CastSpell(caster, 10254, true);
@@ -2682,11 +2683,11 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
             case 12774:                                     // (DND) Belnistrasz Idol Shutdown Visual
             {
                 if (m_removeMode == AURA_REMOVE_BY_DEATH)
-                    return;
+                    { return; }
 
                 // Idom Rool Camera Shake <- wtf, don't drink while making spellnames?
                 if (Unit* caster = GetCaster())
-                    caster->CastSpell(caster, 12816, true);
+                    { caster->CastSpell(caster, 12816, true); }
 
                 return;
             }
@@ -3000,12 +3001,12 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                     {
                         Unit* caster = GetCaster();
                         if (!caster)
-                            return;
+                            { return; }
 
                         caster->CastSpell(target, 24659, true, NULL, NULL, GetCasterGuid());
                     }
                     else
-                        target->RemoveAurasDueToSpell(24659);
+                        { target->RemoveAurasDueToSpell(24659); }
                     return;
                 }
                 case 24661:                                 // Restless Strength
@@ -3014,12 +3015,12 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                     {
                         Unit* caster = GetCaster();
                         if (!caster)
-                            return;
+                            { return; }
 
                         caster->CastSpell(target, 24662, true, NULL, NULL, GetCasterGuid());
                     }
                     else
-                        target->RemoveAurasDueToSpell(24662);
+                        { target->RemoveAurasDueToSpell(24662); }
                     return;
                 }
                 case 29266:                                 // Permanent Feign Death
@@ -3044,7 +3045,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                     // Some appear to be used depending on creature location, in water, at solid ground, in air/suspended, etc
                     // For now, just handle all the same way
                     if (target->GetTypeId() == TYPEID_UNIT)
-                        target->SetFeignDeath(apply);
+                        { target->SetFeignDeath(apply); }
 
                     return;
                 }
@@ -3183,9 +3184,9 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                 case 27978:
                 case 40131:
                     if (apply)
-                        target->m_AuraFlags |= UNIT_AURAFLAG_ALIVE_INVISIBLE;
+                        { target->m_AuraFlags |= UNIT_AURAFLAG_ALIVE_INVISIBLE; }
                     else
-                        target->m_AuraFlags &= ~UNIT_AURAFLAG_ALIVE_INVISIBLE;
+                        { target->m_AuraFlags &= ~UNIT_AURAFLAG_ALIVE_INVISIBLE; }
                     return;
             }
             break;
@@ -3371,14 +3372,14 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                 case 6495:                                  // Sentry Totem
                 {
                     if (target->GetTypeId() != TYPEID_PLAYER)
-                        return;
+                        { return; }
 
                     Totem* totem = target->GetTotem(TOTEM_SLOT_AIR);
 
                     if (totem && apply)
-                        ((Player*)target)->GetCamera().SetView(totem);
+                        { ((Player*)target)->GetCamera().SetView(totem); }
                     else
-                        ((Player*)target)->GetCamera().ResetView();
+                        { ((Player*)target)->GetCamera().ResetView(); }
 
                     return;
                 }
@@ -3391,9 +3392,9 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
     if (PetAura const* petSpell = sSpellMgr.GetPetAura(GetId(), m_effIndex))
     {
         if (apply)
-            target->AddPetAura(petSpell);
+            { target->AddPetAura(petSpell); }
         else
-            target->RemovePetAura(petSpell);
+            { target->RemovePetAura(petSpell); }
         return;
     }
 
@@ -3406,20 +3407,20 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
             target->GetZoneAndAreaId(zone, area);
 
             for (SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
-                itr->second->ApplyOrRemoveSpellIfCan((Player*)target, zone, area, false);
+                { itr->second->ApplyOrRemoveSpellIfCan((Player*)target, zone, area, false); }
         }
     }
 
     // script has to "handle with care", only use where data are not ok to use in the above code.
     if (target->GetTypeId() == TYPEID_UNIT)
-        sScriptMgr.OnAuraDummy(this, apply);
+        { sScriptMgr.OnAuraDummy(this, apply); }
 }
 
 void Aura::HandleAuraMounted(bool apply, bool Real)
 {
     // only at real add/remove aura
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
@@ -3439,11 +3440,11 @@ void Aura::HandleAuraMounted(bool apply, bool Real)
         uint32 display_id = Creature::ChooseDisplayId(ci);
         CreatureModelInfo const* minfo = sObjectMgr.GetCreatureModelRandomGender(display_id);
         if (minfo)
-            display_id = minfo->modelid;
+            { display_id = minfo->modelid; }
 
-        if (ci->vehicleId)
+        if (ci->VehicleTemplateId)
         {
-            target->SetVehicleId(ci->vehicleId, ci->Entry);
+            target->SetVehicleId(ci->VehicleTemplateId, ci->Entry);
 
             if (target->GetTypeId() == TYPEID_PLAYER)
                 target->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_PLAYER_VEHICLE);
@@ -3462,7 +3463,7 @@ void Aura::HandleAuraMounted(bool apply, bool Real)
             target->RemoveAurasByCasterSpell(mountCapability->SpeedModSpell, target->GetObjectGuid());
 
         CreatureInfo const* ci = ObjectMgr::GetCreatureTemplate(m_modifier.m_miscvalue);
-        if (ci && target->IsVehicle() && ci->vehicleId == target->GetVehicleInfo()->GetVehicleEntry()->m_ID)
+        if (ci && target->IsVehicle() && ci->VehicleTemplateId == target->GetVehicleInfo()->GetVehicleEntry()->m_ID)
         {
             if (target->GetTypeId() == TYPEID_PLAYER)
                 target->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_PLAYER_VEHICLE);
@@ -3476,7 +3477,7 @@ void Aura::HandleAuraWaterWalk(bool apply, bool Real)
 {
     // only at real add/remove aura
     if (!Real)
-        return;
+        { return; }
 
     GetTarget()->SetWaterWalk(apply);
 }
@@ -3485,7 +3486,7 @@ void Aura::HandleAuraFeatherFall(bool apply, bool Real)
 {
     // only at real add/remove aura
     if (!Real)
-        return;
+        { return; }
     Unit* target = GetTarget();
     WorldPacket data;
     target->BuildMoveFeatherFallPacket(&data, apply, 0);
@@ -3500,7 +3501,7 @@ void Aura::HandleAuraHover(bool apply, bool Real)
 {
     // only at real add/remove aura
     if (!Real)
-        return;
+        { return; }
 
     WorldPacket data;
     if (apply)
@@ -3518,7 +3519,7 @@ void Aura::HandleAuraHover(bool apply, bool Real)
             data.Initialize(SMSG_SPLINE_MOVE_SET_HOVER, 8 + 4 + 1);
             data.WriteGuidMask<3, 7, 0, 1, 4, 6, 2, 5>(GetTarget()->GetObjectGuid());
             data.WriteGuidBytes<2, 4, 3, 1, 7, 0, 5, 6>(GetTarget()->GetObjectGuid());
-            GetTarget()->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNK_2);
+            GetTarget()->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_FLY_ANIM);
         }
     }
     else
@@ -3537,7 +3538,7 @@ void Aura::HandleAuraHover(bool apply, bool Real)
             data.Initialize(SMSG_SPLINE_MOVE_UNSET_HOVER, 8 + 4 + 1);
             data.WriteGuidMask<6, 7, 4, 0, 3, 1, 5, 2>(GetTarget()->GetObjectGuid());
             data.WriteGuidBytes<4, 5, 3, 0, 2, 7, 6, 1>(GetTarget()->GetObjectGuid());
-            GetTarget()->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNK_2);
+            GetTarget()->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_FLY_ANIM);
         }
     }
     GetTarget()->SendMessageToSet(&data, true);
@@ -3547,13 +3548,13 @@ void Aura::HandleWaterBreathing(bool /*apply*/, bool /*Real*/)
 {
     // update timers in client
     if (GetTarget()->GetTypeId() == TYPEID_PLAYER)
-        ((Player*)GetTarget())->UpdateMirrorTimers();
+        { ((Player*)GetTarget())->UpdateMirrorTimers(); }
 }
 
 void Aura::HandleAuraModShapeshift(bool apply, bool Real)
 {
     if (!Real)
-        return;
+        { return; }
 
     ShapeshiftForm form = ShapeshiftForm(m_modifier.m_miscvalue);
 
@@ -3666,7 +3667,7 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
         {
             // reset power to default values only at power change
             if (target->GetPowerType() != PowerType)
-                target->SetPowerType(PowerType);
+                { target->SetPowerType(PowerType); }
 
             switch (form)
             {
@@ -3722,7 +3723,7 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
                     }
 
                     if (target->GetPower(POWER_RAGE) > Rage_val)
-                        target->SetPower(POWER_RAGE, Rage_val);
+                        { target->SetPower(POWER_RAGE, Rage_val); }
                     break;
                 }
                 default:
@@ -3745,7 +3746,7 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
             target->SetDisplayId(target->GetNativeDisplayId());
 
         if (target->getClass() == CLASS_DRUID)
-            target->SetPowerType(POWER_MANA);
+            { target->SetPowerType(POWER_MANA); }
 
         target->SetShapeshiftForm(FORM_NONE);
 
@@ -3778,7 +3779,7 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
     HandleShapeshiftBoosts(apply);
 
     if (target->GetTypeId() == TYPEID_PLAYER)
-        ((Player*)target)->InitDataForForm();
+        { ((Player*)target)->InitDataForForm(); }
 
     // update form-dependent armor specializations
     if (target->GetTypeId() == TYPEID_PLAYER && ((Player*)target)->getClass() == CLASS_DRUID)
@@ -4017,7 +4018,7 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
                 sLog.outError("Auras: unknown creature id = %d (only need its modelid) Form Spell Aura Transform in Spell ID = %d", m_modifier.m_miscvalue, GetId());
             }
             else
-                model_id = Creature::ChooseDisplayId(ci);   // Will use the default model here
+                { model_id = Creature::ChooseDisplayId(ci); }   // Will use the default model here
 
             // Polymorph (sheep/penguin case)
             if (GetSpellProto()->GetSpellFamilyName() == SPELLFAMILY_MAGE && GetSpellProto()->SpellIconID == 82)
@@ -4032,7 +4033,7 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
 
             // creature case, need to update equipment if additional provided
             if (ci && target->GetTypeId() == TYPEID_UNIT)
-                ((Creature*)target)->LoadEquipment(ci->equipmentId, false);
+                ((Creature*)target)->LoadEquipment(ci->EquipmentTemplateId, false);
 
             // Dragonmaw Illusion (set mount model also)
             if (GetId() == 42016 && target->GetMountID() && !target->GetAurasByType(SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED).empty())
@@ -4064,7 +4065,7 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
 
         // apply default equipment for creature case
         if (target->GetTypeId() == TYPEID_UNIT)
-            ((Creature*)target)->LoadEquipment(((Creature*)target)->GetCreatureInfo()->equipmentId, true);
+            ((Creature*)target)->LoadEquipment(((Creature*)target)->GetCreatureInfo()->EquipmentTemplateId, true);
 
         // re-apply some from still active with preference negative cases
         Unit::AuraList const& otherTransforms = target->GetAurasByType(SPELL_AURA_TRANSFORM);
@@ -4107,10 +4108,10 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
 void Aura::HandleForceReaction(bool apply, bool Real)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     if (!Real)
-        return;
+        { return; }
 
     Player* player = (Player*)GetTarget();
 
@@ -4122,13 +4123,13 @@ void Aura::HandleForceReaction(bool apply, bool Real)
 
     // stop fighting if at apply forced rank friendly or at remove real rank friendly
     if ((apply && faction_rank >= REP_FRIENDLY) || (!apply && player->GetReputationRank(faction_id) >= REP_FRIENDLY))
-        player->StopAttackFaction(faction_id);
+        { player->StopAttackFaction(faction_id); }
 }
 
 void Aura::HandleAuraModSkill(bool apply, bool /*Real*/)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     uint32 prot = m_spellEffect->EffectMiscValue;
     int32 points = GetModifier()->m_amount;
@@ -4146,18 +4147,18 @@ void Aura::HandleChannelDeathItem(bool apply, bool Real)
     if (Real && !apply)
     {
         if (m_removeMode != AURA_REMOVE_BY_DEATH)
-            return;
+            { return; }
         // Item amount
         if (m_modifier.m_amount <= 0)
-            return;
+            { return; }
 
         if(m_spellEffect->EffectItemType == 0)
-            return;
+            { return; }
 
         Unit* victim = GetTarget();
         Unit* caster = GetCaster();
         if (!caster || caster->GetTypeId() != TYPEID_PLAYER)
-            return;
+            { return; }
 
         // Soul Shard (target req.)
         if (m_spellEffect->EffectItemType == 6265)
@@ -4165,7 +4166,7 @@ void Aura::HandleChannelDeathItem(bool apply, bool Real)
             // Only from non-grey units
             if (!((Player*)caster)->isHonorOrXPTarget(victim) ||
                     (victim->GetTypeId() == TYPEID_UNIT && !((Player*)caster)->isAllowedToLoot((Creature*)victim)))
-                return;
+                { return; }
         }
 
         // Adding items
@@ -4174,12 +4175,12 @@ void Aura::HandleChannelDeathItem(bool apply, bool Real)
 
         ItemPosCountVec dest;
         InventoryResult msg = ((Player*)caster)->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, m_spellEffect->EffectItemType, count, &noSpaceForCount);
-        if( msg != EQUIP_ERR_OK )
+        if (msg != EQUIP_ERR_OK)
         {
-            count-=noSpaceForCount;
+            count -= noSpaceForCount;
             ((Player*)caster)->SendEquipError( msg, NULL, NULL, m_spellEffect->EffectItemType );
-            if (count==0)
-                return;
+            if (count == 0)
+                { return; }
         }
 
         Item* newitem = ((Player*)caster)->StoreNewItem(dest, m_spellEffect->EffectItemType, true);
@@ -4199,63 +4200,63 @@ void Aura::HandleBindSight(bool apply, bool /*Real*/)
 {
     Unit* caster = GetCaster();
     if (!caster || caster->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     Camera& camera = ((Player*)caster)->GetCamera();
     if (apply)
-        camera.SetView(GetTarget());
+        { camera.SetView(GetTarget()); }
     else
-        camera.ResetView();
+        { camera.ResetView(); }
 }
 
 void Aura::HandleFarSight(bool apply, bool /*Real*/)
 {
     Unit* caster = GetCaster();
     if (!caster || caster->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     Camera& camera = ((Player*)caster)->GetCamera();
     if (apply)
-        camera.SetView(GetTarget());
+        { camera.SetView(GetTarget()); }
     else
-        camera.ResetView();
+        { camera.ResetView(); }
 }
 
 void Aura::HandleAuraTrackCreatures(bool apply, bool /*Real*/)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     if (apply)
-        GetTarget()->RemoveNoStackAurasDueToAuraHolder(GetHolder());
+        { GetTarget()->RemoveNoStackAurasDueToAuraHolder(GetHolder()); }
 
     if (apply)
-        GetTarget()->SetFlag(PLAYER_TRACK_CREATURES, uint32(1) << (m_modifier.m_miscvalue - 1));
+        { GetTarget()->SetFlag(PLAYER_TRACK_CREATURES, uint32(1) << (m_modifier.m_miscvalue - 1)); }
     else
-        GetTarget()->RemoveFlag(PLAYER_TRACK_CREATURES, uint32(1) << (m_modifier.m_miscvalue - 1));
+        { GetTarget()->RemoveFlag(PLAYER_TRACK_CREATURES, uint32(1) << (m_modifier.m_miscvalue - 1)); }
 }
 
 void Aura::HandleAuraTrackResources(bool apply, bool /*Real*/)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     if (apply)
-        GetTarget()->RemoveNoStackAurasDueToAuraHolder(GetHolder());
+        { GetTarget()->RemoveNoStackAurasDueToAuraHolder(GetHolder()); }
 
     if (apply)
-        GetTarget()->SetFlag(PLAYER_TRACK_RESOURCES, uint32(1) << (m_modifier.m_miscvalue - 1));
+        { GetTarget()->SetFlag(PLAYER_TRACK_RESOURCES, uint32(1) << (m_modifier.m_miscvalue - 1)); }
     else
-        GetTarget()->RemoveFlag(PLAYER_TRACK_RESOURCES, uint32(1) << (m_modifier.m_miscvalue - 1));
+        { GetTarget()->RemoveFlag(PLAYER_TRACK_RESOURCES, uint32(1) << (m_modifier.m_miscvalue - 1)); }
 }
 
 void Aura::HandleAuraTrackStealthed(bool apply, bool /*Real*/)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     if (apply)
-        GetTarget()->RemoveNoStackAurasDueToAuraHolder(GetHolder());
+        { GetTarget()->RemoveNoStackAurasDueToAuraHolder(GetHolder()); }
 
     GetTarget()->ApplyModByteFlag(PLAYER_FIELD_BYTES, 0, PLAYER_FIELD_BYTE_TRACK_STEALTHED, apply);
 }
@@ -4269,17 +4270,17 @@ void Aura::HandleAuraModScale(bool apply, bool /*Real*/)
 void Aura::HandleModPossess(bool apply, bool Real)
 {
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
     // not possess yourself
     if (GetCasterGuid() == target->GetObjectGuid())
-        return;
+        { return; }
 
     Unit* caster = GetCaster();
     if (!caster || caster->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     Player* p_caster = (Player*)caster;
     Camera& camera = p_caster->GetCamera();
@@ -4337,7 +4338,7 @@ void Aura::HandleModPossess(bool apply, bool Real)
 
         // on delete only do caster related effects
         if (m_removeMode == AURA_REMOVE_BY_DELETE)
-            return;
+            { return; }
 
         target->clearUnitState(UNIT_STAT_CONTROLLED);
 
@@ -4357,7 +4358,7 @@ void Aura::HandleModPossess(bool apply, bool Real)
         else if (target->GetTypeId() == TYPEID_UNIT)
         {
             CreatureInfo const* cinfo = ((Creature*)target)->GetCreatureInfo();
-            target->setFaction(cinfo->faction_A);
+            target->setFaction(cinfo->FactionAlliance);
         }
 
         if (target->GetTypeId() == TYPEID_UNIT)
@@ -4371,15 +4372,15 @@ void Aura::HandleModPossess(bool apply, bool Real)
 void Aura::HandleModPossessPet(bool apply, bool Real)
 {
     if (!Real)
-        return;
+        { return; }
 
     Unit* caster = GetCaster();
     if (!caster || caster->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
     if (target->GetTypeId() != TYPEID_UNIT || !((Creature*)target)->IsPet())
-        return;
+        { return; }
 
     Pet* pet = (Pet*)target;
 
@@ -4416,7 +4417,7 @@ void Aura::HandleModPossessPet(bool apply, bool Real)
 
         // on delete only do caster related effects
         if (m_removeMode == AURA_REMOVE_BY_DELETE)
-            return;
+            { return; }
 
         pet->clearUnitState(UNIT_STAT_CONTROLLED);
 
@@ -4449,17 +4450,17 @@ void Aura::HandleAuraModPetTalentsPoints(bool /*Apply*/, bool Real)
 void Aura::HandleModCharm(bool apply, bool Real)
 {
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
     // not charm yourself
     if (GetCasterGuid() == target->GetObjectGuid())
-        return;
+        { return; }
 
     Unit* caster = GetCaster();
     if (!caster)
-        return;
+        { return; }
 
     if (apply)
     {
@@ -4508,7 +4509,7 @@ void Aura::HandleModCharm(bool apply, bool Real)
         }
 
         if (caster->GetTypeId() == TYPEID_PLAYER)
-            ((Player*)caster)->CharmSpellInitialize();
+            { ((Player*)caster)->CharmSpellInitialize(); }
     }
     else
     {
@@ -4524,12 +4525,12 @@ void Aura::HandleModCharm(bool apply, bool Real)
             if (((Creature*)target)->IsPet())
             {
                 if (Unit* owner = target->GetOwner())
-                    target->setFaction(owner->getFaction());
+                    { target->setFaction(owner->getFaction()); }
                 else if (cinfo)
-                    target->setFaction(cinfo->faction_A);
+                    target->setFaction(cinfo->FactionAlliance);
             }
             else if (cinfo)                             // normal creature
-                target->setFaction(cinfo->faction_A);
+                target->setFaction(cinfo->FactionAlliance);
 
             // restore UNIT_FIELD_BYTES_0
             if (cinfo && caster->GetTypeId() == TYPEID_PLAYER && caster->getClass() == CLASS_WARLOCK && cinfo->type == CREATURE_TYPE_DEMON)
@@ -4538,16 +4539,16 @@ void Aura::HandleModCharm(bool apply, bool Real)
                 // m_target->SetByteValue(UNIT_FIELD_BYTES_0, 1, cinfo->unit_class);
 
                 if (target->GetCharmInfo())
-                    target->GetCharmInfo()->SetPetNumber(0, true);
+                    { target->GetCharmInfo()->SetPetNumber(0, true); }
                 else
-                    sLog.outError("Aura::HandleModCharm: target (GUID: %u TypeId: %u) has a charm aura but no charm info!", target->GetGUIDLow(), target->GetTypeId());
+                    { sLog.outError("Aura::HandleModCharm: target (GUID: %u TypeId: %u) has a charm aura but no charm info!", target->GetGUIDLow(), target->GetTypeId()); }
             }
         }
 
         caster->SetCharm(NULL);
 
         if (caster->GetTypeId() == TYPEID_PLAYER)
-            ((Player*)caster)->RemovePetActionBar();
+            { ((Player*)caster)->RemovePetActionBar(); }
 
         target->CombatStop(true);
         target->DeleteThreatList();
@@ -4564,7 +4565,7 @@ void Aura::HandleModCharm(bool apply, bool Real)
 void Aura::HandleModConfuse(bool apply, bool Real)
 {
     if (!Real)
-        return;
+        { return; }
 
     GetTarget()->SetConfused(apply, GetCasterGuid(), GetId());
 }
@@ -4572,7 +4573,7 @@ void Aura::HandleModConfuse(bool apply, bool Real)
 void Aura::HandleModFear(bool apply, bool Real)
 {
     if (!Real)
-        return;
+        { return; }
 
     GetTarget()->SetFeared(apply, GetCasterGuid(), GetId());
 }
@@ -4580,7 +4581,7 @@ void Aura::HandleModFear(bool apply, bool Real)
 void Aura::HandleFeignDeath(bool apply, bool Real)
 {
     if (!Real)
-        return;
+        { return; }
 
     GetTarget()->SetFeignDeath(apply, GetCasterGuid(), GetId());
 }
@@ -4588,12 +4589,12 @@ void Aura::HandleFeignDeath(bool apply, bool Real)
 void Aura::HandleAuraModDisarm(bool apply, bool Real)
 {
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
     if (!apply && target->HasAuraType(GetModifier()->m_auraname))
-        return;
+        { return; }
 
     uint32 flags;
     uint32 field;
@@ -4628,16 +4629,16 @@ void Aura::HandleAuraModDisarm(bool apply, bool Real)
     target->ApplyModFlag(field, flags, apply);
 
     if (target->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     // main-hand attack speed already set to special value for feral form already and don't must change and reset at remove.
     if (target->IsInFeralForm())
-        return;
+        { return; }
 
     if (apply)
         target->SetAttackTime(attack_type, BASE_ATTACK_TIME);
     else
-        ((Player*)target)->SetRegularAttackTime();
+        { ((Player*)target)->SetRegularAttackTime(); }
 
     target->UpdateDamagePhysical(attack_type);
 }
@@ -4645,7 +4646,7 @@ void Aura::HandleAuraModDisarm(bool apply, bool Real)
 void Aura::HandleAuraModStun(bool apply, bool Real)
 {
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
@@ -4653,7 +4654,7 @@ void Aura::HandleAuraModStun(bool apply, bool Real)
     {
         // Frost stun aura -> freeze/unfreeze target
         if (GetSpellSchoolMask(GetSpellProto()) & SPELL_SCHOOL_MASK_FROST)
-            target->ModifyAuraState(AURA_STATE_FROZEN, apply);
+            { target->ModifyAuraState(AURA_STATE_FROZEN, apply); }
 
         target->addUnitState(UNIT_STAT_STUNNED);
         target->SetTargetGuid(ObjectGuid());
@@ -4663,7 +4664,7 @@ void Aura::HandleAuraModStun(bool apply, bool Real)
 
         // Creature specific
         if (target->GetTypeId() != TYPEID_PLAYER)
-            target->StopMoving();
+            { target->StopMoving(); }
         else
         {
             ((Player*)target)->m_movementInfo.SetMovementFlags(MOVEFLAG_NONE);
@@ -4705,16 +4706,16 @@ void Aura::HandleAuraModStun(bool apply, bool Real)
                     }
                 }
                 if (found_another)
-                    break;
+                    { break; }
             }
 
             if (!found_another)
-                target->ModifyAuraState(AURA_STATE_FROZEN, apply);
+                { target->ModifyAuraState(AURA_STATE_FROZEN, apply); }
         }
 
         // Real remove called after current aura remove from lists, check if other similar auras active
         if (target->HasAuraType(SPELL_AURA_MOD_STUN))
-            return;
+            { return; }
 
         target->clearUnitState(UNIT_STAT_STUNNED);
         target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
@@ -4722,7 +4723,7 @@ void Aura::HandleAuraModStun(bool apply, bool Real)
         if (!target->hasUnitState(UNIT_STAT_ROOT))        // prevent allow move if have also root effect
         {
             if (target->getVictim() && target->IsAlive())
-                target->SetTargetGuid(target->getVictim()->GetObjectGuid());
+                { target->SetTargetGuid(target->getVictim()->GetObjectGuid()); }
 
             target->SetRoot(false);
         }
@@ -4733,7 +4734,7 @@ void Aura::HandleAuraModStun(bool apply, bool Real)
         {
             Unit* caster = GetCaster();
             if (!caster || caster->GetTypeId() != TYPEID_PLAYER)
-                return;
+                { return; }
 
             uint32 spell_id = 0;
 
@@ -4753,7 +4754,7 @@ void Aura::HandleAuraModStun(bool apply, bool Real)
             SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell_id);
 
             if (!spellInfo)
-                return;
+                { return; }
 
             caster->CastSpell(target, spellInfo, true, NULL, this);
             return;
@@ -4829,7 +4830,7 @@ void Aura::HandleModStealth(bool apply, bool Real)
                     target->SetVisibility(VISIBILITY_GROUP_INVISIBILITY);
                 }
                 else
-                    target->SetVisibility(VISIBILITY_ON);
+                    { target->SetVisibility(VISIBILITY_ON); }
             }
 
             // apply delayed talent bonus remover at last stealth aura remove
@@ -4884,7 +4885,7 @@ void Aura::HandleInvisibility(bool apply, bool Real)
         target->m_invisibilityMask = 0;
         Unit::AuraList const& auras = target->GetAurasByType(SPELL_AURA_MOD_INVISIBILITY);
         for (Unit::AuraList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
-            target->m_invisibilityMask |= (1 << (*itr)->GetModifier()->m_miscvalue);
+            { target->m_invisibilityMask |= (1 << (*itr)->GetModifier()->m_miscvalue); }
 
         // only at real aura remove and if not have different invisibility auras.
         if (Real && target->m_invisibilityMask == 0)
@@ -4898,7 +4899,7 @@ void Aura::HandleInvisibility(bool apply, bool Real)
             {
                 // if have stealth aura then already have stealth visibility
                 if (!target->HasAuraType(SPELL_AURA_MOD_STEALTH))
-                    target->SetVisibility(VISIBILITY_ON);
+                    { target->SetVisibility(VISIBILITY_ON); }
             }
         }
 
@@ -4921,10 +4922,10 @@ void Aura::HandleInvisibilityDetect(bool apply, bool Real)
         target->m_detectInvisibilityMask = 0;
         Unit::AuraList const& auras = target->GetAurasByType(SPELL_AURA_MOD_INVISIBILITY_DETECTION);
         for (Unit::AuraList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
-            target->m_detectInvisibilityMask |= (1 << (*itr)->GetModifier()->m_miscvalue);
+            { target->m_detectInvisibilityMask |= (1 << (*itr)->GetModifier()->m_miscvalue); }
     }
     if (Real && target->GetTypeId() == TYPEID_PLAYER)
-        ((Player*)target)->GetCamera().UpdateVisibilityForOwner();
+        { ((Player*)target)->GetCamera().UpdateVisibilityForOwner(); }
 }
 
 void Aura::HandleDetectAmore(bool apply, bool /*real*/)
@@ -4936,7 +4937,7 @@ void Aura::HandleAuraModRoot(bool apply, bool Real)
 {
     // only at real add/remove aura
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
@@ -4944,7 +4945,7 @@ void Aura::HandleAuraModRoot(bool apply, bool Real)
     {
         // Frost root aura -> freeze/unfreeze target
         if (GetSpellSchoolMask(GetSpellProto()) & SPELL_SCHOOL_MASK_FROST)
-            target->ModifyAuraState(AURA_STATE_FROZEN, apply);
+            { target->ModifyAuraState(AURA_STATE_FROZEN, apply); }
 
         target->addUnitState(UNIT_STAT_ROOT);
         target->SetTargetGuid(ObjectGuid());
@@ -4961,7 +4962,7 @@ void Aura::HandleAuraModRoot(bool apply, bool Real)
             ((Player*)target)->m_movementInfo.SetMovementFlags(MOVEFLAG_NONE);
         }
         else
-            target->StopMoving();
+            { target->StopMoving(); }
     }
     else
     {
@@ -4981,16 +4982,16 @@ void Aura::HandleAuraModRoot(bool apply, bool Real)
                     }
                 }
                 if (found_another)
-                    break;
+                    { break; }
             }
 
             if (!found_another)
-                target->ModifyAuraState(AURA_STATE_FROZEN, apply);
+                { target->ModifyAuraState(AURA_STATE_FROZEN, apply); }
         }
 
         // Real remove called after current aura remove from lists, check if other similar auras active
         if (target->HasAuraType(SPELL_AURA_MOD_ROOT))
-            return;
+            { return; }
 
         target->clearUnitState(UNIT_STAT_ROOT);
 
@@ -5009,7 +5010,7 @@ void Aura::HandleAuraModSilence(bool apply, bool Real)
 {
     // only at real add/remove aura
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
@@ -5021,13 +5022,13 @@ void Aura::HandleAuraModSilence(bool apply, bool Real)
             if (Spell* spell = target->GetCurrentSpell(CurrentSpellTypes(i)))
                 if(spell->m_spellInfo->GetPreventionType() == SPELL_PREVENTION_TYPE_SILENCE)
                     // Stop spells on prepare or casting state
-                    target->InterruptSpell(CurrentSpellTypes(i), false);
+                    { target->InterruptSpell(CurrentSpellTypes(i), false); }
     }
     else
     {
         // Real remove called after current aura remove from lists, check if other similar auras active
         if (target->HasAuraType(SPELL_AURA_MOD_SILENCE))
-            return;
+            { return; }
 
         target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED);
     }
@@ -5037,12 +5038,12 @@ void Aura::HandleModThreat(bool apply, bool Real)
 {
     // only at real add/remove aura
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
     if (!target->IsAlive())
-        return;
+        { return; }
 
     int level_diff = 0;
     int multiplier = 0;
@@ -5061,29 +5062,29 @@ void Aura::HandleModThreat(bool apply, bool Real)
     }
 
     if (level_diff > 0)
-        m_modifier.m_amount += multiplier * level_diff;
+        { m_modifier.m_amount += multiplier * level_diff; }
 
     if (target->GetTypeId() == TYPEID_PLAYER)
         for (int8 x = 0; x < MAX_SPELL_SCHOOL; ++x)
             if (m_modifier.m_miscvalue & int32(1 << x))
-                ApplyPercentModFloatVar(target->m_threatModifier[x], float(m_modifier.m_amount), apply);
+                { ApplyPercentModFloatVar(target->m_threatModifier[x], float(m_modifier.m_amount), apply); }
 }
 
 void Aura::HandleAuraModTotalThreat(bool apply, bool Real)
 {
     // only at real add/remove aura
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
     if (!target->IsAlive() || target->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     Unit* caster = GetCaster();
 
     if (!caster || !caster->IsAlive())
-        return;
+        { return; }
 
     float threatMod = apply ? float(m_modifier.m_amount) : float(-m_modifier.m_amount);
 
@@ -5094,20 +5095,20 @@ void Aura::HandleModTaunt(bool apply, bool Real)
 {
     // only at real add/remove aura
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
     if (!target->IsAlive() || !target->CanHaveThreatList())
-        return;
+        { return; }
 
     Unit* caster = GetCaster();
 
     if (!caster || !caster->IsAlive())
-        return;
+        { return; }
 
     if (apply)
-        target->TauntApply(caster);
+        { target->TauntApply(caster); }
     else
     {
         // When taunt aura fades out, mob will switch to previous target if current has less than 1.1 * secondthreat
@@ -5141,7 +5142,7 @@ void Aura::HandleAuraModIncreaseSpeed(bool /*apply*/, bool Real)
 {
     // all applied/removed only at real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     GetTarget()->UpdateSpeed(MOVE_RUN, true);
 }
@@ -5150,7 +5151,7 @@ void Aura::HandleAuraModIncreaseMountedSpeed(bool apply, bool Real)
 {
     // all applied/removed only at real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
@@ -5227,7 +5228,7 @@ void Aura::HandleAuraModIncreaseSwimSpeed(bool /*apply*/, bool Real)
 {
     // all applied/removed only at real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     GetTarget()->UpdateSpeed(MOVE_SWIM, true);
 }
@@ -5236,7 +5237,7 @@ void Aura::HandleAuraModDecreaseSpeed(bool apply, bool Real)
 {
     // all applied/removed only at real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
@@ -5259,7 +5260,7 @@ void Aura::HandleAuraModUseNormalSpeed(bool /*apply*/, bool Real)
 {
     // all applied/removed only at real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
@@ -5326,7 +5327,7 @@ void Aura::HandleModMechanicImmunityMask(bool apply, bool /*Real*/)
     uint32 mechanic  = m_modifier.m_miscvalue;
 
     if (apply && GetSpellProto()->HasAttribute(SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY))
-        GetTarget()->RemoveAurasAtMechanicImmunity(mechanic, GetId());
+        { GetTarget()->RemoveAurasAtMechanicImmunity(mechanic, GetId()); }
 
     // check implemented in Unit::IsImmuneToSpell and Unit::IsImmuneToSpellEffect
 }
@@ -5337,14 +5338,14 @@ void Aura::HandleAuraModEffectImmunity(bool apply, bool /*Real*/)
     Unit* target = GetTarget();
 
     // when removing flag aura, handle flag drop
-    if( !apply && target->GetTypeId() == TYPEID_PLAYER
+    if (!apply && target->GetTypeId() == TYPEID_PLAYER
         && (GetSpellProto()->GetAuraInterruptFlags() & AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION) )
     {
         Player* player = (Player*)target;
         if (BattleGround* bg = player->GetBattleGround())
-            bg->EventPlayerDroppedFlag(player);
+            { bg->EventPlayerDroppedFlag(player); }
         else if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(player->GetCachedZoneId()))
-            outdoorPvP->HandleDropFlag(player, GetSpellProto()->Id);
+            { outdoorPvP->HandleDropFlag(player, GetSpellProto()->Id); }
     }
 
     target->ApplySpellImmune(GetId(), IMMUNITY_EFFECT, m_modifier.m_miscvalue, apply);
@@ -5363,7 +5364,7 @@ void Aura::HandleAuraModStateImmunity(bool apply, bool Real)
                 itr = auraList.begin();
             }
             else
-                ++itr;
+                { ++itr; }
         }
     }
 
@@ -5377,7 +5378,7 @@ void Aura::HandleAuraModSchoolImmunity(bool apply, bool Real)
 
     // remove all flag auras (they are positive, but they must be removed when you are immune)
     if (GetSpellProto()->HasAttribute(SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY) && GetSpellProto()->HasAttribute(SPELL_ATTR_EX2_DAMAGE_REDUCED_SHIELD))
-        target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
+        { target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION); }
 
     // TODO: optimalize this cycle - use RemoveAurasWithInterruptFlags call or something else
     if (Real && apply
@@ -5398,18 +5399,18 @@ void Aura::HandleAuraModSchoolImmunity(bool apply, bool Real)
             {
                 target->RemoveAurasDueToSpell(spell->Id);
                 if (Auras.empty())
-                    break;
+                    { break; }
                 else
-                    next = Auras.begin();
+                    { next = Auras.begin(); }
             }
         }
     }
     if( Real && GetSpellProto()->GetMechanic() == MECHANIC_BANISH )
     {
         if (apply)
-            target->addUnitState(UNIT_STAT_ISOLATED);
+            { target->addUnitState(UNIT_STAT_ISOLATED); }
         else
-            target->clearUnitState(UNIT_STAT_ISOLATED);
+            { target->clearUnitState(UNIT_STAT_ISOLATED); }
     }
 }
 
@@ -5422,7 +5423,7 @@ void Aura::HandleAuraModDispelImmunity(bool apply, bool Real)
 {
     // all applied/removed only at real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     GetTarget()->ApplySpellDispelImmunity(GetSpellProto(), DispelType(m_modifier.m_miscvalue), apply);
 }
@@ -5430,7 +5431,7 @@ void Aura::HandleAuraModDispelImmunity(bool apply, bool Real)
 void Aura::HandleAuraProcTriggerSpell(bool apply, bool Real)
 {
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
@@ -5459,9 +5460,9 @@ void Aura::HandleAuraModStalked(bool apply, bool /*Real*/)
 {
     // used by spells: Hunter's Mark, Mind Vision, Syndicate Tracker (MURP) DND
     if (apply)
-        GetTarget()->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TRACK_UNIT);
+        { GetTarget()->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TRACK_UNIT); }
     else
-        GetTarget()->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TRACK_UNIT);
+        { GetTarget()->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TRACK_UNIT); }
 }
 
 /*********************************************************/
@@ -5631,11 +5632,11 @@ void Aura::HandlePeriodicHeal(bool apply, bool /*Real*/)
     if (apply)
     {
         if (loading)
-            return;
+            { return; }
 
         Unit* caster = GetCaster();
         if (!caster)
-            return;
+            { return; }
 
         // Gift of the Naaru (have diff spellfamilies)
         if (GetSpellProto()->SpellIconID == 329 && GetSpellProto()->SpellVisual[0] == 7625)
@@ -5695,7 +5696,7 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     m_isPeriodic = apply;
 
@@ -5710,11 +5711,11 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
     if (apply)
     {
         if (loading)
-            return;
+            { return; }
 
         Unit* caster = GetCaster();
         if (!caster)
-            return;
+            { return; }
 
         if(!classOptions)
             return;
@@ -5840,11 +5841,11 @@ void Aura::HandlePeriodicLeech(bool apply, bool /*Real*/)
     if (apply)
     {
         if (loading)
-            return;
+            { return; }
 
         Unit* caster = GetCaster();
         if (!caster)
-            return;
+            { return; }
 
         m_modifier.m_amount = caster->SpellDamageBonusDone(GetTarget(), GetSpellProto(), m_modifier.m_amount, DOT, GetStackAmount());
     }
@@ -5866,11 +5867,11 @@ void Aura::HandlePeriodicHealthFunnel(bool apply, bool /*Real*/)
     if (apply)
     {
         if (loading)
-            return;
+            { return; }
 
         Unit* caster = GetCaster();
         if (!caster)
-            return;
+            { return; }
 
         m_modifier.m_amount = caster->SpellDamageBonusDone(GetTarget(), GetSpellProto(), m_modifier.m_amount, DOT, GetStackAmount());
     }
@@ -5917,14 +5918,14 @@ void Aura::HandleAuraModBaseResistancePCT(bool apply, bool /*Real*/)
     {
         // pets only have base armor
         if (((Creature*)GetTarget())->IsPet() && (m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_NORMAL))
-            GetTarget()->HandleStatModifier(UNIT_MOD_ARMOR, BASE_PCT, float(m_modifier.m_amount), apply);
+            { GetTarget()->HandleStatModifier(UNIT_MOD_ARMOR, BASE_PCT, float(m_modifier.m_amount), apply); }
     }
     else
     {
         for (int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL; ++x)
         {
             if (m_modifier.m_miscvalue & int32(1 << x))
-                GetTarget()->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), BASE_PCT, float(m_modifier.m_amount), apply);
+                { GetTarget()->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), BASE_PCT, float(m_modifier.m_amount), apply); }
         }
     }
 }
@@ -5954,13 +5955,13 @@ void Aura::HandleModBaseResistance(bool apply, bool /*Real*/)
     {
         // only pets have base stats
         if (((Creature*)GetTarget())->IsPet() && (m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_NORMAL))
-            GetTarget()->HandleStatModifier(UNIT_MOD_ARMOR, TOTAL_VALUE, float(m_modifier.m_amount), apply);
+            { GetTarget()->HandleStatModifier(UNIT_MOD_ARMOR, TOTAL_VALUE, float(m_modifier.m_amount), apply); }
     }
     else
     {
         for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
             if (m_modifier.m_miscvalue & (1 << i))
-                GetTarget()->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + i), TOTAL_VALUE, float(m_modifier.m_amount), apply);
+                { GetTarget()->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + i), TOTAL_VALUE, float(m_modifier.m_amount), apply); }
     }
 }
 
@@ -5999,19 +6000,19 @@ void Aura::HandleModPercentStat(bool apply, bool /*Real*/)
 
     // only players have base stats
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     for (int32 i = STAT_STRENGTH; i < MAX_STATS; ++i)
     {
         if (m_modifier.m_miscvalue == i || m_modifier.m_miscvalue == -1)
-            GetTarget()->HandleStatModifier(UnitMods(UNIT_MOD_STAT_START + i), BASE_PCT, float(m_modifier.m_amount), apply);
+            { GetTarget()->HandleStatModifier(UnitMods(UNIT_MOD_STAT_START + i), BASE_PCT, float(m_modifier.m_amount), apply); }
     }
 }
 
 void Aura::HandleModSpellDamagePercentFromStat(bool /*apply*/, bool /*Real*/)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     // Magic damage modifiers implemented in Unit::SpellDamageBonusDone
     // This information for client side use only
@@ -6022,7 +6023,7 @@ void Aura::HandleModSpellDamagePercentFromStat(bool /*apply*/, bool /*Real*/)
 void Aura::HandleModSpellHealingPercentFromStat(bool /*apply*/, bool /*Real*/)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     // Recalculate bonus
     ((Player*)GetTarget())->UpdateSpellDamageAndHealingBonus();
@@ -6060,7 +6061,7 @@ void Aura::HandleModSpellHealingPercentFromAttackPower(bool /*apply*/, bool /*Re
 void Aura::HandleModHealingDone(bool /*apply*/, bool /*Real*/)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
     // implemented in Unit::SpellHealingBonusDone
     // this information is for client side only
     ((Player*)GetTarget())->UpdateSpellDamageAndHealingBonus();
@@ -6099,7 +6100,7 @@ void Aura::HandleModTotalPercentStat(bool apply, bool /*Real*/)
 void Aura::HandleAuraModResistenceOfStatPercent(bool /*apply*/, bool /*Real*/)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     if (m_modifier.m_miscvalue != SPELL_SCHOOL_MASK_NORMAL)
     {
@@ -6124,7 +6125,7 @@ void Aura::HandleAuraModTotalHealthPercentRegen(bool apply, bool /*Real*/)
 void Aura::HandleAuraModTotalManaPercentRegen(bool apply, bool /*Real*/)
 {
     if (m_modifier.periodictime == 0)
-        m_modifier.periodictime = 1000;
+        { m_modifier.periodictime = 1000; }
 
     if (!GetSpellProto()->HasAttribute(SPELL_ATTR_EX5_START_PERIODIC_AT_APPLY))
         m_periodicTimer = m_modifier.periodictime;
@@ -6135,7 +6136,7 @@ void Aura::HandleAuraModTotalManaPercentRegen(bool apply, bool /*Real*/)
 void Aura::HandleModRegen(bool apply, bool /*Real*/)        // eating
 {
     if (m_modifier.periodictime == 0)
-        m_modifier.periodictime = 5000;
+        { m_modifier.periodictime = 5000; }
 
     if (!GetSpellProto()->HasAttribute(SPELL_ATTR_EX5_START_PERIODIC_AT_APPLY))
         m_periodicTimer = 5000;
@@ -6146,22 +6147,22 @@ void Aura::HandleModRegen(bool apply, bool /*Real*/)        // eating
 void Aura::HandleModPowerRegen(bool apply, bool Real)       // drinking
 {
     if (!Real)
-        return;
+        { return; }
 
     Powers pt = GetTarget()->GetPowerType();
     if (m_modifier.periodictime == 0)
     {
         // Anger Management (only spell use this aura for rage)
         if (pt == POWER_RAGE)
-            m_modifier.periodictime = 3000;
+            { m_modifier.periodictime = 3000; }
         else
-            m_modifier.periodictime = 2000;
+            { m_modifier.periodictime = 2000; }
     }
 
     m_periodicTimer = 5000;
 
     if (GetTarget()->GetTypeId() == TYPEID_PLAYER && m_modifier.m_miscvalue == POWER_MANA)
-        ((Player*)GetTarget())->UpdateManaRegen();
+        { ((Player*)GetTarget())->UpdateManaRegen(); }
 
     m_isPeriodic = apply;
 }
@@ -6170,14 +6171,14 @@ void Aura::HandleModPowerRegenPCT(bool /*apply*/, bool Real)
 {
     // spells required only Real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     // Update manaregen value
     if (m_modifier.m_miscvalue == POWER_MANA)
-        ((Player*)GetTarget())->UpdateManaRegen();
+        { ((Player*)GetTarget())->UpdateManaRegen(); }
 }
 
 void Aura::HandleModManaRegen(bool /*apply*/, bool Real)
@@ -6239,9 +6240,9 @@ void Aura::HandleAuraModIncreaseHealth(bool apply, bool Real)
                 else
                 {
                     if (int32(target->GetHealth()) > m_modifier.m_amount)
-                        target->ModifyHealth(-m_modifier.m_amount);
+                        { target->ModifyHealth(-m_modifier.m_amount); }
                     else
-                        target->SetHealth(1);
+                        { target->SetHealth(1); }
                     target->HandleStatModifier(UNIT_MOD_HEALTH, TOTAL_VALUE, float(m_modifier.m_amount), apply);
                 }
             }
@@ -6277,7 +6278,7 @@ void Aura::HandleAuraModIncreaseEnergy(bool apply, bool Real)
     Unit* target = GetTarget();
     Powers powerType = target->GetPowerType();
     if (int32(powerType) != m_modifier.m_miscvalue)
-        return;
+        { return; }
 
     UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + powerType);
 
@@ -6301,7 +6302,7 @@ void Aura::HandleAuraModIncreaseEnergyPercent(bool apply, bool /*Real*/)
 {
     Powers powerType = GetTarget()->GetPowerType();
     if (int32(powerType) != m_modifier.m_miscvalue)
-        return;
+        { return; }
 
     UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + powerType);
 
@@ -6339,7 +6340,7 @@ void Aura::HandleAuraIncreaseBaseHealthPercent(bool apply, bool /*Real*/)
 void Aura::HandleAuraModParryPercent(bool /*apply*/, bool /*Real*/)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     ((Player*)GetTarget())->UpdateParryPercentage();
 }
@@ -6347,7 +6348,7 @@ void Aura::HandleAuraModParryPercent(bool /*apply*/, bool /*Real*/)
 void Aura::HandleAuraModDodgePercent(bool /*apply*/, bool /*Real*/)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     ((Player*)GetTarget())->UpdateDodgePercentage();
     // sLog.outError("BONUS DODGE CHANCE: + %f", float(m_modifier.m_amount));
@@ -6356,7 +6357,7 @@ void Aura::HandleAuraModDodgePercent(bool /*apply*/, bool /*Real*/)
 void Aura::HandleAuraModBlockChancePercent(bool /*apply*/, bool /*Real*/)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     ((Player*)GetTarget())->UpdateBlockPercentage();
     // sLog.outError("BONUS BLOCK CHANCE: + %f", float(m_modifier.m_amount));
@@ -6366,10 +6367,10 @@ void Aura::HandleAuraModRegenInterrupt(bool /*apply*/, bool Real)
 {
     // spells required only Real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     ((Player*)GetTarget())->UpdateManaRegen();
 }
@@ -6379,14 +6380,14 @@ void Aura::HandleAuraModCritPercent(bool apply, bool Real)
     Unit* target = GetTarget();
 
     if (target->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     // apply item specific bonuses for already equipped weapon
     if (Real)
     {
         for (int i = 0; i < MAX_ATTACK; ++i)
             if (Item* pItem = ((Player*)target)->GetWeaponForAttack(WeaponAttackType(i), true, false))
-                ((Player*)target)->_ApplyWeaponDependentAuraCritMod(pItem, WeaponAttackType(i), this, apply);
+                { ((Player*)target)->_ApplyWeaponDependentAuraCritMod(pItem, WeaponAttackType(i), this, apply); }
     }
 
     // mods must be applied base at equipped weapon class and subclass comparison
@@ -6437,7 +6438,7 @@ void Aura::HandleModSpellCritChance(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     if (GetTarget()->GetTypeId() == TYPEID_PLAYER)
     {
@@ -6453,14 +6454,14 @@ void Aura::HandleModSpellCritChanceShool(bool /*apply*/, bool Real)
 {
     // spells required only Real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     for (int school = SPELL_SCHOOL_NORMAL; school < MAX_SPELL_SCHOOL; ++school)
         if (m_modifier.m_miscvalue & (1 << school))
-            ((Player*)GetTarget())->UpdateSpellCritChance(school);
+            { ((Player*)GetTarget())->UpdateSpellCritChance(school); }
 }
 
 /********************************/
@@ -6509,7 +6510,7 @@ void Aura::HandleAuraModRangedHaste(bool apply, bool /*Real*/)
 void Aura::HandleRangedAmmoHaste(bool apply, bool /*Real*/)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
     GetTarget()->ApplyAttackTimePercentMod(RANGED_ATTACK, float(m_modifier.m_amount), apply);
 }
 
@@ -6525,7 +6526,7 @@ void Aura::HandleAuraModAttackPower(bool apply, bool /*Real*/)
 void Aura::HandleAuraModRangedAttackPower(bool apply, bool /*Real*/)
 {
     if ((GetTarget()->getClassMask() & CLASSMASK_WAND_USERS) != 0)
-        return;
+        { return; }
 
     GetTarget()->HandleStatModifier(UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_VALUE, float(m_modifier.m_amount), apply);
 }
@@ -6539,7 +6540,7 @@ void Aura::HandleAuraModAttackPowerPercent(bool apply, bool /*Real*/)
 void Aura::HandleAuraModRangedAttackPowerPercent(bool apply, bool /*Real*/)
 {
     if ((GetTarget()->getClassMask() & CLASSMASK_WAND_USERS) != 0)
-        return;
+        { return; }
 
     // UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER = multiplier - 1
     GetTarget()->HandleStatModifier(UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_PCT, float(m_modifier.m_amount), apply);
@@ -6567,7 +6568,7 @@ void Aura::HandleModDamageDone(bool apply, bool Real)
     {
         for (int i = 0; i < MAX_ATTACK; ++i)
             if (Item* pItem = ((Player*)target)->GetWeaponForAttack(WeaponAttackType(i), true, false))
-                ((Player*)target)->_ApplyWeaponDependentAuraDamageMod(pItem, WeaponAttackType(i), this, apply);
+                { ((Player*)target)->_ApplyWeaponDependentAuraDamageMod(pItem, WeaponAttackType(i), this, apply); }
     }
 
     // m_modifier.m_miscvalue is bitmask of spell schools
@@ -6581,7 +6582,7 @@ void Aura::HandleModDamageDone(bool apply, bool Real)
 
     SpellEquippedItemsEntry const* equippedItems = GetSpellProto()->GetSpellEquippedItems();
 
-    if((m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_NORMAL) != 0)
+    if ((m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_NORMAL) != 0)
     {
         // apply generic physical damage bonuses including wand case
         if (!equippedItems || equippedItems->EquippedItemClass == -1 || target->GetTypeId() != TYPEID_PLAYER)
@@ -6598,15 +6599,15 @@ void Aura::HandleModDamageDone(bool apply, bool Real)
         if (target->GetTypeId() == TYPEID_PLAYER)
         {
             if (m_positive)
-                target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS, m_modifier.m_amount, apply);
+                { target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS, m_modifier.m_amount, apply); }
             else
-                target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG, m_modifier.m_amount, apply);
+                { target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG, m_modifier.m_amount, apply); }
         }
     }
 
     // Skip non magic case for speedup
     if ((m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_MAGIC) == 0)
-        return;
+        { return; }
 
     if( equippedItems && (equippedItems->EquippedItemClass != -1 || equippedItems->EquippedItemInventoryTypeMask != 0) )
     {
@@ -6626,7 +6627,7 @@ void Aura::HandleModDamageDone(bool apply, bool Real)
             for (int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
             {
                 if ((m_modifier.m_miscvalue & (1 << i)) != 0)
-                    target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + i, m_modifier.m_amount, apply);
+                    { target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + i, m_modifier.m_amount, apply); }
             }
         }
         else
@@ -6634,12 +6635,12 @@ void Aura::HandleModDamageDone(bool apply, bool Real)
             for (int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
             {
                 if ((m_modifier.m_miscvalue & (1 << i)) != 0)
-                    target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + i, m_modifier.m_amount, apply);
+                    { target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + i, m_modifier.m_amount, apply); }
             }
         }
         Pet* pet = target->GetPet();
         if (pet)
-            pet->UpdateAttackPowerAndDamage();
+            { pet->UpdateAttackPowerAndDamage(); }
     }
 }
 
@@ -6653,7 +6654,7 @@ void Aura::HandleModDamagePercentDone(bool apply, bool Real)
     {
         for (int i = 0; i < MAX_ATTACK; ++i)
             if (Item* pItem = ((Player*)target)->GetWeaponForAttack(WeaponAttackType(i), true, false))
-                ((Player*)target)->_ApplyWeaponDependentAuraDamageMod(pItem, WeaponAttackType(i), this, apply);
+                { ((Player*)target)->_ApplyWeaponDependentAuraDamageMod(pItem, WeaponAttackType(i), this, apply); }
     }
 
     // m_modifier.m_miscvalue is bitmask of spell schools
@@ -6667,7 +6668,7 @@ void Aura::HandleModDamagePercentDone(bool apply, bool Real)
 
     SpellEquippedItemsEntry const* equippedItems = GetSpellProto()->GetSpellEquippedItems();
 
-    if((m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_NORMAL) != 0)
+    if ((m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_NORMAL) != 0)
     {
         // apply generic physical damage bonuses including wand case
         if (!equippedItems || equippedItems->EquippedItemClass == -1 || target->GetTypeId() != TYPEID_PLAYER)
@@ -6682,12 +6683,12 @@ void Aura::HandleModDamagePercentDone(bool apply, bool Real)
         }
         // For show in client
         if (target->GetTypeId() == TYPEID_PLAYER)
-            target->ApplyModSignedFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT, m_modifier.m_amount / 100.0f, apply);
+            { target->ApplyModSignedFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT, m_modifier.m_amount / 100.0f, apply); }
     }
 
     // Skip non magic case for speedup
     if ((m_modifier.m_miscvalue & SPELL_SCHOOL_MASK_MAGIC) == 0)
-        return;
+        { return; }
 
     if( equippedItems && (equippedItems->EquippedItemClass != -1 || equippedItems->EquippedItemInventoryTypeMask != 0) )
     {
@@ -6702,14 +6703,14 @@ void Aura::HandleModDamagePercentDone(bool apply, bool Real)
     // Send info to client
     if (target->GetTypeId() == TYPEID_PLAYER)
         for (int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
-            target->ApplyModSignedFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT + i, m_modifier.m_amount / 100.0f, apply);
+            { target->ApplyModSignedFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT + i, m_modifier.m_amount / 100.0f, apply); }
 }
 
 void Aura::HandleModOffhandDamagePercent(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "AURA MOD OFFHAND DAMAGE");
 
@@ -6724,23 +6725,23 @@ void Aura::HandleModPowerCostPCT(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     float amount = m_modifier.m_amount / 100.0f;
     for (int i = 0; i < MAX_SPELL_SCHOOL; ++i)
         if (m_modifier.m_miscvalue & (1 << i))
-            GetTarget()->ApplyModSignedFloatValue(UNIT_FIELD_POWER_COST_MULTIPLIER + i, amount, apply);
+            { GetTarget()->ApplyModSignedFloatValue(UNIT_FIELD_POWER_COST_MULTIPLIER + i, amount, apply); }
 }
 
 void Aura::HandleModPowerCost(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     for (int i = 0; i < MAX_SPELL_SCHOOL; ++i)
         if (m_modifier.m_miscvalue & (1 << i))
-            GetTarget()->ApplyModInt32Value(UNIT_FIELD_POWER_COST_MODIFIER + i, m_modifier.m_amount, apply);
+            { GetTarget()->ApplyModInt32Value(UNIT_FIELD_POWER_COST_MODIFIER + i, m_modifier.m_amount, apply); }
 }
 
 void Aura::HandleNoReagentUseAura(bool /*Apply*/, bool Real)
@@ -6860,20 +6861,20 @@ void Aura::HandleShapeshiftBoosts(bool apply)
     if (apply)
     {
         if (spellId1)
-            target->CastSpell(target, spellId1, true, NULL, this);
+            { target->CastSpell(target, spellId1, true, NULL, this); }
         if (spellId2)
-            target->CastSpell(target, spellId2, true, NULL, this);
+            { target->CastSpell(target, spellId2, true, NULL, this); }
 
         if (target->GetTypeId() == TYPEID_PLAYER)
         {
             const PlayerSpellMap& sp_list = ((Player*)target)->GetSpellMap();
             for (PlayerSpellMap::const_iterator itr = sp_list.begin(); itr != sp_list.end(); ++itr)
             {
-                if (itr->second.state == PLAYERSPELL_REMOVED) continue;
-                if (itr->first == spellId1 || itr->first == spellId2) continue;
+                if (itr->second.state == PLAYERSPELL_REMOVED) { continue; }
+                if (itr->first == spellId1 || itr->first == spellId2) { continue; }
                 SpellEntry const* spellInfo = sSpellStore.LookupEntry(itr->first);
                 if (!spellInfo || !IsNeedCastSpellAtFormApply(spellInfo, form))
-                    continue;
+                    { continue; }
                 target->CastSpell(target, itr->first, true, NULL, this);
             }
             // remove auras that do not require shapeshift, but are not active in this specific form (like Improved Barkskin)
@@ -6909,9 +6910,9 @@ void Aura::HandleShapeshiftBoosts(bool apply)
             // Leader of the Pack
             if (((Player*)target)->HasSpell(17007))
             {
-                SpellEntry const *spellInfo = sSpellStore.LookupEntry(24932);
+                SpellEntry const* spellInfo = sSpellStore.LookupEntry(24932);
                 if (spellInfo && spellInfo->GetStances() & (1<<(form-1)))
-                    target->CastSpell(target, 24932, true, NULL, this);
+                    { target->CastSpell(target, 24932, true, NULL, this); }
             }
 
             // Savage Roar
@@ -6984,9 +6985,9 @@ void Aura::HandleShapeshiftBoosts(bool apply)
     else
     {
         if (spellId1)
-            target->RemoveAurasDueToSpell(spellId1);
+            { target->RemoveAurasDueToSpell(spellId1); }
         if (spellId2)
-            target->RemoveAurasDueToSpell(spellId2);
+            { target->RemoveAurasDueToSpell(spellId2); }
         if (MasterShaperSpellId)
             target->RemoveAurasDueToSpell(MasterShaperSpellId);
 
@@ -7015,7 +7016,7 @@ void Aura::HandleShapeshiftBoosts(bool apply)
                 itr = tAuras.begin();
             }
             else
-                ++itr;
+                { ++itr; }
         }
     }
 }
@@ -7033,17 +7034,17 @@ void Aura::HandleAuraEmpathy(bool apply, bool /*Real*/)
 void Aura::HandleAuraUntrackable(bool apply, bool /*Real*/)
 {
     if (apply)
-        GetTarget()->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNTRACKABLE);
+        { GetTarget()->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNTRACKABLE); }
     else
-        GetTarget()->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNTRACKABLE);
+        { GetTarget()->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNTRACKABLE); }
 }
 
 void Aura::HandleAuraModPacify(bool apply, bool /*Real*/)
 {
     if (apply)
-        GetTarget()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED);
+        { GetTarget()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED); }
     else
-        GetTarget()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED);
+        { GetTarget()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED); }
 }
 
 void Aura::HandleAuraModPacifyAndSilence(bool apply, bool Real)
@@ -7055,7 +7056,7 @@ void Aura::HandleAuraModPacifyAndSilence(bool apply, bool Real)
 void Aura::HandleAuraGhost(bool apply, bool /*Real*/)
 {
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     if (apply)
     {
@@ -7153,10 +7154,10 @@ void Aura::HandleAuraRetainComboPoints(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
-        return;
+        { return; }
 
     Player* target = (Player*)GetTarget();
 
@@ -7164,7 +7165,7 @@ void Aura::HandleAuraRetainComboPoints(bool apply, bool Real)
     // remove only if aura expire by time (in case combo points amount change aura removed without combo points lost)
     if (!apply && m_removeMode == AURA_REMOVE_BY_EXPIRE && target->GetComboTargetGuid())
         if (Unit* unit = ObjectAccessor::GetUnit(*GetTarget(), target->GetComboTargetGuid()))
-            target->AddComboPoints(unit, -m_modifier.m_amount);
+            { target->AddComboPoints(unit, -m_modifier.m_amount); }
 }
 
 void Aura::HandleModUnattackable(bool Apply, bool Real)
@@ -7181,7 +7182,7 @@ void Aura::HandleSpiritOfRedemption(bool apply, bool Real)
 {
     // spells required only Real aura add/remove
     if (!Real)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
 
@@ -7195,24 +7196,24 @@ void Aura::HandleSpiritOfRedemption(bool apply, bool Real)
 
             // set stand state (expected in this form)
             if (!target->IsStandState())
-                target->SetStandState(UNIT_STAND_STATE_STAND);
+                { target->SetStandState(UNIT_STAND_STATE_STAND); }
         }
 
         target->SetHealth(1);
     }
     // die at aura end
     else
-        target->DealDamage(target, target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, GetSpellProto(), false);
+        { target->DealDamage(target, target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, GetSpellProto(), false); }
 }
 
 void Aura::HandleSchoolAbsorb(bool apply, bool Real)
 {
     if (!Real)
-        return;
+        { return; }
 
     Unit* caster = GetCaster();
     if (!caster)
-        return;
+        { return; }
 
     Unit* target = GetTarget();
     SpellEntry const* spellProto = GetSpellProto();
@@ -7366,19 +7367,19 @@ void Aura::PeriodicTick()
         {
             // don't damage target if not alive, possible death persistent effects
             if (!target->IsAlive())
-                return;
+                { return; }
 
             Unit* pCaster = GetCaster();
             if (!pCaster)
-                return;
+                { return; }
 
             if( spellProto->GetSpellEffectIdByIndex(GetEffIndex()) == SPELL_EFFECT_PERSISTENT_AREA_AURA &&
                 pCaster->SpellHitResult(target, spellProto, false) != SPELL_MISS_NONE)
-                return;
+                { return; }
 
             // Check for immune (not use charges)
             if (target->IsImmunedToDamage(GetSpellSchoolMask(spellProto)))
-                return;
+                { return; }
 
             // some auras remove at specific health level or more
             if (m_modifier.m_auraname == SPELL_AURA_PERIODIC_DAMAGE)
@@ -7424,14 +7425,14 @@ void Aura::PeriodicTick()
             uint32 pdamage;
 
             if (m_modifier.m_auraname == SPELL_AURA_PERIODIC_DAMAGE)
-                pdamage = amount;
+                { pdamage = amount; }
             else
-                pdamage = uint32(target->GetMaxHealth() * amount / 100);
+                { pdamage = uint32(target->GetMaxHealth() * amount / 100); }
 
             // SpellDamageBonus for magic spells
             uint32 dmgClass = spellProto->GetDmgClass();
             if(dmgClass == SPELL_DAMAGE_CLASS_NONE || dmgClass == SPELL_DAMAGE_CLASS_MAGIC)
-                pdamage = target->SpellDamageBonusTaken(pCaster, spellProto, pdamage, DOT, GetStackAmount());
+                { pdamage = target->SpellDamageBonusTaken(pCaster, spellProto, pdamage, DOT, GetStackAmount()); }
             // MeleeDamagebonus for weapon based spells
             else
             {
@@ -7454,10 +7455,10 @@ void Aura::PeriodicTick()
             {
                 // 1..4 ticks, 1/2 from normal tick damage
                 if (GetAuraTicks() <= 4)
-                    pdamage = pdamage / 2;
+                    { pdamage = pdamage / 2; }
                 // 9..12 ticks, 3/2 from normal tick damage
                 else if (GetAuraTicks() >= 9)
-                    pdamage += (pdamage + 1) / 2;       // +1 prevent 0.5 damage possible lost at 1..4 ticks
+                    { pdamage += (pdamage + 1) / 2; }       // +1 prevent 0.5 damage possible lost at 1..4 ticks
                 // 5..8 ticks have normal tick damage
             }
 
@@ -7496,7 +7497,7 @@ void Aura::PeriodicTick()
             target->SendPeriodicAuraLog(&pInfo);
 
             if (pdamage)
-                procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE;
+                { procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE; }
 
             pCaster->ProcDamageAndSpell(target, procAttacker, procVictim, procEx, pdamage, BASE_ATTACK, spellProto);
 
@@ -7521,22 +7522,22 @@ void Aura::PeriodicTick()
         {
             // don't damage target if not alive, possible death persistent effects
             if (!target->IsAlive())
-                return;
+                { return; }
 
             Unit* pCaster = GetCaster();
             if (!pCaster)
-                return;
+                { return; }
 
             if (!pCaster->IsAlive())
-                return;
+                { return; }
 
             if( spellProto->GetSpellEffectIdByIndex(GetEffIndex()) == SPELL_EFFECT_PERSISTENT_AREA_AURA &&
                 pCaster->SpellHitResult(target, spellProto, false) != SPELL_MISS_NONE)
-                return;
+                { return; }
 
             // Check for immune
             if (target->IsImmunedToDamage(GetSpellSchoolMask(spellProto)))
-                return;
+                { return; }
 
             uint32 absorb = 0;
             uint32 resist = 0;
@@ -7581,13 +7582,13 @@ void Aura::PeriodicTick()
             float multiplier = m_spellEffect->EffectMultipleValue > 0 ? m_spellEffect->EffectMultipleValue : 1;
 
             // Set trigger flag
-            uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC; //  | PROC_FLAG_SUCCESSFUL_HARMFUL_SPELL_HIT;
+            uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC; // | PROC_FLAG_SUCCESSFUL_HARMFUL_SPELL_HIT;
             uint32 procVictim   = PROC_FLAG_ON_TAKE_PERIODIC;// | PROC_FLAG_TAKEN_HARMFUL_SPELL_HIT;
             uint32 procEx = isCrit ? PROC_EX_CRITICAL_HIT : PROC_EX_NORMAL_HIT;
 
             pdamage = (pdamage <= absorb + resist) ? 0 : (pdamage - absorb - resist);
             if (pdamage)
-                procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE;
+                { procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE; }
 
             pCaster->ProcDamageAndSpell(target, procAttacker, procVictim, procEx, pdamage, BASE_ATTACK, spellProto);
             int32 new_damage = pCaster->DealDamage(target, pdamage, &cleanDamage, DOT, GetSpellSchoolMask(spellProto), spellProto, false);
@@ -7596,10 +7597,10 @@ void Aura::PeriodicTick()
                 for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; ++i)
                     if (Spell* spell = pCaster->GetCurrentSpell(CurrentSpellTypes(i)))
                         if (spell->m_spellInfo->Id == GetId())
-                            spell->cancel();
+                            { spell->cancel(); }
 
             if (Player* modOwner = pCaster->GetSpellModOwner())
-                modOwner->ApplySpellMod(GetId(), SPELLMOD_MULTIPLE_VALUE, multiplier);
+                { modOwner->ApplySpellMod(GetId(), SPELLMOD_MULTIPLE_VALUE, multiplier); }
 
             int32 heal = pCaster->SpellHealingBonusTaken(pCaster, spellProto, int32(new_damage * multiplier), DOT, GetStackAmount());
 
@@ -7615,7 +7616,7 @@ void Aura::PeriodicTick()
         {
             // don't heal target if not alive, mostly death persistent effects from items
             if (!target->IsAlive())
-                return;
+                { return; }
 
             Unit* pCaster = GetCaster();
             if (!pCaster)
@@ -7623,7 +7624,7 @@ void Aura::PeriodicTick()
 
             // heal for caster damage (must be alive)
             if (target != pCaster && spellProto->SpellVisual[0] == 163 && !pCaster->IsAlive())
-                return;
+                { return; }
 
             // ignore non positive values (can be result apply spellmods to aura damage
             uint32 amount = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0;
@@ -7631,10 +7632,10 @@ void Aura::PeriodicTick()
             uint32 pdamage;
 
             if (m_modifier.m_auraname == SPELL_AURA_OBS_MOD_HEALTH)
-                pdamage = uint32(target->GetMaxHealth() * amount / 100);
+                { pdamage = uint32(target->GetMaxHealth() * amount / 100); }
             else
             {
-                pdamage = amount;
+                { pdamage = amount; }
 
                 // Wild Growth (1/7 - 6 + 2*ramainTicks) %
                 if (classOptions && classOptions->SpellFamilyName == SPELLFAMILY_DRUID && spellProto->SpellIconID == 2864)
@@ -7685,7 +7686,7 @@ void Aura::PeriodicTick()
             if (target != pCaster && spellProto->SpellVisual[0] == 163)
             {
                 uint32 dmg = spellProto->GetManaPerSecond();
-                if(pCaster->GetHealth() <= dmg && pCaster->GetTypeId()==TYPEID_PLAYER)
+                if (pCaster->GetHealth() <= dmg && pCaster->GetTypeId() == TYPEID_PLAYER)
                 {
                     pCaster->RemoveAurasDueToSpell(GetId());
 
@@ -7716,31 +7717,31 @@ void Aura::PeriodicTick()
         {
             // don't damage target if not alive, possible death persistent effects
             if (!target->IsAlive())
-                return;
+                { return; }
 
             if (m_modifier.m_miscvalue < 0 || m_modifier.m_miscvalue >= MAX_POWERS)
-                return;
+                { return; }
 
             Powers power = Powers(m_modifier.m_miscvalue);
 
             // power type might have changed between aura applying and tick (druid's shapeshift)
             if (target->GetPowerType() != power)
-                return;
+                { return; }
 
             Unit* pCaster = GetCaster();
             if (!pCaster)
-                return;
+                { return; }
 
             if (!pCaster->IsAlive())
-                return;
+                { return; }
 
             if( GetSpellProto()->GetSpellEffectIdByIndex(GetEffIndex()) == SPELL_EFFECT_PERSISTENT_AREA_AURA &&
                 pCaster->SpellHitResult(target, spellProto, false) != SPELL_MISS_NONE)
-                return;
+                { return; }
 
             // Check for immune (not use charges)
             if (target->IsImmunedToDamage(GetSpellSchoolMask(spellProto)))
-                return;
+                { return; }
 
             // ignore non positive values (can be result apply spellmods to aura damage
             uint32 pdamage = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0;
@@ -7774,7 +7775,7 @@ void Aura::PeriodicTick()
                 gain_multiplier = m_spellEffect->EffectMultipleValue;
 
                 if (Player* modOwner = pCaster->GetSpellModOwner())
-                    modOwner->ApplySpellMod(GetId(), SPELLMOD_MULTIPLE_VALUE, gain_multiplier);
+                    { modOwner->ApplySpellMod(GetId(), SPELLMOD_MULTIPLE_VALUE, gain_multiplier); }
             }
 
             SpellPeriodicAuraLogInfo pInfo(this, drain_amount, 0, 0, 0, gain_multiplier);
@@ -7833,7 +7834,7 @@ void Aura::PeriodicTick()
         {
             // don't energize target if not alive, possible death persistent effects
             if (!target->IsAlive())
-                return;
+                { return; }
 
             // ignore non positive values (can be result apply spellmods to aura damage
             uint32 pdamage = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0;
@@ -7842,12 +7843,12 @@ void Aura::PeriodicTick()
                               GetCasterGuid().GetString().c_str(), target->GetGuidStr().c_str(), pdamage, GetId());
 
             if (m_modifier.m_miscvalue < 0 || m_modifier.m_miscvalue >= MAX_POWERS)
-                break;
+                { break; }
 
             Powers power = Powers(m_modifier.m_miscvalue);
 
             if (target->GetMaxPower(power) == 0)
-                break;
+                { break; }
 
             SpellPeriodicAuraLogInfo pInfo(this, pdamage, 0, 0, 0, 0.0f);
             target->SendPeriodicAuraLog(&pInfo);
@@ -7862,7 +7863,7 @@ void Aura::PeriodicTick()
         {
             // don't energize target if not alive, possible death persistent effects
             if (!target->IsAlive())
-                return;
+                { return; }
 
             // ignore non positive values (can be result apply spellmods to aura damage
             uint32 amount = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0;
@@ -7873,7 +7874,7 @@ void Aura::PeriodicTick()
                               GetCasterGuid().GetString().c_str(), target->GetGuidStr().c_str(), pdamage, GetId());
 
             if (target->GetMaxPower(POWER_MANA) == 0)
-                break;
+                { break; }
 
             SpellPeriodicAuraLogInfo pInfo(this, pdamage, 0, 0, 0, 0.0f);
             target->SendPeriodicAuraLog(&pInfo);
@@ -7888,22 +7889,22 @@ void Aura::PeriodicTick()
         {
             // don't mana burn target if not alive, possible death persistent effects
             if (!target->IsAlive())
-                return;
+                { return; }
 
             Unit* pCaster = GetCaster();
             if (!pCaster)
-                return;
+                { return; }
 
             // Check for immune (not use charges)
             if (target->IsImmunedToDamage(GetSpellSchoolMask(spellProto)))
-                return;
+                { return; }
 
             int32 pdamage = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0;
 
             Powers powerType = Powers(m_modifier.m_miscvalue);
 
             if (!target->IsAlive() || target->GetPowerType() != powerType)
-                return;
+                { return; }
 
             // resilience reduce mana draining effect at spell crit damage reduction (added in 2.4)
             if (powerType == POWER_MANA)
@@ -7928,7 +7929,7 @@ void Aura::PeriodicTick()
             uint32 procVictim   = PROC_FLAG_ON_TAKE_PERIODIC;// | PROC_FLAG_TAKEN_HARMFUL_SPELL_HIT;
             uint32 procEx       = createProcExtendMask(&damageInfo, SPELL_MISS_NONE);
             if (damageInfo.damage)
-                procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE;
+                { procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE; }
 
             pCaster->ProcDamageAndSpell(damageInfo.target, procAttacker, procVictim, procEx, damageInfo.damage, BASE_ATTACK, spellProto);
 
@@ -7939,7 +7940,7 @@ void Aura::PeriodicTick()
         {
             // don't heal target if not alive, possible death persistent effects
             if (!target->IsAlive())
-                return;
+                { return; }
 
             int32 gain = target->ModifyHealth(m_modifier.m_amount);
             if (Unit* caster = GetCaster())
@@ -7950,11 +7951,11 @@ void Aura::PeriodicTick()
         {
             // don't energize target if not alive, possible death persistent effects
             if (!target->IsAlive())
-                return;
+                { return; }
 
             Powers pt = target->GetPowerType();
             if (int32(pt) != m_modifier.m_miscvalue)
-                return;
+                { return; }
 
             if ( spellProto->GetAuraInterruptFlags() & AURA_INTERRUPT_FLAG_NOT_SEATED )
             {
@@ -8001,7 +8002,7 @@ void Aura::PeriodicDummyTick()
     SpellEntry const* spell = GetSpellProto();
     SpellClassOptionsEntry const* classOptions = spell->GetSpellClassOptions();
 
-    Unit *target = GetTarget();
+    Unit* target = GetTarget();
     switch (spell->GetSpellFamilyName())
     {
         case SPELLFAMILY_GENERIC:
@@ -8643,29 +8644,29 @@ void Aura::PeriodicDummyTick()
     if (Unit* caster = GetCaster())
     {
         if (target && target->GetTypeId() == TYPEID_UNIT)
-            sScriptMgr.OnEffectDummy(caster, GetId(), GetEffIndex(), (Creature*)target, ObjectGuid());
+            { sScriptMgr.OnEffectDummy(caster, GetId(), GetEffIndex(), (Creature*)target, ObjectGuid()); }
     }
 }
 
 void Aura::HandlePreventFleeing(bool apply, bool Real)
 {
     if (!Real)
-        return;
+        { return; }
 
     Unit::AuraList const& fearAuras = GetTarget()->GetAurasByType(SPELL_AURA_MOD_FEAR);
     if (!fearAuras.empty())
     {
         if (apply)
-            GetTarget()->SetFeared(false, fearAuras.front()->GetCasterGuid());
+            { GetTarget()->SetFeared(false, fearAuras.front()->GetCasterGuid()); }
         else
-            GetTarget()->SetFeared(true);
+            { GetTarget()->SetFeared(true); }
     }
 }
 
 void Aura::HandleManaShield(bool apply, bool Real)
 {
     if (!Real)
-        return;
+        { return; }
 
     // prevent double apply bonuses
     if (apply && (GetTarget()->GetTypeId() != TYPEID_PLAYER || !((Player*)GetTarget())->GetSession()->PlayerLoading()))
@@ -9041,7 +9042,7 @@ SpellAuraHolder::SpellAuraHolder(SpellEntry const* spellproto, Unit* target, Wor
     MANGOS_ASSERT(spellproto && spellproto == sSpellStore.LookupEntry(spellproto->Id) && "`info` must be pointer to sSpellStore element");
 
     if (!caster)
-        m_casterGuid = target->GetObjectGuid();
+        { m_casterGuid = target->GetObjectGuid(); }
     else
     {
         // remove this assert when not unit casters will be supported
@@ -9065,12 +9066,12 @@ SpellAuraHolder::SpellAuraHolder(SpellEntry const* spellproto, Unit* target, Wor
     m_duration = m_maxDuration = CalculateSpellDuration(spellproto, unitCaster);
 
     if (m_maxDuration == -1 || (m_isPassive && spellproto->DurationIndex == 0))
-        m_permanent = true;
+        { m_permanent = true; }
 
     if (unitCaster)
     {
         if (Player* modOwner = unitCaster->GetSpellModOwner())
-            modOwner->ApplySpellMod(GetId(), SPELLMOD_CHARGES, m_procCharges);
+            { modOwner->ApplySpellMod(GetId(), SPELLMOD_CHARGES, m_procCharges); }
     }
 
     // some custom stack values at aura holder create
@@ -9093,7 +9094,7 @@ SpellAuraHolder::SpellAuraHolder(SpellEntry const* spellproto, Unit* target, Wor
     }
 
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
-        m_auras[i] = NULL;
+        { m_auras[i] = NULL; }
 }
 
 void SpellAuraHolder::AddAura(Aura* aura, SpellEffectIndex index)
@@ -9112,15 +9113,15 @@ void SpellAuraHolder::ApplyAuraModifiers(bool apply, bool real)
 {
     for (int32 i = 0; i < MAX_EFFECT_INDEX && !IsDeleted(); ++i)
         if (Aura* aur = GetAuraByEffectIndex(SpellEffectIndex(i)))
-            aur->ApplyModifier(apply, real);
+            { aur->ApplyModifier(apply, real); }
 }
 
 void SpellAuraHolder::_AddSpellAuraHolder()
 {
     if (!GetId())
-        return;
+        { return; }
     if (!m_target)
-        return;
+        { return; }
 
     // Try find slot for aura
     uint8 slot = NULL_AURA_SLOT;
@@ -9257,7 +9258,7 @@ void SpellAuraHolder::_RemoveSpellAuraHolder()
     // Remove all triggered by aura spells vs unlimited duration
     // except same aura replace case
     if (m_removeMode != AURA_REMOVE_BY_STACK)
-        CleanupTriggeredSpells();
+        { CleanupTriggeredSpells(); }
 
     Unit* caster = GetCaster();
 
@@ -9279,14 +9280,14 @@ void SpellAuraHolder::_RemoveSpellAuraHolder()
     uint8 slot = GetAuraSlot();
 
     if (slot >= MAX_AURAS)                                  // slot not set
-        return;
+        { return; }
 
     if (!m_target->GetVisibleAura(slot))
-        return;
+        { return; }
 
     // unregister aura diminishing (and store last time)
     if (getDiminishGroup() != DIMINISHING_NONE)
-        m_target->ApplyDiminishingAura(getDiminishGroup(), false);
+        { m_target->ApplyDiminishingAura(getDiminishGroup(), false); }
 
     SetAuraFlags(AFLAG_NONE);
     SetAuraLevel(0);
@@ -9332,7 +9333,7 @@ void SpellAuraHolder::_RemoveSpellAuraHolder()
         {
             case SPELLFAMILY_PALADIN:
                 if (IsSealSpell(m_spellProto))
-                    removeState = AURA_STATE_JUDGEMENT;     // Update Seals information
+                    { removeState = AURA_STATE_JUDGEMENT; }     // Update Seals information
                 break;
             case SPELLFAMILY_WARLOCK:
                 // Conflagrate aura state on Immolate and Shadowflame,
@@ -9371,7 +9372,7 @@ void SpellAuraHolder::_RemoveSpellAuraHolder()
             Unit::SpellAuraHolderMap const& holders = m_target->GetSpellAuraHolderMap();
             for (Unit::SpellAuraHolderMap::const_iterator i = holders.begin(); i != holders.end(); ++i)
             {
-                SpellEntry const *auraSpellInfo = (*i).second->GetSpellProto();
+                SpellEntry const* auraSpellInfo = (*i).second->GetSpellProto();
                 if (auraSpellInfo->IsFitToFamily(SpellFamily(m_spellProto->GetSpellFamilyName()), removeFamilyFlag))
                 {
                     found = true;
@@ -9381,7 +9382,7 @@ void SpellAuraHolder::_RemoveSpellAuraHolder()
 
             // this has been last aura
             if (!found)
-                m_target->ModifyAuraState(AuraState(removeState), false);
+                { m_target->ModifyAuraState(AuraState(removeState), false); }
         }
 
         // reset cooldown state for spells
@@ -9389,7 +9390,7 @@ void SpellAuraHolder::_RemoveSpellAuraHolder()
         {
             if (GetSpellProto()->HasAttribute(SPELL_ATTR_DISABLED_WHILE_ACTIVE))
                 // note: item based cooldowns and cooldown spell mods with charges ignored (unknown existing cases)
-                ((Player*)caster)->SendCooldownEvent(GetSpellProto());
+                { ((Player*)caster)->SendCooldownEvent(GetSpellProto()); }
         }
     }
 }
@@ -9403,24 +9404,24 @@ void SpellAuraHolder::CleanupTriggeredSpells()
             continue;
 
         if (!spellEffect->EffectApplyAuraName)
-            continue;
+            { continue; }
 
         uint32 tSpellId = spellEffect->EffectTriggerSpell;
-        if(!tSpellId)
-            continue;
+        if (!tSpellId)
+            { continue; }
 
         SpellEntry const* tProto = sSpellStore.LookupEntry(tSpellId);
         if (!tProto)
-            continue;
+            { continue; }
 
         if (GetSpellDuration(tProto) != -1)
-            continue;
+            { continue; }
 
         // needed for spell 43680, maybe others
         // TODO: is there a spell flag, which can solve this in a more sophisticated way?
         if (spellEffect->EffectApplyAuraName == SPELL_AURA_PERIODIC_TRIGGER_SPELL &&
             GetSpellDuration(m_spellProto) == int32(spellEffect->EffectAmplitude))
-            continue;
+            { continue; }
 
         m_target->RemoveAurasDueToSpell(tSpellId);
     }
@@ -9432,12 +9433,12 @@ bool SpellAuraHolder::ModStackAmount(int32 num)
 
     // Can`t mod
     if (!protoStackAmount)
-        return true;
+        { return true; }
 
     // Modify stack but limit it
     int32 stackAmount = m_stackAmount + num;
     if (stackAmount > (int32)protoStackAmount)
-        stackAmount = protoStackAmount;
+        { stackAmount = protoStackAmount; }
     else if (stackAmount <= 0) // Last aura from stack removed
     {
         m_stackAmount = 0;
@@ -9454,7 +9455,7 @@ void SpellAuraHolder::SetStackAmount(uint32 stackAmount)
     Unit* target = GetTarget();
     Unit* caster = GetCaster();
     if (!target || !caster)
-        return;
+        { return; }
 
     bool refresh = stackAmount >= m_stackAmount;
     if (stackAmount != m_stackAmount)
@@ -9480,7 +9481,7 @@ void SpellAuraHolder::SetStackAmount(uint32 stackAmount)
 
     if (refresh)
         // Stack increased refresh duration
-        RefreshHolder();
+        { RefreshHolder(); }
     else
         // Stack decreased only send update
         SendAuraUpdate(false);
@@ -9489,7 +9490,7 @@ void SpellAuraHolder::SetStackAmount(uint32 stackAmount)
 Unit* SpellAuraHolder::GetCaster() const
 {
     if (GetCasterGuid() == m_target->GetObjectGuid())
-        return m_target;
+        { return m_target; }
 
     return ObjectAccessor::GetUnit(*m_target, m_casterGuid);// player will search at any maps
 }
@@ -9498,32 +9499,32 @@ bool SpellAuraHolder::IsWeaponBuffCoexistableWith(SpellAuraHolder const* ref) co
 {
     // only item casted spells
     if (!GetCastItemGuid())
-        return false;
+        { return false; }
 
     // Exclude Debuffs
     if (!IsPositive())
-        return false;
+        { return false; }
 
     // Exclude Non-generic Buffs [ie: Runeforging] and Executioner-Enchant
     if (GetSpellProto()->GetSpellFamilyName() != SPELLFAMILY_GENERIC || GetId() == 42976)
-        return false;
+        { return false; }
 
     // Exclude Stackable Buffs [ie: Blood Reserve]
     if (GetSpellProto()->GetStackAmount())
-        return false;
+        { return false; }
 
     // only self applied player buffs
     if (m_target->GetTypeId() != TYPEID_PLAYER || m_target->GetObjectGuid() != GetCasterGuid())
-        return false;
+        { return false; }
 
     Item* castItem = ((Player*)m_target)->GetItemByGuid(GetCastItemGuid());
     if (!castItem)
-        return false;
+        { return false; }
 
     // Limit to Weapon-Slots
     if (!castItem->IsEquipped() ||
-            (castItem->GetSlot() != EQUIPMENT_SLOT_MAINHAND && castItem->GetSlot() != EQUIPMENT_SLOT_OFFHAND))
-        return false;
+        (castItem->GetSlot() != EQUIPMENT_SLOT_MAINHAND && castItem->GetSlot() != EQUIPMENT_SLOT_OFFHAND))
+        { return false; }
 
     // form different weapons
     return ref->GetCastItemGuid() && ref->GetCastItemGuid() != GetCastItemGuid();
@@ -9715,7 +9716,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
             {
                 case 11129:                                 // Combustion (remove triggered aura stack)
                 {
-                    if (!apply)
+                    if(!apply)
                         spellId1 = 28682;
                     else
                         return;
@@ -9723,7 +9724,7 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
                 }
                 case 28682:                                 // Combustion (remove main aura)
                 {
-                    if (!apply)
+                    if(!apply)
                         spellId1 = 11129;
                     else
                         return;
@@ -10279,24 +10280,24 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
     if (apply || cast_at_remove)
     {
         if (spellId1)
-            m_target->CastSpell(m_target, spellId1, true, NULL, NULL, GetCasterGuid());
+            { m_target->CastSpell(m_target, spellId1, true, NULL, NULL, GetCasterGuid()); }
         if (spellId2 && !IsDeleted())
-            m_target->CastSpell(m_target, spellId2, true, NULL, NULL, GetCasterGuid());
+            { m_target->CastSpell(m_target, spellId2, true, NULL, NULL, GetCasterGuid()); }
         if (spellId3 && !IsDeleted())
-            m_target->CastSpell(m_target, spellId3, true, NULL, NULL, GetCasterGuid());
+            { m_target->CastSpell(m_target, spellId3, true, NULL, NULL, GetCasterGuid()); }
         if (spellId4 && !IsDeleted())
-            m_target->CastSpell(m_target, spellId4, true, NULL, NULL, GetCasterGuid());
+            { m_target->CastSpell(m_target, spellId4, true, NULL, NULL, GetCasterGuid()); }
     }
     else
     {
         if (spellId1)
-            m_target->RemoveAurasByCasterSpell(spellId1, GetCasterGuid());
+            { m_target->RemoveAurasByCasterSpell(spellId1, GetCasterGuid()); }
         if (spellId2)
-            m_target->RemoveAurasByCasterSpell(spellId2, GetCasterGuid());
+            { m_target->RemoveAurasByCasterSpell(spellId2, GetCasterGuid()); }
         if (spellId3)
-            m_target->RemoveAurasByCasterSpell(spellId3, GetCasterGuid());
+            { m_target->RemoveAurasByCasterSpell(spellId3, GetCasterGuid()); }
         if (spellId4)
-            m_target->RemoveAurasByCasterSpell(spellId4, GetCasterGuid());
+            { m_target->RemoveAurasByCasterSpell(spellId4, GetCasterGuid()); }
     }
 
     SetInUse(false);
@@ -10307,7 +10308,7 @@ SpellAuraHolder::~SpellAuraHolder()
     // note: auras in delete list won't be affected since they clear themselves from holder when adding to deletedAuraslist
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
         if (Aura* aur = m_auras[i])
-            delete aur;
+            { delete aur; }
 }
 
 void SpellAuraHolder::Update(uint32 diff)
@@ -10316,7 +10317,7 @@ void SpellAuraHolder::Update(uint32 diff)
     {
         m_duration -= diff;
         if (m_duration < 0)
-            m_duration = 0;
+            { m_duration = 0; }
 
         m_timeCla -= diff;
 
@@ -10325,7 +10326,7 @@ void SpellAuraHolder::Update(uint32 diff)
             if (Unit* caster = GetCaster())
             {
                 Powers powertype = Powers(GetSpellProto()->powerType);
-                m_timeCla = 1*IN_MILLISECONDS;
+                m_timeCla = 1 * IN_MILLISECONDS;
 
                 if (SpellPowerEntry const* spellPower = GetSpellProto()->GetSpellPower())
                 {
@@ -10343,7 +10344,7 @@ void SpellAuraHolder::Update(uint32 diff)
 
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
         if (Aura* aura = m_auras[i])
-            aura->UpdateAura(diff);
+            { aura->UpdateAura(diff); }
 
     // Channeled aura required check distance from caster
     if (IsChanneledSpell(m_spellProto) && GetCasterGuid() != m_target->GetObjectGuid())
@@ -10362,7 +10363,7 @@ void SpellAuraHolder::Update(uint32 diff)
             float max_range = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellProto->rangeIndex));
 
             if (Player* modOwner = caster->GetSpellModOwner())
-                modOwner->ApplySpellMod(GetId(), SPELLMOD_RANGE, max_range, NULL);
+                { modOwner->ApplySpellMod(GetId(), SPELLMOD_RANGE, max_range, NULL); }
 
             if (!caster->IsWithinDistInMap(m_target, max_range))
             {
@@ -10387,7 +10388,7 @@ void SpellAuraHolder::SetAuraMaxDuration(int32 duration)
     if (duration > 0)
     {
         if (!(IsPassive() && GetSpellProto()->DurationIndex == 0))
-            SetPermanent(false);
+            { SetPermanent(false); }
 
         SetAuraFlags(GetAuraFlags() | AFLAG_DURATION);
     }
@@ -10398,7 +10399,7 @@ void SpellAuraHolder::SetAuraMaxDuration(int32 duration)
 bool SpellAuraHolder::HasMechanic(uint32 mechanic) const
 {
     if (mechanic == m_spellProto->GetMechanic())
-        return true;
+        { return true; }
 
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
     {
@@ -10414,7 +10415,7 @@ bool SpellAuraHolder::HasMechanic(uint32 mechanic) const
 bool SpellAuraHolder::HasMechanicMask(uint32 mechanicMask) const
 {
     if (mechanicMask & (1 << (m_spellProto->GetMechanic() - 1)))
-        return true;
+        { return true; }
 
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
     {
@@ -10432,7 +10433,7 @@ bool SpellAuraHolder::IsPersistent() const
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
         if (Aura* aur = m_auras[i])
             if (aur->IsPersistent())
-                return true;
+                { return true; }
     return false;
 }
 
@@ -10441,7 +10442,7 @@ bool SpellAuraHolder::IsAreaAura() const
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
         if (Aura* aur = m_auras[i])
             if (aur->IsAreaAura())
-                return true;
+                { return true; }
     return false;
 }
 
@@ -10450,7 +10451,7 @@ bool SpellAuraHolder::IsPositive() const
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
         if (Aura* aur = m_auras[i])
             if (!aur->IsPositive())
-                return false;
+                { return false; }
     return true;
 }
 
@@ -10458,7 +10459,7 @@ bool SpellAuraHolder::IsEmptyHolder() const
 {
     for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)
         if (m_auras[i])
-            return false;
+            { return false; }
     return true;
 }
 
@@ -10466,12 +10467,12 @@ void SpellAuraHolder::UnregisterAndCleanupTrackedAuras()
 {
     TrackedAuraType trackedType = GetTrackedAuraType();
     if (!trackedType)
-        return;
+        { return; }
 
     if (trackedType == TRACK_AURA_TYPE_SINGLE_TARGET)
     {
         if (Unit* caster = GetCaster())
-            caster->GetTrackedAuraTargets(trackedType).erase(GetSpellProto());
+            { caster->GetTrackedAuraTargets(trackedType).erase(GetSpellProto()); }
     }
     else if (trackedType == TRACK_AURA_TYPE_CONTROL_VEHICLE)
     {
diff --git a/src/game/WorldHandlers/SpellEffects.cpp b/src/game/WorldHandlers/SpellEffects.cpp
index c8f7eb654..79555ade4 100644
--- a/src/game/WorldHandlers/SpellEffects.cpp
+++ b/src/game/WorldHandlers/SpellEffects.cpp
@@ -5030,7 +5030,7 @@ void Spell::EffectOpenLock(SpellEffectEntry const* effect)
                 return;
             }
         }
-        else if (goInfo->type == GAMEOBJECT_TYPE_FLAGSTAND)
+        else if (goInfo->type == GAMEOBJECT_CreatureTypeFlagsTAND)
         {
             // CanUseBattleGroundObject() already called in CheckCast()
             // in battleground check
diff --git a/src/game/WorldHandlers/UnitAuraProcHandler.cpp b/src/game/WorldHandlers/UnitAuraProcHandler.cpp
index d48188734..c545b689e 100644
--- a/src/game/WorldHandlers/UnitAuraProcHandler.cpp
+++ b/src/game/WorldHandlers/UnitAuraProcHandler.cpp
@@ -3031,7 +3031,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit* pVictim, uint32 d
                 {
                     trigger_spell_id = 64442;
 
-                    // need scale damage base at stack size
+                    // need Scale damage base at stack size
                     if (SpellEntry const* trigEntry = sSpellStore.LookupEntry(trigger_spell_id))
                         basepoints[EFFECT_INDEX_0] = trigEntry->CalculateSimpleValue(EFFECT_INDEX_0) * triggeredByAura->GetStackAmount();
 
@@ -3046,7 +3046,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit* pVictim, uint32 d
 
                     trigger_spell_id = 64569;
 
-                    // need scale damage base at stack size
+                    // need Scale damage base at stack size
                     if (SpellEntry const* trigEntry = sSpellStore.LookupEntry(trigger_spell_id))
                         basepoints[EFFECT_INDEX_0] = trigEntry->CalculateSimpleValue(EFFECT_INDEX_0) * triggeredByAura->GetStackAmount();
 
diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt
index ab2d6253f..fb292ae41 100644
--- a/src/mangosd/CMakeLists.txt
+++ b/src/mangosd/CMakeLists.txt
@@ -86,8 +86,8 @@ if(SCRIPT_LIB_ELUNA)
     include_directories(${CMAKE_SOURCE_DIR}/dep/lualib)
 endif()
 
-if(SCRIPT_LIB_SD2)
-    include_directories(${CMAKE_SOURCE_DIR}/src/modules/SD2)
+if(SCRIPT_LIB_SD3)
+    include_directories(${CMAKE_SOURCE_DIR}/src/modules/SD3)
 endif()
 
 if(SOAP)
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 85b420b77..bff842e0c 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -18,8 +18,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 # Build the mangos script library if enabled
-if(SCRIPT_LIB_SD2)
-    add_subdirectory(SD2)
+if(SCRIPT_LIB_SD3)
+    add_subdirectory(SD3)
 endif()
 
 # Build the Eluna library if enabled
diff --git a/src/modules/SD3/CMakeLists.txt b/src/modules/SD3/CMakeLists.txt
new file mode 100644
index 000000000..0a2c690c1
--- /dev/null
+++ b/src/modules/SD3/CMakeLists.txt
@@ -0,0 +1,576 @@
+# MaNGOS is a full featured server for World of Warcraft, supporting
+# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+#
+# Copyright (C) 2005-2016  MaNGOS project <http://getmangos.eu>
+# Copyright (C) 2006-2013  ScriptDev2 project <http://www.scriptdev2.com>
+#
+# 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
+
+include(MacroMangosSourceGroup)
+
+#Add PCH Files
+set(mangosscript_PCH "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h")
+if(PCH)
+    LIST(APPEND mangosscript_PCH "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.cpp")
+endif()
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/base
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_SOURCE_DIR}/src/shared
+    ${CMAKE_SOURCE_DIR}/src/framework
+    ${CMAKE_SOURCE_DIR}/src/game/Server
+    ${CMAKE_SOURCE_DIR}/src/game/BattleGround
+    ${CMAKE_SOURCE_DIR}/src/game/WorldHandlers
+    ${CMAKE_SOURCE_DIR}/src/game/Object
+    ${CMAKE_SOURCE_DIR}/src/game/References
+    ${CMAKE_SOURCE_DIR}/src/game/MotionGenerators
+    ${CMAKE_SOURCE_DIR}/src/game/vmap
+    ${CMAKE_SOURCE_DIR}/src/shared
+    ${CMAKE_SOURCE_DIR}/src/shared/Utilities
+    ${CMAKE_SOURCE_DIR}/src/shared/Log
+    ${CMAKE_SOURCE_DIR}/src/shared/DataStores
+    ${CMAKE_SOURCE_DIR}/src/shared/Common
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_BINARY_DIR}/src/shared
+    ${ACE_INCLUDE_DIR}
+    ${MYSQL_INCLUDE_DIR}
+)
+
+# Define the scriptdev3 library
+set(mangosscript_LIB_SRCS ${mangosscript_PCH})
+
+#Include Files
+file(GLOB sources_include include/*.cpp include/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_include})
+    source_group("Include Files" FILES ${sources_include})
+
+#System Files
+file(GLOB sources_system system/*.cpp system/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_system})
+    source_group("System Files" FILES ${sources_system})
+
+#Base Files
+file(GLOB sources_base base/*.cpp base/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_base})
+    source_group("Base Files" FILES ${sources_base})
+
+#Battleground Scripts
+file(GLOB sources_battlegrounds scripts/battlegrounds/*.cpp scripts/battlegrounds/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_battlegrounds})
+    source_group("Battleground Scripts" FILES ${sources_battlegrounds})
+
+#World Scripts
+file(GLOB sources_world scripts/world/*.cpp scripts/world/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_world})
+    source_group("World Scripts" FILES ${sources_world})
+
+#Eastern Kingdom Scripts
+file(GLOB sources_eastern_kingdoms scripts/eastern_kingdoms/*.cpp scripts/eastern_kingdoms/*.h)
+# --- Remove Azuremyst and BloodMyst Isle from classic
+IF("${MANGOS_EXP}" STREQUAL "CLASSIC")
+    string(REGEX REPLACE "(eversong_woods.cpp|eversong_woods.h)" "" sources_eastern_kingdoms "${sources_eastern_kingdoms}")
+    string(REGEX REPLACE "(ghostlands.cpp|ghostlands.h)" "" sources_eastern_kingdoms "${sources_eastern_kingdoms}")
+    string(REGEX REPLACE "(isle_of_queldanas.cpp|isle_of_queldanas.h)" "" sources_eastern_kingdoms "${sources_eastern_kingdoms}")
+endif()
+
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_eastern_kingdoms})
+    source_group("Eastern Kingdoms Scripts" FILES ${sources_eastern_kingdoms})
+
+#Kalimdor Scripts
+set (GLOBIGNORE azuremyst_isle.cpp azuremyst_isle.h)
+file(GLOB sources_kalimdor scripts/kalimdor/*.cpp scripts/kalimdor/*.h)
+
+# --- Remove Azuremyst and BloodMyst Isle from classic
+IF("${MANGOS_EXP}" STREQUAL "CLASSIC")
+    string(REGEX REPLACE "(azuremyst_isle.cpp|azuremyst_isle.h)" "" sources_kalimdor "${sources_kalimdor}")
+    string(REGEX REPLACE "(bloodmyst_isle.cpp|bloodmyst_isle.h)" "" sources_kalimdor "${sources_kalimdor}")
+endif()
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_kalimdor})
+    source_group("Kalimdor Scripts" FILES ${sources_kalimdor})
+
+# --- NOT FOR ZERO ---  
+IF(("${MANGOS_EXP}" STREQUAL "TBC") OR ("${MANGOS_EXP}" STREQUAL "WOTLK") OR ("${MANGOS_EXP}" STREQUAL "CATA"))
+#Outlands Scripts
+file(GLOB sources_outlands scripts/outland/*.cpp scripts/outland/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_outlands})
+  source_group("Outlands Scripts" FILES ${sources_outlands})
+endif()
+# --- END IF ---
+
+# --- TWO / Three ---
+if (("${MANGOS_EXP}" STREQUAL "WOTLK") OR ("${MANGOS_EXP}" STREQUAL "CATA"))
+#Northrend Scripts
+file(GLOB sources_northrend scripts/northrend/*.cpp scripts/northrend/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_northrend})
+  source_group("Northrend Scripts" FILES ${sources_northrend})
+endif()
+# --- END IF ---
+
+#Instance: Blackrock Depths Scripts
+file(GLOB sources_instance_ek_brd scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/*.cpp scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/*.h)
+IF("${MANGOS_EXP}" STREQUAL "CLASSIC")
+    string(REGEX REPLACE "(boss_coren_direbrew.cpp|boss_coren_direbrew.h)" "" sources_instance_ek_brd "${sources_instance_ek_brd}")
+endif()
+
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_brd})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Blackrock Depths" FILES ${sources_instance_ek_brd})
+
+#Instance: Blackrock Spire Scripts
+file(GLOB sources_instance_ek_brs scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/*.cpp scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_brs})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Blackrock Spire" FILES ${sources_instance_ek_brs})
+
+#Instance: Deadmines Scripts
+file(GLOB sources_instance_ek_tdm scripts/eastern_kingdoms/deadmines/*.cpp scripts/eastern_kingdoms/deadmines/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_tdm})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Deadmines" FILES ${sources_instance_ek_tdm})
+
+#Instance: Gnomeregan Scripts
+file(GLOB sources_instance_ek_gno scripts/eastern_kingdoms/gnomeregan/*.cpp scripts/eastern_kingdoms/gnomeregan/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_gno})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Gnomeregan" FILES ${sources_instance_ek_gno})
+
+#Instance: Scarlet Monastery Scripts
+file(GLOB sources_instance_ek_sm scripts/eastern_kingdoms/scarlet_monastery/*.cpp scripts/eastern_kingdoms/scarlet_monastery/*.h)
+IF("${MANGOS_EXP}" STREQUAL "CLASSIC")
+    string(REGEX REPLACE "(boss_headless_horseman.cpp|boss_headless_horseman.h)" "" sources_instance_ek_sm "${sources_instance_ek_sm}")
+endif()
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_sm})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Scarlet Monastery" FILES ${sources_instance_ek_sm})
+
+#Instance: Scholomance Scripts
+file(GLOB sources_instance_ek_scholo scripts/eastern_kingdoms/scholomance/*.cpp scripts/eastern_kingdoms/scholomance/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_scholo})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Scholomance" FILES ${sources_instance_ek_scholo})
+
+#Instance: Uldaman Scripts
+file(GLOB sources_instance_ek_uld scripts/eastern_kingdoms/uldaman/*.cpp scripts/eastern_kingdoms/uldaman/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_uld})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Uldaman" FILES ${sources_instance_ek_uld})
+
+#Instance: Shadowfang Keep Scripts
+file(GLOB sources_instance_ek_sfk scripts/eastern_kingdoms/shadowfang_keep/*.cpp scripts/eastern_kingdoms/shadowfang_keep/*.h)
+# --- Remove Hummel from classic
+IF("${MANGOS_EXP}" STREQUAL "CLASSIC")
+    string(REGEX REPLACE "(boss_hummel.cpp|boss_hummel.h)" "" sources_instance_ek_sfk "${sources_instance_ek_sfk}")
+endif()
+
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_sfk})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Shadowfang Keep" FILES ${sources_instance_ek_sfk})
+
+#Instance: Sunken Temple Scripts
+file(GLOB sources_instance_ek_st scripts/eastern_kingdoms/sunken_temple/*.cpp scripts/eastern_kingdoms/sunken_temple/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_st})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Sunken Temple" FILES ${sources_instance_ek_st})
+
+#Instance: Stratholme Scripts
+# --- ONLY FOR ZERO ---  
+IF("${MANGOS_EXP}" STREQUAL "CLASSIC")
+file(GLOB sources_instance_ek_files scripts/eastern_kingdoms/stratholme/*.cpp scripts/eastern_kingdoms/stratholme/*.h)
+    string(REGEX REPLACE "(boss_order_of_silver_hand.cpp|boss_order_of_silver_hand.h)" "" sources_instance_ek_files "${sources_instance_ek_files}")
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_files})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Stratholme" FILES ${sources_instance_ek_files})
+endif()
+
+IF(("${MANGOS_EXP}" STREQUAL "TBC") OR ("${MANGOS_EXP}" STREQUAL "WOTLK") OR ("${MANGOS_EXP}" STREQUAL "CATA"))
+file(GLOB sources_instance_ek_strat scripts/eastern_kingdoms/stratholme/*.cpp scripts/eastern_kingdoms/stratholme/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_strat})
+  source_group("Eastern Kingdoms Scripts\\Instances\\Stratholme" FILES ${sources_instance_ek_strat})
+endif()
+
+IF(("${MANGOS_EXP}" STREQUAL "TBC") OR ("${MANGOS_EXP}" STREQUAL "WOTLK") OR ("${MANGOS_EXP}" STREQUAL "CATA"))
+#Instance: Magisters Terrace Scripts
+file(GLOB sources_instance_ek_mt scripts/eastern_kingdoms/magisters_terrace/*.cpp scripts/eastern_kingdoms/magisters_terrace/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_mt})
+  source_group("Eastern Kingdoms Scripts\\Instances\\Magisters Terrace" FILES ${sources_instance_ek_mt})
+  
+#Raid: Karazhan Scripts
+file(GLOB sources_raid_ek_kara scripts/eastern_kingdoms/karazhan/*.cpp scripts/eastern_kingdoms/karazhan/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_kara})
+  source_group("Eastern Kingdoms Scripts\\Raids\\Karazhan" FILES ${sources_raid_ek_kara})
+  
+#Raid: Sunwell Plateau Scripts
+file(GLOB sources_raid_ek_sp scripts/eastern_kingdoms/sunwell_plateau/*.cpp scripts/eastern_kingdoms/sunwell_plateau/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_sp})
+  source_group("Eastern Kingdoms Scripts\\Raids\\Sunwell Plateau" FILES ${sources_raid_ek_sp})
+  
+#Raid: Zul'Aman Scripts
+file(GLOB sources_raid_ek_za scripts/eastern_kingdoms/zulaman/*.cpp scripts/eastern_kingdoms/zulaman/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_za})
+  source_group("Eastern Kingdoms Scripts\\Raids\\Zul'Aman" FILES ${sources_raid_ek_za})
+endif()  
+# --- END IF ---  
+
+#Raid: Molten Core Scripts
+file(GLOB sources_raid_ek_mc scripts/eastern_kingdoms/blackrock_mountain/molten_core/*.cpp scripts/eastern_kingdoms/blackrock_mountain/molten_core/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_mc})
+    source_group("Eastern Kingdoms Scripts\\Raids\\Molten Core" FILES ${sources_raid_ek_mc})
+
+#Raid: Blackwing Lair Scripts
+file(GLOB sources_raid_ek_bwl scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/*.cpp scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_bwl})
+    source_group("Eastern Kingdoms Scripts\\Raids\\Blackwing Lair" FILES ${sources_raid_ek_bwl})
+
+# --- NOT TWO ---
+IF(("${MANGOS_EXP}" STREQUAL "CLASSIC") OR ("${MANGOS_EXP}" STREQUAL "TBC"))
+#Raid: Naxxramas Scripts
+file(GLOB sources_raid_ek_naxx scripts/eastern_kingdoms/naxxramas/*.cpp scripts/eastern_kingdoms/naxxramas/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_naxx})
+    source_group("Eastern Kingdoms Scripts\\Raids\\Naxxramas" FILES ${sources_raid_ek_naxx})
+endif()
+# --- END IF ---
+
+#Raid: Zul Gurub Scripts
+file(GLOB sources_raid_ek_zg scripts/eastern_kingdoms/zulgurub/*.cpp scripts/eastern_kingdoms/zulgurub/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_zg})
+    source_group("Eastern Kingdoms Scripts\\Raids\\Zul Gurub" FILES ${sources_raid_ek_zg})
+
+#Instance: Blackfathom Deeps Scripts
+file(GLOB sources_instance_k_bdf scripts/kalimdor/blackfathom_deeps/*.cpp scripts/kalimdor/blackfathom_deeps/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_bdf})
+    source_group("Kalimdor Scripts\\Instances\\Blackfathom Deeps" FILES ${sources_instance_k_bdf})
+
+#Instance: Dire Maul Scripts
+file(GLOB sources_instance_k_dm scripts/kalimdor/dire_maul/*.cpp scripts/kalimdor/dire_maul/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_dm})
+    source_group("Kalimdor Scripts\\Instances\\Dire Maul" FILES ${sources_instance_k_dm})
+
+#Instance: Maraudon Scripts
+file(GLOB sources_instance_k_mara scripts/kalimdor/maraudon/*.cpp scripts/kalimdor/maraudon/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_mara})
+    source_group("Kalimdor Scripts\\Instances\\Maraudon Scripts" FILES ${sources_instance_k_mara})
+
+#Instance: Razorfen Downs Scripts
+file(GLOB sources_instance_k_rfd scripts/kalimdor/razorfen_downs/*.cpp scripts/kalimdor/razorfen_downs/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_rfd})
+    source_group("Kalimdor Scripts\\Instances\\Razorfen Downs" FILES ${sources_instance_k_rfd})
+
+#Instance: Razorfen Kraul Scripts
+file(GLOB sources_instance_k_rfk scripts/kalimdor/razorfen_kraul/*.cpp scripts/kalimdor/razorfen_kraul/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_rfk})
+    source_group("Kalimdor Scripts\\Instances\\Razorfen Kraul" FILES ${sources_instance_k_rfk})
+
+#Instance: Wailing Caverns Scripts
+file(GLOB sources_instance_k_wc scripts/kalimdor/wailing_caverns/*.cpp scripts/kalimdor/wailing_caverns/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_wc})
+    source_group("Kalimdor Scripts\\Instances\\Wailing Caverns" FILES ${sources_instance_k_wc})
+
+# --- NOT FOR ZERO ---  
+IF(("${MANGOS_EXP}" STREQUAL "TBC") OR ("${MANGOS_EXP}" STREQUAL "WOTLK") OR ("${MANGOS_EXP}" STREQUAL "CATA"))
+#Instance: Caverns of Time - Black Morass
+file(GLOB sources_instance_k_cot_bm scripts/kalimdor/caverns_of_time/dark_portal/*.cpp scripts/kalimdor/caverns_of_time/dark_portal/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_cot_bm})
+  source_group("Kalimdor Scripts\\Instances\\Caverns of Time\\Black Morass" FILES ${sources_instance_k_cot_bm})
+
+#Instance: Caverns of Time - Old Hillsbrad
+file(GLOB sources_instance_k_cot_oh scripts/kalimdor/caverns_of_time/old_hillsbrad/*.cpp scripts/kalimdor/caverns_of_time/old_hillsbrad/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_cot_oh})
+  source_group("Kalimdor Scripts\\Instances\\Caverns of Time\\Old Hillsbrad" FILES ${sources_instance_k_cot_oh})
+endif()
+# --- END IF ---  
+
+# --- TWO /THREE ONLY ---
+if (("${MANGOS_EXP}" STREQUAL "WOTLK") OR ("${MANGOS_EXP}" STREQUAL "CATA"))
+#Instance: Caverns of Time - Culling of Stratholme
+file(GLOB sources_instance_k_cot_cos scripts/kalimdor/caverns_of_time/culling_of_stratholme/*.cpp scripts/kalimdor/caverns_of_time/culling_of_stratholme/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_cot_cos})
+  source_group("Kalimdor Scripts\\Instances\\Caverns of Time\\Culling of Stratholme" FILES ${sources_instance_k_cot_cos})
+endif()
+# --- END IF ---
+  
+#Instance: Zul Farrak Scripts
+file(GLOB sources_instance_k_zf scripts/kalimdor/zulfarrak/*.cpp scripts/kalimdor/zulfarrak/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_zf})
+    source_group("Kalimdor Scripts\\Instances\\Zul Farrak" FILES ${sources_instance_k_zf})
+
+# --- NOT FOR ZERO ---  
+#Raid: Caverns of Time - Mount Hyjal
+IF(("${MANGOS_EXP}" STREQUAL "TBC") OR ("${MANGOS_EXP}" STREQUAL "WOTLK") OR ("${MANGOS_EXP}" STREQUAL "CATA"))
+file(GLOB sources_instance_k_cot_mh scripts/kalimdor/caverns_of_time/hyjal/*.cpp scripts/kalimdor/caverns_of_time/hyjal/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_cot_mh})
+  source_group("Kalimdor Scripts\\Raids\\Caverns of Time\\Mount Hyjal" FILES ${sources_instance_k_cot_mh})
+endif()
+# --- END IF ---  
+  
+#Raid: Onyxias Lair Scripts
+file(GLOB sources_raid_k_ony scripts/kalimdor/onyxias_lair/*.cpp scripts/kalimdor/onyxias_lair/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_ony})
+    source_group("Kalimdor Scripts\\Raids\\Onyxias Lair" FILES ${sources_raid_k_ony})
+
+#Raid: Ruins of AQ Scripts
+file(GLOB sources_raid_k_raq scripts/kalimdor/ruins_of_ahnqiraj/*.cpp scripts/kalimdor/ruins_of_ahnqiraj/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_raq})
+    source_group("Kalimdor Scripts\\Raids\\Ruins of AQ" FILES ${sources_raid_k_raq})
+
+#Raid: Temple of AQ Scripts
+file(GLOB sources_raid_k_taq scripts/kalimdor/temple_of_ahnqiraj/*.cpp scripts/kalimdor/temple_of_ahnqiraj/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_taq})
+    source_group("Kalimdor Scripts\\Raids\\Temple of AQ" FILES ${sources_raid_k_taq})
+
+# --- NOT FOR ZERO ---  
+IF(("${MANGOS_EXP}" STREQUAL "TBC") OR ("${MANGOS_EXP}" STREQUAL "WOTLK") OR ("${MANGOS_EXP}" STREQUAL "CATA"))
+#Instance: Auchindoun - Auchenai Crypts
+file(GLOB sources_instance_ol_aac scripts/outland/auchindoun/auchenai_crypts/*.cpp scripts/outland/auchindoun/auchenai_crypts/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_aac})
+  source_group("Outlands Scripts\\Instances\\Auchindoun\\Auchenai Crypts" FILES ${sources_instance_ol_aac})
+
+#Instance: Auchindoun - Mana Tombs
+file(GLOB sources_instance_ol_amt scripts/outland/auchindoun/mana_tombs/*.cpp scripts/outland/auchindoun/mana_tombs/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_amt})
+  source_group("Outlands Scripts\\Instances\\Auchindoun\\Mana Tombs" FILES ${sources_instance_ol_amt})
+  
+#Instance: Auchindoun - Sethekk Halls
+file(GLOB sources_instance_ol_ash scripts/outland/auchindoun/sethekk_halls/*.cpp scripts/outland/auchindoun/sethekk_halls/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_ash})
+  source_group("Outlands Scripts\\Instances\\Auchindoun\\Sethekk Halls" FILES ${sources_instance_ol_ash})
+  
+#Instance: Auchindoun - Shadow Labyrinth
+file(GLOB sources_instance_ol_asl scripts/outland/auchindoun/shadow_labyrinth/*.cpp scripts/outland/auchindoun/shadow_labyrinth/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_asl})
+  source_group("Outlands Scripts\\Instances\\Auchindoun\\Shadow Labyrinth" FILES ${sources_instance_ol_asl})
+
+#Instance: Coilfang Reservoir - Slave Pens
+file(GLOB sources_instance_ol_csp scripts/outland/coilfang_reservoir/slave_pens/*.cpp scripts/outland/coilfang_reservoir/slave_pens/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_csp})
+  source_group("Outlands Scripts\\Instances\\Coilfang Reservoir\\Slave Pens" FILES ${sources_instance_ol_csp})
+  
+#Instance: Coilfang Reservoir - Steam Vaults
+file(GLOB sources_instance_ol_cst scripts/outland/coilfang_reservoir/steam_vault/*.cpp scripts/outland/coilfang_reservoir/steam_vault/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_cst})
+  source_group("Outlands Scripts\\Instances\\Coilfang Reservoir\\Steam Vaults" FILES ${sources_instance_ol_cst})
+  
+#Instance: Coilfang Reservoir - Underbog
+file(GLOB sources_instance_ol_cu scripts/outland/coilfang_reservoir/underbog/*.cpp scripts/outland/coilfang_reservoir/underbog/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_cu})
+  source_group("Outlands Scripts\\Instances\\Coilfang Reservoir\\Underbog" FILES ${sources_instance_ol_cu})
+  
+#Instance: Hellfire Citadel - Blood Furnace
+file(GLOB sources_raid_ol_hbf scripts/outland/hellfire_citadel/blood_furnace/*.cpp scripts/outland/hellfire_citadel/blood_furnace/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_hbf})
+  source_group("Outlands Scripts\\Instances\\Hellfire Citadel\\Blood Furnace" FILES ${sources_raid_ol_hbf})
+  
+#Instance: Hellfire Citadel - Hellfire Ramparts
+file(GLOB sources_raid_ol_hhr scripts/outland/hellfire_citadel/hellfire_ramparts/*.cpp scripts/outland/hellfire_citadel/hellfire_ramparts/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_hhr})
+  source_group("Outlands Scripts\\Instances\\Hellfire Citadel\\Hellfire Ramparts" FILES ${sources_raid_ol_hhr})
+  
+#Instance: Hellfire Citadel - Shattered Halls
+file(GLOB sources_raid_ol_hsh scripts/outland/hellfire_citadel/shattered_halls/*.cpp scripts/outland/hellfire_citadel/shattered_halls/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_hsh})
+  source_group("Outlands Scripts\\Instances\\Hellfire Citadel\\Shattered Halls" FILES ${sources_raid_ol_hsh})  
+
+#Instance: Tempest Keep - Arcatraz
+file(GLOB sources_raid_ol_ta scripts/outland/tempest_keep/arcatraz/*.cpp scripts/outland/tempest_keep/arcatraz/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_ta})
+  source_group("Outlands Scripts\\Instances\\Tempest Keep\\Arcatraz" FILES ${sources_raid_ol_ta})
+  
+#Instance: Tempest Keep - Botanica
+file(GLOB sources_raid_ol_tb scripts/outland/tempest_keep/botanica/*.cpp scripts/outland/tempest_keep/botanica/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_tb})
+  source_group("Outlands Scripts\\Instances\\Tempest Keep\\Botanica" FILES ${sources_raid_ol_tb})
+  
+#Instance: Tempest Keep - The Mechanar
+file(GLOB sources_raid_ol_ttm scripts/outland/tempest_keep/the_mechanar/*.cpp scripts/outland/tempest_keep/the_mechanar/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_ttm})
+  source_group("Outlands Scripts\\Instances\\Tempest Keep\\The Mechanar" FILES ${sources_raid_ol_ttm})
+  
+#Raid: Hellfire Citadel - Magtheridons Lair
+file(GLOB sources_raid_ol_hml scripts/outland/hellfire_citadel/magtheridons_lair/*.cpp scripts/outland/hellfire_citadel/magtheridons_lair/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_hml})
+  source_group("Outlands Scripts\\Raids\\Hellfire Citadel\\Magtheridons Lair" FILES ${sources_raid_ol_hml})
+  
+#Raid: Tempest Keep - The Eye
+file(GLOB sources_raid_ol_tte scripts/outland/tempest_keep/the_eye/*.cpp scripts/outland/tempest_keep/the_eye/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_tte})
+  source_group("Outlands Scripts\\Raids\\Tempest Keep\\The Eye" FILES ${sources_raid_ol_tte})
+  
+#Raid: Coilfang Reservoir - Serpentshrine Cavern
+file(GLOB sources_raid_ol_csc scripts/outland/coilfang_reservoir/serpent_shrine/*.cpp scripts/outland/coilfang_reservoir/serpent_shrine/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_csc})
+  source_group("Outlands Scripts\\Raids\\Coilfang Reservoir\\Serpentshrine Cavern" FILES ${sources_raid_ol_csc})
+  
+#Raid: Black Temple
+file(GLOB sources_raid_ol_bt scripts/outland/black_temple/*.cpp scripts/outland/black_temple/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_bt})
+  source_group("Outlands Scripts\\Raids\\Black Temple" FILES ${sources_raid_ol_bt})
+  
+#Raid: Gruul's Lair
+file(GLOB sources_raid_ol_gl scripts/outland/gruuls_lair/*.cpp scripts/outland/gruuls_lair/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_gl})
+  source_group("Outlands Scripts\\Raids\\Gruul's Lair" FILES ${sources_raid_ol_gl})
+endif()
+# --- END IF ---
+
+# --- TWO ONLY ---
+if (("${MANGOS_EXP}" STREQUAL "WOTLK") OR ("${MANGOS_EXP}" STREQUAL "CATA"))
+#Instance: Azjol Nerub
+file(GLOB sources_instance_nr_aznj scripts/northrend/azjol-nerub/azjol-nerub/*.cpp scripts/northrend/azjol-nerub/azjol-nerub/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_aznj})
+  source_group("Northrend Scripts\\Instances\\Azjol Nerub" FILES ${sources_instance_nr_aznj})
+
+#Instance: Ahn'Kahet
+file(GLOB sources_instance_nr_ahnk scripts/northrend/azjol-nerub/ahnkahet/*.cpp scripts/northrend/azjol-nerub/ahnkahet/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_ahnk})
+  source_group("Northrend Scripts\\Instances\\Ahn'Kahet" FILES ${sources_instance_nr_ahnk})
+
+#Instance: Trial of the Champion
+file(GLOB sources_instance_nr_totch scripts/northrend/crusaders_coliseum/trial_of_the_champion/*.cpp scripts/northrend/crusaders_coliseum/trial_of_the_champion/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_totch})
+  source_group("Northrend Scripts\\Instances\\Trial of the Champion" FILES ${sources_instance_nr_totch})
+
+#Instance: Drak'Tharon Keep
+file(GLOB sources_instance_nr_dtk scripts/northrend/draktharon_keep/*.cpp scripts/northrend/draktharon_keep/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_dtk})
+  source_group("Northrend Scripts\\Instances\\Drak'Tharon Keep" FILES ${sources_instance_nr_dtk})
+  
+#Instance: Gundrak
+file(GLOB sources_instance_nr_gdk scripts/northrend/gundrak/*.cpp scripts/northrend/gundrak/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_gdk})
+  source_group("Northrend Scripts\\Instances\\Gundrak" FILES ${sources_instance_nr_gdk})
+  
+#Instance: Frozen Halls: Forge of Souls
+file(GLOB sources_instance_nr_fh_fos scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/*.cpp scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_fh_fos})
+  source_group("Northrend Scripts\\Instances\\Forge of Souls" FILES ${sources_instance_nr_fh_fos})
+
+#Instance: Frozen Halls: Halls of Reflection
+file(GLOB sources_instance_nr_fh_hor scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/*.cpp scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_fh_hor})
+  source_group("Northrend Scripts\\Instances\\Halls of Reflection" FILES ${sources_instance_nr_fh_hor})
+
+#Instance: Frozen Halls: Pit of Saron
+file(GLOB sources_instance_nr_fh_pos scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/*.cpp scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_fh_pos})
+  source_group("Northrend Scripts\\Instances\\Pit of Saron" FILES ${sources_instance_nr_fh_pos})
+  
+#Instance: The Nexus
+file(GLOB sources_instance_nr_nex scripts/northrend/nexus/nexus/*.cpp scripts/northrend/nexus/nexus/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_nex})
+  source_group("Northrend Scripts\\Instances\\The Nexus" FILES ${sources_instance_nr_nex})
+  
+#Instance: The Oculus
+file(GLOB sources_instance_nr_oculus scripts/northrend/nexus/oculus/*.cpp scripts/northrend/nexus/oculus/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_oculus})
+  source_group("Northrend Scripts\\Instances\\The Oculus" FILES ${sources_instance_nr_oculus})
+  
+#Instance: Halls of Lightning
+file(GLOB sources_instance_nr_uld_hol scripts/northrend/ulduar/halls_of_lightning/*.cpp scripts/northrend/ulduar/halls_of_lightning/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_uld_hol})
+  source_group("Northrend Scripts\\Instances\\Halls of Lightning" FILES ${sources_instance_nr_uld_hol})
+  
+#Instance: Halls of Stone
+file(GLOB sources_instance_nr_uld_hos scripts/northrend/ulduar/halls_of_stone/*.cpp scripts/northrend/ulduar/halls_of_stone/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_uld_hos})
+  source_group("Northrend Scripts\\Instances\\Halls of Stone" FILES ${sources_instance_nr_uld_hos})
+  
+#Instance: Utgarde Keep
+file(GLOB sources_instance_nr_uk scripts/northrend/utgarde_keep/utgarde_keep/*.cpp scripts/northrend/utgarde_keep/utgarde_keep/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_uk})
+  source_group("Northrend Scripts\\Instances\\Utgarde Keep" FILES ${sources_instance_nr_uk})
+
+#Instance: Utgarde Pinnacle
+file(GLOB sources_instance_nr_up scripts/northrend/utgarde_keep/utgarde_pinnacle/*.cpp scripts/northrend/utgarde_keep/utgarde_pinnacle/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_up})
+  source_group("Northrend Scripts\\Instances\\Utgarde Pinnacle" FILES ${sources_instance_nr_up})
+  
+#Instance: Violet Hold
+file(GLOB sources_instance_nr_vh scripts/northrend/violet_hold/*.cpp scripts/northrend/violet_hold/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_vh})
+  source_group("Northrend Scripts\\Instances\\Violet Hold" FILES ${sources_instance_nr_vh})
+
+#Raid: Naxxramas
+file(GLOB sources_raid_nr_naxx scripts/northrend/naxxramas/*.cpp scripts/northrend/naxxramas/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_naxx})
+  source_group("Northrend Scripts\\Raids\\Naxxramas" FILES ${sources_raid_nr_naxx})
+  
+#Raid: Vault of Archavon
+file(GLOB sources_raid_nr_voa scripts/northrend/vault_of_archavon/*.cpp scripts/northrend/vault_of_archavon/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_voa})
+  source_group("Northrend Scripts\\Raids\\Vault of Archavon" FILES ${sources_raid_nr_voa})
+  
+#Raid: Obsidian Sanctum
+file(GLOB sources_raid_nr_os scripts/northrend/obsidian_sanctum/*.cpp scripts/northrend/obsidian_sanctum/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_os})
+  source_group("Northrend Scripts\\Raids\\Obsidian Sanctum" FILES ${sources_raid_nr_os})
+  
+#Raid: Ruby Sanctum
+file(GLOB sources_raid_nr_rs scripts/northrend/ruby_sanctum/*.cpp scripts/northrend/ruby_sanctum/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_rs})
+  source_group("Northrend Scripts\\Raids\\Ruby Sanctum" FILES ${sources_raid_nr_rs})
+  
+#Raid: Icecrown Citadel
+file(GLOB sources_raid_nr_icc scripts/northrend/icecrown_citadel/icecrown_citadel/*.cpp scripts/northrend/icecrown_citadel/icecrown_citadel/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_icc})
+  source_group("Northrend Scripts\\Raids\\Icecrown Citadel" FILES ${sources_raid_nr_icc})
+  
+#Raid: Trial of the Crusader
+file(GLOB sources_raid_nr_totc scripts/northrend/crusaders_coliseum/trial_of_the_crusader/*.cpp scripts/northrend/crusaders_coliseum/trial_of_the_crusader/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_totc})
+  source_group("Northrend Scripts\\Raids\\Trial of the Crusader" FILES ${sources_raid_nr_totc})
+  
+#Raid: Eye of Eternity
+file(GLOB sources_raid_nr_eoe scripts/northrend/nexus/eye_of_eternity/*.cpp scripts/northrend/nexus/eye_of_eternity/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_eoe})
+  source_group("Northrend Scripts\\Raids\\Eye of Eternity" FILES ${sources_raid_nr_eoe})
+  
+#Raid: Ulduar
+file(GLOB sources_raid_nr_uld scripts/northrend/ulduar/ulduar/*.cpp scripts/northrend/ulduar/ulduar/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_uld})
+  source_group("Northrend Scripts\\Raids\\Ulduar" FILES ${sources_raid_nr_uld})
+  
+#WorldScript: Scarlet Enclave
+file(GLOB sources_world_scarlet_enclave scripts/eastern_kingdoms/scarlet_enclave/*.cpp scripts/eastern_kingdoms/scarlet_enclave/*.h)
+  LIST(APPEND mangosscript_LIB_SRCS ${sources_world_scarlet_enclave})
+  source_group("Eastern Kingdoms Scripts\\World\\Scarlet Enclave" FILES ${sources_world_scarlet_enclave})
+endif()
+# --- END IF ---  
+add_library(mangosscript STATIC ${mangosscript_LIB_SRCS})
+  
+# Generate PCH
+if(PCH)
+    ADD_CXX_PCH(mangosscript ${mangosscript_PCH})
+endif()
+
+if(NOT ACE_USE_EXTERNAL)
+    add_dependencies(mangosscript ace)
+endif()
+
+if(UNIX)
+    set(mangosscript_LINK_FLAGS "-pthread")
+    if(APPLE)
+        set(mangosscript_LINK_FLAGS "-framework Carbon ${mangosscript_LINK_FLAGS}")
+        # Needed for the linking because of the missing symbols
+        set(mangosscript_LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup ${mangosscript_LINK_FLAGS}")
+    endif()
+
+    if(APPLE)
+        set(mangosscript_PROPERTIES INSTALL_NAME_DIR ${LIBS_DIR})
+    else()
+        set(mangosscript_PROPERTIES INSTALL_RPATH ${LIBS_DIR})
+    endif()
+
+    # Run out of build tree
+    set(mangosscript_PROPERTIES
+        ${mangosscript_PROPERTIES}
+        BUILD_WITH_INSTALL_RPATH OFF
+    )
+
+    set_target_properties(mangosscript PROPERTIES
+        LINK_FLAGS ${mangosscript_LINK_FLAGS}
+        ${mangosscript_PROPERTIES}
+    )
+endif()
diff --git a/src/modules/SD3/README.md b/src/modules/SD3/README.md
new file mode 100644
index 000000000..f70465c0e
--- /dev/null
+++ b/src/modules/SD3/README.md
@@ -0,0 +1,5 @@
+# ScriptDev3
+
+New EventAI engine for all MaNGOS cores. Developed from the old ScriptDev2.
+
+
diff --git a/src/modules/SD3/base/escort_ai.cpp b/src/modules/SD3/base/escort_ai.cpp
new file mode 100644
index 000000000..b4a069951
--- /dev/null
+++ b/src/modules/SD3/base/escort_ai.cpp
@@ -0,0 +1,662 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: EscortAI
+SD%Complete: 100
+SDComment:
+SDCategory: Npc
+EndScriptData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "system/system.h"
+
+const float MAX_PLAYER_DISTANCE = 66.0f;
+
+enum
+{
+    POINT_LAST_POINT    = 0xFFFFFF,
+    POINT_HOME          = 0xFFFFFE
+};
+
+npc_escortAI::npc_escortAI(Creature* pCreature) : ScriptedAI(pCreature),
+    m_uiWPWaitTimer(2500),
+    m_uiPlayerCheckTimer(1000),
+    m_uiEscortState(STATE_ESCORT_NONE),
+    m_pQuestForEscort(NULL),
+    m_bIsRunning(false),
+    m_bCanInstantRespawn(false),
+    m_bCanReturnToStart(false)
+{}
+
+void npc_escortAI::GetAIInformation(ChatHandler& reader)
+{
+    std::ostringstream oss;
+
+    oss << "EscortAI ";
+    if (m_playerGuid)
+    {
+        oss << "started for " << m_playerGuid.GetString() << " ";
+    }
+    if (m_pQuestForEscort)
+    {
+        oss << "started with quest " << m_pQuestForEscort->GetQuestId();
+    }
+
+    if (HasEscortState(STATE_ESCORT_ESCORTING))
+    {
+        oss << "\nEscortFlags: Escorting" << (HasEscortState(STATE_ESCORT_RETURNING) ? ", Returning" : "") << (HasEscortState(STATE_ESCORT_PAUSED) ? ", Paused" : "");
+
+        if (CurrentWP != WaypointList.end())
+        {
+            oss << "\nNext Waypoint Id = " << CurrentWP->uiId << " Position: " << CurrentWP->fX << " " << CurrentWP->fY << " " << CurrentWP->fZ;
+        }
+    }
+
+    reader.PSendSysMessage(oss.str().c_str());
+}
+
+bool npc_escortAI::IsVisible(Unit* pWho) const
+{
+    if (!pWho)
+    {
+        return false;
+    }
+
+    return m_creature->IsWithinDist(pWho, VISIBLE_RANGE) && pWho->IsVisibleForOrDetect(m_creature, m_creature, true);
+}
+
+void npc_escortAI::AttackStart(Unit* pWho)
+{
+    if (!pWho)
+    {
+        return;
+    }
+
+    if (m_creature->Attack(pWho, true))
+    {
+        m_creature->AddThreat(pWho);
+        m_creature->SetInCombatWith(pWho);
+        pWho->SetInCombatWith(m_creature);
+
+        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE)
+        {
+            m_creature->GetMotionMaster()->MovementExpired();
+        }
+
+        if (IsCombatMovement())
+        {
+            m_creature->GetMotionMaster()->MoveChase(pWho);
+        }
+    }
+}
+
+void npc_escortAI::EnterCombat(Unit* pEnemy)
+{
+    // Store combat start position
+    m_creature->SetCombatStartPosition(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+
+    if (!pEnemy)
+    {
+        return;
+    }
+
+    Aggro(pEnemy);
+}
+
+void npc_escortAI::Aggro(Unit* /*pEnemy*/) {}
+
+// see followerAI
+bool npc_escortAI::AssistPlayerInCombat(Unit* pWho)
+{
+    if (!pWho->getVictim())
+    {
+        return false;
+    }
+
+    // experimental (unknown) flag not present
+    if (!(m_creature->GetCreatureInfo()->CreatureTypeFlags & CREATURE_TYPEFLAGS_CAN_ASSIST))
+    {
+        return false;
+    }
+
+    // unit state prevents (similar check is done in CanInitiateAttack which also include checking unit_flags. We skip those here)
+    if (m_creature->hasUnitState(UNIT_STAT_STUNNED | UNIT_STAT_DIED))
+    {
+        return false;
+    }
+
+    // victim of pWho is not a player
+    if (!pWho->getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself())
+    {
+        return false;
+    }
+
+    // never attack friendly
+    if (m_creature->IsFriendlyTo(pWho))
+    {
+        return false;
+    }
+
+    // too far away and no free sight?
+    if (m_creature->IsWithinDistInMap(pWho, MAX_PLAYER_DISTANCE) && m_creature->IsWithinLOSInMap(pWho))
+    {
+        // already fighting someone?
+        if (!m_creature->getVictim())
+        {
+            AttackStart(pWho);
+            return true;
+        }
+        else
+        {
+            pWho->SetInCombatWith(m_creature);
+            m_creature->AddThreat(pWho);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void npc_escortAI::MoveInLineOfSight(Unit* pWho)
+{
+    if (pWho->IsTargetableForAttack() && pWho->isInAccessablePlaceFor(m_creature))
+    {
+        // AssistPlayerInCombat can start attack, so return if true
+        if (HasEscortState(STATE_ESCORT_ESCORTING) && AssistPlayerInCombat(pWho))
+        {
+            return;
+        }
+
+        if (!m_creature->CanInitiateAttack())
+        {
+            return;
+        }
+
+        if (!m_creature->CanFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE)
+        {
+            return;
+        }
+
+        if (m_creature->IsHostileTo(pWho))
+        {
+            float fAttackRadius = m_creature->GetAttackDistance(pWho);
+            if (m_creature->IsWithinDistInMap(pWho, fAttackRadius) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                if (!m_creature->getVictim())
+                {
+                    pWho->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
+                    AttackStart(pWho);
+                }
+                else if (m_creature->GetMap()->IsDungeon())
+                {
+                    pWho->SetInCombatWith(m_creature);
+                    m_creature->AddThreat(pWho);
+                }
+            }
+        }
+    }
+}
+
+void npc_escortAI::JustDied(Unit* /*pKiller*/)
+{
+    if (!HasEscortState(STATE_ESCORT_ESCORTING) || !m_playerGuid || !m_pQuestForEscort)
+    {
+        return;
+    }
+
+    if (Player* pPlayer = GetPlayerForEscort())
+    {
+        if (Group* pGroup = pPlayer->GetGroup())
+        {
+            for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
+            {
+                if (Player* pMember = pRef->getSource())
+                {
+                    if (pMember->GetQuestStatus(m_pQuestForEscort->GetQuestId()) == QUEST_STATUS_INCOMPLETE)
+                    {
+                        pMember->FailQuest(m_pQuestForEscort->GetQuestId());
+                    }
+                }
+            }
+        }
+        else
+        {
+            if (pPlayer->GetQuestStatus(m_pQuestForEscort->GetQuestId()) == QUEST_STATUS_INCOMPLETE)
+            {
+                pPlayer->FailQuest(m_pQuestForEscort->GetQuestId());
+            }
+        }
+    }
+}
+
+void npc_escortAI::JustRespawned()
+{
+    m_uiEscortState = STATE_ESCORT_NONE;
+
+    if (!IsCombatMovement())
+    {
+        SetCombatMovement(true);
+    }
+
+    // add a small delay before going to first waypoint, normal in near all cases
+    m_uiWPWaitTimer = 2500;
+
+    Reset();
+}
+
+void npc_escortAI::EnterEvadeMode()
+{
+    m_creature->RemoveAllAurasOnEvade();
+    m_creature->DeleteThreatList();
+    m_creature->CombatStop(true);
+    m_creature->SetLootRecipient(NULL);
+
+    if (HasEscortState(STATE_ESCORT_ESCORTING))
+    {
+        // We have left our path
+        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE)
+        {
+            debug_log("SD3: EscortAI has left combat and is now returning to CombatStartPosition.");
+
+            AddEscortState(STATE_ESCORT_RETURNING);
+
+            float fPosX, fPosY, fPosZ;
+            m_creature->GetCombatStartPosition(fPosX, fPosY, fPosZ);
+            m_creature->GetMotionMaster()->MovePoint(POINT_LAST_POINT, fPosX, fPosY, fPosZ);
+        }
+    }
+    else
+    {
+        m_creature->GetMotionMaster()->MoveTargetedHome();
+    }
+
+    Reset();
+}
+
+bool npc_escortAI::IsPlayerOrGroupInRange()
+{
+    if (Player* pPlayer = GetPlayerForEscort())
+    {
+        if (Group* pGroup = pPlayer->GetGroup())
+        {
+            for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
+            {
+                Player* pMember = pRef->getSource();
+                if (pMember && m_creature->IsWithinDistInMap(pMember, MAX_PLAYER_DISTANCE))
+                {
+                    return true;
+                }
+            }
+        }
+        else
+        {
+            if (m_creature->IsWithinDistInMap(pPlayer, MAX_PLAYER_DISTANCE))
+            {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+// Returns false, if npc is despawned
+bool npc_escortAI::MoveToNextWaypoint()
+{
+    // Do nothing if escorting is paused
+    if (HasEscortState(STATE_ESCORT_PAUSED))
+    {
+        return true;
+    }
+
+    // Final Waypoint reached (and final wait time waited)
+    if (CurrentWP == WaypointList.end())
+    {
+        debug_log("SD3: EscortAI reached end of waypoints");
+
+        if (m_bCanReturnToStart)
+        {
+            float fRetX, fRetY, fRetZ;
+            m_creature->GetRespawnCoord(fRetX, fRetY, fRetZ);
+
+            m_creature->GetMotionMaster()->MovePoint(POINT_HOME, fRetX, fRetY, fRetZ);
+
+            m_uiWPWaitTimer = 0;
+
+            debug_log("SD3: EscortAI are returning home to spawn location: %u, %f, %f, %f", POINT_HOME, fRetX, fRetY, fRetZ);
+            return true;
+        }
+
+        if (m_bCanInstantRespawn)
+        {
+            m_creature->SetDeathState(JUST_DIED);
+            m_creature->Respawn();
+        }
+        else
+        {
+            m_creature->ForcedDespawn();
+        }
+
+        return false;
+    }
+
+    m_creature->GetMotionMaster()->MovePoint(CurrentWP->uiId, CurrentWP->fX, CurrentWP->fY, CurrentWP->fZ);
+    debug_log("SD3: EscortAI start waypoint %u (%f, %f, %f).", CurrentWP->uiId, CurrentWP->fX, CurrentWP->fY, CurrentWP->fZ);
+
+    WaypointStart(CurrentWP->uiId);
+
+    m_uiWPWaitTimer = 0;
+
+    return true;
+}
+
+void npc_escortAI::UpdateAI(const uint32 uiDiff)
+{
+    // Waypoint Updating
+    if (HasEscortState(STATE_ESCORT_ESCORTING) && !m_creature->getVictim() && m_uiWPWaitTimer && !HasEscortState(STATE_ESCORT_RETURNING))
+    {
+        if (m_uiWPWaitTimer <= uiDiff)
+        {
+            if (!MoveToNextWaypoint())
+            {
+                return;
+            }
+        }
+        else
+        {
+            m_uiWPWaitTimer -= uiDiff;
+        }
+    }
+
+    // Check if player or any member of his group is within range
+    if (HasEscortState(STATE_ESCORT_ESCORTING) && m_playerGuid && !m_creature->getVictim() && !HasEscortState(STATE_ESCORT_RETURNING))
+    {
+        if (m_uiPlayerCheckTimer < uiDiff)
+        {
+            if (!HasEscortState(STATE_ESCORT_PAUSED) && !IsPlayerOrGroupInRange())
+            {
+                debug_log("SD3: EscortAI failed because player/group was to far away or not found");
+
+                if (m_bCanInstantRespawn)
+                {
+                    m_creature->SetDeathState(JUST_DIED);
+                    m_creature->Respawn();
+                }
+                else
+                {
+                    m_creature->ForcedDespawn();
+                }
+
+                return;
+            }
+
+            m_uiPlayerCheckTimer = 1000;
+        }
+        else
+        {
+            m_uiPlayerCheckTimer -= uiDiff;
+        }
+    }
+
+    UpdateEscortAI(uiDiff);
+}
+
+void npc_escortAI::UpdateEscortAI(const uint32 /*uiDiff*/)
+{
+    // Check if we have a current target
+    if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+    {
+        return;
+    }
+
+    DoMeleeAttackIfReady();
+}
+
+void npc_escortAI::MovementInform(uint32 uiMoveType, uint32 uiPointId)
+{
+    if (uiMoveType != POINT_MOTION_TYPE || !HasEscortState(STATE_ESCORT_ESCORTING))
+    {
+        return;
+    }
+
+    // Combat start position reached, continue waypoint movement
+    if (uiPointId == POINT_LAST_POINT)
+    {
+        debug_log("SD3: EscortAI has returned to original position before combat");
+
+        m_creature->SetWalk(!m_bIsRunning);
+        RemoveEscortState(STATE_ESCORT_RETURNING);
+    }
+    else if (uiPointId == POINT_HOME)
+    {
+        debug_log("SD3: EscortAI has returned to original home location and will continue from beginning of waypoint list.");
+
+        CurrentWP = WaypointList.begin();
+        m_uiWPWaitTimer = 0;
+    }
+    else
+    {
+        // Make sure that we are still on the right waypoint
+        if (CurrentWP->uiId != uiPointId)
+        {
+            script_error_log("EscortAI for Npc %u reached waypoint out of order %u, expected %u.", m_creature->GetEntry(), uiPointId, CurrentWP->uiId);
+            return;
+        }
+
+        debug_log("SD3: EscortAI waypoint %u reached.", CurrentWP->uiId);
+
+        // In case we were moving while in combat, we should evade back to this position
+        m_creature->SetCombatStartPosition(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+
+        // Call WP function
+        WaypointReached(CurrentWP->uiId);
+
+        m_uiWPWaitTimer = CurrentWP->uiWaitTime;
+
+        ++CurrentWP;
+    }
+
+    if (!m_uiWPWaitTimer)
+    {
+        // Continue WP Movement if Can
+        if (HasEscortState(STATE_ESCORT_ESCORTING) && !HasEscortState(STATE_ESCORT_PAUSED | STATE_ESCORT_RETURNING) && !m_creature->getVictim())
+        {
+            MoveToNextWaypoint();
+        }
+        else
+        {
+            m_uiWPWaitTimer = 1;
+        }
+    }
+}
+
+/*void npc_escortAI::AddWaypoint(uint32 id, float x, float y, float z, uint32 WaitTimeMs)
+{
+    Escort_Waypoint t(id, x, y, z, WaitTimeMs);
+
+    WaypointList.push_back(t);
+}*/
+
+void npc_escortAI::FillPointMovementListForCreature()
+{
+    std::vector<ScriptPointMove> const& pPointsEntries = pSystemMgr.GetPointMoveList(m_creature->GetEntry());
+
+    if (pPointsEntries.empty())
+    {
+        return;
+    }
+
+    std::vector<ScriptPointMove>::const_iterator itr;
+
+    for (itr = pPointsEntries.begin(); itr != pPointsEntries.end(); ++itr)
+    {
+        Escort_Waypoint pPoint(itr->uiPointId, itr->fX, itr->fY, itr->fZ, itr->uiWaitTime);
+        WaypointList.push_back(pPoint);
+    }
+}
+
+void npc_escortAI::SetCurrentWaypoint(uint32 uiPointId)
+{
+    if (!(HasEscortState(STATE_ESCORT_PAUSED)))             // Only when paused
+    {
+        return;
+    }
+
+    if (uiPointId == CurrentWP->uiId)                       // Already here
+    {
+        return;
+    }
+
+    bool bFoundWaypoint = false;
+    for (std::list<Escort_Waypoint>::iterator itr = WaypointList.begin(); itr != WaypointList.end(); ++itr)
+    {
+        if (itr->uiId == uiPointId)
+        {
+            CurrentWP = itr;                                // Set to found itr
+            bFoundWaypoint = true;
+            break;
+        }
+    }
+
+    if (!bFoundWaypoint)
+    {
+        debug_log("SD3: EscortAI current waypoint tried to set to id %u, but doesn't exist in WaypointList", uiPointId);
+        return;
+    }
+
+    m_uiWPWaitTimer = 1;
+
+    debug_log("SD3: EscortAI current waypoint set to id %u", CurrentWP->uiId);
+}
+
+void npc_escortAI::SetRun(bool bRun)
+{
+    if (bRun)
+    {
+        if (!m_bIsRunning)
+        {
+            m_creature->SetWalk(false);
+        }
+        else
+        {
+            debug_log("SD3: EscortAI attempt to set run mode, but is already running.");
+        }
+    }
+    else
+    {
+        if (m_bIsRunning)
+        {
+            m_creature->SetWalk(true);
+        }
+        else
+        {
+            debug_log("SD3: EscortAI attempt to set walk mode, but is already walking.");
+        }
+    }
+    m_bIsRunning = bRun;
+}
+
+// TODO: get rid of this many variables passed in function.
+void npc_escortAI::Start(bool bRun, const Player* pPlayer, const Quest* pQuest, bool bInstantRespawn, bool bCanLoopPath)
+{
+    if (m_creature->getVictim())
+    {
+        script_error_log("EscortAI attempt to Start while in combat.");
+        return;
+    }
+
+    if (HasEscortState(STATE_ESCORT_ESCORTING))
+    {
+        script_error_log("EscortAI attempt to Start while already escorting.");
+        return;
+    }
+
+    if (!WaypointList.empty())
+    {
+        WaypointList.clear();
+    }
+
+    FillPointMovementListForCreature();
+
+    if (WaypointList.empty())
+    {
+        error_db_log("SD3: EscortAI Start with 0 waypoints (possible missing entry in script_waypoint).");
+        return;
+    }
+
+    // set variables
+    m_bIsRunning = bRun;
+
+    m_playerGuid = pPlayer ? pPlayer->GetObjectGuid() : ObjectGuid();
+    m_pQuestForEscort = pQuest;
+
+    m_bCanInstantRespawn = bInstantRespawn;
+    m_bCanReturnToStart = bCanLoopPath;
+
+    if (m_bCanReturnToStart && m_bCanInstantRespawn)
+    {
+        debug_log("SD3: EscortAI is set to return home after waypoint end and instant respawn at waypoint end. Creature will never despawn.");
+    }
+
+    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
+    {
+        m_creature->GetMotionMaster()->MovementExpired();
+        m_creature->GetMotionMaster()->MoveIdle();
+        debug_log("SD3: EscortAI start with WAYPOINT_MOTION_TYPE, changed to MoveIdle.");
+    }
+
+    // disable npcflags
+    m_creature->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+
+    debug_log("SD3: EscortAI started with " SIZEFMTD " waypoints. Run = %d, PlayerGuid = %s", WaypointList.size(), m_bIsRunning, m_playerGuid.GetString().c_str());
+
+    CurrentWP = WaypointList.begin();
+
+    // Set initial speed
+    m_creature->SetWalk(!m_bIsRunning);
+
+    AddEscortState(STATE_ESCORT_ESCORTING);
+
+    JustStartedEscort();
+}
+
+void npc_escortAI::SetEscortPaused(bool bPaused)
+{
+    if (!HasEscortState(STATE_ESCORT_ESCORTING))
+    {
+        return;
+    }
+
+    if (bPaused)
+    {
+        AddEscortState(STATE_ESCORT_PAUSED);
+    }
+    else
+    {
+        RemoveEscortState(STATE_ESCORT_PAUSED);
+    }
+}
diff --git a/src/modules/SD3/base/escort_ai.h b/src/modules/SD3/base/escort_ai.h
new file mode 100644
index 000000000..3335166c8
--- /dev/null
+++ b/src/modules/SD3/base/escort_ai.h
@@ -0,0 +1,133 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef SC_ESCORTAI_H
+#define SC_ESCORTAI_H
+
+// Remove this include, when EscortAI stores uint32 quest-id instead of Quest*
+#include "ObjectMgr.h"
+
+struct Escort_Waypoint
+{
+    Escort_Waypoint(uint32 uiId, float fX, float fY, float fZ, uint32 uiWaitTime) :
+        uiId(uiId),
+        fX(fX),
+        fY(fY),
+        fZ(fZ),
+        uiWaitTime(uiWaitTime)
+    {}
+
+    uint32 uiId;
+    float  fX;
+    float  fY;
+    float  fZ;
+    uint32 uiWaitTime;
+};
+
+enum EscortState
+{
+    STATE_ESCORT_NONE       = 0x000,                        // nothing in progress
+    STATE_ESCORT_ESCORTING  = 0x001,                        // escort are in progress
+    STATE_ESCORT_RETURNING  = 0x002,                        // escort is returning after being in combat
+    STATE_ESCORT_PAUSED     = 0x004                         // will not proceed with waypoints before state is removed
+};
+
+struct npc_escortAI : public ScriptedAI
+{
+    public:
+        explicit npc_escortAI(Creature* pCreature);
+        ~npc_escortAI() {}
+
+        void GetAIInformation(ChatHandler& reader) override;
+
+        virtual void Aggro(Unit*) override;
+
+        virtual void Reset() override {}
+
+        // CreatureAI functions
+        bool IsVisible(Unit*) const override;
+
+        void AttackStart(Unit*) override;
+
+        void EnterCombat(Unit*) override;
+
+        void MoveInLineOfSight(Unit*) override;
+
+        void JustDied(Unit*) override;
+
+        void JustRespawned() override;
+
+        void EnterEvadeMode() override;
+
+        void UpdateAI(const uint32) override;               // the "internal" update, calls UpdateEscortAI()
+        virtual void UpdateEscortAI(const uint32);          // used when it's needed to add code in update (abilities, scripted events, etc)
+
+        void MovementInform(uint32, uint32) override;
+
+        // EscortAI functions
+        // void AddWaypoint(uint32 id, float x, float y, float z, uint32 WaitTimeMs = 0);
+
+        virtual void WaypointReached(uint32 uiPointId) = 0;
+        virtual void WaypointStart(uint32 /*uiPointId*/) {}
+
+        void Start(bool bRun = false, const Player* pPlayer = NULL, const Quest* pQuest = NULL, bool bInstantRespawn = false, bool bCanLoopPath = false);
+
+        void SetRun(bool bRun = true);
+        void SetEscortPaused(bool uPaused);
+
+        bool HasEscortState(uint32 uiEscortState) { return (m_uiEscortState & uiEscortState); }
+
+        // update current point
+        void SetCurrentWaypoint(uint32 uiPointId);
+
+    protected:
+        Player* GetPlayerForEscort() { return m_creature->GetMap()->GetPlayer(m_playerGuid); }
+        virtual void JustStartedEscort() {}
+
+    private:
+        bool AssistPlayerInCombat(Unit* pWho);
+        bool IsPlayerOrGroupInRange();
+        bool MoveToNextWaypoint();
+        void FillPointMovementListForCreature();
+
+        void AddEscortState(uint32 uiEscortState) { m_uiEscortState |= uiEscortState; }
+        void RemoveEscortState(uint32 uiEscortState) { m_uiEscortState &= ~uiEscortState; }
+
+        ObjectGuid m_playerGuid;
+        uint32 m_uiWPWaitTimer;
+        uint32 m_uiPlayerCheckTimer;
+        uint32 m_uiEscortState;
+
+        const Quest* m_pQuestForEscort;                     // generally passed in Start() when regular escort script.
+
+        std::list<Escort_Waypoint> WaypointList;
+        std::list<Escort_Waypoint>::iterator CurrentWP;
+
+        bool m_bIsRunning;                                  // all creatures are walking by default (has flag SPLINEFLAG_WALKMODE)
+        bool m_bCanInstantRespawn;                          // if creature should respawn instantly after escort over (if not, database respawntime are used)
+        bool m_bCanReturnToStart;                           // if creature can walk same path (loop) without despawn. Not for regular escort quests.
+};
+#endif
diff --git a/src/modules/SD3/base/follower_ai.cpp b/src/modules/SD3/base/follower_ai.cpp
new file mode 100644
index 000000000..0dc514726
--- /dev/null
+++ b/src/modules/SD3/base/follower_ai.cpp
@@ -0,0 +1,458 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: FollowerAI
+SD%Complete: 60
+SDComment: This AI is under development
+SDCategory: Npc
+EndScriptData */
+
+#include "precompiled.h"
+#include "follower_ai.h"
+
+const float MAX_PLAYER_DISTANCE = 100.0f;
+
+enum
+{
+    POINT_COMBAT_START  = 0xFFFFFF
+};
+
+FollowerAI::FollowerAI(Creature* pCreature) : ScriptedAI(pCreature),
+    m_uiUpdateFollowTimer(2500),
+    m_uiFollowState(STATE_FOLLOW_NONE),
+    m_pQuestForFollow(NULL)
+{}
+
+void FollowerAI::AttackStart(Unit* pWho)
+{
+    if (!pWho)
+    {
+        return;
+    }
+
+    if (m_creature->Attack(pWho, true))
+    {
+        m_creature->AddThreat(pWho);
+        m_creature->SetInCombatWith(pWho);
+        pWho->SetInCombatWith(m_creature);
+
+        if (IsCombatMovement())
+        {
+            m_creature->GetMotionMaster()->MoveChase(pWho);
+        }
+    }
+}
+
+// This part provides assistance to a player that are attacked by pWho, even if out of normal aggro range
+// It will cause m_creature to attack pWho that are attacking _any_ player (which has been confirmed may happen also on offi)
+bool FollowerAI::AssistPlayerInCombat(Unit* pWho)
+{
+    if (!pWho->getVictim())
+    {
+        return false;
+    }
+
+    // experimental (unknown) flag not present
+    if (!(m_creature->GetCreatureInfo()->CreatureTypeFlags & CREATURE_TYPEFLAGS_CAN_ASSIST))
+    {
+        return false;
+    }
+
+    // unit state prevents (similar check is done in CanInitiateAttack which also include checking unit_flags. We skip those here)
+    if (m_creature->hasUnitState(UNIT_STAT_STUNNED | UNIT_STAT_DIED))
+    {
+        return false;
+    }
+
+    // victim of pWho is not a player
+    if (!pWho->getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself())
+    {
+        return false;
+    }
+
+    // never attack friendly
+    if (m_creature->IsFriendlyTo(pWho))
+    {
+        return false;
+    }
+
+    // too far away and no free sight?
+    if (m_creature->IsWithinDistInMap(pWho, MAX_PLAYER_DISTANCE) && m_creature->IsWithinLOSInMap(pWho))
+    {
+        // already fighting someone?
+        if (!m_creature->getVictim())
+        {
+            AttackStart(pWho);
+            return true;
+        }
+        else
+        {
+            pWho->SetInCombatWith(m_creature);
+            m_creature->AddThreat(pWho);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void FollowerAI::MoveInLineOfSight(Unit* pWho)
+{
+    if (pWho->IsTargetableForAttack() && pWho->isInAccessablePlaceFor(m_creature))
+    {
+        // AssistPlayerInCombat can start attack, so return if true
+        if (HasFollowState(STATE_FOLLOW_INPROGRESS) && AssistPlayerInCombat(pWho))
+        {
+            return;
+        }
+
+        if (!m_creature->CanInitiateAttack())
+        {
+            return;
+        }
+
+        if (!m_creature->CanFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE)
+        {
+            return;
+        }
+
+        if (m_creature->IsHostileTo(pWho))
+        {
+            float fAttackRadius = m_creature->GetAttackDistance(pWho);
+            if (m_creature->IsWithinDistInMap(pWho, fAttackRadius) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                if (!m_creature->getVictim())
+                {
+                    pWho->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
+                    AttackStart(pWho);
+                }
+                else if (m_creature->GetMap()->IsDungeon())
+                {
+                    pWho->SetInCombatWith(m_creature);
+                    m_creature->AddThreat(pWho);
+                }
+            }
+        }
+    }
+}
+
+void FollowerAI::JustDied(Unit* /*pKiller*/)
+{
+    if (!HasFollowState(STATE_FOLLOW_INPROGRESS) || !m_leaderGuid || !m_pQuestForFollow)
+    {
+        return;
+    }
+
+    // TODO: need a better check for quests with time limit.
+    if (Player* pPlayer = GetLeaderForFollower())
+    {
+        if (Group* pGroup = pPlayer->GetGroup())
+        {
+            for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
+            {
+                if (Player* pMember = pRef->getSource())
+                {
+                    if (pMember->GetQuestStatus(m_pQuestForFollow->GetQuestId()) == QUEST_STATUS_INCOMPLETE)
+                    {
+                        pMember->FailQuest(m_pQuestForFollow->GetQuestId());
+                    }
+                }
+            }
+        }
+        else
+        {
+            if (pPlayer->GetQuestStatus(m_pQuestForFollow->GetQuestId()) == QUEST_STATUS_INCOMPLETE)
+            {
+                pPlayer->FailQuest(m_pQuestForFollow->GetQuestId());
+            }
+        }
+    }
+}
+
+void FollowerAI::JustRespawned()
+{
+    m_uiFollowState = STATE_FOLLOW_NONE;
+
+    if (!IsCombatMovement())
+    {
+        SetCombatMovement(true);
+    }
+
+    Reset();
+}
+
+void FollowerAI::EnterEvadeMode()
+{
+    m_creature->RemoveAllAurasOnEvade();
+    m_creature->DeleteThreatList();
+    m_creature->CombatStop(true);
+    m_creature->SetLootRecipient(NULL);
+
+    if (HasFollowState(STATE_FOLLOW_INPROGRESS))
+    {
+        debug_log("SD3: FollowerAI left combat, returning to CombatStartPosition.");
+
+        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
+        {
+            float fPosX, fPosY, fPosZ;
+            m_creature->GetCombatStartPosition(fPosX, fPosY, fPosZ);
+            m_creature->GetMotionMaster()->MovePoint(POINT_COMBAT_START, fPosX, fPosY, fPosZ);
+        }
+    }
+    else
+    {
+        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
+        {
+            m_creature->GetMotionMaster()->MoveTargetedHome();
+        }
+    }
+
+    Reset();
+}
+
+void FollowerAI::UpdateAI(const uint32 uiDiff)
+{
+    if (HasFollowState(STATE_FOLLOW_INPROGRESS) && !m_creature->getVictim())
+    {
+        if (m_uiUpdateFollowTimer < uiDiff)
+        {
+            if (HasFollowState(STATE_FOLLOW_COMPLETE) && !HasFollowState(STATE_FOLLOW_POSTEVENT))
+            {
+                debug_log("SD3: FollowerAI is set completed, despawns.");
+                m_creature->ForcedDespawn();
+                return;
+            }
+
+            bool bIsMaxRangeExceeded = true;
+
+            if (Player* pPlayer = GetLeaderForFollower())
+            {
+                if (HasFollowState(STATE_FOLLOW_RETURNING))
+                {
+                    debug_log("SD3: FollowerAI is returning to leader.");
+
+                    RemoveFollowState(STATE_FOLLOW_RETURNING);
+                    m_creature->GetMotionMaster()->MoveFollow(pPlayer, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
+                    return;
+                }
+
+                if (Group* pGroup = pPlayer->GetGroup())
+                {
+                    for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
+                    {
+                        Player* pMember = pRef->getSource();
+
+                        if (pMember && m_creature->IsWithinDistInMap(pMember, MAX_PLAYER_DISTANCE))
+                        {
+                            bIsMaxRangeExceeded = false;
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    if (m_creature->IsWithinDistInMap(pPlayer, MAX_PLAYER_DISTANCE))
+                    {
+                        bIsMaxRangeExceeded = false;
+                    }
+                }
+            }
+
+            if (bIsMaxRangeExceeded)
+            {
+                debug_log("SD3: FollowerAI failed because player/group was to far away or not found");
+                m_creature->ForcedDespawn();
+                return;
+            }
+
+            m_uiUpdateFollowTimer = 1000;
+        }
+        else
+        {
+            m_uiUpdateFollowTimer -= uiDiff;
+        }
+    }
+
+    UpdateFollowerAI(uiDiff);
+}
+
+void FollowerAI::UpdateFollowerAI(const uint32 /*uiDiff*/)
+{
+    if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+    {
+        return;
+    }
+
+    DoMeleeAttackIfReady();
+}
+
+void FollowerAI::MovementInform(uint32 uiMotionType, uint32 uiPointId)
+{
+    if (uiMotionType != POINT_MOTION_TYPE || !HasFollowState(STATE_FOLLOW_INPROGRESS))
+    {
+        return;
+    }
+
+    if (uiPointId == POINT_COMBAT_START)
+    {
+        if (GetLeaderForFollower())
+        {
+            if (!HasFollowState(STATE_FOLLOW_PAUSED))
+            {
+                AddFollowState(STATE_FOLLOW_RETURNING);
+            }
+        }
+        else
+        {
+            m_creature->ForcedDespawn();
+        }
+    }
+}
+
+void FollowerAI::StartFollow(Player* pLeader, uint32 uiFactionForFollower, const Quest* pQuest)
+{
+    if (m_creature->getVictim())
+    {
+        debug_log("SD3: FollowerAI attempt to StartFollow while in combat.");
+        return;
+    }
+
+    if (HasFollowState(STATE_FOLLOW_INPROGRESS))
+    {
+        script_error_log("FollowerAI attempt to StartFollow while already following.");
+        return;
+    }
+
+    // set variables
+    m_leaderGuid = pLeader->GetObjectGuid();
+
+    if (uiFactionForFollower)
+    {
+        m_creature->SetFactionTemporary(uiFactionForFollower, TEMPFACTION_RESTORE_RESPAWN);
+    }
+
+    m_pQuestForFollow = pQuest;
+
+    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
+    {
+        m_creature->GetMotionMaster()->Clear();
+        m_creature->GetMotionMaster()->MoveIdle();
+        debug_log("SD3: FollowerAI start with WAYPOINT_MOTION_TYPE, set to MoveIdle.");
+    }
+
+    m_creature->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+
+    AddFollowState(STATE_FOLLOW_INPROGRESS);
+
+    m_creature->GetMotionMaster()->MoveFollow(pLeader, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
+
+    debug_log("SD3: FollowerAI start follow %s (Guid %s)", pLeader->GetName(), m_leaderGuid.GetString().c_str());
+}
+
+Player* FollowerAI::GetLeaderForFollower()
+{
+    if (Player* pLeader = m_creature->GetMap()->GetPlayer(m_leaderGuid))
+    {
+        if (pLeader->IsAlive())
+        {
+            return pLeader;
+        }
+        else
+        {
+            if (Group* pGroup = pLeader->GetGroup())
+            {
+                for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
+                {
+                    Player* pMember = pRef->getSource();
+
+                    if (pMember && pMember->IsAlive() && m_creature->IsWithinDistInMap(pMember, MAX_PLAYER_DISTANCE))
+                    {
+                        debug_log("SD3: FollowerAI GetLeader changed and returned new leader.");
+                        m_leaderGuid = pMember->GetObjectGuid();
+                        return pMember;
+                    }
+                }
+            }
+        }
+    }
+
+    debug_log("SD3: FollowerAI GetLeader can not find suitable leader.");
+    return NULL;
+}
+
+void FollowerAI::SetFollowComplete(bool bWithEndEvent)
+{
+    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == FOLLOW_MOTION_TYPE)
+    {
+        m_creature->StopMoving();
+        m_creature->GetMotionMaster()->Clear();
+        m_creature->GetMotionMaster()->MoveIdle();
+    }
+
+    if (bWithEndEvent)
+    {
+        AddFollowState(STATE_FOLLOW_POSTEVENT);
+    }
+    else
+    {
+        if (HasFollowState(STATE_FOLLOW_POSTEVENT))
+        {
+            RemoveFollowState(STATE_FOLLOW_POSTEVENT);
+        }
+    }
+
+    AddFollowState(STATE_FOLLOW_COMPLETE);
+}
+
+void FollowerAI::SetFollowPaused(bool bPaused)
+{
+    if (!HasFollowState(STATE_FOLLOW_INPROGRESS) || HasFollowState(STATE_FOLLOW_COMPLETE))
+    {
+        return;
+    }
+
+    if (bPaused)
+    {
+        AddFollowState(STATE_FOLLOW_PAUSED);
+
+        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == FOLLOW_MOTION_TYPE)
+        {
+            m_creature->StopMoving();
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MoveIdle();
+        }
+    }
+    else
+    {
+        RemoveFollowState(STATE_FOLLOW_PAUSED);
+
+        if (Player* pLeader = GetLeaderForFollower())
+        {
+            m_creature->GetMotionMaster()->MoveFollow(pLeader, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
+        }
+    }
+}
diff --git a/src/modules/SD3/base/follower_ai.h b/src/modules/SD3/base/follower_ai.h
new file mode 100644
index 000000000..db1617415
--- /dev/null
+++ b/src/modules/SD3/base/follower_ai.h
@@ -0,0 +1,87 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef SC_FOLLOWERAI_H
+#define SC_FOLLOWERAI_H
+
+enum FollowState
+{
+    STATE_FOLLOW_NONE       = 0x000,
+    STATE_FOLLOW_INPROGRESS = 0x001,                        // must always have this state for any follow
+    STATE_FOLLOW_RETURNING  = 0x002,                        // when returning to combat start after being in combat
+    STATE_FOLLOW_PAUSED     = 0x004,                        // disables following
+    STATE_FOLLOW_COMPLETE   = 0x008,                        // follow is completed and may end
+    STATE_FOLLOW_PREEVENT   = 0x010,                        // not implemented (allow pre event to run, before follow is initiated)
+    STATE_FOLLOW_POSTEVENT  = 0x020                         // can be set at complete and allow post event to run
+};
+
+class FollowerAI : public ScriptedAI
+{
+    public:
+        explicit FollowerAI(Creature* pCreature);
+        ~FollowerAI() {}
+
+        // virtual void WaypointReached(uint32 uiPointId) = 0;
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override;
+
+        void AttackStart(Unit*) override;
+
+        void MoveInLineOfSight(Unit*) override;
+
+        void EnterEvadeMode() override;
+
+        void JustDied(Unit*) override;
+
+        void JustRespawned() override;
+
+        void UpdateAI(const uint32) override;               // the "internal" update, calls UpdateFollowerAI()
+        virtual void UpdateFollowerAI(const uint32);        // used when it's needed to add code in update (abilities, scripted events, etc)
+
+        void StartFollow(Player* pPlayer, uint32 uiFactionForFollower = 0, const Quest* pQuest = NULL);
+
+        void SetFollowPaused(bool bPaused);                 // if special event require follow mode to hold/resume during the follow
+        void SetFollowComplete(bool bWithEndEvent = false);
+
+        bool HasFollowState(uint32 uiFollowState) { return (m_uiFollowState & uiFollowState); }
+
+    protected:
+        Player* GetLeaderForFollower();
+
+    private:
+        void AddFollowState(uint32 uiFollowState) { m_uiFollowState |= uiFollowState; }
+        void RemoveFollowState(uint32 uiFollowState) { m_uiFollowState &= ~uiFollowState; }
+
+        bool AssistPlayerInCombat(Unit* pWho);
+
+        ObjectGuid m_leaderGuid;
+        uint32 m_uiUpdateFollowTimer;
+        uint32 m_uiFollowState;
+
+        const Quest* m_pQuestForFollow;                     // normally we have a quest
+};
+
+#endif
diff --git a/src/modules/SD3/base/guard_ai.cpp b/src/modules/SD3/base/guard_ai.cpp
new file mode 100644
index 000000000..67e7ff097
--- /dev/null
+++ b/src/modules/SD3/base/guard_ai.cpp
@@ -0,0 +1,275 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Guard_AI
+SD%Complete: 90
+SDComment:
+SDCategory: Guards
+EndScriptData */
+
+#include "precompiled.h"
+#include "guard_ai.h"
+
+// This script is for use within every single guard to save coding time
+
+guardAI::guardAI(Creature* pCreature) : ScriptedAI(pCreature),
+    m_uiGlobalCooldown(0),
+    m_uiBuffTimer(0)
+{}
+
+void guardAI::Reset()
+{
+    m_uiGlobalCooldown = 0;
+    m_uiBuffTimer = 0;                                      // Rebuff as soon as we can
+}
+
+void guardAI::Aggro(Unit* pWho)
+{
+    if (m_creature->GetEntry() == NPC_CENARION_INFANTRY)
+    {
+        switch (urand(0, 2))
+        {
+            case 0:
+                DoScriptText(SAY_GUARD_SIL_AGGRO1, m_creature, pWho);
+                break;
+            case 1:
+                DoScriptText(SAY_GUARD_SIL_AGGRO2, m_creature, pWho);
+                break;
+            case 2:
+                DoScriptText(SAY_GUARD_SIL_AGGRO3, m_creature, pWho);
+                break;
+        }
+    }
+
+    if (const SpellEntry* pSpellInfo = m_creature->ReachWithSpellAttack(pWho))
+    {
+        DoCastSpell(pWho, pSpellInfo);
+    }
+}
+
+void guardAI::JustDied(Unit* pKiller)
+{
+    // Send Zone Under Attack message to the LocalDefense and WorldDefense Channels
+    if (Player* pPlayer = pKiller->GetCharmerOrOwnerPlayerOrPlayerItself())
+    {
+        m_creature->SendZoneUnderAttackMessage(pPlayer);
+    }
+}
+
+void guardAI::UpdateAI(const uint32 uiDiff)
+{
+    // Always decrease our global cooldown first
+    if (m_uiGlobalCooldown > uiDiff)
+    {
+        m_uiGlobalCooldown -= uiDiff;
+    }
+    else
+    {
+        m_uiGlobalCooldown = 0;
+    }
+
+    // Buff timer (only buff when we are alive and not in combat
+    if (m_creature->IsAlive() && !m_creature->IsInCombat())
+    {
+        if (m_uiBuffTimer < uiDiff)
+        {
+            // Find a spell that targets friendly and applies an aura (these are generally buffs)
+            const SpellEntry* pSpellInfo = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_AURA);
+
+            if (pSpellInfo && !m_uiGlobalCooldown)
+            {
+                // Cast the buff spell
+                DoCastSpell(m_creature, pSpellInfo);
+
+                // Set our global cooldown
+                m_uiGlobalCooldown = GENERIC_CREATURE_COOLDOWN;
+
+                // Set our timer to 10 minutes before rebuff
+                m_uiBuffTimer = 600000;
+            }                                               // Try again in 30 seconds
+            else
+            {
+                m_uiBuffTimer = 30000;
+            }
+        }
+        else
+        {
+            m_uiBuffTimer -= uiDiff;
+        }
+    }
+
+    // Return since we have no target
+    if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+    {
+        return;
+    }
+
+    // Make sure our attack is ready and we arn't currently casting
+    if (m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
+    {
+        // If we are within range melee the target
+        if (m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+        {
+            bool bHealing = false;
+            const SpellEntry* pSpellInfo = NULL;
+
+            // Select a healing spell if less than 30% hp
+            if (m_creature->GetHealthPercent() < 30.0f)
+            {
+                pSpellInfo = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING);
+            }
+
+            // No healing spell available, select a hostile spell
+            if (pSpellInfo)
+            {
+                bHealing = true;
+            }
+            else
+            {
+                pSpellInfo = SelectSpell(m_creature->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE);
+            }
+
+            // 20% chance to replace our white hit with a spell
+            if (pSpellInfo && !urand(0, 4) && !m_uiGlobalCooldown)
+            {
+                // Cast the spell
+                if (bHealing)
+                {
+                    DoCastSpell(m_creature, pSpellInfo);
+                }
+                else
+                {
+                    DoCastSpell(m_creature->getVictim(), pSpellInfo);
+                }
+
+                // Set our global cooldown
+                m_uiGlobalCooldown = GENERIC_CREATURE_COOLDOWN;
+            }
+            else
+            {
+                m_creature->AttackerStateUpdate(m_creature->getVictim());
+            }
+
+            m_creature->resetAttackTimer();
+        }
+    }
+    else
+    {
+        // Only run this code if we arn't already casting
+        if (!m_creature->IsNonMeleeSpellCasted(false))
+        {
+            bool bHealing = false;
+            const SpellEntry* pSpellInfo = NULL;
+
+            // Select a healing spell if less than 30% hp ONLY 33% of the time
+            if (m_creature->GetHealthPercent() < 30.0f && !urand(0, 2))
+            {
+                pSpellInfo = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING);
+            }
+
+            // No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DISTANCE)
+            if (pSpellInfo)
+            {
+                bHealing = true;
+            }
+            else
+            {
+                pSpellInfo = SelectSpell(m_creature->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, ATTACK_DISTANCE, 0, SELECT_EFFECT_DONTCARE);
+            }
+
+            // Found a spell, check if we arn't on cooldown
+            if (pSpellInfo && !m_uiGlobalCooldown)
+            {
+                // If we are currently moving stop us and set the movement generator
+                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != IDLE_MOTION_TYPE)
+                {
+                    m_creature->GetMotionMaster()->Clear(false);
+                    m_creature->GetMotionMaster()->MoveIdle();
+                }
+
+                // Cast spell
+                if (bHealing)
+                {
+                    DoCastSpell(m_creature, pSpellInfo);
+                }
+                else
+                {
+                    DoCastSpell(m_creature->getVictim(), pSpellInfo);
+                }
+
+                // Set our global cooldown
+                m_uiGlobalCooldown = GENERIC_CREATURE_COOLDOWN;
+            }                                               // If no spells available and we arn't moving run to target
+            else if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
+            {
+                // Cancel our current spell and then mutate new movement generator
+                m_creature->InterruptNonMeleeSpells(false);
+                m_creature->GetMotionMaster()->Clear(false);
+                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+            }
+        }
+    }
+}
+
+void guardAI::DoReplyToTextEmote(uint32 uiTextEmote)
+{
+    switch (uiTextEmote)
+    {
+        case TEXTEMOTE_KISS:
+            m_creature->HandleEmote(EMOTE_ONESHOT_BOW);
+            break;
+        case TEXTEMOTE_WAVE:
+            m_creature->HandleEmote(EMOTE_ONESHOT_WAVE);
+            break;
+        case TEXTEMOTE_SALUTE:
+            m_creature->HandleEmote(EMOTE_ONESHOT_SALUTE);
+            break;
+        case TEXTEMOTE_SHY:
+            m_creature->HandleEmote(EMOTE_ONESHOT_FLEX);
+            break;
+        case TEXTEMOTE_RUDE:
+        case TEXTEMOTE_CHICKEN:
+            m_creature->HandleEmote(EMOTE_ONESHOT_POINT);
+            break;
+    }
+}
+
+void guardAI_orgrimmar::ReceiveEmote(Player* pPlayer, uint32 uiTextEmote)
+{
+    if (pPlayer->GetTeam() == HORDE)
+    {
+        DoReplyToTextEmote(uiTextEmote);
+    }
+}
+
+void guardAI_stormwind::ReceiveEmote(Player* pPlayer, uint32 uiTextEmote)
+{
+    if (pPlayer->GetTeam() == ALLIANCE)
+    {
+        DoReplyToTextEmote(uiTextEmote);
+    }
+}
diff --git a/src/modules/SD3/base/guard_ai.h b/src/modules/SD3/base/guard_ai.h
new file mode 100644
index 000000000..9eb5bbb8e
--- /dev/null
+++ b/src/modules/SD3/base/guard_ai.h
@@ -0,0 +1,84 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef SC_GUARDAI_H
+#define SC_GUARDAI_H
+
+enum
+{
+    GENERIC_CREATURE_COOLDOWN       = 5000,
+
+    SAY_GUARD_SIL_AGGRO1            = -1000198,
+    SAY_GUARD_SIL_AGGRO2            = -1000199,
+    SAY_GUARD_SIL_AGGRO3            = -1000200,
+
+    NPC_CENARION_INFANTRY           = 15184
+};
+
+enum eShattrathGuard
+{
+    SPELL_BANISHED_SHATTRATH_A      = 36642,
+    SPELL_BANISHED_SHATTRATH_S      = 36671,
+    SPELL_BANISH_TELEPORT           = 36643,
+    SPELL_EXILE                     = 39533
+};
+
+struct guardAI : public ScriptedAI
+{
+    public:
+        explicit guardAI(Creature* pCreature);
+        ~guardAI() {}
+
+        uint32 m_uiGlobalCooldown;                          // This variable acts like the global cooldown that players have (1.5 seconds)
+        uint32 m_uiBuffTimer;                               // This variable keeps track of buffs
+
+        void Reset() override;
+
+        void Aggro(Unit* pWho) override;
+
+        void JustDied(Unit* /*pKiller*/) override;
+
+        void UpdateAI(const uint32 uiDiff) override;
+
+        // Commonly used for guards in main cities
+        void DoReplyToTextEmote(uint32 uiTextEmote);
+};
+
+struct guardAI_orgrimmar : public guardAI
+{
+    guardAI_orgrimmar(Creature* pCreature) : guardAI(pCreature) {}
+
+    void ReceiveEmote(Player* pPlayer, uint32 uiTextEmote) override;
+};
+
+struct guardAI_stormwind : public guardAI
+{
+    guardAI_stormwind(Creature* pCreature) : guardAI(pCreature) {}
+
+    void ReceiveEmote(Player* pPlayer, uint32 uiTextEmote) override;
+};
+
+#endif
diff --git a/src/modules/SD3/base/pet_ai.cpp b/src/modules/SD3/base/pet_ai.cpp
new file mode 100644
index 000000000..6db6dec65
--- /dev/null
+++ b/src/modules/SD3/base/pet_ai.cpp
@@ -0,0 +1,172 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: ScriptedPetAI
+SD%Complete: 50
+SDComment: Intended to be used with Guardian/Protector/Minipets. Little/no control over when pet enter/leave combat. Must be considered to be under development.
+SDCategory: Npc
+EndScriptData */
+
+#include "precompiled.h"
+#include "pet_ai.h"
+
+ScriptedPetAI::ScriptedPetAI(Creature* pCreature) : CreatureAI(pCreature)
+{}
+
+bool ScriptedPetAI::IsVisible(Unit* pWho) const
+{
+    return pWho && m_creature->IsWithinDist(pWho, VISIBLE_RANGE)
+           && pWho->IsVisibleForOrDetect(m_creature, m_creature, true);
+}
+
+void ScriptedPetAI::MoveInLineOfSight(Unit* pWho)
+{
+    if (m_creature->getVictim())
+    {
+        return;
+    }
+
+    if (!m_creature->GetCharmInfo() || !m_creature->GetCharmInfo()->HasReactState(REACT_AGGRESSIVE))
+    {
+        return;
+    }
+
+    if (m_creature->CanInitiateAttack() && pWho->IsTargetableForAttack() &&
+        m_creature->IsHostileTo(pWho) && pWho->isInAccessablePlaceFor(m_creature))
+    {
+        if (!m_creature->CanFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE)
+        {
+            return;
+        }
+
+        if (m_creature->IsWithinDistInMap(pWho, m_creature->GetAttackDistance(pWho)) && m_creature->IsWithinLOSInMap(pWho))
+        {
+            pWho->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
+            AttackStart(pWho);
+        }
+    }
+}
+
+void ScriptedPetAI::AttackStart(Unit* pWho)
+{
+    if (pWho && m_creature->Attack(pWho, true))
+    {
+        m_creature->GetMotionMaster()->MoveChase(pWho);
+    }
+}
+
+void ScriptedPetAI::AttackedBy(Unit* pAttacker)
+{
+    if (m_creature->getVictim())
+    {
+        return;
+    }
+
+    if (m_creature->GetCharmInfo() && !m_creature->GetCharmInfo()->HasReactState(REACT_PASSIVE) &&
+        m_creature->CanReachWithMeleeAttack(pAttacker))
+    {
+        AttackStart(pAttacker);
+    }
+}
+
+void ScriptedPetAI::ResetPetCombat()
+{
+    Unit* pOwner = m_creature->GetCharmerOrOwner();
+
+    if (pOwner && m_creature->GetCharmInfo() && m_creature->GetCharmInfo()->HasCommandState(COMMAND_FOLLOW))
+    {
+        m_creature->GetMotionMaster()->MoveFollow(pOwner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
+    }
+    else
+    {
+        m_creature->GetMotionMaster()->Clear(false);
+        m_creature->GetMotionMaster()->MoveIdle();
+    }
+
+    m_creature->AttackStop();
+
+    debug_log("SD3: ScriptedPetAI reset pet combat and stop attack.");
+    Reset();
+}
+
+void ScriptedPetAI::UpdatePetAI(const uint32 /*uiDiff*/)
+{
+    DoMeleeAttackIfReady();
+}
+
+void ScriptedPetAI::UpdateAI(const uint32 uiDiff)
+{
+    if (!m_creature->IsAlive())                             // should not be needed, IsAlive is checked in mangos before calling UpdateAI
+    {
+        return;
+    }
+
+    // UpdateAllies() is done in the generic PetAI in Mangos, but we can't do this from script side.
+    // Unclear what side effects this has, but is something to be resolved from Mangos.
+
+    if (m_creature->getVictim())                            // in combat
+    {
+        if (!m_creature->getVictim()->IsTargetableForAttack())
+        {
+            // target no longer valid for pet, so either attack stops or new target are selected
+            // doesn't normally reach this, because of how petAi is designed in Mangos. CombatStop
+            // are called before this update diff, and then pet will already have no victim.
+            ResetPetCombat();
+            return;
+        }
+
+        // update when in combat
+        UpdatePetAI(uiDiff);
+    }
+    else if (m_creature->GetCharmInfo())
+    {
+        Unit* pOwner = m_creature->GetCharmerOrOwner();
+
+        if (!pOwner)
+        {
+            return;
+        }
+
+        if (pOwner->IsInCombat() && !m_creature->GetCharmInfo()->HasReactState(REACT_PASSIVE))
+        {
+            // Not correct in all cases.
+            // When mob initiate attack by spell, pet should not start attack before spell landed.
+            AttackStart(pOwner->getAttackerForHelper());
+        }
+        else if (m_creature->GetCharmInfo()->HasCommandState(COMMAND_FOLLOW))
+        {
+            // not following, so start follow
+            if (!m_creature->hasUnitState(UNIT_STAT_FOLLOW))
+            {
+                m_creature->GetMotionMaster()->MoveFollow(pOwner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
+            }
+
+            // update when not in combat
+            UpdatePetOOCAI(uiDiff);
+        }
+    }
+}
diff --git a/src/modules/SD3/base/pet_ai.h b/src/modules/SD3/base/pet_ai.h
new file mode 100644
index 000000000..0844c3226
--- /dev/null
+++ b/src/modules/SD3/base/pet_ai.h
@@ -0,0 +1,61 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef SC_PET_H
+#define SC_PET_H
+
+// Using CreatureAI for now. Might change later and use PetAI (need to export for dll first)
+class ScriptedPetAI : public CreatureAI
+{
+    public:
+        explicit ScriptedPetAI(Creature* pCreature);
+        ~ScriptedPetAI() {}
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override;
+
+        void AttackStart(Unit* /*pWho*/) override;
+
+        void AttackedBy(Unit* /*pAttacker*/) override;
+
+        bool IsVisible(Unit* /*pWho*/) const override;
+
+        void KilledUnit(Unit* /*pVictim*/) override {}
+
+        void OwnerKilledUnit(Unit* /*pVictim*/) override {}
+
+        void UpdateAI(const uint32 uiDiff) override;
+
+        virtual void Reset() {}
+
+        virtual void UpdatePetAI(const uint32 uiDiff);      // while in combat
+
+        virtual void UpdatePetOOCAI(const uint32 /*uiDiff*/) {} // when not in combat
+
+    protected:
+        void ResetPetCombat();
+};
+
+#endif
diff --git a/src/modules/SD3/include/precompiled.cpp b/src/modules/SD3/include/precompiled.cpp
new file mode 100644
index 000000000..f43b4f1d3
--- /dev/null
+++ b/src/modules/SD3/include/precompiled.cpp
@@ -0,0 +1,26 @@
+/**
+ * ScriptDev2 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#include "precompiled.h"
diff --git a/src/modules/SD3/include/precompiled.h b/src/modules/SD3/include/precompiled.h
new file mode 100644
index 000000000..bdf68e2ee
--- /dev/null
+++ b/src/modules/SD3/include/precompiled.h
@@ -0,0 +1,42 @@
+/**
+ * ScriptDev2 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef SC_PRECOMPILED_H
+#define SC_PRECOMPILED_H
+
+#include "ScriptMgr.h"
+#include "Object.h"
+#include "Unit.h"
+#include "Creature.h"
+#include "CreatureAI.h"
+#include "GameObject.h"
+#include "sc_creature.h"
+#include "sc_gossip.h"
+#include "sc_grid_searchers.h"
+#include "sc_instance.h"
+#include "SpellAuras.h"
+
+
+#endif
diff --git a/src/modules/SD3/include/sc_creature.cpp b/src/modules/SD3/include/sc_creature.cpp
new file mode 100644
index 000000000..b15f5c76b
--- /dev/null
+++ b/src/modules/SD3/include/sc_creature.cpp
@@ -0,0 +1,836 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#include "precompiled.h"
+#include "Item.h"
+#include "Spell.h"
+#include "WorldPacket.h"
+#include "ObjectMgr.h"
+#include "Cell.h"
+#include "CellImpl.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+
+// Spell summary for ScriptedAI::SelectSpell
+struct TSpellSummary
+{
+    uint8 Targets;                                          // set of enum SelectTarget
+    uint8 Effects;                                          // set of enum SelectEffect
+}* SpellSummary;
+
+ScriptedAI::ScriptedAI(Creature* pCreature) : CreatureAI(pCreature),
+    m_uiEvadeCheckCooldown(2500)
+{}
+
+/// This function shows if combat movement is enabled, overwrite for more info
+void ScriptedAI::GetAIInformation(ChatHandler& reader)
+{
+    reader.PSendSysMessage("ScriptedAI, combat movement is %s", reader.GetOnOffStr(IsCombatMovement()));
+}
+
+/// Return if the creature can "see" pWho
+bool ScriptedAI::IsVisible(Unit* pWho) const
+{
+    if (!pWho)
+    {
+        return false;
+    }
+
+    return m_creature->IsWithinDist(pWho, VISIBLE_RANGE) && pWho->IsVisibleForOrDetect(m_creature, m_creature, true);
+}
+
+/**
+ * This function triggers the creature attacking pWho, depending on conditions like:
+ * - Can the creature start an attack?
+ * - Is pWho hostile to the creature?
+ * - Can the creature reach pWho?
+ * - Is pWho in aggro-range?
+ * If the creature can attack pWho, it will if it has no victim.
+ * Inside dungeons, the creature will get into combat with pWho, even if it has already a victim
+ */
+void ScriptedAI::MoveInLineOfSight(Unit* pWho)
+{
+    if (m_creature->CanInitiateAttack() && pWho->IsTargetableForAttack() &&
+        m_creature->IsHostileTo(pWho) && pWho->isInAccessablePlaceFor(m_creature))
+    {
+        if (!m_creature->CanFly() && m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE)
+        {
+            return;
+        }
+
+        if (m_creature->IsWithinDistInMap(pWho, m_creature->GetAttackDistance(pWho)) && m_creature->IsWithinLOSInMap(pWho))
+        {
+            if (!m_creature->getVictim())
+            {
+                pWho->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
+                AttackStart(pWho);
+            }
+            else if (m_creature->GetMap()->IsDungeon())
+            {
+                pWho->SetInCombatWith(m_creature);
+                m_creature->AddThreat(pWho);
+            }
+        }
+    }
+}
+
+/**
+ * This function sets the TargetGuid for the creature if required
+ * Also it will handle the combat movement (chase movement), depending on SetCombatMovement(bool)
+ */
+void ScriptedAI::AttackStart(Unit* pWho)
+{
+#if defined (WOTLK) || defined (CATA)
+    if (!m_creature->CanInitiateAttack())
+        return;
+#endif
+    if (pWho && m_creature->Attack(pWho, true))             // The Attack function also uses basic checks if pWho can be attacked
+    {
+        m_creature->AddThreat(pWho);
+        m_creature->SetInCombatWith(pWho);
+        pWho->SetInCombatWith(m_creature);
+
+        HandleMovementOnAttackStart(pWho);
+    }
+}
+
+/**
+ * This function only calls Aggro, which is to be used for scripting purposes
+ */
+void ScriptedAI::EnterCombat(Unit* pEnemy)
+{
+    if (pEnemy)
+    {
+        Aggro(pEnemy);
+    }
+}
+
+/**
+ * Main update function, by default let the creature behave as expected by a mob (threat management and melee dmg)
+ * Always handle here threat-management with m_creature->SelectHostileTarget()
+ * Handle (if required) melee attack with DoMeleeAttackIfReady()
+ * This is usally overwritten to support timers for ie spells
+ */
+void ScriptedAI::UpdateAI(const uint32 /*uiDiff*/)
+{
+    // Check if we have a current target
+    if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+    {
+        return;
+    }
+
+    DoMeleeAttackIfReady();
+    
+#if defined (WOTLK) || defined (CATA)
+    Unit* victim = m_creature->getVictim();
+        
+    const SpellEntry* potentialSpell = m_creature->ReachWithSpellAttack(victim);
+    if (potentialSpell)
+        m_creature->CastSpell(victim, potentialSpell->Id, true);
+#endif
+}
+
+/**
+ * This function cleans up the combat state if the creature evades
+ * It will:
+ * - Drop Auras
+ * - Drop all threat
+ * - Stop combat
+ * - Move the creature home
+ * - Clear tagging for loot
+ * - call Reset()
+ */
+void ScriptedAI::EnterEvadeMode()
+{
+    m_creature->RemoveAllAurasOnEvade();
+    m_creature->DeleteThreatList();
+    m_creature->CombatStop(true);
+
+    if (m_creature->IsAlive())
+    {
+        m_creature->GetMotionMaster()->MoveTargetedHome();
+    }
+
+    m_creature->SetLootRecipient(NULL);
+
+    Reset();
+}
+
+/// This function calls Reset() to reset variables as expected
+void ScriptedAI::JustRespawned()
+{
+    Reset();
+}
+
+void ScriptedAI::DoStartMovement(Unit* pVictim, float fDistance, float fAngle)
+{
+    if (pVictim)
+    {
+        m_creature->GetMotionMaster()->MoveChase(pVictim, fDistance, fAngle);
+    }
+}
+
+void ScriptedAI::DoStartNoMovement(Unit* pVictim)
+{
+    if (!pVictim)
+    {
+        return;
+    }
+
+    m_creature->GetMotionMaster()->MoveIdle();
+    m_creature->StopMoving();
+}
+
+void ScriptedAI::DoStopAttack()
+{
+    if (m_creature->getVictim())
+    {
+        m_creature->AttackStop();
+    }
+}
+
+void ScriptedAI::DoCast(Unit* pTarget, uint32 uiSpellId, bool bTriggered)
+{
+    if (m_creature->IsNonMeleeSpellCasted(false) && !bTriggered)
+    {
+        return;
+    }
+
+    m_creature->CastSpell(pTarget, uiSpellId, bTriggered);
+}
+
+void ScriptedAI::DoCastSpell(Unit* pTarget, SpellEntry const* pSpellInfo, bool bTriggered)
+{
+    if (m_creature->IsNonMeleeSpellCasted(false) && !bTriggered)
+    {
+        return;
+    }
+
+    m_creature->CastSpell(pTarget, pSpellInfo, bTriggered);
+}
+
+void ScriptedAI::DoPlaySoundToSet(WorldObject* pSource, uint32 uiSoundId)
+{
+    if (!pSource)
+    {
+        return;
+    }
+
+    if (!GetSoundEntriesStore()->LookupEntry(uiSoundId))
+    {
+        script_error_log("Invalid soundId %u used in DoPlaySoundToSet (Source: TypeId %u, GUID %u)", uiSoundId, pSource->GetTypeId(), pSource->GetGUIDLow());
+        return;
+    }
+
+    pSource->PlayDirectSound(uiSoundId);
+}
+
+Creature* ScriptedAI::DoSpawnCreature(uint32 uiId, float fX, float fY, float fZ, float fAngle, uint32 uiType, uint32 uiDespawntime)
+{
+    return m_creature->SummonCreature(uiId, m_creature->GetPositionX() + fX, m_creature->GetPositionY() + fY, m_creature->GetPositionZ() + fZ, fAngle, (TempSummonType)uiType, uiDespawntime);
+}
+
+SpellEntry const* ScriptedAI::SelectSpell(Unit* pTarget, int32 uiSchool, int32 iMechanic, SelectTarget selectTargets, uint32 uiPowerCostMin, uint32 uiPowerCostMax, float fRangeMin, float fRangeMax, SelectEffect selectEffects)
+{
+    // No target so we can't cast
+    if (!pTarget)
+    {
+        return NULL;
+    }
+
+    // Silenced so we can't cast
+    if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED))
+    {
+        return NULL;
+    }
+
+    // Using the extended script system we first create a list of viable spells
+    SpellEntry const* apSpell[4];
+    memset(apSpell, 0, sizeof(SpellEntry*) * 4);
+
+    uint32 uiSpellCount = 0;
+
+    SpellEntry const* pTempSpell;
+    SpellRangeEntry const* pTempRange;
+
+    // Check if each spell is viable(set it to null if not)
+    for (uint8 i = 0; i < 4; ++i)
+    {
+        pTempSpell = GetSpellStore()->LookupEntry(m_creature->m_spells[i]);
+
+        // This spell doesn't exist
+        if (!pTempSpell)
+        {
+            continue;
+        }
+
+        // Targets and Effects checked first as most used restrictions
+        // Check the spell targets if specified
+        if (selectTargets && !(SpellSummary[m_creature->m_spells[i]].Targets & (1 << (selectTargets - 1))))
+        {
+            continue;
+        }
+
+        // Check the type of spell if we are looking for a specific spell type
+        if (selectEffects && !(SpellSummary[m_creature->m_spells[i]].Effects & (1 << (selectEffects - 1))))
+        {
+            continue;
+        }
+
+        // Check for school if specified
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+        if (uiSchool >= 0 && pTempSpell->SchoolMask & uiSchool)
+        { continue; }
+#endif
+
+        // Check for spell mechanic if specified
+#if defined (CATA)
+        if (iMechanic >= 0 && pTempSpell->GetMechanic() != (uint32)iMechanic)
+#else
+        if (iMechanic >= 0 && pTempSpell->Mechanic != (uint32)iMechanic)
+#endif
+        {
+            continue;
+        }
+
+        // Make sure that the spell uses the requested amount of power
+#if defined (CATA)
+        if (uiPowerCostMin &&  pTempSpell->GetManaCost() < uiPowerCostMin)
+#else
+        if (uiPowerCostMin &&  pTempSpell->manaCost < uiPowerCostMin)
+#endif
+        {
+            continue;
+        }
+
+#if defined (CATA)
+        if (uiPowerCostMax && pTempSpell->GetManaCost() > uiPowerCostMax)
+#else
+        if (uiPowerCostMax && pTempSpell->manaCost > uiPowerCostMax)
+#endif
+        {
+            continue;
+        }
+
+        // Continue if we don't have the mana to actually cast this spell
+#if defined (CATA)
+        if (pTempSpell->GetManaCost() > m_creature->GetPower((Powers)pTempSpell->powerType))
+#else
+        if (pTempSpell->manaCost > m_creature->GetPower((Powers)pTempSpell->powerType))
+#endif
+
+        {
+            continue;
+        }
+
+        // Get the Range
+        pTempRange = GetSpellRangeStore()->LookupEntry(pTempSpell->rangeIndex);
+
+        // Spell has invalid range store so we can't use it
+        if (!pTempRange)
+        {
+            continue;
+        }
+
+        // Check if the spell meets our range requirements
+        if (fRangeMin && pTempRange->maxRange < fRangeMin)
+        {
+            continue;
+        }
+
+        if (fRangeMax && pTempRange->maxRange > fRangeMax)
+        {
+            continue;
+        }
+
+        // Check if our target is in range
+        if (m_creature->IsWithinDistInMap(pTarget, pTempRange->minRange) || !m_creature->IsWithinDistInMap(pTarget, pTempRange->maxRange))
+        {
+            continue;
+        }
+
+        // All good so lets add it to the spell list
+        apSpell[uiSpellCount] = pTempSpell;
+        ++uiSpellCount;
+    }
+
+    // We got our usable spells so now lets randomly pick one
+    if (!uiSpellCount)
+    {
+        return NULL;
+    }
+
+    return apSpell[urand(0, uiSpellCount - 1)];
+}
+
+bool ScriptedAI::CanCast(Unit* pTarget, SpellEntry const* pSpellEntry, bool bTriggered)
+{
+    // No target so we can't cast
+    if (!pTarget || !pSpellEntry)
+    {
+        return false;
+    }
+
+    // Silenced so we can't cast
+    if (!bTriggered && m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED))
+    {
+        return false;
+    }
+
+    // Check for power
+#if defined (CATA)
+    if (!bTriggered && m_creature->GetPower((Powers)pSpellEntry->powerType) < pSpellEntry->GetManaCost())
+#else
+    if (!bTriggered && m_creature->GetPower((Powers)pSpellEntry->powerType) < pSpellEntry->manaCost)
+#endif
+    {
+        return false;
+    }
+
+    SpellRangeEntry const* pTempRange = GetSpellRangeStore()->LookupEntry(pSpellEntry->rangeIndex);
+
+    // Spell has invalid range store so we can't use it
+    if (!pTempRange)
+    {
+        return false;
+    }
+
+    // Unit is out of range of this spell
+    if (!m_creature->IsInRange(pTarget, pTempRange->minRange, pTempRange->maxRange))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+void FillSpellSummary()
+{
+    SpellSummary = new TSpellSummary[GetSpellStore()->GetNumRows()];
+
+    SpellEntry const* pTempSpell;
+
+    for (uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
+    {
+        SpellSummary[i].Effects = 0;
+        SpellSummary[i].Targets = 0;
+
+        pTempSpell = GetSpellStore()->LookupEntry(i);
+
+        // This spell doesn't exist
+        if (!pTempSpell)
+        {
+            continue;
+        }
+
+        for (uint8 j = 0; j < 3; ++j)
+        {
+#if defined (CATA)
+            SpellEffectEntry const* pSpellEffect = pTempSpell->GetSpellEffect(SpellEffectIndex(j));
+            if (!pSpellEffect)
+                continue;
+#endif
+            // Spell targets self
+#if defined (CATA)
+            if (pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_SELF)
+#else
+            if (pTempSpell->EffectImplicitTargetA[j] == TARGET_SELF)
+#endif
+            {
+                SpellSummary[i].Targets |= 1 << (SELECT_TARGET_SELF - 1);
+            }
+
+            // Spell targets a single enemy
+#if defined (CATA)
+            if (pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_CHAIN_DAMAGE ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_CURRENT_ENEMY_COORDINATES)
+#else
+            if (pTempSpell->EffectImplicitTargetA[j] == TARGET_CHAIN_DAMAGE ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_CURRENT_ENEMY_COORDINATES)
+#endif
+            {
+                SpellSummary[i].Targets |= 1 << (SELECT_TARGET_SINGLE_ENEMY - 1);
+            }
+
+            // Spell targets AoE at enemy
+#if defined (CATA)
+            if (pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_ALL_ENEMY_IN_AREA ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_ALL_ENEMY_IN_AREA_INSTANT ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_CASTER_COORDINATES ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_ALL_ENEMY_IN_AREA_CHANNELED)
+#else
+            if (pTempSpell->EffectImplicitTargetA[j] == TARGET_ALL_ENEMY_IN_AREA ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_ALL_ENEMY_IN_AREA_INSTANT ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_CASTER_COORDINATES ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_ALL_ENEMY_IN_AREA_CHANNELED)
+#endif
+            {
+                SpellSummary[i].Targets |= 1 << (SELECT_TARGET_AOE_ENEMY - 1);
+            }
+
+            // Spell targets an enemy
+#if defined (CATA)
+            if (pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_CHAIN_DAMAGE ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_CURRENT_ENEMY_COORDINATES ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_ALL_ENEMY_IN_AREA ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_ALL_ENEMY_IN_AREA_INSTANT ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_CASTER_COORDINATES ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_ALL_ENEMY_IN_AREA_CHANNELED)
+#else
+            if (pTempSpell->EffectImplicitTargetA[j] == TARGET_CHAIN_DAMAGE ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_CURRENT_ENEMY_COORDINATES ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_ALL_ENEMY_IN_AREA ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_ALL_ENEMY_IN_AREA_INSTANT ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_CASTER_COORDINATES ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_ALL_ENEMY_IN_AREA_CHANNELED)
+#endif
+            {
+                SpellSummary[i].Targets |= 1 << (SELECT_TARGET_ANY_ENEMY - 1);
+            }
+
+            // Spell targets a single friend(or self)
+#if defined (CATA)
+            if (pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_SELF ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_SINGLE_FRIEND ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_SINGLE_PARTY)
+#else
+            if (pTempSpell->EffectImplicitTargetA[j] == TARGET_SELF ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_SINGLE_FRIEND ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_SINGLE_PARTY)
+#endif
+            {
+                SpellSummary[i].Targets |= 1 << (SELECT_TARGET_SINGLE_FRIEND - 1);
+            }
+
+            // Spell targets aoe friends
+#if defined (CATA)
+            if (pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_ALL_PARTY_AROUND_CASTER ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_AREAEFFECT_PARTY ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_CASTER_COORDINATES)
+#else
+            if (pTempSpell->EffectImplicitTargetA[j] == TARGET_ALL_PARTY_AROUND_CASTER ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_AREAEFFECT_PARTY ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_CASTER_COORDINATES)
+#endif
+            {
+                SpellSummary[i].Targets |= 1 << (SELECT_TARGET_AOE_FRIEND - 1);
+            }
+
+            // Spell targets any friend(or self)
+#if defined (CATA)
+            if (pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_SELF ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_SINGLE_FRIEND ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_SINGLE_PARTY ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_ALL_PARTY_AROUND_CASTER ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_AREAEFFECT_PARTY ||
+                pTempSpell->GetEffectImplicitTargetAByIndex(SpellEffectIndex(j)) == TARGET_CASTER_COORDINATES)
+#else
+            if (pTempSpell->EffectImplicitTargetA[j] == TARGET_SELF ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_SINGLE_FRIEND ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_SINGLE_PARTY ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_ALL_PARTY_AROUND_CASTER ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_AREAEFFECT_PARTY ||
+                pTempSpell->EffectImplicitTargetA[j] == TARGET_CASTER_COORDINATES)
+#endif
+            {
+                SpellSummary[i].Targets |= 1 << (SELECT_TARGET_ANY_FRIEND - 1);
+            }
+
+            // Make sure that this spell includes a damage effect
+#if defined (CATA)
+            if (pSpellEffect->Effect == SPELL_EFFECT_SCHOOL_DAMAGE ||
+                pSpellEffect->Effect == SPELL_EFFECT_INSTAKILL ||
+                pSpellEffect->Effect == SPELL_EFFECT_ENVIRONMENTAL_DAMAGE ||
+                pSpellEffect->Effect == SPELL_EFFECT_HEALTH_LEECH)
+#else
+            if (pTempSpell->Effect[j] == SPELL_EFFECT_SCHOOL_DAMAGE ||
+                pTempSpell->Effect[j] == SPELL_EFFECT_INSTAKILL ||
+                pTempSpell->Effect[j] == SPELL_EFFECT_ENVIRONMENTAL_DAMAGE ||
+                pTempSpell->Effect[j] == SPELL_EFFECT_HEALTH_LEECH)
+#endif
+            {
+                SpellSummary[i].Effects |= 1 << (SELECT_EFFECT_DAMAGE - 1);
+            }
+
+            // Make sure that this spell includes a healing effect (or an apply aura with a periodic heal)
+#if defined (CATA)
+            if (pSpellEffect->Effect == SPELL_EFFECT_HEAL ||
+                    pSpellEffect->Effect == SPELL_EFFECT_HEAL_MAX_HEALTH ||
+                    pSpellEffect->Effect == SPELL_EFFECT_HEAL_MECHANICAL ||
+                    (pSpellEffect->Effect == SPELL_EFFECT_APPLY_AURA  && pTempSpell->GetEffectApplyAuraNameByIndex(SpellEffectIndex(j)) == 8))
+#else
+            if (pTempSpell->Effect[j] == SPELL_EFFECT_HEAL ||
+                pTempSpell->Effect[j] == SPELL_EFFECT_HEAL_MAX_HEALTH ||
+                pTempSpell->Effect[j] == SPELL_EFFECT_HEAL_MECHANICAL ||
+                (pTempSpell->Effect[j] == SPELL_EFFECT_APPLY_AURA  && pTempSpell->EffectApplyAuraName[j] == 8))
+#endif
+            {
+                SpellSummary[i].Effects |= 1 << (SELECT_EFFECT_HEALING - 1);
+            }
+
+            // Make sure that this spell applies an aura
+#if defined (CATA)
+            if (pSpellEffect->Effect == SPELL_EFFECT_APPLY_AURA)
+#else
+            if (pTempSpell->Effect[j] == SPELL_EFFECT_APPLY_AURA)
+#endif
+            {
+                SpellSummary[i].Effects |= 1 << (SELECT_EFFECT_AURA - 1);
+            }
+        }
+    }
+}
+
+void ScriptedAI::DoResetThreat()
+{
+    if (!m_creature->CanHaveThreatList() || m_creature->GetThreatManager().isThreatListEmpty())
+    {
+        script_error_log("DoResetThreat called for creature that either can not have threat list or has empty threat list (m_creature entry = %d)", m_creature->GetEntry());
+        return;
+    }
+
+    ThreatList const& tList = m_creature->GetThreatManager().getThreatList();
+    for (ThreatList::const_iterator itr = tList.begin(); itr != tList.end(); ++itr)
+    {
+        Unit* pUnit = m_creature->GetMap()->GetUnit((*itr)->getUnitGuid());
+
+        if (pUnit && m_creature->GetThreatManager().getThreat(pUnit))
+        {
+            m_creature->GetThreatManager().modifyThreatPercent(pUnit, -100);
+        }
+    }
+}
+
+void ScriptedAI::DoTeleportPlayer(Unit* pUnit, float fX, float fY, float fZ, float fO)
+{
+    if (!pUnit)
+    {
+        return;
+    }
+
+    if (pUnit->GetTypeId() != TYPEID_PLAYER)
+    {
+        script_error_log("%s tried to teleport non-player (%s) to x: %f y:%f z: %f o: %f. Aborted.", m_creature->GetGuidStr().c_str(), pUnit->GetGuidStr().c_str(), fX, fY, fZ, fO);
+        return;
+    }
+
+    ((Player*)pUnit)->TeleportTo(pUnit->GetMapId(), fX, fY, fZ, fO, TELE_TO_NOT_LEAVE_COMBAT);
+}
+
+Unit* ScriptedAI::DoSelectLowestHpFriendly(float fRange, uint32 uiMinHPDiff)
+{
+    Unit* pUnit = NULL;
+
+    MaNGOS::MostHPMissingInRangeCheck u_check(m_creature, fRange, uiMinHPDiff);
+    MaNGOS::UnitLastSearcher<MaNGOS::MostHPMissingInRangeCheck> searcher(pUnit, u_check);
+
+    Cell::VisitGridObjects(m_creature, searcher, fRange);
+
+    return pUnit;
+}
+
+std::list<Creature*> ScriptedAI::DoFindFriendlyCC(float fRange)
+{
+    std::list<Creature*> pList;
+
+    MaNGOS::FriendlyCCedInRangeCheck u_check(m_creature, fRange);
+    MaNGOS::CreatureListSearcher<MaNGOS::FriendlyCCedInRangeCheck> searcher(pList, u_check);
+
+    Cell::VisitGridObjects(m_creature, searcher, fRange);
+
+    return pList;
+}
+
+std::list<Creature*> ScriptedAI::DoFindFriendlyMissingBuff(float fRange, uint32 uiSpellId)
+{
+    std::list<Creature*> pList;
+
+    MaNGOS::FriendlyMissingBuffInRangeCheck u_check(m_creature, fRange, uiSpellId);
+    MaNGOS::CreatureListSearcher<MaNGOS::FriendlyMissingBuffInRangeCheck> searcher(pList, u_check);
+
+    Cell::VisitGridObjects(m_creature, searcher, fRange);
+
+    return pList;
+}
+
+Player* ScriptedAI::GetPlayerAtMinimumRange(float fMinimumRange)
+{
+    Player* pPlayer = NULL;
+
+    MaNGOS::AnyPlayerInObjectRangeCheck check(m_creature, fMinimumRange);
+    MaNGOS::PlayerSearcher<MaNGOS::AnyPlayerInObjectRangeCheck> searcher(pPlayer, check);
+
+    Cell::VisitWorldObjects(m_creature, searcher, fMinimumRange);
+
+    return pPlayer;
+}
+
+void ScriptedAI::SetEquipmentSlots(bool bLoadDefault, int32 iMainHand, int32 iOffHand, int32 iRanged)
+{
+    if (bLoadDefault)
+    {
+        m_creature->LoadEquipment(m_creature->GetCreatureInfo()->EquipmentTemplateId, true);
+        return;
+    }
+
+    if (iMainHand >= 0)
+    {
+        m_creature->SetVirtualItem(VIRTUAL_ITEM_SLOT_0, iMainHand);
+    }
+
+    if (iOffHand >= 0)
+    {
+        m_creature->SetVirtualItem(VIRTUAL_ITEM_SLOT_1, iOffHand);
+    }
+
+    if (iRanged >= 0)
+    {
+        m_creature->SetVirtualItem(VIRTUAL_ITEM_SLOT_2, iRanged);
+    }
+}
+
+// Hacklike storage used for misc creatures that are expected to evade of outside of a certain area.
+// It is assumed the information is found elswehere and can be handled by mangos. So far no luck finding such information/way to extract it.
+enum
+{
+
+#if defined (CLASSIC)  
+    NPC_BROODLORD               = 12017
+#endif  
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+    NPC_BROODLORD               = 12017,
+    NPC_VOID_REAVER             = 19516,
+    NPC_JAN_ALAI                = 23578,
+    NPC_SARTHARION              = 28860,
+    NPC_TALON_KING_IKISS        = 18473,
+    NPC_KARGATH_BLADEFIST       = 16808,
+#endif  
+#if defined (WOTLK) || defined (CATA)
+    NPC_ANUBARAK                = 29120,
+    NPC_SINDRAGOSA              = 36853,
+    NPC_ZARITHRIAN              = 39746,
+#endif
+};
+
+bool ScriptedAI::EnterEvadeIfOutOfCombatArea(const uint32 uiDiff)
+{
+    if (m_uiEvadeCheckCooldown < uiDiff)
+    {
+        m_uiEvadeCheckCooldown = 2500;
+    }
+    else
+    {
+        m_uiEvadeCheckCooldown -= uiDiff;
+        return false;
+    }
+
+    if (m_creature->IsInEvadeMode() || !m_creature->getVictim())
+    {
+        return false;
+    }
+
+    float fX = m_creature->GetPositionX();
+    float fY = m_creature->GetPositionY();
+    float fZ = m_creature->GetPositionZ();
+
+    switch (m_creature->GetEntry())
+    {
+        case NPC_BROODLORD:                                 // broodlord (not move down stairs)
+            if (fZ > 448.60f)
+            {
+                return false;
+            }
+            break;
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+        case NPC_VOID_REAVER:                               // void reaver (calculate from center of room)
+            if (m_creature->GetDistance2d(432.59f, 371.93f) < 105.0f)
+            { return false; }
+            break;
+        case NPC_JAN_ALAI:                                  // jan'alai (calculate by Z)
+            if (fZ > 12.0f)
+            { return false; }
+            break;
+        case NPC_SARTHARION:                                // sartharion (calculate box)
+            if (fX > 3218.86f && fX < 3275.69f && fY < 572.40f && fY > 484.68f)
+            { return false; }
+            break;
+        case NPC_TALON_KING_IKISS:
+        {
+            float fX, fY, fZ;
+            m_creature->GetRespawnCoord(fX, fY, fZ);
+            if (m_creature->GetDistance2d(fX, fY) < 70.0f)
+            { return false; }
+            break;
+        }
+        case NPC_KARGATH_BLADEFIST:
+            if (fX < 255.0f && fX > 205.0f)
+            { return false; }
+            break;
+
+#endif  
+#if defined (WOTLK) || defined (CATA)
+        case NPC_ANUBARAK:
+            if (fY < 281.0f && fY > 228.0f)
+                return false;
+            break;
+        case NPC_SINDRAGOSA:
+            if (fX > 4314.0f)
+                return false;
+            break;
+        case NPC_ZARITHRIAN:
+            if (fZ > 87.0f)
+                return false;
+            break;
+#endif
+        default:
+            script_error_log("EnterEvadeIfOutOfCombatArea used for creature entry %u, but does not have any definition.", m_creature->GetEntry());
+            return false;
+    }
+
+    EnterEvadeMode();
+    return true;
+}
+
+void Scripted_NoMovementAI::GetAIInformation(ChatHandler& reader)
+{
+    reader.PSendSysMessage("Subclass of Scripted_NoMovementAI");
+}
+
+void Scripted_NoMovementAI::AttackStart(Unit* pWho)
+{
+#if defined (WOTLK) || defined (CATA)
+    if (!m_creature->CanInitiateAttack())
+        return;
+#endif
+    if (pWho && m_creature->Attack(pWho, true))
+    {
+        m_creature->AddThreat(pWho);
+        m_creature->SetInCombatWith(pWho);
+        pWho->SetInCombatWith(m_creature);
+
+        DoStartNoMovement(pWho);
+    }
+}
diff --git a/src/modules/SD3/include/sc_creature.h b/src/modules/SD3/include/sc_creature.h
new file mode 100644
index 000000000..e90005840
--- /dev/null
+++ b/src/modules/SD3/include/sc_creature.h
@@ -0,0 +1,262 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef SC_CREATURE_H
+#define SC_CREATURE_H
+
+#include "Chat.h"
+#include "DBCStores.h"                                      // Mostly only used the Lookup acces, but a few cases really do use the DBC-Stores
+
+// Spell targets used by SelectSpell
+enum SelectTarget
+{
+    SELECT_TARGET_DONTCARE = 0,                             // All target types allowed
+
+    SELECT_TARGET_SELF,                                     // Only Self casting
+
+    SELECT_TARGET_SINGLE_ENEMY,                             // Only Single Enemy
+    SELECT_TARGET_AOE_ENEMY,                                // Only AoE Enemy
+    SELECT_TARGET_ANY_ENEMY,                                // AoE or Single Enemy
+
+    SELECT_TARGET_SINGLE_FRIEND,                            // Only Single Friend
+    SELECT_TARGET_AOE_FRIEND,                               // Only AoE Friend
+    SELECT_TARGET_ANY_FRIEND,                               // AoE or Single Friend
+};
+
+// Spell Effects used by SelectSpell
+enum SelectEffect
+{
+    SELECT_EFFECT_DONTCARE = 0,                             // All spell effects allowed
+    SELECT_EFFECT_DAMAGE,                                   // Spell does damage
+    SELECT_EFFECT_HEALING,                                  // Spell does healing
+    SELECT_EFFECT_AURA,                                     // Spell applies an aura
+};
+
+enum SCEquip
+{
+    EQUIP_NO_CHANGE = -1,
+    EQUIP_UNEQUIP   = 0
+};
+
+/// Documentation of CreatureAI functions can be found in MaNGOS source
+// Only list them here again to ensure that the interface between SD3 and the core is not changed unnoticed
+struct ScriptedAI : public CreatureAI
+{
+    public:
+        explicit ScriptedAI(Creature* pCreature);
+        ~ScriptedAI() {}
+
+        // *************
+        // CreatureAI Functions
+        // *************
+
+        // == Information about AI ========================
+        // Get information about the AI
+        void GetAIInformation(ChatHandler& reader) override;
+
+        // == Reactions At =================================
+
+        // Called if IsVisible(Unit* pWho) is true at each relative pWho move
+        void MoveInLineOfSight(Unit* pWho) override;
+
+        // Called for reaction at enter to combat if not in combat yet (enemy can be NULL)
+        void EnterCombat(Unit* pEnemy) override;
+
+        // Called at stoping attack by any attacker
+        void EnterEvadeMode() override;
+
+        // Called when reached home after MoveTargetHome (in evade)
+        void JustReachedHome() override {}
+
+        // Called at any Heal received
+        void HealedBy(Unit* /*pHealer*/, uint32& /*uiHealedAmount*/) override {}
+
+        // Called at any Damage to any victim (before damage apply)
+        void DamageDeal(Unit* /*pDoneTo*/, uint32& /*uiDamage*/) override {}
+
+        // Called at any Damage from any attacker (before damage apply)
+        void DamageTaken(Unit* /*pDealer*/, uint32& /*uiDamage*/) override {}
+
+        // Called at creature death
+        void JustDied(Unit* /*pKiller*/) override {}
+
+        // Called when the corpse of this creature gets removed
+        void CorpseRemoved(uint32& /*uiRespawnDelay*/) override {}
+
+        // Called when a summoned creature is killed
+        void SummonedCreatureJustDied(Creature* /*pSummoned*/) override {}
+
+        // Called at creature killing another unit
+        void KilledUnit(Unit* /*pVictim*/) override {}
+
+        // Called when owner of m_creature (if m_creature is PROTECTOR_PET) kills a unit
+        void OwnerKilledUnit(Unit* /*pVictim*/) override {}
+
+        // Called when the creature successfully summons a creature
+        void JustSummoned(Creature* /*pSummoned*/) override {}
+
+        // Called when the creature successfully summons a gameobject
+        void JustSummoned(GameObject* /*pGo*/) override {}
+
+        // Called when a summoned creature gets TemporarySummon::UnSummon ed
+        void SummonedCreatureDespawn(Creature* /*pSummoned*/) override {}
+
+        // Called when hit by a spell
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* /*pSpell*/) override {}
+
+        // Called when spell hits creature's target
+        void SpellHitTarget(Unit* /*pTarget*/, const SpellEntry* /*pSpell*/) override {}
+
+        // Called when the creature is target of hostile action: swing, hostile spell landed, fear/etc)
+        /// This will by default result in reattacking, if the creature has no victim
+        void AttackedBy(Unit* pAttacker) override { CreatureAI::AttackedBy(pAttacker); }
+
+        // Called when creature is respawned (for reseting variables)
+        void JustRespawned() override;
+
+        // Called at waypoint reached or point movement finished
+        void MovementInform(uint32 /*uiMovementType*/, uint32 /*uiData*/) override {}
+
+        // Called if a temporary summoned of m_creature reach a move point
+        void SummonedMovementInform(Creature* /*pSummoned*/, uint32 /*uiMotionType*/, uint32 /*uiData*/) override {}
+
+        // Called at text emote receive from player
+        void ReceiveEmote(Player* /*pPlayer*/, uint32 /*uiEmote*/) override {}
+
+        // Called at each attack of m_creature by any victim
+        void AttackStart(Unit* pWho) override;
+
+        // Called at World update tick
+        void UpdateAI(const uint32) override;
+
+        // Called when an AI Event is received
+        void ReceiveAIEvent(AIEventType /*eventType*/, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override {}
+
+        // == State checks =================================
+
+        // Check if unit is visible for MoveInLineOfSight
+        bool IsVisible(Unit* pWho) const override;
+
+        // Called when victim entered water and creature can not enter water
+        bool canReachByRangeAttack(Unit* pWho) override { return CreatureAI::canReachByRangeAttack(pWho); }
+
+        // *************
+        // Variables
+        // *************
+
+        // *************
+        // Pure virtual functions
+        // *************
+
+        /**
+         * This is a SD3 internal function, that every AI must implement
+         * Usally used to reset combat variables
+         * Called by default on creature evade and respawn
+         * In most scripts also called in the constructor of the AI
+         */
+        void Reset() override {}
+
+        /// Called at creature EnterCombat with an enemy
+        /**
+         * This is a SD3 internal function
+         * Called by default on creature EnterCombat with an enemy
+         */
+        virtual void Aggro(Unit* /*pWho*/) {}
+
+        // *************
+        // AI Helper Functions
+        // *************
+
+        // Start movement toward victim
+        void DoStartMovement(Unit* pVictim, float fDistance = 0, float fAngle = 0);
+
+        // Start no movement on victim
+        void DoStartNoMovement(Unit* pVictim);
+
+        // Stop attack of current victim
+        void DoStopAttack();
+
+        // Cast spell by Id
+        void DoCast(Unit* pTarget, uint32 uiSpellId, bool bTriggered = false);
+
+        // Cast spell by spell info
+        void DoCastSpell(Unit* pTarget, SpellEntry const* pSpellInfo, bool bTriggered = false);
+
+        // Plays a sound to all nearby players
+        void DoPlaySoundToSet(WorldObject* pSource, uint32 uiSoundId);
+
+        // Drops all threat to 0%. Does not remove enemies from the threat list
+        void DoResetThreat();
+
+        // Teleports a player without dropping threat (only teleports to same map)
+        void DoTeleportPlayer(Unit* pUnit, float fX, float fY, float fZ, float fO);
+
+        // Returns friendly unit with the most amount of hp missing from max hp
+        Unit* DoSelectLowestHpFriendly(float fRange, uint32 uiMinHPDiff = 1);
+
+        // Returns a list of friendly CC'd units within range
+        std::list<Creature*> DoFindFriendlyCC(float fRange);
+
+        // Returns a list of all friendly units missing a specific buff within range
+        std::list<Creature*> DoFindFriendlyMissingBuff(float fRange, uint32 uiSpellId);
+
+        // Return a player with at least minimumRange from m_creature
+        Player* GetPlayerAtMinimumRange(float fMinimumRange);
+
+        // Spawns a creature relative to m_creature
+        Creature* DoSpawnCreature(uint32 uiId, float fX, float fY, float fZ, float fAngle, uint32 uiType, uint32 uiDespawntime);
+
+        // Returns spells that meet the specified criteria from the creatures spell list
+        SpellEntry const* SelectSpell(Unit* pTarget, int32 uiSchool, int32 iMechanic, SelectTarget selectTargets, uint32 uiPowerCostMin, uint32 uiPowerCostMax, float fRangeMin, float fRangeMax, SelectEffect selectEffect);
+
+        // Checks if you can cast the specified spell
+        bool CanCast(Unit* pTarget, SpellEntry const* pSpell, bool bTriggered = false);
+
+        void SetEquipmentSlots(bool bLoadDefault, int32 iMainHand = EQUIP_NO_CHANGE, int32 iOffHand = EQUIP_NO_CHANGE, int32 iRanged = EQUIP_NO_CHANGE);
+
+        bool EnterEvadeIfOutOfCombatArea(const uint32 uiDiff);
+
+        // a wrapper for aggro list browsing
+        Unit *SelectAttackTarget(AttackingTarget type, uint32 position, uint32 spellId = 0, uint32 selectFlags = 0) { return m_creature->SelectAttackingTarget(type, position, spellId, selectFlags); }
+
+    private:
+        uint32 m_uiEvadeCheckCooldown;
+};
+
+struct Scripted_NoMovementAI : public ScriptedAI
+{
+    Scripted_NoMovementAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        SetCombatMovement(false);
+    }
+
+    void GetAIInformation(ChatHandler& reader) override;
+
+    // Called at each attack of m_creature by any victim
+    void AttackStart(Unit* pWho) override;
+};
+
+#endif
diff --git a/src/modules/SD3/include/sc_gossip.h b/src/modules/SD3/include/sc_gossip.h
new file mode 100644
index 000000000..b8adf4b7b
--- /dev/null
+++ b/src/modules/SD3/include/sc_gossip.h
@@ -0,0 +1,186 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef SC_GOSSIP_H
+#define SC_GOSSIP_H
+
+#include "Player.h"
+#include "GossipDef.h"
+#include "QuestDef.h"
+
+// Gossip Item Text
+#define GOSSIP_TEXT_BROWSE_GOODS        "I'd like to browse your goods."
+#define GOSSIP_TEXT_TRAIN               "Train me!"
+
+#define GOSSIP_TEXT_BANK                "The bank"
+#define GOSSIP_TEXT_IRONFORGE_BANK      "The bank of Ironforge"
+#define GOSSIP_TEXT_STORMWIND_BANK      "The bank of Stormwind"
+#define GOSSIP_TEXT_WINDRIDER           "The wind rider master"
+#define GOSSIP_TEXT_GRYPHON             "The gryphon master"
+#define GOSSIP_TEXT_BATHANDLER          "The bat handler"
+#define GOSSIP_TEXT_HIPPOGRYPH          "The hippogryph master"
+#define GOSSIP_TEXT_ZEPPLINMASTER       "The zeppelin master"
+#define GOSSIP_TEXT_DEEPRUNTRAM         "The Deeprun Tram"
+#define GOSSIP_TEXT_FERRY               "The Rut'theran Ferry"
+#define GOSSIP_TEXT_FLIGHTMASTER        "The flight master"
+#define GOSSIP_TEXT_AUCTIONHOUSE        "The auction house"
+#define GOSSIP_TEXT_GUILDMASTER         "The guild master"
+#define GOSSIP_TEXT_INN                 "The inn"
+#define GOSSIP_TEXT_MAILBOX             "The mailbox"
+#define GOSSIP_TEXT_STABLEMASTER        "The stable master"
+#define GOSSIP_TEXT_WEAPONMASTER        "The weapon master"
+#define GOSSIP_TEXT_OFFICERS            "The officers' lounge"
+#define GOSSIP_TEXT_BATTLEMASTER        "The battlemaster"
+#define GOSSIP_TEXT_BARBER              "Barber"
+#define GOSSIP_TEXT_CLASSTRAINER        "A class trainer"
+#define GOSSIP_TEXT_PROFTRAINER         "A profession trainer"
+#define GOSSIP_TEXT_LEXICON             "Lexicon of Power"
+
+#define GOSSIP_TEXT_ALTERACVALLEY       "Alterac Valley"
+#define GOSSIP_TEXT_ARATHIBASIN         "Arathi Basin"
+#define GOSSIP_TEXT_WARSONGULCH         "Warsong Gulch"
+#define GOSSIP_TEXT_ARENA               "Arena"
+#define GOSSIP_TEXT_EYEOFTHESTORM       "Eye of The Storm"
+#define GOSSIP_TEXT_STRANDOFANCIENT     "Strand of the Ancients"
+
+#define GOSSIP_TEXT_DEATH_KNIGHT        "Death Knight"
+#define GOSSIP_TEXT_DRUID               "Druid"
+#define GOSSIP_TEXT_HUNTER              "Hunter"
+#define GOSSIP_TEXT_PRIEST              "Priest"
+#define GOSSIP_TEXT_ROGUE               "Rogue"
+#define GOSSIP_TEXT_WARRIOR             "Warrior"
+#define GOSSIP_TEXT_PALADIN             "Paladin"
+#define GOSSIP_TEXT_SHAMAN              "Shaman"
+#define GOSSIP_TEXT_MAGE                "Mage"
+#define GOSSIP_TEXT_WARLOCK             "Warlock"
+
+#define GOSSIP_TEXT_ALCHEMY             "Alchemy"
+#define GOSSIP_TEXT_BLACKSMITHING       "Blacksmithing"
+#define GOSSIP_TEXT_COOKING             "Cooking"
+#define GOSSIP_TEXT_ENCHANTING          "Enchanting"
+#define GOSSIP_TEXT_ENGINEERING         "Engineering"
+#define GOSSIP_TEXT_FIRSTAID            "First Aid"
+#define GOSSIP_TEXT_HERBALISM           "Herbalism"
+#define GOSSIP_TEXT_LEATHERWORKING      "Leatherworking"
+#define GOSSIP_TEXT_TAILORING           "Tailoring"
+#define GOSSIP_TEXT_MINING              "Mining"
+#define GOSSIP_TEXT_FISHING             "Fishing"
+#define GOSSIP_TEXT_SKINNING            "Skinning"
+#define GOSSIP_TEXT_JEWELCRAFTING       "Jewelcrafting"
+#define GOSSIP_TEXT_INSCRIPTION         "Inscription"
+
+enum
+{
+    // Skill defines
+    TRADESKILL_ALCHEMY             = 1,
+    TRADESKILL_BLACKSMITHING       = 2,
+    TRADESKILL_COOKING             = 3,
+    TRADESKILL_ENCHANTING          = 4,
+    TRADESKILL_ENGINEERING         = 5,
+    TRADESKILL_FIRSTAID            = 6,
+    TRADESKILL_HERBALISM           = 7,
+    TRADESKILL_LEATHERWORKING      = 8,
+    TRADESKILL_POISONS             = 9,
+    TRADESKILL_TAILORING           = 10,
+    TRADESKILL_MINING              = 11,
+    TRADESKILL_FISHING             = 12,
+    TRADESKILL_SKINNING            = 13,
+    TRADESKILL_JEWLCRAFTING        = 14,
+    TRADESKILL_INSCRIPTION         = 15,
+
+    TRADESKILL_LEVEL_NONE          = 0,
+    TRADESKILL_LEVEL_APPRENTICE    = 1,
+    TRADESKILL_LEVEL_JOURNEYMAN    = 2,
+    TRADESKILL_LEVEL_EXPERT        = 3,
+    TRADESKILL_LEVEL_ARTISAN       = 4,
+    TRADESKILL_LEVEL_MASTER        = 5,
+    TRADESKILL_LEVEL_GRAND_MASTER  = 6,
+
+    // Gossip defines
+    GOSSIP_ACTION_TRADE            = 1,
+    GOSSIP_ACTION_TRAIN            = 2,
+    GOSSIP_ACTION_TAXI             = 3,
+    GOSSIP_ACTION_GUILD            = 4,
+    GOSSIP_ACTION_BATTLE           = 5,
+    GOSSIP_ACTION_BANK             = 6,
+    GOSSIP_ACTION_INN              = 7,
+    GOSSIP_ACTION_HEAL             = 8,
+    GOSSIP_ACTION_TABARD           = 9,
+    GOSSIP_ACTION_AUCTION          = 10,
+    GOSSIP_ACTION_INN_INFO         = 11,
+    GOSSIP_ACTION_UNLEARN          = 12,
+    GOSSIP_ACTION_INFO_DEF         = 1000,
+
+    GOSSIP_SENDER_MAIN             = 1,
+    GOSSIP_SENDER_INN_INFO         = 2,
+    GOSSIP_SENDER_INFO             = 3,
+    GOSSIP_SENDER_SEC_PROFTRAIN    = 4,
+    GOSSIP_SENDER_SEC_CLASSTRAIN   = 5,
+    GOSSIP_SENDER_SEC_BATTLEINFO   = 6,
+    GOSSIP_SENDER_SEC_BANK         = 7,
+    GOSSIP_SENDER_SEC_INN          = 8,
+    GOSSIP_SENDER_SEC_MAILBOX      = 9,
+    GOSSIP_SENDER_SEC_STABLEMASTER = 10
+};
+
+extern uint32 GetSkillLevel(Player* pPlayer, uint32 uiSkill);
+
+// Defined fuctions to use with player.
+
+// This fuction add's a menu item,
+// Icon Id
+// Text
+// Sender(this is to identify the current Menu with this item)
+// Option id (identifies this Menu Item)
+// Text to be displayed in pop up box
+// Money value in pop up box
+// Coded
+#define ADD_GOSSIP_ITEM(uiIcon, chrText, uiSender, uiOptionId)   PlayerTalkClass->GetGossipMenu().AddMenuItem(uiIcon, chrText, uiSender, uiOptionId, "", 0)
+#define ADD_GOSSIP_ITEM_ID(uiIcon, iTextId, uiSender, uiOptionId)   PlayerTalkClass->GetGossipMenu().AddMenuItem(uiIcon, iTextId, uiSender, uiOptionId, 0, 0)
+
+#if defined (CLASSIC)  
+#define ADD_GOSSIP_ITEM_EXTENDED(uiIcon, chrText, uiSender, uiOptionId, chrBoxMessage, uiBoxMoney, bCode)   PlayerTalkClass->GetGossipMenu().AddMenuItem(uiIcon, chrText, uiSender, uiOptionId, chrBoxMessage, /*uiBoxMoney,*/ bCode)
+#else
+#define ADD_GOSSIP_ITEM_EXTENDED(uiIcon, chrText, uiSender, uiOptionId, chrBoxMessage, uiBoxMoney, bCode)   PlayerTalkClass->GetGossipMenu().AddMenuItem(uiIcon, chrText, uiSender, uiOptionId, chrBoxMessage, uiBoxMoney, bCode)
+#endif  
+
+// This fuction Sends the current menu to show to client
+// uiTextId - NPCTEXTID (uint32)
+// guid - npc guid (ObjectGuid)
+#define SEND_GOSSIP_MENU(uiTextId, guid)      PlayerTalkClass->SendGossipMenu(uiTextId, guid)
+
+// Closes the Menu
+#define CLOSE_GOSSIP_MENU()        PlayerTalkClass->CloseGossip()
+
+// Fuctions to send NPC lists
+// a - is always the npc guid (ObjectGuid)
+#define SEND_VENDORLIST(a)         GetSession()->SendListInventory(a)
+#define SEND_TRAINERLIST(a)        GetSession()->SendTrainerList(a)
+#define SEND_BANKERLIST(a)         GetSession()->SendShowBank(a)
+#define SEND_TABARDLIST(a)         GetSession()->SendTabardVendorActivate(a)
+#define SEND_TAXILIST(a)           GetSession()->SendTaxiStatus(a)
+
+#endif
diff --git a/src/modules/SD3/include/sc_grid_searchers.cpp b/src/modules/SD3/include/sc_grid_searchers.cpp
new file mode 100644
index 000000000..6fc5b9104
--- /dev/null
+++ b/src/modules/SD3/include/sc_grid_searchers.cpp
@@ -0,0 +1,74 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#include "precompiled.h"
+
+#include "Cell.h"
+#include "CellImpl.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+
+// return closest GO in grid, with range from pSource
+GameObject* GetClosestGameObjectWithEntry(WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange)
+{
+    GameObject* pGo = NULL;
+
+    MaNGOS::NearestGameObjectEntryInObjectRangeCheck go_check(*pSource, uiEntry, fMaxSearchRange);
+    MaNGOS::GameObjectLastSearcher<MaNGOS::NearestGameObjectEntryInObjectRangeCheck> searcher(pGo, go_check);
+
+    Cell::VisitGridObjects(pSource, searcher, fMaxSearchRange);
+
+    return pGo;
+}
+
+// return closest creature alive in grid, with range from pSource
+Creature* GetClosestCreatureWithEntry(WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange, bool bOnlyAlive/*=true*/, bool bOnlyDead/*=false*/, bool bExcludeSelf/*=false*/)
+{
+    Creature* pCreature = NULL;
+
+    MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck creature_check(*pSource, uiEntry, bOnlyAlive, bOnlyDead, fMaxSearchRange, bExcludeSelf);
+    MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(pCreature, creature_check);
+
+    Cell::VisitGridObjects(pSource, searcher, fMaxSearchRange);
+
+    return pCreature;
+}
+
+void GetGameObjectListWithEntryInGrid(std::list<GameObject*>& lList , WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange)
+{
+    MaNGOS::GameObjectEntryInPosRangeCheck check(*pSource, uiEntry, pSource->GetPositionX(), pSource->GetPositionY(), pSource->GetPositionZ(), fMaxSearchRange);
+    MaNGOS::GameObjectListSearcher<MaNGOS::GameObjectEntryInPosRangeCheck> searcher(lList, check);
+
+    Cell::VisitGridObjects(pSource, searcher, fMaxSearchRange);
+}
+
+void GetCreatureListWithEntryInGrid(std::list<Creature*>& lList, WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange)
+{
+    MaNGOS::AllCreaturesOfEntryInRangeCheck check(pSource, uiEntry, fMaxSearchRange);
+    MaNGOS::CreatureListSearcher<MaNGOS::AllCreaturesOfEntryInRangeCheck> searcher(lList, check);
+
+    Cell::VisitGridObjects(pSource, searcher, fMaxSearchRange);
+}
diff --git a/src/modules/SD3/include/sc_grid_searchers.h b/src/modules/SD3/include/sc_grid_searchers.h
new file mode 100644
index 000000000..a1814097b
--- /dev/null
+++ b/src/modules/SD3/include/sc_grid_searchers.h
@@ -0,0 +1,64 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef SC_GRIDSEARCH_H
+#define SC_GRIDSEARCH_H
+
+#include "Object.h"
+class GameObject;
+class Creature;
+
+struct ObjectDistanceOrder : public std::binary_function<const WorldObject, const WorldObject, bool>
+{
+    const Unit* m_pSource;
+
+    ObjectDistanceOrder(const Unit* pSource) : m_pSource(pSource) {}
+
+    bool operator()(const WorldObject* pLeft, const WorldObject* pRight) const
+    {
+        return m_pSource->GetDistanceOrder(pLeft, pRight);
+    }
+};
+
+struct ObjectDistanceOrderReversed : public std::binary_function<const WorldObject, const WorldObject, bool>
+{
+    const Unit* m_pSource;
+
+    ObjectDistanceOrderReversed(const Unit* pSource) : m_pSource(pSource) {}
+
+    bool operator()(const WorldObject* pLeft, const WorldObject* pRight) const
+    {
+        return !m_pSource->GetDistanceOrder(pLeft, pRight);
+    }
+};
+
+GameObject* GetClosestGameObjectWithEntry(WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange);
+Creature* GetClosestCreatureWithEntry(WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange, bool bOnlyAlive = true, bool bOnlyDead = false, bool bExcludeSelf = false);
+
+void GetGameObjectListWithEntryInGrid(std::list<GameObject*>& lList , WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange);
+void GetCreatureListWithEntryInGrid(std::list<Creature*>& lList, WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange);
+
+#endif
diff --git a/src/modules/SD3/include/sc_instance.cpp b/src/modules/SD3/include/sc_instance.cpp
new file mode 100644
index 000000000..e59ad1d70
--- /dev/null
+++ b/src/modules/SD3/include/sc_instance.cpp
@@ -0,0 +1,434 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#include "precompiled.h"
+
+/**
+   Function that uses a door or a button
+
+   @param   guid The ObjectGuid of the Door/ Button that will be used
+   @param   uiWithRestoreTime (in seconds) if == 0 autoCloseTime will be used (if not 0 by default in *_template)
+   @param   bUseAlternativeState Use to alternative state
+ */
+void ScriptedInstance::DoUseDoorOrButton(ObjectGuid guid, uint32 uiWithRestoreTime, bool bUseAlternativeState)
+{
+    if (!guid)
+    {
+        return;
+    }
+
+    if (GameObject* pGo = instance->GetGameObject(guid))
+    {
+#if defined (CLASSIC) || defined (TBC)
+        if (pGo->GetGoType() == GAMEOBJECT_TYPE_DOOR || pGo->GetGoType() == GAMEOBJECT_TYPE_BUTTON)
+#endif
+#if defined (WOTLK) || defined (CATA)
+        if (pGo->GetGoType() == GAMEOBJECT_TYPE_DOOR || pGo->GetGoType() == GAMEOBJECT_TYPE_BUTTON || pGo->GetGoType() == GAMEOBJECT_TYPE_TRAPDOOR)
+#endif
+        {
+            if (pGo->getLootState() == GO_READY)
+            {
+                pGo->UseDoorOrButton(uiWithRestoreTime, bUseAlternativeState);
+            }
+            else if (pGo->getLootState() == GO_ACTIVATED)
+            {
+                pGo->ResetDoorOrButton();
+            }
+        }
+        else
+        {
+            script_error_log("Script call DoUseDoorOrButton, but gameobject entry %u is type %u.", pGo->GetEntry(), pGo->GetGoType());
+        }
+    }
+}
+
+/// Function that uses a door or button that is stored in m_mGoEntryGuidStore
+void ScriptedInstance::DoUseDoorOrButton(uint32 uiEntry, uint32 uiWithRestoreTime /*= 0*/, bool bUseAlternativeState /*= false*/)
+{
+    EntryGuidMap::iterator find = m_mGoEntryGuidStore.find(uiEntry);
+    if (find != m_mGoEntryGuidStore.end())
+    {
+        DoUseDoorOrButton(find->second, uiWithRestoreTime, bUseAlternativeState);
+    }
+    else
+        // Output log, possible reason is not added GO to storage, or not yet loaded
+    {
+        debug_log("SD3: Script call DoUseDoorOrButton(by Entry), but no gameobject of entry %u was created yet, or it was not stored by script for map %u.", uiEntry, instance->GetId());
+    }
+}
+
+/**
+   Function that respawns a despawned GameObject with given time
+
+   @param   guid The ObjectGuid of the GO that will be respawned
+   @param   uiTimeToDespawn (in seconds) Despawn the GO after this time, default is a minute
+ */
+void ScriptedInstance::DoRespawnGameObject(ObjectGuid guid, uint32 uiTimeToDespawn)
+{
+    if (!guid)
+    {
+        return;
+    }
+
+    if (GameObject* pGo = instance->GetGameObject(guid))
+    {
+        // not expect any of these should ever be handled
+        if (pGo->GetGoType() == GAMEOBJECT_TYPE_FISHINGNODE || pGo->GetGoType() == GAMEOBJECT_TYPE_DOOR ||
+#if defined (CLASSIC) || defined (TBC)
+            pGo->GetGoType() == GAMEOBJECT_TYPE_BUTTON || pGo->GetGoType() == GAMEOBJECT_TYPE_TRAP)
+#endif
+#if defined (WOTLK) || defined (CATA)
+            pGo->GetGoType() == GAMEOBJECT_TYPE_BUTTON)
+#endif
+
+        {
+            return;
+        }
+
+        if (pGo->isSpawned())
+        {
+            return;
+        }
+
+        pGo->SetRespawnTime(uiTimeToDespawn);
+        pGo->Refresh();
+    }
+}
+
+/// Function that uses a door or button that is stored in m_mGoEntryGuidStore
+void ScriptedInstance::DoToggleGameObjectFlags(uint32 uiEntry, uint32 uiGOflags, bool bApply)
+{
+    EntryGuidMap::iterator find = m_mGoEntryGuidStore.find(uiEntry);
+    if (find != m_mGoEntryGuidStore.end())
+    {
+        DoToggleGameObjectFlags(find->second, uiGOflags, bApply);
+    }
+    else
+        // Output log, possible reason is not added GO to storage, or not yet loaded
+    {
+        debug_log("SD3: Script call ToogleTameObjectFlags (by Entry), but no gameobject of entry %u was created yet, or it was not stored by script for map %u.", uiEntry, instance->GetId());
+    }
+}
+
+/**
+   Function that toggles the GO-flags of a GameObject
+
+   @param   guid The ObjectGuid of the GO that will be respawned
+   @param   uiGOflags Which GO-flags to toggle
+   @param   bApply should the GO-flags be applied or removed?
+ */
+void ScriptedInstance::DoToggleGameObjectFlags(ObjectGuid guid, uint32 uiGOflags, bool bApply)
+{
+    if (!guid)
+    {
+        return;
+    }
+
+    if (GameObject* pGo = instance->GetGameObject(guid))
+    {
+        if (bApply)
+        {
+            pGo->SetFlag(GAMEOBJECT_FLAGS, uiGOflags);
+        }
+        else
+        {
+            pGo->RemoveFlag(GAMEOBJECT_FLAGS, uiGOflags);
+        }
+    }
+}
+
+/// Function that respawns a despawned GO that is stored in m_mGoEntryGuidStore
+void ScriptedInstance::DoRespawnGameObject(uint32 uiEntry, uint32 uiTimeToDespawn)
+{
+    EntryGuidMap::iterator find = m_mGoEntryGuidStore.find(uiEntry);
+    if (find != m_mGoEntryGuidStore.end())
+    {
+        DoRespawnGameObject(find->second, uiTimeToDespawn);
+    }
+    else
+        // Output log, possible reason is not added GO to storage, or not yet loaded;
+    {
+        debug_log("SD3: Script call DoRespawnGameObject(by Entry), but no gameobject of entry %u was created yet, or it was not stored by script for map %u.", uiEntry, instance->GetId());
+    }
+}
+
+/**
+   Helper function to update a world state for all players in the map
+
+   @param   uiStateId The WorldState that will be set for all players in the map
+   @param   uiStateData The Value to which the State will be set to
+ */
+void ScriptedInstance::DoUpdateWorldState(uint32 uiStateId, uint32 uiStateData)
+{
+    Map::PlayerList const& lPlayers = instance->GetPlayers();
+
+    if (!lPlayers.isEmpty())
+    {
+        for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
+        {
+            if (Player* pPlayer = itr->getSource())
+            {
+                pPlayer->SendUpdateWorldState(uiStateId, uiStateData);
+            }
+        }
+    }
+    else
+    {
+        debug_log("SD3: DoUpdateWorldState attempt send data but no players in map.");
+    }
+}
+
+/// Get the first found Player* (with requested properties) in the map. Can return NULL.
+Player* ScriptedInstance::GetPlayerInMap(bool bOnlyAlive /*=false*/, bool bCanBeGamemaster /*=true*/)
+{
+    Map::PlayerList const& lPlayers = instance->GetPlayers();
+
+    for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
+    {
+        Player* pPlayer = itr->getSource();
+        if (pPlayer && (!bOnlyAlive || pPlayer->IsAlive()) && (bCanBeGamemaster || !pPlayer->isGameMaster()))
+        {
+            return pPlayer;
+        }
+    }
+
+    return NULL;
+}
+
+/// Returns a pointer to a loaded GameObject that was stored in m_mGoEntryGuidStore. Can return NULL
+GameObject* ScriptedInstance::GetSingleGameObjectFromStorage(uint32 uiEntry) const
+{
+    EntryGuidMap::const_iterator find = m_mGoEntryGuidStore.find(uiEntry);
+    if (find != m_mGoEntryGuidStore.end())
+    {
+        return instance->GetGameObject(find->second);
+    }
+
+    // Output log, possible reason is not added GO to map, or not yet loaded;
+    script_error_log("Script requested gameobject with entry %u, but no gameobject of this entry was created yet, or it was not stored by script for map %u.", uiEntry, instance->GetId());
+
+    return NULL;
+}
+
+/// Returns a pointer to a loaded Creature that was stored in m_mGoEntryGuidStore. Can return NULL
+Creature* ScriptedInstance::GetSingleCreatureFromStorage(uint32 uiEntry, bool bSkipDebugLog /*=false*/) const
+{
+    EntryGuidMap::const_iterator find = m_mNpcEntryGuidStore.find(uiEntry);
+    if (find != m_mNpcEntryGuidStore.end())
+    {
+        return instance->GetCreature(find->second);
+    }
+
+    // Output log, possible reason is not added GO to map, or not yet loaded;
+    if (!bSkipDebugLog)
+    {
+        script_error_log("Script requested creature with entry %u, but no npc of this entry was created yet, or it was not stored by script for map %u.", uiEntry, instance->GetId());
+    }
+
+    return NULL;
+}
+
+#if defined (WOTLK) || defined (CATA)
+/**
+   Helper function to start a timed achievement criteria for players in the map
+
+   @param   criteriaType The Type that is required to complete the criteria, see enum AchievementCriteriaTypes in MaNGOS
+   @param   uiTimedCriteriaMiscId The ID that identifies how the criteria is started
+ */
+void ScriptedInstance::DoStartTimedAchievement(AchievementCriteriaTypes criteriaType, uint32 uiTimedCriteriaMiscId)
+{
+    Map::PlayerList const& lPlayers = instance->GetPlayers();
+
+    if (!lPlayers.isEmpty())
+    {
+        for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
+        {
+            if (Player* pPlayer = itr->getSource())
+                pPlayer->StartTimedAchievementCriteria(criteriaType, uiTimedCriteriaMiscId);
+        }
+    }
+    else
+        debug_log("SD3: DoStartTimedAchievement attempt start achievements but no players in map.");
+}
+#endif
+
+/**
+   Constructor for DialogueHelper
+
+   @param   pDialogueArray The static const array of DialogueEntry holding the information about the dialogue. This array MUST be terminated by {0,0,0}
+ */
+DialogueHelper::DialogueHelper(DialogueEntry const* pDialogueArray) :
+    m_pInstance(NULL),
+    m_pDialogueArray(pDialogueArray),
+    m_pCurrentEntry(NULL),
+    m_pDialogueTwoSideArray(NULL),
+    m_pCurrentEntryTwoSide(NULL),
+    m_uiTimer(0),
+    m_bIsFirstSide(true),
+    m_bCanSimulate(false)
+{}
+
+/**
+   Constructor for DialogueHelper (Two Sides)
+
+   @param   pDialogueTwoSideArray The static const array of DialogueEntryTwoSide holding the information about the dialogue. This array MUST be terminated by {0,0,0,0,0}
+ */
+DialogueHelper::DialogueHelper(DialogueEntryTwoSide const* pDialogueTwoSideArray) :
+    m_pInstance(NULL),
+    m_pDialogueArray(NULL),
+    m_pCurrentEntry(NULL),
+    m_pDialogueTwoSideArray(pDialogueTwoSideArray),
+    m_pCurrentEntryTwoSide(NULL),
+    m_uiTimer(0),
+    m_bIsFirstSide(true),
+    m_bCanSimulate(false)
+{}
+
+/**
+   Function to start a (part of a) dialogue
+
+   @param   iTextEntry The TextEntry of the dialogue that will be started (must be always the entry of first side)
+ */
+void DialogueHelper::StartNextDialogueText(int32 iTextEntry)
+{
+    // Find iTextEntry
+    bool bFound = false;
+
+    if (m_pDialogueArray)                                   // One Side
+    {
+        for (DialogueEntry const* pEntry = m_pDialogueArray; pEntry->iTextEntry; ++pEntry)
+        {
+            if (pEntry->iTextEntry == iTextEntry)
+            {
+                m_pCurrentEntry = pEntry;
+                bFound = true;
+                break;
+            }
+        }
+    }
+    else                                                    // Two Sides
+    {
+        for (DialogueEntryTwoSide const* pEntry = m_pDialogueTwoSideArray; pEntry->iTextEntry; ++pEntry)
+        {
+            if (pEntry->iTextEntry == iTextEntry)
+            {
+                m_pCurrentEntryTwoSide = pEntry;
+                bFound = true;
+                break;
+            }
+        }
+    }
+
+    if (!bFound)
+    {
+        script_error_log("Script call DialogueHelper::StartNextDialogueText, but textEntry %i is not in provided dialogue (on map id %u)", iTextEntry, m_pInstance ? m_pInstance->instance->GetId() : 0);
+        return;
+    }
+
+    DoNextDialogueStep();
+}
+
+/// Internal helper function to do the actual say of a DialogueEntry
+void DialogueHelper::DoNextDialogueStep()
+{
+    // Last Dialogue Entry done?
+    if ((m_pCurrentEntry && !m_pCurrentEntry->iTextEntry) || (m_pCurrentEntryTwoSide && !m_pCurrentEntryTwoSide->iTextEntry))
+    {
+        m_uiTimer = 0;
+        return;
+    }
+
+    // Get Text, SpeakerEntry and Timer
+    int32 iTextEntry = 0;
+    uint32 uiSpeakerEntry = 0;
+
+    if (m_pDialogueArray)                               // One Side
+    {
+        uiSpeakerEntry = m_pCurrentEntry->uiSayerEntry;
+        iTextEntry = m_pCurrentEntry->iTextEntry;
+
+        m_uiTimer = m_pCurrentEntry->uiTimer;
+    }
+    else                                                // Two Sides
+    {
+        // Second Entries can be 0, if they are the entry from first side will be taken
+        uiSpeakerEntry = !m_bIsFirstSide && m_pCurrentEntryTwoSide->uiSayerEntryAlt ? m_pCurrentEntryTwoSide->uiSayerEntryAlt : m_pCurrentEntryTwoSide->uiSayerEntry;
+        iTextEntry = !m_bIsFirstSide && m_pCurrentEntryTwoSide->iTextEntryAlt ? m_pCurrentEntryTwoSide->iTextEntryAlt : m_pCurrentEntryTwoSide->iTextEntry;
+
+        m_uiTimer = m_pCurrentEntryTwoSide->uiTimer;
+    }
+
+    // Simulate Case
+    if (uiSpeakerEntry && iTextEntry < 0)
+    {
+        // Use Speaker if directly provided
+        Creature* pSpeaker = GetSpeakerByEntry(uiSpeakerEntry);
+        if (m_pInstance && !pSpeaker)                       // Get Speaker from instance
+        {
+            if (m_bCanSimulate)                             // Simulate case
+            {
+                m_pInstance->DoOrSimulateScriptTextForThisInstance(iTextEntry, uiSpeakerEntry);
+            }
+            else
+            {
+                pSpeaker = m_pInstance->GetSingleCreatureFromStorage(uiSpeakerEntry);
+            }
+        }
+
+        if (pSpeaker)
+        {
+            DoScriptText(iTextEntry, pSpeaker);
+        }
+    }
+
+    JustDidDialogueStep(m_pDialogueArray ?  m_pCurrentEntry->iTextEntry : m_pCurrentEntryTwoSide->iTextEntry);
+
+    // Increment position
+    if (m_pDialogueArray)
+    {
+        ++m_pCurrentEntry;
+    }
+    else
+    {
+        ++m_pCurrentEntryTwoSide;
+    }
+}
+
+/// Call this function within any DialogueUpdate method. This is required for saying next steps in a dialogue
+void DialogueHelper::DialogueUpdate(uint32 uiDiff)
+{
+    if (m_uiTimer)
+    {
+        if (m_uiTimer <= uiDiff)
+        {
+            DoNextDialogueStep();
+        }
+        else
+        {
+            m_uiTimer -= uiDiff;
+        }
+    }
+}
diff --git a/src/modules/SD3/include/sc_instance.h b/src/modules/SD3/include/sc_instance.h
new file mode 100644
index 000000000..78e99d836
--- /dev/null
+++ b/src/modules/SD3/include/sc_instance.h
@@ -0,0 +1,159 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef SC_INSTANCE_H
+#define SC_INSTANCE_H
+
+#include "InstanceData.h"
+#include "Map.h"
+
+enum EncounterState
+{
+    NOT_STARTED   = 0,
+    IN_PROGRESS   = 1,
+    FAIL          = 2,
+    DONE          = 3,
+    SPECIAL       = 4
+};
+
+#define OUT_SAVE_INST_DATA             debug_log("SD3: Saving Instance Data for Instance %s (Map %d, Instance Id %d)", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
+#define OUT_SAVE_INST_DATA_COMPLETE    debug_log("SD3: Saving Instance Data for Instance %s (Map %d, Instance Id %d) completed.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
+#define OUT_LOAD_INST_DATA(a)          debug_log("SD3: Loading Instance Data for Instance %s (Map %d, Instance Id %d). Input is '%s'", instance->GetMapName(), instance->GetId(), instance->GetInstanceId(), a)
+#define OUT_LOAD_INST_DATA_COMPLETE    debug_log("SD3: Instance Data for Instance %s (Map %d, Instance Id: %d) is loaded.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
+#define OUT_LOAD_INST_DATA_FAIL        script_error_log("Unable to load Instance Data for Instance %s (Map %d, Instance Id: %d).", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
+
+class ScriptedInstance : public InstanceData
+{
+    public:
+        ScriptedInstance(Map* pMap) : InstanceData(pMap) {}
+        ~ScriptedInstance() {}
+
+        // Default accessor functions
+        GameObject* GetSingleGameObjectFromStorage(uint32 uiEntry) const;
+        Creature* GetSingleCreatureFromStorage(uint32 uiEntry, bool bSkipDebugLog = false) const;
+
+        // Change active state of doors or buttons
+        void DoUseDoorOrButton(ObjectGuid guid, uint32 uiWithRestoreTime = 0, bool bUseAlternativeState = false);
+        void DoUseDoorOrButton(uint32 uiEntry, uint32 uiWithRestoreTime = 0, bool bUseAlternativeState = false);
+
+        // Respawns a GO having negative spawntimesecs in gameobject-table
+        void DoRespawnGameObject(ObjectGuid guid, uint32 uiTimeToDespawn = MINUTE);
+        void DoRespawnGameObject(uint32 uiEntry, uint32 uiTimeToDespawn = MINUTE);
+
+        // Toggle the flags of a GO
+        void DoToggleGameObjectFlags(ObjectGuid guid, uint32 uiGOflags, bool bApply);
+        void DoToggleGameObjectFlags(uint32 uiEntry, uint32 uiGOflags, bool bApply);
+
+        // Sends world state update to all players in instance
+        void DoUpdateWorldState(uint32 uiStateId, uint32 uiStateData);
+
+        // Get a Player from map
+        Player* GetPlayerInMap(bool bOnlyAlive = false, bool bCanBeGamemaster = true);
+
+        /// Wrapper for simulating map-wide text in this instance. It is expected that the Creature is stored in m_mNpcEntryGuidStore if loaded.
+        void DoOrSimulateScriptTextForThisInstance(int32 iTextEntry, uint32 uiCreatureEntry)
+        {
+            // Prevent debug output in GetSingleCreatureFromStorage
+            DoOrSimulateScriptTextForMap(iTextEntry, uiCreatureEntry, instance, GetSingleCreatureFromStorage(uiCreatureEntry, true));
+        }
+
+#if defined (WOTLK) || defined (CATA)
+        // Starts a timed achievement criteria for all players in instance
+        void DoStartTimedAchievement(AchievementCriteriaTypes criteriaType, uint32 uiTimedCriteriaMiscId);
+#endif
+
+    protected:
+        // Storage for GO-Guids and NPC-Guids
+        typedef std::map<uint32, ObjectGuid> EntryGuidMap;
+        EntryGuidMap m_mGoEntryGuidStore;                   ///< Store unique GO-Guids by entry
+        EntryGuidMap m_mNpcEntryGuidStore;                  ///< Store unique NPC-Guids by entry
+};
+
+// Class for world maps (May need additional zone-wide functions later on)
+class ScriptedMap : public ScriptedInstance
+{
+    public:
+        ScriptedMap(Map* pMap) : ScriptedInstance(pMap) {}
+};
+
+/// A static const array of this structure must be handled to DialogueHelper
+struct DialogueEntry
+{
+    int32 iTextEntry;                                       ///< To be said text entry
+    uint32 uiSayerEntry;                                    ///< Entry of the mob who should say
+    uint32 uiTimer;                                         ///< Time delay until next text of array is said (0 stops)
+};
+
+/// A static const array of this structure must be handled to DialogueHelper
+struct DialogueEntryTwoSide
+{
+    int32 iTextEntry;                                       ///< To be said text entry (first side)
+    uint32 uiSayerEntry;                                    ///< Entry of the mob who should say (first side)
+    int32 iTextEntryAlt;                                    ///< To be said text entry (second side)
+    uint32 uiSayerEntryAlt;                                 ///< Entry of the mob who should say (second side)
+    uint32 uiTimer;                                         ///< Time delay until next text of array is said (0 stops)
+};
+
+/// Helper class handling a dialogue given as static const array of DialogueEntry or DialogueEntryTwoSide
+class DialogueHelper
+{
+    public:
+        // The array MUST be terminated by {0,0,0}
+        DialogueHelper(DialogueEntry const* pDialogueArray);
+        // The array MUST be terminated by {0,0,0,0,0}
+        DialogueHelper(DialogueEntryTwoSide const* aDialogueTwoSide);
+
+        /// Function to initialize the dialogue helper for instances. If not used with instances, GetSpeakerByEntry MUST be overwritten to obtain the speakers
+        void InitializeDialogueHelper(ScriptedInstance* pInstance, bool bCanSimulateText = false) { m_pInstance = pInstance; m_bCanSimulate = bCanSimulateText; }
+        /// Set if take first entries or second entries
+        void SetDialogueSide(bool bIsFirstSide) { m_bIsFirstSide = bIsFirstSide; }
+
+        void StartNextDialogueText(int32 iTextEntry);
+
+        void DialogueUpdate(uint32 uiDiff);
+
+    protected:
+        /// Will be called when a dialogue step was done
+        virtual void JustDidDialogueStep(int32 /*iEntry*/) {}
+        /// Will be called to get a speaker, MUST be implemented if not used in instances
+        virtual Creature* GetSpeakerByEntry(uint32 /*uiEntry*/) { return NULL; }
+
+    private:
+        void DoNextDialogueStep();
+
+        ScriptedInstance* m_pInstance;
+
+        DialogueEntry const* m_pDialogueArray;
+        DialogueEntry const* m_pCurrentEntry;
+        DialogueEntryTwoSide const* m_pDialogueTwoSideArray;
+        DialogueEntryTwoSide const* m_pCurrentEntryTwoSide;
+
+        uint32 m_uiTimer;
+        bool m_bIsFirstSide;
+        bool m_bCanSimulate;
+};
+
+#endif
diff --git a/src/modules/SD3/precompiled.cpp b/src/modules/SD3/precompiled.cpp
new file mode 100644
index 000000000..78c5d479b
--- /dev/null
+++ b/src/modules/SD3/precompiled.cpp
@@ -0,0 +1,27 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#include "precompiled.h"
diff --git a/src/modules/SD3/precompiled.h b/src/modules/SD3/precompiled.h
new file mode 100644
index 000000000..414cbfd5d
--- /dev/null
+++ b/src/modules/SD3/precompiled.h
@@ -0,0 +1,46 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef SC_PRECOMPILED_H
+#define SC_PRECOMPILED_H
+
+#include "system/ScriptDevMgr.h"
+#include "Object.h"
+#include "Unit.h"
+#include "Creature.h"
+#include "CreatureAI.h"
+#include "GameObject.h"
+#include "sc_creature.h"
+#include "sc_gossip.h"
+#include "sc_grid_searchers.h"
+#include "sc_instance.h"
+#include "SpellAuras.h"
+#include "World.h"
+
+// sc_gossip.h:             ADD_GOSSIP_ITEM_EXTENDED outcommented box-money (Required until professions are fixed)
+// sc_creature.cpp:         Used in ScriptedAI::SelectSpell, outcommented SchoolMask
+
+#endif
diff --git a/src/modules/SD3/scripts/battlegrounds/battleground.cpp b/src/modules/SD3/scripts/battlegrounds/battleground.cpp
new file mode 100644
index 000000000..dc69c4d82
--- /dev/null
+++ b/src/modules/SD3/scripts/battlegrounds/battleground.cpp
@@ -0,0 +1,145 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Battleground
+ * SD%Complete: 100
+ * SDComment:   Spirit guides in battlegrounds will revive all players every 30 sec.
+ * SDCategory:  Battlegrounds
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+/**
+ * Script Info
+ *
+ * Spirit guides in battlegrounds resurrecting many players at once every 30
+ * seconds through a channeled spell, which gets autocasted the whole time.
+ *
+ * If a spirit guide despawns all players around him will get teleported to
+ * the next spirit guide.
+ *
+ * this script handles gossipHello and JustDied also allows autocast of the
+ * channeled spell.
+ */
+
+enum
+{
+    SPELL_SPIRIT_HEAL_CHANNEL       = 22011,                // Spirit Heal Channel
+
+    SPELL_SPIRIT_HEAL               = 22012,                // Spirit Heal
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    SPELL_SPIRIT_HEAL_MANA          = 44535,                // in battlegrounds player get this no-mana-cost-buff
+#endif
+
+    SPELL_WAITING_TO_RESURRECT      = 2584                  // players who cancel this aura don't want a resurrection
+};
+
+struct npc_spirit_guide : public CreatureScript
+{
+    npc_spirit_guide() : CreatureScript("npc_spirit_guide") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* /*pCreature*/) override
+    {
+        pPlayer->CastSpell(pPlayer, SPELL_WAITING_TO_RESURRECT, true);
+        return true;
+    }
+
+    struct npc_spirit_guideAI : public ScriptedAI
+    {
+        npc_spirit_guideAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            pCreature->SetActiveObjectState(true);
+            Reset();
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            // auto cast the whole time this spell
+            if (!m_creature->GetCurrentSpell(CURRENT_CHANNELED_SPELL))
+            {
+                m_creature->CastSpell(m_creature, SPELL_SPIRIT_HEAL_CHANNEL, false);
+            }
+        }
+
+        void CorpseRemoved(uint32&) override
+        {
+            // TODO: would be better to cast a dummy spell
+            Map* pMap = m_creature->GetMap();
+
+            if (!pMap || !pMap->IsBattleGround())
+            {
+                return;
+            }
+
+            Map::PlayerList const& PlayerList = pMap->GetPlayers();
+
+            for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr)
+            {
+                Player* pPlayer = itr->getSource();
+                if (!pPlayer || !pPlayer->IsWithinDistInMap(m_creature, 20.0f) || !pPlayer->HasAura(SPELL_WAITING_TO_RESURRECT))
+                {
+                    continue;
+                }
+
+                // repop player again - now this node won't be counted and another node is searched
+                pPlayer->RepopAtGraveyard();
+            }
+        }
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+        void SpellHitTarget(Unit* pUnit, const SpellEntry* pSpellEntry) override
+        {
+            if (pSpellEntry->Id == SPELL_SPIRIT_HEAL && pUnit->GetTypeId() == TYPEID_PLAYER
+                && pUnit->HasAura(SPELL_WAITING_TO_RESURRECT))
+            { pUnit->CastSpell(pUnit, SPELL_SPIRIT_HEAL_MANA, true); }
+        }
+#endif
+    };
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_spirit_guideAI(pCreature);
+    }
+#endif
+};
+
+void AddSC_battleground()
+{
+    Script *s;
+    s = new npc_spirit_guide();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_spirit_guide";
+    //pNewScript->GetAI = &GetAI_npc_spirit_guide;
+    //pNewScript->pGossipHello = &GossipHello_npc_spirit_guide;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/alterac_mountains.cpp b/src/modules/SD3/scripts/eastern_kingdoms/alterac_mountains.cpp
new file mode 100644
index 000000000..c169a3aaa
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/alterac_mountains.cpp
@@ -0,0 +1,45 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Alterac_Mountains
+ * SD%Complete: 0
+ * SDComment:   Placeholder
+ * SDCategory:  Alterac Mountains
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+void AddSC_alterac_mountains()
+{
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/arathi_highlands.cpp b/src/modules/SD3/scripts/eastern_kingdoms/arathi_highlands.cpp
new file mode 100644
index 000000000..e05c94e03
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/arathi_highlands.cpp
@@ -0,0 +1,326 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Arathi Highlands
+ * SD%Complete: 100
+ * SDComment:   Quest support: 660, 665
+ * SDCategory:  Arathi Highlands
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_professor_phizzlethorpe
+ * npc_kinelory
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_professor_phizzlethorpe
+######*/
+
+enum
+{
+    SAY_PROGRESS_1          = -1000264,
+    SAY_PROGRESS_2          = -1000265,
+    SAY_PROGRESS_3          = -1000266,
+    EMOTE_PROGRESS_4        = -1000267,
+    SAY_AGGRO               = -1000268,
+    SAY_PROGRESS_5          = -1000269,
+    SAY_PROGRESS_6          = -1000270,
+    SAY_PROGRESS_7          = -1000271,
+    EMOTE_PROGRESS_8        = -1000272,
+    SAY_PROGRESS_9          = -1000273,
+
+    QUEST_SUNKEN_TREASURE   = 665,
+    ENTRY_VENGEFUL_SURGE    = 2776
+};
+
+struct npc_professor_phizzlethorpe : public CreatureScript
+{
+    npc_professor_phizzlethorpe() : CreatureScript("npc_professor_phizzlethorpe") {}
+
+    struct npc_professor_phizzlethorpeAI : public npc_escortAI
+    {
+        npc_professor_phizzlethorpeAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 4:
+                DoScriptText(SAY_PROGRESS_2, m_creature, pPlayer);
+                break;
+            case 5:
+                DoScriptText(SAY_PROGRESS_3, m_creature, pPlayer);
+                break;
+            case 8:
+                DoScriptText(EMOTE_PROGRESS_4, m_creature);
+                break;
+            case 9:
+                m_creature->SummonCreature(ENTRY_VENGEFUL_SURGE, -2056.41f, -2144.01f, 20.59f, 5.70f, TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN, 600000);
+                m_creature->SummonCreature(ENTRY_VENGEFUL_SURGE, -2050.17f, -2140.02f, 19.54f, 5.17f, TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN, 600000);
+                break;
+            case 10:
+                DoScriptText(SAY_PROGRESS_5, m_creature, pPlayer);
+                break;
+            case 11:
+                DoScriptText(SAY_PROGRESS_6, m_creature, pPlayer);
+                SetRun();
+                break;
+            case 19:
+                DoScriptText(SAY_PROGRESS_7, m_creature, pPlayer);
+                break;
+            case 20:
+                DoScriptText(EMOTE_PROGRESS_8, m_creature);
+                DoScriptText(SAY_PROGRESS_9, m_creature, pPlayer);
+                pPlayer->GroupEventHappens(QUEST_SUNKEN_TREASURE, m_creature);
+                break;
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_SUNKEN_TREASURE)
+        {
+            pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+            DoScriptText(SAY_PROGRESS_1, pCreature, pPlayer);
+
+            if (npc_professor_phizzlethorpeAI* pEscortAI = dynamic_cast<npc_professor_phizzlethorpeAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest, true);
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_professor_phizzlethorpeAI(pCreature);
+    }
+};
+
+/*######
+## npc_kinelory
+######*/
+
+enum
+{
+    SAY_START               = -1000948,
+    SAY_REACH_BOTTOM        = -1000949,
+    SAY_AGGRO_KINELORY      = -1000950,
+    SAY_AGGRO_JORELL        = -1000951,
+    SAY_WATCH_BACK          = -1000952,
+    EMOTE_BELONGINGS        = -1000953,
+    SAY_DATA_FOUND          = -1000954,
+    SAY_ESCAPE              = -1000955,
+    SAY_FINISH              = -1000956,
+    EMOTE_HAND_PACK         = -1000957,
+
+    SPELL_REJUVENATION      = 3627,
+    SPELL_BEAR_FORM         = 4948,
+
+    NPC_JORELL              = 2733,
+    NPC_QUAE                = 2712,
+
+    QUEST_HINTS_NEW_PLAGUE  = 660
+};
+
+struct npc_kinelory : public CreatureScript
+{
+    npc_kinelory() : CreatureScript("npc_kinelory") {}
+
+    struct npc_kineloryAI : public npc_escortAI
+    {
+        npc_kineloryAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        uint32 m_uiBearFormTimer;
+        uint32 m_uiHealTimer;
+
+        void Reset() override
+        {
+            m_uiBearFormTimer = urand(5000, 7000);
+            m_uiHealTimer = urand(2000, 5000);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 9:
+                DoScriptText(SAY_REACH_BOTTOM, m_creature);
+                break;
+            case 16:
+                DoScriptText(SAY_WATCH_BACK, m_creature);
+                DoScriptText(EMOTE_BELONGINGS, m_creature);
+                break;
+            case 17:
+                DoScriptText(SAY_DATA_FOUND, m_creature);
+                break;
+            case 18:
+                DoScriptText(SAY_ESCAPE, m_creature);
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    m_creature->SetFacingToObject(pPlayer);
+                }
+                SetRun();
+                break;
+            case 33:
+                DoScriptText(SAY_FINISH, m_creature);
+                if (Creature* pQuae = GetClosestCreatureWithEntry(m_creature, NPC_QUAE, 10.0f))
+                {
+                    DoScriptText(EMOTE_HAND_PACK, m_creature, pQuae);
+                    m_creature->SetFacingToObject(pQuae);
+                }
+                break;
+            case 34:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_HINTS_NEW_PLAGUE, m_creature);
+                }
+                break;
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (pWho->GetEntry() == NPC_JORELL)
+            {
+                DoScriptText(SAY_AGGRO_JORELL, pWho, m_creature);
+            }
+            else if (roll_chance_i(10))
+            {
+                DoScriptText(SAY_AGGRO_KINELORY, m_creature);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoScriptText(SAY_START, m_creature);
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue), true);
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiBearFormTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BEAR_FORM) == CAST_OK)
+                {
+                    m_uiBearFormTimer = urand(25000, 30000);
+                }
+            }
+            else
+            {
+                m_uiBearFormTimer -= uiDiff;
+            }
+
+            if (m_uiHealTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(40.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_REJUVENATION) == CAST_OK)
+                    {
+                        m_uiHealTimer = urand(15000, 25000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiHealTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kineloryAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_HINTS_NEW_PLAGUE)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_arathi_highlands()
+{
+    Script* s;
+    s = new npc_professor_phizzlethorpe();
+    s->RegisterSelf();
+    s = new npc_kinelory();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_professor_phizzlethorpe";
+    //pNewScript->GetAI = &GetAI_npc_professor_phizzlethorpe;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_professor_phizzlethorpe;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kinelory";
+    //pNewScript->GetAI = &GetAI_npc_kinelory;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_kinelory;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/blackrock_depths.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/blackrock_depths.cpp
new file mode 100644
index 000000000..cf494ef24
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/blackrock_depths.cpp
@@ -0,0 +1,1332 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Blackrock_Depths
+ * SD%Complete: 80
+ * SDComment:   Quest support: 4001, 4322, 4342, 7604, 9015.
+ * SDCategory:  Blackrock Depths
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * go_shadowforge_brazier
+ * go_relic_coffer_door
+ * at_ring_of_law
+ * npc_grimstone
+ * npc_kharan_mighthammer
+ * npc_marshal_windsor
+ * npc_dughal_stormwing
+ * npc_tobias_seecher
+ * boss_doomrel
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "blackrock_depths.h"
+#include "escort_ai.h"
+
+/*######
+## go_shadowforge_brazier
+######*/
+
+struct go_shadowforge_brazier : public GameObjectScript
+{
+    go_shadowforge_brazier() : GameObjectScript("go_shadowforge_brazier") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_LYCEUM) == IN_PROGRESS)
+            {
+                pInstance->SetData(TYPE_LYCEUM, DONE);
+            }
+            else
+            {
+                pInstance->SetData(TYPE_LYCEUM, IN_PROGRESS);
+            }
+        }
+        return false;
+    }
+};
+
+/*######
+## go_relic_coffer_door
+######*/
+
+struct go_relic_coffer_door : public GameObjectScript
+{
+    go_relic_coffer_door() : GameObjectScript("go_relic_coffer_door") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData())
+        {
+            // check if the event is already done
+            if (pInstance->GetData(TYPE_VAULT) != DONE && pInstance->GetData(TYPE_VAULT) != IN_PROGRESS)
+            {
+                pInstance->SetData(TYPE_VAULT, SPECIAL);
+            }
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_grimstone
+######*/
+
+/* Notes about this event:
+ * Visual: Npc Grimstone should use some visual spell when appear/ disappear / opening/ closing doors
+ * Texts: The texts and their positions need confirmation
+ * Event timer might also need adjustment
+ * Quest-Event: This needs to be clearified - there is some suggestion, that Theldren&Adds also might come as first wave.
+ */
+
+enum
+{
+    SAY_START_1                     = -1230004,
+    SAY_START_2                     = -1230005,
+    SAY_OPEN_EAST_GATE              = -1230006,
+    SAY_SUMMON_BOSS_1               = -1230007,
+    SAY_SUMMON_BOSS_2               = -1230008,
+    SAY_OPEN_NORTH_GATE             = -1230009,
+
+    NPC_GRIMSTONE                   = 10096,
+    DATA_BANNER_BEFORE_EVENT        = 5,
+
+    // 4 or 6 in total? 1+2+1 / 2+2+2 / 3+3. Depending on this, code should be changed.
+    MAX_MOB_AMOUNT                  = 4,
+    MAX_THELDREN_ADDS               = 4,
+    MAX_POSSIBLE_THELDREN_ADDS      = 8,
+
+    SPELL_SUMMON_THELRIN_DND        = 27517,
+    /* Other spells used by Grimstone
+    SPELL_ASHCROMBES_TELEPORT_A     = 15742
+    SPELL_ASHCROMBES_TELEPORT_B     = 6422,
+    SPELL_ARENA_FLASH_A             = 15737,
+    SPELL_ARENA_FLASH_B             = 15739,
+    */
+
+    QUEST_THE_CHALLENGE             = 9015,
+    NPC_THELDREN_QUEST_CREDIT       = 16166,
+};
+
+enum SpawnPosition
+{
+    POS_EAST                        = 0,
+    POS_NORTH                       = 1,
+    POS_GRIMSTONE                   = 2,
+};
+
+static const float aSpawnPositions[3][4] =
+{
+    {608.960f, -235.322f, -53.907f, 1.857f},                // Ring mob spawn position
+    {644.300f, -175.989f, -53.739f, 3.418f},                // Ring boss spawn position
+    {625.559f, -205.618f, -52.735f, 2.609f}                 // Grimstone spawn position
+};
+
+static const uint32 aGladiator[MAX_POSSIBLE_THELDREN_ADDS] = {NPC_LEFTY, NPC_ROTFANG, NPC_SNOKH, NPC_MALGEN, NPC_KORV, NPC_REZZNIK, NPC_VAJASHNI, NPC_VOLIDA};
+static const uint32 aRingMob[] = {NPC_WORM, NPC_STINGER, NPC_SCREECHER, NPC_THUNDERSNOUT, NPC_CREEPER, NPC_BEETLE};
+static const uint32 aRingBoss[] = {NPC_GOROSH, NPC_GRIZZLE, NPC_EVISCERATOR, NPC_OKTHOR, NPC_ANUBSHIAH, NPC_HEDRUM};
+
+enum Phases
+{
+    PHASE_MOBS                      = 0,
+    PHASE_BOSS                      = 2,
+    PHASE_GLADIATORS                = 3,
+};
+
+struct at_ring_of_law : public AreaTriggerScript
+{
+    at_ring_of_law() : AreaTriggerScript("at_ring_of_law") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_RING_OF_LAW) == IN_PROGRESS || pInstance->GetData(TYPE_RING_OF_LAW) == DONE || pInstance->GetData(TYPE_RING_OF_LAW) == SPECIAL)
+            {
+                return false;
+            }
+
+            if (pPlayer->isGameMaster())
+            {
+                return false;
+            }
+
+            pInstance->SetData(TYPE_RING_OF_LAW, pInstance->GetData(TYPE_RING_OF_LAW) == DATA_BANNER_BEFORE_EVENT ? SPECIAL : IN_PROGRESS);
+
+            pPlayer->SummonCreature(NPC_GRIMSTONE, aSpawnPositions[POS_GRIMSTONE][0], aSpawnPositions[POS_GRIMSTONE][1], aSpawnPositions[POS_GRIMSTONE][2], aSpawnPositions[POS_GRIMSTONE][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+            pInstance->SetData(TYPE_SIGNAL, pAt->id);
+            //pInstance->SetArenaCenterCoords(pAt->x, pAt->y, pAt->z);
+
+            return false;
+        }
+        return false;
+    }
+};
+
+/*######
+## npc_grimstone
+######*/
+
+struct npc_grimstone : public CreatureScript
+{
+    npc_grimstone() : CreatureScript("npc_grimstone") {}
+
+    struct npc_grimstoneAI : public npc_escortAI
+    {
+        npc_grimstoneAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_uiMobSpawnId = urand(0, 5);
+            // Select MAX_THELDREN_ADDS(4) random adds for Theldren encounter
+            uint8 uiCount = 0;
+            for (uint8 i = 0; i < MAX_POSSIBLE_THELDREN_ADDS && uiCount < MAX_THELDREN_ADDS; ++i)
+            {
+                if (urand(0, 1) || i >= MAX_POSSIBLE_THELDREN_ADDS - MAX_THELDREN_ADDS + uiCount)
+                {
+                    m_uiGladiatorId[uiCount] = aGladiator[i];
+                    ++uiCount;
+                }
+            }
+
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiEventPhase;
+        uint32 m_uiEventTimer;
+
+        uint8 m_uiMobSpawnId;
+        uint8 m_uiMobDeadCount;
+
+        Phases m_uiPhase;
+
+        uint32 m_uiGladiatorId[MAX_THELDREN_ADDS];
+
+        GuidList m_lSummonedGUIDList;
+
+        void Reset() override
+        {
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+            m_uiEventTimer    = 1000;
+            m_uiEventPhase    = 0;
+            m_uiMobDeadCount  = 0;
+
+            m_uiPhase = PHASE_MOBS;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // Ring mob or boss summoned
+            float fcX, fcY, fcZ;
+            //m_pInstance->GetArenaCenterCoords(fX, fY, fZ);
+            AreaTriggerEntry const *at = sAreaTriggerStore.LookupEntry(m_pInstance->GetData(TYPE_SIGNAL));
+            if (at)
+            {
+                m_creature->GetRandomPoint(at->x, at->y, at->z, 10.0f, fcX, fcY, fcZ);
+                pSummoned->GetMotionMaster()->MovePoint(1, fcX, fcY, fcZ);
+            }
+
+            m_lSummonedGUIDList.push_back(pSummoned->GetObjectGuid());
+        }
+
+        void DoChallengeQuestCredit()
+        {
+            Map::PlayerList const& PlayerList = m_creature->GetMap()->GetPlayers();
+
+            for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr)
+            {
+                Player* pPlayer = itr->getSource();
+                if (pPlayer && pPlayer->GetQuestStatus(QUEST_THE_CHALLENGE) == QUEST_STATUS_INCOMPLETE)
+                {
+                    pPlayer->KilledMonsterCredit(NPC_THELDREN_QUEST_CREDIT);
+                }
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* /*pSummoned*/) override
+        {
+            ++m_uiMobDeadCount;
+
+            switch (m_uiPhase)
+            {
+                case PHASE_MOBS:                                // Ring mob killed
+                    if (m_uiMobDeadCount == MAX_MOB_AMOUNT)
+                    {
+                        m_uiEventTimer = 5000;
+                        m_uiMobDeadCount = 0;
+                    }
+                    break;
+                case PHASE_BOSS:                                // Ring boss killed
+                    // One Boss
+                    if (m_uiMobDeadCount == 1)
+                    {
+                        m_uiEventTimer = 5000;
+                        m_uiMobDeadCount = 0;
+                    }
+                    break;
+                case PHASE_GLADIATORS:                          // Theldren and his band killed
+                    // Adds + Theldren
+                    if (m_uiMobDeadCount == MAX_THELDREN_ADDS + 1)
+                    {
+                        m_uiEventTimer = 5000;
+                        m_uiMobDeadCount = 0;
+                        DoChallengeQuestCredit();
+                    }
+                    break;
+            }
+        }
+
+        void SummonRingMob(uint32 uiEntry, SpawnPosition uiPosition)
+        {
+            float fX, fY, fZ;
+            m_creature->GetRandomPoint(aSpawnPositions[uiPosition][0], aSpawnPositions[uiPosition][1], aSpawnPositions[uiPosition][2], 2.0f, fX, fY, fZ);
+            m_creature->SummonCreature(uiEntry, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+                case 0:                                         // Middle reached first time
+                    DoScriptText(urand(0, 1) ? SAY_START_1 : SAY_START_2, m_creature);
+                    SetEscortPaused(true);
+                    m_uiEventTimer = 5000;
+                    break;
+                case 1:                                         // Reached wall again
+                    DoScriptText(SAY_OPEN_EAST_GATE, m_creature);
+                    SetEscortPaused(true);
+                    m_uiEventTimer = 5000;
+                    break;
+                case 2:                                         // walking along the wall, while door opened
+                    SetEscortPaused(true);
+                    break;
+                case 3:                                         // Middle reached second time
+                    DoScriptText(urand(0, 1) ? SAY_SUMMON_BOSS_1 : SAY_SUMMON_BOSS_2, m_creature);
+                    break;
+                case 4:                                         // Reached North Gate
+                    DoScriptText(SAY_OPEN_NORTH_GATE, m_creature);
+                    SetEscortPaused(true);
+                    m_uiEventTimer = 5000;
+                    break;
+                case 5:
+                    if (m_pInstance)
+                    {
+                        m_pInstance->SetData(TYPE_RING_OF_LAW, DONE);
+                        debug_log("SD3: npc_grimstone: event reached end and set complete.");
+                    }
+                    break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            if (m_pInstance->GetData(TYPE_RING_OF_LAW) == FAIL)
+            {
+                // Reset Doors
+                if (m_uiEventPhase >= 9)                        // North Gate is opened
+                {
+                    m_pInstance->DoUseDoorOrButton(GO_ARENA_2);
+                    m_pInstance->DoUseDoorOrButton(GO_ARENA_4);
+                }
+                else if (m_uiEventPhase >= 4)                   // East Gate is opened
+                {
+                    m_pInstance->DoUseDoorOrButton(GO_ARENA_1);
+                    m_pInstance->DoUseDoorOrButton(GO_ARENA_4);
+                }
+
+                // Despawn Summoned Mobs
+                for (GuidList::const_iterator itr = m_lSummonedGUIDList.begin(); itr != m_lSummonedGUIDList.end(); ++itr)
+                {
+                    if (Creature* pSummoned = m_creature->GetMap()->GetCreature(*itr))
+                    {
+                        pSummoned->ForcedDespawn();
+                    }
+                }
+                m_lSummonedGUIDList.clear();
+
+                // Despawn NPC
+                m_creature->ForcedDespawn();
+                return;
+            }
+
+            if (m_uiEventTimer)
+            {
+                if (m_uiEventTimer <= uiDiff)
+                {
+                    switch (m_uiEventPhase)
+                    {
+                        case 0:
+                            // Shortly after spawn, start walking
+                            // DoScriptText(-1000000, m_creature); // no more text on spawn
+                            m_pInstance->DoUseDoorOrButton(GO_ARENA_4);
+                            Start(false);
+                            SetEscortPaused(false);
+                            m_uiEventTimer = 0;
+                            break;
+                        case 1:
+                            // Start walking towards wall
+                            SetEscortPaused(false);
+                            m_uiEventTimer = 0;
+                            break;
+                        case 2:
+                            m_uiEventTimer = 2000;
+                            break;
+                        case 3:
+                            // Open East Gate
+                            m_pInstance->DoUseDoorOrButton(GO_ARENA_1);
+                            m_uiEventTimer = 3000;
+                            break;
+                        case 4:
+                            SetEscortPaused(false);
+                            m_creature->SetVisibility(VISIBILITY_OFF);
+                            // Summon Ring Mob(s)
+                            SummonRingMob(aRingMob[m_uiMobSpawnId], POS_EAST);
+                            m_uiEventTimer = 8000;
+                            break;
+                        case 5:
+                            // Summon Ring Mob(s)
+                            SummonRingMob(aRingMob[m_uiMobSpawnId], POS_EAST);
+                            SummonRingMob(aRingMob[m_uiMobSpawnId], POS_EAST);
+                            m_uiEventTimer = 8000;
+                            break;
+                        case 6:
+                            // Summon Ring Mob(s)
+                            SummonRingMob(aRingMob[m_uiMobSpawnId], POS_EAST);
+                            m_uiEventTimer = 0;
+                            break;
+                        case 7:
+                            // Summoned Mobs are dead, continue event
+                            m_creature->SetVisibility(VISIBILITY_ON);
+                            m_pInstance->DoUseDoorOrButton(GO_ARENA_1);
+                            // DoScriptText(-1000000, m_creature); // after killed the mobs, no say here
+                            SetEscortPaused(false);
+                            m_uiEventTimer = 0;
+                            break;
+                        case 8:
+                            // Open North Gate
+                            m_pInstance->DoUseDoorOrButton(GO_ARENA_2);
+                            m_uiEventTimer = 5000;
+                            break;
+                        case 9:
+                            // Summon Boss
+                            m_creature->SetVisibility(VISIBILITY_OFF);
+                            // If banner summoned after start, then summon Thelden after the creatures are dead
+                            if (m_pInstance->GetData(TYPE_RING_OF_LAW) == SPECIAL && m_uiPhase == PHASE_MOBS)
+                            {
+                                m_uiPhase = PHASE_GLADIATORS;
+                                SummonRingMob(NPC_THELDREN, POS_NORTH);
+                                for (uint8 i = 0; i < MAX_THELDREN_ADDS; ++i)
+                                {
+                                    SummonRingMob(m_uiGladiatorId[i], POS_NORTH);
+                                }
+                            }
+                            else
+                            {
+                                m_uiPhase = PHASE_BOSS;
+                                SummonRingMob(aRingBoss[urand(0, 5)], POS_NORTH);
+                            }
+                            m_uiEventTimer = 0;
+                            break;
+                        case 10:
+                            // Boss dead
+                            m_lSummonedGUIDList.clear();
+                            m_pInstance->DoUseDoorOrButton(GO_ARENA_2);
+                            m_pInstance->DoUseDoorOrButton(GO_ARENA_3);
+                            m_pInstance->DoUseDoorOrButton(GO_ARENA_4);
+                            SetEscortPaused(false);
+                            m_uiEventTimer = 0;
+                            break;
+                    }
+                    ++m_uiEventPhase;
+                }
+                else
+                {
+                    m_uiEventTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_grimstoneAI(pCreature);
+    }
+};
+
+struct spell_banner_of_provocation : public SpellScript
+{
+    spell_banner_of_provocation() : SpellScript("spell_banner_of_provocation") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_SUMMON_THELRIN_DND && uiEffIndex == EFFECT_INDEX_1)
+        {
+            InstanceData* pInstance = pCreatureTarget->ToCreature()->GetInstanceData();
+            if (pInstance && pInstance->GetData(TYPE_RING_OF_LAW) != DONE && pInstance->GetData(TYPE_RING_OF_LAW) != SPECIAL)
+            {
+                pInstance->SetData(TYPE_RING_OF_LAW, pInstance->GetData(TYPE_RING_OF_LAW) == IN_PROGRESS ? uint32(SPECIAL) : uint32(DATA_BANNER_BEFORE_EVENT));
+            }
+
+            return true;
+        }
+        return false;
+    }
+};
+
+/*######
+## npc_kharan_mighthammer
+######*/
+enum
+{
+    QUEST_WHAT_IS_GOING_ON = 4001,
+    QUEST_KHARANS_TALE     = 4342
+};
+
+#define GOSSIP_ITEM_KHARAN_1    "I need to know where the princess are, Kharan!"
+#define GOSSIP_ITEM_KHARAN_2    "All is not lost, Kharan!"
+
+#define GOSSIP_ITEM_KHARAN_3    "Gor'shak is my friend, you can trust me."
+#define GOSSIP_ITEM_KHARAN_4    "Not enough, you need to tell me more."
+#define GOSSIP_ITEM_KHARAN_5    "So what happened?"
+#define GOSSIP_ITEM_KHARAN_6    "Continue..."
+#define GOSSIP_ITEM_KHARAN_7    "So you suspect that someone on the inside was involved? That they were tipped off?"
+#define GOSSIP_ITEM_KHARAN_8    "Continue with your story please."
+#define GOSSIP_ITEM_KHARAN_9    "Indeed."
+#define GOSSIP_ITEM_KHARAN_10   "The door is open, Kharan. You are a free man."
+
+struct npc_kharan_mighthammer : public CreatureScript
+{
+    npc_kharan_mighthammer() : CreatureScript("npc_kharan_mighthammer") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature)
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+
+        if (pPlayer->GetQuestStatus(QUEST_WHAT_IS_GOING_ON) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        if (pPlayer->GetQuestStatus(QUEST_KHARANS_TALE) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+        }
+
+        if (pPlayer->GetTeam() == HORDE)
+        {
+            pPlayer->SEND_GOSSIP_MENU(2473, pCreature->GetObjectGuid());
+        }
+        else
+        {
+            pPlayer->SEND_GOSSIP_MENU(2474, pCreature->GetObjectGuid());
+        }
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(2475, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(2476, pCreature->GetObjectGuid());
+            break;
+
+        case GOSSIP_ACTION_INFO_DEF + 3:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(2477, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 4:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(2478, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 5:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->SEND_GOSSIP_MENU(2479, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 6:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->SEND_GOSSIP_MENU(2480, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 7:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->SEND_GOSSIP_MENU(2481, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 8:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->SEND_GOSSIP_MENU(2482, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 9:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            if (pPlayer->GetTeam() == HORDE)
+            {
+                pPlayer->AreaExploredOrEventHappens(QUEST_WHAT_IS_GOING_ON);
+            }
+            else
+            {
+                pPlayer->AreaExploredOrEventHappens(QUEST_KHARANS_TALE);
+            }
+            break;
+        }
+        return true;
+    }
+};
+
+/*######
+## npc_rocknot
+######*/
+
+enum
+{
+    SAY_GOT_BEER       = -1230000,
+
+    SPELL_DRUNKEN_RAGE = 14872,
+
+    QUEST_ALE          = 4295
+};
+
+struct npc_rocknot : public CreatureScript
+{
+    npc_rocknot() : CreatureScript("npc_rocknot") {}
+
+    struct npc_rocknotAI : public npc_escortAI
+    {
+        npc_rocknotAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiBreakKegTimer;
+        uint32 m_uiBreakDoorTimer;
+
+        void Reset() override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                return;
+            }
+
+            m_uiBreakKegTimer = 0;
+            m_uiBreakDoorTimer = 0;
+        }
+
+        void DoGo(uint32 id, uint32 state)
+        {
+            if (GameObject* pGo = m_pInstance->GetSingleGameObjectFromStorage(id))
+            {
+                pGo->SetGoState(GOState(state));
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 1:
+                m_creature->HandleEmote(EMOTE_ONESHOT_KICK);
+                break;
+            case 2:
+                m_creature->HandleEmote(EMOTE_ONESHOT_ATTACKUNARMED);
+                break;
+            case 3:
+                m_creature->HandleEmote(EMOTE_ONESHOT_ATTACKUNARMED);
+                break;
+            case 4:
+                m_creature->HandleEmote(EMOTE_ONESHOT_KICK);
+                break;
+            case 5:
+                m_creature->HandleEmote(EMOTE_ONESHOT_KICK);
+                m_uiBreakKegTimer = 2000;
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            if (m_uiBreakKegTimer)
+            {
+                if (m_uiBreakKegTimer <= uiDiff)
+                {
+                    DoGo(GO_BAR_KEG_SHOT, 0);
+                    m_uiBreakKegTimer = 0;
+                    m_uiBreakDoorTimer = 1000;
+                }
+                else
+                {
+                    m_uiBreakKegTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiBreakDoorTimer)
+            {
+                if (m_uiBreakDoorTimer <= uiDiff)
+                {
+                    DoGo(GO_BAR_DOOR, 2);
+                    DoGo(GO_BAR_KEG_TRAP, 0);                   // doesn't work very well, leaving code here for future
+                    // spell by trap has effect61, this indicate the bar go hostile
+
+                    if (Creature* pTmp = m_pInstance->GetSingleCreatureFromStorage(NPC_PHALANX))
+                    {
+                        pTmp->SetFactionTemporary(14, TEMPFACTION_NONE);
+                    }
+
+                    // for later, this event(s) has alot more to it.
+                    // optionally, DONE can trigger bar to go hostile.
+                    m_pInstance->SetData(TYPE_BAR, DONE);
+
+                    m_uiBreakDoorTimer = 0;
+                }
+                else
+                {
+                    m_uiBreakDoorTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_rocknotAI(pCreature);
+    }
+
+    bool OnQuestRewarded(Player* /*pPlayer*/, Creature* pCreature, Quest const* pQuest) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+        if (!pInstance)
+        {
+            return true;
+        }
+
+        if (pInstance->GetData(TYPE_BAR) == DONE || pInstance->GetData(TYPE_BAR) == SPECIAL)
+        {
+            return true;
+        }
+
+        if (pQuest->GetQuestId() == QUEST_ALE)
+        {
+            if (pInstance->GetData(TYPE_BAR) != IN_PROGRESS)
+            {
+                pInstance->SetData(TYPE_BAR, IN_PROGRESS);
+            }
+
+            pInstance->SetData(TYPE_BAR, SPECIAL);
+
+            // keep track of amount in instance script, returns SPECIAL if amount ok and event in progress
+            if (pInstance->GetData(TYPE_BAR) == SPECIAL)
+            {
+                DoScriptText(SAY_GOT_BEER, pCreature);
+                pCreature->CastSpell(pCreature, SPELL_DRUNKEN_RAGE, false);
+
+                if (npc_rocknotAI* pEscortAI = dynamic_cast<npc_rocknotAI*>(pCreature->AI()))
+                {
+                    pEscortAI->Start(false, NULL, NULL, true);
+                }
+            }
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_marshal_windsor
+######*/
+
+enum
+{
+    // Windsor texts
+    SAY_WINDSOR_AGGRO1          = -1230011,
+    SAY_WINDSOR_AGGRO2          = -1230012,
+    SAY_WINDSOR_AGGRO3          = -1230013,
+    SAY_WINDSOR_START           = -1230014,
+    SAY_WINDSOR_CELL_DUGHAL_1   = -1230015,
+    SAY_WINDSOR_CELL_DUGHAL_3   = -1230016,
+    SAY_WINDSOR_EQUIPMENT_1     = -1230017,
+    SAY_WINDSOR_EQUIPMENT_2     = -1230018,
+    SAY_WINDSOR_EQUIPMENT_3     = -1230019,
+    SAY_WINDSOR_EQUIPMENT_4     = -1230020,
+    SAY_WINDSOR_CELL_JAZ_1      = -1230021,
+    SAY_WINDSOR_CELL_JAZ_2      = -1230022,
+    SAY_WINDSOR_CELL_SHILL_1    = -1230023,
+    SAY_WINDSOR_CELL_SHILL_2    = -1230024,
+    SAY_WINDSOR_CELL_SHILL_3    = -1230025,
+    SAY_WINDSOR_CELL_CREST_1    = -1230026,
+    SAY_WINDSOR_CELL_CREST_2    = -1230027,
+    SAY_WINDSOR_CELL_TOBIAS_1   = -1230028,
+    SAY_WINDSOR_CELL_TOBIAS_2   = -1230029,
+    SAY_WINDSOR_FREE_1          = -1230030,
+    SAY_WINDSOR_FREE_2          = -1230031,
+
+    // Additional gossips
+    SAY_DUGHAL_FREE             = -1230010,
+    GOSSIP_ID_DUGHAL            = -3230000,
+    GOSSIP_TEXT_ID_DUGHAL       = 2846,
+
+    SAY_TOBIAS_FREE_1           = -1230032,
+    SAY_TOBIAS_FREE_2           = -1230033,
+    GOSSIP_ID_TOBIAS            = -3230001,
+    GOSSIP_TEXT_ID_TOBIAS       = 2847,
+
+    NPC_REGINALD_WINDSOR        = 9682,
+
+    QUEST_JAIL_BREAK            = 4322
+};
+
+struct npc_marshal_windsor : public CreatureScript
+{
+    npc_marshal_windsor() : CreatureScript("npc_marshal_windsor") {}
+
+    struct npc_marshal_windsorAI : public npc_escortAI
+    {
+        npc_marshal_windsorAI(Creature* m_creature) : npc_escortAI(m_creature)
+        {
+            m_pInstance = (ScriptedInstance*)m_creature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiEventPhase;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiEventPhase = 0;
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(SAY_WINDSOR_AGGRO1, m_creature, pWho);
+                break;
+            case 1:
+                DoScriptText(SAY_WINDSOR_AGGRO2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_WINDSOR_AGGRO3, m_creature, pWho);
+                break;
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 1:
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_QUEST_JAIL_BREAK, IN_PROGRESS);
+                }
+
+                DoScriptText(SAY_WINDSOR_START, m_creature);
+                break;
+            case 7:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_WINDSOR_CELL_DUGHAL_1, m_creature, pPlayer);
+                }
+                if (m_pInstance)
+                {
+                    if (Creature* pDughal = m_pInstance->GetSingleCreatureFromStorage(NPC_DUGHAL))
+                    {
+                        pDughal->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                        m_creature->SetFacingToObject(pDughal);
+                    }
+                }
+                ++m_uiEventPhase;
+                SetEscortPaused(true);
+                break;
+            case 9:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_WINDSOR_CELL_DUGHAL_3, m_creature, pPlayer);
+                }
+                break;
+            case 14:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_WINDSOR_EQUIPMENT_1, m_creature, pPlayer);
+                }
+                break;
+            case 15:
+#if defined (WOTLK) || defined (CATA)
+                m_creature->HandleEmoteCommand(EMOTE_ONESHOT_USESTANDING);
+#endif
+                break;
+            case 16:
+                if (m_pInstance)
+                {
+                    m_pInstance->DoUseDoorOrButton(GO_JAIL_DOOR_SUPPLY);
+                }
+                break;
+            case 18:
+                DoScriptText(SAY_WINDSOR_EQUIPMENT_2, m_creature);
+                break;
+            case 19:
+#if defined (WOTLK) || defined (CATA)
+                m_creature->HandleEmoteCommand(EMOTE_ONESHOT_USESTANDING);
+#endif
+                break;
+            case 20:
+                if (m_pInstance)
+                {
+                    m_pInstance->DoUseDoorOrButton(GO_JAIL_SUPPLY_CRATE);
+                }
+                break;
+            case 21:
+                m_creature->UpdateEntry(NPC_REGINALD_WINDSOR);
+                break;
+            case 22:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_WINDSOR_EQUIPMENT_3, m_creature, pPlayer);
+                    m_creature->SetFacingToObject(pPlayer);
+                }
+                break;
+            case 23:
+                DoScriptText(SAY_WINDSOR_EQUIPMENT_4, m_creature);
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    m_creature->SetFacingToObject(pPlayer);
+                }
+                break;
+            case 30:
+                if (m_pInstance)
+                {
+                    if (Creature* pJaz = m_pInstance->GetSingleCreatureFromStorage(NPC_JAZ))
+                    {
+                        m_creature->SetFacingToObject(pJaz);
+                    }
+                }
+                DoScriptText(SAY_WINDSOR_CELL_JAZ_1, m_creature);
+                ++m_uiEventPhase;
+                SetEscortPaused(true);
+                break;
+            case 32:
+                DoScriptText(SAY_WINDSOR_CELL_JAZ_2, m_creature);
+                break;
+            case 35:
+                if (m_pInstance)
+                {
+                    if (Creature* pShill = m_pInstance->GetSingleCreatureFromStorage(NPC_SHILL))
+                    {
+                        m_creature->SetFacingToObject(pShill);
+                    }
+                }
+                DoScriptText(SAY_WINDSOR_CELL_SHILL_1, m_creature);
+                ++m_uiEventPhase;
+                SetEscortPaused(true);
+                break;
+            case 37:
+                DoScriptText(SAY_WINDSOR_CELL_SHILL_2, m_creature);
+                break;
+            case 38:
+                DoScriptText(SAY_WINDSOR_CELL_SHILL_3, m_creature);
+                break;
+            case 45:
+                if (m_pInstance)
+                {
+                    if (Creature* pCrest = m_pInstance->GetSingleCreatureFromStorage(NPC_CREST))
+                    {
+                        m_creature->SetFacingToObject(pCrest);
+                    }
+                }
+                DoScriptText(SAY_WINDSOR_CELL_CREST_1, m_creature);
+                ++m_uiEventPhase;
+                SetEscortPaused(true);
+                break;
+            case 47:
+                DoScriptText(SAY_WINDSOR_CELL_CREST_2, m_creature);
+                break;
+            case 49:
+                DoScriptText(SAY_WINDSOR_CELL_TOBIAS_1, m_creature);
+                if (m_pInstance)
+                {
+                    if (Creature* pTobias = m_pInstance->GetSingleCreatureFromStorage(NPC_TOBIAS))
+                    {
+                        pTobias->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                        m_creature->SetFacingToObject(pTobias);
+                    }
+                }
+                ++m_uiEventPhase;
+                SetEscortPaused(true);
+                break;
+            case 51:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_WINDSOR_CELL_TOBIAS_2, m_creature, pPlayer);
+                }
+                break;
+            case 57:
+                DoScriptText(SAY_WINDSOR_FREE_1, m_creature);
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    m_creature->SetFacingToObject(pPlayer);
+                }
+                break;
+            case 58:
+                DoScriptText(SAY_WINDSOR_FREE_2, m_creature);
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_QUEST_JAIL_BREAK, DONE);
+                }
+
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_JAIL_BREAK, m_creature);
+                }
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 /*uiDiff*/) override
+        {
+            // Handle escort resume events
+            if (m_pInstance && m_pInstance->GetData(TYPE_QUEST_JAIL_BREAK) == SPECIAL)
+            {
+                switch (m_uiEventPhase)
+                {
+                case 1:                     // Dughal
+                case 3:                     // Ograbisi
+                case 4:                     // Crest
+                case 5:                     // Shill
+                case 6:                     // Tobias
+                    SetEscortPaused(false);
+                    break;
+                case 2:                     // Jaz
+                    ++m_uiEventPhase;
+                    break;
+                }
+
+                m_pInstance->SetData(TYPE_QUEST_JAIL_BREAK, IN_PROGRESS);
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_marshal_windsorAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_JAIL_BREAK)
+        {
+            pCreature->SetFactionTemporary(FACTION_ESCORT_A_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+
+            if (npc_marshal_windsorAI* pEscortAI = dynamic_cast<npc_marshal_windsorAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_dughal_stormwing
+######*/
+
+struct npc_dughal_stormwing : public CreatureScript
+{
+    npc_dughal_stormwing() : CreatureScript("npc_dughal_stormwing") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ID_DUGHAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_DUGHAL, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            // Set instance data in order to allow the quest to continue
+            if (InstanceData* pInstance = pCreature->GetInstanceData())
+            {
+                pInstance->SetData(TYPE_QUEST_JAIL_BREAK, SPECIAL);
+            }
+
+            DoScriptText(SAY_DUGHAL_FREE, pCreature, pPlayer);
+            pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+
+            pCreature->SetWalk(false);
+            pCreature->GetMotionMaster()->MoveWaypoint();
+
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_tobias_seecher
+######*/
+
+struct npc_tobias_seecher : public CreatureScript
+{
+    npc_tobias_seecher() : CreatureScript("npc_tobias_seecher") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ID_TOBIAS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_TOBIAS, pCreature->GetObjectGuid());
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            // Set instance data in order to allow the quest to continue
+            if (InstanceData* pInstance = pCreature->GetInstanceData())
+            {
+                pInstance->SetData(TYPE_QUEST_JAIL_BREAK, SPECIAL);
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_TOBIAS_FREE_1 : SAY_TOBIAS_FREE_2, pCreature);
+            pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+
+            pCreature->SetWalk(false);
+            pCreature->GetMotionMaster()->MoveWaypoint();
+
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        return true;
+    }
+};
+
+/*######
+## boss_doomrel
+######*/
+
+enum
+{
+    SAY_DOOMREL_START_EVENT     = -1230003,
+    GOSSIP_ITEM_CHALLENGE       = -3230002,
+    GOSSIP_TEXT_ID_CHALLENGE    = 2601,
+};
+
+struct boss_doomrel : public CreatureScript
+{
+    boss_doomrel() : CreatureScript("boss_doomrel") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_TOMB_OF_SEVEN) == NOT_STARTED || pInstance->GetData(TYPE_TOMB_OF_SEVEN) == FAIL)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            }
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_CHALLENGE, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            DoScriptText(SAY_DOOMREL_START_EVENT, pCreature);
+            // start event
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+            {
+                pInstance->SetData(TYPE_TOMB_OF_SEVEN, IN_PROGRESS);
+            }
+
+            break;
+        }
+        return true;
+    }
+};
+
+void AddSC_blackrock_depths()
+{
+    Script *s;
+    s = new go_shadowforge_brazier();
+    s->RegisterSelf();
+    s = new go_relic_coffer_door();
+    s->RegisterSelf();
+
+    s = new at_ring_of_law();
+    s->RegisterSelf();
+
+    s = new spell_banner_of_provocation();
+    s->RegisterSelf();
+
+    s = new npc_grimstone();
+    s->RegisterSelf();
+    s = new npc_kharan_mighthammer();
+    s->RegisterSelf();
+    s = new npc_kharan_mighthammer();
+    s->RegisterSelf();
+    s = new npc_rocknot();
+    s->RegisterSelf();
+    s = new npc_marshal_windsor();
+    s->RegisterSelf();
+    s = new npc_tobias_seecher();
+    s->RegisterSelf();
+    s = new npc_dughal_stormwing();
+    s->RegisterSelf();
+    s = new boss_doomrel();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_shadowforge_brazier";
+    //pNewScript->pGOUse = &GOUse_go_shadowforge_brazier;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_relic_coffer_door";
+    //pNewScript->pGOUse = &GOUse_go_relic_coffer_door;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_ring_of_law";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_ring_of_law;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_grimstone";
+    //pNewScript->GetAI = &GetAI_npc_grimstone;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_theldren_trigger";
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_banner_of_provocation;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kharan_mighthammer";
+    //pNewScript->pGossipHello =  &GossipHello_npc_kharan_mighthammer;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_kharan_mighthammer;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_rocknot";
+    //pNewScript->GetAI = &GetAI_npc_rocknot;
+    //pNewScript->pQuestRewardedNPC = &QuestRewarded_npc_rocknot;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_marshal_windsor";
+    //pNewScript->GetAI = &GetAI_npc_marshal_windsor;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_marshal_windsor;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_tobias_seecher";
+    //pNewScript->pGossipHello =  &GossipHello_npc_tobias_seecher;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_tobias_seecher;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_dughal_stormwing";
+    //pNewScript->pGossipHello =  &GossipHello_npc_dughal_stormwing;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_dughal_stormwing;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_doomrel";
+    //pNewScript->pGossipHello = &GossipHello_boss_doomrel;
+    //pNewScript->pGossipSelect = &GossipSelect_boss_doomrel;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/blackrock_depths.h b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/blackrock_depths.h
new file mode 100644
index 000000000..16f0ce7e6
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/blackrock_depths.h
@@ -0,0 +1,144 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_BRD_H
+#define DEF_BRD_H
+
+enum
+{
+    MAX_ENCOUNTER           = 7,
+    TYPE_SIGNAL             = MAX_ENCOUNTER + 1,
+    MAX_RELIC_DOORS         = 12,
+    MAX_DWARFS              = 7,
+
+    TYPE_RING_OF_LAW        = 1,
+    TYPE_VAULT              = 2,
+    TYPE_BAR                = 3,
+    TYPE_TOMB_OF_SEVEN      = 4,
+    TYPE_LYCEUM             = 5,
+    TYPE_IRON_HALL          = 6,
+    TYPE_QUEST_JAIL_BREAK   = 7,
+
+    NPC_EMPEROR             = 9019,
+    NPC_PRINCESS            = 8929,
+    NPC_PHALANX             = 9502,
+    NPC_HATEREL             = 9034,
+    NPC_ANGERREL            = 9035,
+    NPC_VILEREL             = 9036,
+    NPC_GLOOMREL            = 9037,
+    NPC_SEETHREL            = 9038,
+    NPC_DOOMREL             = 9039,
+    NPC_DOPEREL             = 9040,
+    NPC_MAGMUS              = 9938,
+    NPC_WATCHER_DOOMGRIP    = 9476,
+    NPC_WARBRINGER_CONST    = 8905,                         // Four of them in Relict Vault are related to Doomgrip summon event
+
+    // Jail Break event related
+    NPC_OGRABISI            = 9677,
+    NPC_SHILL               = 9678,
+    NPC_CREST               = 9680,
+    NPC_JAZ                 = 9681,
+    NPC_TOBIAS              = 9679,
+    NPC_DUGHAL              = 9022,
+
+    GO_ARENA_1              = 161525,
+    GO_ARENA_2              = 161522,
+    GO_ARENA_3              = 161524,
+    GO_ARENA_4              = 161523,
+
+    GO_SHADOW_LOCK          = 161460,
+    GO_SHADOW_MECHANISM     = 161461,
+    GO_SHADOW_GIANT_DOOR    = 157923,
+    GO_SHADOW_DUMMY         = 161516,
+    GO_BAR_KEG_SHOT         = 170607,
+    GO_BAR_KEG_TRAP         = 171941,
+    GO_BAR_DOOR             = 170571,
+    GO_TOMB_ENTER           = 170576,
+    GO_TOMB_EXIT            = 170577,
+    GO_LYCEUM               = 170558,
+    GO_GOLEM_ROOM_N         = 170573,
+    GO_GOLEM_ROOM_S         = 170574,
+    GO_THRONE_ROOM          = 170575,
+
+    GO_SPECTRAL_CHALICE     = 164869,
+    GO_CHEST_SEVEN          = 169243,
+    GO_ARENA_SPOILS         = 181074,
+    GO_SECRET_DOOR          = 174553,
+
+    // Jail break event related
+    GO_JAIL_DOOR_SUPPLY     = 170561,
+    GO_JAIL_SUPPLY_CRATE    = 166872,
+
+    SPELL_STONED            = 10255,                        // Aura of Warbringer Constructs in Relict Vault
+
+    FACTION_DWARF_HOSTILE   = 754,                          // Hostile faction for the Tomb of the Seven dwarfs
+};
+
+enum ArenaNPCs
+{
+    // Gladiators
+    NPC_LEFTY               = 16049,
+    NPC_ROTFANG             = 16050,
+    NPC_SNOKH               = 16051,
+    NPC_MALGEN              = 16052,
+    NPC_KORV                = 16053,
+    NPC_REZZNIK             = 16054,
+    NPC_VAJASHNI            = 16055,
+    NPC_VOLIDA              = 16058,
+    NPC_THELDREN            = 16059,
+    // Ring mobs
+    NPC_WORM                = 8925,
+    NPC_STINGER             = 8926,
+    NPC_SCREECHER           = 8927,
+    NPC_THUNDERSNOUT        = 8928,
+    NPC_CREEPER             = 8933,
+    NPC_BEETLE              = 8932,
+    // Ring bosses
+    NPC_GOROSH              = 9027,
+    NPC_GRIZZLE             = 9028,
+    NPC_EVISCERATOR         = 9029,
+    NPC_OKTHOR              = 9030,
+    NPC_ANUBSHIAH           = 9031,
+    NPC_HEDRUM              = 9032
+};
+
+static const uint32 aArenaNPCs[] =
+{
+    // Gladiators
+    NPC_LEFTY, NPC_ROTFANG, NPC_SNOKH, NPC_MALGEN, NPC_KORV, NPC_REZZNIK, NPC_VAJASHNI, NPC_VOLIDA, NPC_THELDREN,
+    // Ring mobs
+    NPC_WORM, NPC_STINGER, NPC_SCREECHER, NPC_THUNDERSNOUT, NPC_CREEPER, NPC_BEETLE,
+    // Ring bosses
+    NPC_GOROSH, NPC_GRIZZLE, NPC_EVISCERATOR, NPC_OKTHOR, NPC_ANUBSHIAH, NPC_HEDRUM
+};
+
+// Used to summon Watcher Doomgrip
+static const float aVaultPositions[4] = {821.905f, -338.382f, -50.134f, 3.78736f};
+
+// Tomb of the Seven dwarfs
+static const uint32 aTombDwarfes[MAX_DWARFS] = {NPC_ANGERREL, NPC_SEETHREL, NPC_DOPEREL, NPC_GLOOMREL, NPC_VILEREL, NPC_HATEREL, NPC_DOOMREL};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_ambassador_flamelash.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_ambassador_flamelash.cpp
new file mode 100644
index 000000000..4e82647da
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_ambassador_flamelash.cpp
@@ -0,0 +1,155 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Ambassador_Flamelash
+ * SD%Complete: 80
+ * SDComment:   Texts missing, Add handling rather guesswork, Add spell Burning Spirit likely won't work
+ * SDCategory:  Blackrock Depths
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_FIREBLAST             = 15573,
+    SPELL_BURNING_SPIRIT        = 13489,
+    SPELL_BURNING_SPIRIT_BUFF   = 14744,
+
+    NPC_BURNING_SPIRIT          = 9178,
+};
+
+struct boss_ambassador_flamelash : public CreatureScript
+{
+    boss_ambassador_flamelash() : CreatureScript("boss_ambassador_flamelash") {}
+
+    struct boss_ambassador_flamelashAI : public ScriptedAI
+    {
+        boss_ambassador_flamelashAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        uint32 m_uiSpiritTimer;
+        int Rand;
+        int RandX;
+        int RandY;
+
+        void Reset() override
+        {
+            m_uiSpiritTimer = 12000;
+        }
+
+        void SummonSpirits()
+        {
+            float fX, fY, fZ;
+            m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 30.0f, fX, fY, fZ);
+            m_creature->SummonCreature(NPC_BURNING_SPIRIT, fX, fY, fZ, m_creature->GetAngle(fX, fY) + M_PI_F, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_FIREBLAST);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->GetMotionMaster()->MovePoint(1, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 /*uiMotionType*/, uint32 uiPointId) override
+        {
+            if (uiPointId != 1)
+            {
+                return;
+            }
+
+            pSummoned->CastSpell(m_creature, SPELL_BURNING_SPIRIT, true);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // m_uiSpiritTimer
+            if (m_uiSpiritTimer < uiDiff)
+            {
+                SummonSpirits();
+                SummonSpirits();
+                SummonSpirits();
+                SummonSpirits();
+
+                m_uiSpiritTimer = 20000;
+            }
+            else
+            {
+                m_uiSpiritTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ambassador_flamelashAI(pCreature);
+    }
+};
+
+struct spell_boss_ambassador_flamelash : public SpellScript
+{
+    spell_boss_ambassador_flamelash() : SpellScript("spell_boss_ambassador_flamelash") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_BURNING_SPIRIT && uiEffIndex == EFFECT_INDEX_1)
+        {
+            pCreatureTarget->ToCreature()->CastSpell(pCreatureTarget->ToCreature(), SPELL_BURNING_SPIRIT_BUFF, true);
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_ambassador_flamelash()
+{
+    Script *s;
+    s = new boss_ambassador_flamelash();
+    s->RegisterSelf();
+    s = new spell_boss_ambassador_flamelash();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ambassador_flamelash";
+    //pNewScript->GetAI = &GetAI_boss_ambassador_flamelash;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_boss_ambassador_flamelash;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_coren_direbrew.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_coren_direbrew.cpp
new file mode 100644
index 000000000..0db8c1641
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_coren_direbrew.cpp
@@ -0,0 +1,215 @@
+/**
+ * ScriptDev3 is an extension for mangos-one providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos-one.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_coren_direbrew
+SD%Complete: 75
+SDComment: Some parts are not complete - requires additional research. Brewmaidens scripts handled in eventAI.
+SDCategory: Blackrock Depths
+EndScriptData */
+
+#include "precompiled.h"
+
+enum
+{
+    SAY_AGGRO                       = -1230034,
+
+    // spells
+    SPELL_DIREBREW_DISARM           = 47310,
+    SPELL_SUMMON_DIREBREW_MINION    = 47375,
+    SPELL_DIREBREW_CHARGE           = 47718,
+    SPELL_SUMMON_MOLE_MACHINE       = 47691,            // triggers 47690
+
+    // summoned auras
+    SPELL_PORT_TO_COREN             = 52850,
+
+    // other summoned spells - currently not used in script
+    // SPELL_CHUCK_MUG               = 50276,
+    // SPELL_BARRELED_AURA           = 50278,            // used by Ursula
+    // SPELL_HAS_BREW                = 47331,            // triggers 47344 - aura which asks for the second brew on item expire
+    // SPELL_SEND_FIRST_MUG          = 47333,            // triggers 47345
+    // SPELL_SEND_SECOND_MUG         = 47339,            // triggers 47340 - spell triggered by 47344
+    // SPELL_BREWMAIDEN_DESPAWN_AURA = 48186,            // purpose unk
+
+    // npcs
+    NPC_DIREBREW_MINION             = 26776,
+    NPC_ILSA_DIREBREW               = 26764,
+    NPC_URSULA_DIREBREW             = 26822,
+
+    // other
+    FACTION_HOSTILE                 = 736,
+
+    QUEST_INSULT_COREN              = 12062,
+
+    MAX_DIREBREW_MINIONS            = 3,
+};
+struct boss_coren_direbrew : public CreatureScript
+{
+    boss_coren_direbrew() : CreatureScript("boss_coren_direbrew") {}
+
+    struct boss_coren_direbrewAI : public ScriptedAI
+    {
+        boss_coren_direbrewAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        uint32 m_uiDisarmTimer;
+        uint32 m_uiChargeTimer;
+        uint32 m_uiSummonTimer;
+        uint8 m_uiPhase;
+
+        void Reset() override
+        {
+            m_uiDisarmTimer = 10000;
+            m_uiChargeTimer = 5000;
+            m_uiSummonTimer = 15000;
+            m_uiPhase = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            // Spawn 3 minions on aggro
+            for (uint8 i = 0; i < MAX_DIREBREW_MINIONS; ++i)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_DIREBREW_MINION, CAST_TRIGGERED);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_ILSA_DIREBREW:
+            case NPC_URSULA_DIREBREW:
+                pSummoned->CastSpell(m_creature, SPELL_PORT_TO_COREN, true);
+                break;
+            }
+
+            if (m_creature->getVictim())
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Spawn Ilsa
+            if (m_creature->GetHealthPercent() < 66.0f && m_uiPhase == 0)
+            {
+                float fX, fY, fZ;
+                m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 10, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_ILSA_DIREBREW, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                m_uiPhase = 1;
+            }
+
+            // Spawn Ursula
+            if (m_creature->GetHealthPercent() < 33.0f && m_uiPhase == 1)
+            {
+                float fX, fY, fZ;
+                m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 10, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_URSULA_DIREBREW, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                m_uiPhase = 2;
+            }
+
+            if (m_uiDisarmTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DIREBREW_DISARM) == CAST_OK)
+                {
+                    m_uiDisarmTimer = 15000;
+                }
+            }
+            else
+            {
+                m_uiDisarmTimer -= uiDiff;
+            }
+
+            if (m_uiChargeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_DIREBREW_CHARGE, SELECT_FLAG_NOT_IN_MELEE_RANGE))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_DIREBREW_CHARGE) == CAST_OK)
+                    {
+                        m_uiChargeTimer = urand(5000, 10000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiChargeTimer -= uiDiff;
+            }
+
+            if (m_uiSummonTimer < uiDiff)
+            {
+                for (uint8 i = 0; i < MAX_DIREBREW_MINIONS; ++i)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_SUMMON_DIREBREW_MINION, CAST_TRIGGERED);
+                }
+
+                m_uiSummonTimer = 15000;
+            }
+            else
+            {
+                m_uiSummonTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_coren_direbrewAI(pCreature);
+    }
+
+    bool OnQuestRewarded(Player* pPlayer, Creature* pCreature, Quest const* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_INSULT_COREN)
+        {
+            DoScriptText(SAY_AGGRO, pCreature, pPlayer);
+
+            pCreature->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_REACH_HOME | TEMPFACTION_RESTORE_RESPAWN);
+            pCreature->AI()->AttackStart(pPlayer);
+        }
+
+        return true;
+    }
+};
+
+void AddSC_boss_coren_direbrew()
+{
+    Script* s;
+    s = new boss_coren_direbrew();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_coren_direbrew";
+    //pNewScript->GetAI = &GetAI_boss_coren_direbrew;
+    //pNewScript->pQuestRewardedNPC = &QuestRewarded_npc_coren_direbrew;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_emperor_dagran_thaurissan.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
new file mode 100644
index 000000000..50825ecce
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
@@ -0,0 +1,308 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Emperor_Dagran_Thaurissan
+ * SD%Complete: 90
+ * SDComment:   With script for Moira
+ * SDCategory:  Blackrock Depths
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackrock_depths.h"
+
+enum eEmperor
+{
+    FACTION_NEUTRAL             = 734,
+    SAY_AGGRO                   = -1230001,
+    SAY_SLAY                    = -1230002,
+
+    SPELL_HANDOFTHAURISSAN      = 17492,
+    SPELL_AVATAROFFLAME         = 15636
+};
+
+struct boss_emperor_dagran_thaurissan : public CreatureScript
+{
+    boss_emperor_dagran_thaurissan() : CreatureScript("boss_emperor_dagran_thaurissan") {}
+
+    struct boss_emperor_dagran_thaurissanAI : public ScriptedAI
+    {
+        boss_emperor_dagran_thaurissanAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiHandOfThaurissan_Timer;
+        uint32 m_uiAvatarOfFlame_Timer;
+        // uint32 m_uiCounter;
+
+        void Reset() override
+        {
+            m_uiHandOfThaurissan_Timer = 4000;
+            m_uiAvatarOfFlame_Timer = 25000;
+            // m_uiCounter = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+            m_creature->CallForHelp(VISIBLE_RANGE);
+        }
+
+        void JustDied(Unit* /*pVictim*/) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            if (Creature* pPrincess = m_pInstance->GetSingleCreatureFromStorage(NPC_PRINCESS))
+            {
+                if (pPrincess->IsAlive())
+                {
+                    pPrincess->SetFactionTemporary(FACTION_NEUTRAL, TEMPFACTION_NONE);
+                    pPrincess->AI()->EnterEvadeMode();
+                }
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiHandOfThaurissan_Timer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    DoCastSpellIfCan(pTarget, SPELL_HANDOFTHAURISSAN);
+                }
+
+                // 3 Hands of Thaurissan will be casted
+                // if (m_uiCounter < 3)
+                //{
+                //    m_uiHandOfThaurissan_Timer = 1000;
+                //    ++m_uiCounter;
+                //}
+                // else
+                //{
+                m_uiHandOfThaurissan_Timer = 5000;
+                // m_uiCounter = 0;
+                //}
+            }
+            else
+            {
+                m_uiHandOfThaurissan_Timer -= uiDiff;
+            }
+
+            // AvatarOfFlame_Timer
+            if (m_uiAvatarOfFlame_Timer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_AVATAROFFLAME);
+                m_uiAvatarOfFlame_Timer = 18000;
+            }
+            else
+            {
+                m_uiAvatarOfFlame_Timer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_emperor_dagran_thaurissanAI(pCreature);
+    }
+};
+
+/*######
+## boss_moira_bronzebeard
+######*/
+
+enum ePrincess
+{
+    SPELL_HEAL                  = 15586,
+    SPELL_RENEW                 = 10929,
+    SPELL_SHIELD                = 10901,
+    SPELL_MINDBLAST             = 15587,
+    SPELL_SHADOWWORDPAIN        = 15654,
+    SPELL_SMITE                 = 10934,
+    SPELL_SHADOW_BOLT           = 15537,
+    SPELL_OPEN_PORTAL           = 13912
+};
+
+struct boss_moira_bronzebeard : public CreatureScript
+{
+    boss_moira_bronzebeard() : CreatureScript("boss_moira_bronzebeard") {}
+
+    struct boss_moira_bronzebeardAI : public ScriptedAI
+    {
+        boss_moira_bronzebeardAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiHeal_Timer;
+        uint32 m_uiMindBlast_Timer;
+        uint32 m_uiShadowWordPain_Timer;
+        uint32 m_uiSmite_Timer;
+
+        void Reset() override
+        {
+            m_uiHeal_Timer = 12000;                             // These times are probably wrong
+            m_uiMindBlast_Timer = 16000;
+            m_uiShadowWordPain_Timer = 2000;
+            m_uiSmite_Timer = 8000;
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, false))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+
+                m_creature->GetMotionMaster()->MoveChase(pWho, 25.0f);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                if (Creature* pEmperor = m_pInstance->GetSingleCreatureFromStorage(NPC_EMPEROR))
+                {
+                    // if evade, then check if he is alive. If not, start make portal
+                    if (!pEmperor->IsAlive())
+                    {
+                        m_creature->CastSpell(m_creature, SPELL_OPEN_PORTAL, false);
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // MindBlast_Timer
+            if (m_uiMindBlast_Timer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_MINDBLAST);
+                m_uiMindBlast_Timer = 14000;
+            }
+            else
+            {
+                m_uiMindBlast_Timer -= uiDiff;
+            }
+
+            // ShadowWordPain_Timer
+            if (m_uiShadowWordPain_Timer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHADOWWORDPAIN);
+                m_uiShadowWordPain_Timer = 18000;
+            }
+            else
+            {
+                m_uiShadowWordPain_Timer -= uiDiff;
+            }
+
+            // Smite_Timer
+            if (m_uiSmite_Timer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_SMITE);
+                m_uiSmite_Timer = 10000;
+            }
+            else
+            {
+                m_uiSmite_Timer -= uiDiff;
+            }
+
+            // Heal_Timer
+            if (m_uiHeal_Timer < uiDiff)
+            {
+                if (Creature* pEmperor = m_pInstance->GetSingleCreatureFromStorage(NPC_EMPEROR))
+                {
+                    if (pEmperor->IsAlive() && pEmperor->GetHealthPercent() != 100.0f)
+                    {
+                        DoCastSpellIfCan(pEmperor, SPELL_HEAL);
+                    }
+                }
+
+                m_uiHeal_Timer = 10000;
+            }
+            else
+            {
+                m_uiHeal_Timer -= uiDiff;
+            }
+
+            // No meele?
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_moira_bronzebeardAI(pCreature);
+    }
+};
+
+void AddSC_boss_draganthaurissan()
+{
+    Script *s;
+    s = new boss_emperor_dagran_thaurissan();
+    s->RegisterSelf();
+    s = new boss_moira_bronzebeard();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_emperor_dagran_thaurissan";
+    //pNewScript->GetAI = &GetAI_boss_emperor_dagran_thaurissan;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_moira_bronzebeard";
+    //pNewScript->GetAI = &GetAI_boss_moira_bronzebeard;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_general_angerforge.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_general_angerforge.cpp
new file mode 100644
index 000000000..dd3618966
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_general_angerforge.cpp
@@ -0,0 +1,173 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_General_Angerforge
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Blackrock Depths
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_MIGHTYBLOW            = 14099,
+    SPELL_HAMSTRING             = 9080,
+    SPELL_CLEAVE                = 20691,
+
+    NPC_ANVILRAGE_RESERVIST     = 8901,
+    NPC_ANVILRAGE_MEDIC         = 8894,
+};
+
+struct boss_general_angerforge : public CreatureScript
+{
+    boss_general_angerforge() : CreatureScript("boss_general_angerforge") {}
+
+    struct boss_general_angerforgeAI : public ScriptedAI
+    {
+        boss_general_angerforgeAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiMightyBlowTimer;
+        uint32 m_uiHamStringTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiAddsTimer;
+        bool m_bSummonedMedics;
+
+        void Reset() override
+        {
+            m_uiMightyBlowTimer = 8000;
+            m_uiHamStringTimer = 12000;
+            m_uiCleaveTimer = 16000;
+            m_uiAddsTimer = 0;
+            m_bSummonedMedics = false;
+        }
+
+        void SummonAdd(uint32 uiEntry)
+        {
+            float fX, fY, fZ;
+            m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 20.0f, fX, fY, fZ);
+            m_creature->SummonCreature(uiEntry, fX, fY, fZ, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // MightyBlow_Timer
+            if (m_uiMightyBlowTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_MIGHTYBLOW);
+                m_uiMightyBlowTimer = 18000;
+            }
+            else
+            {
+                m_uiMightyBlowTimer -= uiDiff;
+            }
+
+            // HamString_Timer
+            if (m_uiHamStringTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_HAMSTRING);
+                m_uiHamStringTimer = 15000;
+            }
+            else
+            {
+                m_uiHamStringTimer -= uiDiff;
+            }
+
+            // Cleave_Timer
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE);
+                m_uiCleaveTimer = 9000;
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            // Adds_Timer
+            if (m_creature->GetHealthPercent() < 21.0f)
+            {
+                if (m_uiAddsTimer < uiDiff)
+                {
+                    // summon 3 Adds every 25s
+                    SummonAdd(NPC_ANVILRAGE_RESERVIST);
+                    SummonAdd(NPC_ANVILRAGE_RESERVIST);
+                    SummonAdd(NPC_ANVILRAGE_RESERVIST);
+
+                    m_uiAddsTimer = 25000;
+                }
+                else
+                {
+                    m_uiAddsTimer -= uiDiff;
+                }
+            }
+
+            // Summon Medics
+            if (!m_bSummonedMedics && m_creature->GetHealthPercent() < 21.0f)
+            {
+                SummonAdd(NPC_ANVILRAGE_MEDIC);
+                SummonAdd(NPC_ANVILRAGE_MEDIC);
+                m_bSummonedMedics = true;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_general_angerforgeAI(pCreature);
+    }
+};
+
+void AddSC_boss_general_angerforge()
+{
+    Script *s;
+    s = new boss_general_angerforge();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_general_angerforge";
+    //pNewScript->GetAI = &GetAI_boss_general_angerforge;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_high_interrogator_gerstahn.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_high_interrogator_gerstahn.cpp
new file mode 100644
index 000000000..5dcfcd723
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/boss_high_interrogator_gerstahn.cpp
@@ -0,0 +1,147 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_High_Interrogator_Gerstahn
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Blackrock Depths
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_SHADOWWORDPAIN        = 14032,
+    SPELL_MANABURN              = 14033,
+    SPELL_PSYCHICSCREAM         = 13704,
+    SPELL_SHADOWSHIELD          = 12040
+};
+
+struct boss_high_interrogator_gerstahn : public CreatureScript
+{
+    boss_high_interrogator_gerstahn() : CreatureScript("boss_high_interrogator_gerstahn") {}
+
+    struct boss_high_interrogator_gerstahnAI : public ScriptedAI
+    {
+        boss_high_interrogator_gerstahnAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiShadowWordPainTimer;
+        uint32 m_uiManaBurnTimer;
+        uint32 m_uiPsychicScreamTimer;
+        uint32 m_uiShadowShieldTimer;
+
+        void Reset() override
+        {
+            m_uiShadowWordPainTimer = 4000;
+            m_uiManaBurnTimer = 14000;
+            m_uiPsychicScreamTimer = 32000;
+            m_uiShadowShieldTimer = 8000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // ShadowWordPain_Timer
+            if (m_uiShadowWordPainTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    DoCastSpellIfCan(pTarget, SPELL_SHADOWWORDPAIN);
+                }
+
+                m_uiShadowWordPainTimer = 7000;
+            }
+            else
+            {
+                m_uiShadowWordPainTimer -= uiDiff;
+            }
+
+            // ManaBurn_Timer
+            if (m_uiManaBurnTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_MANABURN, SELECT_FLAG_POWER_MANA))
+                {
+                    DoCastSpellIfCan(pTarget, SPELL_MANABURN);
+                }
+
+                m_uiManaBurnTimer = 10000;
+            }
+            else
+            {
+                m_uiManaBurnTimer -= uiDiff;
+            }
+
+            // PsychicScream_Timer
+            if (m_uiPsychicScreamTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_PSYCHICSCREAM);
+                m_uiPsychicScreamTimer = 30000;
+            }
+            else
+            {
+                m_uiPsychicScreamTimer -= uiDiff;
+            }
+
+            // ShadowShield_Timer
+            if (m_uiShadowShieldTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SHADOWSHIELD);
+                m_uiShadowShieldTimer = 25000;
+            }
+            else
+            {
+                m_uiShadowShieldTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_high_interrogator_gerstahnAI(pCreature);
+    }
+};
+
+void AddSC_boss_high_interrogator_gerstahn()
+{
+    Script *s;
+    s = new boss_high_interrogator_gerstahn();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_high_interrogator_gerstahn";
+    //pNewScript->GetAI = &GetAI_boss_high_interrogator_gerstahn;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/instance_blackrock_depths.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/instance_blackrock_depths.cpp
new file mode 100644
index 000000000..a309e06ba
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/instance_blackrock_depths.cpp
@@ -0,0 +1,501 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Blackrock_Depths
+ * SD%Complete: 80
+ * SDComment:   None
+ * SDCategory:  Blackrock Depths
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackrock_depths.h"
+
+struct is_blackrock_depths : public InstanceScript
+{
+    is_blackrock_depths() : InstanceScript("instance_blackrock_depths") {}
+
+    class instance_blackrock_depths : public ScriptedInstance
+    {
+    public:
+        instance_blackrock_depths(Map* pMap) : ScriptedInstance(pMap),
+            m_uiBarAleCount(0),
+            m_uiCofferDoorsOpened(0),
+            m_uiDwarfFightTimer(0),
+            m_uiArenaCenterAT(0),
+            m_uiDwarfRound(0)
+        {
+            Initialize();
+        }
+
+        ~instance_blackrock_depths() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_EMPEROR:
+            case NPC_PRINCESS:
+            case NPC_PHALANX:
+            case NPC_HATEREL:
+            case NPC_ANGERREL:
+            case NPC_VILEREL:
+            case NPC_GLOOMREL:
+            case NPC_SEETHREL:
+            case NPC_DOOMREL:
+            case NPC_DOPEREL:
+            case NPC_SHILL:
+            case NPC_CREST:
+            case NPC_JAZ:
+            case NPC_TOBIAS:
+            case NPC_DUGHAL:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+
+            case NPC_WARBRINGER_CONST:
+                // Golems not in the Relict Vault?
+                if (std::abs(pCreature->GetPositionZ() - aVaultPositions[2]) > 1.0f || !pCreature->IsWithinDist2d(aVaultPositions[0], aVaultPositions[1], 20.0f))
+                {
+                    break;
+                }
+                // Golems in Relict Vault need to have a stoned aura, set manually to prevent reapply when reached home
+                pCreature->CastSpell(pCreature, SPELL_STONED, true);
+                // Store the Relict Vault Golems into m_sVaultNpcGuids
+            case NPC_WATCHER_DOOMGRIP:
+                m_sVaultNpcGuids.insert(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_MAGMUS)
+            {
+                SetData(TYPE_IRON_HALL, IN_PROGRESS);
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_WARBRINGER_CONST:
+            case NPC_WATCHER_DOOMGRIP:
+                if (GetData(TYPE_VAULT) == IN_PROGRESS)
+                {
+                    m_sVaultNpcGuids.erase(pCreature->GetObjectGuid());
+
+                    // If all event npcs dead then set event to done
+                    if (m_sVaultNpcGuids.empty())
+                    {
+                        SetData(TYPE_VAULT, DONE);
+                    }
+                }
+                break;
+            case NPC_OGRABISI:
+            case NPC_SHILL:
+            case NPC_CREST:
+            case NPC_JAZ:
+                if (GetData(TYPE_QUEST_JAIL_BREAK) == IN_PROGRESS)
+                {
+                    SetData(TYPE_QUEST_JAIL_BREAK, SPECIAL);
+                }
+                break;
+                // Handle Tomb of the Seven dwarf death event
+            case NPC_HATEREL:
+            case NPC_ANGERREL:
+            case NPC_VILEREL:
+            case NPC_GLOOMREL:
+            case NPC_SEETHREL:
+            case NPC_DOPEREL:
+                // Only handle the event when event is in progress
+                if (GetData(TYPE_TOMB_OF_SEVEN) != IN_PROGRESS)
+                {
+                    return;
+                }
+                // Call the next dwarf only if it's the last one which joined the fight
+                if (pCreature->GetEntry() == aTombDwarfes[m_uiDwarfRound - 1])
+                {
+                    DoCallNextDwarf();
+                }
+                break;
+            case NPC_DOOMREL:
+                SetData(TYPE_TOMB_OF_SEVEN, DONE);
+                break;
+            case NPC_MAGMUS:
+                SetData(TYPE_IRON_HALL, DONE);
+                break;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            if (GetData(TYPE_RING_OF_LAW) == IN_PROGRESS || GetData(TYPE_RING_OF_LAW) == SPECIAL)
+            {
+                for (uint8 i = 0; i < countof(aArenaNPCs); ++i)
+                {
+                    if (pCreature->GetEntry() == aArenaNPCs[i])
+                    {
+                        SetData(TYPE_RING_OF_LAW, FAIL);
+                        return;
+                    }
+                }
+            }
+
+            switch (pCreature->GetEntry())
+            {
+                // Handle Tomb of the Seven reset in case of wipe
+            case NPC_HATEREL:
+            case NPC_ANGERREL:
+            case NPC_VILEREL:
+            case NPC_GLOOMREL:
+            case NPC_SEETHREL:
+            case NPC_DOPEREL:
+            case NPC_DOOMREL:
+                SetData(TYPE_TOMB_OF_SEVEN, FAIL);
+                break;
+            case NPC_MAGMUS:
+                SetData(TYPE_IRON_HALL, FAIL);
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_ARENA_1:
+            case GO_ARENA_2:
+            case GO_ARENA_3:
+            case GO_ARENA_4:
+            case GO_SHADOW_LOCK:
+            case GO_SHADOW_MECHANISM:
+            case GO_SHADOW_GIANT_DOOR:
+            case GO_SHADOW_DUMMY:
+            case GO_BAR_KEG_SHOT:
+            case GO_BAR_KEG_TRAP:
+            case GO_BAR_DOOR:
+            case GO_TOMB_ENTER:
+            case GO_TOMB_EXIT:
+            case GO_LYCEUM:
+            case GO_GOLEM_ROOM_N:
+            case GO_GOLEM_ROOM_S:
+            case GO_THRONE_ROOM:
+            case GO_SPECTRAL_CHALICE:
+            case GO_CHEST_SEVEN:
+            case GO_ARENA_SPOILS:
+            case GO_SECRET_DOOR:
+            case GO_JAIL_DOOR_SUPPLY:
+            case GO_JAIL_SUPPLY_CRATE:
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_RING_OF_LAW:
+                // If finished the arena event after theldren fight
+                if (uiData == DONE && m_auiEncounter[0] == SPECIAL)
+                {
+                    DoRespawnGameObject(GO_ARENA_SPOILS, HOUR);
+                }
+                m_auiEncounter[0] = uiData;
+                break;
+            case TYPE_VAULT:
+                if (uiData == SPECIAL)
+                {
+                    ++m_uiCofferDoorsOpened;
+
+                    if (m_uiCofferDoorsOpened == MAX_RELIC_DOORS)
+                    {
+                        SetData(TYPE_VAULT, IN_PROGRESS);
+
+                        Creature* pConstruct = NULL;
+
+                        // Activate vault constructs
+                        for (GuidSet::const_iterator itr = m_sVaultNpcGuids.begin(); itr != m_sVaultNpcGuids.end(); ++itr)
+                        {
+                            pConstruct = instance->GetCreature(*itr);
+                            if (pConstruct)
+                            {
+                                pConstruct->RemoveAurasDueToSpell(SPELL_STONED);
+                            }
+                        }
+
+                        if (!pConstruct)
+                        {
+                            return;
+                        }
+
+                        // Summon doomgrip
+                        pConstruct->SummonCreature(NPC_WATCHER_DOOMGRIP, aVaultPositions[0], aVaultPositions[1], aVaultPositions[2], aVaultPositions[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                    }
+                    // No need to store in this case
+                    return;
+                }
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_SECRET_DOOR);
+                }
+                m_auiEncounter[1] = uiData;
+                break;
+            case TYPE_BAR:
+                if (uiData == SPECIAL)
+                {
+                    ++m_uiBarAleCount;
+                }
+                else
+                {
+                    m_auiEncounter[2] = uiData;
+                }
+                break;
+            case TYPE_TOMB_OF_SEVEN:
+                // Don't set the same data twice
+                if (uiData == m_auiEncounter[3])
+                {
+                    break;
+                }
+                // Combat door
+                DoUseDoorOrButton(GO_TOMB_ENTER);
+                // Start the event
+                if (uiData == IN_PROGRESS)
+                {
+                    DoCallNextDwarf();
+                }
+                if (uiData == FAIL)
+                {
+                    // Reset dwarfes
+                    for (uint8 i = 0; i < MAX_DWARFS; ++i)
+                    {
+                        if (Creature* pDwarf = GetSingleCreatureFromStorage(aTombDwarfes[i]))
+                        {
+                            if (!pDwarf->IsAlive())
+                            {
+                                pDwarf->Respawn();
+                            }
+                        }
+                    }
+
+                    m_uiDwarfRound = 0;
+                    m_uiDwarfFightTimer = 0;
+                }
+                if (uiData == DONE)
+                {
+                    DoRespawnGameObject(GO_CHEST_SEVEN, HOUR);
+                    DoUseDoorOrButton(GO_TOMB_EXIT);
+                }
+                m_auiEncounter[3] = uiData;
+                break;
+            case TYPE_LYCEUM:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_GOLEM_ROOM_N);
+                    DoUseDoorOrButton(GO_GOLEM_ROOM_S);
+                }
+                m_auiEncounter[4] = uiData;
+                break;
+            case TYPE_IRON_HALL:
+                switch (uiData)
+                {
+                case IN_PROGRESS:
+                    DoUseDoorOrButton(GO_GOLEM_ROOM_N);
+                    DoUseDoorOrButton(GO_GOLEM_ROOM_S);
+                    break;
+                case FAIL:
+                    DoUseDoorOrButton(GO_GOLEM_ROOM_N);
+                    DoUseDoorOrButton(GO_GOLEM_ROOM_S);
+                    break;
+                case DONE:
+                    DoUseDoorOrButton(GO_GOLEM_ROOM_N);
+                    DoUseDoorOrButton(GO_GOLEM_ROOM_S);
+                    DoUseDoorOrButton(GO_THRONE_ROOM);
+                    break;
+                }
+                m_auiEncounter[5] = uiData;
+                break;
+            case TYPE_QUEST_JAIL_BREAK:
+                m_auiEncounter[6] = uiData;
+                return;
+            case TYPE_SIGNAL:
+                if (AreaTriggerEntry const *at = sAreaTriggerStore.LookupEntry(uiData))
+                    m_uiArenaCenterAT = uiData;
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " " << m_auiEncounter[6];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case TYPE_RING_OF_LAW:
+                return m_auiEncounter[0];
+            case TYPE_VAULT:
+                return m_auiEncounter[1];
+            case TYPE_BAR:
+                if (m_auiEncounter[2] == IN_PROGRESS && m_uiBarAleCount == 3)
+                {
+                    return SPECIAL;
+                }
+                else
+                {
+                    return m_auiEncounter[2];
+                }
+            case TYPE_TOMB_OF_SEVEN:
+                return m_auiEncounter[3];
+            case TYPE_LYCEUM:
+                return m_auiEncounter[4];
+            case TYPE_IRON_HALL:
+                return m_auiEncounter[5];
+            case TYPE_QUEST_JAIL_BREAK:
+                return m_auiEncounter[6];
+            case TYPE_SIGNAL:
+                return m_uiArenaCenterAT;
+            default:
+                return 0;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            if (m_auiEncounter[i] == IN_PROGRESS)
+            {
+                m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_uiDwarfFightTimer)
+            {
+                if (m_uiDwarfFightTimer <= uiDiff)
+                {
+                    if (m_uiDwarfRound < MAX_DWARFS)
+                    {
+                        DoCallNextDwarf();
+                        m_uiDwarfFightTimer = 30000;
+                    }
+                    else
+                    {
+                        m_uiDwarfFightTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiDwarfFightTimer -= uiDiff;
+                }
+            }
+        }
+
+    private:
+        void DoCallNextDwarf()
+        {
+            if (Creature* pDwarf = GetSingleCreatureFromStorage(aTombDwarfes[m_uiDwarfRound]))
+            {
+                if (Player* pPlayer = GetPlayerInMap())
+                {
+                    pDwarf->SetFactionTemporary(FACTION_DWARF_HOSTILE, TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_RESTORE_REACH_HOME);
+                    pDwarf->AI()->AttackStart(pPlayer);
+                }
+            }
+            m_uiDwarfFightTimer = 30000;
+            ++m_uiDwarfRound;
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiBarAleCount;
+        uint8 m_uiCofferDoorsOpened;
+
+        uint32 m_uiDwarfFightTimer;
+        uint32 m_uiArenaCenterAT;
+        uint8 m_uiDwarfRound;
+
+        float m_fArenaCenterX, m_fArenaCenterY, m_fArenaCenterZ;
+
+        GuidSet m_sVaultNpcGuids;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_blackrock_depths(pMap);
+    }
+};
+
+void AddSC_instance_blackrock_depths()
+{
+    Script* s;
+    s = new is_blackrock_depths();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_blackrock_depths";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_blackrock_depths;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/blackrock_spire.h b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/blackrock_spire.h
new file mode 100644
index 000000000..a40c61c6a
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/blackrock_spire.h
@@ -0,0 +1,141 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_BLACKROCK_SPIRE_H
+#define DEF_BLACKROCK_SPIRE_H
+
+enum
+{
+    MAX_ENCOUNTER               = 6,
+    MAX_ROOMS                   = 7,
+    DO_ACTIVATE_RUNES           = 0,
+    DO_SORT_MOBS                = 1,
+    DO_EMBERSEER_EVENT          = 2,
+    DO_FLAMEWREATH_EVENT        = 3,
+
+    TYPE_ROOM_EVENT             = 0,
+    TYPE_EMBERSEER              = 1,
+    TYPE_FLAMEWREATH            = 2,                        // Only summon once per instance
+    TYPE_STADIUM                = 3,
+    TYPE_DRAKKISATH             = 4,
+    TYPE_VALTHALAK              = 5,                        // Only summon once per instance
+
+    NPC_SCARSHIELD_INFILTRATOR  = 10299,
+    NPC_BLACKHAND_SUMMONER      = 9818,
+    NPC_BLACKHAND_VETERAN       = 9819,
+    NPC_PYROGUARD_EMBERSEER     = 9816,
+    NPC_SOLAKAR_FLAMEWREATH     = 10264,
+    NPC_BLACKHAND_INCARCERATOR  = 10316,
+    NPC_LORD_VICTOR_NEFARIUS    = 10162,
+    NPC_REND_BLACKHAND          = 10429,
+    NPC_GYTH                    = 10339,
+    NPC_DRAKKISATH              = 10363,
+    NPC_CHROMATIC_WHELP         = 10442,                    // related to Gyth arena event
+    NPC_CHROMATIC_DRAGON        = 10447,
+    NPC_BLACKHAND_HANDLER       = 10742,
+
+    // Doors
+    GO_EMBERSEER_IN             = 175244,
+    GO_DOORS                    = 175705,
+    GO_EMBERSEER_OUT            = 175153,
+    GO_FATHER_FLAME             = 175245,
+    GO_GYTH_ENTRY_DOOR          = 164726,
+    GO_GYTH_COMBAT_DOOR         = 175185,
+    GO_GYTH_EXIT_DOOR           = 175186,
+    GO_DRAKKISATH_DOOR_1        = 175946,
+    GO_DRAKKISATH_DOOR_2        = 175947,
+
+
+#if defined (TBC) || defined (WOTLK)  || defined (CATA)    
+    // upper spire entrance
+    GO_DRAGONSPINE              = 164725,
+    GO_BRAZIER_1                = 175528,
+    GO_BRAZIER_2                = 175529,
+    GO_BRAZIER_3                = 175530,
+    GO_BRAZIER_4                = 175531,
+    GO_BRAZIER_5                = 175532,
+    GO_BRAZIER_6                = 175533,
+#endif
+
+    GO_ROOM_7_RUNE              = 175194,
+    GO_ROOM_3_RUNE              = 175195,
+    GO_ROOM_6_RUNE              = 175196,
+    GO_ROOM_1_RUNE              = 175197,
+    GO_ROOM_5_RUNE              = 175198,
+    GO_ROOM_2_RUNE              = 175199,
+    GO_ROOM_4_RUNE              = 175200,
+
+    GO_ROOKERY_EGG              = 175124,
+
+    GO_EMBERSEER_RUNE_1         = 175266,
+    GO_EMBERSEER_RUNE_2         = 175267,
+    GO_EMBERSEER_RUNE_3         = 175268,
+    GO_EMBERSEER_RUNE_4         = 175269,
+    GO_EMBERSEER_RUNE_5         = 175270,
+    GO_EMBERSEER_RUNE_6         = 175271,
+    GO_EMBERSEER_RUNE_7         = 175272,
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    ITEM_SEAL_OF_ASCENSION      = 12344,
+#endif
+
+    MAX_STADIUM_WAVES           = 7,
+    MAX_STADIUM_MOBS_PER_WAVE   = 5,
+
+    FACTION_BLACK_DRAGON        = 103,
+
+    SPELL_ENCAGE_EMBERSEER      = 15281,    // cast by Blackhand Incarcerator
+};
+
+struct SpawnLocation
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+static const SpawnLocation aStadiumLocs[7] =
+{
+    {210.00f, -420.30f, 110.94f, 3.14f},                    // dragons summon location
+    {210.14f, -397.54f, 111.1f, 0.0f},                      // Gyth summon location
+    {163.62f, -420.33f, 110.47f, 0.0f},                     // center of the stadium location (for movement)
+    {164.63f, -444.04f, 121.97f, 3.22f},                    // Lord Nefarius summon position
+    {161.01f, -443.73f, 121.97f, 6.26f},                    // Rend summon position
+    {164.64f, -443.30f, 121.97f, 1.61f},                    // Nefarius move position
+    {165.74f, -466.46f, 116.80f, 0.0f},                     // Rend move position
+};
+
+// Stadium event description
+static const uint32 aStadiumEventNpcs[MAX_STADIUM_WAVES][5] =
+{
+    {NPC_CHROMATIC_WHELP, NPC_CHROMATIC_WHELP, NPC_CHROMATIC_WHELP, NPC_CHROMATIC_DRAGON, 0},
+    {NPC_CHROMATIC_WHELP, NPC_CHROMATIC_WHELP, NPC_CHROMATIC_WHELP, NPC_CHROMATIC_DRAGON, 0},
+    {NPC_CHROMATIC_WHELP, NPC_CHROMATIC_WHELP, NPC_CHROMATIC_DRAGON, NPC_BLACKHAND_HANDLER, 0},
+    {NPC_CHROMATIC_WHELP, NPC_CHROMATIC_WHELP, NPC_CHROMATIC_DRAGON, NPC_BLACKHAND_HANDLER, 0},
+    {NPC_CHROMATIC_WHELP, NPC_CHROMATIC_WHELP, NPC_CHROMATIC_WHELP, NPC_CHROMATIC_DRAGON, NPC_BLACKHAND_HANDLER},
+    {NPC_CHROMATIC_WHELP, NPC_CHROMATIC_WHELP, NPC_CHROMATIC_DRAGON, NPC_CHROMATIC_DRAGON, NPC_BLACKHAND_HANDLER},
+    {NPC_CHROMATIC_WHELP, NPC_CHROMATIC_WHELP, NPC_CHROMATIC_DRAGON, NPC_CHROMATIC_DRAGON, NPC_BLACKHAND_HANDLER},
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/boss_gyth.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/boss_gyth.cpp
new file mode 100644
index 000000000..6f06111cc
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/boss_gyth.cpp
@@ -0,0 +1,180 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Gyth
+ * SD%Complete: 100
+ * SDComment:   Timers may need adjustments
+ * SDCategory:  Blackrock Spire
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackrock_spire.h"
+
+enum
+{
+    SAY_NEFARIUS_BUFF_GYTH  = -1229017,
+    EMOTE_KNOCKED_OFF       = -1229019,
+
+    SPELL_CHROMATIC_CHAOS   = 16337,                // casted by Nefarius at 50%
+    SPELL_REND_MOUNTS       = 16167,
+    SPELL_SUMMON_REND       = 16328,
+    SPELL_CORROSIVE_ACID    = 16359,
+    SPELL_FREEZE            = 16350,
+    SPELL_FLAME_BREATH      = 16390,
+    SPELL_KNOCK_AWAY        = 10101,
+};
+
+struct boss_gyth : public CreatureScript
+{
+    boss_gyth() : CreatureScript("boss_gyth") {}
+
+    struct boss_gythAI : public ScriptedAI
+    {
+        boss_gythAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 uiCorrosiveAcidTimer;
+        uint32 uiFreezeTimer;
+        uint32 uiFlamebreathTimer;
+
+        bool m_bSummonedRend;
+        bool m_bHasChromaticChaos;
+
+        void Reset() override
+        {
+            uiCorrosiveAcidTimer = 8000;
+            uiFreezeTimer = 11000;
+            uiFlamebreathTimer = 4000;
+            m_bSummonedRend = false;
+            m_bHasChromaticChaos = false;
+
+            DoCastSpellIfCan(m_creature, SPELL_REND_MOUNTS);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            DoScriptText(EMOTE_KNOCKED_OFF, pSummoned);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Chromatic Chaos at 50%
+            if (!m_bHasChromaticChaos && m_creature->GetHealthPercent() < 50.0f)
+            {
+                if (m_pInstance)
+                {
+                    if (Creature* pNefarius = m_pInstance->GetSingleCreatureFromStorage(NPC_LORD_VICTOR_NEFARIUS))
+                    {
+                        pNefarius->CastSpell(m_creature, SPELL_CHROMATIC_CHAOS, true);
+                        DoScriptText(SAY_NEFARIUS_BUFF_GYTH, pNefarius);
+                        m_bHasChromaticChaos = true;
+                    }
+                }
+            }
+
+            // CorrosiveAcid_Timer
+            if (uiCorrosiveAcidTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CORROSIVE_ACID) == CAST_OK)
+                {
+                    uiCorrosiveAcidTimer = 7000;
+                }
+            }
+            else
+            {
+                uiCorrosiveAcidTimer -= uiDiff;
+            }
+
+            // Freeze_Timer
+            if (uiFreezeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FREEZE) == CAST_OK)
+                {
+                    uiFreezeTimer = 16000;
+                }
+            }
+            else
+            {
+                uiFreezeTimer -= uiDiff;
+            }
+
+            // Flamebreath_Timer
+            if (uiFlamebreathTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FLAME_BREATH) == CAST_OK)
+                {
+                    uiFlamebreathTimer = 10500;
+                }
+            }
+            else
+            {
+                uiFlamebreathTimer -= uiDiff;
+            }
+
+            // Summon Rend
+            if (!m_bSummonedRend && m_creature->GetHealthPercent() < 11.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_REND) == CAST_OK)
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_REND_MOUNTS);
+                    m_bSummonedRend = true;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_gythAI(pCreature);
+    }
+};
+
+void AddSC_boss_gyth()
+{
+    Script *s;
+    s = new boss_gyth();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_gyth";
+    //pNewScript->GetAI = &GetAI_boss_gyth;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/boss_overlord_wyrmthalak.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/boss_overlord_wyrmthalak.cpp
new file mode 100644
index 000000000..cdc37243b
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/boss_overlord_wyrmthalak.cpp
@@ -0,0 +1,173 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Overlord_Wyrmthalak
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Blackrock Spire
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_BLASTWAVE            = 11130,
+    SPELL_SHOUT                = 23511,
+    SPELL_CLEAVE               = 20691,
+    SPELL_KNOCKAWAY            = 20686,
+
+    NPC_SPIRESTONE_WARLORD     = 9216,
+    NPC_SMOLDERTHORN_BERSERKER = 9268
+};
+
+const float afLocations[2][4] =
+{
+    { -39.355381f, -513.456482f, 88.472046f, 4.679872f},
+    { -49.875881f, -511.896942f, 88.195160f, 4.613114f}
+};
+
+struct boss_overlordwyrmthalak : public CreatureScript
+{
+    boss_overlordwyrmthalak() : CreatureScript("boss_overlord_wyrmthalak") {}
+
+    struct boss_overlordwyrmthalakAI : public ScriptedAI
+    {
+        boss_overlordwyrmthalakAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiBlastWaveTimer;
+        uint32 m_uiShoutTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiKnockawayTimer;
+        bool m_bSummoned;
+
+        void Reset() override
+        {
+            m_uiBlastWaveTimer = 20000;
+            m_uiShoutTimer = 2000;
+            m_uiCleaveTimer = 6000;
+            m_uiKnockawayTimer = 12000;
+            m_bSummoned = false;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() != NPC_SPIRESTONE_WARLORD && pSummoned->GetEntry() != NPC_SMOLDERTHORN_BERSERKER)
+            {
+                return;
+            }
+
+            if (m_creature->getVictim())
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0);
+                pSummoned->AI()->AttackStart(pTarget ? pTarget : m_creature->getVictim());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // BlastWave
+            if (m_uiBlastWaveTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_BLASTWAVE);
+                m_uiBlastWaveTimer = 20000;
+            }
+            else
+            {
+                m_uiBlastWaveTimer -= uiDiff;
+            }
+
+            // Shout
+            if (m_uiShoutTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SHOUT);
+                m_uiShoutTimer = 10000;
+            }
+            else
+            {
+                m_uiShoutTimer -= uiDiff;
+            }
+
+            // Cleave
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE);
+                m_uiCleaveTimer = 7000;
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            // Knockaway
+            if (m_uiKnockawayTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_KNOCKAWAY);
+                m_uiKnockawayTimer = 14000;
+            }
+            else
+            {
+                m_uiKnockawayTimer -= uiDiff;
+            }
+
+            // Summon two Beserks
+            if (!m_bSummoned && m_creature->GetHealthPercent() < 51.0f)
+            {
+                m_creature->SummonCreature(NPC_SPIRESTONE_WARLORD, afLocations[0][0], afLocations[0][1], afLocations[0][2], afLocations[0][3], TEMPSUMMON_TIMED_DESPAWN, 300000);
+                m_creature->SummonCreature(NPC_SMOLDERTHORN_BERSERKER, afLocations[1][0], afLocations[1][1], afLocations[1][2], afLocations[1][3], TEMPSUMMON_TIMED_DESPAWN, 300000);
+
+                m_bSummoned = true;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_overlordwyrmthalakAI(pCreature);
+    }
+};
+
+void AddSC_boss_overlordwyrmthalak()
+{
+    Script *s;
+    s = new boss_overlordwyrmthalak();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_overlord_wyrmthalak";
+    //pNewScript->GetAI = &GetAI_boss_overlordwyrmthalak;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/boss_pyroguard_emberseer.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/boss_pyroguard_emberseer.cpp
new file mode 100644
index 000000000..2399ea35e
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/boss_pyroguard_emberseer.cpp
@@ -0,0 +1,263 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Pyroguard_Emberseer
+ * SD%Complete: 90
+ * SDComment:   Dummy spells used during the transformation may need further research
+ * SDCategory:  Blackrock Spire
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackrock_spire.h"
+
+enum
+{
+    // Intro emote/say
+    EMOTE_NEAR              = -1229001,
+    EMOTE_FULL              = -1229002,
+    SAY_FREE                = -1229003,
+
+    MAX_GROWING_STACKS      = 20,
+
+    // Intro spells
+
+    SPELL_FIRE_SHIELD       = 13376,                        // not sure what's the purpose of this
+    SPELL_DESPAWN_EMBERSEER = 16078,                        // not sure what's the purpose of this
+    SPELL_FREEZE_ANIM       = 16245,                        // not sure what's the purpose of this
+    SPELL_FULL_STRENGHT     = 16047,
+    SPELL_GROWING           = 16049,                        // stacking aura
+    SPELL_BONUS_DAMAGE      = 16534,                        // triggered on full grow
+    SPELL_TRANSFORM         = 16052,
+
+    // Combat spells
+    SPELL_FIRENOVA          = 23462,
+    SPELL_FLAMEBUFFET       = 23341,
+    SPELL_PYROBLAST         = 20228                         // guesswork, but best fitting in spells-area, was 17274 (has mana cost)
+};
+
+struct boss_pyroguard_emberseer : public CreatureScript
+{
+    boss_pyroguard_emberseer() : CreatureScript("boss_pyroguard_emberseer") {}
+
+    struct boss_pyroguard_emberseerAI : public ScriptedAI
+    {
+        boss_pyroguard_emberseerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = pCreature->GetInstanceData();
+        }
+
+        InstanceData* m_pInstance;
+
+        uint32 m_uiEncageTimer;
+        uint32 m_uiFireNovaTimer;
+        uint32 m_uiFlameBuffetTimer;
+        uint32 m_uiPyroBlastTimer;
+        uint8 m_uiGrowingStacks;
+
+        void Reset() override
+        {
+            m_uiEncageTimer = 10000;
+            m_uiFireNovaTimer = 6000;
+            m_uiFlameBuffetTimer = 3000;
+            m_uiPyroBlastTimer = 14000;
+            m_uiGrowingStacks = 0;
+
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_EMBERSEER, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_EMBERSEER, FAIL);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType type, Creature* pSender, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            if (type == AI_EVENT_CUSTOM_A && pSender == m_creature) //defined in the spell
+                DoHandleEmberseerGrowing();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Cast Encage spell on OOC timer
+            if (m_uiEncageTimer)
+            {
+                if (m_uiEncageTimer <= uiDiff)
+                {
+                    if (!m_pInstance)
+                    {
+                        script_error_log("Instance Blackrock Spire: ERROR Failed to load instance data for this instace.");
+                        return;
+                    }
+
+                    m_pInstance->SetData64(NPC_PYROGUARD_EMBERSEER, m_creature->GetObjectGuid());
+
+                    m_uiEncageTimer = 0;
+                }
+                else
+                {
+                    m_uiEncageTimer -= uiDiff;
+                }
+            }
+
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // FireNova Timer
+            if (m_uiFireNovaTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FIRENOVA) == CAST_OK)
+                {
+                    m_uiFireNovaTimer = 6000;
+                }
+            }
+            else
+            {
+                m_uiFireNovaTimer -= uiDiff;
+            }
+
+            // FlameBuffet Timer
+            if (m_uiFlameBuffetTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FLAMEBUFFET) == CAST_OK)
+                {
+                    m_uiFlameBuffetTimer = 14000;
+                }
+            }
+            else
+            {
+                m_uiFlameBuffetTimer -= uiDiff;
+            }
+
+            // PyroBlast Timer
+            if (m_uiPyroBlastTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_PYROBLAST) == CAST_OK)
+                    {
+                        m_uiPyroBlastTimer = 15000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiPyroBlastTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+
+    private:
+        // Wrapper to handle the transformation
+        void DoHandleEmberseerGrowing()
+        {
+            ++m_uiGrowingStacks;
+
+            if (m_uiGrowingStacks == MAX_GROWING_STACKS * 0.5f)
+            {
+                DoScriptText(EMOTE_NEAR, m_creature);
+            }
+            else if (m_uiGrowingStacks == MAX_GROWING_STACKS)
+            {
+                DoScriptText(EMOTE_FULL, m_creature);
+                DoScriptText(SAY_FREE, m_creature);
+
+                // Note: the spell order needs further research
+                DoCastSpellIfCan(m_creature, SPELL_FULL_STRENGHT, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_BONUS_DAMAGE, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_TRANSFORM, CAST_TRIGGERED);
+
+                // activate all runes
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(MAX_ENCOUNTER, DO_ACTIVATE_RUNES);
+                    // Redundant check: if for some reason the event isn't set in progress until this point - avoid using the altar again when the boss is fully grown
+                    m_pInstance->SetData(TYPE_EMBERSEER, IN_PROGRESS);
+                }
+
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_pyroguard_emberseerAI(pCreature);
+    }
+};
+
+struct spell_emberseer_growing : public SpellScript
+{
+    spell_emberseer_growing() : SpellScript("spell_emberseer_growing") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_GROWING && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (CreatureAI* pEmberseerAI = pCreatureTarget->ToCreature()->AI())
+            {
+                pEmberseerAI->SendAIEvent(AI_EVENT_CUSTOM_A, pCreatureTarget->ToCreature(), pCreatureTarget->ToCreature(), 0);
+            }
+            return true;
+        }
+        return false;
+    }
+};
+
+void AddSC_boss_pyroguard_emberseer()
+{
+    Script *s;
+    s = new boss_pyroguard_emberseer();
+    s->RegisterSelf();
+    s = new spell_emberseer_growing();
+    s->RegisterSelf();
+
+    //Script* pNewScript;
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_pyroguard_emberseer";
+    //pNewScript->GetAI = &GetAI_boss_pyroguard_emberseer;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_pyroguard_emberseer;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/instance_blackrock_spire.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/instance_blackrock_spire.cpp
new file mode 100644
index 000000000..e8344ebac
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/instance_blackrock_spire.cpp
@@ -0,0 +1,1025 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      instance_blackrock_spire
+ * SD%Complete: 75
+ * SDComment:   The Stadium event is missing some yells. Seal of Ascension related event NYI
+ * SDCategory:  Blackrock Spire
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackrock_spire.h"
+
+enum
+{
+    AREATRIGGER_ENTER_UBRS      = 2046,
+    AREATRIGGER_STADIUM         = 2026,
+
+    // Arena event dialogue - handled by instance
+    SAY_NEFARIUS_INTRO_1        = -1229004,
+    SAY_NEFARIUS_INTRO_2        = -1229005,
+    SAY_NEFARIUS_ATTACK_1       = -1229006,
+    SAY_REND_JOIN               = -1229007,
+    SAY_NEFARIUS_ATTACK_2       = -1229008,
+    SAY_NEFARIUS_ATTACK_3       = -1229009,
+    SAY_NEFARIUS_ATTACK_4       = -1229010,
+    SAY_REND_LOSE_1             = -1229011,
+    SAY_REND_LOSE_2             = -1229012,
+    SAY_NEFARIUS_LOSE_3         = -1229013,
+    SAY_NEFARIUS_LOSE_4         = -1229014,
+    SAY_REND_ATTACK             = -1229015,
+    SAY_NEFARIUS_WARCHIEF       = -1229016,
+    SAY_NEFARIUS_VICTORY        = -1229018,
+
+    // Emberseer event
+    EMOTE_BEGIN                 = -1229000,
+    SPELL_EMBERSEER_GROWING     = 16048,
+
+    // Solakar Flamewreath Event
+    SAY_ROOKERY_EVENT_START     = -1229020,
+    NPC_ROOKERY_GUARDIAN        = 10258,
+    NPC_ROOKERY_HATCHER         = 10683,
+};
+
+/* Areatrigger
+1470 Instance Entry
+1628 LBRS, between Spiders and Ogres
+1946 LBRS, ubrs pre-quest giver (1)
+1986 LBRS, ubrs pre-quest giver (2)
+1987 LBRS, ubrs pre-quest giver (3)
+2026 UBRS, stadium event trigger
+2046 UBRS, way to upper
+2066 UBRS, The Beast - Exit (to the dark chamber)
+2067 UBRS, The Beast - Entry
+2068 LBRS, fall out of map
+3726 UBRS, entrance to BWL
+*/
+
+static const DialogueEntry aStadiumDialogue[] =
+{
+    {NPC_LORD_VICTOR_NEFARIUS,  0,                          1000},
+    {SAY_NEFARIUS_INTRO_1,      NPC_LORD_VICTOR_NEFARIUS,   7000},
+    {SAY_NEFARIUS_INTRO_2,      NPC_LORD_VICTOR_NEFARIUS,   5000},
+    {NPC_BLACKHAND_HANDLER,     0,                          0},
+    {SAY_NEFARIUS_LOSE_4,       NPC_LORD_VICTOR_NEFARIUS,   3000},
+    {SAY_REND_ATTACK,           NPC_REND_BLACKHAND,         2000},
+    {SAY_NEFARIUS_WARCHIEF,     NPC_LORD_VICTOR_NEFARIUS,   0},
+    {SAY_NEFARIUS_VICTORY,      NPC_LORD_VICTOR_NEFARIUS,   5000},
+    {NPC_REND_BLACKHAND,        0,                          0},
+    {0, 0, 0},
+};
+
+static const float rookeryEventSpawnPos[3] = {43.7685f, -259.82f, 91.6483f};
+
+struct is_blackrock_spire : public InstanceScript
+{
+    is_blackrock_spire() : InstanceScript("instance_blackrock_spire") {}
+
+    class instance_blackrock_spire : public ScriptedInstance, private DialogueHelper
+    {
+    public:
+        instance_blackrock_spire(Map* pMap) : ScriptedInstance(pMap), DialogueHelper(aStadiumDialogue),
+            m_uiFlamewreathEventTimer(0),
+            m_uiFlamewreathWaveCount(0),
+            m_uiStadiumEventTimer(0),
+            m_uiStadiumWaves(0),
+#if defined (TBC) || defined(WOTLK)
+            m_uiStadiumMobsAlive(0),
+            m_uiDragonspineDoorTimer(0),
+            m_uiDragonspineGoCount(0),
+            m_bUpperDoorOpened(false)
+#else
+            m_uiStadiumMobsAlive(0)
+#endif
+        {
+            Initialize();
+        }
+
+        ~instance_blackrock_spire() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+            memset(&m_aRoomRuneGuid, 0, sizeof(m_aRoomRuneGuid));
+            InitializeDialogueHelper(this);
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_EMBERSEER_IN:
+                if (GetData(TYPE_ROOM_EVENT) == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_DOORS:
+                break;
+            case GO_EMBERSEER_OUT:
+                if (GetData(TYPE_EMBERSEER) == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_FATHER_FLAME:
+            case GO_GYTH_ENTRY_DOOR:
+            case GO_GYTH_COMBAT_DOOR:
+            case GO_DRAKKISATH_DOOR_1:
+            case GO_DRAKKISATH_DOOR_2:
+                break;
+            case GO_GYTH_EXIT_DOOR:
+                if (GetData(TYPE_STADIUM) == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+
+#if defined (TBC) || defined(WOTLK)
+        case GO_BRAZIER_1:
+        case GO_BRAZIER_2:
+        case GO_BRAZIER_3:
+        case GO_BRAZIER_4:
+        case GO_BRAZIER_5:
+        case GO_BRAZIER_6:
+        case GO_DRAGONSPINE:
+            break;
+#endif
+            case GO_ROOM_1_RUNE:
+                m_aRoomRuneGuid[0] = pGo->GetObjectGuid();
+                return;
+            case GO_ROOM_2_RUNE:
+                m_aRoomRuneGuid[1] = pGo->GetObjectGuid();
+                return;
+            case GO_ROOM_3_RUNE:
+                m_aRoomRuneGuid[2] = pGo->GetObjectGuid();
+                return;
+            case GO_ROOM_4_RUNE:
+                m_aRoomRuneGuid[3] = pGo->GetObjectGuid();
+                return;
+            case GO_ROOM_5_RUNE:
+                m_aRoomRuneGuid[4] = pGo->GetObjectGuid();
+                return;
+            case GO_ROOM_6_RUNE:
+                m_aRoomRuneGuid[5] = pGo->GetObjectGuid();
+                return;
+            case GO_ROOM_7_RUNE:
+                m_aRoomRuneGuid[6] = pGo->GetObjectGuid();
+                return;
+
+            case GO_EMBERSEER_RUNE_1:
+            case GO_EMBERSEER_RUNE_2:
+            case GO_EMBERSEER_RUNE_3:
+            case GO_EMBERSEER_RUNE_4:
+            case GO_EMBERSEER_RUNE_5:
+            case GO_EMBERSEER_RUNE_6:
+            case GO_EMBERSEER_RUNE_7:
+                m_lEmberseerRunesGUIDList.push_back(pGo->GetObjectGuid());
+                return;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_PYROGUARD_EMBERSEER:
+            case NPC_SOLAKAR_FLAMEWREATH:
+            case NPC_LORD_VICTOR_NEFARIUS:
+            case NPC_GYTH:
+            case NPC_REND_BLACKHAND:
+            case NPC_SCARSHIELD_INFILTRATOR:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+
+            case NPC_BLACKHAND_SUMMONER:
+            case NPC_BLACKHAND_VETERAN:
+                m_lRoomEventMobGUIDList.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_BLACKHAND_INCARCERATOR:
+                m_lIncarceratorGUIDList.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_BLACKHAND_SUMMONER:
+            case NPC_BLACKHAND_VETERAN:
+                // Handle Runes
+                if (m_auiEncounter[TYPE_ROOM_EVENT] == IN_PROGRESS)
+                {
+                    uint8 uiNotEmptyRoomsCount = 0;
+                    for (uint8 i = 0; i < MAX_ROOMS; ++i)
+                    {
+                        if (m_aRoomRuneGuid[i])                 // This check is used, to ensure which runes still need processing
+                        {
+                            m_alRoomEventMobGUIDSorted[i].remove(pCreature->GetObjectGuid());
+                            if (m_alRoomEventMobGUIDSorted[i].empty())
+                            {
+                                DoUseDoorOrButton(m_aRoomRuneGuid[i]);
+                                m_aRoomRuneGuid[i].Clear();
+                            }
+                            else
+                            {
+                                ++uiNotEmptyRoomsCount;    // found an not empty room
+                            }
+                        }
+                    }
+                    if (!uiNotEmptyRoomsCount)
+                    {
+                        SetData(TYPE_ROOM_EVENT, DONE);
+                    }
+                }
+                break;
+            case NPC_SOLAKAR_FLAMEWREATH:
+                SetData(TYPE_FLAMEWREATH, DONE);
+                break;
+            case NPC_DRAKKISATH:
+                SetData(TYPE_DRAKKISATH, DONE);
+                DoUseDoorOrButton(GO_DRAKKISATH_DOOR_1);
+                DoUseDoorOrButton(GO_DRAKKISATH_DOOR_2);
+                break;
+            case NPC_CHROMATIC_WHELP:
+            case NPC_CHROMATIC_DRAGON:
+            case NPC_BLACKHAND_HANDLER:
+                // check if it's summoned - some npcs with the same entry are already spawned in the instance
+                if (!pCreature->IsTemporarySummon())
+                {
+                    break;
+                }
+                --m_uiStadiumMobsAlive;
+                if (m_uiStadiumMobsAlive == 0)
+                {
+                    DoSendNextStadiumWave();
+                }
+                break;
+            case NPC_GYTH:
+            case NPC_REND_BLACKHAND:
+                --m_uiStadiumMobsAlive;
+                if (m_uiStadiumMobsAlive == 0)
+                {
+                    StartNextDialogueText(SAY_NEFARIUS_VICTORY);
+                }
+                break;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+                // Emberseer should evade if the incarcerators evade
+            case NPC_BLACKHAND_INCARCERATOR:
+                if (Creature* pEmberseer = GetSingleCreatureFromStorage(NPC_PYROGUARD_EMBERSEER))
+                {
+                    pEmberseer->AI()->EnterEvadeMode();
+                }
+                break;
+            case NPC_SOLAKAR_FLAMEWREATH:
+            case NPC_ROOKERY_GUARDIAN:
+            case NPC_ROOKERY_HATCHER:
+                SetData(TYPE_FLAMEWREATH, FAIL);
+                break;
+            case NPC_CHROMATIC_WHELP:
+            case NPC_CHROMATIC_DRAGON:
+            case NPC_BLACKHAND_HANDLER:
+            case NPC_GYTH:
+            case NPC_REND_BLACKHAND:
+                // check if it's summoned - some npcs with the same entry are already spawned in the instance
+                if (!pCreature->IsTemporarySummon())
+                {
+                    break;
+                }
+                SetData(TYPE_STADIUM, FAIL);
+                pCreature->ForcedDespawn();
+                break;
+            }
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+                // Once one of the Incarcerators gets Aggro, the door should close
+            case NPC_BLACKHAND_INCARCERATOR:
+                SetData(TYPE_EMBERSEER, IN_PROGRESS);
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_ROOM_EVENT:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_EMBERSEER_IN);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_EMBERSEER:
+                // Don't set the same data twice
+                if (m_auiEncounter[uiType] == uiData)
+                {
+                    break;
+                }
+                // Combat door
+                DoUseDoorOrButton(GO_DOORS);
+                // Respawn all incarcerators and reset the runes on FAIL
+                if (uiData == FAIL)
+                {
+                    for (GuidList::const_iterator itr = m_lIncarceratorGUIDList.begin(); itr != m_lIncarceratorGUIDList.end(); ++itr)
+                    {
+                        if (Creature* pIncarcerator = instance->GetCreature(*itr))
+                        {
+                            if (!pIncarcerator->IsAlive())
+                            {
+                                pIncarcerator->Respawn();
+                            }
+                            pIncarcerator->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                        }
+                    }
+
+                    DoUseEmberseerRunes(true);
+                }
+                else if (uiData == DONE)
+                {
+                    DoUseEmberseerRunes();
+                    DoUseDoorOrButton(GO_EMBERSEER_OUT);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_FLAMEWREATH:
+                if (uiData == FAIL)
+                {
+                    m_uiFlamewreathEventTimer = 0;
+                    m_uiFlamewreathWaveCount = 0;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_STADIUM:
+                // Don't set the same data twice
+                if (m_auiEncounter[uiType] == uiData)
+                {
+                    break;
+                }
+                // Combat door
+                DoUseDoorOrButton(GO_GYTH_ENTRY_DOOR);
+                // Start event
+                if (uiData == IN_PROGRESS)
+                {
+                    StartNextDialogueText(SAY_NEFARIUS_INTRO_1);
+                }
+                else if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_GYTH_EXIT_DOOR);
+                }
+                else if (uiData == FAIL)
+                {
+                    // Despawn Nefarius and Rend on fail (the others are despawned OnCreatureEvade())
+                    if (Creature* pNefarius = GetSingleCreatureFromStorage(NPC_LORD_VICTOR_NEFARIUS))
+                    {
+                        pNefarius->ForcedDespawn();
+                    }
+                    if (Creature* pRend = GetSingleCreatureFromStorage(NPC_REND_BLACKHAND))
+                    {
+                        pRend->ForcedDespawn();
+                    }
+                    if (Creature* pGyth = GetSingleCreatureFromStorage(NPC_GYTH))
+                    {
+                        pGyth->ForcedDespawn();
+                    }
+
+                    m_uiStadiumEventTimer = 0;
+                    m_uiStadiumMobsAlive = 0;
+                    m_uiStadiumWaves = 0;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_DRAKKISATH:
+            case TYPE_VALTHALAK:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case MAX_ENCOUNTER:
+                switch (uiData)
+                {
+                case DO_ACTIVATE_RUNES:
+                    DoUseEmberseerRunes();
+                    break;
+                case DO_SORT_MOBS:
+                    DoSortRoomEventMobs();
+                    break;
+                case DO_EMBERSEER_EVENT:
+                    DoProcessEmberseerEvent();
+                    break;
+                case DO_FLAMEWREATH_EVENT:
+                    StartflamewreathEventIfCan();
+                    break;
+                }
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        void SetData64(uint32 type, uint64 guid) override
+        {
+            switch (type)
+            {
+            case NPC_PYROGUARD_EMBERSEER:
+            {
+                Creature *ember = instance->GetCreature(ObjectGuid(guid));
+
+                for (GuidList::const_iterator itr = m_lIncarceratorGUIDList.begin(); itr != m_lIncarceratorGUIDList.end(); ++itr)
+                {
+                    if (Creature* pIncarcerator = instance->GetCreature(*itr))
+                    {
+                        pIncarcerator->CastSpell(ember, SPELL_ENCAGE_EMBERSEER, false);
+                    }
+                }
+                break;
+            }
+#if defined (TBC) || defined(WOTLK)
+            case MAX_ENCOUNTER:
+                if (Player* pPlayer = instance->GetPlayer(ObjectGuid(guid)))
+                    DoOpenUpperDoorIfCan(pPlayer);
+                break;
+#endif
+            default:
+                break;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] >> m_auiEncounter[4] >> m_auiEncounter[5];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+#if defined (CLASSIC)
+            OUT_LOAD_INST_DATA_COMPLETE;
+#endif
+        }
+
+#if defined (TBC) || defined(WOTLK)
+        void DoOpenUpperDoorIfCan(Player* pPlayer)
+        {
+            if (m_bUpperDoorOpened)
+                return;
+
+            if (pPlayer->HasItemCount(ITEM_SEAL_OF_ASCENSION, 1))
+            {
+                m_uiDragonspineDoorTimer = 100;
+                m_uiDragonspineGoCount = 0;
+                m_bUpperDoorOpened = true;
+            }
+        }
+#endif  
+
+        void Update(uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (m_uiStadiumEventTimer)
+            {
+                if (m_uiStadiumEventTimer <= uiDiff)
+                {
+                    DoSendNextStadiumWave();
+                }
+                else
+                {
+                    m_uiStadiumEventTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiFlamewreathEventTimer)
+            {
+                if (m_uiFlamewreathEventTimer <= uiDiff)
+                {
+                    DoSendNextFlamewreathWave();
+                }
+                else
+                {
+                    m_uiFlamewreathEventTimer -= uiDiff;
+                }
+            }
+
+#if defined (TBC) || defined(WOTLK)
+            // unlock dragon spine door
+            if (m_uiDragonspineDoorTimer)
+            {
+                if (m_uiDragonspineDoorTimer <= uiDiff)
+                {
+                    switch (m_uiDragonspineGoCount)
+                    {
+                    case 0:
+                        DoUseDoorOrButton(GO_BRAZIER_1);
+                        DoUseDoorOrButton(GO_BRAZIER_2);
+                        break;
+                    case 1:
+                        DoUseDoorOrButton(GO_BRAZIER_3);
+                        DoUseDoorOrButton(GO_BRAZIER_4);
+                        break;
+                    case 2:
+                        DoUseDoorOrButton(GO_BRAZIER_5);
+                        DoUseDoorOrButton(GO_BRAZIER_6);
+                        break;
+                    case 3:
+                        DoUseDoorOrButton(GO_DRAGONSPINE);
+                        break;
+                    }
+                    ++m_uiDragonspineGoCount;
+
+                    if (m_uiDragonspineGoCount >= 4)
+                        m_uiDragonspineDoorTimer = 0;
+                    else
+                        m_uiDragonspineDoorTimer = 1000;
+                }
+                else
+                    m_uiDragonspineDoorTimer -= uiDiff;
+            }
+#endif
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case NPC_BLACKHAND_HANDLER:
+                m_uiStadiumEventTimer = 1000;
+                // Move the two near the balcony
+                if (Creature* pRend = GetSingleCreatureFromStorage(NPC_REND_BLACKHAND))
+                {
+                    pRend->SetFacingTo(aStadiumLocs[5].m_fO);
+                }
+                if (Creature* pNefarius = GetSingleCreatureFromStorage(NPC_LORD_VICTOR_NEFARIUS))
+                {
+                    pNefarius->GetMotionMaster()->MovePoint(0, aStadiumLocs[5].m_fX, aStadiumLocs[5].m_fY, aStadiumLocs[5].m_fZ);
+                }
+                break;
+            case SAY_NEFARIUS_WARCHIEF:
+                // Prepare for Gyth - note: Nefarius should be moving around the balcony
+                if (Creature* pRend = GetSingleCreatureFromStorage(NPC_REND_BLACKHAND))
+                {
+                    pRend->ForcedDespawn(5000);
+                    pRend->SetWalk(false);
+                    pRend->GetMotionMaster()->MovePoint(0, aStadiumLocs[6].m_fX, aStadiumLocs[6].m_fY, aStadiumLocs[6].m_fZ);
+                }
+                m_uiStadiumEventTimer = 30000;
+                break;
+            case SAY_NEFARIUS_VICTORY:
+                SetData(TYPE_STADIUM, DONE);
+                break;
+            case NPC_REND_BLACKHAND:
+                // Despawn Nefarius
+                if (Creature* pNefarius = GetSingleCreatureFromStorage(NPC_LORD_VICTOR_NEFARIUS))
+                {
+                    pNefarius->ForcedDespawn(5000);
+                    pNefarius->GetMotionMaster()->MovePoint(0, aStadiumLocs[6].m_fX, aStadiumLocs[6].m_fY, aStadiumLocs[6].m_fZ);
+                }
+                break;
+            }
+        }
+
+    private:
+        void DoSendNextStadiumWave()
+        {
+            if (m_uiStadiumWaves < MAX_STADIUM_WAVES)
+            {
+                // Send current wave mobs
+                if (Creature* pNefarius = GetSingleCreatureFromStorage(NPC_LORD_VICTOR_NEFARIUS))
+                {
+                    float fX, fY, fZ;
+                    for (uint8 i = 0; i < MAX_STADIUM_MOBS_PER_WAVE; ++i)
+                    {
+                        if (aStadiumEventNpcs[m_uiStadiumWaves][i] == 0)
+                        {
+                            continue;
+                        }
+
+                        pNefarius->GetRandomPoint(aStadiumLocs[0].m_fX, aStadiumLocs[0].m_fY, aStadiumLocs[0].m_fZ, 7.0f, fX, fY, fZ);
+                        fX = std::min(aStadiumLocs[0].m_fX, fX);    // Halfcircle - suits better the rectangular form
+                        if (Creature* pTemp = pNefarius->SummonCreature(aStadiumEventNpcs[m_uiStadiumWaves][i], fX, fY, fZ, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0))
+                        {
+                            // Get some point in the center of the stadium
+                            pTemp->GetRandomPoint(aStadiumLocs[2].m_fX, aStadiumLocs[2].m_fY, aStadiumLocs[2].m_fZ, 5.0f, fX, fY, fZ);
+                            fX = std::min(aStadiumLocs[2].m_fX, fX);// Halfcircle - suits better the rectangular form
+
+                            pTemp->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                            ++m_uiStadiumMobsAlive;
+                        }
+                    }
+                }
+
+                DoUseDoorOrButton(GO_GYTH_COMBAT_DOOR);
+            }
+            // All waves are cleared - start Gyth intro
+            else if (m_uiStadiumWaves == MAX_STADIUM_WAVES)
+            {
+                StartNextDialogueText(SAY_NEFARIUS_LOSE_4);
+            }
+            else
+            {
+                // Send Gyth
+                if (Creature* pNefarius = GetSingleCreatureFromStorage(NPC_LORD_VICTOR_NEFARIUS))
+                {
+                    if (Creature* pTemp = pNefarius->SummonCreature(NPC_GYTH, aStadiumLocs[1].m_fX, aStadiumLocs[1].m_fY, aStadiumLocs[1].m_fZ, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0))
+                    {
+                        pTemp->GetMotionMaster()->MovePoint(0, aStadiumLocs[2].m_fX, aStadiumLocs[2].m_fY, aStadiumLocs[2].m_fZ);
+                    }
+                }
+
+                // Set this to 2, because Rend will be summoned later during the fight
+                m_uiStadiumMobsAlive = 2;
+
+                DoUseDoorOrButton(GO_GYTH_COMBAT_DOOR);
+            }
+
+            ++m_uiStadiumWaves;
+
+            // Stop the timer when all the waves have been sent
+            if (m_uiStadiumWaves >= MAX_STADIUM_WAVES)
+            {
+                m_uiStadiumEventTimer = 0;
+            }
+            else
+            {
+                m_uiStadiumEventTimer = 60000;
+            }
+        }
+
+        void DoSendNextFlamewreathWave()
+        {
+            GameObject* pSummoner = GetSingleGameObjectFromStorage(GO_FATHER_FLAME);
+            if (!pSummoner)
+            {
+                return;
+            }
+
+            // TODO - The npcs would move nicer if they had DB waypoints, so i suggest to change their default movement to DB waypoints, and random movement when they reached their goal
+
+            if (m_uiFlamewreathWaveCount < 6)                       // Send two adds (6 waves, then boss)
+            {
+                Creature* pSummoned = NULL;
+                for (uint8 i = 0; i < 2; ++i)
+                {
+                    float fX, fY, fZ;
+                    pSummoner->GetRandomPoint(rookeryEventSpawnPos[0], rookeryEventSpawnPos[1], rookeryEventSpawnPos[2], 2.5f, fX, fY, fZ);
+                    // Summon Rookery Hatchers in first wave, else random
+                    pSummoned = pSummoner->SummonCreature(urand(0, 1) && m_uiFlamewreathWaveCount ? NPC_ROOKERY_GUARDIAN : NPC_ROOKERY_HATCHER, fX, fY, fZ, 0.0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 300000);
+                    if (pSummoned)
+                    {
+                        pSummoner->GetContactPoint(pSummoned, fX, fY, fZ);
+                        pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, pSummoner->GetPositionZ());
+                    }
+                }
+                if (pSummoned && m_uiFlamewreathWaveCount == 0)
+                {
+                    DoScriptText(SAY_ROOKERY_EVENT_START, pSummoned);
+                }
+
+                if (m_uiFlamewreathWaveCount < 4)
+                {
+                    m_uiFlamewreathEventTimer = 30000;
+                }
+                else if (m_uiFlamewreathWaveCount < 6)
+                {
+                    m_uiFlamewreathEventTimer = 40000;
+                }
+                else
+                {
+                    m_uiFlamewreathEventTimer = 10000;
+                }
+
+                ++m_uiFlamewreathWaveCount;
+            }
+            else                                                    // Send Flamewreath
+            {
+                if (Creature* pSolakar = pSummoner->SummonCreature(NPC_SOLAKAR_FLAMEWREATH, rookeryEventSpawnPos[0], rookeryEventSpawnPos[1], rookeryEventSpawnPos[2], 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, HOUR * IN_MILLISECONDS))
+                {
+                    pSolakar->GetMotionMaster()->MovePoint(1, pSummoner->GetPositionX(), pSummoner->GetPositionY(), pSummoner->GetPositionZ());
+                }
+                SetData(TYPE_FLAMEWREATH, SPECIAL);
+                m_uiFlamewreathEventTimer = 0;
+            }
+        }
+
+        void DoUseEmberseerRunes(bool bReset = false)
+        {
+            if (m_lEmberseerRunesGUIDList.empty())
+            {
+                return;
+            }
+
+            for (GuidList::const_iterator itr = m_lEmberseerRunesGUIDList.begin(); itr != m_lEmberseerRunesGUIDList.end(); ++itr)
+            {
+                if (bReset)
+                {
+                    if (GameObject* pRune = instance->GetGameObject(*itr))
+                    {
+                        pRune->ResetDoorOrButton();
+                    }
+                }
+                else
+                {
+                    DoUseDoorOrButton(*itr);
+                }
+            }
+        }
+
+        void DoProcessEmberseerEvent()
+        {
+            if (GetData(TYPE_EMBERSEER) == DONE || GetData(TYPE_EMBERSEER) == IN_PROGRESS)
+            {
+                return;
+            }
+
+            if (m_lIncarceratorGUIDList.empty())
+            {
+                script_error_log("Npc %u couldn't be found. Please check your DB content!", NPC_BLACKHAND_INCARCERATOR);
+                return;
+            }
+
+            // start to grow
+            if (Creature* pEmberseer = GetSingleCreatureFromStorage(NPC_PYROGUARD_EMBERSEER))
+            {
+                // If already casting, return
+                if (pEmberseer->HasAura(SPELL_EMBERSEER_GROWING))
+                {
+                    return;
+                }
+
+                DoScriptText(EMOTE_BEGIN, pEmberseer);
+                pEmberseer->CastSpell(pEmberseer, SPELL_EMBERSEER_GROWING, true);
+            }
+
+            // remove the incarcerators flags and stop casting
+            for (GuidList::const_iterator itr = m_lIncarceratorGUIDList.begin(); itr != m_lIncarceratorGUIDList.end(); ++itr)
+            {
+                if (Creature* pCreature = instance->GetCreature(*itr))
+                {
+                    if (pCreature->IsAlive())
+                    {
+                        pCreature->InterruptNonMeleeSpells(false);
+                        pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                    }
+                }
+            }
+        }
+
+        void DoSortRoomEventMobs()
+        {
+            if (GetData(TYPE_ROOM_EVENT) != NOT_STARTED)
+            {
+                return;
+            }
+
+            for (uint8 i = 0; i < MAX_ROOMS; ++i)
+            {
+                if (GameObject* pRune = instance->GetGameObject(m_aRoomRuneGuid[i]))
+                {
+                    for (GuidList::const_iterator itr = m_lRoomEventMobGUIDList.begin(); itr != m_lRoomEventMobGUIDList.end(); ++itr)
+                    {
+                        Creature* pCreature = instance->GetCreature(*itr);
+                        if (pCreature && pCreature->IsAlive() && pCreature->GetDistance(pRune) < 10.0f)
+                        {
+                            m_alRoomEventMobGUIDSorted[i].push_back(*itr);
+                        }
+                    }
+                }
+            }
+
+            SetData(TYPE_ROOM_EVENT, IN_PROGRESS);
+        }
+
+        void StartflamewreathEventIfCan()
+        {
+            // Already done or currently in progress - or endboss done
+            if (m_auiEncounter[TYPE_FLAMEWREATH] == DONE || m_auiEncounter[TYPE_FLAMEWREATH] == IN_PROGRESS || m_auiEncounter[TYPE_DRAKKISATH] == DONE)
+            {
+                return;
+            }
+
+            // Boss still around
+            if (GetSingleCreatureFromStorage(NPC_SOLAKAR_FLAMEWREATH, true))
+            {
+                return;
+            }
+
+            // Start summoning of mobs
+            m_uiFlamewreathEventTimer = 1;
+            m_uiFlamewreathWaveCount = 0;
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiFlamewreathEventTimer;
+        uint32 m_uiFlamewreathWaveCount;
+        uint32 m_uiStadiumEventTimer;
+        uint8 m_uiStadiumWaves;
+        uint8 m_uiStadiumMobsAlive;
+
+#if defined (TBC) || defined(WOTLK)
+        bool m_bUpperDoorOpened;
+        uint32 m_uiDragonspineGoCount;
+        uint32 m_uiDragonspineDoorTimer;
+#endif
+        ObjectGuid m_aRoomRuneGuid[MAX_ROOMS];
+        GuidList m_alRoomEventMobGUIDSorted[MAX_ROOMS];
+        GuidList m_lRoomEventMobGUIDList;
+        GuidList m_lIncarceratorGUIDList;
+        GuidList m_lEmberseerRunesGUIDList;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_blackrock_spire(pMap);
+    }
+};
+
+struct at_blackrock_spire : public AreaTriggerScript
+{
+    at_blackrock_spire() : AreaTriggerScript("at_blackrock_spire") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (!pPlayer->IsAlive() || pPlayer->isGameMaster())
+        {
+            return false;
+        }
+
+        switch (pAt->id)
+        {
+        case AREATRIGGER_ENTER_UBRS:
+            if (InstanceData* pInstance = pPlayer->GetInstanceData())
+            {
+                pInstance->SetData(MAX_ENCOUNTER, DO_SORT_MOBS);
+#if defined (TBC) || defined(WOTLK)
+                pInstance->SetData64(MAX_ENCOUNTER, pPlayer->GetObjectGuid().GetRawValue());
+#endif
+            }
+            break;
+        case AREATRIGGER_STADIUM:
+            if (InstanceData* pInstance = pPlayer->GetInstanceData())
+            {
+                if (pInstance->GetData(TYPE_STADIUM) == IN_PROGRESS || pInstance->GetData(TYPE_STADIUM) == DONE)
+                {
+                    return false;
+                }
+
+                // Summon Nefarius and Rend for the dialogue event
+                // Note: Nefarius and Rend need to be hostile and not attackable
+                if (Creature* pNefarius = pPlayer->SummonCreature(NPC_LORD_VICTOR_NEFARIUS, aStadiumLocs[3].m_fX, aStadiumLocs[3].m_fY, aStadiumLocs[3].m_fZ, aStadiumLocs[3].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 0))
+                {
+                    pNefarius->SetFactionTemporary(FACTION_BLACK_DRAGON, TEMPFACTION_NONE);
+                }
+                if (Creature* pRend = pPlayer->SummonCreature(NPC_REND_BLACKHAND, aStadiumLocs[4].m_fX, aStadiumLocs[4].m_fY, aStadiumLocs[4].m_fZ, aStadiumLocs[4].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 0))
+                {
+                    pRend->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                }
+
+                pInstance->SetData(TYPE_STADIUM, IN_PROGRESS);
+            }
+            break;
+        }
+        return false;
+    }
+};
+
+struct event_spell_altar_emberseer : public MapEventScript
+{
+    event_spell_altar_emberseer() : MapEventScript("event_spell_altar_emberseer") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* /*pTarget*/, bool bIsStart) override
+    {
+        if (bIsStart && pSource->GetTypeId() == TYPEID_PLAYER)
+        {
+            if (InstanceData* pInstance = ((Unit*)pSource)->GetInstanceData())
+            {
+                pInstance->SetData(MAX_ENCOUNTER, DO_EMBERSEER_EVENT);
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+struct go_father_flame : public GameObjectScript
+{
+    go_father_flame() : GameObjectScript("go_father_flame") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        if (InstanceData* pInstance = pGo->GetInstanceData())
+        {
+            pInstance->SetData(MAX_ENCOUNTER, DO_FLAMEWREATH_EVENT);
+        }
+
+        return true;
+    }
+};
+
+void AddSC_instance_blackrock_spire()
+{
+    Script* s;
+    s = new is_blackrock_spire();
+    s->RegisterSelf();
+    s = new at_blackrock_spire();
+    s->RegisterSelf();
+    s = new event_spell_altar_emberseer();
+    s->RegisterSelf();
+    s = new go_father_flame();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_blackrock_spire";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_blackrock_spire;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_blackrock_spire";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_blackrock_spire;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_spell_altar_emberseer";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_spell_altar_emberseer;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_father_flame";
+    //pNewScript->pGOUse = &GOUse_go_father_flame;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/blackwing_lair.h b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/blackwing_lair.h
new file mode 100644
index 000000000..45379a9d1
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/blackwing_lair.h
@@ -0,0 +1,86 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_BLACKWING_LAIR
+#define DEF_BLACKWING_LAIR
+
+enum
+{
+    MAX_ENCOUNTER               = 8,
+
+    TYPE_RAZORGORE              = 0,
+    TYPE_VAELASTRASZ            = 1,
+    TYPE_LASHLAYER              = 2,
+    TYPE_FIREMAW                = 3,
+    TYPE_EBONROC                = 4,
+    TYPE_FLAMEGOR               = 5,
+    TYPE_CHROMAGGUS             = 6,
+    TYPE_NEFARIAN               = 7,
+
+    DATA_DRAGON_EGG             = 1,                        // track the used eggs
+
+    NPC_RAZORGORE               = 12435,
+    NPC_VAELASTRASZ             = 13020,
+    NPC_LASHLAYER               = 12017,
+    NPC_FIREMAW                 = 11983,
+    NPC_EBONROC                 = 14601,
+    NPC_FLAMEGOR                = 11981,
+    NPC_CHROMAGGUS              = 14020,
+    NPC_NEFARIAN                = 11583,
+    NPC_LORD_VICTOR_NEFARIUS    = 10162,
+    NPC_BLACKWING_TECHNICIAN    = 13996,                    // Flees at Vael intro event
+
+    // Razorgore event related
+    NPC_GRETHOK_CONTROLLER      = 12557,
+    NPC_BLACKWING_ORB_TRIGGER   = 14449,
+    NPC_NEFARIANS_TROOPS        = 14459,
+    NPC_MONSTER_GENERATOR       = 12434,
+    NPC_BLACKWING_LEGIONNAIRE   = 12416,                    // one spawn per turn
+    NPC_BLACKWING_MAGE          = 12420,                    // one spawn per turn
+    NPC_DRAGONSPAWN             = 12422,                    // two spawns per turn
+
+    GO_DOOR_RAZORGORE_ENTER     = 176964,
+    GO_DOOR_RAZORGORE_EXIT      = 176965,
+    GO_DOOR_NEFARIAN            = 176966,
+    // GO_DOOR_CHROMAGGUS_ENTER  = 179115,
+    // GO_DOOR_CHROMAGGUS_SIDE   = 179116,
+    GO_DOOR_CHROMAGGUS_EXIT     = 179117,
+    GO_DOOR_VAELASTRASZ         = 179364,
+    GO_DOOR_LASHLAYER           = 179365,
+    GO_ORB_OF_DOMINATION        = 177808,                   // trigger 19832 on Razorgore
+    GO_BLACK_DRAGON_EGG         = 177807,
+    GO_DRAKONID_BONES           = 179804,
+
+    EMOTE_ORB_SHUT_OFF          = -1469035,
+    EMOTE_TROOPS_FLEE           = -1469033,                 // emote by Nefarian's Troops npc
+
+    MAX_EGGS_DEFENDERS          = 4,
+};
+
+// Coords used to spawn Nefarius at the throne
+static const float aNefariusSpawnLoc[4] = { -7466.16f, -1040.80f, 412.053f, 2.14675f};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_broodlord_lashlayer.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_broodlord_lashlayer.cpp
new file mode 100644
index 000000000..044d4b36f
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_broodlord_lashlayer.cpp
@@ -0,0 +1,188 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Broodlord_Lashlayer
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Blackwing Lair
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackwing_lair.h"
+
+enum
+{
+    SAY_AGGRO                   = -1469000,
+    SAY_LEASH                   = -1469001,
+
+    SPELL_CLEAVE                = 26350,
+    SPELL_BLAST_WAVE            = 23331,
+    SPELL_MORTAL_STRIKE         = 24573,
+    SPELL_KNOCK_AWAY            = 25778
+};
+
+struct boss_broodlord : public CreatureScript
+{
+    boss_broodlord() : CreatureScript("boss_broodlord") {}
+
+    struct boss_broodlordAI : public ScriptedAI
+    {
+        boss_broodlordAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiBlastWaveTimer;
+        uint32 m_uiMortalStrikeTimer;
+        uint32 m_uiKnockAwayTimer;
+
+        void Reset() override
+        {
+            m_uiCleaveTimer = 8000;                     // These times are probably wrong
+            m_uiBlastWaveTimer = 12000;
+            m_uiMortalStrikeTimer = 20000;
+            m_uiKnockAwayTimer = 30000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LASHLAYER, IN_PROGRESS);
+            }
+
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LASHLAYER, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LASHLAYER, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Cleave Timer
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                {
+                    m_uiCleaveTimer = 7000;
+                }
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            // Blast Wave
+            if (m_uiBlastWaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BLAST_WAVE) == CAST_OK)
+                {
+                    m_uiBlastWaveTimer = urand(8000, 16000);
+                }
+            }
+            else
+            {
+                m_uiBlastWaveTimer -= uiDiff;
+            }
+
+            // Mortal Strike Timer
+            if (m_uiMortalStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MORTAL_STRIKE) == CAST_OK)
+                {
+                    m_uiMortalStrikeTimer = urand(25000, 35000);
+                }
+            }
+            else
+            {
+                m_uiMortalStrikeTimer -= uiDiff;
+            }
+
+            if (m_uiKnockAwayTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_KNOCK_AWAY);
+                // Drop 50% aggro - TODO should be scriptedEffect?
+                if (m_creature->GetThreatManager().getThreat(m_creature->getVictim()))
+                {
+                    m_creature->GetThreatManager().modifyThreatPercent(m_creature->getVictim(), -50);
+                }
+
+                m_uiKnockAwayTimer = urand(15000, 30000);
+            }
+            else
+            {
+                m_uiKnockAwayTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+
+            if (EnterEvadeIfOutOfCombatArea(uiDiff))
+            {
+                DoScriptText(SAY_LEASH, m_creature);
+            }
+        }
+    };
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_broodlordAI(pCreature);
+    }
+};
+
+void AddSC_boss_broodlord()
+{
+    Script* s;
+    s = new boss_broodlord();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_broodlord";
+    //pNewScript->GetAI = &GetAI_boss_broodlord;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_chromaggus.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_chromaggus.cpp
new file mode 100644
index 000000000..313ec7fac
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_chromaggus.cpp
@@ -0,0 +1,312 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Chromaggus
+ * SD%Complete: 90
+ * SDComment:   Chromatic Mutation disabled due to lack of core support
+ * SDCategory:  Blackwing Lair
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackwing_lair.h"
+
+enum
+{
+    EMOTE_GENERIC_FRENZY_KILL   = -1000001,
+    EMOTE_SHIMMER               = -1469003,
+
+    // These spells are actually called elemental shield
+    // What they do is decrease all damage by 75% then they increase
+    // One school of damage by 1100%
+    SPELL_FIRE_VULNERABILITY    = 22277,
+    SPELL_FROST_VULNERABILITY   = 22278,
+    SPELL_SHADOW_VULNERABILITY  = 22279,
+    SPELL_NATURE_VULNERABILITY  = 22280,
+    SPELL_ARCANE_VULNERABILITY  = 22281,
+
+    MAX_BREATHS                 = 5,
+    SPELL_INCINERATE            = 23308,                    // Incinerate 23308,23309
+    SPELL_TIME_LAPSE            = 23310,                    // Time lapse 23310, 23311(old threat mod that was removed in 2.01)
+    SPELL_CORROSIVE_ACID        = 23313,                    // Corrosive Acid 23313, 23314
+    SPELL_IGNITE_FLESH          = 23315,                    // Ignite Flesh 23315,23316
+    SPELL_FROST_BURN            = 23187,                    // Frost burn 23187, 23189
+
+    // Brood Affliction 23173 - Scripted Spell that cycles through all targets within 100 yards and has a chance to cast one of the afflictions on them
+    // Since Scripted spells arn't coded I'll just write a function that does the same thing
+    SPELL_BROODAF_BLUE          = 23153,                    // Blue affliction 23153
+    SPELL_BROODAF_BLACK         = 23154,                    // Black affliction 23154
+    SPELL_BROODAF_RED           = 23155,                    // Red affliction 23155 (23168 on death)
+    SPELL_BROODAF_BRONZE        = 23170,                    // Bronze Affliction  23170
+    SPELL_BROODAF_GREEN         = 23169,                    // Brood Affliction Green 23169
+
+    SPELL_CHROMATIC_MUT_1       = 23174,                    // Spell cast on player if they get all 5 debuffs
+
+    SPELL_FRENZY                = 28371,                    // The frenzy spell may be wrong
+    SPELL_ENRAGE                = 28747
+};
+
+static const uint32 aPossibleBreaths[MAX_BREATHS] = {SPELL_INCINERATE, SPELL_TIME_LAPSE, SPELL_CORROSIVE_ACID, SPELL_IGNITE_FLESH, SPELL_FROST_BURN};
+
+struct boss_chromaggus : public CreatureScript
+{
+    boss_chromaggus() : CreatureScript("boss_chromaggus") {}
+
+    struct boss_chromaggusAI : public ScriptedAI
+    {
+        boss_chromaggusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            // Select the 2 different breaths that we are going to use until despawned
+            // 5 possiblities for the first breath, 4 for the second, 20 total possiblites
+
+            // select two different numbers between 0..MAX_BREATHS-1
+            uint8 uiPos1 = urand(0, MAX_BREATHS - 1);
+            uint8 uiPos2 = (uiPos1 + urand(1, MAX_BREATHS - 1)) % MAX_BREATHS;
+
+            m_uiBreathOneSpell = aPossibleBreaths[uiPos1];
+            m_uiBreathTwoSpell = aPossibleBreaths[uiPos2];
+
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiBreathOneSpell;
+        uint32 m_uiBreathTwoSpell;
+        uint32 m_uiCurrentVulnerabilitySpell;
+
+        uint32 m_uiShimmerTimer;
+        uint32 m_uiBreathOneTimer;
+        uint32 m_uiBreathTwoTimer;
+        uint32 m_uiAfflictionTimer;
+        uint32 m_uiFrenzyTimer;
+        bool m_bEnraged;
+
+        void Reset() override
+        {
+            m_uiCurrentVulnerabilitySpell = 0;                  // We use this to store our last vulnerability spell so we can remove it later
+
+            m_uiShimmerTimer = 0;                            // Time till we change vurlnerabilites
+            m_uiBreathOneTimer = 30000;                        // First breath is 30 seconds
+            m_uiBreathTwoTimer = 60000;                        // Second is 1 minute so that we can alternate
+            m_uiAfflictionTimer = 10000;                        // This is special - 5 seconds means that we cast this on 1 pPlayer every 5 sconds
+            m_uiFrenzyTimer = 15000;
+
+            m_bEnraged = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_CHROMAGGUS, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_CHROMAGGUS, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_CHROMAGGUS, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Shimmer Timer Timer
+            if (m_uiShimmerTimer < uiDiff)
+            {
+                // Remove old vulnerability spell
+                if (m_uiCurrentVulnerabilitySpell)
+                {
+                    m_creature->RemoveAurasDueToSpell(m_uiCurrentVulnerabilitySpell);
+                }
+
+                // Cast new random vurlnabilty on self
+                uint32 aSpellId[] = { SPELL_FIRE_VULNERABILITY, SPELL_FROST_VULNERABILITY, SPELL_SHADOW_VULNERABILITY, SPELL_NATURE_VULNERABILITY, SPELL_ARCANE_VULNERABILITY };
+                uint32 uiSpell = aSpellId[urand(0, 4)];
+
+                if (DoCastSpellIfCan(m_creature, uiSpell) == CAST_OK)
+                {
+                    m_uiCurrentVulnerabilitySpell = uiSpell;
+
+                    DoScriptText(EMOTE_SHIMMER, m_creature);
+                    m_uiShimmerTimer = 45000;
+                }
+            }
+            else
+            {
+                m_uiShimmerTimer -= uiDiff;
+            }
+
+            // Breath One Timer
+            if (m_uiBreathOneTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_uiBreathOneSpell) == CAST_OK)
+                {
+                    m_uiBreathOneTimer = 60000;
+                }
+            }
+            else
+            {
+                m_uiBreathOneTimer -= uiDiff;
+            }
+
+            // Breath Two Timer
+            if (m_uiBreathTwoTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_uiBreathTwoSpell) == CAST_OK)
+                {
+                    m_uiBreathTwoTimer = 60000;
+                }
+            }
+            else
+            {
+                m_uiBreathTwoTimer -= uiDiff;
+            }
+
+            // Affliction Timer
+            if (m_uiAfflictionTimer < uiDiff)
+            {
+                uint32 m_uiSpellAfflict = 0;
+
+                switch (urand(0, 4))
+                {
+                case 0:
+                    m_uiSpellAfflict = SPELL_BROODAF_BLUE;
+                    break;
+                case 1:
+                    m_uiSpellAfflict = SPELL_BROODAF_BLACK;
+                    break;
+                case 2:
+                    m_uiSpellAfflict = SPELL_BROODAF_RED;
+                    break;
+                case 3:
+                    m_uiSpellAfflict = SPELL_BROODAF_BRONZE;
+                    break;
+                case 4:
+                    m_uiSpellAfflict = SPELL_BROODAF_GREEN;
+                    break;
+                }
+
+                GuidVector vGuids;
+                m_creature->FillGuidsListFromThreatList(vGuids);
+                for (GuidVector::const_iterator i = vGuids.begin(); i != vGuids.end(); ++i)
+                {
+                    Unit* pUnit = m_creature->GetMap()->GetUnit(*i);
+
+                    if (pUnit)
+                    {
+                        // Cast affliction
+                        DoCastSpellIfCan(pUnit, m_uiSpellAfflict, CAST_TRIGGERED);
+
+                        // Chromatic mutation if target is effected by all afflictions
+                        if (pUnit->HasAura(SPELL_BROODAF_BLUE, EFFECT_INDEX_0)
+                            && pUnit->HasAura(SPELL_BROODAF_BLACK, EFFECT_INDEX_0)
+                            && pUnit->HasAura(SPELL_BROODAF_RED, EFFECT_INDEX_0)
+                            && pUnit->HasAura(SPELL_BROODAF_BRONZE, EFFECT_INDEX_0)
+                            && pUnit->HasAura(SPELL_BROODAF_GREEN, EFFECT_INDEX_0))
+                        {
+                            // target->RemoveAllAuras();
+                            // DoCastSpellIfCan(target,SPELL_CHROMATIC_MUT_1);
+
+                            // Chromatic mutation is causing issues
+                            // Assuming it is caused by a lack of core support for Charm
+                            // So instead we instant kill our target
+
+                            // WORKAROUND
+                            if (pUnit->GetTypeId() == TYPEID_PLAYER)
+                            {
+                                m_creature->CastSpell(pUnit, 5, false);
+                            }
+                        }
+                    }
+                }
+
+                m_uiAfflictionTimer = 10000;
+            }
+            else
+            {
+                m_uiAfflictionTimer -= uiDiff;
+            }
+
+            // Frenzy Timer
+            if (m_uiFrenzyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_GENERIC_FRENZY_KILL, m_creature);
+                    m_uiFrenzyTimer = urand(10000, 15000);
+                }
+            }
+            else
+            {
+                m_uiFrenzyTimer -= uiDiff;
+            }
+
+            // Enrage if not already enraged and below 20%
+            if (!m_bEnraged && m_creature->GetHealthPercent() < 20.0f)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_ENRAGE);
+                m_bEnraged = true;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_chromaggusAI(pCreature);
+    }
+};
+
+void AddSC_boss_chromaggus()
+{
+    Script* s;
+    s = new boss_chromaggus();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_chromaggus";
+    //pNewScript->GetAI = &GetAI_boss_chromaggus;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_ebonroc.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_ebonroc.cpp
new file mode 100644
index 000000000..5c53832c0
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_ebonroc.cpp
@@ -0,0 +1,176 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Ebonroc
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Blackwing Lair
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackwing_lair.h"
+
+enum
+{
+    SPELL_SHADOW_FLAME          = 22539,
+    SPELL_WING_BUFFET           = 18500,
+    SPELL_SHADOW_OF_EBONROC     = 23340,
+    SPELL_THRASH                = 3391
+};
+
+struct boss_ebonroc : public CreatureScript
+{
+    boss_ebonroc() : CreatureScript("boss_ebonroc") {}
+
+    struct boss_ebonrocAI : public ScriptedAI
+    {
+        boss_ebonrocAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiShadowFlameTimer;
+        uint32 m_uiWingBuffetTimer;
+        uint32 m_uiShadowOfEbonrocTimer;
+        uint32 m_uiTrashTimer;
+
+        void Reset() override
+        {
+            m_uiShadowFlameTimer = 15000;                // These times are probably wrong
+            m_uiWingBuffetTimer = 30000;
+            m_uiShadowOfEbonrocTimer = 45000;
+            m_uiTrashTimer = 25000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_EBONROC, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_EBONROC, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_EBONROC, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Shadow Flame Timer
+            if (m_uiShadowFlameTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_FLAME) == CAST_OK)
+                {
+                    m_uiShadowFlameTimer = urand(12000, 15000);
+                }
+            }
+            else
+            {
+                m_uiShadowFlameTimer -= uiDiff;
+            }
+
+            // Wing Buffet Timer
+            if (m_uiWingBuffetTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WING_BUFFET) == CAST_OK)
+                {
+                    m_uiWingBuffetTimer = 25000;
+                }
+            }
+            else
+            {
+                m_uiWingBuffetTimer -= uiDiff;
+            }
+
+            // Shadow of Ebonroc Timer
+            if (m_uiShadowOfEbonrocTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHADOW_OF_EBONROC) == CAST_OK)
+                {
+                    m_uiShadowOfEbonrocTimer = urand(25000, 35000);
+                }
+            }
+            else
+            {
+                m_uiShadowOfEbonrocTimer -= uiDiff;
+            }
+
+            // Thrash Timer
+            if (m_uiTrashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_THRASH) == CAST_OK)
+                {
+                    m_uiTrashTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiTrashTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ebonrocAI(pCreature);
+    }
+};
+
+void AddSC_boss_ebonroc()
+{
+    Script* s;
+    s = new boss_ebonroc();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ebonroc";
+    //pNewScript->GetAI = &GetAI_boss_ebonroc;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_firemaw.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_firemaw.cpp
new file mode 100644
index 000000000..b2503b222
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_firemaw.cpp
@@ -0,0 +1,181 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Firemaw
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Blackwing Lair
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackwing_lair.h"
+
+enum
+{
+    SPELL_SHADOW_FLAME          = 22539,
+    SPELL_WING_BUFFET           = 23339,
+    SPELL_FLAME_BUFFET          = 23341,
+    SPELL_THRASH                = 3391
+};
+
+struct boss_firemaw : public CreatureScript
+{
+    boss_firemaw() : CreatureScript("boss_firemaw") {}
+
+    struct boss_firemawAI : public ScriptedAI
+    {
+        boss_firemawAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiShadowFlameTimer;
+        uint32 m_uiWingBuffetTimer;
+        uint32 m_uiFlameBuffetTimer;
+        uint32 m_uiTrashTimer;
+
+        void Reset() override
+        {
+            m_uiShadowFlameTimer = 30000;                       // These times are probably wrong
+            m_uiWingBuffetTimer = 24000;
+            m_uiFlameBuffetTimer = 5000;
+            m_uiTrashTimer = 25000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FIREMAW, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FIREMAW, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FIREMAW, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Shadow Flame Timer
+            if (m_uiShadowFlameTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_FLAME) == CAST_OK)
+                {
+                    m_uiShadowFlameTimer = urand(15000, 18000);
+                }
+            }
+            else
+            {
+                m_uiShadowFlameTimer -= uiDiff;
+            }
+
+            // Wing Buffet Timer
+            if (m_uiWingBuffetTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WING_BUFFET) == CAST_OK)
+                {
+                    if (m_creature->GetThreatManager().getThreat(m_creature->getVictim()))
+                    {
+                        m_creature->GetThreatManager().modifyThreatPercent(m_creature->getVictim(), -75);
+                    }
+
+                    m_uiWingBuffetTimer = 25000;
+                }
+            }
+            else
+            {
+                m_uiWingBuffetTimer -= uiDiff;
+            }
+
+            // Flame Buffet Timer
+            if (m_uiFlameBuffetTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FLAME_BUFFET) == CAST_OK)
+                {
+                    m_uiFlameBuffetTimer = 5000;
+                }
+            }
+            else
+            {
+                m_uiFlameBuffetTimer -= uiDiff;
+            }
+
+            // Thrash Timer
+            if (m_uiTrashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_THRASH) == CAST_OK)
+                {
+                    m_uiTrashTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiTrashTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_firemawAI(pCreature);
+    }
+};
+
+void AddSC_boss_firemaw()
+{
+    Script* s;
+    s = new boss_firemaw();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_firemaw";
+    //pNewScript->GetAI = &GetAI_boss_firemaw;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_flamegor.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_flamegor.cpp
new file mode 100644
index 000000000..2b7482026
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_flamegor.cpp
@@ -0,0 +1,184 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Flamegor
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Blackwing Lair
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackwing_lair.h"
+
+enum
+{
+    EMOTE_GENERIC_FRENZY        = -1000002,
+
+    SPELL_SHADOW_FLAME          = 22539,
+    SPELL_WING_BUFFET           = 23339,
+    SPELL_FRENZY                = 23342,                    // This spell periodically triggers fire nova
+    SPELL_THRASH                = 3391
+};
+
+struct boss_flamegor : public CreatureScript
+{
+    boss_flamegor() : CreatureScript("boss_flamegor") {}
+
+    struct boss_flamegorAI : public ScriptedAI
+    {
+        boss_flamegorAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiShadowFlameTimer;
+        uint32 m_uiWingBuffetTimer;
+        uint32 m_uiFrenzyTimer;
+        uint32 m_uiTrashTimer;
+
+        void Reset() override
+        {
+            m_uiShadowFlameTimer = 21000;                       // These times are probably wrong
+            m_uiWingBuffetTimer = 35000;
+            m_uiFrenzyTimer = 10000;
+            m_uiTrashTimer = 25000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FLAMEGOR, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FLAMEGOR, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FLAMEGOR, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Shadow Flame Timer
+            if (m_uiShadowFlameTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_FLAME) == CAST_OK)
+                {
+                    m_uiShadowFlameTimer = urand(15000, 22000);
+                }
+            }
+            else
+            {
+                m_uiShadowFlameTimer -= uiDiff;
+            }
+
+            // Wing Buffet Timer
+            if (m_uiWingBuffetTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WING_BUFFET) == CAST_OK)
+                {
+                    if (m_creature->GetThreatManager().getThreat(m_creature->getVictim()))
+                    {
+                        m_creature->GetThreatManager().modifyThreatPercent(m_creature->getVictim(), -75);
+                    }
+
+                    m_uiWingBuffetTimer = 25000;
+                }
+            }
+            else
+            {
+                m_uiWingBuffetTimer -= uiDiff;
+            }
+
+            // Frenzy Timer
+            if (m_uiFrenzyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_GENERIC_FRENZY, m_creature);
+                    m_uiFrenzyTimer = urand(8000, 10000);
+                }
+            }
+            else
+            {
+                m_uiFrenzyTimer -= uiDiff;
+            }
+
+            // Thrash Timer
+            if (m_uiTrashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_THRASH) == CAST_OK)
+                {
+                    m_uiTrashTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiTrashTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_flamegorAI(pCreature);
+    }
+};
+
+void AddSC_boss_flamegor()
+{
+    Script* s;
+    s = new boss_flamegor();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_flamegor";
+    //pNewScript->GetAI = &GetAI_boss_flamegor;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_nefarian.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_nefarian.cpp
new file mode 100644
index 000000000..e048fef3a
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_nefarian.cpp
@@ -0,0 +1,331 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Nefarian
+ * SD%Complete: 80
+ * SDComment:   Some issues with class calls effecting more than one class
+ * SDCategory:  Blackwing Lair
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackwing_lair.h"
+#include "TemporarySummon.h"
+
+enum
+{
+    SAY_XHEALTH                 = -1469008,             // at 5% hp
+    SAY_AGGRO                   = -1469009,
+    SAY_RAISE_SKELETONS         = -1469010,
+    SAY_SLAY                    = -1469011,
+    SAY_DEATH                   = -1469012,
+
+    SAY_MAGE                    = -1469013,
+    SAY_WARRIOR                 = -1469014,
+    SAY_DRUID                   = -1469015,
+    SAY_PRIEST                  = -1469016,
+    SAY_PALADIN                 = -1469017,
+    SAY_SHAMAN                  = -1469018,
+    SAY_WARLOCK                 = -1469019,
+    SAY_HUNTER                  = -1469020,
+    SAY_ROGUE                   = -1469021,
+    SAY_DEATH_KNIGHT            = -1469031,             // spell unk for the moment
+
+    SPELL_SHADOWFLAME_INITIAL   = 22992,                // old spell id 22972 -> wrong
+    SPELL_SHADOWFLAME           = 22539,
+    SPELL_BELLOWING_ROAR        = 22686,
+    SPELL_VEIL_OF_SHADOW        = 22687,                // old spell id 7068 -> wrong
+    SPELL_CLEAVE                = 20691,
+    SPELL_TAIL_LASH             = 23364,
+    // SPELL_BONE_CONTRUST       = 23363,                // 23362, 23361   Missing from DBC!
+
+    SPELL_MAGE                  = 23410,                // wild magic
+    SPELL_WARRIOR               = 23397,                // beserk
+    SPELL_DRUID                 = 23398,                // cat form
+    SPELL_PRIEST                = 23401,                // corrupted healing
+    SPELL_PALADIN               = 23418,                // syphon blessing
+    SPELL_SHAMAN                = 23425,                // totems
+    SPELL_WARLOCK               = 23427,                // infernals    -> should trigger 23426
+    SPELL_HUNTER                = 23436,                // bow broke
+    SPELL_ROGUE                 = 23414,                // Paralise
+};
+
+struct boss_nefarian : public CreatureScript
+{
+    boss_nefarian() : CreatureScript("boss_nefarian") {}
+
+    struct boss_nefarianAI : public ScriptedAI
+    {
+        boss_nefarianAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiShadowFlameTimer;
+        uint32 m_uiBellowingRoarTimer;
+        uint32 m_uiVeilOfShadowTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiTailLashTimer;
+        uint32 m_uiClassCallTimer;
+        bool m_bPhase3;
+        bool m_bHasEndYell;
+
+        void Reset() override
+        {
+            m_uiShadowFlameTimer = 12000;                    // These times are probably wrong
+            m_uiBellowingRoarTimer = 30000;
+            m_uiVeilOfShadowTimer = 15000;
+            m_uiCleaveTimer = 7000;
+            m_uiTailLashTimer = 10000;
+            m_uiClassCallTimer = 35000;                    // 35-40 seconds
+            m_bPhase3 = false;
+            m_bHasEndYell = false;
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (urand(0, 4))
+            {
+                return;
+            }
+
+            DoScriptText(SAY_SLAY, m_creature, pVictim);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NEFARIAN, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NEFARIAN, FAIL);
+
+                // Cleanup encounter
+                if (m_creature->IsTemporarySummon())
+                {
+                    TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+                    if (Creature* pNefarius = m_creature->GetMap()->GetCreature(pTemporary->GetSummonerGuid()))
+                    {
+                        pNefarius->AI()->EnterEvadeMode();
+                    }
+                }
+
+                m_creature->ForcedDespawn();
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            // Remove flying in case Nefarian aggroes before his combat point was reached
+            if (m_creature->IsLevitating())
+            {
+                m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, 0);
+                m_creature->SetLevitate(false);
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_SHADOWFLAME_INITIAL);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // ShadowFlame_Timer
+            if (m_uiShadowFlameTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHADOWFLAME) == CAST_OK)
+                {
+                    m_uiShadowFlameTimer = 12000;
+                }
+            }
+            else
+            {
+                m_uiShadowFlameTimer -= uiDiff;
+            }
+
+            // BellowingRoar_Timer
+            if (m_uiBellowingRoarTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BELLOWING_ROAR) == CAST_OK)
+                {
+                    m_uiBellowingRoarTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiBellowingRoarTimer -= uiDiff;
+            }
+
+            // VeilOfShadow_Timer
+            if (m_uiVeilOfShadowTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_VEIL_OF_SHADOW) == CAST_OK)
+                {
+                    m_uiVeilOfShadowTimer = 15000;
+                }
+            }
+            else
+            {
+                m_uiVeilOfShadowTimer -= uiDiff;
+            }
+
+            // Cleave_Timer
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                {
+                    m_uiCleaveTimer = 7000;
+                }
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            // TailLash_Timer
+            if (m_uiTailLashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TAIL_LASH) == CAST_OK)
+                {
+                    m_uiTailLashTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiTailLashTimer -= uiDiff;
+            }
+
+            // ClassCall_Timer
+            if (m_uiClassCallTimer < uiDiff)
+            {
+                // Cast a random class call
+                // On official it is based on what classes are currently on the hostil list
+                // but we can't do that yet so just randomly call one
+
+                switch (urand(0, 8))
+                {
+                case 0:
+                    DoScriptText(SAY_MAGE, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_MAGE);
+                    break;
+                case 1:
+                    DoScriptText(SAY_WARRIOR, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_WARRIOR);
+                    break;
+                case 2:
+                    DoScriptText(SAY_DRUID, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_DRUID);
+                    break;
+                case 3:
+                    DoScriptText(SAY_PRIEST, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_PRIEST);
+                    break;
+                case 4:
+                    DoScriptText(SAY_PALADIN, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_PALADIN);
+                    break;
+                case 5:
+                    DoScriptText(SAY_SHAMAN, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_SHAMAN);
+                    break;
+                case 6:
+                    DoScriptText(SAY_WARLOCK, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_WARLOCK);
+                    break;
+                case 7:
+                    DoScriptText(SAY_HUNTER, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_HUNTER);
+                    break;
+                case 8:
+                    DoScriptText(SAY_ROGUE, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_ROGUE);
+                    break;
+                }
+
+                m_uiClassCallTimer = urand(35000, 40000);
+            }
+            else
+            {
+                m_uiClassCallTimer -= uiDiff;
+            }
+
+            // Phase3 begins when we are below X health
+            if (!m_bPhase3 && m_creature->GetHealthPercent() < 20.0f)
+            {
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_NEFARIAN, SPECIAL);
+                }
+                m_bPhase3 = true;
+                DoScriptText(SAY_RAISE_SKELETONS, m_creature);
+            }
+
+            // 5% hp yell
+            if (!m_bHasEndYell && m_creature->GetHealthPercent() < 5.0f)
+            {
+                m_bHasEndYell = true;
+                DoScriptText(SAY_XHEALTH, m_creature);
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_nefarianAI(pCreature);
+    }
+};
+
+void AddSC_boss_nefarian()
+{
+    Script* s;
+    s = new boss_nefarian();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_nefarian";
+    //pNewScript->GetAI = &GetAI_boss_nefarian;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_razorgore.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_razorgore.cpp
new file mode 100644
index 000000000..1eee09aa8
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_razorgore.cpp
@@ -0,0 +1,310 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Razorgore
+ * SD%Complete: 95
+ * SDComment:   Timers may be improved.
+ * SDCategory:  Blackwing Lair
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackwing_lair.h"
+
+enum
+{
+    SAY_EGGS_BROKEN_1           = -1469022,
+    SAY_EGGS_BROKEN_2           = -1469023,
+    SAY_EGGS_BROKEN_3           = -1469024,
+    SAY_DEATH                   = -1469025,
+
+    SPELL_POSSESS               = 23014,                    // visual effect and increase the damage taken
+    SPELL_DESTROY_EGG           = 19873,
+    SPELL_EXPLODE_ORB           = 20037,                    // used if attacked without destroying the eggs - triggers 20038
+
+    SPELL_CLEAVE                = 19632,
+    SPELL_WARSTOMP              = 24375,
+    SPELL_FIREBALL_VOLLEY       = 22425,
+    SPELL_CONFLAGRATION         = 23023,
+};
+
+struct boss_razorgore : public CreatureScript
+{
+    boss_razorgore() : CreatureScript("boss_razorgore") {}
+
+    struct boss_razorgoreAI : public ScriptedAI
+    {
+        boss_razorgoreAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiIntroVisualTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiWarStompTimer;
+        uint32 m_uiFireballVolleyTimer;
+        uint32 m_uiConflagrationTimer;
+
+        bool m_bEggsExploded;
+
+        void Reset() override
+        {
+            m_uiIntroVisualTimer = 5000;
+            m_bEggsExploded = false;
+
+            m_uiCleaveTimer = urand(4000, 8000);
+            m_uiWarStompTimer = 30000;
+            m_uiConflagrationTimer = urand(10000, 15000);
+            m_uiFireballVolleyTimer = urand(15000, 20000);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                // Don't set instance data unless all eggs are destroyed
+                if (m_pInstance->GetData(TYPE_RAZORGORE) != SPECIAL)
+                {
+                    return;
+                }
+
+                m_pInstance->SetData(TYPE_RAZORGORE, DONE);
+            }
+
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (uiDamage < m_creature->GetHealth())
+            {
+                return;
+            }
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // Don't allow any accident
+            if (m_bEggsExploded)
+            {
+                uiDamage = 0;
+                return;
+            }
+
+            // Boss explodes everything and resets - this happens if not all eggs are destroyed
+            if (m_pInstance->GetData(TYPE_RAZORGORE) == IN_PROGRESS)
+            {
+                uiDamage = 0;
+                m_bEggsExploded = true;
+                m_pInstance->SetData(TYPE_RAZORGORE, FAIL);
+                DoCastSpellIfCan(m_creature, SPELL_EXPLODE_ORB, CAST_TRIGGERED);
+                m_creature->ForcedDespawn();
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_RAZORGORE, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Defenders should attack the players and the boss
+            pSummoned->SetInCombatWithZone();
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                // Set visual only on OOC timer
+                if (m_uiIntroVisualTimer)
+                {
+                    if (m_uiIntroVisualTimer <= uiDiff)
+                    {
+                        if (!m_pInstance)
+                        {
+                            script_error_log("Instance Blackwing Lair: ERROR Failed to load instance data for this instace.");
+                            return;
+                        }
+
+                        if (Creature* pOrbTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_BLACKWING_ORB_TRIGGER))
+                        {
+                            pOrbTrigger->CastSpell(m_creature, SPELL_POSSESS, false);
+                        }
+                        m_uiIntroVisualTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiIntroVisualTimer -= uiDiff;
+                    }
+                }
+
+                return;
+            }
+
+            // Cleave
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                {
+                    m_uiCleaveTimer = urand(4000, 8000);
+                }
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            // War Stomp
+            if (m_uiWarStompTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WARSTOMP) == CAST_OK)
+                {
+                    m_uiWarStompTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiWarStompTimer -= uiDiff;
+            }
+
+            // Fireball Volley
+            if (m_uiFireballVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FIREBALL_VOLLEY) == CAST_OK)
+                {
+                    m_uiFireballVolleyTimer = urand(15000, 20000);
+                }
+            }
+            else
+            {
+                m_uiFireballVolleyTimer -= uiDiff;
+            }
+
+            // Conflagration
+            if (m_uiConflagrationTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CONFLAGRATION) == CAST_OK)
+                {
+                    m_uiConflagrationTimer = urand(15000, 25000);
+                }
+            }
+            else
+            {
+                m_uiConflagrationTimer -= uiDiff;
+            }
+
+            /* This is obsolete code, not working anymore, keep as reference, should be handled in core though
+            * // Aura Check. If the gamer is affected by confliguration we attack a random gamer.
+            * if (m_creature->getVictim()->HasAura(SPELL_CONFLAGRATION, EFFECT_INDEX_0))
+            * {
+            *     if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+            *         m_creature->TauntApply(pTarget);
+            * }
+            */
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_razorgoreAI(pCreature);
+    }
+};
+
+struct spell_go_black_dragon_egg : public SpellScript
+{
+    spell_go_black_dragon_egg() : SpellScript("spell_go_black_dragon_egg") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pGOTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_DESTROY_EGG && uiEffIndex == EFFECT_INDEX_1)
+        {
+            if (!pGOTarget->ToGameObject()->isSpawned())
+            {
+                return true;
+            }
+
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pGOTarget->ToGameObject()->GetInstanceData())
+            {
+                if (urand(0, 1))
+                {
+                    switch (urand(0, 2))
+                    {
+                    case 0:
+                        DoScriptText(SAY_EGGS_BROKEN_1, pCaster);
+                        break;
+                    case 1:
+                        DoScriptText(SAY_EGGS_BROKEN_2, pCaster);
+                        break;
+                    case 2:
+                        DoScriptText(SAY_EGGS_BROKEN_3, pCaster);
+                        break;
+                    }
+                }
+
+                // Store the eggs which are destroyed, in order to count them for the second phase
+                pInstance->SetData64(DATA_DRAGON_EGG, pGOTarget->GetObjectGuid().GetRawValue());
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_razorgore()
+{
+    Script* s;
+    s = new boss_razorgore();
+    s->RegisterSelf();
+    s = new spell_go_black_dragon_egg();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_razorgore";
+    //pNewScript->GetAI = &GetAI_boss_razorgore;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_black_dragon_egg";
+    //pNewScript->pEffectDummyGO = &EffectDummyGameObj_go_black_dragon_egg;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_vaelastrasz.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_vaelastrasz.cpp
new file mode 100644
index 000000000..afb322751
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_vaelastrasz.cpp
@@ -0,0 +1,472 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Vaelastrasz
+ * SD%Complete: 75
+ * SDComment:   Burning Adrenaline not correctly implemented in core
+ * SDCategory:  Blackwing Lair
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackwing_lair.h"
+
+enum
+{
+    SAY_LINE_1                  = -1469026,
+    SAY_LINE_2                  = -1469027,
+    SAY_LINE_3                  = -1469028,
+    SAY_HALFLIFE                = -1469029,
+    SAY_KILLTARGET              = -1469030,
+    SAY_NEFARIUS_CORRUPT_1      = -1469006,                 // When he corrupts Vaelastrasz
+    SAY_NEFARIUS_CORRUPT_2      = -1469032,
+    SAY_TECHNICIAN_RUN          = -1469034,
+
+    SPELL_ESSENCE_OF_THE_RED    = 23513,
+    SPELL_FLAME_BREATH          = 23461,
+    SPELL_FIRE_NOVA             = 23462,
+    SPELL_TAIL_SWEEP            = 15847,
+    SPELL_BURNING_ADRENALINE    = 23620,
+    SPELL_CLEAVE                = 20684,                    // Chain cleave is most likely named something different and contains a dummy effect
+
+    SPELL_NEFARIUS_CORRUPTION   = 23642,
+
+    GOSSIP_ITEM_VAEL_1          = -3469003,
+    GOSSIP_ITEM_VAEL_2          = -3469004,
+    // Vael Gossip texts might be 7156 and 7256; At the moment are missing from DB
+    // For the moment add the default values
+    GOSSIP_TEXT_VAEL_1          = 384,
+    GOSSIP_TEXT_VAEL_2          = 384,
+
+    FACTION_HOSTILE             = 14,
+
+    AREATRIGGER_VAEL_INTRO      = 3626,
+};
+
+struct boss_vaelastrasz : public CreatureScript
+{
+    boss_vaelastrasz() : CreatureScript("boss_vaelastrasz") {}
+
+    struct boss_vaelastraszAI : public ScriptedAI
+    {
+        boss_vaelastraszAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+            // Set stand state to dead before the intro event
+            m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        ObjectGuid m_nefariusGuid;
+        uint32 m_uiIntroTimer;
+        uint8 m_uiIntroPhase;
+
+        ObjectGuid m_playerGuid;
+        uint32 m_uiSpeechTimer;
+        uint8 m_uiSpeechNum;
+
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiFlameBreathTimer;
+        uint32 m_uiFireNovaTimer;
+        uint32 m_uiBurningAdrenalineCasterTimer;
+        uint32 m_uiBurningAdrenalineTankTimer;
+        uint32 m_uiTailSweepTimer;
+        bool m_bHasYelled;
+
+        void Reset() override
+        {
+            m_playerGuid.Clear();
+
+            m_uiIntroTimer = 0;
+            m_uiIntroPhase = 0;
+            m_uiSpeechTimer = 0;
+            m_uiSpeechNum = 0;
+            m_uiCleaveTimer = 8000;            // These times are probably wrong
+            m_uiFlameBreathTimer = 11000;
+            m_uiBurningAdrenalineCasterTimer = 15000;
+            m_uiBurningAdrenalineTankTimer = 45000;
+            m_uiFireNovaTimer = 5000;
+            m_uiTailSweepTimer = 20000;
+            m_bHasYelled = false;
+
+            // Creature should have only 1/3 of hp
+            m_creature->SetHealth(uint32(m_creature->GetMaxHealth()*0.3f));
+        }
+
+        void BeginIntro()
+        {
+            // Start Intro delayed
+            m_uiIntroTimer = 1000;
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VAELASTRASZ, SPECIAL);
+            }
+        }
+
+        void BeginSpeech(Player* pTarget)
+        {
+            // Stand up and begin speach
+            m_playerGuid = pTarget->GetObjectGuid();
+
+            // 10 seconds
+            DoScriptText(SAY_LINE_1, m_creature);
+
+            // Make boss stand
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+
+            m_uiSpeechTimer = 10000;
+            m_uiSpeechNum = 0;
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (urand(0, 4))
+            {
+                return;
+            }
+
+            DoScriptText(SAY_KILLTARGET, m_creature, pVictim);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VAELASTRASZ, IN_PROGRESS);
+            }
+
+            // Buff players on aggro
+            DoCastSpellIfCan(m_creature, SPELL_ESSENCE_OF_THE_RED);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VAELASTRASZ, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VAELASTRASZ, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_LORD_VICTOR_NEFARIUS)
+            {
+                // Set not selectable, so players won't interact with it
+                pSummoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_nefariusGuid = pSummoned->GetObjectGuid();
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_START_EVENT && pSender == m_creature && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                BeginIntro();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiIntroTimer)
+            {
+                if (m_uiIntroTimer <= uiDiff)
+                {
+                    switch (m_uiIntroPhase)
+                    {
+                    case 0:
+                        m_creature->SummonCreature(NPC_LORD_VICTOR_NEFARIUS, aNefariusSpawnLoc[0], aNefariusSpawnLoc[1], aNefariusSpawnLoc[2], aNefariusSpawnLoc[3], TEMPSUMMON_TIMED_DESPAWN, 25000);
+                        m_uiIntroTimer = 1000;
+                        break;
+                    case 1:
+                        if (Creature* pNefarius = m_creature->GetMap()->GetCreature(m_nefariusGuid))
+                        {
+                            pNefarius->CastSpell(m_creature, SPELL_NEFARIUS_CORRUPTION, true);
+                            DoScriptText(SAY_NEFARIUS_CORRUPT_1, pNefarius);
+                        }
+                        m_uiIntroTimer = 16000;
+                        break;
+                    case 2:
+                        if (Creature* pNefarius = m_creature->GetMap()->GetCreature(m_nefariusGuid))
+                        {
+                            DoScriptText(SAY_NEFARIUS_CORRUPT_2, pNefarius);
+                        }
+
+                        // Set npc flags now
+                        m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                        m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                        m_uiIntroTimer = 0;
+                        break;
+                    }
+                    ++m_uiIntroPhase;
+                }
+                else
+                {
+                    m_uiIntroTimer -= uiDiff;
+                }
+            }
+
+            // Speech
+            if (m_uiSpeechTimer)
+            {
+                if (m_uiSpeechTimer <= uiDiff)
+                {
+                    switch (m_uiSpeechNum)
+                    {
+                    case 0:
+                        // 16 seconds till next line
+                        DoScriptText(SAY_LINE_2, m_creature);
+                        m_uiSpeechTimer = 16000;
+                        ++m_uiSpeechNum;
+                        break;
+                    case 1:
+                        // This one is actually 16 seconds but we only go to 10 seconds because he starts attacking after he says "I must fight this!"
+                        DoScriptText(SAY_LINE_3, m_creature);
+                        m_uiSpeechTimer = 10000;
+                        ++m_uiSpeechNum;
+                        break;
+                    case 2:
+                        m_creature->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_RESPAWN);
+
+                        if (m_playerGuid)
+                        {
+                            if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                            {
+                                AttackStart(pPlayer);
+                            }
+                        }
+                        m_uiSpeechTimer = 0;
+                        break;
+                    }
+                }
+                else
+                {
+                    m_uiSpeechTimer -= uiDiff;
+                }
+            }
+
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Yell if hp lower than 15%
+            if (m_creature->GetHealthPercent() < 15.0f && !m_bHasYelled)
+            {
+                DoScriptText(SAY_HALFLIFE, m_creature);
+                m_bHasYelled = true;
+            }
+
+            // Cleave Timer
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                {
+                    m_uiCleaveTimer = 15000;
+                }
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            // Flame Breath Timer
+            if (m_uiFlameBreathTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FLAME_BREATH) == CAST_OK)
+                {
+                    m_uiFlameBreathTimer = urand(4000, 8000);
+                }
+            }
+            else
+            {
+                m_uiFlameBreathTimer -= uiDiff;
+            }
+
+            // Burning Adrenaline Caster Timer
+            if (m_uiBurningAdrenalineCasterTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_BURNING_ADRENALINE, SELECT_FLAG_PLAYER | SELECT_FLAG_POWER_MANA))
+                {
+                    pTarget->CastSpell(pTarget, SPELL_BURNING_ADRENALINE, true, NULL, NULL, m_creature->GetObjectGuid());
+                    m_uiBurningAdrenalineCasterTimer = 15000;
+                }
+            }
+            else
+            {
+                m_uiBurningAdrenalineCasterTimer -= uiDiff;
+            }
+
+            // Burning Adrenaline Tank Timer
+            if (m_uiBurningAdrenalineTankTimer < uiDiff)
+            {
+                // have the victim cast the spell on himself otherwise the third effect aura will be applied
+                // to Vael instead of the player
+                m_creature->getVictim()->CastSpell(m_creature->getVictim(), SPELL_BURNING_ADRENALINE, true, NULL, NULL, m_creature->GetObjectGuid());
+
+                m_uiBurningAdrenalineTankTimer = 45000;
+            }
+            else
+            {
+                m_uiBurningAdrenalineTankTimer -= uiDiff;
+            }
+
+            // Fire Nova Timer
+            if (m_uiFireNovaTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FIRE_NOVA) == CAST_OK)
+                {
+                    m_uiFireNovaTimer = 5000;
+                }
+            }
+            else
+            {
+                m_uiFireNovaTimer -= uiDiff;
+            }
+
+            // Tail Sweep Timer
+            if (m_uiTailSweepTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TAIL_SWEEP) == CAST_OK)
+                {
+                    m_uiTailSweepTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiTailSweepTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VAEL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_VAEL_2, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            if (boss_vaelastraszAI* pVaelAI = dynamic_cast<boss_vaelastraszAI*>(pCreature->AI()))
+            {
+                pVaelAI->BeginSpeech(pPlayer);
+            }
+            break;
+        }
+
+        return true;
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+
+        pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VAEL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_VAEL_1, pCreature->GetObjectGuid());
+
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_vaelastraszAI(pCreature);
+    }
+};
+
+struct at_vaelastrasz : public AreaTriggerScript
+{
+    at_vaelastrasz() : AreaTriggerScript("at_vaelastrasz") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (pAt->id == AREATRIGGER_VAEL_INTRO)
+        {
+            if (pPlayer->isGameMaster() || pPlayer->IsDead())
+            {
+                return false;
+            }
+
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
+            {
+                // Handle intro event
+                if (pInstance->GetData(TYPE_VAELASTRASZ) == NOT_STARTED)
+                {
+                    if (Creature* pVaelastrasz = pInstance->GetSingleCreatureFromStorage(NPC_VAELASTRASZ))
+                        if (CreatureAI* pVaelAI = pVaelastrasz->AI())
+                        {
+                            pVaelAI->SendAIEvent(AI_EVENT_START_EVENT, pPlayer, pVaelastrasz);
+                        }
+                }
+
+                // ToDo: make goblins flee
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_vaelastrasz()
+{
+    Script* s;
+    s = new boss_vaelastrasz();
+    s->RegisterSelf();
+    s = new at_vaelastrasz();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_vaelastrasz";
+    //pNewScript->GetAI = &GetAI_boss_vaelastrasz;
+    //pNewScript->pGossipHello = &GossipHello_boss_vaelastrasz;
+    //pNewScript->pGossipSelect = &GossipSelect_boss_vaelastrasz;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_vaelastrasz";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_vaelastrasz;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_victor_nefarius.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_victor_nefarius.cpp
new file mode 100644
index 000000000..a17b2d9e5
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/boss_victor_nefarius.cpp
@@ -0,0 +1,477 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Victor_Nefarius
+ * SD%Complete: 90
+ * SDComment:   Small adjustments needed; Timers
+ * SDCategory:  Blackwing Lair
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackwing_lair.h"
+
+enum
+{
+    SAY_GAMESBEGIN_1                = -1469004,
+    SAY_GAMESBEGIN_2                = -1469005,
+    SAY_NEFARIAN_INTRO              = -1469007,
+
+    GOSSIP_ITEM_NEFARIUS_1          = -3469000,
+    GOSSIP_ITEM_NEFARIUS_2          = -3469001,
+    GOSSIP_ITEM_NEFARIUS_3          = -3469002,
+    GOSSIP_TEXT_NEFARIUS_1          = 7134,
+    GOSSIP_TEXT_NEFARIUS_2          = 7198,
+    GOSSIP_TEXT_NEFARIUS_3          = 7199,
+
+    MAX_DRAKES                      = 5,
+    MAX_DRAKE_SUMMONS               = 42,
+    NPC_BRONZE_DRAKANOID            = 14263,
+    NPC_BLUE_DRAKANOID              = 14261,
+    NPC_RED_DRAKANOID               = 14264,
+    NPC_GREEN_DRAKANOID             = 14262,
+    NPC_BLACK_DRAKANOID             = 14265,
+    NPC_CHROMATIC_DRAKANOID         = 14302,
+
+    SPELL_NEFARIUS_BARRIER          = 22663,                // immunity in phase 1
+    SPELL_SHADOWBLINK_INTRO         = 22664,
+    SPELL_SHADOWBOLT_VOLLEY         = 22665,
+    SPELL_SILENCE                   = 22666,
+    SPELL_SHADOW_COMMAND            = 22667,
+    SPELL_SHADOWBOLT                = 22677,
+    SPELL_FEAR                      = 22678,
+    SPELL_SHADOWBLINK               = 22681,                // triggers a random from spells (22668 - 22676)
+
+    SPELL_SUMMON_DRAKONID_BONES     = 23363,
+
+    MAP_ID_BWL                      = 469,
+
+    FACTION_BLACK_DRAGON            = 103
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {SAY_GAMESBEGIN_1,    NPC_LORD_VICTOR_NEFARIUS,     4000},
+    {SAY_GAMESBEGIN_2,    NPC_LORD_VICTOR_NEFARIUS,     5000},
+    {SPELL_SHADOWBLINK,   0,                            0},
+    {0, 0, 0},
+};
+
+struct SpawnLocation
+{
+    float m_fX, m_fY, m_fZ;
+};
+
+static const SpawnLocation aNefarianLocs[4] =
+{
+    { -7599.32f, -1191.72f, 475.545f},                      // opening where red/blue/black darknid spawner appear (ori 3.05433)
+    { -7526.27f, -1135.04f, 473.445f},                      // same as above, closest to door (ori 5.75959)
+    { -7498.177f, -1273.277f, 481.649f},                    // nefarian spawn location (ori 1.798)
+    { -7502.002f, -1256.503f, 476.758f},                    // nefarian fly to this position
+};
+
+static const uint32 aPossibleDrake[MAX_DRAKES] = {NPC_BRONZE_DRAKANOID, NPC_BLUE_DRAKANOID, NPC_RED_DRAKANOID, NPC_GREEN_DRAKANOID, NPC_BLACK_DRAKANOID};
+
+// This script is complicated
+// Instead of morphing Victor Nefarius we will have him control phase 1
+// And then have him spawn "Nefarian" for phase 2
+// When phase 2 starts Victor Nefarius will go invisible and stop attacking
+// If Nefarian reched home because nef killed the players then nef will trigger this guy to EnterEvadeMode
+// and allow players to start the event over
+// If nefarian dies then he will kill himself then he will be despawned in Nefarian script
+// To prevent players from doing the event twice
+
+// Dev note: Lord Victor Nefarius should despawn completely, then ~5 seconds later Nefarian should appear.
+
+struct boss_victor_nefarius : public CreatureScript
+{
+    boss_victor_nefarius() : CreatureScript("boss_victor_nefarius") {}
+
+    struct boss_victor_nefariusAI : public ScriptedAI, private DialogueHelper
+    {
+        boss_victor_nefariusAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aIntroDialogue)
+        {
+            // Select the 2 different drakes that we are going to use until despawned
+            // 5 possiblities for the first drake, 4 for the second, 20 total possiblites
+
+            // select two different numbers between 0..MAX_DRAKES-1
+            uint8 uiPos1 = urand(0, MAX_DRAKES - 1);
+            uint8 uiPos2 = (uiPos1 + urand(1, MAX_DRAKES - 1)) % MAX_DRAKES;
+
+            m_uiDrakeTypeOne = aPossibleDrake[uiPos1];
+            m_uiDrakeTypeTwo = aPossibleDrake[uiPos2];
+
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiSpawnedAdds;
+        uint32 m_uiAddSpawnTimer;
+        uint32 m_uiShadowBoltTimer;
+        uint32 m_uiFearTimer;
+        uint32 m_uiDrakeTypeOne;
+        uint32 m_uiDrakeTypeTwo;
+        uint32 m_uiShadowboltVolleyTimer;
+        uint32 m_uiSilenceTimer;
+        uint32 m_uiShadowCommandTimer;
+        uint32 m_uiShadowBlinkTimer;
+
+        void Reset() override
+        {
+            m_uiSpawnedAdds = 0;
+            m_uiAddSpawnTimer = 10000;
+            m_uiShadowBoltTimer = 3000;
+            m_uiFearTimer = 8000;
+            m_uiShadowboltVolleyTimer = 13000;
+            m_uiSilenceTimer = 23000;
+            m_uiShadowCommandTimer = 30000;
+            m_uiShadowBlinkTimer = 40000;
+
+            // set gossip flag to begin the event
+            m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+
+            // Make visible if needed
+            if (m_creature->GetVisibility() != VISIBILITY_ON)
+            {
+                m_creature->SetVisibility(VISIBILITY_ON);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NEFARIAN, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NEFARIAN, FAIL);
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, false))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+
+                // Only range attack - ToDo: research the distance
+                m_creature->GetMotionMaster()->MoveChase(pWho, 30.0f);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_NEFARIAN)
+            {
+                pSummoned->SetWalk(false);
+
+                // see boss_onyxia (also note the removal of this in boss_nefarian)
+#if defined (CLASSIC) || defined (TBC)
+                pSummoned->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND);
+#endif
+#if defined (WOTLK) || defined (CATA)
+                pSummoned->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+#endif
+                pSummoned->SetLevitate(true);
+
+                // Let Nefarian fly towards combat area
+                pSummoned->GetMotionMaster()->MovePoint(1, aNefarianLocs[3].m_fX, aNefarianLocs[3].m_fY, aNefarianLocs[3].m_fZ);
+                DoScriptText(SAY_NEFARIAN_INTRO, pSummoned);
+            }
+            else
+            {
+                ++m_uiSpawnedAdds;
+
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            // If Nefarian has reached combat area, let him attack
+            if (pSummoned->GetEntry() == NPC_NEFARIAN && uiMotionType == POINT_MOTION_TYPE && uiPointId == 1)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // Despawn self when Nefarian is killed
+            if (pSummoned->GetEntry() == NPC_NEFARIAN)
+            {
+                m_creature->ForcedDespawn();
+            }
+            else
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_SUMMON_DRAKONID_BONES, true);
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            // Start combat after the dialogue is finished
+            if (iEntry == SPELL_SHADOWBLINK)
+            {
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                m_creature->SetFactionTemporary(FACTION_BLACK_DRAGON, TEMPFACTION_RESTORE_REACH_HOME);
+                DoCastSpellIfCan(m_creature, SPELL_NEFARIUS_BARRIER, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SHADOWBLINK_INTRO, CAST_TRIGGERED);
+                m_creature->SetInCombatWithZone();
+            }
+        }
+
+        void DoStartIntro()
+        {
+            StartNextDialogueText(SAY_GAMESBEGIN_1);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Only do this if we haven't spawned nef yet
+            if (m_uiSpawnedAdds < MAX_DRAKE_SUMMONS)
+            {
+                // Shadowbolt Timer
+                if (m_uiShadowBoltTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SHADOWBOLT) == CAST_OK)
+                        {
+                            m_uiShadowBoltTimer = urand(2000, 4000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiShadowBoltTimer -= uiDiff;
+                }
+
+                // Fear Timer
+                if (m_uiFearTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_FEAR) == CAST_OK)
+                        {
+                            m_uiFearTimer = urand(10000, 20000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiFearTimer -= uiDiff;
+                }
+
+                // Shadowbolt Volley
+                if (m_uiShadowboltVolleyTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SHADOWBOLT_VOLLEY) == CAST_OK)
+                    {
+                        m_uiShadowboltVolleyTimer = urand(19000, 28000);
+                    }
+                }
+                else
+                {
+                    m_uiShadowboltVolleyTimer -= uiDiff;
+                }
+
+                // Silence
+                if (m_uiSilenceTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SILENCE) == CAST_OK)
+                        {
+                            m_uiSilenceTimer = urand(14000, 23000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiSilenceTimer -= uiDiff;
+                }
+
+                // Shadow Command
+                if (m_uiShadowCommandTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_COMMAND) == CAST_OK)
+                        {
+                            m_uiShadowCommandTimer = urand(24000, 30000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiShadowCommandTimer -= uiDiff;
+                }
+
+                // ShadowBlink
+                if (m_uiShadowBlinkTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SHADOWBLINK) == CAST_OK)
+                    {
+                        m_uiShadowBlinkTimer = urand(30000, 40000);
+                    }
+                }
+                else
+                {
+                    m_uiShadowBlinkTimer -= uiDiff;
+                }
+
+                // Add spawning mechanism
+                if (m_uiAddSpawnTimer < uiDiff)
+                {
+                    // Spawn 2 random types of creatures at the 2 locations
+                    uint32 uiCreatureId = 0;
+
+                    // 1 in 3 chance it will be a chromatic
+                    uiCreatureId = urand(0, 2) ? m_uiDrakeTypeOne : uint32(NPC_CHROMATIC_DRAKANOID);
+                    m_creature->SummonCreature(uiCreatureId, aNefarianLocs[0].m_fX, aNefarianLocs[0].m_fY, aNefarianLocs[0].m_fZ, 5.000f, TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN, 30000);
+
+                    // 1 in 3 chance it will be a chromatic
+                    uiCreatureId = urand(0, 2) ? m_uiDrakeTypeTwo : uint32(NPC_CHROMATIC_DRAKANOID);
+                    m_creature->SummonCreature(uiCreatureId, aNefarianLocs[1].m_fX, aNefarianLocs[1].m_fY, aNefarianLocs[1].m_fZ, 5.000, TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN, 30000);
+
+                    // Begin phase 2 by spawning Nefarian
+                    if (m_uiSpawnedAdds >= MAX_DRAKE_SUMMONS)
+                    {
+                        // Inturrupt any spell casting
+                        m_creature->InterruptNonMeleeSpells(false);
+
+                        // Make super invis
+                        if (m_creature->GetVisibility() != VISIBILITY_OFF)
+                        {
+                            m_creature->SetVisibility(VISIBILITY_OFF);
+                        }
+
+                        // Spawn Nefarian
+                        // Summon as active, to be able to work proper!
+                        m_creature->SummonCreature(NPC_NEFARIAN, aNefarianLocs[2].m_fX, aNefarianLocs[2].m_fY, aNefarianLocs[2].m_fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0, true);
+                    }
+
+                    m_uiAddSpawnTimer = 4000;
+                }
+                else
+                {
+                    m_uiAddSpawnTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        // Check the map id because the same creature entry is involved in other scripted event in other instance
+        return pCreature->GetMapId() == MAP_ID_BWL ? new boss_victor_nefariusAI(pCreature) : NULL;
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->GetMapId() != MAP_ID_BWL)
+        {
+            return true;
+        }
+
+        pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NEFARIUS_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_NEFARIUS_1, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (pCreature->GetMapId() != MAP_ID_BWL)
+        {
+            return true;
+        }
+
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pCreature->HandleEmote(EMOTE_ONESHOT_TALK);
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NEFARIUS_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_NEFARIUS_2, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pCreature->HandleEmote(EMOTE_ONESHOT_TALK);
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NEFARIUS_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_NEFARIUS_3, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 3:
+            pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            // Start the intro event
+            if (boss_victor_nefariusAI* pBossAI = dynamic_cast<boss_victor_nefariusAI*>(pCreature->AI()))
+            {
+                pBossAI->DoStartIntro();
+            }
+            break;
+        }
+        return true;
+    }
+};
+
+void AddSC_boss_victor_nefarius()
+{
+    Script* s;
+    s = new boss_victor_nefarius();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_victor_nefarius";
+    //pNewScript->GetAI = &GetAI_boss_victor_nefarius;
+    //pNewScript->pGossipHello = &GossipHello_boss_victor_nefarius;
+    //pNewScript->pGossipSelect = &GossipSelect_boss_victor_nefarius;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/instance_blackwing_lair.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/instance_blackwing_lair.cpp
new file mode 100644
index 000000000..b9d7e2cfa
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/instance_blackwing_lair.cpp
@@ -0,0 +1,478 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Blackwing_Lair
+ * SD%Complete: 90
+ * SDComment:   None
+ * SDCategory:  Blackwing Lair
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackwing_lair.h"
+
+static const uint32 aRazorgoreSpawns[MAX_EGGS_DEFENDERS] = { NPC_BLACKWING_LEGIONNAIRE, NPC_BLACKWING_MAGE, NPC_DRAGONSPAWN, NPC_DRAGONSPAWN };
+
+struct is_blackwing_lair : public InstanceScript
+{
+    is_blackwing_lair() : InstanceScript("instance_blackwing_lair") {}
+
+    class instance_blackwing_lair : public ScriptedInstance
+    {
+    public:
+        instance_blackwing_lair(Map* pMap) : ScriptedInstance(pMap),
+            m_uiResetTimer(0),
+            m_uiDefenseTimer(0)
+        {
+            Initialize();
+        }
+
+        ~instance_blackwing_lair() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_BLACKWING_TECHNICIAN:
+                // Sort creatures so we can get only the ones near Vaelastrasz
+                if (pCreature->IsWithinDist2d(aNefariusSpawnLoc[0], aNefariusSpawnLoc[1], 50.0f))
+                {
+                    m_lTechnicianGuids.push_back(pCreature->GetObjectGuid());
+                }
+                break;
+            case NPC_MONSTER_GENERATOR:
+                m_vGeneratorGuids.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_BLACKWING_LEGIONNAIRE:
+            case NPC_BLACKWING_MAGE:
+            case NPC_DRAGONSPAWN:
+                m_lDefendersGuids.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_RAZORGORE:
+            case NPC_NEFARIANS_TROOPS:
+            case NPC_BLACKWING_ORB_TRIGGER:
+            case NPC_VAELASTRASZ:
+            case NPC_LORD_VICTOR_NEFARIUS:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_DOOR_RAZORGORE_ENTER:
+            case GO_ORB_OF_DOMINATION:
+            case GO_DOOR_NEFARIAN:
+                break;
+            case GO_DOOR_RAZORGORE_EXIT:
+                if (m_auiEncounter[TYPE_RAZORGORE] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_DOOR_CHROMAGGUS_EXIT:
+                if (m_auiEncounter[TYPE_CHROMAGGUS] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_DOOR_VAELASTRASZ:
+                if (m_auiEncounter[TYPE_VAELASTRASZ] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_DOOR_LASHLAYER:
+                if (m_auiEncounter[TYPE_LASHLAYER] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_BLACK_DRAGON_EGG:
+                m_lDragonEggsGuids.push_back(pGo->GetObjectGuid());
+                return;
+            case GO_DRAKONID_BONES:
+                m_lDrakonidBonesGuids.push_back(pGo->GetObjectGuid());
+                return;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_GRETHOK_CONTROLLER)
+            {
+                SetData(TYPE_RAZORGORE, IN_PROGRESS);
+                m_uiDefenseTimer = 40000;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_GRETHOK_CONTROLLER)
+            {
+                // Allow orb to be used
+                DoToggleGameObjectFlags(GO_ORB_OF_DOMINATION, GO_FLAG_NO_INTERACT, false);
+
+                if (Creature* pOrbTrigger = GetSingleCreatureFromStorage(NPC_BLACKWING_ORB_TRIGGER))
+                {
+                    pOrbTrigger->InterruptNonMeleeSpells(false);
+                }
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_RAZORGORE:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData != SPECIAL)
+                {
+                    DoUseDoorOrButton(GO_DOOR_RAZORGORE_ENTER);
+                }
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_DOOR_RAZORGORE_EXIT);
+                }
+                else if (uiData == FAIL)
+                {
+                    m_uiResetTimer = 30000;
+
+                    // Reset the Orb of Domination and the eggs
+                    DoToggleGameObjectFlags(GO_ORB_OF_DOMINATION, GO_FLAG_NO_INTERACT, true);
+
+                    // Reset defenders
+                    for (GuidList::const_iterator itr = m_lDefendersGuids.begin(); itr != m_lDefendersGuids.end(); ++itr)
+                    {
+                        if (Creature* pDefender = instance->GetCreature(*itr))
+                        {
+                            pDefender->ForcedDespawn();
+                        }
+                    }
+
+                    m_lUsedEggsGuids.clear();
+                    m_lDefendersGuids.clear();
+                }
+                break;
+            case TYPE_VAELASTRASZ:
+                m_auiEncounter[uiType] = uiData;
+                // Prevent the players from running back to the first room; use if the encounter is not special
+                if (uiData != SPECIAL)
+                {
+                    DoUseDoorOrButton(GO_DOOR_RAZORGORE_EXIT);
+                }
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_DOOR_VAELASTRASZ);
+                }
+                break;
+            case TYPE_LASHLAYER:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_DOOR_LASHLAYER);
+                }
+                break;
+            case TYPE_FIREMAW:
+            case TYPE_EBONROC:
+            case TYPE_FLAMEGOR:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_CHROMAGGUS:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_DOOR_CHROMAGGUS_EXIT);
+                }
+                break;
+            case TYPE_NEFARIAN:
+                // Don't store the same thing twice
+                if (m_auiEncounter[uiType] == uiData)
+                {
+                    break;
+                }
+                if (uiData == SPECIAL)
+                {
+                    // handle missing spell 23362
+                    Creature* pNefarius = GetSingleCreatureFromStorage(NPC_LORD_VICTOR_NEFARIUS);
+                    if (!pNefarius)
+                    {
+                        break;
+                    }
+
+                    for (GuidList::const_iterator itr = m_lDrakonidBonesGuids.begin(); itr != m_lDrakonidBonesGuids.end(); ++itr)
+                    {
+                        // The Go script will handle the missing spell 23361
+                        if (GameObject* pGo = instance->GetGameObject(*itr))
+                        {
+                            pGo->Use(pNefarius);
+                        }
+                    }
+                    // Don't store special data
+                    break;
+                }
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_DOOR_NEFARIAN);
+                // Cleanup the drakonid bones
+                if (uiData == FAIL)
+                {
+                    for (GuidList::const_iterator itr = m_lDrakonidBonesGuids.begin(); itr != m_lDrakonidBonesGuids.end(); ++itr)
+                    {
+                        if (GameObject* pGo = instance->GetGameObject(*itr))
+                        {
+                            pGo->SetLootState(GO_JUST_DEACTIVATED);
+                        }
+                    }
+
+                    m_lDrakonidBonesGuids.clear();
+                }
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6] << " " << m_auiEncounter[7];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        void SetData64(uint32 uiData, uint64 uiGuid) override
+        {
+            if (uiData == DATA_DRAGON_EGG)
+            {
+                if (GameObject* pEgg = instance->GetGameObject(ObjectGuid(uiGuid)))
+                {
+                    m_lUsedEggsGuids.push_back(pEgg->GetObjectGuid());
+                }
+
+                // If all eggs are destroyed, then allow Razorgore to be attacked
+                if (m_lUsedEggsGuids.size() == m_lDragonEggsGuids.size())
+                {
+                    SetData(TYPE_RAZORGORE, SPECIAL);
+                    DoToggleGameObjectFlags(GO_ORB_OF_DOMINATION, GO_FLAG_NO_INTERACT, true);
+
+                    // Emote for the start of the second phase
+                    if (Creature* pTrigger = GetSingleCreatureFromStorage(NPC_NEFARIANS_TROOPS))
+                    {
+                        DoScriptText(EMOTE_ORB_SHUT_OFF, pTrigger);
+                        DoScriptText(EMOTE_TROOPS_FLEE, pTrigger);
+                    }
+
+                    // Break mind control and set max health
+                    if (Creature* pRazorgore = GetSingleCreatureFromStorage(NPC_RAZORGORE))
+                    {
+                        pRazorgore->RemoveAllAuras();
+                        pRazorgore->SetHealth(pRazorgore->GetMaxHealth());
+                    }
+
+                    // All defenders evade and despawn
+                    for (GuidList::const_iterator itr = m_lDefendersGuids.begin(); itr != m_lDefendersGuids.end(); ++itr)
+                    {
+                        if (Creature* pDefender = instance->GetCreature(*itr))
+                        {
+                            pDefender->AI()->EnterEvadeMode();
+                            pDefender->ForcedDespawn(10000);
+                        }
+                    }
+                }
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            // Reset Razorgore in case of wipe
+            if (m_uiResetTimer)
+            {
+                if (m_uiResetTimer <= uiDiff)
+                {
+                    // Respawn Razorgore
+                    if (Creature* pRazorgore = GetSingleCreatureFromStorage(NPC_RAZORGORE))
+                    {
+                        if (!pRazorgore->IsAlive())
+                        {
+                            pRazorgore->Respawn();
+                        }
+                    }
+
+                    // Respawn the Dragon Eggs
+                    for (GuidList::const_iterator itr = m_lDragonEggsGuids.begin(); itr != m_lDragonEggsGuids.end(); ++itr)
+                    {
+                        if (GameObject* pEgg = instance->GetGameObject(*itr))
+                        {
+                            if (!pEgg->isSpawned())
+                            {
+                                pEgg->Respawn();
+                            }
+                        }
+                    }
+
+                    m_uiResetTimer = 0;
+                }
+                else
+                {
+                    m_uiResetTimer -= uiDiff;
+                }
+            }
+
+            if (GetData(TYPE_RAZORGORE) != IN_PROGRESS)
+            {
+                return;
+            }
+
+            if (m_uiDefenseTimer < uiDiff)
+            {
+                // Allow Razorgore to spawn the defenders
+                Creature* pRazorgore = GetSingleCreatureFromStorage(NPC_RAZORGORE);
+                if (!pRazorgore)
+                {
+                    return;
+                }
+
+                // Randomize generators
+                std::random_shuffle(m_vGeneratorGuids.begin(), m_vGeneratorGuids.end());
+
+                // Spawn the defenders
+                for (uint8 i = 0; i < MAX_EGGS_DEFENDERS; ++i)
+                {
+                    Creature* pGenerator = instance->GetCreature(m_vGeneratorGuids[i]);
+                    if (!pGenerator)
+                    {
+                        return;
+                    }
+
+                    pRazorgore->SummonCreature(aRazorgoreSpawns[i], pGenerator->GetPositionX(), pGenerator->GetPositionY(), pGenerator->GetPositionZ(), pGenerator->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+
+                m_uiDefenseTimer = 20000;
+            }
+            else
+            {
+                m_uiDefenseTimer -= uiDiff;
+            }
+        }
+
+    protected:
+        std::string m_strInstData;
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+
+        uint32 m_uiResetTimer;
+        uint32 m_uiDefenseTimer;
+
+        GuidList m_lTechnicianGuids;
+        GuidList m_lDragonEggsGuids;
+        GuidList m_lDrakonidBonesGuids;
+        GuidList m_lDefendersGuids;
+        GuidList m_lUsedEggsGuids;
+        GuidVector m_vGeneratorGuids;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_blackwing_lair(pMap);
+    }
+};
+
+void AddSC_instance_blackwing_lair()
+{
+    Script* s;
+    s = new is_blackwing_lair();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_blackwing_lair";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_blackwing_lair;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_baron_geddon.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_baron_geddon.cpp
new file mode 100644
index 000000000..7966b273b
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_baron_geddon.cpp
@@ -0,0 +1,184 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Baron_Geddon
+ * SD%Complete: 90
+ * SDComment:   Armaggedon is not working properly (core issue)
+ * SDCategory:  Molten Core
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "molten_core.h"
+
+enum
+{
+    EMOTE_SERVICE               = -1409000,
+
+    SPELL_INFERNO               = 19695,
+    SPELL_IGNITE_MANA           = 19659,
+    SPELL_LIVING_BOMB           = 20475,
+    SPELL_ARMAGEDDON            = 20478
+};
+
+struct boss_baron_geddon : public CreatureScript
+{
+    boss_baron_geddon() : CreatureScript("boss_baron_geddon") {}
+
+    struct boss_baron_geddonAI : public ScriptedAI
+    {
+        boss_baron_geddonAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bIsArmageddon;
+        uint32 m_uiInfernoTimer;
+        uint32 m_uiIgniteManaTimer;
+        uint32 m_uiLivingBombTimer;
+
+        void Reset() override
+        {
+            m_bIsArmageddon = false;
+            m_uiInfernoTimer = 45000;
+            m_uiIgniteManaTimer = 30000;
+            m_uiLivingBombTimer = 35000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GEDDON, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GEDDON, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GEDDON, NOT_STARTED);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_bIsArmageddon)                                // Do nothing untill armageddon triggers
+            {
+                return;
+            }
+
+            // If we are <2% hp cast Armageddom
+            if (m_creature->GetHealthPercent() <= 2.0f && !m_bIsArmageddon)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ARMAGEDDON, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_SERVICE, m_creature);
+                    m_bIsArmageddon = true;
+                    return;
+                }
+            }
+
+            // Inferno_Timer
+            if (m_uiInfernoTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_INFERNO) == CAST_OK)
+                {
+                    m_uiInfernoTimer = 45000;
+                }
+            }
+            else
+            {
+                m_uiInfernoTimer -= uiDiff;
+            }
+
+            // Ignite Mana Timer
+            if (m_uiIgniteManaTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_IGNITE_MANA) == CAST_OK)
+                {
+                    m_uiIgniteManaTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiIgniteManaTimer -= uiDiff;
+            }
+
+            // Living Bomb Timer
+            if (m_uiLivingBombTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_LIVING_BOMB) == CAST_OK)
+                    {
+                        m_uiLivingBombTimer = 35000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiLivingBombTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_baron_geddonAI(pCreature);
+    }
+};
+
+void AddSC_boss_baron_geddon()
+{
+    Script* s;
+    s = new boss_baron_geddon();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_baron_geddon";
+    //pNewScript->GetAI = &GetAI_boss_baron_geddon;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_garr.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_garr.cpp
new file mode 100644
index 000000000..a8b35378d
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_garr.cpp
@@ -0,0 +1,313 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Garr
+ * SD%Complete: 50
+ * SDComment:   Garr's enrage is missing
+ * SDCategory:  Molten Core
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "molten_core.h"
+
+enum
+{
+    // Garr spells
+    SPELL_ANTIMAGICPULSE        = 19492,
+    SPELL_MAGMASHACKLES         = 19496,
+    SPELL_ERUPTION_TRIGGER      = 20482,    // target script, dispel and permanent immune to banish anywhere on map
+    SPELL_ENRAGE_TRIGGER        = 19515,    // target script, effect dummy anywhere on map
+
+    // Add spells
+    SPELL_ERUPTION              = 19497,
+    SPELL_MASSIVE_ERUPTION      = 20483,                    // TODO possible on death
+    SPELL_IMMOLATE              = 20294,
+};
+
+struct boss_garr : public CreatureScript
+{
+    boss_garr() : CreatureScript("boss_garr") {}
+
+    struct boss_garrAI : public ScriptedAI
+    {
+        boss_garrAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiAntiMagicPulseTimer;
+        uint32 m_uiMagmaShacklesTimer;
+        uint32 m_uiExplodeAddTimer;
+        bool m_bHasFreed;
+
+        void Reset() override
+        {
+            m_uiAntiMagicPulseTimer = 25 * IN_MILLISECONDS;
+            m_uiMagmaShacklesTimer = 15 * IN_MILLISECONDS;
+            m_uiExplodeAddTimer = 60 * IN_MILLISECONDS;
+            m_bHasFreed = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GARR, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GARR, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GARR, FAIL);
+            }
+        }
+
+        void DamageTaken(Unit* /*damager*/, uint32 &damage) override
+        {
+            if (!m_bHasFreed && m_creature->HealthBelowPctDamaged(50, damage))
+            {
+                m_pInstance->SetData(TYPE_DO_FREE_GARR_ADDS, 0);
+                m_bHasFreed = true;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType type, Creature* pSender, Unit* /*pInvoker*/, uint32 /*uiData*/) override
+        {
+            if (type == AI_EVENT_CUSTOM_B && pSender == m_creature)
+            {
+                if (Creature* spawn = m_creature->SummonCreature(NPC_FIRESWORN, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), m_creature->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, true))
+                    spawn->SetOwnerGuid(ObjectGuid());  // trying to prevent despawn of the summon at Garr death
+                m_uiExplodeAddTimer = 25 * IN_MILLISECONDS;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // AntiMagicPulse_Timer
+            if (m_uiAntiMagicPulseTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ANTIMAGICPULSE) == CAST_OK)
+                {
+                    m_uiAntiMagicPulseTimer = urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS);
+                }
+            }
+            else
+            {
+                m_uiAntiMagicPulseTimer -= uiDiff;
+            }
+
+            // MagmaShackles_Timer
+            if (m_uiMagmaShacklesTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MAGMASHACKLES) == CAST_OK)
+                {
+                    m_uiMagmaShacklesTimer = urand(8 * IN_MILLISECONDS, 12 * IN_MILLISECONDS);
+                }
+            }
+            else
+            {
+                m_uiMagmaShacklesTimer -= uiDiff;
+            }
+
+            // Explode an add
+            if (m_uiExplodeAddTimer < uiDiff)
+            {
+                if (urand(0, 1)) // 50% chance to explode, is it too much?
+                {
+                    ObjectGuid guid = m_pInstance->GetGuid(NPC_FIRESWORN);
+                    if (Creature* firesworn = m_pInstance->instance->GetCreature(guid))
+                        SendAIEvent(AI_EVENT_CUSTOM_A, firesworn, firesworn, SPELL_MASSIVE_ERUPTION);   // this is an instant explosion with no SPELL_ERUPTION_TRIGGER
+                }
+                m_uiExplodeAddTimer = 15 * IN_MILLISECONDS;
+            }
+            else m_uiExplodeAddTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_garrAI(pCreature);
+    }
+};
+
+struct mob_firesworn : public CreatureScript
+{
+    mob_firesworn() : CreatureScript("mob_firesworn") {}
+
+    struct mob_fireswornAI : public ScriptedAI
+    {
+        mob_fireswornAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiImmolateTimer;
+        uint32 m_uiSeparationCheckTimer;
+        bool m_bExploding;
+
+        void Reset() override
+        {
+            m_uiImmolateTimer = urand(4 * IN_MILLISECONDS, 8 * IN_MILLISECONDS);    // These times are probably wrong
+            m_uiSeparationCheckTimer = 5 * IN_MILLISECONDS;
+            m_bExploding = false;
+        }
+
+        void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override
+        {
+            if (!m_bExploding && m_creature->HealthBelowPctDamaged(10, uiDamage))
+            {
+                ReceiveAIEvent(AI_EVENT_CUSTOM_A, m_creature, m_creature, SPELL_ERUPTION);
+                uiDamage = 0;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType type, Creature* /*pSender*/, Unit* pInvoker, uint32 uiData) override
+        {
+            if (type == AI_EVENT_CUSTOM_A && pInvoker == m_creature)
+            {
+                m_creature->CastSpell(m_creature, uiData, true);
+                m_creature->ForcedDespawn(100);
+                m_bExploding = true;
+            }
+        }
+    
+#if defined (WOTLK) || defined (CATA)
+    void JustDied(Unit* /*pKiller*/) override
+    {
+        if (m_pInstance)
+        {
+            if (Creature* pGarr = m_pInstance->GetSingleCreatureFromStorage(NPC_GARR))
+                pGarr->CastSpell(pGarr, SPELL_GARR_ENRAGE, true, NULL, NULL, m_creature->GetObjectGuid());
+        }
+    }
+#endif
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim() || m_bExploding)
+            {
+                return;
+            }
+
+            if (m_uiSeparationCheckTimer < uiDiff)
+            {
+#if defined (WOTLK) || defined (CATA)
+            if (!m_pInstance)
+                return;
+#endif            
+                // Distance guesswork, but should be ok
+                Creature* pGarr = m_pInstance->GetSingleCreatureFromStorage(NPC_GARR);
+                if (pGarr && pGarr->IsAlive() && !m_creature->IsWithinDist2d(pGarr->GetPositionX(), pGarr->GetPositionY(), 50.0f))
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_SEPARATION_ANXIETY, CAST_TRIGGERED);
+                }
+
+                m_uiSeparationCheckTimer = 5000;
+            }
+            else
+            {
+                m_uiSeparationCheckTimer -= uiDiff;
+            }
+
+#if defined (WOTLK) || defined (CATA)
+            // Cast Erruption and let them die
+            if (m_creature->GetHealthPercent() <= 10.0f)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_ERUPTION);
+                m_creature->SetDeathState(JUST_DIED);
+                m_creature->RemoveCorpse();
+            }
+#endif            
+
+            // Immolate_Timer
+            if (m_uiImmolateTimer < uiDiff)
+            {
+                if (Unit* pTarget = SelectAttackTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_IMMOLATE))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_IMMOLATE, CAST_TRIGGERED) == CAST_OK)
+                    {
+                        m_uiImmolateTimer = urand(5 * IN_MILLISECONDS, 10 * IN_MILLISECONDS);
+                    }
+                }
+            }
+            else
+            {
+                m_uiImmolateTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_fireswornAI(pCreature);
+    }
+};
+
+void AddSC_boss_garr()
+{
+    Script* s;
+    s = new boss_garr();
+    s->RegisterSelf();
+    s = new mob_firesworn();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_garr";
+    //pNewScript->GetAI = &GetAI_boss_garr;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_firesworn";
+    //pNewScript->GetAI = &GetAI_mob_firesworn;
+    //pNewScript->RegisterSelf();
+}
+
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_gehennas.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_gehennas.cpp
new file mode 100644
index 000000000..323234f3f
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_gehennas.cpp
@@ -0,0 +1,170 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Gehennas
+ * SD%Complete: 90
+ * SDComment:   None
+ * SDCategory:  Molten Core
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "molten_core.h"
+
+enum
+{
+    SPELL_SHADOW_BOLT           = 19728,                    // 19729 exists too, but can be reflected
+    SPELL_RAIN_OF_FIRE          = 19717,
+    SPELL_GEHENNAS_CURSE        = 19716
+};
+
+struct boss_gehennas : public CreatureScript
+{
+    boss_gehennas() : CreatureScript("boss_gehennas") {}
+
+    struct boss_gehennasAI : public ScriptedAI
+    {
+        boss_gehennasAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiShadowBoltTimer;
+        uint32 m_uiRainOfFireTimer;
+        uint32 m_uiGehennasCurseTimer;
+
+        void Reset() override
+        {
+            m_uiShadowBoltTimer = 6000;
+            m_uiRainOfFireTimer = 10000;
+            m_uiGehennasCurseTimer = 12000;
+        }
+
+        void Aggro(Unit* /*pwho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GEHENNAS, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GEHENNAS, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GEHENNAS, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // ShadowBolt Timer
+            if (m_uiShadowBoltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_BOLT) == CAST_OK)
+                    {
+                        m_uiShadowBoltTimer = 7000;
+                    }
+                }
+                else                                            // In case someone attempts soloing, we don't need to scan for targets every tick
+                {
+                    m_uiShadowBoltTimer = 7000;
+                }
+            }
+            else
+            {
+                m_uiShadowBoltTimer -= uiDiff;
+            }
+
+            // Rain of Fire Timer
+            if (m_uiRainOfFireTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_RAIN_OF_FIRE) == CAST_OK)
+                    {
+                        m_uiRainOfFireTimer = urand(4000, 12000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiRainOfFireTimer -= uiDiff;
+            }
+
+            // GehennasCurse Timer
+            if (m_uiGehennasCurseTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_GEHENNAS_CURSE) == CAST_OK)
+                {
+                    m_uiGehennasCurseTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiGehennasCurseTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_gehennasAI(pCreature);
+    }
+};
+
+void AddSC_boss_gehennas()
+{
+    Script* s;
+    s = new boss_gehennas();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_gehennas";
+    //pNewScript->GetAI = &GetAI_boss_gehennas;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_golemagg.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_golemagg.cpp
new file mode 100644
index 000000000..68077154a
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_golemagg.cpp
@@ -0,0 +1,258 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Golemagg
+ * SD%Complete: 80
+ * SDComment:   Rager need to be tied to boss (Despawn on boss-death)
+ * SDCategory:  Molten Core
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "molten_core.h"
+
+enum
+{
+    SPELL_MAGMA_SPLASH      = 13879,
+    SPELL_PYROBLAST         = 20228,
+    SPELL_EARTHQUAKE        = 19798,
+    SPELL_ENRAGE            = 19953,
+    SPELL_GOLEMAGG_TRUST    = 20553,
+
+    // Core Rager
+    EMOTE_LOW_HP            = -1409002,
+    SPELL_MANGLE            = 19820
+};
+
+struct boss_golemagg : public CreatureScript
+{
+    boss_golemagg() : CreatureScript("boss_golemagg") {}
+
+    struct boss_golemaggAI : public ScriptedAI
+    {
+        boss_golemaggAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+#if defined (WOTLK) || defined (CATA)
+        DoCastSpellIfCan(m_creature, SPELL_MAGMA_SPLASH, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+#endif
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiPyroblastTimer;
+        uint32 m_uiEarthquakeTimer;
+        uint32 m_uiBuffTimer;
+        bool m_bEnraged;
+
+        void Reset() override
+        {
+            m_uiPyroblastTimer = 7 * IN_MILLISECONDS;
+            m_uiEarthquakeTimer = 3 * IN_MILLISECONDS;
+            m_uiBuffTimer = 1.5 * IN_MILLISECONDS;
+            m_bEnraged = false;
+
+            m_creature->CastSpell(m_creature, SPELL_MAGMA_SPLASH, true);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GOLEMAGG, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GOLEMAGG, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GOLEMAGG, FAIL);
+            }
+#if defined (WOTLK) || defined (CATA)
+        DoCastSpellIfCan(m_creature, SPELL_MAGMA_SPLASH, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+#endif
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Pyroblast
+            if (m_uiPyroblastTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_PYROBLAST) == CAST_OK)
+                    {
+                        m_uiPyroblastTimer = 7 * IN_MILLISECONDS;
+                    }
+                }
+            }
+            else
+            {
+                m_uiPyroblastTimer -= uiDiff;
+            }
+
+            // Enrage
+            if (!m_bEnraged && m_creature->GetHealthPercent() < 10.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                {
+                    m_bEnraged = true;
+                }
+            }
+
+            // Earthquake
+            if (m_bEnraged)
+            {
+                if (m_uiEarthquakeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_EARTHQUAKE) == CAST_OK)
+                    {
+                        m_uiEarthquakeTimer = 3 * IN_MILLISECONDS;
+                    }
+                }
+                else
+                {
+                    m_uiEarthquakeTimer -= uiDiff;
+                }
+            }
+
+            // Golemagg's Trust
+            if (m_uiBuffTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_GOLEMAGG_TRUST);
+                m_uiBuffTimer = 1.5 * IN_MILLISECONDS;
+            }
+            else
+            {
+                m_uiBuffTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_golemaggAI(pCreature);
+    }
+};
+
+struct mob_core_rager : public CreatureScript
+{
+    mob_core_rager() : CreatureScript("mob_core_rager") {}
+
+    struct mob_core_ragerAI : public ScriptedAI
+    {
+        mob_core_ragerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+        uint32 m_uiMangleTimer;
+
+        void Reset() override
+        {
+            m_uiMangleTimer = 7 * IN_MILLISECONDS;              // These times are probably wrong
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (m_creature->GetHealthPercent() < 50.0f)
+            {
+                if (m_pInstance && m_pInstance->GetData(TYPE_GOLEMAGG) != DONE)
+                {
+                    DoScriptText(EMOTE_LOW_HP, m_creature);
+                    m_creature->SetHealth(m_creature->GetMaxHealth());
+                    uiDamage = 0;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Mangle
+            if (m_uiMangleTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MANGLE) == CAST_OK)
+                {
+                    m_uiMangleTimer = 10 * IN_MILLISECONDS;
+                }
+            }
+            else
+            {
+                m_uiMangleTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_core_ragerAI(pCreature);
+    }
+};
+
+void AddSC_boss_golemagg()
+{
+    Script* s;
+    s = new boss_golemagg();
+    s->RegisterSelf();
+    s = new mob_core_rager();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_golemagg";
+    //pNewScript->GetAI = &GetAI_boss_golemagg;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_core_rager";
+    //pNewScript->GetAI = &GetAI_mob_core_rager;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_lucifron.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_lucifron.cpp
new file mode 100644
index 000000000..61b7f7890
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_lucifron.cpp
@@ -0,0 +1,164 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Lucifron
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Molten Core
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "molten_core.h"
+
+enum
+{
+    SPELL_IMPENDINGDOOM     = 19702,
+    SPELL_LUCIFRONCURSE     = 19703,
+    SPELL_SHADOWSHOCK       = 19460
+};
+
+struct boss_lucifron : public CreatureScript
+{
+    boss_lucifron() : CreatureScript("boss_lucifron") {}
+
+    struct boss_lucifronAI : public ScriptedAI
+    {
+        boss_lucifronAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiImpendingDoomTimer;
+        uint32 m_uiLucifronCurseTimer;
+        uint32 m_uiShadowShockTimer;
+
+        void Reset() override
+        {
+            m_uiImpendingDoomTimer = 10000;
+            m_uiLucifronCurseTimer = 20000;
+            m_uiShadowShockTimer = 6000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LUCIFRON, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LUCIFRON, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LUCIFRON, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Impending doom timer
+            if (m_uiImpendingDoomTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_IMPENDINGDOOM) == CAST_OK)
+                {
+                    m_uiImpendingDoomTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiImpendingDoomTimer -= uiDiff;
+            }
+
+            // Lucifron's curse timer
+            if (m_uiLucifronCurseTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_LUCIFRONCURSE) == CAST_OK)
+                {
+                    m_uiLucifronCurseTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiLucifronCurseTimer -= uiDiff;
+            }
+
+            // Shadowshock
+            if (m_uiShadowShockTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SHADOWSHOCK) == CAST_OK)
+                    {
+                        m_uiShadowShockTimer = 6000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiShadowShockTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_lucifronAI(pCreature);
+    }
+};
+
+void AddSC_boss_lucifron()
+{
+    Script* s;
+    s = new boss_lucifron();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_lucifron";
+    //pNewScript->GetAI = &GetAI_boss_lucifron;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_magmadar.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_magmadar.cpp
new file mode 100644
index 000000000..c95036f48
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_magmadar.cpp
@@ -0,0 +1,170 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Magmadar
+ * SD%Complete: 75
+ * SDComment:   Lava bomb needs still core support
+ * SDCategory:  Molten Core
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "molten_core.h"
+
+enum
+{
+    EMOTE_GENERIC_FRENZY_KILL   = -1000001,
+
+    SPELL_FRENZY                = 19451,
+    SPELL_MAGMASPIT             = 19449,                    // This is actually a buff he gives himself
+    SPELL_PANIC                 = 19408,
+    SPELL_LAVABOMB              = 19411,                    // This calls a dummy server side effect that isn't implemented yet
+    SPELL_LAVABOMB_ALT          = 19428
+};
+
+struct boss_magmadar : public CreatureScript
+{
+    boss_magmadar() : CreatureScript("boss_magmadar") {}
+
+    struct boss_magmadarAI : public ScriptedAI
+    {
+        boss_magmadarAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiFrenzyTimer;
+        uint32 m_uiPanicTimer;
+        uint32 m_uiLavabombTimer;
+
+        void Reset() override
+        {
+            m_uiFrenzyTimer = 30000;
+            m_uiPanicTimer = 7000;
+            m_uiLavabombTimer = 12000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_MAGMASPIT, true);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAGMADAR, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAGMADAR, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAGMADAR, NOT_STARTED);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Frenzy_Timer
+            if (m_uiFrenzyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_GENERIC_FRENZY_KILL, m_creature);
+                    m_uiFrenzyTimer = 15000;
+                }
+            }
+            else
+            {
+                m_uiFrenzyTimer -= uiDiff;
+            }
+
+            // Panic_Timer
+            if (m_uiPanicTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_PANIC) == CAST_OK)
+                {
+                    m_uiPanicTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiPanicTimer -= uiDiff;
+            }
+
+            // Lavabomb_Timer
+            if (m_uiLavabombTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_LAVABOMB) == CAST_OK)
+                    {
+                        m_uiLavabombTimer = 12000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiLavabombTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_magmadarAI(pCreature);
+    }
+};
+
+void AddSC_boss_magmadar()
+{
+    Script* s;
+    s = new boss_magmadar();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_magmadar";
+    //pNewScript->GetAI = &GetAI_boss_magmadar;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_majordomo_executus.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_majordomo_executus.cpp
new file mode 100644
index 000000000..148d1bcf2
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_majordomo_executus.cpp
@@ -0,0 +1,560 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Majordomo_Executus
+ * SD%Complete: 95
+ * SDComment:   Minor weaknesses
+ * SDCategory:  Molten Core
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "molten_core.h"
+#include "TemporarySummon.h"
+
+enum
+{
+    SAY_AGGRO               = -1409003,
+    SAY_SLAY                = -1409005,
+    SAY_SPECIAL             = -1409006,                     // Use unknown
+    SAY_LAST_ADD            = -1409019,                     // When only one add remaining
+    SAY_DEFEAT_1            = -1409007,
+    SAY_DEFEAT_2            = -1409020,
+    SAY_DEFEAT_3            = -1409021,
+
+    SAY_SUMMON_0            = -1409023,
+    SAY_SUMMON_1            = -1409024,
+    SAY_SUMMON_MAJ          = -1409008,
+    SAY_ARRIVAL1_RAG        = -1409009,
+    SAY_ARRIVAL2_MAJ        = -1409010,
+    SAY_ARRIVAL3_RAG        = -1409011,
+    SAY_ARRIVAL4_MAJ        = -1409022,
+
+    GOSSIP_ITEM_SUMMON_1    = -3409000,
+    GOSSIP_ITEM_SUMMON_2    = -3409001,
+    GOSSIP_ITEM_SUMMON_3    = -3409002,
+
+    TEXT_ID_SUMMON_1        = 4995,
+    TEXT_ID_SUMMON_2        = 5011,
+    TEXT_ID_SUMMON_3        = 5012,
+
+    SPELL_MAGIC_REFLECTION  = 20619,
+    SPELL_DAMAGE_REFLECTION = 21075,
+    SPELL_BLASTWAVE         = 20229,
+    SPELL_AEGIS             = 20620,
+    SPELL_TELEPORT          = 20618,
+
+    SPELL_TELEPORT_SELF     = 19484,
+    SPELL_SUMMON_RAGNAROS   = 19774,
+    SPELL_ELEMENTAL_FIRE    = 19773,
+    SPELL_RAGNA_EMERGE      = 20568,
+};
+
+struct boss_majordomo : public CreatureScript
+{
+    boss_majordomo() : CreatureScript("boss_majordomo") {}
+
+    struct boss_majordomoAI : public ScriptedAI
+    {
+        boss_majordomoAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bHasEncounterFinished = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiMagicReflectionTimer;
+        uint32 m_uiDamageReflectionTimer;
+        uint32 m_uiBlastwaveTimer;
+        uint32 m_uiTeleportTimer;
+        uint32 m_uiAegisTimer;
+        uint32 m_uiSpeechTimer;
+
+        ObjectGuid m_ragnarosGuid;
+        bool m_bHasEncounterFinished;
+        uint8 m_uiAddsKilled;
+        uint8 m_uiSpeech;
+        GuidList m_luiMajordomoAddsGUIDs;
+
+        void Reset() override
+        {
+            m_uiMagicReflectionTimer = 30000;                  // Damage reflection first so we alternate
+            m_uiDamageReflectionTimer = 15000;
+            m_uiBlastwaveTimer = 10000;
+            m_uiTeleportTimer = 20000;
+            m_uiAegisTimer = 5000;
+            m_uiSpeechTimer = 1000;
+
+            m_uiAddsKilled = 0;
+            m_uiSpeech = 0;
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (urand(0, 4))
+            {
+                return;
+            }
+
+            DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (pWho->GetTypeId() == TYPEID_UNIT && pWho->GetEntry() == NPC_RAGNAROS)
+            {
+                return;
+            }
+
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAJORDOMO, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (!m_bHasEncounterFinished)                       // Normal reached home, FAIL
+            {
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_MAJORDOMO, FAIL);
+                }
+            }
+            else                                                // Finished the encounter, DONE
+            {
+                // Exit combat
+                m_creature->RemoveAllAurasOnEvade();
+                m_creature->DeleteThreatList();
+                m_creature->CombatStop(true);
+                m_creature->SetLootRecipient(NULL);
+
+                // Set friendly
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                m_creature->SetFactionTemporary(FACTION_MAJORDOMO_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN);
+
+                // Reset orientation
+                m_creature->SetFacingTo(m_aMajordomoLocations[0].m_fO);
+
+                // Start his speech
+                m_uiSpeechTimer = 1;                        // At next tick
+                m_uiSpeech = 1;
+
+                m_pInstance->SetData(TYPE_MAJORDOMO, DONE);
+            }
+        }
+
+        void StartSummonEvent(Player* pPlayer)
+        {
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+
+            // Prevent possible exploits with double summoning
+            if (m_creature->GetMap()->GetCreature(m_ragnarosGuid))
+            {
+                return;
+            }
+
+            DoScriptText(SAY_SUMMON_0, m_creature, pPlayer);
+
+            m_uiSpeechTimer = 5000;
+            m_uiSpeech = 10;
+        }
+
+        void JustRespawned() override
+        {
+            // Encounter finished, need special treatment
+            if (m_bHasEncounterFinished)
+            {
+                // This needs to be set to be able to resummon Ragnaros
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+
+                // Relocate here
+                debug_log("[SD3]: boss_majordomo_executus: Relocate to Ragnaros' Lair on respawn");
+                m_creature->GetMap()->CreatureRelocation(m_creature, m_aMajordomoLocations[1].m_fX, m_aMajordomoLocations[1].m_fY, m_aMajordomoLocations[1].m_fZ, m_aMajordomoLocations[1].m_fO);
+                m_creature->SetActiveObjectState(false);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_FLAMEWAKER_HEALER || pSummoned->GetEntry() == NPC_FLAMEWAKER_ELITE)
+            {
+                m_luiMajordomoAddsGUIDs.push_back(pSummoned->GetObjectGuid());
+                pSummoned->SetRespawnDelay(2 * HOUR);
+            }
+            else if (pSummoned->GetEntry() == NPC_RAGNAROS)
+            {
+                m_ragnarosGuid = pSummoned->GetObjectGuid();
+                pSummoned->CastSpell(pSummoned, SPELL_RAGNA_EMERGE, false);
+            }
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            if (pKiller->GetTypeId() == TYPEID_UNIT && pKiller->GetEntry() == NPC_RAGNAROS)
+            {
+                DoScriptText(SAY_ARRIVAL4_MAJ, m_creature);
+            }
+        }
+
+        void CorpseRemoved(uint32& uiRespawnDelay) override
+        {
+            uiRespawnDelay = urand(2 * HOUR, 3 * HOUR);
+
+            if (m_bHasEncounterFinished)
+            {
+                // Needed for proper respawn handling
+                debug_log("[SD3]: boss_majordomo_executus: Set active");
+                m_creature->SetActiveObjectState(true);
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_FLAMEWAKER_HEALER || pSummoned->GetEntry() == NPC_FLAMEWAKER_ELITE)
+            {
+                m_uiAddsKilled += 1;
+
+                // Yell if only one Add alive
+                if (m_uiAddsKilled == m_luiMajordomoAddsGUIDs.size() - 1)
+                {
+                    DoScriptText(SAY_LAST_ADD, m_creature);
+                }
+
+                // All adds are killed, retreat
+                else if (m_uiAddsKilled == m_luiMajordomoAddsGUIDs.size())
+                {
+                    m_bHasEncounterFinished = true;
+                    m_creature->GetMotionMaster()->MoveTargetedHome();
+                }
+            }
+        }
+
+        // Unsummon Majordomo adds
+        void UnsummonMajordomoAdds()
+        {
+            for (GuidList::const_iterator itr = m_luiMajordomoAddsGUIDs.begin(); itr != m_luiMajordomoAddsGUIDs.end(); ++itr)
+            {
+                if (Creature* pAdd = m_creature->GetMap()->GetCreature(*itr))
+                if (pAdd->IsTemporarySummon())
+                {
+                    ((TemporarySummon*)pAdd)->UnSummon();
+                }
+            }
+
+            m_luiMajordomoAddsGUIDs.clear();
+        }
+
+        void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override
+        {
+            if (uiDamage > m_creature->GetHealth())
+            {
+                uiDamage = 0;
+                DoCastSpellIfCan(m_creature, SPELL_AEGIS, CAST_TRIGGERED);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Handling of his combat-end speech and Ragnaros summoning
+            if (m_uiSpeech)
+            {
+                if (m_uiSpeechTimer < uiDiff)
+                {
+                    switch (m_uiSpeech)
+                    {
+                        // Majordomo retreat event
+                    case 1:
+                        DoScriptText(SAY_DEFEAT_1, m_creature);
+                        m_uiSpeechTimer = 7500;
+                        ++m_uiSpeech;
+                        break;
+                    case 2:
+                        DoScriptText(SAY_DEFEAT_2, m_creature);
+                        m_uiSpeechTimer = 8000;
+                        ++m_uiSpeech;
+                        break;
+                    case 3:
+                        DoScriptText(SAY_DEFEAT_3, m_creature);
+                        m_uiSpeechTimer = 21500;
+                        ++m_uiSpeech;
+                        break;
+                    case 4:
+                        DoCastSpellIfCan(m_creature, SPELL_TELEPORT_SELF);
+                        // TODO - when should they be unsummoned?
+                        // TODO - also unclear how this should be handled, as of range issues
+                        m_uiSpeechTimer = 900;
+                        ++m_uiSpeech;
+                        break;
+                    case 5:
+                        // Majordomo is away now, remove his adds
+                        UnsummonMajordomoAdds();
+                        m_uiSpeech = 0;
+                        break;
+
+                        // Ragnaros Summon Event
+                    case 10:
+                        DoScriptText(SAY_SUMMON_1, m_creature);
+                        ++m_uiSpeech;
+                        m_uiSpeechTimer = 1000;
+                        break;
+                    case 11:
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_RAGNAROS);
+                        // TODO - Move along, this expects to be handled with mmaps
+                        m_creature->GetMotionMaster()->MovePoint(1, 831.079590f, -816.023193f, -229.023270f);
+                        ++m_uiSpeech;
+                        m_uiSpeechTimer = 7000;
+                        break;
+                    case 12:
+                        // Reset orientation
+                        if (GameObject* pLavaSteam = m_pInstance->GetSingleGameObjectFromStorage(GO_LAVA_STEAM))
+                        {
+                            m_creature->SetFacingToObject(pLavaSteam);
+                        }
+                        m_uiSpeechTimer = 4500;
+                        ++m_uiSpeech;
+                        break;
+                    case 13:
+                        DoScriptText(SAY_SUMMON_MAJ, m_creature);
+                        ++m_uiSpeech;
+                        m_uiSpeechTimer = 8000;
+                        break;
+                    case 14:
+                        // Summon Ragnaros
+                        if (m_pInstance)
+                        if (GameObject* pGo = m_pInstance->GetSingleGameObjectFromStorage(GO_LAVA_STEAM))
+                        {
+                            m_creature->SummonCreature(NPC_RAGNAROS, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), fmod(m_creature->GetOrientation() + M_PI, 2 * M_PI), TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 2 * HOUR * IN_MILLISECONDS);
+                        }
+                        ++m_uiSpeech;
+                        m_uiSpeechTimer = 8700;
+                        break;
+                    case 15:
+                        if (Creature* pRagnaros = m_creature->GetMap()->GetCreature(m_ragnarosGuid))
+                        {
+                            DoScriptText(SAY_ARRIVAL1_RAG, pRagnaros);
+                        }
+                        ++m_uiSpeech;
+                        m_uiSpeechTimer = 11700;
+                        break;
+                    case 16:
+                        DoScriptText(SAY_ARRIVAL2_MAJ, m_creature);
+                        ++m_uiSpeech;
+                        m_uiSpeechTimer = 8700;
+                        break;
+                    case 17:
+                        if (Creature* pRagnaros = m_creature->GetMap()->GetCreature(m_ragnarosGuid))
+                        {
+                            DoScriptText(SAY_ARRIVAL3_RAG, pRagnaros);
+                        }
+                        ++m_uiSpeech;
+                        m_uiSpeechTimer = 16500;
+                        break;
+                    case 18:
+                        if (Creature* pRagnaros = m_creature->GetMap()->GetCreature(m_ragnarosGuid))
+                        {
+                            pRagnaros->CastSpell(m_creature, SPELL_ELEMENTAL_FIRE, false);
+                        }
+                        // Rest of summoning speech is handled by Ragnaros, as Majordomo will be dead
+                        m_uiSpeech = 0;
+                        break;
+                    }
+                }
+                else
+                {
+                    m_uiSpeechTimer -= uiDiff;
+                }
+            }
+
+            // When encounter finished, no need to do anything anymore (important for moving home after victory)
+            if (m_bHasEncounterFinished)
+            {
+                return;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Cast Ageis to heal self
+            if (m_uiAegisTimer <= uiDiff)
+            {
+                m_uiAegisTimer = 0;
+            }
+            else
+            {
+                m_uiAegisTimer -= uiDiff;
+            }
+
+            if (m_creature->GetHealthPercent() < 90.0f && !m_uiAegisTimer)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_AEGIS);
+                m_uiAegisTimer = 10000;
+            }
+
+            // Magic Reflection Timer
+            if (m_uiMagicReflectionTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MAGIC_REFLECTION) == CAST_OK)
+                {
+                    m_uiMagicReflectionTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiMagicReflectionTimer -= uiDiff;
+            }
+
+            // Damage Reflection Timer
+            if (m_uiDamageReflectionTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DAMAGE_REFLECTION) == CAST_OK)
+                {
+                    m_uiDamageReflectionTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiDamageReflectionTimer -= uiDiff;
+            }
+
+            // Teleports the target to the heated rock in the center of the area
+            if (m_uiTeleportTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_TELEPORT) == CAST_OK)
+                    {
+                        m_uiTeleportTimer = 20000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiTeleportTimer -= uiDiff;
+            }
+
+            // Blastwave Timer
+            if (m_uiBlastwaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BLASTWAVE) == CAST_OK)
+                {
+                    m_uiBlastwaveTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiBlastwaveTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_majordomoAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (InstanceData* pInstance = pCreature->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_RAGNAROS) == NOT_STARTED || pInstance->GetData(TYPE_RAGNAROS) == FAIL)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SUMMON_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_SUMMON_1, pCreature->GetObjectGuid());
+            }
+        }
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*sender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SUMMON_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_SUMMON_2, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SUMMON_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_SUMMON_3, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 3:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            if (boss_majordomoAI* pMajoAI = dynamic_cast<boss_majordomoAI*>(pCreature->AI()))
+            {
+                pMajoAI->StartSummonEvent(pPlayer);
+            }
+            break;
+        }
+
+        return true;
+    }
+};
+
+struct spell_boss_majordomo : public SpellScript
+{
+    spell_boss_majordomo() : SpellScript("spell_boss_majordomo") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId != SPELL_TELEPORT_SELF || uiEffIndex != EFFECT_INDEX_0)
+        {
+            return false;
+        }
+
+        pCreatureTarget->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); //TODO is here ToCreature() needed?
+        pCreatureTarget->ToCreature()->NearTeleportTo(m_aMajordomoLocations[1].m_fX, m_aMajordomoLocations[1].m_fY, m_aMajordomoLocations[1].m_fZ, m_aMajordomoLocations[1].m_fO, true);
+        // TODO - some visibility update?
+        return true;
+    }
+};
+
+void AddSC_boss_majordomo()
+{
+    Script* s;
+    s = new boss_majordomo();
+    s->RegisterSelf();
+    s = new spell_boss_majordomo();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_majordomo";
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_boss_majordomo;
+    //pNewScript->pGossipHello = &GossipHello_boss_majordomo;
+    //pNewScript->pGossipSelect = &GossipSelect_boss_majordomo;
+    //pNewScript->GetAI = &GetAI_boss_majordomo;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_ragnaros.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_ragnaros.cpp
new file mode 100644
index 000000000..6ea367947
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_ragnaros.cpp
@@ -0,0 +1,409 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Ragnaros
+ * SD%Complete: 70
+ * SDComment:   Melee/Range Combat behavior is not correct(any enemy in melee range, not only getVictim), Some abilities are missing
+ * SDCategory:  Molten Core
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "molten_core.h"
+
+/**
+ * Notes:
+ *
+ * There have been quite some bugs about his spells, keep this as reference until all are resolved.
+ *
+ * Missing features (based on wowwiki)
+ * Lava Burst - this spell is handled by Go 178088 which is summoned by spells 21886, 21900 - 21907
+ */
+
+enum
+{
+    SAY_ARRIVAL5_RAG            = -1409012,
+    SAY_REINFORCEMENTS_1        = -1409013,
+    SAY_REINFORCEMENTS_2        = -1409014,
+    SAY_HAMMER                  = -1409015,
+    SAY_WRATH                   = -1409016,
+    SAY_KILL                    = -1409017,
+    SAY_MAGMABURST              = -1409018,
+
+    SPELL_WRATH_OF_RAGNAROS     = 20566,
+    SPELL_ELEMENTAL_FIRE        = 20564,
+    SPELL_MAGMA_BLAST           = 20565,                    // Ranged attack if nobody is in melee range
+    SPELL_MELT_WEAPON           = 21387,
+    SPELL_RAGNA_SUBMERGE        = 21107,                    // Stealth aura
+    SPELL_RAGNA_EMERGE          = 20568,                    // Emerge from lava
+    SPELL_ELEMENTAL_FIRE_KILL   = 19773,
+    SPELL_MIGHT_OF_RAGNAROS     = 21154,
+    SPELL_INTENSE_HEAT          = 21155,
+
+    MAX_ADDS_IN_SUBMERGE        = 8,
+    NPC_SON_OF_FLAME            = 12143,
+    NPC_FLAME_OF_RAGNAROS       = 13148,
+};
+
+struct boss_ragnaros : public CreatureScript
+{
+    boss_ragnaros() : CreatureScript("boss_ragnaros") {}
+
+    struct boss_ragnarosAI : public Scripted_NoMovementAI
+    {
+        boss_ragnarosAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_uiEnterCombatTimer = 0;
+            m_bHasAggroYelled = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiEnterCombatTimer;
+        uint32 m_uiWrathOfRagnarosTimer;
+        uint32 m_uiHammerTimer;
+        uint32 m_uiMagmaBlastTimer;
+        uint32 m_uiElementalFireTimer;
+        uint32 m_uiSubmergeTimer;
+        uint32 m_uiAttackTimer;
+        uint32 m_uiAddCount;
+
+        bool m_bHasAggroYelled;
+        bool m_bHasYelledMagmaBurst;
+        bool m_bHasSubmergedOnce;
+        bool m_bIsSubmerged;
+
+        void Reset() override
+        {
+            m_uiWrathOfRagnarosTimer = 30000;                   // TODO Research more, according to wowwiki 25s, but timers up to 34s confirmed
+            m_uiHammerTimer = 11000;                            // TODO wowwiki states 20-30s timer, but ~11s confirmed
+            m_uiMagmaBlastTimer = 2000;
+            m_uiElementalFireTimer = 3000;
+            m_uiSubmergeTimer = 3 * MINUTE * IN_MILLISECONDS;
+            m_uiAttackTimer = 90 * IN_MILLISECONDS;
+            m_uiAddCount = 0;
+
+            m_bHasYelledMagmaBurst = false;
+            m_bHasSubmergedOnce = false;
+            m_bIsSubmerged = false;
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            if (urand(0, 3))
+            {
+                return;
+            }
+
+            DoScriptText(SAY_KILL, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_RAGNAROS, DONE);
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (pWho->GetTypeId() == TYPEID_UNIT && pWho->GetEntry() == NPC_MAJORDOMO)
+            {
+                return;
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_MELT_WEAPON);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_RAGNAROS, IN_PROGRESS);
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_RAGNAROS, FAIL);
+            }
+
+            // Reset flag if had been submerged
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+            {
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            }
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummmoned) override
+        {
+            // If all Sons of Flame are dead, trigger emerge
+            if (pSummmoned->GetEntry() == NPC_SON_OF_FLAME)
+            {
+                m_uiAddCount--;
+
+                // If last add killed then emerge soonish
+                if (m_uiAddCount == 0)
+                {
+                    m_uiAttackTimer = std::min(m_uiAttackTimer, (uint32)1000);
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SON_OF_FLAME)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+
+                ++m_uiAddCount;
+            }
+            else if (pSummoned->GetEntry() == NPC_FLAME_OF_RAGNAROS)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_INTENSE_HEAT, true, NULL, NULL, m_creature->GetObjectGuid());
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            // As Majordomo is now killed, the last timer (until attacking) must be handled with ragnaros script
+            if (pSpell->Id == SPELL_ELEMENTAL_FIRE_KILL && pTarget->GetTypeId() == TYPEID_UNIT && pTarget->GetEntry() == NPC_MAJORDOMO)
+            {
+                m_uiEnterCombatTimer = 10000;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiEnterCombatTimer)
+            {
+                if (m_uiEnterCombatTimer <= uiDiff)
+                {
+                    if (!m_bHasAggroYelled)
+                    {
+                        m_uiEnterCombatTimer = 3000;
+                        m_bHasAggroYelled = true;
+                        DoScriptText(SAY_ARRIVAL5_RAG, m_creature);
+                    }
+                    else
+                    {
+                        m_uiEnterCombatTimer = 0;
+                        // If we don't remove this passive flag, he will be unattackable after evading, this way he will enter combat
+                        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                        if (m_pInstance)
+                        {
+                            if (Player* pPlayer = m_pInstance->GetPlayerInMap(true, false))
+                            {
+                                m_creature->AI()->AttackStart(pPlayer);
+                                return;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiEnterCombatTimer -= uiDiff;
+                }
+            }
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_bIsSubmerged)
+            {
+                // Timer to check when Ragnaros should emerge (is set to soonish, when last add is killed)
+                if (m_uiAttackTimer < uiDiff)
+                {
+                    // Become emerged again
+                    DoCastSpellIfCan(m_creature, SPELL_RAGNA_EMERGE);
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    m_uiSubmergeTimer = 3 * MINUTE * IN_MILLISECONDS;
+                    m_uiMagmaBlastTimer = 3000;                 // Delay the magma blast after emerge
+                    m_bIsSubmerged = false;
+                }
+                else
+                {
+                    m_uiAttackTimer -= uiDiff;
+                }
+
+                // Do nothing while submerged
+                return;
+            }
+
+            // Wrath Of Ragnaros Timer
+            if (m_uiWrathOfRagnarosTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WRATH_OF_RAGNAROS) == CAST_OK)
+                {
+                    DoScriptText(SAY_WRATH, m_creature);
+                    m_uiWrathOfRagnarosTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiWrathOfRagnarosTimer -= uiDiff;
+            }
+
+            // Elemental Fire Timer
+            if (m_uiElementalFireTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ELEMENTAL_FIRE) == CAST_OK)
+                {
+                    m_uiElementalFireTimer = urand(10000, 14000);
+                }
+            }
+            else
+            {
+                m_uiElementalFireTimer -= uiDiff;
+            }
+
+            // Hammer of Ragnaros
+            if (m_uiHammerTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_MIGHT_OF_RAGNAROS, SELECT_FLAG_POWER_MANA))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_MIGHT_OF_RAGNAROS) == CAST_OK)
+                    {
+                        DoScriptText(SAY_HAMMER, m_creature);
+                        m_uiHammerTimer = 11000;
+                    }
+                }
+                else
+                {
+                    m_uiHammerTimer = 11000;
+                }
+            }
+            else
+            {
+                m_uiHammerTimer -= uiDiff;
+            }
+
+            // Submerge Timer
+            if (m_uiSubmergeTimer < uiDiff)
+            {
+                // Submerge and attack again after 90 secs
+                DoCastSpellIfCan(m_creature, SPELL_RAGNA_SUBMERGE, CAST_INTERRUPT_PREVIOUS);
+                m_creature->HandleEmote(EMOTE_ONESHOT_SUBMERGE);
+                m_bIsSubmerged = true;
+                m_uiAttackTimer = 90 * IN_MILLISECONDS;
+
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                // Say dependend if first time or not
+                DoScriptText(!m_bHasSubmergedOnce ? SAY_REINFORCEMENTS_1 : SAY_REINFORCEMENTS_2, m_creature);
+                m_bHasSubmergedOnce = true;
+
+                // Summon 8 elementals at random points around the boss
+                float fX, fY, fZ;
+                for (uint8 i = 0; i < MAX_ADDS_IN_SUBMERGE; ++i)
+                {
+                    m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 30.0f, fX, fY, fZ);
+                    m_creature->SummonCreature(NPC_SON_OF_FLAME, fX, fY, fZ, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 1000);
+                }
+
+                return;
+            }
+            else
+            {
+                m_uiSubmergeTimer -= uiDiff;
+            }
+
+            // TODO this actually should select _any_ enemy in melee range, not only the tank
+            // Range check for melee target, if nobody is found in range, then cast magma blast on random
+            // If we are within range melee the target
+            if (m_creature->IsNonMeleeSpellCasted(false) || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+            {
+                // Make sure our attack is ready
+                if (m_creature->isAttackReady())
+                {
+                    m_creature->AttackerStateUpdate(m_creature->getVictim());
+                    m_creature->resetAttackTimer();
+                    m_bHasYelledMagmaBurst = false;
+                }
+            }
+            else
+            {
+                // Magma Burst Timer
+                if (m_uiMagmaBlastTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_MAGMA_BLAST) == CAST_OK)
+                        {
+                            if (!m_bHasYelledMagmaBurst)
+                            {
+                                DoScriptText(SAY_MAGMABURST, m_creature);
+                                m_bHasYelledMagmaBurst = true;
+                            }
+                            m_uiMagmaBlastTimer = 1000;         // Spamm this!
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiMagmaBlastTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ragnarosAI(pCreature);
+    }
+};
+
+void AddSC_boss_ragnaros()
+{
+    Script* s;
+    s = new boss_ragnaros();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ragnaros";
+    //pNewScript->GetAI = &GetAI_boss_ragnaros;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_shazzrah.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_shazzrah.cpp
new file mode 100644
index 000000000..ca31fe74f
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_shazzrah.cpp
@@ -0,0 +1,202 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Shazzrah
+ * SD%Complete: 75
+ * SDComment:   Teleport NYI (need core support, remove hack here when implemented)
+ * SDCategory:  Molten Core
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "molten_core.h"
+
+enum
+{
+    SPELL_ARCANE_EXPLOSION          = 19712,
+    SPELL_SHAZZRAH_CURSE            = 19713,
+    SPELL_MAGIC_GROUNDING           = 19714,
+    SPELL_COUNTERSPELL              = 19715,
+    SPELL_GATE_OF_SHAZZRAH          = 23138                 // effect spell: 23139
+};
+
+struct boss_shazzrah : public CreatureScript
+{
+    boss_shazzrah() : CreatureScript("boss_shazzrah") {}
+
+    struct boss_shazzrahAI : public ScriptedAI
+    {
+        boss_shazzrahAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiArcaneExplosionTimer;
+        uint32 m_uiShazzrahCurseTimer;
+        uint32 m_uiMagicGroundingTimer;
+        uint32 m_uiCounterspellTimer;
+        uint32 m_uiBlinkTimer;
+
+        void Reset() override
+        {
+            m_uiArcaneExplosionTimer = 6000;
+            m_uiShazzrahCurseTimer = 10000;
+            m_uiMagicGroundingTimer = 24000;
+            m_uiCounterspellTimer = 15000;
+            m_uiBlinkTimer = 30000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SHAZZRAH, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SHAZZRAH, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SHAZZRAH, NOT_STARTED);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Arcane Explosion Timer
+            if (m_uiArcaneExplosionTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_EXPLOSION) == CAST_OK)
+                {
+                    m_uiArcaneExplosionTimer = urand(5000, 9000);
+                }
+            }
+            else
+            {
+                m_uiArcaneExplosionTimer -= uiDiff;
+            }
+
+            // Shazzrah Curse Timer
+            if (m_uiShazzrahCurseTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHAZZRAH_CURSE) == CAST_OK)
+                {
+                    m_uiShazzrahCurseTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiShazzrahCurseTimer -= uiDiff;
+            }
+
+            // Magic Grounding Timer
+            if (m_uiMagicGroundingTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MAGIC_GROUNDING) == CAST_OK)
+                {
+                    m_uiMagicGroundingTimer = 35000;
+                }
+            }
+            else
+            {
+                m_uiMagicGroundingTimer -= uiDiff;
+            }
+
+            // Counterspell Timer
+            if (m_uiCounterspellTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_COUNTERSPELL) == CAST_OK)
+                {
+                    m_uiCounterspellTimer = urand(16000, 20000);
+                }
+            }
+            else
+            {
+                m_uiCounterspellTimer -= uiDiff;
+            }
+
+            // Blink Timer
+            if (m_uiBlinkTimer < uiDiff)
+            {
+                // Teleporting him to a random gamer and casting Arcane Explosion after that.
+                if (DoCastSpellIfCan(m_creature, SPELL_GATE_OF_SHAZZRAH) == CAST_OK)
+                {
+                    // manual, until added effect of dummy properly -- TODO REMOVE HACK
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        m_creature->NearTeleportTo(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), m_creature->GetOrientation());
+                    }
+                    DoResetThreat();
+
+                    DoCastSpellIfCan(m_creature, SPELL_ARCANE_EXPLOSION, CAST_TRIGGERED);
+
+                    m_uiBlinkTimer = 45000;
+                }
+            }
+            else
+            {
+                m_uiBlinkTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_shazzrahAI(pCreature);
+    }
+};
+
+void AddSC_boss_shazzrah()
+{
+    Script* s;
+    s = new boss_shazzrah();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_shazzrah";
+    //pNewScript->GetAI = &GetAI_boss_shazzrah;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_sulfuron_harbinger.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_sulfuron_harbinger.cpp
new file mode 100644
index 000000000..47aff1994
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_sulfuron_harbinger.cpp
@@ -0,0 +1,310 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Sulfuron_Harbringer
+ * SD%Complete: 80
+ * SDComment:   Spells Dark strike and Flamespear need confirmation
+ * SDCategory:  Molten Core
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "molten_core.h"
+
+enum
+{
+    SPELL_DARK_STRIKE           = 19777,                    // Wowhead Linked to add - need confirmation!
+    SPELL_DEMORALIZING_SHOUT    = 19778,
+    SPELL_INSPIRE               = 19779,
+    SPELL_HAND_OF_RAGNAROS      = 19780,
+    SPELL_FLAMESPEAR            = 19781,
+
+    // Adds Spells
+    SPELL_HEAL                  = 19775,
+    SPELL_SHADOWWORD_PAIN       = 19776,
+    SPELL_IMMOLATE              = 20294
+};
+
+struct boss_sulfuron : public CreatureScript
+{
+    boss_sulfuron() : CreatureScript("boss_sulfuron") {}
+
+    struct boss_sulfuronAI : public ScriptedAI
+    {
+        boss_sulfuronAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiDarkstrikeTimer;
+        uint32 m_uiDemoralizingShoutTimer;
+        uint32 m_uiInspireTimer;
+        uint32 m_uiKnockdownTimer;
+        uint32 m_uiFlamespearTimer;
+
+        void Reset() override
+        {
+            m_uiDarkstrikeTimer = 10000;
+            m_uiDemoralizingShoutTimer = 15000;
+            m_uiInspireTimer = 3000;
+            m_uiKnockdownTimer = 6000;
+            m_uiFlamespearTimer = 2000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SULFURON, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SULFURON, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SULFURON, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Demoralizing Shout Timer
+            if (m_uiDemoralizingShoutTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DEMORALIZING_SHOUT) == CAST_OK)
+                {
+                    m_uiDemoralizingShoutTimer = urand(15000, 20000);
+                }
+            }
+            else
+            {
+                m_uiDemoralizingShoutTimer -= uiDiff;
+            }
+
+            // Inspire Timer
+            if (m_uiInspireTimer < uiDiff)
+            {
+                Creature* pTarget = NULL;
+                std::list<Creature*> pList = DoFindFriendlyMissingBuff(45.0f, SPELL_INSPIRE);
+                if (!pList.empty())
+                {
+                    std::list<Creature*>::iterator i = pList.begin();
+                    advance(i, (rand() % pList.size()));
+                    pTarget = (*i);
+                }
+
+                if (!pTarget)
+                {
+                    pTarget = m_creature;
+                }
+
+                if (DoCastSpellIfCan(pTarget, SPELL_INSPIRE) == CAST_OK)
+                {
+                    m_uiInspireTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiInspireTimer -= uiDiff;
+            }
+
+            // Hand of Ragnaros Timer
+            if (m_uiKnockdownTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_HAND_OF_RAGNAROS) == CAST_OK)
+                {
+                    m_uiKnockdownTimer = urand(12000, 15000);
+                }
+            }
+            else
+            {
+                m_uiKnockdownTimer -= uiDiff;
+            }
+
+            // Flamespear Timer
+            if (m_uiFlamespearTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_FLAMESPEAR) == CAST_OK)
+                    {
+                        m_uiFlamespearTimer = urand(12000, 16000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiFlamespearTimer -= uiDiff;
+            }
+
+            // Dark Strike Timer
+            if (m_uiDarkstrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DARK_STRIKE) == CAST_OK)
+                {
+                    m_uiDarkstrikeTimer = urand(15000, 18000);
+                }
+            }
+            else
+            {
+                m_uiDarkstrikeTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_sulfuronAI(pCreature);
+    }
+};
+
+struct mob_flamewaker_priest : public CreatureScript
+{
+    mob_flamewaker_priest() : CreatureScript("mob_flamewaker_priest") {}
+
+    struct mob_flamewaker_priestAI : public ScriptedAI
+    {
+        mob_flamewaker_priestAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        uint32 m_uiHealTimer;
+        uint32 m_uiShadowWordPainTimer;
+        uint32 m_uiImmolateTimer;
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override
+        {
+            m_uiHealTimer = urand(15000, 30000);
+            m_uiShadowWordPainTimer = 2000;
+            m_uiImmolateTimer = 8000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Casting Heal to Sulfuron or other Guards.
+            if (m_uiHealTimer < uiDiff)
+            {
+                if (Unit* pUnit = DoSelectLowestHpFriendly(60.0f, 1))
+                {
+                    if (DoCastSpellIfCan(pUnit, SPELL_HEAL) == CAST_OK)
+                    {
+                        m_uiHealTimer = urand(15000, 20000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiHealTimer -= uiDiff;
+            }
+
+            // ShadowWord Pain Timer
+            if (m_uiShadowWordPainTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SHADOWWORD_PAIN) == CAST_OK)
+                    {
+                        m_uiShadowWordPainTimer = urand(18000, 26000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiShadowWordPainTimer -= uiDiff;
+            }
+
+            // Immolate Timer
+            if (m_uiImmolateTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_IMMOLATE) == CAST_OK)
+                    {
+                        m_uiImmolateTimer = urand(15000, 25000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiImmolateTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_flamewaker_priestAI(pCreature);
+    }
+};
+
+void AddSC_boss_sulfuron()
+{
+    Script* s;
+    s = new boss_sulfuron();
+    s->RegisterSelf();
+    s = new mob_flamewaker_priest();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_sulfuron";
+    //pNewScript->GetAI = &GetAI_boss_sulfuron;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_flamewaker_priest";
+    //pNewScript->GetAI = &GetAI_mob_flamewaker_priest;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/instance_molten_core.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/instance_molten_core.cpp
new file mode 100644
index 000000000..9b98acfe8
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/instance_molten_core.cpp
@@ -0,0 +1,502 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Molten_Core
+ * SD%Complete: 25
+ * SDComment:   Majordomos and Ragnaros Event missing
+ * SDCategory:  Molten Core
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "molten_core.h"
+
+static sSpawnLocation m_aBosspawnLocs[MAX_MAJORDOMO_ADDS] =
+{
+    {NPC_FLAMEWAKER_ELITE,  737.945f, -1156.48f, -118.945f, 4.46804f},
+    {NPC_FLAMEWAKER_ELITE,  752.520f, -1191.02f, -118.218f, 2.49582f},
+    {NPC_FLAMEWAKER_ELITE,  752.953f, -1163.94f, -118.869f, 3.70010f},
+    {NPC_FLAMEWAKER_ELITE,  738.814f, -1197.40f, -118.018f, 1.83260f},
+    {NPC_FLAMEWAKER_HEALER, 746.939f, -1194.87f, -118.016f, 2.21657f},
+    {NPC_FLAMEWAKER_HEALER, 747.132f, -1158.87f, -118.897f, 4.03171f},
+    {NPC_FLAMEWAKER_HEALER, 757.116f, -1170.12f, -118.793f, 3.40339f},
+    {NPC_FLAMEWAKER_HEALER, 755.910f, -1184.46f, -118.449f, 2.80998f}
+};
+
+struct is_molten_core : public InstanceScript
+{
+    is_molten_core() : InstanceScript("instance_molten_core") {}
+
+    class instance_molten_core : public ScriptedInstance
+    {
+    public:
+        instance_molten_core(Map* pMap) : ScriptedInstance(pMap)
+        {
+            Initialize();
+        }
+
+        ~instance_molten_core() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+            memset(&m_auiRuneState, 0, sizeof(m_auiRuneState));
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+                // Bosses
+            case NPC_GARR:
+            case NPC_SULFURON:
+            case NPC_MAJORDOMO:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_FIRESWORN:
+                m_sFireswornGUID.insert(pCreature->GetObjectGuid());
+                break;
+            case NPC_LAVA_SURGER:
+                if (GetData(TYPE_GARR) == DONE)
+                    pCreature->ForcedDespawn(500);
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_FIRESWORN:
+                m_sFireswornGUID.erase(pCreature->GetObjectGuid());
+                if (Creature* pGarr = GetSingleCreatureFromStorage(NPC_GARR))
+                {
+                    if (pGarr->IsAlive())
+                    {
+                        pGarr->CastSpell(pGarr, SPELL_GARR_ENRAGE, true);
+                        pGarr->CastSpell(pGarr, SPELL_GARR_ARMOR_DEBUFF, true);
+
+                        if (!m_sFireswornGUID.size())
+                            pGarr->AI()->ReceiveAIEvent(AI_EVENT_CUSTOM_B, pGarr, pGarr, 0);
+                    }
+                }
+                break;
+            default:
+                break;
+            }
+        }
+
+        void OnCreatureDespawn(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_FIRESWORN:
+                OnCreatureDeath(pCreature);
+                break;
+            default:
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+                // Runes
+            case GO_RUNE_KRESS:
+            case GO_RUNE_MOHN:
+            case GO_RUNE_BLAZ:
+            case GO_RUNE_MAZJ:
+            case GO_RUNE_ZETH:
+            case GO_RUNE_THERI:
+            case GO_RUNE_KORO:
+                if (sRuneEncounters const *rstr = GetRuneStructForTrapEntry(pGo->GetGOInfo()->button.linkedTrapId))
+                {
+                    switch (m_auiRuneState[rstr->getRuneType()])
+                    {
+                    case DONE:
+                        pGo->SetGoState(GO_STATE_READY);
+                        break;
+                    default:
+                        pGo->SetGoState(GO_STATE_ACTIVE);
+                        break;
+                    }
+                }
+                // no break here!
+                // Majordomo event chest
+            case GO_CACHE_OF_THE_FIRE_LORD:
+                // Ragnaros GOs
+            case GO_LAVA_STEAM:
+            case GO_LAVA_SPLASH:
+                m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+                break;
+                // rune traps: just change state
+            case GO_RUNE_KRESS_TRAP:
+            case GO_RUNE_MOHN_TRAP:
+            case GO_RUNE_BLAZ_TRAP:
+            case GO_RUNE_MAZJ_TRAP:
+            case GO_RUNE_ZETH_TRAP:
+            case GO_RUNE_THERI_TRAP:
+            case GO_RUNE_KORO_TRAP:
+                if (sRuneEncounters const *rstr = GetRuneStructForTrapEntry(pGo->GetEntry()))
+                {
+                    switch (m_auiRuneState[rstr->getRuneType()])
+                    {
+                    case DONE:
+                        pGo->SetLootState(GO_JUST_DEACTIVATED); //TODO fix GameObject::Use for traps
+                        // no break here!
+                    case NOT_STARTED:
+                        pGo->SetGoState(GO_STATE_ACTIVE);
+                    default:
+                        break;
+                    }
+                }
+                m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            // Summon Majordomo if can
+            DoSpawnMajordomoIfCan(true);
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            bool save = (uiData == DONE);
+            switch (uiType)
+            {
+            case TYPE_MAJORDOMO:
+                if (uiData == DONE)
+                {
+                    DoRespawnGameObject(GO_CACHE_OF_THE_FIRE_LORD, HOUR);
+                }
+                // no break here!
+            case TYPE_LUCIFRON:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_MAGMADAR:
+                m_auiEncounter[uiType] = uiData;
+#if defined (WOTLK) || defined (CATA)
+            if (uiData == DONE)
+                { DoUseDoorOrButton(GO_RUNE_KRESS); }
+#endif
+                break;
+            case TYPE_GEHENNAS:
+                m_auiEncounter[uiType] = uiData;
+#if defined (WOTLK) || defined (CATA)
+            if (uiData == DONE)
+                { DoUseDoorOrButton(GO_RUNE_MOHN); }
+#endif
+                break;
+            case TYPE_GARR:
+                m_auiEncounter[uiType] = uiData;
+#if defined (WOTLK) || defined (CATA)
+            if (uiData == DONE)
+                { DoUseDoorOrButton(GO_RUNE_BLAZ); }
+#endif
+                break;
+            case TYPE_SHAZZRAH:
+                m_auiEncounter[uiType] = uiData;
+#if defined (WOTLK) || defined (CATA)
+            if (uiData == DONE)
+                { DoUseDoorOrButton(GO_RUNE_MAZJ); }
+#endif
+                break;
+            case TYPE_GEDDON:
+                m_auiEncounter[uiType] = uiData;
+#if defined (WOTLK) || defined (CATA)
+            if (uiData == DONE)
+                { DoUseDoorOrButton(GO_RUNE_ZETH); }
+#endif
+                break;
+            case TYPE_GOLEMAGG:
+                m_auiEncounter[uiType] = uiData;
+#if defined (WOTLK) || defined (CATA)
+            if (uiData == DONE)
+                { DoUseDoorOrButton(GO_RUNE_THERI); }
+#endif
+                break;
+            case TYPE_SULFURON:
+            case TYPE_RAGNAROS:
+                m_auiEncounter[uiType] = uiData;
+#if defined (WOTLK) || defined (CATA)
+            if (uiData == DONE)
+                { DoUseDoorOrButton(GO_RUNE_KORO); }
+#endif
+                break;
+            case TYPE_FLAME_DOSED:
+                if (sRuneEncounters const *rstr = GetRuneStructForTrapEntry(uiData))
+                {
+                    m_auiRuneState[rstr->getRuneType()] = DONE;
+                    save = true;
+                    if (GameObject *trap = GetSingleGameObjectFromStorage(rstr->m_uiTrapEntry))
+                    {
+                        trap->SetGoState(GO_STATE_ACTIVE);
+                        trap->SetLootState(GO_JUST_DEACTIVATED);    //TODO fix GameObject::Use for traps
+                    }
+                    if (GameObject *rune = GetSingleGameObjectFromStorage(rstr->m_uiRuneEntry))
+                        rune->SetGoState(GO_STATE_READY);
+                    DoSpawnMajordomoIfCan(false);
+                }
+                break;
+            case TYPE_DO_FREE_GARR_ADDS:
+                for (std::set<ObjectGuid>::const_iterator it = m_sFireswornGUID.begin(); it != m_sFireswornGUID.end(); ++it)
+                {
+                    ObjectGuid guid = *it;
+                    int32 bp0 = 0;
+                    if (Creature* firesworn = instance->GetCreature(guid))
+                        if (firesworn->IsAlive())
+                            firesworn->CastCustomSpell(firesworn, SPELL_SEPARATION_ANXIETY, &bp0, NULL, NULL, true);
+                }
+                return;
+            }
+
+            // Check if Majordomo can be summoned
+#if defined (CLASSIC) || defined (TBC)
+            if (uiType < MAX_ENCOUNTER && uiData == DONE)   // a boss just killed
+            {
+                if (sRuneEncounters const *rstr = GetRuneStructForBoss(uiType))
+                {
+                    m_auiRuneState[rstr->getRuneType()] = SPECIAL;
+                    if (GameObject *trap = GetSingleGameObjectFromStorage(rstr->m_uiTrapEntry))
+                        trap->SetGoState(GO_STATE_READY);
+                }
+            }
+#endif
+#if defined (WOTLK) || defined (CATA)
+            if (uiData == DONE)
+            {
+                DoSpawnMajordomoIfCan(false);
+            }
+#endif
+
+#if defined (CLASSIC) || defined (TBC) || defined(WOTLK)
+            if (save)
+#endif
+#if defined (WOTLK) || defined (CATA)
+            if (uiData == DONE)
+#endif
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6] << " " << m_auiEncounter[7] << " " << m_auiEncounter[8] << " "
+                    << m_auiEncounter[9] << " " << m_auiRuneState[0] << " " << m_auiRuneState[1] << " "
+                    << m_auiRuneState[2] << " " << m_auiRuneState[3] << " " << m_auiRuneState[4] << " "
+                    << m_auiRuneState[5] << " " << m_auiRuneState[6];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+            else if (sRuneEncounters const *rstr = GetRuneStructForTrapEntry(uiType))
+                return m_auiRuneState[rstr->getRuneType()];
+
+            return 0;
+        }
+
+        uint64 GetData64(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case NPC_FIRESWORN:
+            {
+                Creature* garr = GetSingleCreatureFromStorage(NPC_GARR);
+                for (std::set<ObjectGuid>::const_iterator it = m_sFireswornGUID.begin(); it != m_sFireswornGUID.end(); ++it)
+                {
+                    ObjectGuid guid = *it;
+                    if (Creature* firesworn = instance->GetCreature(guid))
+                        if (firesworn->IsAlive() && firesworn->IsWithinDistInMap(garr, 20.0f, false))
+                            return guid.GetRawValue();
+                }
+                break;
+            }
+            default:
+                break;
+            }
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7]
+                >> m_auiEncounter[8] >> m_auiEncounter[9] >> m_auiRuneState[0] >> m_auiRuneState[1]
+                >> m_auiRuneState[2] >> m_auiRuneState[3] >> m_auiRuneState[4] >> m_auiRuneState[5]
+                >> m_auiRuneState[6];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    protected:
+        void DoSpawnMajordomoIfCan(bool bByPlayerEnter)
+        {
+            // If both Majordomo and Ragnaros events are finished, return
+            if (m_auiEncounter[TYPE_MAJORDOMO] == DONE && m_auiEncounter[TYPE_RAGNAROS] == DONE)
+            {
+                return;
+            }
+
+            // If already spawned return
+            if (GetSingleCreatureFromStorage(NPC_MAJORDOMO, true))
+            {
+                return;
+            }
+
+            // Check if all rune bosses are done
+            for (uint8 i = TYPE_MAGMADAR; i < TYPE_MAJORDOMO; ++i)
+            {
+#if defined (CLASSIC) || defined (TBC) || defined(WOTLK)
+                if (m_auiEncounter[i] != SPECIAL)
+#endif
+#if defined (WOTLK) || defined (CATA)
+        if (m_auiEncounter[i] != DONE)
+#endif
+                {
+                    return;
+                }
+            }
+
+            Player* pPlayer = GetPlayerInMap();
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            // Summon Majordomo
+            // If Majordomo encounter isn't done, summon at encounter place, else near Ragnaros
+            uint8 uiSummonPos = m_auiEncounter[TYPE_MAJORDOMO] == DONE ? 1 : 0;
+            if (Creature* pMajordomo = pPlayer->SummonCreature(m_aMajordomoLocations[uiSummonPos].m_uiEntry, m_aMajordomoLocations[uiSummonPos].m_fX, m_aMajordomoLocations[uiSummonPos].m_fY, m_aMajordomoLocations[uiSummonPos].m_fZ, m_aMajordomoLocations[uiSummonPos].m_fO, TEMPSUMMON_MANUAL_DESPAWN, 2 * HOUR * IN_MILLISECONDS))
+            {
+                if (uiSummonPos)                                    // Majordomo encounter already done, set faction
+                {
+                    pMajordomo->SetFactionTemporary(FACTION_MAJORDOMO_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN);
+                    pMajordomo->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                    pMajordomo->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                }
+                else                                                // Else yell and summon adds
+                {
+                    if (!bByPlayerEnter)
+                    {
+                        DoScriptText(SAY_MAJORDOMO_SPAWN, pMajordomo);
+                    }
+
+                    for (uint8 i = 0; i < MAX_MAJORDOMO_ADDS; ++i)
+                    {
+                        pMajordomo->SummonCreature(m_aBosspawnLocs[i].m_uiEntry, m_aBosspawnLocs[i].m_fX, m_aBosspawnLocs[i].m_fY, m_aBosspawnLocs[i].m_fZ, m_aBosspawnLocs[i].m_fO, TEMPSUMMON_MANUAL_DESPAWN, DAY * IN_MILLISECONDS);
+                    }
+                }
+            }
+        }
+
+        sRuneEncounters const *GetRuneStructForBoss(uint32 uiType) const
+        {
+            for (int i = 0; i < MAX_MOLTEN_RUNES; ++i)
+                if (m_aMoltenCoreRunes[i].m_bossType == uiType)
+                    return &m_aMoltenCoreRunes[i];
+
+            return NULL;
+        }
+
+        sRuneEncounters const *GetRuneStructForTrapEntry(uint32 entry) const
+        {
+            for (int i = 0; i < MAX_MOLTEN_RUNES; ++i)
+            if (m_aMoltenCoreRunes[i].m_uiTrapEntry == entry)
+                return &m_aMoltenCoreRunes[i];
+
+            return NULL;
+        }
+
+        std::string m_strInstData;
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        uint32 m_auiRuneState[MAX_MOLTEN_RUNES];
+        std::set<ObjectGuid> m_sFireswornGUID;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_molten_core(pMap);
+    }
+};
+
+void AddSC_instance_molten_core()
+{
+    Script* s;
+    s = new is_molten_core();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_molten_core";
+    //pNewScript->GetInstanceData = &GetInstance_instance_molten_core;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/molten_core.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/molten_core.cpp
new file mode 100644
index 000000000..afdb68b98
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/molten_core.cpp
@@ -0,0 +1,90 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Molten_Core
+ * SD%Complete: 25
+ * SDComment:   None
+ * SDCategory:  Molten Core
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+#if defined (CLASSIC) || defined (TBC) || defined(WOTLK)
+ * go_molten_core_rune
+#endif
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#if defined (CLASSIC) || defined (TBC) || defined(WOTLK)
+#include "molten_core.h"
+#endif
+
+#if defined (CLASSIC) || defined (TBC) || defined(WOTLK)
+
+/*######
+## go_molten_core_rune
+######*/
+
+struct go_molten_core_rune : public GameObjectScript
+{
+    go_molten_core_rune() : GameObjectScript("go_molten_core_rune") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+
+        if (!pInstance)
+        {
+            return true;
+        }
+
+        if (pInstance->GetData(pGo->GetGOInfo()->button.linkedTrapId) == SPECIAL)
+        {
+            pInstance->SetData(TYPE_FLAME_DOSED, pGo->GetGOInfo()->button.linkedTrapId);
+            return false;   // this path allows the spell to have effect
+        }
+
+        return true;
+    }
+};
+#endif
+void AddSC_molten_core()
+{
+#if defined (CLASSIC) || defined (TBC) || defined(WOTLK)
+    Script* s;
+    s = new go_molten_core_rune();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_molten_core_rune";
+    //pNewScript->pGOUse = &GOUse_go_molten_core_rune;
+    //pNewScript->RegisterSelf();
+#endif
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/molten_core.h b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/molten_core.h
new file mode 100644
index 000000000..a5ed787b2
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blackrock_mountain/molten_core/molten_core.h
@@ -0,0 +1,138 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_MOLTEN_CORE_H
+#define DEF_MOLTEN_CORE_H
+
+enum
+{
+    MAX_ENCOUNTER               = 10,
+
+    TYPE_LUCIFRON               = 0,
+    TYPE_MAGMADAR               = 1,    // do not change order: begin
+    TYPE_GEHENNAS               = 2,
+    TYPE_GARR                   = 3,
+    TYPE_SHAZZRAH               = 4,
+    TYPE_GEDDON                 = 5,
+    TYPE_GOLEMAGG               = 6,
+    TYPE_SULFURON               = 7,    // do not change order: end
+    TYPE_MAJORDOMO              = 8, 
+    TYPE_RAGNAROS               = 9,
+    TYPE_FLAME_DOSED            = MAX_ENCOUNTER,
+    TYPE_DO_FREE_GARR_ADDS      = MAX_ENCOUNTER+1,
+
+    MAX_MOLTEN_RUNES            = 7,
+
+    TYPE_RUNE_KRESS             = 0,
+    TYPE_RUNE_MOHN              = 1,
+    TYPE_RUNE_BLAZ              = 2,
+    TYPE_RUNE_MAZJ              = 3,
+    TYPE_RUNE_ZETH              = 4,
+    TYPE_RUNE_THERI             = 5,
+    TYPE_RUNE_KORO              = 6,
+
+    NPC_LUCIFRON                = 12118,
+    NPC_MAGMADAR                = 11982,
+    NPC_GEHENNAS                = 12259,
+    NPC_GARR                    = 12057,
+    NPC_SHAZZRAH                = 12264,
+    NPC_GEDDON                  = 12056,
+    NPC_GOLEMAGG                = 11988,
+    NPC_SULFURON                = 12098,
+    NPC_MAJORDOMO               = 12018,
+    NPC_RAGNAROS                = 11502,
+
+    // Adds
+    // Used for respawn in case of wipe
+    NPC_FLAMEWAKER_PROTECTOR    = 12119,                    // Lucifron
+    NPC_FLAMEWAKER              = 11661,                    // Gehennas
+    NPC_FIRESWORN               = 12099,                    // Garr
+    NPC_CORE_RAGER              = 11672,                    // Golemagg
+    NPC_FLAMEWAKER_PRIEST       = 11662,                    // Sulfuron
+    NPC_FLAMEWAKER_HEALER       = 11663,                    // Majordomo
+    NPC_FLAMEWAKER_ELITE        = 11664,                    // Majordomo
+    NPC_LAVA_SURGER             = 12101,
+
+    GO_LAVA_STEAM               = 178107,
+    GO_LAVA_SPLASH              = 178108,
+    GO_CACHE_OF_THE_FIRE_LORD   = 179703,
+    GO_RUNE_KRESS               = 176956,                   // Magmadar
+    GO_RUNE_MOHN                = 176957,                   // Gehennas
+    GO_RUNE_BLAZ                = 176955,                   // Garr
+    GO_RUNE_MAZJ                = 176953,                   // Shazzah
+    GO_RUNE_ZETH                = 176952,                   // Geddon
+    GO_RUNE_THERI               = 176954,                   // Golemagg
+    GO_RUNE_KORO                = 176951,                   // Sulfuron
+
+    GO_RUNE_KRESS_TRAP          = 178192,
+    GO_RUNE_MOHN_TRAP           = 178193,
+    GO_RUNE_BLAZ_TRAP           = 178191,
+    GO_RUNE_MAZJ_TRAP           = 178189,
+    GO_RUNE_ZETH_TRAP           = 178188,
+    GO_RUNE_THERI_TRAP          = 178190,
+    GO_RUNE_KORO_TRAP           = 178187,
+
+    MAX_MAJORDOMO_ADDS          = 8,
+    FACTION_MAJORDOMO_FRIENDLY  = 1080,
+    SAY_MAJORDOMO_SPAWN         = -1409004,
+
+    // Garr encounter spells
+    SPELL_GARR_ENRAGE           = 19516,
+    SPELL_GARR_ARMOR_DEBUFF     = 20481,
+    SPELL_SEPARATION_ANXIETY    = 23492,    // selfcast, for 5 sec: dmg +300% and banish immunity
+};
+
+struct sSpawnLocation
+{
+    uint32 m_uiEntry;
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+static sSpawnLocation m_aMajordomoLocations[2] =
+{
+    {NPC_MAJORDOMO, 758.089f, -1176.71f, -118.640f, 3.12414f},  // Summon fight position
+    {NPC_MAJORDOMO, 847.103f, -816.153f, -229.775f, 4.344f} // Summon and teleport location (near Ragnaros)
+};
+
+struct sRuneEncounters
+{
+    uint32 m_uiRuneEntry, m_uiTrapEntry;
+    uint8 m_bossType;
+    uint8 getRuneType() const { return m_bossType - 1; }
+};
+
+static const sRuneEncounters m_aMoltenCoreRunes[MAX_MOLTEN_RUNES] =
+{
+    { GO_RUNE_KRESS, GO_RUNE_KRESS_TRAP, TYPE_MAGMADAR },
+    { GO_RUNE_MOHN,  GO_RUNE_MOHN_TRAP,  TYPE_GEHENNAS },
+    { GO_RUNE_BLAZ,  GO_RUNE_BLAZ_TRAP,  TYPE_GARR },
+    { GO_RUNE_MAZJ,  GO_RUNE_MAZJ_TRAP,  TYPE_SHAZZRAH },
+    { GO_RUNE_ZETH,  GO_RUNE_ZETH_TRAP,  TYPE_GEDDON },
+    { GO_RUNE_THERI, GO_RUNE_THERI_TRAP, TYPE_GOLEMAGG },
+    { GO_RUNE_KORO,  GO_RUNE_KORO_TRAP,  TYPE_SULFURON }
+};
+#endif
+
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/blasted_lands.cpp b/src/modules/SD3/scripts/eastern_kingdoms/blasted_lands.cpp
new file mode 100644
index 000000000..742fc7883
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/blasted_lands.cpp
@@ -0,0 +1,153 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Blasted_Lands
+ * SD%Complete: 90
+ * SDComment:   Quest support: 2784, 2801. Missing some texts for Fallen Hero. Teleporter to Rise of the Defiler missing group support.
+ * SDCategory:  Blasted Lands
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_fallen_hero_of_horde
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+/*######
+## npc_fallen_hero_of_horde
+######*/
+
+#define GOSSIP_ITEM_FALLEN "Continue..."    //TODO localisation setup
+
+#define GOSSIP_ITEM_FALLEN1 "What could be worse than death?"
+#define GOSSIP_ITEM_FALLEN2 "Subordinates?"
+#define GOSSIP_ITEM_FALLEN3 "What are the stones of binding?"
+#define GOSSIP_ITEM_FALLEN4 "You can count on me, Hero"
+#define GOSSIP_ITEM_FALLEN5 "I shall"
+
+struct npc_fallen_hero_of_horde : public CreatureScript
+{
+    npc_fallen_hero_of_horde() : CreatureScript("npc_fallen_hero_of_horde") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+
+        if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Why are you here?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        if (pPlayer->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && pPlayer->GetTeam() == HORDE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Continue story...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+        }
+
+        if (pPlayer->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && pPlayer->GetTeam() == ALLIANCE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Why are you here?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->SEND_GOSSIP_MENU(1392, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 11:
+            pPlayer->SEND_GOSSIP_MENU(1411, pCreature->GetObjectGuid());
+            if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
+            {
+                pPlayer->AreaExploredOrEventHappens(2784);
+            }
+            if (pPlayer->GetTeam() == ALLIANCE)
+            {
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+                pPlayer->SEND_GOSSIP_MENU(1411, pCreature->GetObjectGuid());
+            }
+            break;
+
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
+            pPlayer->SEND_GOSSIP_MENU(1451, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 21:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
+            pPlayer->SEND_GOSSIP_MENU(1452, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 22:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
+            pPlayer->SEND_GOSSIP_MENU(1453, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 23:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
+            pPlayer->SEND_GOSSIP_MENU(1454, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 24:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
+            pPlayer->SEND_GOSSIP_MENU(1455, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 25:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26);
+            pPlayer->SEND_GOSSIP_MENU(1456, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 26:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(2801);
+            break;
+        }
+        return true;
+    }
+};
+
+void AddSC_blasted_lands()
+{
+    Script* s;
+    s = new npc_fallen_hero_of_horde();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_fallen_hero_of_horde";
+    //pNewScript->pGossipHello =  &GossipHello_npc_fallen_hero_of_horde;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_fallen_hero_of_horde;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/boss_kazzak.cpp b/src/modules/SD3/scripts/eastern_kingdoms/boss_kazzak.cpp
new file mode 100644
index 000000000..8a2e3c751
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/boss_kazzak.cpp
@@ -0,0 +1,252 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Kazzak
+ * SD%Complete: 80
+ * SDComment:   Spells and timers need to be confirmed.
+ * SDCategory:  Bosses
+ * EndScriptData
+ */
+
+//TODO merge into zone script file
+
+#include "precompiled.h"
+
+enum
+{
+    SAY_INTRO                 = -1000147,
+    SAY_AGGRO1                = -1000148,
+    SAY_AGGRO2                = -1000149,
+    SAY_SURPREME1             = -1000150,
+    SAY_SURPREME2             = -1000151,
+    SAY_KILL1                 = -1000152,
+    SAY_KILL2                 = -1000153,
+    SAY_KILL3                 = -1000154,
+    SAY_DEATH                 = -1000155,
+    EMOTE_FRENZY              = -1000002,
+    SAY_RAND1                 = -1000157,
+    SAY_RAND2                 = -1000158,
+
+    SPELL_SHADOW_VOLLEY       = 21341,
+    SPELL_BERSERK             = 21340,
+    SPELL_CLEAVE              = 20691,
+    SPELL_THUNDERCLAP         = 26554,
+    SPELL_VOIDBOLT            = 21066,
+    SPELL_MARK_OF_KAZZAK      = 21056,                  // triggers 21058 when target gets to 0 mana
+    SPELL_CAPTURESOUL         = 21053,                  // procs 21054 on kill
+    SPELL_TWISTEDREFLECTION   = 21063
+};
+
+struct boss_kazzak : public CreatureScript
+{
+    boss_kazzak() : CreatureScript("boss_kazzak") {}
+
+    struct boss_kazzakAI : public ScriptedAI
+    {
+        boss_kazzakAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiShadowVolleyTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiThunderClapTimer;
+        uint32 m_uiVoidBoltTimer;
+        uint32 m_uiMarkOfKazzakTimer;
+        uint32 m_uiTwistedReflectionTimer;
+        uint32 m_uiSupremeTimer;
+
+        void Reset() override
+        {
+            m_uiShadowVolleyTimer = urand(3000, 12000);
+            m_uiCleaveTimer = 7000;
+            m_uiThunderClapTimer = urand(16000, 20000);
+            m_uiVoidBoltTimer = 30000;
+            m_uiMarkOfKazzakTimer = 25000;
+            m_uiTwistedReflectionTimer = 33000;
+            m_uiSupremeTimer = 3 * MINUTE * IN_MILLISECONDS;
+        }
+
+        void JustRespawned() override
+        {
+            DoScriptText(SAY_INTRO, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_CAPTURESOUL, CAST_TRIGGERED);
+            DoScriptText(urand(0, 1) ? SAY_AGGRO1 : SAY_AGGRO2, m_creature);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            switch (urand(0, 3))
+            {
+            case 0:
+                DoScriptText(SAY_KILL1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_KILL2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_KILL3, m_creature);
+                break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiSupremeTimer)
+            {
+                // Enrage - cast shadowbolt volley every second
+                if (m_uiSupremeTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_SURPREME1 : SAY_SURPREME2, m_creature);
+                        m_uiSupremeTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiSupremeTimer -= uiDiff;
+                }
+
+                // Cast shadowbolt volley on timer before Berserk
+                if (m_uiShadowVolleyTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_VOLLEY) == CAST_OK)
+                    {
+                        m_uiShadowVolleyTimer = urand(4000, 20000);
+                    }
+                }
+                else
+                {
+                    m_uiShadowVolleyTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                {
+                    m_uiCleaveTimer = urand(8000, 12000);
+                }
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            if (m_uiThunderClapTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_THUNDERCLAP) == CAST_OK)
+                {
+                    m_uiThunderClapTimer = urand(10000, 14000);
+                }
+            }
+            else
+            {
+                m_uiThunderClapTimer -= uiDiff;
+            }
+
+            if (m_uiVoidBoltTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_VOIDBOLT) == CAST_OK)
+                {
+                    m_uiVoidBoltTimer = urand(15000, 28000);
+                }
+            }
+            else
+            {
+                m_uiVoidBoltTimer -= uiDiff;
+            }
+
+            if (m_uiMarkOfKazzakTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_MARK_OF_KAZZAK, SELECT_FLAG_POWER_MANA))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_MARK_OF_KAZZAK) == CAST_OK)
+                    {
+                        m_uiMarkOfKazzakTimer = 20000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiMarkOfKazzakTimer -= uiDiff;
+            }
+
+            if (m_uiTwistedReflectionTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_TWISTEDREFLECTION) == CAST_OK)
+                    {
+                        m_uiTwistedReflectionTimer = 15000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiTwistedReflectionTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_kazzakAI(pCreature);
+    }
+};
+
+void AddSC_boss_kazzakAI()
+{
+    Script* s;
+    s = new boss_kazzak();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_kazzak";
+    //pNewScript->GetAI = &GetAI_boss_kazzak;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/burning_steppes.cpp b/src/modules/SD3/scripts/eastern_kingdoms/burning_steppes.cpp
new file mode 100644
index 000000000..ed2ed4c09
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/burning_steppes.cpp
@@ -0,0 +1,537 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Burning_Steppes
+ * SD%Complete: 100
+ * SDComment:   Quest support: 4121, 4122, 4224, 4866.
+ * SDCategory:  Burning Steppes
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_ragged_john
+ * npc_grark_lorkrub
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_ragged_john
+######*/
+
+struct npc_ragged_john : public CreatureScript
+{
+    npc_ragged_john() : CreatureScript("npc_ragged_john") {}
+
+    struct npc_ragged_johnAI : public ScriptedAI
+    {
+        npc_ragged_johnAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void MoveInLineOfSight(Unit* who) override
+        {
+            if (who->HasAura(16468, EFFECT_INDEX_0))
+            {
+                if (who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 15) && who->isInAccessablePlaceFor(m_creature))
+                {
+                    DoCastSpellIfCan(who, 16472);
+                    ((Player*)who)->AreaExploredOrEventHappens(4866);
+                }
+            }
+
+            if (!m_creature->getVictim() && who->IsTargetableForAttack() && (m_creature->IsHostileTo(who)) && who->isInAccessablePlaceFor(m_creature))
+            {
+                if (!m_creature->CanFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)
+                {
+                    return;
+                }
+
+                float attackRadius = m_creature->GetAttackDistance(who);
+                if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who))
+                {
+                    who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
+                    AttackStart(who);
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ragged_johnAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override   //TODO localisation setup
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+
+        if (pPlayer->GetQuestStatus(4224) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Official business, John. I need some information about Marshal Windsor. Tell me about he last time you saw him.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(2713, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "So what did you do?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(2714, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Start making sense, dwarf. I don't want to have anything to do with your cracker, your pappy, or any sort of 'discreditin'.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(2715, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Ironfoe?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(2716, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 3:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Interesting... continue, John.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(2717, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 4:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "So that's how Windsor died...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(2718, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 5:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "So how did he die?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->SEND_GOSSIP_MENU(2719, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 6:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Ok, so where the hell is he? Wait a minute! Are you drunk?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->SEND_GOSSIP_MENU(2720, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 7:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "WHY is he in Blackrock Depths?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->SEND_GOSSIP_MENU(2721, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 8:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "300? So the Dark Irons killed him and dragged him into the Depths?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->SEND_GOSSIP_MENU(2722, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 9:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Ahh... Ironfoe.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->SEND_GOSSIP_MENU(2723, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 10:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Thanks, Ragged John. Your story was very uplifting and informative.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->SEND_GOSSIP_MENU(2725, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 11:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(4224);
+            break;
+        }
+        return true;
+    }
+};
+
+/*######
+## npc_grark_lorkrub
+######*/
+
+enum
+{
+    SAY_START                   = -1000873,
+    SAY_PAY                     = -1000874,
+    SAY_FIRST_AMBUSH_START      = -1000875,
+    SAY_FIRST_AMBUSH_END        = -1000876,
+    SAY_SEC_AMBUSH_START        = -1000877,
+    SAY_SEC_AMBUSH_END          = -1000878,
+    SAY_THIRD_AMBUSH_START      = -1000879,
+    SAY_THIRD_AMBUSH_END        = -1000880,
+    EMOTE_LAUGH                 = -1000881,
+    SAY_LAST_STAND              = -1000882,
+    SAY_LEXLORT_1               = -1000883,
+    SAY_LEXLORT_2               = -1000884,
+    EMOTE_RAISE_AXE             = -1000885,
+    EMOTE_LOWER_HAND            = -1000886,
+    SAY_LEXLORT_3               = -1000887,
+    SAY_LEXLORT_4               = -1000888,
+
+    EMOTE_SUBMIT                = -1000889,
+    SAY_AGGRO                   = -1000890,
+
+    SPELL_CAPTURE_GRARK             = 14250,
+
+    NPC_BLACKROCK_AMBUSHER          = 9522,
+    NPC_BLACKROCK_RAIDER            = 9605,
+    NPC_FLAMESCALE_DRAGONSPAWN      = 7042,
+    NPC_SEARSCALE_DRAKE             = 7046,
+
+    NPC_GRARK_LORKRUB               = 9520,
+    NPC_HIGH_EXECUTIONER_NUZARK     = 9538,
+    NPC_SHADOW_OF_LEXLORT           = 9539,
+
+    FACTION_FRIENDLY                = 35,
+
+    QUEST_ID_PRECARIOUS_PREDICAMENT = 4121
+};
+
+static const DialogueEntry aOutroDialogue[] =
+{
+    {SAY_LAST_STAND,    NPC_GRARK_LORKRUB,              5000},
+    {SAY_LEXLORT_1,     NPC_SHADOW_OF_LEXLORT,          3000},
+    {SAY_LEXLORT_2,     NPC_SHADOW_OF_LEXLORT,          5000},
+    {EMOTE_RAISE_AXE,   NPC_HIGH_EXECUTIONER_NUZARK,    4000},
+    {EMOTE_LOWER_HAND,  NPC_SHADOW_OF_LEXLORT,          3000},
+    {SAY_LEXLORT_3,     NPC_SHADOW_OF_LEXLORT,          3000},
+    {NPC_GRARK_LORKRUB, 0,                              5000},
+    {SAY_LEXLORT_4,     NPC_SHADOW_OF_LEXLORT,          0},
+    {0, 0, 0},
+};
+
+struct npc_grark_lorkrub : public CreatureScript
+{
+    npc_grark_lorkrub() : CreatureScript("npc_grark_lorkrub") {}
+
+    struct npc_grark_lorkrubAI : public npc_escortAI, private DialogueHelper
+    {
+        npc_grark_lorkrubAI(Creature* pCreature) : npc_escortAI(pCreature),
+        DialogueHelper(aOutroDialogue)
+        {
+        }
+
+        ObjectGuid m_nuzarkGuid;
+        ObjectGuid m_lexlortGuid;
+
+        GuidList m_lSearscaleGuidList;
+
+        uint8 m_uiKilledCreatures;
+        bool m_bIsFirstSearScale;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiKilledCreatures = 0;
+                m_bIsFirstSearScale = true;
+
+                m_lSearscaleGuidList.clear();
+
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                DoScriptText(SAY_AGGRO, m_creature);
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // No combat during escort
+            if (HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                return;
+            }
+
+            npc_escortAI::MoveInLineOfSight(pWho);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 1:
+                DoScriptText(SAY_START, m_creature);
+                break;
+            case 7:
+                DoScriptText(SAY_PAY, m_creature);
+                break;
+            case 12:
+                DoScriptText(SAY_FIRST_AMBUSH_START, m_creature);
+                SetEscortPaused(true);
+
+                m_creature->SummonCreature(NPC_BLACKROCK_AMBUSHER, -7844.3f, -1521.6f, 139.2f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                m_creature->SummonCreature(NPC_BLACKROCK_AMBUSHER, -7860.4f, -1507.8f, 141.0f, 6.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                m_creature->SummonCreature(NPC_BLACKROCK_RAIDER, -7845.6f, -1508.1f, 138.8f, 6.1f, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                m_creature->SummonCreature(NPC_BLACKROCK_RAIDER, -7859.8f, -1521.8f, 139.2f, 6.2f, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                break;
+            case 24:
+                DoScriptText(SAY_SEC_AMBUSH_START, m_creature);
+                SetEscortPaused(true);
+
+                m_creature->SummonCreature(NPC_BLACKROCK_AMBUSHER, -8035.3f, -1222.2f, 135.5f, 5.1f, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                m_creature->SummonCreature(NPC_FLAMESCALE_DRAGONSPAWN, -8037.5f, -1216.9f, 135.8f, 5.1f, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                m_creature->SummonCreature(NPC_BLACKROCK_AMBUSHER, -8009.5f, -1222.1f, 139.2f, 3.9f, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                m_creature->SummonCreature(NPC_FLAMESCALE_DRAGONSPAWN, -8007.1f, -1219.4f, 140.1f, 3.9f, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                break;
+            case 28:
+                m_creature->SummonCreature(NPC_SEARSCALE_DRAKE, -7897.8f, -1123.1f, 233.4f, 3.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_SEARSCALE_DRAKE, -7898.8f, -1125.1f, 193.9f, 3.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_SEARSCALE_DRAKE, -7895.6f, -1119.5f, 194.5f, 3.1f, TEMPSUMMON_TIMED_OOC_DESPAWN, 60000);
+                break;
+            case 30:
+            {
+                       SetEscortPaused(true);
+                       DoScriptText(SAY_THIRD_AMBUSH_START, m_creature);
+
+                       Player* pPlayer = GetPlayerForEscort();
+                       if (!pPlayer)
+                       {
+                           return;
+                       }
+
+                       // Set all the dragons in combat
+                       for (GuidList::const_iterator itr = m_lSearscaleGuidList.begin(); itr != m_lSearscaleGuidList.end(); ++itr)
+                       {
+                           if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                           {
+                               pTemp->AI()->AttackStart(pPlayer);
+                           }
+                       }
+                       break;
+            }
+            case 36:
+                DoScriptText(EMOTE_LAUGH, m_creature);
+                break;
+            case 45:
+                StartNextDialogueText(SAY_LAST_STAND);
+                SetEscortPaused(true);
+
+                m_creature->SummonCreature(NPC_HIGH_EXECUTIONER_NUZARK, -7532.3f, -1029.4f, 258.0f, 2.7f, TEMPSUMMON_TIMED_DESPAWN, 40000);
+                m_creature->SummonCreature(NPC_SHADOW_OF_LEXLORT, -7532.8f, -1032.9f, 258.2f, 2.5f, TEMPSUMMON_TIMED_DESPAWN, 40000);
+                break;
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case SAY_LEXLORT_1:
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                break;
+            case SAY_LEXLORT_3:
+                // Note: this part isn't very clear. Should he just simply attack him, or charge him?
+                if (Creature* pNuzark = m_creature->GetMap()->GetCreature(m_nuzarkGuid))
+                {
+                    pNuzark->HandleEmote(EMOTE_ONESHOT_ATTACK2HTIGHT);
+                }
+                break;
+            case NPC_GRARK_LORKRUB:
+                // Fake death creature when the axe is lowered. This will allow us to finish the event
+                m_creature->InterruptNonMeleeSpells(true);
+                m_creature->SetHealth(1);
+                m_creature->StopMoving();
+                m_creature->ClearComboPointHolders();
+                m_creature->RemoveAllAurasOnDeath();
+                m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+                m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+#endif
+
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->ClearAllReactives();
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MoveIdle();
+                m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+                break;
+            case SAY_LEXLORT_4:
+                // Finish the quest
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_ID_PRECARIOUS_PREDICAMENT, m_creature);
+                }
+                // Kill self
+                m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_HIGH_EXECUTIONER_NUZARK:
+                m_nuzarkGuid = pSummoned->GetObjectGuid();
+                break;
+            case NPC_SHADOW_OF_LEXLORT:
+                m_lexlortGuid = pSummoned->GetObjectGuid();
+                break;
+            case NPC_SEARSCALE_DRAKE:
+                // If it's the flying drake allow him to move in circles
+                if (m_bIsFirstSearScale)
+                {
+                    m_bIsFirstSearScale = false;
+
+                    pSummoned->SetLevitate(true);
+                    // ToDo: this guy should fly in circles above the creature
+                }
+                m_lSearscaleGuidList.push_back(pSummoned->GetObjectGuid());
+                break;
+
+            default:
+                // The hostile mobs should attack the player only
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pSummoned->AI()->AttackStart(pPlayer);
+                }
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* /*pSummoned*/) override
+        {
+            ++m_uiKilledCreatures;
+
+            switch (m_uiKilledCreatures)
+            {
+            case 4:
+                DoScriptText(SAY_FIRST_AMBUSH_END, m_creature);
+                SetEscortPaused(false);
+                break;
+            case 8:
+                DoScriptText(SAY_SEC_AMBUSH_END, m_creature);
+                SetEscortPaused(false);
+                break;
+            case 11:
+                DoScriptText(SAY_THIRD_AMBUSH_END, m_creature);
+                SetEscortPaused(false);
+                break;
+            }
+        }
+
+        Creature* GetSpeakerByEntry(uint32 uiEntry) override
+        {
+            switch (uiEntry)
+            {
+            case NPC_GRARK_LORKRUB:
+                return m_creature;
+            case NPC_HIGH_EXECUTIONER_NUZARK:
+                return m_creature->GetMap()->GetCreature(m_nuzarkGuid);
+            case NPC_SHADOW_OF_LEXLORT:
+                return m_creature->GetMap()->GetCreature(m_lexlortGuid);
+
+            default:
+                return NULL;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_grark_lorkrubAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_PRECARIOUS_PREDICAMENT)
+        {
+            if (npc_grark_lorkrubAI* pEscortAI = dynamic_cast<npc_grark_lorkrubAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+};
+
+struct spell_capture_grark : public SpellScript
+{
+    spell_capture_grark() : SpellScript("spell_capture_grark") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_CAPTURE_GRARK && uiEffIndex == EFFECT_INDEX_0)
+        {
+            // Note: this implementation needs additional research! There is a lot of guesswork involved in this!
+            if (pCreatureTarget->ToCreature()->GetHealthPercent() > 25.0f)
+            {
+                return false;
+            }
+
+            // The faction is guesswork - needs more research
+            DoScriptText(EMOTE_SUBMIT, pCreatureTarget->ToCreature());
+            pCreatureTarget->ToCreature()->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN);
+            pCreatureTarget->ToCreature()->AI()->EnterEvadeMode();
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_burning_steppes()
+{
+    Script* s;
+    s = new npc_ragged_john();
+    s->RegisterSelf();
+    s = new npc_grark_lorkrub();
+    s->RegisterSelf();
+    s = new spell_capture_grark();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ragged_john";
+    //pNewScript->GetAI = &GetAI_npc_ragged_john;
+    //pNewScript->pGossipHello =  &GossipHello_npc_ragged_john;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_ragged_john;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_grark_lorkrub";
+    //pNewScript->GetAI = &GetAI_npc_grark_lorkrub;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_grark_lorkrub;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_capture_grark;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp b/src/modules/SD3/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp
new file mode 100644
index 000000000..06a9a2122
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp
@@ -0,0 +1,304 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Mr_Smite
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Deadmines
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "deadmines.h"
+
+enum
+{
+    SAY_PHASE_2                     = -1036002,
+    SAY_PHASE_3                     = -1036003,
+
+    EQUIP_ID_SWORD                  = 2179,                 // default equipment
+    EQUIP_ID_AXE                    = 2183,
+    EQUIP_ID_HAMMER                 = 10756,
+
+    SPELL_NIBLE_REFLEXES            = 6433,                 // removed after phase 1
+    SPELL_SMITE_SLAM                = 6435,                 // only casted in phase 3
+    SPELL_SMITE_STOMP               = 6432,
+    SPELL_SMITE_HAMMER              = 6436,                 // unclear, not casted in sniff
+    SPELL_THRASH                    = 12787,                // only casted in phase 2; unclear, 3391 directly casted in sniff
+
+    PHASE_1                         = 1,
+    PHASE_2                         = 2,
+    PHASE_3                         = 3,
+    PHASE_EQUIP_NULL                = 4,
+    PHASE_EQUIP_START               = 5,
+    PHASE_EQUIP_PROCESS             = 6,
+    PHASE_EQUIP_END                 = 7,
+};
+
+struct boss_mr_smite : public CreatureScript
+{
+    boss_mr_smite() : CreatureScript("boss_mr_smite") {}
+
+    struct boss_mr_smiteAI : public ScriptedAI
+    {
+        boss_mr_smiteAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiPhase;
+        uint32 m_uiEquipTimer;
+        uint32 m_uiSlamTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_1;
+            m_uiEquipTimer = 0;
+            m_uiSlamTimer = 9000;
+
+            DoCastSpellIfCan(m_creature, SPELL_NIBLE_REFLEXES, CAST_TRIGGERED);
+
+            // must assume database has the default equipment set
+            SetEquipmentSlots(false, EQUIP_ID_SWORD, EQUIP_UNEQUIP);
+        }
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            if (m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiPhase > PHASE_3)
+            {
+                return;
+            }
+
+            AttackStart(pAttacker);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_uiPhase > PHASE_3)
+            {
+                return;
+            }
+
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+
+                m_creature->GetMotionMaster()->MoveChase(pWho);
+            }
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 /*uiPointId*/) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            m_creature->SetSheath(SHEATH_STATE_UNARMED);
+            m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+
+            m_uiEquipTimer = 3000;
+            m_uiPhase = PHASE_EQUIP_PROCESS;
+        }
+
+        void PhaseEquipStart()
+        {
+            ScriptedInstance* pInstance = (ScriptedInstance*)m_creature->GetInstanceData();
+
+            if (!pInstance)
+            {
+                return;
+            }
+
+            GameObject* pChest = pInstance->GetSingleGameObjectFromStorage(GO_SMITE_CHEST);
+
+            if (!pChest)
+            {
+                return;
+            }
+
+            m_uiPhase = PHASE_EQUIP_NULL;
+
+            float fX, fY, fZ;
+            pChest->GetContactPoint(m_creature, fX, fY, fZ, CONTACT_DISTANCE);
+
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->SetFacingToObject(pChest);
+            m_creature->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+        }
+
+        void PhaseEquipProcess()
+        {
+            if (m_creature->GetHealthPercent() < 33.0f)
+            {
+                // It's Hammer, go Hammer!
+                SetEquipmentSlots(false, EQUIP_ID_HAMMER, EQUIP_UNEQUIP);
+                DoCastSpellIfCan(m_creature, SPELL_SMITE_HAMMER);
+            }
+            else
+            {
+                SetEquipmentSlots(false, EQUIP_ID_AXE, EQUIP_ID_AXE);
+            }
+
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            m_uiPhase = PHASE_EQUIP_END;
+            m_uiEquipTimer = 1000;
+        }
+
+        void PhaseEquipEnd()
+        {
+            // We don't have getVictim, so select from threat list
+            Unit* pVictim = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0);
+
+            if (!pVictim)
+            {
+                EnterEvadeMode();
+                return;
+            }
+
+            m_creature->SetSheath(SHEATH_STATE_MELEE);
+
+            m_uiPhase = m_creature->GetHealthPercent() < 33.0f ? PHASE_3 : PHASE_2;
+
+            if (m_uiPhase == PHASE_2)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_THRASH, CAST_TRIGGERED);
+            }
+
+            AttackStart(pVictim);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (m_uiEquipTimer)
+                {
+                    // decrease the cooldown in between equipment change phases
+                    if (m_uiEquipTimer > uiDiff)
+                    {
+                        m_uiEquipTimer -= uiDiff;
+                        return;
+                    }
+                    else
+                    {
+                        m_uiEquipTimer = 0;
+                    }
+                }
+
+                switch (m_uiPhase)
+                {
+                case PHASE_EQUIP_START:
+                    PhaseEquipStart();
+                    break;
+                case PHASE_EQUIP_PROCESS:
+                    PhaseEquipProcess();
+                    break;
+                case PHASE_EQUIP_END:
+                    PhaseEquipEnd();
+                    break;
+                }
+
+                return;
+            }
+
+            // the normal combat phases
+            switch (m_uiPhase)
+            {
+            case PHASE_1:
+                if (m_creature->GetHealthPercent() < 66.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SMITE_STOMP) == CAST_OK)
+                    {
+                        DoScriptText(m_creature->GetHealthPercent() < 33.0f ? SAY_PHASE_3 : SAY_PHASE_2, m_creature);
+                        m_uiPhase = PHASE_EQUIP_START;
+                        m_uiEquipTimer = 2500;
+
+                        // will clear getVictim (m_attacking)
+                        m_creature->AttackStop(true);
+                        m_creature->RemoveAurasDueToSpell(SPELL_NIBLE_REFLEXES);
+                    }
+                    return;
+                }
+                break;
+            case PHASE_2:
+                if (m_creature->GetHealthPercent() < 33.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SMITE_STOMP) == CAST_OK)
+                    {
+                        DoScriptText(SAY_PHASE_3, m_creature);
+                        m_uiPhase = PHASE_EQUIP_START;
+                        m_uiEquipTimer = 2500;
+
+                        // will clear getVictim (m_attacking)
+                        m_creature->AttackStop(true);
+                        m_creature->RemoveAurasDueToSpell(SPELL_THRASH);
+                    }
+                    return;
+                }
+                break;
+            case PHASE_3:
+                if (m_uiSlamTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SMITE_SLAM) == CAST_OK)
+                    {
+                        m_uiSlamTimer = 11000;
+                    }
+                }
+                else
+                {
+                    m_uiSlamTimer -= uiDiff;
+                }
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_mr_smiteAI(pCreature);
+    }
+};
+
+void AddSC_boss_mr_smite()
+{
+    Script *s;
+    s = new boss_mr_smite();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_mr_smite";
+    //pNewScript->GetAI = &GetAI_boss_mr_smite;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/deadmines/deadmines.cpp b/src/modules/SD3/scripts/eastern_kingdoms/deadmines/deadmines.cpp
new file mode 100644
index 000000000..c2f44b929
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/deadmines/deadmines.cpp
@@ -0,0 +1,72 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Deadmines
+ * SD%Complete: 100
+ * SDComment:   Contains GO for Iron Clad door event
+ * SDCategory:  Deadmines
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "deadmines.h"
+
+struct go_defias_cannon : public GameObjectScript
+{
+    go_defias_cannon() : GameObjectScript("go_defias_cannon") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+
+        if (!pInstance)
+        {
+            return false;
+        }
+
+        if (pInstance->GetData(TYPE_IRON_CLAD_DOOR) == DONE)
+        {
+            return false;
+        }
+
+        pInstance->SetData(TYPE_IRON_CLAD_DOOR, DONE);
+        return false;   //TODO check it; true?
+    }
+};
+
+void AddSC_deadmines()
+{
+    Script *s;
+    s = new go_defias_cannon();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_defias_cannon";
+    //pNewScript->pGOUse = &GOUse_go_defias_cannon;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/deadmines/deadmines.h b/src/modules/SD3/scripts/eastern_kingdoms/deadmines/deadmines.h
new file mode 100644
index 000000000..a1062afcf
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/deadmines/deadmines.h
@@ -0,0 +1,62 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_DEADMINES_H
+#define DEF_DEADMINES_H
+
+enum
+{
+    MAX_ENCOUNTER           = 4,
+
+    TYPE_RHAHKZOR           = 0,
+    TYPE_SNEED              = 1,
+    TYPE_GILNID             = 2,
+    TYPE_IRON_CLAD_DOOR     = 3,
+
+    INST_SAY_ALARM1         = -1036000,
+    INST_SAY_ALARM2         = -1036001,
+
+    GO_FACTORY_DOOR         = 13965,                        // rhahk'zor
+    GO_MAST_ROOM_DOOR       = 16400,                        // sneed
+    GO_FOUNDRY_DOOR         = 16399,                        // gilnid
+    GO_HEAVY_DOOR_1         = 17153,                        // to sneed
+    GO_HEAVY_DOOR_2         = 17154,                        // to gilnid
+    GO_IRON_CLAD_DOOR       = 16397,
+    GO_DEFIAS_CANNON        = 16398,
+    GO_SMITE_CHEST          = 144111,                       // use to get correct location of mr.smites equipment changes
+    GO_MYSTERIOUS_CHEST     = 180024,                       // used for quest 7938; spawns in the instance only if one of the players has the quest
+
+    NPC_RHAHKZOR            = 644,
+    NPC_SNEED               = 643,
+    NPC_GILNID              = 1763,
+    NPC_MR_SMITE            = 646,
+    NPC_PIRATE              = 657,
+    NPC_SQUALLSHAPER        = 1732,
+
+    QUEST_FORTUNE_AWAITS    = 7938,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp b/src/modules/SD3/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp
new file mode 100644
index 000000000..253630c7b
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp
@@ -0,0 +1,295 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Deadmines
+ * SD%Complete: 0
+ * SDComment:   Placeholder
+ * SDCategory:  Deadmines
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "deadmines.h"
+
+struct is_deadmines : public InstanceScript
+{
+    is_deadmines() : InstanceScript("instance_deadmines") {}
+
+    class instance_deadmines : public ScriptedInstance
+    {
+    public:
+        instance_deadmines(Map* pMap) : ScriptedInstance(pMap),
+            m_uiIronDoorTimer(0),
+            m_uiDoorStep(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            // Respawn the Mysterious chest if one of the players who enter the instance has the quest in his log
+            if (pPlayer->GetQuestStatus(QUEST_FORTUNE_AWAITS) == QUEST_STATUS_COMPLETE &&
+                !pPlayer->GetQuestRewardStatus(QUEST_FORTUNE_AWAITS))
+            {
+                DoRespawnGameObject(GO_MYSTERIOUS_CHEST, HOUR);
+            }
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_MR_SMITE)
+            {
+                m_mNpcEntryGuidStore[NPC_MR_SMITE] = pCreature->GetObjectGuid();
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_FACTORY_DOOR:
+                if (m_auiEncounter[TYPE_RHAHKZOR] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+
+                break;
+            case GO_MAST_ROOM_DOOR:
+                if (m_auiEncounter[TYPE_SNEED] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+
+                break;
+            case GO_FOUNDRY_DOOR:
+                if (m_auiEncounter[TYPE_GILNID] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+
+                break;
+            case GO_IRON_CLAD_DOOR:
+                if (m_auiEncounter[TYPE_IRON_CLAD_DOOR] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
+                }
+
+                break;
+            case GO_DEFIAS_CANNON:
+            case GO_SMITE_CHEST:
+            case GO_MYSTERIOUS_CHEST:
+                break;
+
+            default:
+                return;
+            }
+
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_RHAHKZOR:
+                SetData(TYPE_RHAHKZOR, DONE);
+                break;
+            case NPC_SNEED:
+                SetData(TYPE_SNEED, DONE);
+                break;
+            case NPC_GILNID:
+                SetData(TYPE_GILNID, DONE);
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_RHAHKZOR:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_FACTORY_DOOR);
+                }
+                break;
+            case TYPE_SNEED:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_MAST_ROOM_DOOR);
+                }
+                break;
+            case TYPE_GILNID:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_FOUNDRY_DOOR);
+                }
+                break;
+            case TYPE_IRON_CLAD_DOOR:
+                // delayed door animation to sync with Defias Cannon animation
+                if (uiData == DONE)
+                {
+                    m_uiIronDoorTimer = 500;
+                }
+                break;
+            }
+
+            m_auiEncounter[uiType] = uiData;
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_uiIronDoorTimer)
+            {
+                if (m_uiIronDoorTimer <= uiDiff)
+                {
+                    switch (m_uiDoorStep)
+                    {
+                    case 0:
+                        DoUseDoorOrButton(GO_IRON_CLAD_DOOR, 0, true);
+
+                        if (Creature* pMrSmite = GetSingleCreatureFromStorage(NPC_MR_SMITE))
+                        {
+                            DoScriptText(INST_SAY_ALARM1, pMrSmite);
+                        }
+
+                        if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_IRON_CLAD_DOOR))
+                        {
+                            // should be static spawns, fetch the closest ones at the pier
+                            if (Creature* pi1 = GetClosestCreatureWithEntry(pDoor, NPC_PIRATE, 40.0f))
+                            {
+                                pi1->SetWalk(false);
+                                pi1->GetMotionMaster()->MovePoint(0, pDoor->GetPositionX(), pDoor->GetPositionY(), pDoor->GetPositionZ());
+                            }
+
+                            if (Creature* pi2 = GetClosestCreatureWithEntry(pDoor, NPC_SQUALLSHAPER, 40.0f))
+                            {
+                                pi2->SetWalk(false);
+                                pi2->GetMotionMaster()->MovePoint(0, pDoor->GetPositionX(), pDoor->GetPositionY(), pDoor->GetPositionZ());
+                            }
+                        }
+
+                        ++m_uiDoorStep;
+                        m_uiIronDoorTimer = 15000;
+                        break;
+                    case 1:
+                        if (Creature* pMrSmite = GetSingleCreatureFromStorage(NPC_MR_SMITE))
+                        {
+                            DoScriptText(INST_SAY_ALARM2, pMrSmite);
+                        }
+
+                        m_uiDoorStep = 0;
+                        m_uiIronDoorTimer = 0;
+                        break;
+                    }
+                }
+                else
+                {
+                    m_uiIronDoorTimer -= uiDiff;
+                }
+            }
+        }
+
+    private:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiIronDoorTimer;
+        uint32 m_uiDoorStep;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_deadmines(pMap);
+    }
+};
+
+void AddSC_instance_deadmines()
+{
+    Script* s;
+    s = new is_deadmines();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_deadmines";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_deadmines;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/dun_morogh.cpp b/src/modules/SD3/scripts/eastern_kingdoms/dun_morogh.cpp
new file mode 100644
index 000000000..fd033f211
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/dun_morogh.cpp
@@ -0,0 +1,45 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Dun_Morogh
+ * SD%Complete: 0
+ * SDComment:   Placeholder
+ * SDCategory:  Dun Morogh
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+void AddSC_dun_morogh()
+{
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/eastern_plaguelands.cpp b/src/modules/SD3/scripts/eastern_kingdoms/eastern_plaguelands.cpp
new file mode 100644
index 000000000..49980860c
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/eastern_plaguelands.cpp
@@ -0,0 +1,386 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Eastern_Plaguelands
+ * SD%Complete: 100
+ * SDComment:   Quest support: 7622.
+ * SDCategory:  Eastern Plaguelands
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_eris_havenfire
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+/*######
+## npc_eris_havenfire
+######*/
+
+enum
+{
+    SAY_PHASE_HEAL                      = -1000815,
+    SAY_EVENT_END                       = -1000816,
+    SAY_EVENT_FAIL_1                    = -1000817,
+    SAY_EVENT_FAIL_2                    = -1000818,
+    SAY_PEASANT_APPEAR_1                = -1000819,
+    SAY_PEASANT_APPEAR_2                = -1000820,
+    SAY_PEASANT_APPEAR_3                = -1000821,
+
+    // SPELL_DEATHS_DOOR                 = 23127,           // damage spells cast on the peasants
+    // SPELL_SEETHING_PLAGUE             = 23072,
+    SPELL_ENTER_THE_LIGHT_DND           = 23107,
+    SPELL_BLESSING_OF_NORDRASSIL        = 23108,
+
+    NPC_INJURED_PEASANT                 = 14484,
+    NPC_PLAGUED_PEASANT                 = 14485,
+    NPC_SCOURGE_ARCHER                  = 14489,
+    NPC_SCOURGE_FOOTSOLDIER             = 14486,
+    NPC_THE_CLEANER                     = 14503,            // can be summoned if the priest has more players in the party for help. requires further research
+
+    QUEST_BALANCE_OF_LIGHT_AND_SHADOW   = 7622,
+
+    MAX_PEASANTS                        = 13,
+    MAX_ARCHERS                         = 8,
+    MAX_PEASANTS_TO_SAVE                = 50,
+    MAX_PEASANTS_TO_DIE                 = 15,
+};
+
+static const float aArcherSpawn[8][4] =
+{
+    {3327.42f, -3021.11f, 170.57f, 6.01f},
+    {3335.4f,  -3054.3f,  173.63f, 0.49f},
+    {3351.3f,  -3079.08f, 178.67f, 1.15f},
+    {3358.93f, -3076.1f,  174.87f, 1.57f},
+    {3371.58f, -3069.24f, 175.20f, 1.99f},
+    {3369.46f, -3023.11f, 171.83f, 3.69f},
+    {3383.25f, -3057.01f, 181.53f, 2.21f},
+    {3380.03f, -3062.73f, 181.90f, 2.31f},
+};
+
+static const float aPeasantSpawnLoc[3] = {3360.12f, -3047.79f, 165.26f};
+static const float aPeasantMoveLoc[3] = {3335.0f, -2994.04f, 161.14f};
+
+static const int32 aPeasantSpawnYells[3] = {SAY_PEASANT_APPEAR_1, SAY_PEASANT_APPEAR_2, SAY_PEASANT_APPEAR_3};
+
+struct npc_eris_havenfire : public CreatureScript
+{
+    npc_eris_havenfire() : CreatureScript("npc_eris_havenfire") {}
+
+    struct npc_eris_havenfireAI : public ScriptedAI
+    {
+        npc_eris_havenfireAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiEventTimer;
+        uint32 m_uiSadEndTimer;
+        uint8 m_uiPhase;
+        uint8 m_uiCurrentWave;
+        uint8 m_uiKillCounter;
+        uint8 m_uiSaveCounter;
+
+        ObjectGuid m_playerGuid;
+        GuidList m_lSummonedGuidList;
+
+        void Reset() override
+        {
+            m_uiEventTimer = 0;
+            m_uiSadEndTimer = 0;
+            m_uiPhase = 0;
+            m_uiCurrentWave = 0;
+            m_uiKillCounter = 0;
+            m_uiSaveCounter = 0;
+
+            m_playerGuid.Clear();
+            m_lSummonedGuidList.clear();
+            m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_INJURED_PEASANT:
+            case NPC_PLAGUED_PEASANT:
+                {
+                    float fX, fY, fZ;
+                    pSummoned->GetRandomPoint(aPeasantMoveLoc[0], aPeasantMoveLoc[1], aPeasantMoveLoc[2], 10.0f, fX, fY, fZ);
+                    pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                }
+                break;
+            case NPC_SCOURGE_FOOTSOLDIER:
+            case NPC_THE_CLEANER:
+                if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                {
+                    pSummoned->AI()->AttackStart(pPlayer);
+                }
+                break;
+            case NPC_SCOURGE_ARCHER:    // these should attack the peasants - who are not spawned yet
+                //{
+                //    std::vector<ObjectGuid> peasantGUID;
+                //    for (GuidList::const_iterator it = m_lSummonedGuidList.begin(); it != m_lSummonedGuidList.end(); ++it)
+                //    {
+                //        if ((*it).GetEntry() == NPC_INJURED_PEASANT || (*it).GetEntry() == NPC_PLAGUED_PEASANT)
+                //        {
+                //            if (Creature* peasant = m_creature->GetMap()->GetCreature(*it))
+                //                if (peasant->IsAlive() && pSummoned->IsInRange(peasant, 5.0f, 30.0f))
+                //                    peasantGUID.push_back(*it);
+                //        }
+                //    }
+                //    ObjectGuid victimGUID = peasantGUID[urand(0, peasantGUID.size() - 1)];
+                //    if (Creature* victim = m_creature->GetMap()->GetCreature(victimGUID))
+                //        pSummoned->AI()->AttackStart(victim);   // ot Creature::Attack(victim, false) ?
+                //}
+                break;
+            }
+
+            m_lSummonedGuidList.push_back(pSummoned->GetObjectGuid());
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || uiPointId != 1)
+            {
+                return;
+            }
+
+            ++m_uiSaveCounter;
+            pSummoned->GetMotionMaster()->Clear();
+
+            pSummoned->RemoveAllAuras();
+            pSummoned->CastSpell(pSummoned, SPELL_ENTER_THE_LIGHT_DND, false);
+            pSummoned->ForcedDespawn(10000);
+            m_lSummonedGuidList.remove(pSummoned->GetObjectGuid());
+
+            // Event ended
+            if (m_uiSaveCounter >= MAX_PEASANTS_TO_SAVE)
+            {
+                DoBalanceEventEnd();
+            }
+            // Phase ended
+            else if (m_uiSaveCounter + m_uiKillCounter == m_uiCurrentWave * MAX_PEASANTS)
+            {
+                DoHandlePhaseEnd();
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_INJURED_PEASANT || pSummoned->GetEntry() == NPC_PLAGUED_PEASANT)
+            {
+                ++m_uiKillCounter;
+
+                // If more than 15 peasants have died, then fail the quest
+                if (m_uiKillCounter >= MAX_PEASANTS_TO_DIE)
+                {
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                    {
+                        pPlayer->FailQuest(QUEST_BALANCE_OF_LIGHT_AND_SHADOW);
+                    }
+
+                    DoScriptText(SAY_EVENT_FAIL_1, m_creature);
+                    m_uiSadEndTimer = 1*IN_MILLISECONDS;
+                    m_uiEventTimer = 0;
+                }
+                else if (m_uiSaveCounter + m_uiKillCounter == m_uiCurrentWave * MAX_PEASANTS)
+                {
+                    DoHandlePhaseEnd();
+                }
+            }
+            m_lSummonedGuidList.remove(pSummoned->GetObjectGuid());
+        }
+
+        void DoSummonWave(uint32 uiSummonId = 0)
+        {
+            float fX, fY, fZ;
+
+            switch (uiSummonId)
+            {
+            case NPC_SCOURGE_FOOTSOLDIER:
+                {
+                    uint8 uiRand = urand(2, 3);
+                    for (uint8 i = 0; i < uiRand; ++i)
+                    {
+                        m_creature->GetRandomPoint(aPeasantSpawnLoc[0], aPeasantSpawnLoc[1], aPeasantSpawnLoc[2], 15.0f, fX, fY, fZ);
+                        m_creature->SummonCreature(NPC_SCOURGE_FOOTSOLDIER, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                    }
+                }
+                break;
+            case NPC_SCOURGE_ARCHER:
+                for (uint8 i = 0; i < MAX_ARCHERS; ++i)
+                    m_creature->SummonCreature(NPC_SCOURGE_ARCHER, aArcherSpawn[i][0], aArcherSpawn[i][1], aArcherSpawn[i][2], aArcherSpawn[i][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                break;
+            default:
+                for (uint8 i = 0; i < MAX_PEASANTS; ++i)
+                {
+                    uint32 uiSummonEntry = roll_chance_i(70) ? NPC_INJURED_PEASANT : NPC_PLAGUED_PEASANT;
+                    m_creature->GetRandomPoint(aPeasantSpawnLoc[0], aPeasantSpawnLoc[1], aPeasantSpawnLoc[2], 10.0f, fX, fY, fZ);
+                    if (Creature* pTemp = m_creature->SummonCreature(uiSummonEntry, fX, fY, fZ, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 10*MINUTE*IN_MILLISECONDS))
+                    {
+                        // Only the first mob needs to yell
+                        if (!i)
+                            DoScriptText(aPeasantSpawnYells[urand(0, 2)], pTemp);
+                    }
+                }
+
+                ++m_uiCurrentWave;
+                break;
+            }
+        }
+
+        void DoHandlePhaseEnd()
+        {
+            if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+            {
+                pPlayer->CastSpell(pPlayer, SPELL_BLESSING_OF_NORDRASSIL, true);
+            }
+
+            DoScriptText(SAY_PHASE_HEAL, m_creature);
+
+            // Send next wave
+            if (m_uiCurrentWave < 5)
+            {
+                DoSummonWave();
+            }
+        }
+
+        void DoStartBalanceEvent(Player* pPlayer)
+        {
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+            m_playerGuid = pPlayer->GetObjectGuid();
+            m_uiEventTimer = 5000;
+        }
+
+        void DoBalanceEventEnd()
+        {
+            if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+            {
+                pPlayer->AreaExploredOrEventHappens(QUEST_BALANCE_OF_LIGHT_AND_SHADOW);
+            }
+
+            DoScriptText(SAY_EVENT_END, m_creature);
+            DoDespawnSummons(true);
+            EnterEvadeMode();
+        }
+
+        void DoDespawnSummons(bool bIsEventEnd = false)
+        {
+            for (GuidList::const_iterator itr = m_lSummonedGuidList.begin(); itr != m_lSummonedGuidList.end(); ++itr)
+            {
+                if (bIsEventEnd && ((*itr).GetEntry() == NPC_INJURED_PEASANT || (*itr).GetEntry() == NPC_PLAGUED_PEASANT))
+                    continue;
+
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                    if (pTemp->IsAlive())
+                        pTemp->ForcedDespawn();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiEventTimer)
+            {
+                if (m_uiEventTimer <= uiDiff)
+                {
+                    switch (m_uiPhase)
+                    {
+                    case 0:
+                        DoSummonWave(NPC_SCOURGE_ARCHER);
+                        m_uiEventTimer = 5000;
+                        break;
+                    case 1:
+                        DoSummonWave();
+                        m_uiEventTimer = urand(60000, 80000);
+                        break;
+                    default:
+                        // The summoning timer of the soldiers isn't very clear
+                        DoSummonWave(NPC_SCOURGE_FOOTSOLDIER);
+                        m_uiEventTimer = urand(5000, 30000);
+                        break;
+                    }
+                    ++m_uiPhase;
+                }
+                else
+                {
+                    m_uiEventTimer -= uiDiff;
+                }
+            }
+
+            // Handle event end in case of fail
+            if (m_uiSadEndTimer)
+            {
+                if (m_uiSadEndTimer <= uiDiff)
+                {
+                    DoScriptText(SAY_EVENT_FAIL_2, m_creature);
+                    m_creature->ForcedDespawn(5000);
+                    DoDespawnSummons();
+                    m_uiSadEndTimer = 0;
+                    EnterEvadeMode();
+                }
+                else
+                {
+                    m_uiSadEndTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_eris_havenfireAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_BALANCE_OF_LIGHT_AND_SHADOW)
+        {
+            if (npc_eris_havenfireAI* pErisAI = dynamic_cast<npc_eris_havenfireAI*>(pCreature->AI()))
+            {
+                pErisAI->DoStartBalanceEvent(pPlayer);
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_eastern_plaguelands()
+{
+    Script* s;
+    s = new npc_eris_havenfire();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_eris_havenfire";
+    //pNewScript->GetAI = &GetAI_npc_eris_havenfire;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_eris_havenfire;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/elwynn_forest.cpp b/src/modules/SD3/scripts/eastern_kingdoms/elwynn_forest.cpp
new file mode 100644
index 000000000..88654bcec
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/elwynn_forest.cpp
@@ -0,0 +1,45 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Elwynn_Forest
+ * SD%Complete: 0
+ * SDComment:   Placeholder
+ * SDCategory:  Elwynn Forest
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+void AddSC_elwynn_forest()
+{
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/eversong_woods.cpp b/src/modules/SD3/scripts/eastern_kingdoms/eversong_woods.cpp
new file mode 100644
index 000000000..b383e5325
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/eversong_woods.cpp
@@ -0,0 +1,663 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Eversong_Woods
+SD%Complete: 100
+SDComment: Quest support: 8483, 8488, 8490, 9686
+SDCategory: Eversong Woods
+EndScriptData */
+
+/* ContentData
+npc_kelerun_bloodmourn
+go_harbinger_second_trial
+npc_prospector_anvilward
+npc_apprentice_mirveda
+npc_infused_crystal
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "TemporarySummon.h"
+
+/*######
+## npc_kelerun_bloodmourn
+######*/
+
+enum
+{
+    NPC_KELERUN        = 17807,
+    NPC_BLOODWRATH     = 17809,
+    NPC_LIGHTREND      = 17810,
+    NPC_SWIFTBLADE     = 17811,
+    NPC_SUNSTRIKER     = 17812,
+
+    GO_SECOND_TRIAL    = 182052,
+    QUEST_SECOND_TRIAL = 9686,
+    MAX_CHALLENGER     = 4
+};
+
+const uint32 uiChallengerId[4] = {NPC_BLOODWRATH, NPC_LIGHTREND, NPC_SWIFTBLADE, NPC_SUNSTRIKER};
+
+const int32 uiSayId[4] =
+{
+    -1000319,
+    -1000320,
+    -1000321,
+    -1000322
+};
+
+float fChallengerLoc[4][4] =
+{
+    {10110.667f, -6628.059f, 4.100f, 2.708f},
+    {10093.919f, -6634.340f, 4.098f, 1.106f},
+    {10087.565f, -6617.282f, 4.098f, 5.887f},
+    {10104.807f, -6611.145f, 4.101f, 4.265f}
+};
+
+struct npc_kelerun_bloodmourn : public CreatureScript
+{
+    npc_kelerun_bloodmourn() : CreatureScript("npc_kelerun_bloodmourn") {}
+
+    struct npc_kelerun_bloodmournAI : public ScriptedAI
+    {
+        npc_kelerun_bloodmournAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_uiNpcFlags = pCreature->GetUInt32Value(UNIT_NPC_FLAGS);
+        }
+
+        uint32 m_uiNpcFlags;
+        ObjectGuid m_playerGuid;
+        ObjectGuid m_aChallengerGuids[MAX_CHALLENGER];
+
+        uint8 m_uiChallengerCount;
+
+        uint32 m_uiTimeOutTimer;
+        uint32 m_uiCheckAliveStateTimer;
+        uint32 m_uiEngageTimer;
+
+        bool m_bIsEventInProgress;
+
+        void Reset() override
+        {
+            m_creature->SetUInt32Value(UNIT_NPC_FLAGS, m_uiNpcFlags);
+
+            m_playerGuid.Clear();
+
+            m_uiChallengerCount = 0;
+
+            m_uiTimeOutTimer = 60000;
+            m_uiCheckAliveStateTimer = 2500;
+            m_uiEngageTimer = 0;
+
+            m_bIsEventInProgress = false;
+            for (uint8 i = 0; i < MAX_CHALLENGER; ++i)          // Despawn challengers
+            {
+                if (Creature* pChallenger = m_creature->GetMap()->GetCreature(m_aChallengerGuids[i]))
+                {
+                    pChallenger->ForcedDespawn(1000);
+                }
+                m_aChallengerGuids[i].Clear();
+            }
+        }
+
+        void StartEvent()
+        {
+            m_creature->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+            m_bIsEventInProgress = true;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit *pInvoker, uint32 data) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+                CanProgressEvent(pInvoker->ToPlayer());
+        }
+
+        bool CanProgressEvent(Player* pPlayer)
+        {
+            if (m_bIsEventInProgress)
+            {
+                m_playerGuid = pPlayer->GetObjectGuid();
+                DoSpawnChallengers();
+                m_uiEngageTimer = 15000;
+
+                return true;
+            }
+
+            return false;
+        }
+
+        void DoSpawnChallengers()
+        {
+            for (uint8 i = 0; i < MAX_CHALLENGER; ++i)
+            {
+                if (Creature* pCreature = m_creature->SummonCreature(uiChallengerId[i],
+                    fChallengerLoc[i][0], fChallengerLoc[i][1],
+                    fChallengerLoc[i][2], fChallengerLoc[i][3],
+                    TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 600000))
+                {
+                    m_aChallengerGuids[i] = pCreature->GetObjectGuid();
+                    pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_bIsEventInProgress)
+            {
+                if (m_uiTimeOutTimer)
+                {
+                    if (m_uiTimeOutTimer <= uiDiff)
+                    {
+                        if (!m_playerGuid)                      // player are expected to use GO within a minute, if not, event will fail.
+                        {
+                            Reset();
+                            return;
+                        }
+                        m_uiTimeOutTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiTimeOutTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiCheckAliveStateTimer < uiDiff)
+                {
+                    Creature* pChallenger = m_creature->GetMap()->GetCreature(m_aChallengerGuids[m_uiChallengerCount]);
+                    if (pChallenger && !pChallenger->IsAlive())
+                    {
+                        Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+                        if (!pPlayer || !pPlayer->IsAlive())
+                        {
+                            Reset();
+                            return;
+                        }
+
+                        ++m_uiChallengerCount;
+
+                        // count starts at 0
+                        if (m_uiChallengerCount == MAX_CHALLENGER)
+                        {
+                            pPlayer->GroupEventHappens(QUEST_SECOND_TRIAL, m_creature);
+                            Reset();
+                            return;
+                        }
+                        else
+                        {
+                            m_uiEngageTimer = 15000;
+                        }
+                    }
+                    m_uiCheckAliveStateTimer = 2500;
+                }
+                else
+                {
+                    m_uiCheckAliveStateTimer -= uiDiff;
+                }
+
+                if (m_uiEngageTimer)
+                {
+                    if (m_uiEngageTimer <= uiDiff)
+                    {
+                        Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+                        if (!pPlayer || !pPlayer->IsAlive())
+                        {
+                            Reset();
+                            return;
+                        }
+
+                        if (Creature* pCreature = m_creature->GetMap()->GetCreature(m_aChallengerGuids[m_uiChallengerCount]))
+                        {
+                            DoScriptText(uiSayId[m_uiChallengerCount], m_creature, pPlayer);
+                            pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                            pCreature->AI()->AttackStart(pPlayer);
+                        }
+
+                        m_uiEngageTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiEngageTimer -= uiDiff;
+                    }
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kelerun_bloodmournAI(pCreature);
+    }
+
+    // easiest way is to expect database to respawn GO at quest accept (quest_start_script)
+    bool OnQuestAccept(Player* /*pPlayer*/, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_SECOND_TRIAL)
+        {
+            if (npc_kelerun_bloodmournAI* pKelrunAI = dynamic_cast<npc_kelerun_bloodmournAI*>(pCreature->AI()))
+            {
+                pKelrunAI->StartEvent();
+            }
+        }
+
+        return true;
+    }
+};
+
+struct go_harbinger_second_trial : public GameObjectScript
+{
+    go_harbinger_second_trial() : GameObjectScript("go_harbinger_second_trial") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGO) override
+    {
+        if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER)
+        {
+            if (Creature* pCreature = GetClosestCreatureWithEntry(pGO, NPC_KELERUN, 30.0f))
+            {
+                if (CreatureAI* pKelrunAI = pCreature->AI())
+                {
+                    pKelrunAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pCreature, pPlayer, 0);
+                }
+            }
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_prospector_anvilward
+######*/
+enum
+{
+    SAY_ANVIL1            = -1000209,
+    SAY_ANVIL2            = -1000210,
+
+    GOSSIP_ITEM_MOMENT    = -3000108,
+    GOSSIP_ITEM_SHOW      = -3000110,
+
+    GOSSIP_TEXT_ID_MOMENT = 8239,
+    GOSSIP_TEXT_ID_SHOW   = 8240,
+
+    FACTION_HOSTILE       = 24,
+
+    QUEST_THE_DWARVEN_SPY = 8483
+};
+
+struct npc_prospector_anvilward : public CreatureScript
+{
+    npc_prospector_anvilward() : CreatureScript("npc_prospector_anvilward") {}
+
+    struct npc_prospector_anvilwardAI : public npc_escortAI
+    {
+        // CreatureAI functions
+        npc_prospector_anvilwardAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        // Pure Virtual Functions
+        void WaypointReached(uint32 uiPointId) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 0:
+                DoScriptText(SAY_ANVIL1, m_creature, pPlayer);
+                break;
+            case 5:
+                DoScriptText(SAY_ANVIL2, m_creature, pPlayer);
+                break;
+            case 6:
+                m_creature->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_REACH_HOME | TEMPFACTION_RESTORE_RESPAWN);
+                AttackStart(pPlayer);
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_prospector_anvilwardAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_THE_DWARVEN_SPY) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MOMENT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_MOMENT, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SHOW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_SHOW, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+            if (npc_prospector_anvilwardAI* pEscortAI = dynamic_cast<npc_prospector_anvilwardAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer);
+            }
+
+            break;
+        }
+        return true;
+    }
+};
+
+/*######
+## npc_apprentice_mirveda
+######*/
+
+enum
+{
+    QUEST_UNEXPECTED_RESULT = 8488,
+
+    SPELL_FIREBALL          = 20811,
+
+    NPC_GHARSUL             = 15958,
+    NPC_ANGERSHADE          = 15656
+};
+
+struct npc_apprentice_mirveda : public CreatureScript
+{
+    npc_apprentice_mirveda() : CreatureScript("npc_apprentice_mirveda") {}
+
+    struct npc_apprentice_mirvedaAI : public ScriptedAI
+    {
+        npc_apprentice_mirvedaAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint8 m_uiMobCount;
+        uint32 m_uiFireballTimer;
+        ObjectGuid m_playerGuid;
+
+        void Reset() override
+        {
+            m_uiMobCount = 0;
+            m_playerGuid.Clear();
+            m_uiFireballTimer = 0;
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+
+            if (pPlayer && pPlayer->GetQuestStatus(QUEST_UNEXPECTED_RESULT) == QUEST_STATUS_INCOMPLETE)
+            {
+                pPlayer->SendQuestFailed(QUEST_UNEXPECTED_RESULT);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+            ++m_uiMobCount;
+        }
+
+        void SummonedCreatureJustDied(Creature* /*pKilled*/) override
+        {
+            --m_uiMobCount;
+
+            if (m_uiMobCount)
+            {
+                return;
+            }
+
+            Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+
+            if (pPlayer && pPlayer->GetQuestStatus(QUEST_UNEXPECTED_RESULT) == QUEST_STATUS_INCOMPLETE)
+            {
+                pPlayer->GroupEventHappens(QUEST_UNEXPECTED_RESULT, m_creature);
+            }
+
+            m_playerGuid.Clear();
+            m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+        }
+
+        void StartEvent(Player* pPlayer)
+        {
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+            m_playerGuid = pPlayer->GetObjectGuid();
+
+            m_creature->SummonCreature(NPC_GHARSUL, 8745.0f, -7134.32f, 35.22f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 4000);
+            m_creature->SummonCreature(NPC_ANGERSHADE, 8745.0f, -7134.32f, 35.22f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 4000);
+            m_creature->SummonCreature(NPC_ANGERSHADE, 8745.0f, -7134.32f, 35.22f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 4000);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiFireballTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FIREBALL) == CAST_OK)
+                {
+                    m_uiFireballTimer = urand(4000, 6000);
+                }
+            }
+            else
+            {
+                m_uiFireballTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_UNEXPECTED_RESULT)
+            if (npc_apprentice_mirvedaAI* pMirvedaAI = dynamic_cast<npc_apprentice_mirvedaAI*>(pCreature->AI()))
+            {
+                pMirvedaAI->StartEvent(pPlayer);
+            }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_apprentice_mirvedaAI(pCreature);
+    }
+};
+
+/*######
+## npc_infused_crystal
+######*/
+
+enum
+{
+    QUEST_POWERING_OUR_DEFENSES     = 8490,
+    SAY_DEFENSE_FINISH              = -1000668,
+    NPC_ENRAGED_WRAITH              = 17086,
+};
+
+static const float aSummonPos[6][4] =
+{
+    {8250.539f, -7239.028f, 139.7099f, 0.8975816f},
+    {8263.437f, -7181.188f, 139.4102f, 5.237229f},
+    {8317.124f, -7210.098f, 140.1064f, 3.022202f},
+    {8293.848f, -7179.062f, 138.6693f, 4.153376f},
+    {8239.229f, -7207.673f, 139.1196f, 0.06059111f},
+    {8301.548f, -7247.548f, 139.974f, 1.828518f}
+};
+
+struct npc_infused_crystal : public CreatureScript
+{
+    npc_infused_crystal() : CreatureScript("npc_infused_crystal") {}
+
+    struct npc_infused_crystalAI : public Scripted_NoMovementAI
+    {
+        npc_infused_crystalAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_bFirstWave = true;
+            m_uiWaveTimer = 1000;
+            m_uiKilledCount = 0;
+            m_uiFinishTimer = 60 * IN_MILLISECONDS;
+        }
+
+        bool m_bFirstWave;
+        uint32 m_uiWaveTimer;
+        uint8 m_uiKilledCount;
+        uint32 m_uiFinishTimer;
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void SummonedCreatureJustDied(Creature* /*pSummoned*/) override
+        {
+            ++m_uiKilledCount;
+
+            if (m_uiKilledCount == 3)
+            {
+                m_uiWaveTimer = std::min(m_uiWaveTimer, (uint32)10000);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiWaveTimer)
+            {
+                if (m_uiWaveTimer <= uiDiff)
+                {
+                    if (m_bFirstWave)
+                    {
+                        for (uint8 i = 0; i < 3; ++i)
+                        {
+                            m_creature->SummonCreature(NPC_ENRAGED_WRAITH, aSummonPos[i][0], aSummonPos[i][1], aSummonPos[i][2], aSummonPos[i][3], TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 5 * MINUTE);
+                        }
+                        m_uiWaveTimer = 29000;
+                        m_bFirstWave = false;
+                    }
+                    else
+                    {
+                        for (uint8 i = 3; i < 6; ++i)
+                        {
+                            m_creature->SummonCreature(NPC_ENRAGED_WRAITH, aSummonPos[i][0], aSummonPos[i][1], aSummonPos[i][2], aSummonPos[i][3], TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 5 * MINUTE);
+                        }
+                        m_uiWaveTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiWaveTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiFinishTimer)
+            {
+                if (m_uiFinishTimer <= uiDiff)
+                {
+                    DoScriptText(SAY_DEFENSE_FINISH, m_creature);
+                    if (m_creature->IsTemporarySummon())
+                    {
+                        TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+                        if (Player* pPlayer = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                        {
+                            pPlayer->KilledMonsterCredit(m_creature->GetEntry(), m_creature->GetObjectGuid());
+                        }
+                    }
+                    m_uiFinishTimer = 0;
+                    m_creature->ForcedDespawn(1000);
+                }
+                else
+                {
+                    m_uiFinishTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_infused_crystalAI(pCreature);
+    }
+};
+
+void AddSC_eversong_woods()
+{
+    Script* s;
+
+    s = new npc_kelerun_bloodmourn();
+    s->RegisterSelf();
+    s = new go_harbinger_second_trial();
+    s->RegisterSelf();
+    s = new npc_prospector_anvilward();
+    s->RegisterSelf();
+    s = new npc_apprentice_mirveda();
+    s->RegisterSelf();
+    s = new npc_infused_crystal();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kelerun_bloodmourn";
+    //pNewScript->GetAI = &GetAI_npc_kelerun_bloodmourn;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_kelerun_bloodmourn;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_harbinger_second_trial";
+    //pNewScript->pGOUse = &GOUse_go_harbinger_second_trial;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_prospector_anvilward";
+    //pNewScript->GetAI = &GetAI_npc_prospector_anvilward;
+    //pNewScript->pGossipHello =  &GossipHello_npc_prospector_anvilward;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_prospector_anvilward;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_apprentice_mirveda";
+    //pNewScript->GetAI = &GetAI_npc_apprentice_mirvedaAI;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_unexpected_results;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_infused_crystal";
+    //pNewScript->GetAI = &GetAI_npc_infused_crystalAI;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/ghostlands.cpp b/src/modules/SD3/scripts/eastern_kingdoms/ghostlands.cpp
new file mode 100644
index 000000000..e8d1a27fa
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/ghostlands.cpp
@@ -0,0 +1,197 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Ghostlands
+SD%Complete: 100
+SDComment: Quest support: 9212.
+SDCategory: Ghostlands
+EndScriptData */
+
+/* ContentData
+npc_ranger_lilatha
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_ranger_lilatha
+######*/
+
+enum
+{
+    SAY_START           = -1000140,
+    SAY_PROGRESS1       = -1000141,
+    SAY_PROGRESS2       = -1000142,
+    SAY_PROGRESS3       = -1000143,
+    SAY_END1            = -1000144,
+    SAY_END2            = -1000145,
+    CAPTAIN_ANSWER      = -1000146,
+
+    QUEST_CATACOMBS     = 9212,
+    GO_CAGE             = 181152,
+    NPC_CAPTAIN_HELIOS  = 16220,
+    FACTION_SMOON_E     = 1603,
+};
+
+struct npc_ranger_lilatha : public CreatureScript
+{
+    npc_ranger_lilatha() : CreatureScript("npc_ranger_lilatha") {}
+
+    struct npc_ranger_lilathaAI : public npc_escortAI
+    {
+        npc_ranger_lilathaAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        ObjectGuid m_goCageGuid;
+        ObjectGuid m_heliosGuid;
+
+        void MoveInLineOfSight(Unit* pUnit) override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                if (!m_heliosGuid && pUnit->GetEntry() == NPC_CAPTAIN_HELIOS)
+                {
+                    if (m_creature->IsWithinDistInMap(pUnit, 30.0f))
+                    {
+                        m_heliosGuid = pUnit->GetObjectGuid();
+                    }
+                }
+            }
+
+            npc_escortAI::MoveInLineOfSight(pUnit);
+        }
+
+        void WaypointReached(uint32 i) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            switch (i)
+            {
+            case 0:
+                if (GameObject* pGoTemp = GetClosestGameObjectWithEntry(m_creature, GO_CAGE, 10.0f))
+                {
+                    m_goCageGuid = pGoTemp->GetObjectGuid();
+                    pGoTemp->SetGoState(GO_STATE_ACTIVE);
+                }
+
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+
+                DoScriptText(SAY_START, m_creature, pPlayer);
+                break;
+            case 1:
+                if (GameObject* pGo = m_creature->GetMap()->GetGameObject(m_goCageGuid))
+                {
+                    pGo->SetGoState(GO_STATE_READY);
+                }
+                break;
+            case 5:
+                DoScriptText(SAY_PROGRESS1, m_creature, pPlayer);
+                break;
+            case 11:
+                DoScriptText(SAY_PROGRESS2, m_creature, pPlayer);
+                break;
+            case 18:
+                DoScriptText(SAY_PROGRESS3, m_creature, pPlayer);
+                if (Creature* pSum1 = m_creature->SummonCreature(16342, 7627.083984f, -7532.538086f, 152.128616f, 1.082733f, TEMPSUMMON_DEAD_DESPAWN, 0))
+                {
+                    pSum1->AI()->AttackStart(m_creature);
+                }
+                if (Creature* pSum2 = m_creature->SummonCreature(16343, 7620.432129f, -7532.550293f, 152.454865f, 0.827478f, TEMPSUMMON_DEAD_DESPAWN, 0))
+                {
+                    pSum2->AI()->AttackStart(pPlayer);
+                }
+                break;
+            case 19:
+                SetRun();
+                break;
+            case 25:
+                SetRun(false);
+                break;
+            case 30:
+                pPlayer->GroupEventHappens(QUEST_CATACOMBS, m_creature);
+                break;
+            case 32:
+                DoScriptText(SAY_END1, m_creature, pPlayer);
+                break;
+            case 33:
+                DoScriptText(SAY_END2, m_creature, pPlayer);
+                if (Creature* pHelios = m_creature->GetMap()->GetCreature(m_heliosGuid))
+                {
+                    DoScriptText(CAPTAIN_ANSWER, pHelios, m_creature);
+                }
+                break;
+            }
+        }
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_goCageGuid.Clear();
+                m_heliosGuid.Clear();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ranger_lilathaAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_CATACOMBS)
+        {
+            pCreature->SetFactionTemporary(FACTION_SMOON_E, TEMPFACTION_RESTORE_RESPAWN);
+
+            if (npc_ranger_lilathaAI* pEscortAI = dynamic_cast<npc_ranger_lilathaAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+};
+
+void AddSC_ghostlands()
+{
+    Script* s;
+
+    s = new npc_ranger_lilatha();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ranger_lilatha";
+    //pNewScript->GetAI = &GetAI_npc_ranger_lilathaAI;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_ranger_lilatha;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/gnomeregan/boss_thermaplugg.cpp b/src/modules/SD3/scripts/eastern_kingdoms/gnomeregan/boss_thermaplugg.cpp
new file mode 100644
index 000000000..671ec9b48
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/gnomeregan/boss_thermaplugg.cpp
@@ -0,0 +1,431 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Mekgineer_Thermaplugg
+ * SD%Complete: 90
+ * SDComment:   Timer need improvement, especially for bomb-spawning
+ * SDCategory:  Gnomeregan
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "gnomeregan.h"
+
+enum
+{
+    SAY_AGGRO                           = -1090024,
+    SAY_PHASE                           = -1090025,
+    SAY_BOMB                            = -1090026,
+    SAY_SLAY                            = -1090027,
+
+    SPELL_ACTIVATE_BOMB_A               = 11511,            // Target Dest = -530.754 670.571 -313.784
+    SPELL_ACTIVATE_BOMB_B               = 11795,            // Target Dest = -530.754 670.571 -313.784
+    SPELL_KNOCK_AWAY                    = 10101,
+    SPELL_KNOCK_AWAY_AOE                = 11130,
+    SPELL_WALKING_BOMB_EFFECT           = 11504,
+    //TODO use the spells; effects: send event + activate object; event IDs listed below
+    SPELL_ACTIVATE_BOMB_01              = 11518,    //2721
+    SPELL_ACTIVATE_BOMB_02              = 11521,    //2723
+    SPELL_ACTIVATE_BOMB_03              = 11523,    //2724
+    SPELL_ACTIVATE_BOMB_04              = 11524,    //2725
+    SPELL_ACTIVATE_BOMB_05              = 11526,    //2726
+    SPELL_ACTIVATE_BOMB_07              = 11527,    //2727
+    SPELL_ACTIVATE_BOMB_01B             = 11796,    //2814
+    SPELL_ACTIVATE_BOMB_02B             = 11797,    //2815
+    SPELL_ACTIVATE_BOMB_03B             = 11798,    //2816
+    SPELL_ACTIVATE_BOMB_04B             = 11799,    //2817
+    SPELL_ACTIVATE_BOMB_05B             = 11800,    //2818
+    SPELL_ACTIVATE_BOMB_07B             = 11801,    //2819
+
+    NPC_WALKING_BOMB                    = 7915,
+};
+
+static const float fBombSpawnZ  = -316.2625f;
+
+struct boss_thermaplugg : public CreatureScript
+{
+    boss_thermaplugg() : CreatureScript("boss_thermaplugg") {}
+
+    struct boss_thermapluggAI : public ScriptedAI
+    {
+        boss_thermapluggAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsPhaseTwo;
+
+        uint32 m_uiKnockAwayTimer;
+        uint32 m_uiActivateBombTimer;
+
+        sBombFace m_asBombFaces[MAX_GNOME_FACES];
+        float m_afSpawnPos[3];
+
+        GuidList m_lSummonedBombGUIDs;
+        GuidList m_lLandedBombGUIDs;
+
+        void Reset() override
+        {
+            m_uiKnockAwayTimer = urand(17000, 20000);
+            m_uiActivateBombTimer = urand(10000, 15000);
+            m_bIsPhaseTwo = false;
+
+            memset(&m_afSpawnPos, 0.0f, sizeof(m_afSpawnPos));
+            m_lLandedBombGUIDs.clear();
+        }
+
+        void GetAIInformation(ChatHandler& reader) override
+        {
+            reader.PSendSysMessage("Thermaplugg, currently phase %s", m_bIsPhaseTwo ? "two" : "one");
+
+            if (m_asBombFaces)
+            {
+                for (uint8 i = 0; i < MAX_GNOME_FACES; ++i)
+                {
+                    reader.PSendSysMessage("Bomb face %u is %s ", (uint32)i, m_asBombFaces[i].m_bActivated ? "activated" : "not activated");
+                }
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THERMAPLUGG, DONE);
+            }
+
+            m_lSummonedBombGUIDs.clear();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            //copy faces GUIDs from instance script; BombFaces are fully controlled by this AI
+            uint32 faces[MAX_GNOME_FACES] = {GO_GNOME_FACE_1, GO_GNOME_FACE_2, GO_GNOME_FACE_3, GO_GNOME_FACE_4, GO_GNOME_FACE_5, GO_GNOME_FACE_6};
+            for (int i = 0; i < MAX_GNOME_FACES; ++i)
+            {
+                m_asBombFaces[i].m_gnomeFaceGuid = ObjectGuid(m_pInstance->GetData64(faces[i]));
+                m_asBombFaces[i].m_bActivated = false;
+                m_asBombFaces[i].m_uiBombTimer = 0;
+            }
+
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THERMAPLUGG, IN_PROGRESS);
+            }
+
+            m_afSpawnPos[0] = m_creature->GetPositionX();
+            m_afSpawnPos[1] = m_creature->GetPositionY();
+            m_afSpawnPos[2] = m_creature->GetPositionZ();
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THERMAPLUGG, FAIL);
+            }
+
+            // Remove remaining bombs
+            for (GuidList::const_iterator itr = m_lSummonedBombGUIDs.begin(); itr != m_lSummonedBombGUIDs.end(); ++itr)
+            {
+                if (Creature* pBomb = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pBomb->ForcedDespawn();
+                }
+            }
+            m_lSummonedBombGUIDs.clear();
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_WALKING_BOMB)
+            {
+                m_lSummonedBombGUIDs.push_back(pSummoned->GetObjectGuid());
+                // calculate point for falling down
+                float fX, fY;
+                fX = 0.2 * m_afSpawnPos[0] + 0.8 * pSummoned->GetPositionX();
+                fY = 0.2 * m_afSpawnPos[1] + 0.8 * pSummoned->GetPositionY();
+                pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, m_afSpawnPos[2] - 2.0f);
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (pSummoned->GetEntry() == NPC_WALKING_BOMB && uiMotionType == POINT_MOTION_TYPE && uiPointId == 1)
+            {
+                m_lLandedBombGUIDs.push_back(pSummoned->GetObjectGuid());
+            }
+        }
+
+        void SummonedCreatureDespawn(Creature* pSummoned) override
+        {
+            m_lSummonedBombGUIDs.remove(pSummoned->GetObjectGuid());
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* /*pInvoker*/, uint32 data) override
+        {
+            if (pSender != m_creature)  //handling only events from himself (casts of activate bomb), to be refactored
+                return;
+
+            switch (eventType)
+            {
+            case AI_EVENT_CUSTOM_A:
+                DoActivateBombFace(data);
+                break;
+            case AI_EVENT_CUSTOM_B:
+                DoDeactivateBombFace(data);
+                break;
+            case AI_EVENT_CUSTOM_C:
+                for (uint8 i = 0; i < MAX_GNOME_FACES; ++i)
+                    DoDeactivateBombFace(i);
+                break;
+            default:
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Movement of Summoned mobs
+            if (!m_lLandedBombGUIDs.empty())
+            {
+                for (GuidList::const_iterator itr = m_lLandedBombGUIDs.begin(); itr != m_lLandedBombGUIDs.end(); ++itr)
+                {
+                    if (Creature* pBomb = m_creature->GetMap()->GetCreature(*itr))
+                    {
+                        pBomb->GetMotionMaster()->MoveFollow(m_creature, 0.0f, 0.0f);
+                    }
+                }
+                m_lLandedBombGUIDs.clear();
+            }
+
+            if (!m_bIsPhaseTwo && m_creature->GetHealthPercent() < 50.0f)
+            {
+                DoScriptText(SAY_PHASE, m_creature);
+                m_bIsPhaseTwo = true;
+            }
+
+            if (m_uiKnockAwayTimer < uiDiff)
+            {
+                if (m_bIsPhaseTwo)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_KNOCK_AWAY_AOE) == CAST_OK)
+                    {
+                        m_uiKnockAwayTimer = 12000;
+                    }
+                }
+                else
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_KNOCK_AWAY) == CAST_OK)
+                    {
+                        m_uiKnockAwayTimer = urand(17000, 20000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiKnockAwayTimer -= uiDiff;
+            }
+
+            if (m_uiActivateBombTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsPhaseTwo ? SPELL_ACTIVATE_BOMB_B : SPELL_ACTIVATE_BOMB_A) == CAST_OK)
+                {
+                    m_uiActivateBombTimer = (m_bIsPhaseTwo ? urand(6, 12) : urand(12, 17)) * IN_MILLISECONDS;
+                    if (!urand(0, 5))                           // TODO, chance/ place for this correct?
+                    {
+                        DoScriptText(SAY_BOMB, m_creature);
+                    }
+                }
+            }
+            else
+            {
+                m_uiActivateBombTimer -= uiDiff;
+            }
+
+            // Spawn bombs
+            if (m_asBombFaces)
+            {
+                for (uint8 i = 0; i < MAX_GNOME_FACES; ++i)
+                {
+                    if (m_asBombFaces[i].m_bActivated)
+                    {
+                        if (m_asBombFaces[i].m_uiBombTimer < uiDiff)
+                        {
+                            // Calculate the spawning position as 90% between face and thermaplugg spawn-pos, and hight hardcoded
+                            float fX = 0.0f, fY = 0.0f;
+                            if (GameObject* pFace = m_creature->GetMap()->GetGameObject(m_asBombFaces[i].m_gnomeFaceGuid))
+                            {
+                                fX = 0.35 * m_afSpawnPos[0] + 0.65 * pFace->GetPositionX();
+                                fY = 0.35 * m_afSpawnPos[1] + 0.65 * pFace->GetPositionY();
+                            }
+                            m_creature->SummonCreature(NPC_WALKING_BOMB, fX, fY, fBombSpawnZ, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                            m_asBombFaces[i].m_uiBombTimer = urand(10000, 25000);   // TODO
+                        }
+                        else
+                        {
+                            m_asBombFaces[i].m_uiBombTimer -= uiDiff;
+                        }
+                    }
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+        private:
+            void DoActivateBombFace(uint8 uiIndex)
+            {
+                if (uiIndex >= MAX_GNOME_FACES)
+                {
+                    return;
+                }
+
+                if (!m_asBombFaces[uiIndex].m_bActivated)
+                {
+                    m_pInstance->DoUseDoorOrButton(m_asBombFaces[uiIndex].m_gnomeFaceGuid);
+                    m_asBombFaces[uiIndex].m_bActivated = true;
+                    m_asBombFaces[uiIndex].m_uiBombTimer = 3000;
+                }
+            }
+
+            void DoDeactivateBombFace(uint8 uiIndex)
+            {
+                if (uiIndex >= MAX_GNOME_FACES)
+                {
+                    return;
+                }
+
+                if (m_asBombFaces[uiIndex].m_bActivated)
+                {
+                    m_pInstance->DoUseDoorOrButton(m_asBombFaces[uiIndex].m_gnomeFaceGuid);
+                    m_asBombFaces[uiIndex].m_bActivated = false;
+                    m_asBombFaces[uiIndex].m_uiBombTimer = 0;
+                }
+            }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_thermapluggAI(pCreature);
+    }
+};
+
+//the following is a workaround by a wrong mechanic for missing spells (now found) TODO refactor it
+struct spell_boss_thermaplugg : public SpellScript
+{
+    spell_boss_thermaplugg() : SpellScript("spell_boss_thermaplugg") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* /*pCreatureTarget*/, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if ((uiSpellId != SPELL_ACTIVATE_BOMB_A && uiSpellId != SPELL_ACTIVATE_BOMB_B) || uiEffIndex != EFFECT_INDEX_0)
+        {
+            return false;
+        }
+
+        // This spell should select a random Bomb-Face and activate it if needed
+        if (pCaster->GetEntry() == NPC_MEKGINEER_THERMAPLUGG && pCaster->ToCreature()->AI())
+            pCaster->ToCreature()->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pCaster->ToCreature(), urand(0, MAX_GNOME_FACES - 1));
+
+        return true;
+    }
+};
+
+struct go_gnomeface_button : public GameObjectScript
+{
+    go_gnomeface_button() : GameObjectScript("go_gnomeface_button") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        InstanceData* pInstance = pPlayer->GetInstanceData();
+        if (!pInstance)
+        {
+            return false;
+        }
+
+        //below is a workaround due to missing GO 196608 definition and error in GO_BUTTON_ templates TODO fix it maybe?
+        // If a button is used, the related face should be deactivated (if already activated)
+        switch (pGo->GetEntry())
+        {
+        case GO_BUTTON_1:
+            pInstance->SetData(TYPE_DO_BOMB_OFF, 0);
+            break;
+        case GO_BUTTON_2:
+            pInstance->SetData(TYPE_DO_BOMB_OFF, 1);
+            break;
+        case GO_BUTTON_3:
+            pInstance->SetData(TYPE_DO_BOMB_OFF, 2);
+            break;
+        case GO_BUTTON_4:
+            pInstance->SetData(TYPE_DO_BOMB_OFF, 3);
+            break;
+        case GO_BUTTON_5:
+            pInstance->SetData(TYPE_DO_BOMB_OFF, 4);
+            break;
+        case GO_BUTTON_6:
+            pInstance->SetData(TYPE_DO_BOMB_OFF, 5);
+            break;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_thermaplugg()
+{
+    Script *s;
+    s = new boss_thermaplugg();
+    s->RegisterSelf();
+    s = new go_gnomeface_button();
+    s->RegisterSelf();
+    s = new spell_boss_thermaplugg();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_thermaplugg";
+    //pNewScript->GetAI = &GetAI_boss_thermaplugg;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_boss_thermaplugg;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_gnomeface_button";
+    //pNewScript->pGOUse = &GOUse_go_gnomeface_button;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp b/src/modules/SD3/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp
new file mode 100644
index 000000000..49fda59c8
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp
@@ -0,0 +1,813 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      gnomeregan
+ * SD%Complete: 90
+ * SDComment:   Grubbis Encounter, quest 2904 (A fine mess)
+ * SDCategory:  Gnomeregan
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_blastmaster_emi_shortfuse
+ * npc_kernobee
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "gnomeregan.h"
+#include "escort_ai.h"
+#include "follower_ai.h"
+
+/*######
+## npc_blastmaster_emi_shortfuse
+######*/
+
+enum
+{
+    SAY_START                   = -1090000,
+    SAY_INTRO_1                 = -1090001,
+    SAY_INTRO_2                 = -1090002,
+    SAY_INTRO_3                 = -1090003,
+    SAY_INTRO_4                 = -1090004,
+    SAY_LOOK_1                  = -1090005,
+    SAY_HEAR_1                  = -1090006,
+    SAY_AGGRO_1                 = -1090007,
+    SAY_CHARGE_1                = -1090008,
+    SAY_CHARGE_2                = -1090009,
+    SAY_BLOW_1_10               = -1090010,
+    SAY_BLOW_1_5                = -1090011,
+    SAY_BLOW_1                  = -1090012,
+    SAY_FINISH_1                = -1090013,
+    SAY_LOOK_2                  = -1090014,
+    SAY_HEAR_2                  = -1090015,
+    SAY_CHARGE_3                = -1090016,
+    SAY_CHARGE_4                = -1090017,
+    SAY_BLOW_2_10               = -1090018,
+    SAY_BLOW_2_5                = -1090019,
+    SAY_BLOW_SOON               = -1090020,
+    SAY_BLOW_2                  = -1090021,
+    SAY_FINISH_2                = -1090022,
+
+    SAY_AGGRO_2                 = -1090028,
+
+    SAY_GRUBBIS_SPAWN           = -1090023,
+
+    GOSSIP_ITEM_START           = -3090000,
+
+    SPELL_EXPLOSION_NORTH       = 12158,
+    SPELL_EXPLOSION_SOUTH       = 12159,
+    SPELL_FIREWORKS_RED         = 11542,
+
+    MAX_SUMMON_POSITIONS        = 33,
+
+    NPC_GRUBBIS                 = 7361,
+    NPC_CHOMPER                 = 6215,
+    NPC_CAVERNDEEP_BURROWER     = 6206,
+    NPC_CAVERNDEEP_AMBUSHER     = 6207
+};
+
+struct sSummonInformation
+{
+    uint32 uiPosition, uiEntry;
+    float fX, fY, fZ, fO;
+};
+
+static const sSummonInformation asSummonInfo[MAX_SUMMON_POSITIONS] =
+{
+    // Entries must be sorted by pack
+    // First Cave-In
+    {1, NPC_CAVERNDEEP_AMBUSHER, -566.8114f, -111.7036f, -151.1891f, 5.986479f},
+    {1, NPC_CAVERNDEEP_AMBUSHER, -568.5875f, -113.7559f, -151.1869f, 0.06981317f},
+    {1, NPC_CAVERNDEEP_AMBUSHER, -570.2333f, -116.8126f, -151.2272f, 0.296706f},
+    {1, NPC_CAVERNDEEP_AMBUSHER, -550.6331f, -108.7592f, -153.965f, 0.8901179f},
+    {1, NPC_CAVERNDEEP_AMBUSHER, -558.9717f, -115.0669f, -151.8799f, 0.5235988f},
+    {1, NPC_CAVERNDEEP_AMBUSHER, -556.6719f, -112.0526f, -152.8255f, 0.4886922f},
+    {1, NPC_CAVERNDEEP_AMBUSHER, -552.6419f, -113.4385f, -153.0727f, 0.8028514f},
+    {1, NPC_CAVERNDEEP_AMBUSHER, -549.1248f, -112.1469f, -153.7987f, 0.7504916f},
+    {1, NPC_CAVERNDEEP_AMBUSHER, -546.7435f, -112.3051f, -154.2225f, 0.9250245f},
+    {2, NPC_CAVERNDEEP_AMBUSHER, -571.4071f, -108.7721f, -150.6547f, 5.480334f},
+    {2, NPC_CAVERNDEEP_AMBUSHER, -573.797f, -106.5265f, -150.4106f, 5.550147f},
+    {2, NPC_CAVERNDEEP_AMBUSHER, -576.3784f, -108.0483f, -150.4227f, 5.585053f},
+    {2, NPC_CAVERNDEEP_AMBUSHER, -576.697f, -111.7413f, -150.6484f, 5.759586f},
+    {3, NPC_CAVERNDEEP_AMBUSHER, -571.3161f, -114.4412f, -151.0931f, 6.021386f},
+    {3, NPC_CAVERNDEEP_AMBUSHER, -570.3127f, -111.7964f, -151.04f, 2.042035f},
+
+    // Second Cave-In
+    {4, NPC_CAVERNDEEP_AMBUSHER, -474.5954f, -104.074f, -146.0483f, 2.338741f},
+    {4, NPC_CAVERNDEEP_AMBUSHER, -477.9396f, -108.6563f, -145.7394f, 1.553343f},
+    {4, NPC_CAVERNDEEP_AMBUSHER, -475.6625f, -97.12168f, -146.5959f, 1.291544f},
+    {4, NPC_CAVERNDEEP_AMBUSHER, -480.5233f, -88.40702f, -146.3772f, 3.001966f},
+    {5, NPC_CAVERNDEEP_AMBUSHER, -474.2943f, -105.2212f, -145.9747f, 2.251475f},
+    {5, NPC_CAVERNDEEP_AMBUSHER, -481.1831f, -101.4225f, -146.377f, 2.146755f},
+    {5, NPC_CAVERNDEEP_BURROWER, -475.0871f, -100.016f, -146.4382f, 2.303835f},
+    {5, NPC_CAVERNDEEP_AMBUSHER, -478.8562f, -106.9321f, -145.8533f, 1.658063f},
+    {6, NPC_CAVERNDEEP_AMBUSHER, -473.8762f, -107.4022f, -145.838f, 2.024582f},
+    {6, NPC_CAVERNDEEP_AMBUSHER, -490.5134f, -92.72843f, -148.0954f, 3.054326f},
+    {6, NPC_CAVERNDEEP_AMBUSHER, -491.401f, -88.25341f, -148.0358f, 3.560472f},
+    {6, NPC_CAVERNDEEP_AMBUSHER, -479.1431f, -106.227f, -145.9097f, 1.727876f},
+    {6, NPC_CAVERNDEEP_AMBUSHER, -475.3185f, -101.4804f, -146.2717f, 2.234021f},
+    {6, NPC_CAVERNDEEP_AMBUSHER, -485.1559f, -89.57419f, -146.9299f, 3.071779f},
+    {6, NPC_CAVERNDEEP_AMBUSHER, -482.2516f, -96.80614f, -146.6596f, 2.303835f},
+    {6, NPC_CAVERNDEEP_AMBUSHER, -477.9874f, -92.82047f, -146.6944f, 3.124139f},
+
+    // Grubbis and add
+    {7, NPC_GRUBBIS, -476.3761f, -108.1901f, -145.7763f, 1.919862f},
+    {7, NPC_CHOMPER, -473.1326f, -103.0901f, -146.1155f, 2.042035f}
+};
+
+struct npc_blastmaster_emi_shortfuse : public CreatureScript
+{
+    npc_blastmaster_emi_shortfuse() : CreatureScript("npc_blastmaster_emi_shortfuse") {}
+
+    struct npc_blastmaster_emi_shortfuseAI : public npc_escortAI
+    {
+        npc_blastmaster_emi_shortfuseAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            // Remove Gossip-Menu in reload case for DONE enounter
+            if (m_pInstance && m_pInstance->GetData(TYPE_GRUBBIS) == DONE)
+            {
+                pCreature->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+            }
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+        uint32 m_uiPhaseTimer;
+        ObjectGuid m_playerGuid;
+        bool m_bDidAggroText, m_bSouthernCaveInOpened, m_bNorthernCaveInOpened;
+        GuidList m_luiSummonedMobGUIDs;
+
+        void Reset() override
+        {
+            m_bDidAggroText = false;                            // Used for 'defend' text, is triggered when the npc is attacked
+
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiPhase = 0;
+                m_uiPhaseTimer = 0;
+                m_bSouthernCaveInOpened = m_bNorthernCaveInOpened = false;
+                m_luiSummonedMobGUIDs.clear();
+            }
+        }
+
+        void DoSummonPack(uint8 uiIndex)
+        {
+            for (uint8 i = 0; i < MAX_SUMMON_POSITIONS; ++i)
+            {
+                // This requires order of the array
+                if (asSummonInfo[i].uiPosition > uiIndex)
+                {
+                    break;
+                }
+                if (asSummonInfo[i].uiPosition == uiIndex)
+                {
+                    m_creature->SummonCreature(asSummonInfo[i].uiEntry, asSummonInfo[i].fX, asSummonInfo[i].fY, asSummonInfo[i].fZ, asSummonInfo[i].fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_CAVERNDEEP_BURROWER:
+            case NPC_CAVERNDEEP_AMBUSHER:
+                if (GameObject* pDoor = m_pInstance->GetSingleGameObjectFromStorage(m_uiPhase > 20 ? GO_CAVE_IN_NORTH : GO_CAVE_IN_SOUTH))
+                {
+                    float fX, fY, fZ;
+                    pDoor->GetNearPoint(pDoor, fX, fY, fZ, 0.0f, 2.0f, frand(0.0f, 2 * M_PI_F));
+                    pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                }
+                break;
+            case NPC_GRUBBIS:
+                // Movement of Grubbis and Add to be handled by DB waypoints
+                DoScriptText(SAY_GRUBBIS_SPAWN, pSummoned);
+                break;
+            }
+            m_luiSummonedMobGUIDs.push_back(pSummoned->GetObjectGuid());
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_GRUBBIS)
+            {
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_GRUBBIS, DONE);
+                }
+                m_uiPhaseTimer = 1000;
+            }
+            m_luiSummonedMobGUIDs.remove(pSummoned->GetObjectGuid());
+        }
+
+        bool IsPreparingExplosiveCharge()
+        {
+            return m_uiPhase == 11 || m_uiPhase == 13 || m_uiPhase == 26 || m_uiPhase == 28;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // In case we are preparing the explosive charges, we won't start attacking mobs
+            if (IsPreparingExplosiveCharge())
+            {
+                return;
+            }
+
+            npc_escortAI::MoveInLineOfSight(pWho);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            // In case we are preparing the explosive charges, we won't start attacking mobs
+            if (IsPreparingExplosiveCharge())
+            {
+                return;
+            }
+
+            npc_escortAI::AttackStart(pWho);
+        }
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            // Possibility for Aggro-Text only once per combat
+            if (m_bDidAggroText)
+            {
+                return;
+            }
+
+            m_bDidAggroText = true;
+
+            if (!urand(0, 2))
+            {
+                DoScriptText(urand(0, 1) ? SAY_AGGRO_1 : SAY_AGGRO_2, m_creature, pAttacker);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            m_pInstance->SetData(TYPE_GRUBBIS, FAIL);
+
+            if (m_bSouthernCaveInOpened)                        // close southern cave-in door
+            {
+                m_pInstance->DoUseDoorOrButton(GO_CAVE_IN_SOUTH);
+            }
+            if (m_bNorthernCaveInOpened)                        // close northern cave-in door
+            {
+                m_pInstance->DoUseDoorOrButton(GO_CAVE_IN_NORTH);
+            }
+
+            for (GuidList::const_iterator itr = m_luiSummonedMobGUIDs.begin(); itr != m_luiSummonedMobGUIDs.end(); ++itr)
+            {
+                if (Creature* pSummoned = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pSummoned->ForcedDespawn();
+                }
+            }
+        }
+
+        void StartEvent(Player* pPlayer)
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            m_pInstance->SetData(TYPE_GRUBBIS, IN_PROGRESS);
+
+            m_uiPhase = 1;
+            m_uiPhaseTimer = 1000;
+            m_playerGuid = pPlayer->GetObjectGuid();
+        }
+
+        void WaypointStart(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 10:
+                // Open Southern Cave-In
+                if (m_pInstance && !m_bSouthernCaveInOpened)
+                {
+                    m_pInstance->DoUseDoorOrButton(GO_CAVE_IN_SOUTH);
+                }
+                m_bSouthernCaveInOpened = true;
+                break;
+            case 12:
+                DoScriptText(SAY_CHARGE_1, m_creature);
+                break;
+            case 16:
+                DoScriptText(SAY_CHARGE_3, m_creature);
+                // Open Northern Cave-In
+                if (m_pInstance && !m_bNorthernCaveInOpened)
+                {
+                    m_pInstance->DoUseDoorOrButton(GO_CAVE_IN_NORTH);
+                }
+                m_bNorthernCaveInOpened = true;
+                break;
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 4:
+                m_uiPhaseTimer = 1000;
+                break;
+            case 9:
+                m_uiPhaseTimer = 2000;
+                break;
+            case 11:
+                m_creature->HandleEmote(EMOTE_STATE_USESTANDING);
+                m_uiPhaseTimer = 15000;
+                break;
+            case 13:
+                m_creature->HandleEmote(EMOTE_STATE_USESTANDING);
+                m_uiPhaseTimer = 10000;
+                break;
+            case 15:
+                SetEscortPaused(true);
+                if (m_pInstance)
+                {
+                    if (GameObject* pDoor = m_pInstance->GetSingleGameObjectFromStorage(GO_CAVE_IN_SOUTH))
+                    {
+                        m_creature->SetFacingToObject(pDoor);
+                    }
+                }
+                DoScriptText(SAY_BLOW_1_10, m_creature);
+                m_uiPhaseTimer = 5000;
+                break;
+            case 16:
+                m_creature->HandleEmote(EMOTE_STATE_USESTANDING);
+                m_uiPhaseTimer = 15000;
+                break;
+            case 17:
+                m_creature->HandleEmote(EMOTE_STATE_USESTANDING);
+                m_uiPhaseTimer = 10000;
+                break;
+            case 19:
+                m_uiPhaseTimer = 2000;
+                SetEscortPaused(true);                      // And keep paused from now on!
+                break;
+            }
+        }
+
+        void UpdateEscortAI(uint32 const uiDiff) override
+        {
+            // the phases are handled OOC (keeps them in sync with the waypoints)
+            if (m_uiPhaseTimer && !m_creature->getVictim())
+            {
+                if (m_uiPhaseTimer <= uiDiff)
+                {
+                    switch (m_uiPhase)
+                    {
+                    case 1:
+                        DoScriptText(SAY_START, m_creature);
+                        m_creature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+                        m_creature->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+                        m_creature->SetUInt32Value(UNIT_DYNAMIC_FLAGS, 0);
+                        m_uiPhaseTimer = 5000;
+                        break;
+                    case 2:
+                        DoScriptText(SAY_INTRO_1, m_creature);
+                        m_uiPhaseTimer = 3500;              // 6s delay, but 2500ms for escortstarting
+                        break;
+                    case 3:
+                        Start(false, m_creature->GetMap()->GetPlayer(m_playerGuid), NULL, false, false);
+                        m_uiPhaseTimer = 0;
+                        break;
+
+                    case 4:                                 // Shortly after reached WP 4
+                        DoScriptText(SAY_INTRO_2, m_creature);
+                        m_uiPhaseTimer = 0;
+                        break;
+
+                    case 5:                                 // Shortly after reached WP 9
+                        DoScriptText(SAY_INTRO_3, m_creature);
+                        m_uiPhaseTimer = 6000;
+                        break;
+                    case 6:
+                        DoScriptText(SAY_INTRO_4, m_creature);
+                        m_uiPhaseTimer = 9000;
+                        break;
+                    case 7:
+                        if (m_pInstance)
+                        {
+                            if (GameObject* pDoor = m_pInstance->GetSingleGameObjectFromStorage(GO_CAVE_IN_SOUTH))
+                            {
+                                m_creature->SetFacingToObject(pDoor);
+                            }
+                        }
+                        m_uiPhaseTimer = 2000;
+                        break;
+                    case 8:
+                        DoScriptText(SAY_LOOK_1, m_creature);
+                        m_uiPhaseTimer = 5000;
+                        break;
+                    case 9:
+                        DoScriptText(SAY_HEAR_1, m_creature);
+                        m_uiPhaseTimer = 2000;
+                        break;
+                    case 10:                                // Shortly shortly before starting WP 11
+                        DoSummonPack(1);
+                        m_uiPhaseTimer = 0;
+                        break;
+
+                    case 11:                                // 15s after reached WP 11
+                        DoSummonPack(2);
+
+                        // Summon first explosive charge
+                        if (m_pInstance)
+                        {
+                            m_pInstance->SetData(TYPE_EXPLOSIVE_CHARGE, DATA_EXPLOSIVE_CHARGE_1);
+                        }
+                        // Remove EMOTE_STATE_USESTANDING state-emote
+                        m_creature->HandleEmote(EMOTE_ONESHOT_NONE);
+
+                        m_uiPhaseTimer = 1;
+                        break;
+                    case 12:                                // Empty Phase, used to store information about set charge
+                        m_uiPhaseTimer = 0;
+                        break;
+
+                    case 13:                                // 10s after reached WP 13
+                        DoSummonPack(3);
+
+                        // Summon second explosive charge
+                        if (m_pInstance)
+                        {
+                            m_pInstance->SetData(TYPE_EXPLOSIVE_CHARGE, DATA_EXPLOSIVE_CHARGE_2);
+                        }
+                        // Remove EMOTE_STATE_USESTANDING state-emote
+                        m_creature->HandleEmote(EMOTE_ONESHOT_NONE);
+
+                        m_uiPhaseTimer = 11000;
+                        break;
+                    case 14:                                // Empty Phase, used to store information about set charge
+                        m_uiPhaseTimer = 1;
+                        break;
+                    case 15:                                // shortly before starting WP 14
+                        if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                        {
+                            m_creature->SetFacingToObject(pPlayer);
+                        }
+                        DoScriptText(SAY_CHARGE_2, m_creature);
+                        m_uiPhaseTimer = 0;
+                        break;
+
+                    case 16:                                // 5s after reaching WP 15
+                        DoScriptText(SAY_BLOW_1_5, m_creature);
+                        m_uiPhaseTimer = 5000;
+                        break;
+                    case 17:
+                        DoScriptText(SAY_BLOW_1, m_creature);
+                        m_uiPhaseTimer = 1000;
+                        break;
+                    case 18:
+                        DoCastSpellIfCan(m_creature, SPELL_EXPLOSION_SOUTH);
+                        m_uiPhaseTimer = 500;
+                        break;
+                    case 19:
+                        // Close southern cave-in and let charges explode
+                        if (m_pInstance)
+                        {
+                            m_pInstance->DoUseDoorOrButton(GO_CAVE_IN_SOUTH);
+                            m_bSouthernCaveInOpened = false;
+                            m_pInstance->SetData(TYPE_EXPLOSIVE_CHARGE, DATA_EXPLOSIVE_CHARGE_USE);
+                        }
+                        m_uiPhaseTimer = 5000;
+                        break;
+                    case 20:
+                        m_creature->HandleEmote(EMOTE_ONESHOT_CHEER);
+                        m_uiPhaseTimer = 6000;
+                        break;
+                    case 21:
+                        DoScriptText(SAY_FINISH_1, m_creature);
+                        m_uiPhaseTimer = 6000;
+                        break;
+                    case 22:
+                        DoScriptText(SAY_LOOK_2, m_creature);
+                        m_uiPhaseTimer = 3000;
+                        break;
+                    case 23:
+                        if (m_pInstance)
+                        {
+                            if (GameObject* pDoor = m_pInstance->GetSingleGameObjectFromStorage(GO_CAVE_IN_NORTH))
+                            {
+                                m_creature->SetFacingToObject(pDoor);
+                            }
+                        }
+                        m_uiPhaseTimer = 3000;
+                        break;
+                    case 24:
+                        DoScriptText(SAY_HEAR_2, m_creature);
+                        m_uiPhaseTimer = 8000;
+                        break;
+                    case 25:                                // shortly before starting WP 16
+                        SetEscortPaused(false);
+                        DoSummonPack(4);
+                        m_uiPhaseTimer = 0;
+                        break;
+
+                    case 26:                                // 15s after reaching WP 16
+                        DoSummonPack(5);
+
+                        // Summon third explosive charge
+                        if (m_pInstance)
+                        {
+                            m_pInstance->SetData(TYPE_EXPLOSIVE_CHARGE, DATA_EXPLOSIVE_CHARGE_3);
+                        }
+                        // Remove EMOTE_STATE_USESTANDING state-emote
+                        m_creature->HandleEmote(EMOTE_ONESHOT_NONE);
+
+                        m_uiPhaseTimer = 1;
+                        break;
+                    case 27:                                // Empty Phase, used to store information about set charge
+                        m_uiPhaseTimer = 0;
+                        break;
+
+                    case 28:                                // 10s after reaching WP 17
+                        DoSummonPack(6);
+
+                        // Summon forth explosive charge
+                        if (m_pInstance)
+                        {
+                            m_pInstance->SetData(TYPE_EXPLOSIVE_CHARGE, DATA_EXPLOSIVE_CHARGE_4);
+                        }
+                        // Remove EMOTE_STATE_USESTANDING state-emote
+                        m_creature->HandleEmote(EMOTE_ONESHOT_NONE);
+
+                        m_uiPhaseTimer = 10000;
+                        break;
+                    case 29:                                // Empty Phase, used to store information about set charge
+                        m_uiPhaseTimer = 1;
+                        break;
+                    case 30:                                // shortly before starting WP 18
+                        DoScriptText(SAY_CHARGE_4, m_creature);
+                        m_uiPhaseTimer = 0;
+                        break;
+
+                    case 31:                                // shortly after reaching WP 19
+                        if (m_pInstance)
+                        {
+                            if (GameObject* pDoor = m_pInstance->GetSingleGameObjectFromStorage(GO_CAVE_IN_NORTH))
+                            {
+                                m_creature->SetFacingToObject(pDoor);
+                            }
+                        }
+                        DoScriptText(SAY_BLOW_2_10, m_creature);
+                        m_uiPhaseTimer = 5000;
+                        break;
+                    case 32:
+                        DoScriptText(SAY_BLOW_2_5, m_creature);
+                        m_uiPhaseTimer = 1000;
+                        break;
+                    case 33:
+                        DoSummonPack(7);                    // Summon Grubbis and add
+                        m_uiPhaseTimer = 0;
+                        break;
+
+                    case 34:                                // 1 sek after Death of Grubbis
+                        if (m_pInstance)
+                        {
+                            if (GameObject* pDoor = m_pInstance->GetSingleGameObjectFromStorage(GO_CAVE_IN_NORTH))
+                            {
+                                m_creature->SetFacingToObject(pDoor);
+                            }
+                        }
+                        m_creature->HandleEmote(EMOTE_ONESHOT_CHEER);
+                        m_uiPhaseTimer = 5000;
+                        break;
+                    case 35:
+                        DoScriptText(SAY_BLOW_SOON, m_creature);
+                        m_uiPhaseTimer = 5000;
+                        break;
+                    case 36:
+                        DoScriptText(SAY_BLOW_2, m_creature);
+                        m_uiPhaseTimer = 2000;
+                        break;
+                    case 37:
+                        m_creature->HandleEmote(EMOTE_ONESHOT_POINT);
+                        m_uiPhaseTimer = 1000;
+                        break;
+                    case 38:
+                        DoCastSpellIfCan(m_creature, SPELL_EXPLOSION_NORTH);
+                        m_uiPhaseTimer = 500;
+                        break;
+                    case 39:
+                        // Close northern cave-in and let charges explode
+                        if (m_pInstance)
+                        {
+                            m_pInstance->DoUseDoorOrButton(GO_CAVE_IN_NORTH);
+                            m_bNorthernCaveInOpened = false;
+                            m_pInstance->SetData(TYPE_EXPLOSIVE_CHARGE, DATA_EXPLOSIVE_CHARGE_USE);
+                        }
+                        m_uiPhaseTimer = 8000;
+                        break;
+                    case 40:
+                        DoCastSpellIfCan(m_creature, SPELL_FIREWORKS_RED);
+                        DoScriptText(SAY_FINISH_2, m_creature);
+                        m_uiPhaseTimer = 0;
+                        break;
+                    }
+                    ++m_uiPhase;
+                }
+                else
+                {
+                    m_uiPhaseTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_blastmaster_emi_shortfuseAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (InstanceData* pInstance = pCreature->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_GRUBBIS) == NOT_STARTED || pInstance->GetData(TYPE_GRUBBIS) == FAIL)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+            }
+        }
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            if (InstanceData* pInstance = pCreature->GetInstanceData())
+            {
+                if (pInstance->GetData(TYPE_GRUBBIS) == NOT_STARTED || pInstance->GetData(TYPE_GRUBBIS) == FAIL)
+                {
+                    if (npc_blastmaster_emi_shortfuseAI* pEmiAI = dynamic_cast<npc_blastmaster_emi_shortfuseAI*>(pCreature->AI()))
+                    {
+                        pEmiAI->StartEvent(pPlayer);
+                    }
+                }
+            }
+        }
+        pPlayer->CLOSE_GOSSIP_MENU();
+
+        return true;
+    }
+};
+
+/*######
+## npc_kernobee
+## TODO: It appears there are some things missing, including his? alarm-bot
+######*/
+
+enum
+{
+    QUEST_A_FINE_MESS           = 2904,
+    TRIGGER_GNOME_EXIT          = 324,                      // Add scriptlib support for it, atm simply use hardcoded values
+};
+
+static const float aKernobeePositions[2][3] =
+{
+    { -330.92f, -3.03f, -152.85f},                          // End position
+    { -297.32f, -7.32f, -152.85f}                           // Walk out of the door
+};
+
+struct npc_kernobee : public CreatureScript
+{
+    npc_kernobee() : CreatureScript("npc_kernobee") {}
+
+    struct npc_kernobeeAI : public FollowerAI
+    {
+        npc_kernobeeAI(Creature* pCreature) : FollowerAI(pCreature)
+        {
+        }
+
+        uint32 m_uiCheckEndposTimer;
+
+        void Reset() override
+        {
+            m_uiCheckEndposTimer = 10000;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_EVENT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                // No idea why he has UNIT_STAND_STATE_DEAD in UDB ..
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                StartFollow((Player*)pInvoker, 0, GetQuestTemplateStore(uiMiscValue));
+            }
+        }
+
+        void UpdateFollowerAI(const uint32 uiDiff)
+        {
+            FollowerAI::UpdateFollowerAI(uiDiff);               // Do combat handling
+
+            if (m_creature->IsInCombat() || !HasFollowState(STATE_FOLLOW_INPROGRESS) || HasFollowState(STATE_FOLLOW_COMPLETE))
+            {
+                return;
+            }
+
+            if (m_uiCheckEndposTimer < uiDiff)
+            {
+                m_uiCheckEndposTimer = 500;
+                if (m_creature->IsWithinDist3d(aKernobeePositions[0][0], aKernobeePositions[0][1], aKernobeePositions[0][2], 2 * INTERACTION_DISTANCE))
+                {
+                    SetFollowComplete(true);
+                    if (Player* pPlayer = GetLeaderForFollower())
+                    {
+                        pPlayer->GroupEventHappens(QUEST_A_FINE_MESS, m_creature);
+                    }
+                    m_creature->GetMotionMaster()->MovePoint(1, aKernobeePositions[1][0], aKernobeePositions[1][1], aKernobeePositions[1][2], false);
+                    m_creature->ForcedDespawn(2000);
+                }
+            }
+            else
+            {
+                m_uiCheckEndposTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kernobeeAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_A_FINE_MESS)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_EVENT, pPlayer, pCreature, pQuest->GetQuestId());
+        }
+
+        return true;
+    }
+};
+
+void AddSC_gnomeregan()
+{
+    Script *s;
+    s = new npc_blastmaster_emi_shortfuse();
+    s->RegisterSelf();
+    s = new npc_kernobee();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_blastmaster_emi_shortfuse";
+    //pNewScript->GetAI = &GetAI_npc_blastmaster_emi_shortfuse;
+    //pNewScript->pGossipHello = &GossipHello_npc_blastmaster_emi_shortfuse;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_blastmaster_emi_shortfuse;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kernobee";
+    //pNewScript->GetAI = &GetAI_npc_kernobee;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_kernobee;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/gnomeregan/gnomeregan.h b/src/modules/SD3/scripts/eastern_kingdoms/gnomeregan/gnomeregan.h
new file mode 100644
index 000000000..f4a1a7e74
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/gnomeregan/gnomeregan.h
@@ -0,0 +1,78 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_GNOMEREGAN_H
+#define DEF_GNOMEREGAN_H
+
+enum
+{
+    MAX_ENCOUNTER               = 2,                        // Only Grubbis and Thermaplugg need treatment
+    MAX_GNOME_FACES             = 6,
+    MAX_EXPLOSIVES_PER_SIDE     = 2,
+
+    TYPE_GRUBBIS                = 1,
+    TYPE_THERMAPLUGG            = 2,
+    TYPE_EXPLOSIVE_CHARGE       = 3,
+    TYPE_DO_BOMB_OFF            = 4,
+
+    DATA_EXPLOSIVE_CHARGE_1     = 1,
+    DATA_EXPLOSIVE_CHARGE_2     = 2,
+    DATA_EXPLOSIVE_CHARGE_3     = 3,
+    DATA_EXPLOSIVE_CHARGE_4     = 4,
+    DATA_EXPLOSIVE_CHARGE_USE   = 5,
+
+    NPC_MEKGINEER_THERMAPLUGG = 7800,
+    NPC_BLASTMASTER_SHORTFUSE = 7998,
+
+    GO_RED_ROCKET               = 103820,
+    GO_CAVE_IN_NORTH            = 146085,
+    GO_CAVE_IN_SOUTH            = 146086,
+    GO_EXPLOSIVE_CHARGE         = 144065,
+    GO_THE_FINAL_CHAMBER        = 142207,
+
+    GO_GNOME_FACE_1             = 142211,
+    GO_GNOME_FACE_2             = 142210,
+    GO_GNOME_FACE_3             = 142209,
+    GO_GNOME_FACE_4             = 142208,
+    GO_GNOME_FACE_5             = 142213,
+    GO_GNOME_FACE_6             = 142212,
+
+    GO_BUTTON_1                 = 142214,
+    GO_BUTTON_2                 = 142215,
+    GO_BUTTON_3                 = 142216,
+    GO_BUTTON_4                 = 142217,
+    GO_BUTTON_5                 = 142218,
+    GO_BUTTON_6                 = 142219
+};
+
+struct sBombFace
+{
+    ObjectGuid m_gnomeFaceGuid;
+    bool m_bActivated;
+    uint32 m_uiBombTimer;
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp b/src/modules/SD3/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp
new file mode 100644
index 000000000..45e035ed6
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp
@@ -0,0 +1,332 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Gnomeregan
+ * SD%Complete: 90
+ * SDComment:   Support for Grubbis and Thermaplugg Encounters
+ * SDCategory:  Gnomeregan
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "gnomeregan.h"
+
+static bool sortFromEastToWest(GameObject* pFirst, GameObject* pSecond)
+{
+    return pFirst && pSecond && pFirst->GetPositionY() < pSecond->GetPositionY();
+}
+
+struct is_gnomeregan : public InstanceScript
+{
+    is_gnomeregan() : InstanceScript("instance_gnomeregan") {}
+
+    class instance_gnomeregan : public ScriptedInstance
+    {
+    public:
+        instance_gnomeregan(Map* pMap) : ScriptedInstance(pMap)
+        {
+            Initialize();
+        }
+
+        ~instance_gnomeregan() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_BLASTMASTER_SHORTFUSE:
+            case NPC_MEKGINEER_THERMAPLUGG:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            default:
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_CAVE_IN_NORTH:
+            case GO_CAVE_IN_SOUTH:
+            case GO_THE_FINAL_CHAMBER:
+            case GO_GNOME_FACE_1:
+            case GO_GNOME_FACE_2:
+            case GO_GNOME_FACE_3:
+            case GO_GNOME_FACE_4:
+            case GO_GNOME_FACE_5:
+            case GO_GNOME_FACE_6:
+                m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+                break;
+
+            case GO_RED_ROCKET:
+                m_lRedRocketGUIDs.push_back(pGo->GetObjectGuid());
+                return;
+            case GO_EXPLOSIVE_CHARGE:
+                m_luiExplosiveChargeGUIDs.push_back(pGo->GetObjectGuid());
+                return;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_GRUBBIS:
+                m_auiEncounter[0] = uiData;
+                if (uiData == IN_PROGRESS)
+                {
+                    // Sort the explosive charges if needed
+                    if (!m_luiExplosiveChargeGUIDs.empty())
+                    {
+                        std::list<GameObject*> lExplosiveCharges;
+                        for (GuidList::const_iterator itr = m_luiExplosiveChargeGUIDs.begin(); itr != m_luiExplosiveChargeGUIDs.end(); ++itr)
+                        {
+                            if (GameObject* pCharge = instance->GetGameObject(*itr))
+                            {
+                                lExplosiveCharges.push_back(pCharge);
+                            }
+                        }
+                        m_luiExplosiveChargeGUIDs.clear();
+
+                        // Sort from east to west
+                        lExplosiveCharges.sort(sortFromEastToWest);
+
+                        // Sort to south and north
+                        uint8 uiCounterSouth = 0;
+                        uint8 uiCounterNorth = 0;
+                        GameObject* pCaveInSouth = GetSingleGameObjectFromStorage(GO_CAVE_IN_SOUTH);
+                        GameObject* pCaveInNorth = GetSingleGameObjectFromStorage(GO_CAVE_IN_NORTH);
+                        if (pCaveInSouth && pCaveInNorth)
+                        {
+                            for (std::list<GameObject*>::iterator itr = lExplosiveCharges.begin(); itr != lExplosiveCharges.end(); ++itr)
+                            {
+                                if ((*itr)->GetDistanceOrder(pCaveInSouth, pCaveInNorth) && uiCounterSouth < MAX_EXPLOSIVES_PER_SIDE)
+                                {
+                                    m_aExplosiveSortedGuids[0][uiCounterSouth] = (*itr)->GetObjectGuid();
+                                    ++uiCounterSouth;
+                                }
+                                else if (uiCounterNorth < MAX_EXPLOSIVES_PER_SIDE)
+                                {
+                                    m_aExplosiveSortedGuids[1][uiCounterNorth] = (*itr)->GetObjectGuid();
+                                    ++uiCounterNorth;
+                                }
+                            }
+                        }
+                    }
+                }
+                if (uiData == FAIL)
+                {
+                    // Despawn possible spawned explosive charges
+                    SetData(TYPE_EXPLOSIVE_CHARGE, DATA_EXPLOSIVE_CHARGE_USE);
+                }
+                if (uiData == DONE)
+                {
+                    for (GuidList::const_iterator itr = m_lRedRocketGUIDs.begin(); itr != m_lRedRocketGUIDs.end(); ++itr)
+                    {
+                        DoRespawnGameObject(*itr, HOUR);
+                    }
+                }
+                break;
+            case TYPE_EXPLOSIVE_CHARGE:
+                switch (uiData)
+                {
+                case DATA_EXPLOSIVE_CHARGE_1:
+                    DoRespawnGameObject(m_aExplosiveSortedGuids[0][0], HOUR);
+                    m_luiSpawnedExplosiveChargeGUIDs.push_back(m_aExplosiveSortedGuids[0][0]);
+                    break;
+                case DATA_EXPLOSIVE_CHARGE_2:
+                    DoRespawnGameObject(m_aExplosiveSortedGuids[0][1], HOUR);
+                    m_luiSpawnedExplosiveChargeGUIDs.push_back(m_aExplosiveSortedGuids[0][1]);
+                    break;
+                case DATA_EXPLOSIVE_CHARGE_3:
+                    DoRespawnGameObject(m_aExplosiveSortedGuids[1][0], HOUR);
+                    m_luiSpawnedExplosiveChargeGUIDs.push_back(m_aExplosiveSortedGuids[1][0]);
+                    break;
+                case DATA_EXPLOSIVE_CHARGE_4:
+                    DoRespawnGameObject(m_aExplosiveSortedGuids[1][1], HOUR);
+                    m_luiSpawnedExplosiveChargeGUIDs.push_back(m_aExplosiveSortedGuids[1][1]);
+                    break;
+                case DATA_EXPLOSIVE_CHARGE_USE:
+                    Creature* pBlastmaster = GetSingleCreatureFromStorage(NPC_BLASTMASTER_SHORTFUSE);
+                    if (!pBlastmaster)
+                    {
+                        break;
+                    }
+                    for (GuidList::const_iterator itr = m_luiSpawnedExplosiveChargeGUIDs.begin(); itr != m_luiSpawnedExplosiveChargeGUIDs.end(); ++itr)
+                    {
+                        if (GameObject* pExplosive = instance->GetGameObject(*itr))
+                        {
+                            pExplosive->Use(pBlastmaster);
+                        }
+                    }
+                    m_luiSpawnedExplosiveChargeGUIDs.clear();
+                    break;
+                }
+                return;
+            case TYPE_THERMAPLUGG:
+                {
+                Creature *thermaplugg = GetSingleCreatureFromStorage(NPC_MEKGINEER_THERMAPLUGG);
+                m_auiEncounter[1] = uiData;
+                if (uiData == IN_PROGRESS)
+                {
+                    // Make Door locked
+                    if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_THE_FINAL_CHAMBER))
+                    {
+                        pDoor->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED);
+                        if (pDoor->getLootState() == GO_ACTIVATED)
+                        {
+                            pDoor->ResetDoorOrButton();
+                        }
+                    }
+
+                    // Always directly activates this bomb-face
+                    if (thermaplugg && thermaplugg->AI())
+                        thermaplugg->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, thermaplugg, thermaplugg, 2);
+                }
+                else if (uiData == DONE || uiData == FAIL)
+                {
+                    // Make Door unlocked again
+                    if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_THE_FINAL_CHAMBER))
+                    {
+                        pDoor->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED);
+                        if (pDoor->getLootState() == GO_READY)
+                        {
+                            pDoor->UseDoorOrButton();
+                        }
+                    }
+
+                    // Deactivate all remaining BombFaces
+                    if (thermaplugg && thermaplugg->AI())
+                        thermaplugg->AI()->SendAIEvent(AI_EVENT_CUSTOM_C, thermaplugg, thermaplugg);
+                }
+                break;
+                }
+            case TYPE_DO_BOMB_OFF:
+                if (Creature *thermaplugg = GetSingleCreatureFromStorage(NPC_MEKGINEER_THERMAPLUGG))
+                {
+                    if (thermaplugg->AI())
+                        thermaplugg->AI()->SendAIEvent(AI_EVENT_CUSTOM_B, thermaplugg, thermaplugg, uiData);
+                }
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case TYPE_GRUBBIS:
+                return m_auiEncounter[0];
+            case TYPE_THERMAPLUGG:
+                return m_auiEncounter[1];
+            default:
+                return 0;
+            }
+        }
+
+        uint64 GetData64(uint32 type) const override
+        {
+            EntryGuidMap::const_iterator find = m_mGoEntryGuidStore.find(type);
+            if (find != m_mGoEntryGuidStore.end())
+                return find->second.GetRawValue();
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    protected:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        ObjectGuid m_aExplosiveSortedGuids[2][MAX_EXPLOSIVES_PER_SIDE];
+
+        GuidList m_luiExplosiveChargeGUIDs;
+        GuidList m_luiSpawnedExplosiveChargeGUIDs;
+        GuidList m_lRedRocketGUIDs;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_gnomeregan(pMap);
+    }
+};
+
+void AddSC_instance_gnomeregan()
+{
+    Script* s;
+    s = new is_gnomeregan();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_gnomeregan";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_gnomeregan;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/hinterlands.cpp b/src/modules/SD3/scripts/eastern_kingdoms/hinterlands.cpp
new file mode 100644
index 000000000..f0ea0bb0a
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/hinterlands.cpp
@@ -0,0 +1,384 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Hinterlands
+ * SD%Complete: 100
+ * SDComment:   Quest support: 836, 2742.
+ * SDCategory:  The Hinterlands
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_00x09hl
+ * npc_rinji
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_00x09hl
+######*/
+
+enum
+{
+    SAY_OOX_START           = -1000287,
+    SAY_OOX_AGGRO1          = -1000288,
+    SAY_OOX_AGGRO2          = -1000289,
+    SAY_OOX_AMBUSH          = -1000290,
+    SAY_OOX_END             = -1000292,
+
+    QUEST_RESQUE_OOX_09     = 836,
+
+    NPC_MARAUDING_OWL       = 7808,
+    NPC_VILE_AMBUSHER       = 7809
+};
+
+struct npc_00x09hl : public CreatureScript
+{
+    npc_00x09hl() : CreatureScript("npc_00x09hl") {}
+
+    struct npc_00x09hlAI : public npc_escortAI
+    {
+        npc_00x09hlAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 26:
+                DoScriptText(SAY_OOX_AMBUSH, m_creature);
+                break;
+            case 43:
+                DoScriptText(SAY_OOX_AMBUSH, m_creature);
+                break;
+            case 64:
+                DoScriptText(SAY_OOX_END, m_creature);
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_RESQUE_OOX_09, m_creature);
+                }
+                break;
+            }
+        }
+
+        void WaypointStart(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 27:
+                for (uint8 i = 0; i < 3; ++i)
+                {
+                    float fX, fY, fZ;
+                    m_creature->GetRandomPoint(147.927444f, -3851.513428f, 130.893f, 7.0f, fX, fY, fZ);
+
+                    m_creature->SummonCreature(NPC_MARAUDING_OWL, fX, fY, fZ, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 25000);
+                }
+                break;
+            case 44:
+                for (uint8 i = 0; i < 3; ++i)
+                {
+                    float fX, fY, fZ;
+                    m_creature->GetRandomPoint(-141.151581f, -4291.213867f, 120.130f, 7.0f, fX, fY, fZ);
+
+                    m_creature->SummonCreature(NPC_VILE_AMBUSHER, fX, fY, fZ, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 25000);
+                }
+                break;
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (pWho->GetEntry() == NPC_MARAUDING_OWL || pWho->GetEntry() == NPC_VILE_AMBUSHER)
+            {
+                return;
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_OOX_AGGRO1 : SAY_OOX_AGGRO2, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_RESQUE_OOX_09)
+        {
+            pCreature->SetStandState(UNIT_STAND_STATE_STAND);
+            pCreature->SetFactionTemporary(pPlayer->GetTeam() == ALLIANCE ? FACTION_ESCORT_A_PASSIVE : FACTION_ESCORT_H_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+
+            DoScriptText(SAY_OOX_START, pCreature, pPlayer);
+
+            if (npc_00x09hlAI* pEscortAI = dynamic_cast<npc_00x09hlAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_00x09hlAI(pCreature);
+    }
+};
+
+/*######
+## npc_rinji
+######*/
+
+enum
+{
+    SAY_RIN_FREE            = -1000403,
+    SAY_RIN_BY_OUTRUNNER    = -1000404,
+    SAY_RIN_HELP_1          = -1000405,
+    SAY_RIN_HELP_2          = -1000406,
+    SAY_RIN_COMPLETE        = -1000407,
+    SAY_RIN_PROGRESS_1      = -1000408,
+    SAY_RIN_PROGRESS_2      = -1000409,
+
+    QUEST_RINJI_TRAPPED     = 2742,
+    NPC_RANGER              = 2694,
+    NPC_OUTRUNNER           = 2691,
+    GO_RINJI_CAGE           = 142036
+};
+
+struct Location
+{
+    float m_fX, m_fY, m_fZ;
+};
+
+Location m_afAmbushSpawn[] =
+{
+    {191.29620f, -2839.329346f, 107.388f},
+    {70.972466f, -2848.674805f, 109.459f}
+};
+
+Location m_afAmbushMoveTo[] =
+{
+    {166.63038f, -2824.780273f, 108.153f},
+    {70.886589f, -2874.335449f, 116.675f}
+};
+
+struct npc_rinji : public CreatureScript
+{
+    npc_rinji() : CreatureScript("npc_rinji") {}
+
+    struct npc_rinjiAI : public npc_escortAI
+    {
+        npc_rinjiAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_bIsByOutrunner = false;
+            m_iSpawnId = 0;
+        }
+
+        bool m_bIsByOutrunner;
+        uint32 m_uiPostEventCount;
+        uint32 m_uiPostEventTimer;
+        int m_iSpawnId;
+
+        void Reset() override
+        {
+            m_uiPostEventCount = 0;
+            m_uiPostEventTimer = 3000;
+        }
+
+        void JustRespawned() override
+        {
+            m_bIsByOutrunner = false;
+            m_iSpawnId = 0;
+
+            npc_escortAI::JustRespawned();
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                if (pWho->GetEntry() == NPC_OUTRUNNER && !m_bIsByOutrunner)
+                {
+                    DoScriptText(SAY_RIN_BY_OUTRUNNER, pWho);
+                    m_bIsByOutrunner = true;
+                }
+
+                if (urand(0, 3))
+                {
+                    return;
+                }
+
+                // only if attacked and escorter is not in combat?
+                DoScriptText(urand(0, 1) ? SAY_RIN_HELP_1 : SAY_RIN_HELP_2, m_creature);
+            }
+        }
+
+        void DoSpawnAmbush(bool bFirst)
+        {
+            if (!bFirst)
+            {
+                m_iSpawnId = 1;
+            }
+
+            m_creature->SummonCreature(NPC_RANGER,
+                m_afAmbushSpawn[m_iSpawnId].m_fX, m_afAmbushSpawn[m_iSpawnId].m_fY, m_afAmbushSpawn[m_iSpawnId].m_fZ, 0.0f,
+                TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN, 60000);
+
+            for (int i = 0; i < 2; ++i)
+            {
+                m_creature->SummonCreature(NPC_OUTRUNNER,
+                    m_afAmbushSpawn[m_iSpawnId].m_fX, m_afAmbushSpawn[m_iSpawnId].m_fY, m_afAmbushSpawn[m_iSpawnId].m_fZ, 0.0f,
+                    TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN, 60000);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            m_creature->SetWalk(false);
+            pSummoned->GetMotionMaster()->MovePoint(0, m_afAmbushMoveTo[m_iSpawnId].m_fX, m_afAmbushMoveTo[m_iSpawnId].m_fY, m_afAmbushMoveTo[m_iSpawnId].m_fZ);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 1:
+                DoScriptText(SAY_RIN_FREE, m_creature, pPlayer);
+                break;
+            case 7:
+                DoSpawnAmbush(true);
+                break;
+            case 13:
+                DoSpawnAmbush(false);
+                break;
+            case 17:
+                DoScriptText(SAY_RIN_COMPLETE, m_creature, pPlayer);
+                pPlayer->GroupEventHappens(QUEST_RINJI_TRAPPED, m_creature);
+                SetRun();
+                m_uiPostEventCount = 1;
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            // Check if we have a current target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (HasEscortState(STATE_ESCORT_ESCORTING) && m_uiPostEventCount)
+                {
+                    if (m_uiPostEventTimer < uiDiff)
+                    {
+                        m_uiPostEventTimer = 3000;
+
+                        if (Player* pPlayer = GetPlayerForEscort())
+                        {
+                            switch (m_uiPostEventCount)
+                            {
+                            case 1:
+                                DoScriptText(SAY_RIN_PROGRESS_1, m_creature, pPlayer);
+                                ++m_uiPostEventCount;
+                                break;
+                            case 2:
+                                DoScriptText(SAY_RIN_PROGRESS_2, m_creature, pPlayer);
+                                m_uiPostEventCount = 0;
+                                break;
+                            }
+                        }
+                        else
+                        {
+                            m_creature->ForcedDespawn();
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        m_uiPostEventTimer -= uiDiff;
+                    }
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_RINJI_TRAPPED)
+        {
+            if (GameObject* pGo = GetClosestGameObjectWithEntry(pCreature, GO_RINJI_CAGE, INTERACTION_DISTANCE))
+            {
+                pGo->UseDoorOrButton();
+            }
+
+            if (npc_rinjiAI* pEscortAI = dynamic_cast<npc_rinjiAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_rinjiAI(pCreature);
+    }
+};
+
+void AddSC_hinterlands()
+{
+    Script* s;
+    s = new npc_00x09hl();
+    s->RegisterSelf();
+    s = new npc_rinji();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_00x09hl";
+    //pNewScript->GetAI = &GetAI_npc_00x09hl;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_00x09hl;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_rinji";
+    //pNewScript->GetAI = &GetAI_npc_rinji;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_rinji;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/ironforge.cpp b/src/modules/SD3/scripts/eastern_kingdoms/ironforge.cpp
new file mode 100644
index 000000000..6ad8da9c8
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/ironforge.cpp
@@ -0,0 +1,45 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Ironforge
+ * SD%Complete: 0
+ * SDComment:   Placeholder
+ * SDCategory:  Ironforge
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+void AddSC_ironforge()
+{
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/isle_of_queldanas.cpp b/src/modules/SD3/scripts/eastern_kingdoms/isle_of_queldanas.cpp
new file mode 100644
index 000000000..96a1494d8
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/isle_of_queldanas.cpp
@@ -0,0 +1,107 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Isle_of_Queldanas
+SD%Complete: 100
+SDComment: Quest support: 11524, 11525
+SDCategory: Isle Of Quel'Danas
+EndScriptData */
+
+/* ContentData
+npc_converted_sentry
+EndContentData */
+
+#include "precompiled.h"
+
+/*######
+## npc_converted_sentry
+######*/
+
+enum
+{
+    SAY_CONVERTED_1             = -1000188,
+    SAY_CONVERTED_2             = -1000189,
+
+    SPELL_CONVERT_CREDIT        = 45009,
+    TIME_PET_DURATION           = 7500
+};
+
+struct npc_converted_sentry : public CreatureScript
+{
+    npc_converted_sentry() : CreatureScript("npc_converted_sentry") {}
+
+    struct npc_converted_sentryAI : public ScriptedAI
+    {
+        npc_converted_sentryAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiCreditTimer;
+
+        void Reset() override
+        {
+            m_uiCreditTimer = 2500;
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiCreditTimer)
+            {
+                if (m_uiCreditTimer <= uiDiff)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_CONVERTED_1 : SAY_CONVERTED_2, m_creature);
+
+                    DoCastSpellIfCan(m_creature, SPELL_CONVERT_CREDIT);
+                    ((Pet*)m_creature)->SetDuration(TIME_PET_DURATION);
+                    m_uiCreditTimer = 0;
+                }
+                else
+                {
+                    m_uiCreditTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_converted_sentryAI(pCreature);
+    }
+};
+
+void AddSC_isle_of_queldanas()
+{
+    Script* s;
+
+    s = new npc_converted_sentry();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_converted_sentry";
+    //pNewScript->GetAI = &GetAI_npc_converted_sentry;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_curator.cpp b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_curator.cpp
new file mode 100644
index 000000000..9b2c2e0ce
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_curator.cpp
@@ -0,0 +1,264 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Curator
+SD%Complete: 90%
+SDComment:
+SDCategory: Karazhan
+EndScriptData */
+
+#include "precompiled.h"
+#include "karazhan.h"
+
+enum
+{
+    SAY_AGGRO                   = -1532057,
+    SAY_SUMMON1                 = -1532058,
+    SAY_SUMMON2                 = -1532059,
+    SAY_EVOCATE                 = -1532060,
+    SAY_ENRAGE                  = -1532061,
+    SAY_KILL1                   = -1532062,
+    SAY_KILL2                   = -1532063,
+    SAY_DEATH                   = -1532064,
+
+    // Flare
+    NPC_ASTRAL_FLARE            = 17096,
+    SPELL_ASTRAL_FLARE_PASSIVE  = 30234,
+    SPELL_ASTRAL_FLARE_VISUAL   = 30237,
+
+    // The Curator
+    SPELL_HATEFUL_BOLT          = 30383,
+    SPELL_EVOCATION             = 30254,
+    SPELL_ARCANE_INFUSION       = 30403,
+    SPELL_BERSERK               = 26662
+};
+
+struct boss_curator : public CreatureScript
+{
+    boss_curator() : CreatureScript("boss_curator") {}
+
+    struct boss_curatorAI : public ScriptedAI
+    {
+        boss_curatorAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiFlareTimer;
+        uint32 m_uiHatefulBoltTimer;
+        uint32 m_uiBerserkTimer;
+
+        bool m_bIsEnraged;
+
+        void Reset() override
+        {
+            m_uiFlareTimer = 10000;
+            m_uiHatefulBoltTimer = 15000;                       // This time may be wrong
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+            m_bIsEnraged = false;
+
+            m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, true);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_CURATOR, DONE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_CURATOR, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_CURATOR, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_ASTRAL_FLARE)
+            {
+                // Flare start with aggro on it's target, should be immune to arcane
+                pSummoned->CastSpell(pSummoned, SPELL_ASTRAL_FLARE_PASSIVE, true);
+                pSummoned->CastSpell(pSummoned, SPELL_ASTRAL_FLARE_VISUAL, true);
+                pSummoned->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, true);
+
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // always decrease BerserkTimer
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    // Also interrupt evocation
+                    m_creature->RemoveAurasDueToSpell(SPELL_EVOCATION);
+
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        // ScriptText needs confirmation
+                        DoScriptText(SAY_ENRAGE, m_creature);
+
+                        // don't know if he's supposed to do summon/evocate after hard enrage (probably not)
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            // not supposed to do anything while evocate
+            if (m_creature->HasAura(SPELL_EVOCATION))
+            {
+                return;
+            }
+
+            if (!m_bIsEnraged)
+            {
+                if (m_uiFlareTimer < uiDiff)
+                {
+                    m_uiFlareTimer = 10000;
+
+                    // summon Astral Flare
+                    float fX, fY, fZ;
+                    m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 10.0f, fX, fY, fZ);
+                    m_creature->SummonCreature(NPC_ASTRAL_FLARE, fX, fY, fZ, 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+
+                    // reduce mana by 10% of maximum
+                    if (int32 iMana = m_creature->GetMaxPower(POWER_MANA))
+                    {
+                        m_creature->ModifyPower(POWER_MANA, -(iMana / 10));
+
+                        // if this get's us below 10%, then we evocate (the 10th should be summoned now
+                        if (m_creature->GetPower(POWER_MANA) * 10 < m_creature->GetMaxPower(POWER_MANA))
+                        {
+                            if (DoCastSpellIfCan(m_creature, SPELL_EVOCATION, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                            {
+                                DoScriptText(SAY_EVOCATE, m_creature);
+                                // this small delay should make first flare appear fast after evocate, and also prevent possible spawn flood
+                                m_uiFlareTimer = 1000;
+                            }
+                            return;
+                        }
+                        else
+                        {
+                            switch (urand(0, 3))
+                            {
+                            case 0: DoScriptText(SAY_SUMMON1, m_creature); break;
+                            case 1: DoScriptText(SAY_SUMMON2, m_creature); break;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiFlareTimer -= uiDiff;
+                }
+
+                if (m_creature->GetHealthPercent() < 15.0f)
+                {
+                    // Also stop evocation
+                    m_creature->RemoveAurasDueToSpell(SPELL_EVOCATION);
+
+                    if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_INFUSION, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        DoScriptText(SAY_ENRAGE, m_creature);
+                        m_bIsEnraged = true;
+                    }
+                }
+            }
+
+            if (m_uiHatefulBoltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_HATEFUL_BOLT) == CAST_OK)
+                    {
+                        m_uiHatefulBoltTimer = m_bIsEnraged ? 7000 : 15000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiHatefulBoltTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_curatorAI(pCreature);
+    }
+};
+
+void AddSC_boss_curator()
+{
+    Script* s;
+    s = new boss_curator();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_curator";
+    //pNewScript->GetAI = &GetAI_boss_curator;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp
new file mode 100644
index 000000000..dce78b7ff
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp
@@ -0,0 +1,198 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Maiden_of_Virtue
+SD%Complete: 100
+SDComment:
+SDCategory: Karazhan
+EndScriptData */
+
+#include "precompiled.h"
+#include "karazhan.h"
+
+enum
+{
+    SAY_AGGRO               = -1532018,
+    SAY_SLAY1               = -1532019,
+    SAY_SLAY2               = -1532020,
+    SAY_SLAY3               = -1532021,
+    SAY_REPENTANCE1         = -1532022,
+    SAY_REPENTANCE2         = -1532023,
+    SAY_DEATH               = -1532024,
+
+    SPELL_REPENTANCE        = 29511,
+    SPELL_HOLYFIRE          = 29522,
+    SPELL_HOLYWRATH         = 32445,
+    SPELL_HOLYGROUND        = 29512
+};
+
+struct boss_maiden_of_virtue : public CreatureScript
+{
+    boss_maiden_of_virtue() : CreatureScript("boss_maiden_of_virtue") {}
+
+    struct boss_maiden_of_virtueAI : public ScriptedAI
+    {
+        boss_maiden_of_virtueAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiRepentanceTimer;
+        uint32 m_uiHolyfireTimer;
+        uint32 m_uiHolywrathTimer;
+        uint32 m_uiHolygroundTimer;
+
+        void Reset() override
+        {
+            m_uiRepentanceTimer = urand(25000, 40000);
+            m_uiHolyfireTimer = urand(8000, 25000);
+            m_uiHolywrathTimer = urand(15000, 25000);
+            m_uiHolygroundTimer = 3000;
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 5))                                // 50% chance to say something out of 3 texts
+            {
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAIDEN, DONE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAIDEN, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAIDEN, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiHolygroundTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_HOLYGROUND, CAST_TRIGGERED) == CAST_OK)
+                {
+                    m_uiHolygroundTimer = 3000;
+                }
+            }
+            else
+            {
+                m_uiHolygroundTimer -= uiDiff;
+            }
+
+            if (m_uiRepentanceTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_REPENTANCE) == CAST_OK)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_REPENTANCE1 : SAY_REPENTANCE2, m_creature);
+                    m_uiRepentanceTimer = urand(25000, 35000);
+                }
+            }
+            else
+            {
+                m_uiRepentanceTimer -= uiDiff;
+            }
+
+            if (m_uiHolyfireTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_HOLYFIRE, SELECT_FLAG_NOT_IN_MELEE_RANGE))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_HOLYFIRE) == CAST_OK)
+                    {
+                        m_uiHolyfireTimer = urand(8000, 23000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiHolyfireTimer -= uiDiff;
+            }
+
+            if (m_uiHolywrathTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    DoCastSpellIfCan(pTarget, SPELL_HOLYWRATH);
+                }
+
+                m_uiHolywrathTimer = urand(20000, 25000);
+            }
+            else
+            {
+                m_uiHolywrathTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_maiden_of_virtueAI(pCreature);
+    }
+};
+
+void AddSC_boss_maiden_of_virtue()
+{
+    Script* s;
+    s = new boss_maiden_of_virtue();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_maiden_of_virtue";
+    //pNewScript->GetAI = &GetAI_boss_maiden_of_virtue;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
new file mode 100644
index 000000000..4b930b355
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
@@ -0,0 +1,453 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Midnight
+SD%Complete: 100
+SDComment:
+SDCategory: Karazhan
+EndScriptData */
+
+#include "precompiled.h"
+#include "karazhan.h"
+
+enum
+{
+    SAY_MIDNIGHT_KILL           = -1532000,
+    SAY_APPEAR1                 = -1532001,
+    SAY_APPEAR2                 = -1532002,
+    SAY_APPEAR3                 = -1532003,
+    SAY_MOUNT                   = -1532004,
+    SAY_KILL1                   = -1532005,
+    SAY_KILL2                   = -1532006,
+    SAY_DISARMED                = -1532007,
+    SAY_DEATH                   = -1532008,
+    SAY_RANDOM1                 = -1532009,
+    SAY_RANDOM2                 = -1532010,
+
+    // Midnight
+    SPELL_MOUNT                 = 29770,
+    SPELL_KNOCKDOWN             = 29711,
+    SPELL_SUMMON_ATTUMEN        = 29714,
+    SPELL_SUMMON_ATTUMEN_MOUNTED = 29799,
+
+    // Attumen
+    SPELL_SHADOWCLEAVE          = 29832,
+    SPELL_INTANGIBLE_PRESENCE   = 29833,
+    SPELL_UPPERCUT              = 29850,
+    SPELL_BERSERKER_CHARGE      = 26561,                    // Only when mounted
+
+    NPC_ATTUMEN_MOUNTED         = 16152,
+};
+
+struct boss_midnight : public CreatureScript
+{
+    boss_midnight() : CreatureScript("boss_midnight") {}
+
+    struct boss_midnightAI : public ScriptedAI
+    {
+        boss_midnightAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+        uint32 m_uiKnockDown;
+
+        void Reset() override
+        {
+            m_uiPhase = 0;
+            m_uiKnockDown = urand(6000, 9000);
+
+            SetCombatMovement(true);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ATTUMEN, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (m_uiPhase == 1 && m_pInstance)
+            {
+                if (Creature* pAttumen = m_pInstance->GetSingleCreatureFromStorage(NPC_ATTUMEN))
+                {
+                    DoScriptText(SAY_MIDNIGHT_KILL, pAttumen);
+                }
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ATTUMEN, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (m_creature->getVictim())
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+
+            if (pSummoned->GetEntry() == NPC_ATTUMEN)
+            {
+                // Attumen yells when spawned
+                switch (urand(0, 2))
+                {
+                case 0: DoScriptText(SAY_APPEAR1, pSummoned); break;
+                case 1: DoScriptText(SAY_APPEAR2, pSummoned); break;
+                case 2: DoScriptText(SAY_APPEAR3, pSummoned); break;
+                }
+            }
+            else if (pSummoned->GetEntry() == NPC_ATTUMEN_MOUNTED)
+            {
+                DoScriptText(SAY_MOUNT, pSummoned);
+
+                if (!m_pInstance)
+                {
+                    return;
+                }
+
+                // The summoned has the health equal to the one which has the higher HP percentage of both
+                if (Creature* pAttumen = m_pInstance->GetSingleCreatureFromStorage(NPC_ATTUMEN))
+                {
+                    pSummoned->SetHealth(pAttumen->GetHealth() > m_creature->GetHealth() ? pAttumen->GetHealth() : m_creature->GetHealth());
+                }
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId || !m_pInstance)
+            {
+                return;
+            }
+
+            // Spawn the mounted Attumen and despawn
+            if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_ATTUMEN_MOUNTED, CAST_TRIGGERED) == CAST_OK)
+            {
+                if (Creature* pAttumen = m_pInstance->GetSingleCreatureFromStorage(NPC_ATTUMEN))
+                {
+                    pAttumen->ForcedDespawn();
+                }
+
+                m_creature->ForcedDespawn();
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature && pInvoker->GetTypeId() == TYPEID_UNIT)
+            {
+                if (pInvoker)   // Wrapper to prepare phase 3
+                {
+                    m_uiPhase = 2;
+
+                    SetCombatMovement(false);
+                    m_creature->GetMotionMaster()->MovePoint(1, pInvoker->GetPositionX(), pInvoker->GetPositionY(), pInvoker->GetPositionZ());
+                }
+            }
+        }
+        
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Stop attacking during the mount phase
+            if (m_uiPhase == 2)
+            {
+                return;
+            }
+
+            // Spawn Attumen on 95% hp
+            if (m_uiPhase == 0 && m_creature->GetHealthPercent() < 95.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_ATTUMEN) == CAST_OK)
+                {
+                    m_uiPhase = 1;
+                }
+            }
+
+            // Spawn Attumen mounted at 25%
+            if (m_uiPhase == 1 && m_creature->GetHealthPercent() < 25.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MOUNT, CAST_TRIGGERED) == CAST_OK)
+                {
+                    m_uiPhase = 2;
+                }
+            }
+
+            if (m_uiKnockDown < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_KNOCKDOWN) == CAST_OK)
+                {
+                    m_uiKnockDown = urand(6000, 9000);
+                }
+            }
+            else
+            {
+                m_uiKnockDown -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_midnightAI(pCreature);
+    }
+};
+
+struct boss_attumen : public CreatureScript
+{
+    boss_attumen() : CreatureScript("boss_attumen") {}
+
+    struct boss_attumenAI : public ScriptedAI
+    {
+        boss_attumenAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiCurseTimer;
+        uint32 m_uiRandomYellTimer;
+        uint32 m_uiKnockDown;
+        uint32 m_uiChargeTimer;                                 // only when mounted
+
+        bool m_bHasSummonRider;
+
+        void Reset() override
+        {
+            m_uiCleaveTimer = urand(10000, 16000);
+            m_uiCurseTimer = 30000;
+            m_uiRandomYellTimer = urand(30000, 60000);          // Occasionally yell
+            m_uiChargeTimer = 20000;
+            m_uiKnockDown = urand(6000, 9000);
+
+            m_bHasSummonRider = false;
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, m_creature);
+        }
+
+        void SpellHit(Unit* /*pSource*/, const SpellEntry* pSpell) override
+        {
+#if defined (CATA)
+            if (pSpell->GetMechanic() == MECHANIC_DISARM)
+#else
+            if (pSpell->Mechanic == MECHANIC_DISARM)
+#endif
+            {
+                DoScriptText(SAY_DISARMED, m_creature);
+            }
+        }
+
+        void JustDied(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ATTUMEN, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ATTUMEN, FAIL);
+            }
+
+            // Despawn Attumen on fail
+            m_creature->ForcedDespawn();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHADOWCLEAVE) == CAST_OK)
+                {
+                    m_uiCleaveTimer = urand(10000, 16000);
+                }
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            if (m_uiCurseTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_INTANGIBLE_PRESENCE) == CAST_OK)
+                {
+                    m_uiCurseTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiCurseTimer -= uiDiff;
+            }
+
+            if (m_uiRandomYellTimer < uiDiff)
+            {
+                DoScriptText(urand(0, 1) ? SAY_RANDOM1 : SAY_RANDOM2, m_creature);
+                m_uiRandomYellTimer = urand(30000, 60000);
+            }
+            else
+            {
+                m_uiRandomYellTimer -= uiDiff;
+            }
+
+            if (m_uiKnockDown < uiDiff)
+            {
+                // Cast knockdown when mounted, otherwise uppercut
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_creature->GetEntry() == NPC_ATTUMEN_MOUNTED ? SPELL_KNOCKDOWN : SPELL_UPPERCUT) == CAST_OK)
+                {
+                    m_uiKnockDown = urand(6000, 9000);
+                }
+            }
+            else
+            {
+                m_uiKnockDown -= uiDiff;
+            }
+
+            // If creature is mounted then cast charge
+            if (m_creature->GetEntry() == NPC_ATTUMEN_MOUNTED)
+            {
+                if (m_uiChargeTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_BERSERKER_CHARGE, SELECT_FLAG_NOT_IN_MELEE_RANGE | SELECT_FLAG_IN_LOS))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_BERSERKER_CHARGE) == CAST_OK)
+                        {
+                            m_uiChargeTimer = 20000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiChargeTimer = 2000;
+                    }
+                }
+                else
+                {
+                    m_uiChargeTimer -= uiDiff;
+                }
+            }
+            // Else, mount if below 25%
+            else if (!m_bHasSummonRider && m_creature->GetHealthPercent() < 25.0f)
+            {
+                if (Creature* pMidnight = m_pInstance->GetSingleCreatureFromStorage(NPC_MIDNIGHT))
+                {
+                    pMidnight->CastSpell(m_creature, SPELL_MOUNT, true);
+                    m_bHasSummonRider = true;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_attumenAI(pCreature);
+    }
+};
+
+struct spell_mount_attumen : public SpellScript
+{
+    spell_mount_attumen() : SpellScript("spell_mount_attumen") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_MOUNT && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            // Avoid possible DB errors
+            if (pCaster->GetEntry() == NPC_MIDNIGHT && pCreatureTarget->GetEntry() == NPC_ATTUMEN)
+            {
+                // Prepare for mount
+                if (CreatureAI* pMidnightAI = ((Creature*)pCaster)->AI())
+                {
+                    pMidnightAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pCaster->ToCreature(), pCreatureTarget, 0);
+                    //pMidnightAI->DoPrepareMount(pCreatureTarget);
+                }
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_attumen()
+{
+    Script* s;
+
+    s = new boss_attumen();
+    s->RegisterSelf();
+    s = new boss_midnight();
+    s->RegisterSelf();
+    s = new spell_mount_attumen();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_attumen";
+    //pNewScript->GetAI = &GetAI_boss_attumen;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_mount_attumen;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_midnight";
+    //pNewScript->GetAI = &GetAI_boss_midnight;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
new file mode 100644
index 000000000..0886242dd
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
@@ -0,0 +1,338 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Moroes
+SD%Complete: 95
+SDComment: Timers.
+SDCategory: Karazhan
+EndScriptData */
+
+#include "precompiled.h"
+#include "karazhan.h"
+
+enum
+{
+    MAX_ACTIVE_GUESTS   = 4,
+    MAX_GUESTS          = 6,
+
+    SAY_AGGRO           = -1532011,
+    SAY_SPECIAL_1       = -1532012,
+    SAY_SPECIAL_2       = -1532013,
+    SAY_KILL_1          = -1532014,
+    SAY_KILL_2          = -1532015,
+    SAY_KILL_3          = -1532016,
+    SAY_DEATH           = -1532017,
+
+    SPELL_VANISH        = 29448,
+    SPELL_GARROTE       = 37066,
+    SPELL_BLIND         = 34694,
+    SPELL_GOUGE         = 29425,
+    SPELL_FRENZY        = 37023
+};
+
+static const float afLocations[MAX_ACTIVE_GUESTS][4] =
+{
+    { -10991.0f, -1884.33f, 81.73f, 0.614315f},
+    { -10989.4f, -1885.88f, 81.73f, 0.904913f},
+    { -10978.1f, -1887.07f, 81.73f, 2.035550f},
+    { -10975.9f, -1885.81f, 81.73f, 2.253890f}
+};
+
+static const uint32 auiGuests[MAX_GUESTS] =
+{
+    NPC_LADY_KEIRA_BERRYBUCK,
+    NPC_LADY_CATRIONA_VON_INDI,
+    NPC_LORD_CRISPIN_FERENCE,
+    NPC_BARON_RAFE_DREUGER,
+    NPC_BARONESS_DOROTHEA_MILLSTIPE,
+    NPC_LORD_ROBIN_DARIS
+};
+
+struct boss_moroes : public CreatureScript
+{
+    boss_moroes() : CreatureScript("boss_moroes") {}
+
+    struct boss_moroesAI : public ScriptedAI
+    {
+        boss_moroesAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        std::vector<uint32> m_vGuestsEntryList;
+
+        uint32 m_uiVanishTimer;
+        uint32 m_uiBlindTimer;
+        uint32 m_uiGougeTimer;
+        uint32 m_uiWaitTimer;
+
+        bool m_bEnrage;
+
+        void Reset() override
+        {
+            m_uiVanishTimer = 30000;
+            m_uiBlindTimer = 35000;
+            m_uiGougeTimer = 23000;
+            m_uiWaitTimer = 0;
+
+            m_bEnrage = false;
+
+            DoSpawnGuests();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MOROES, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_KILL_1, m_creature); break;
+            case 1: DoScriptText(SAY_KILL_2, m_creature); break;
+            case 2: DoScriptText(SAY_KILL_3, m_creature); break;
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            DoRemoveGarroteAura();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MOROES, FAIL);
+            }
+        }
+
+        void JustDied(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+            DoRemoveGarroteAura();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MOROES, DONE);
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            // Don't evade during vanish phase
+            if (m_uiWaitTimer)
+            {
+                return;
+            }
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void DoSpawnGuests()
+        {
+            // not if m_creature are dead, so avoid
+            if (!m_creature->IsAlive())
+            {
+                return;
+            }
+
+            // it's empty, so first time
+            if (m_vGuestsEntryList.empty())
+            {
+                // pre-allocate size for speed
+                m_vGuestsEntryList.resize(MAX_GUESTS);
+
+                // fill vector array with entries from creature array
+                for (uint8 i = 0; i < MAX_GUESTS; ++i)
+                {
+                    m_vGuestsEntryList[i] = auiGuests[i];
+                }
+
+                std::random_shuffle(m_vGuestsEntryList.begin(), m_vGuestsEntryList.end());
+
+                // Summon the 4 entries
+                for (uint8 i = 0; i < MAX_ACTIVE_GUESTS; ++i)
+                {
+                    m_creature->SummonCreature(m_vGuestsEntryList[i], afLocations[i][0], afLocations[i][1], afLocations[i][2], afLocations[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
+                }
+            }
+            // Resummon the killed adds
+            else
+            {
+                if (!m_pInstance)
+                {
+                    return;
+                }
+
+                for (uint8 i = 0; i < MAX_ACTIVE_GUESTS; ++i)
+                {
+                    // If we already have the creature on the map, then don't summon it
+                    if (m_pInstance->GetSingleCreatureFromStorage(m_vGuestsEntryList[i], true))
+                    {
+                        continue;
+                    }
+
+                    m_creature->SummonCreature(m_vGuestsEntryList[i], afLocations[i][0], afLocations[i][1], afLocations[i][2], afLocations[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
+                }
+            }
+        }
+
+        // Wrapper to remove the Garrote aura on death and on evade - ToDo: maybe find a better way for this!
+        void DoRemoveGarroteAura()
+        {
+            // remove aura from spell Garrote when Moroes dies
+            Map* pMap = m_creature->GetMap();
+            if (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(SPELL_GARROTE))
+                    {
+                        i->getSource()->RemoveAurasDueToSpell(SPELL_GARROTE);
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Note: because the Vanish spell adds invisibility effect on the target, the timers won't be decreased during the vanish phase
+            if (m_uiWaitTimer)
+            {
+                if (m_uiWaitTimer <= uiDiff)
+                {
+                    // It's not very clear how to handle this spell
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_SPECIAL_1 : SAY_SPECIAL_2, m_creature);
+                        DoResetThreat();
+                        AttackStart(pTarget);
+                        pTarget->CastSpell(pTarget, SPELL_GARROTE, true);
+                    }
+                    m_uiWaitTimer = 0;
+                }
+                else
+                {
+                    m_uiWaitTimer -= uiDiff;
+                }
+
+                // Don't user other abilities in vanish
+                return;
+            }
+
+            if (!m_bEnrage && m_creature->GetHealthPercent() < 30.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                {
+                    m_bEnrage = true;
+                }
+            }
+
+            // No other spells are cast after enrage
+            if (!m_bEnrage)
+            {
+                if (m_uiVanishTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_VANISH) == CAST_OK)
+                    {
+                        m_uiVanishTimer = 30000;
+                        m_uiWaitTimer = 1000;
+                    }
+                }
+                else
+                {
+                    m_uiVanishTimer -= uiDiff;
+                }
+
+                // Gouge highest aggro, and attack second highest
+                if (m_uiGougeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_GOUGE) == CAST_OK)
+                    {
+                        m_uiGougeTimer = 40000;
+                    }
+                }
+                else
+                {
+                    m_uiGougeTimer -= uiDiff;
+                }
+
+                if (m_uiBlindTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_BLIND, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_BLIND) == CAST_OK)
+                        {
+                            m_uiBlindTimer = 40000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiBlindTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_moroesAI(pCreature);
+    }
+};
+
+void AddSC_boss_moroes()
+{
+    Script* s;
+    s = new boss_moroes();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_moroes";
+    //pNewScript->GetAI = &GetAI_boss_moroes;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp
new file mode 100644
index 000000000..c97fc2799
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp
@@ -0,0 +1,623 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+* ScriptData
+* SDName:      Boss Netherspite
+* SD%Complete: 75
+* SDComment:   Nether portal partially implemented. Find spell ID for tail swipe added in patch 3.0.2
+* SDCategory:  Karazhan
+* EndScriptData
+*/
+
+#include "precompiled.h"
+#include "karazhan.h"
+
+enum
+{
+    // netherspite spells
+    SPELL_NETHERBURN = 30522,
+    SPELL_VOID_ZONE = 37063,
+    SPELL_NETHERBREATH = 38523,
+    SPELL_EMPOWERMENT = 38549,
+    SPELL_NETHER_INFUSION = 38688,                // hard enrage spell
+    SPELL_NETHERSPITE_ROAR = 38684,                // on banish phase begin
+    SPELL_SHADOWFORM = 38542,                // banish visual spell
+    SPELL_FACE_RANDOM_TARGET = 38546,                // triggered by spell 38684 - currently not used
+    SPELL_PORTAL_ATTUNEMENT = 30425,
+
+    // void zone spells
+    SPELL_CONSUMPTION = 28865,
+
+    // beam buffs
+    SPELL_SERENITY_NS = 30467,
+    SPELL_SERENITY_PLR = 30422,
+    SPELL_DOMINANCE_NS = 30468,
+    SPELL_DOMINANCE_PLR = 30423,
+    SPELL_PERSEVERENCE_NS = 30466,
+    SPELL_PERSEVERENCE_PLR = 30421,
+
+    // beam debuffs
+    SPELL_EXHAUSTION_SER = 38638,
+    SPELL_EXHAUSTION_DOM = 38639,
+    SPELL_EXHAUSTION_PER = 38637,
+
+    // beam visual spells which hit players
+    SPELL_BEAM_SER = 30401,
+    SPELL_BEAM_DOM = 30402,
+    SPELL_BEAM_PER = 30400,
+
+    // beam visual spells which hit Netherspite
+    SPELL_BEAM_GREEN = 30464,
+    SPELL_BEAM_BLUE = 30463,
+    SPELL_BEAM_RED = 30465,
+
+    // portal visual spells
+    SPELL_GREEN_PORTAL = 30490,
+    SPELL_BLUE_PORTAL = 30491,
+    SPELL_RED_PORTAL = 30487,
+
+    // passive auras
+    SPELL_SERENITY_PASSIVE      = 30397,
+    SPELL_DOMINANCE_PASSIVE     = 30398,
+    // note: for Perseverence, there isn't any passive spell - currently we use script timer
+    SPELL_NETHER_BEAM           = 30469,                // spell triggered by the passive auras
+    // SPELL_CLEAR_NETHER_BEAM  = 37072,                // not clear how to use this
+
+    // emotes
+    EMOTE_PHASE_BEAM = -1532089,
+    EMOTE_PHASE_BANISH = -1532090,
+
+    // npcs
+    NPC_VOID_ZONE = 16697,
+    NPC_PORTAL_GREEN = 17367, // Nether Portal - Serenity
+    NPC_PORTAL_BLUE = 17368,  // Nether Portal - Dominance
+    NPC_PORTAL_RED = 17369,   // Nether Portal - Perseverence
+
+    MAX_PORTALS = 3,
+    MAX_PORTAL_PROPERTIES = 7,
+};
+
+struct SpawnLocation
+{
+    float fX, fY, fZ, fO;
+};
+
+// at first spawn portals got fixed coords, should be shuffled in subsequent beam phases
+static const SpawnLocation aPortalCoordinates[MAX_PORTALS] =
+{
+    { -11195.14f, -1616.375f, 278.3217f, 6.230825f },
+    { -11108.13f, -1602.839f, 280.0323f, 3.717551f },
+    { -11139.78f, -1681.278f, 278.3217f, 1.396263f },
+};
+
+enum NetherspitePhases
+{
+    BEAM_PHASE = 0,
+    BANISH_PHASE = 1,
+};
+
+enum PortalProperties
+{
+    PORTAL_ENTRY = 0,    
+    PORTAL_VISUAL = 1,
+    PORTAL_VISUAL_PLR = 2,
+    PORTAL_VISUAL_NS = 3,
+    PORTAL_BUFF_PLR = 4,
+    PORTAL_BUFF_NS = 5,
+    PORTAL_DEBUFF = 6,
+};
+
+static const uint32 auiPortalVector[MAX_PORTAL_PROPERTIES][MAX_PORTALS] =
+{
+    //      0 - GREEN               1 - BLUE                2 - RED
+    { NPC_PORTAL_GREEN, NPC_PORTAL_BLUE, NPC_PORTAL_RED },    // 0 - portal entries
+    { SPELL_GREEN_PORTAL, SPELL_BLUE_PORTAL, SPELL_RED_PORTAL },    // 1 - visual spells for portals
+    { SPELL_BEAM_SER, SPELL_BEAM_DOM, SPELL_BEAM_PER },  // 2 - visual spells for players
+    { SPELL_BEAM_GREEN, SPELL_BEAM_BLUE, SPELL_BEAM_RED },    // 3 - visual spells for netherspite
+    { SPELL_SERENITY_PLR, SPELL_DOMINANCE_PLR, SPELL_PERSEVERENCE_PLR },  // 4 - buffs for players
+    { SPELL_SERENITY_NS, SPELL_DOMINANCE_NS, SPELL_PERSEVERENCE_NS },  // 5 - buffs for netherspite
+    { SPELL_EXHAUSTION_SER, SPELL_EXHAUSTION_DOM, SPELL_EXHAUSTION_PER },    // 6 - debuffs    
+};
+
+//adjust how easy it is to catch the beam
+static const float beamHitbox = 0.8f;
+
+struct boss_netherspite : public CreatureScript
+{
+    boss_netherspite() : CreatureScript("boss_netherspite") {}
+
+    struct boss_netherspiteAI : public ScriptedAI
+    {
+        boss_netherspiteAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        NetherspitePhases m_uiActivePhase;
+
+        Creature* m_portal[MAX_PORTALS];
+        Unit* m_portalHolder[MAX_PORTALS];
+
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiVoidZoneTimer;
+        uint32 m_uiPhaseSwitchTimer;
+        uint32 m_uiNetherbreathTimer;
+        uint32 m_uiEmpowermentTimer;
+        uint32 m_uiConnectionTimer;
+
+        std::vector<uint32> m_vPortalEntryList;
+
+        void Reset() override
+        {
+            m_uiActivePhase = BEAM_PHASE;
+
+            m_uiEmpowermentTimer = 10000;
+            m_uiEnrageTimer = 9 * MINUTE * IN_MILLISECONDS;
+            m_uiVoidZoneTimer = 15000;
+            m_uiPhaseSwitchTimer = MINUTE * IN_MILLISECONDS;
+            m_uiConnectionTimer = 10000;
+
+            SetCombatMovement(true);
+
+            // initialize the portal list
+            m_vPortalEntryList.clear();
+            m_vPortalEntryList.resize(MAX_PORTALS);
+
+            for (uint8 i = 0; i < MAX_PORTALS; ++i)
+                m_vPortalEntryList[i] = auiPortalVector[PORTAL_ENTRY][i];
+
+            DoResetPortals();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_NETHERSPITE, IN_PROGRESS);
+
+            DoSummonPortals();
+            DoCastSpellIfCan(m_creature, SPELL_NETHERBURN);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_NETHERSPITE, DONE);
+
+            DoDespawnPortalsImmediately();
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_NETHERSPITE, FAIL);
+
+            DoDespawnPortalsImmediately();
+        }
+
+        void SwitchPhases()
+        {
+            if (m_uiActivePhase == BEAM_PHASE)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_NETHERSPITE_ROAR) == CAST_OK)
+                {
+                    DoDebuffPortalHolderInBanishPhase();
+                    DoResetPortals();
+
+                    DoCastSpellIfCan(m_creature, SPELL_SHADOWFORM, CAST_TRIGGERED);
+                    m_creature->RemoveAurasDueToSpell(SPELL_EMPOWERMENT);
+
+                    SetCombatMovement(false);
+                    m_creature->GetMotionMaster()->MoveIdle();
+
+                    m_uiActivePhase = BANISH_PHASE;
+                    DoScriptText(EMOTE_PHASE_BANISH, m_creature);
+
+                    m_uiNetherbreathTimer = 2000;
+                    m_uiPhaseSwitchTimer = 30000;
+                }
+            }
+            else
+            {
+                m_creature->RemoveAurasDueToSpell(SPELL_SHADOWFORM);
+                SetCombatMovement(true);
+                DoStartMovement(m_creature->getVictim());
+
+                m_uiActivePhase = BEAM_PHASE;
+                DoScriptText(EMOTE_PHASE_BEAM, m_creature);
+
+                DoSummonPortals();
+                m_uiConnectionTimer = 5000;
+                m_uiEmpowermentTimer = 10000;
+                m_uiPhaseSwitchTimer = MINUTE * IN_MILLISECONDS;
+            }
+
+            // reset threat every phase switch
+            DoResetThreat();
+        }
+
+        void DoSummonPortals()
+        {
+            for (uint8 i = 0; i < MAX_PORTALS; ++i)
+                m_creature->SummonCreature(m_vPortalEntryList[i], aPortalCoordinates[i].fX, aPortalCoordinates[i].fY, aPortalCoordinates[i].fZ, aPortalCoordinates[i].fO, TEMPSUMMON_TIMED_DESPAWN, 60000);
+
+            // randomize the portals after the first summon
+            std::random_shuffle(m_vPortalEntryList.begin(), m_vPortalEntryList.end());
+        }
+
+        void DoDespawnPortalsImmediately()
+        {
+            if (m_pInstance)
+            {
+                for (uint8 i = 0; i < MAX_PORTALS; ++i)
+                {
+                    if (Creature* pPortal = m_pInstance->GetSingleCreatureFromStorage(auiPortalVector[PORTAL_ENTRY][i]))
+                    {
+                        pPortal->ForcedDespawn();
+                        pPortal->RemoveFromWorld();
+                    }
+                }
+            }
+        }
+
+        void DoResetPortals()
+        {
+            for (uint8 i = 0; i < MAX_PORTALS; ++i)
+            {
+                m_portal[i] = 0;
+                m_portalHolder[i] = 0;
+            }
+        }
+
+        void DoDebuffPortalHolder(uint8 portalIndex)
+        {
+            if (m_portalHolder[portalIndex] && m_portalHolder[portalIndex] != m_creature)
+                m_portalHolder[portalIndex]->CastSpell(m_portalHolder[portalIndex], auiPortalVector[PORTAL_DEBUFF][portalIndex], true);
+        }
+
+        void DoDebuffPortalHolderInBanishPhase()
+        {
+            for (uint8 i = 0; i < MAX_PORTALS; ++i)
+            {
+                DoDebuffPortalHolder(i);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            //do this at db later
+            //we need to adjust the modells of the portals -> need invisible modells
+            pSummoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            pSummoned->setFaction(m_creature->getFaction());
+
+            //we need the portals not moveing and auto attacking but staying in fight so that we can turn the triggered spells to false
+            //pSummoned->SetInCombatWithZone();
+            //pSummoned->addUnitState(UNIT_STAT_NO_COMBAT_MOVEMENT);
+
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_VOID_ZONE:
+                pSummoned->CastSpell(pSummoned, SPELL_CONSUMPTION, true);
+                break;
+            case NPC_PORTAL_RED:
+                pSummoned->CastSpell(pSummoned, SPELL_RED_PORTAL, true);
+                m_portal[2] = pSummoned;
+                break;
+            case NPC_PORTAL_GREEN:
+                pSummoned->CastSpell(pSummoned, SPELL_GREEN_PORTAL, true);
+                m_portal[0] = pSummoned;
+                break;
+            case NPC_PORTAL_BLUE:
+                pSummoned->CastSpell(pSummoned, SPELL_BLUE_PORTAL, true);
+                m_portal[1] = pSummoned;
+                break;
+            }
+        }
+
+        void UpdatePortalConnection()
+        {
+            for (uint8 i = 0; i < MAX_PORTALS; ++i)
+            {
+                if (m_portal[i])
+                {
+                    if (Player* pPlayer = GetClosestPlayerToPortalBetweenPortalAndNetherspite(i))
+                    {
+                        m_portal[i]->CastSpell(pPlayer, auiPortalVector[PORTAL_BUFF_PLR][i], true);
+
+                        if (!m_portalHolder[i] || pPlayer != m_portalHolder[i])
+                        {
+                            DoDebuffPortalHolder(i);
+
+                            m_portal[i]->CastSpell(pPlayer, auiPortalVector[PORTAL_VISUAL_PLR][i], true);
+                            m_portalHolder[i] = pPlayer;
+                        }
+                    }
+                    else
+                    {
+                        m_portal[i]->CastSpell(m_creature, auiPortalVector[PORTAL_BUFF_NS][i], true);
+
+                        if (!m_portalHolder[i] || m_creature != m_portalHolder[i])
+                        {
+                            DoDebuffPortalHolder(i);
+
+                            m_portal[i]->CastSpell(m_creature, auiPortalVector[PORTAL_VISUAL_NS][i], true);
+                            m_portalHolder[i] = m_creature;
+                        }
+                    }
+                }
+            }
+        }
+
+        bool IsPlayerPositionBetweenPortalAndNetherspite(uint8 portalIndex, Player* pPlayer)
+        {
+            bool success = false;
+
+            if (m_portal[portalIndex] && pPlayer)
+            {
+                float delta = m_portal[portalIndex]->GetDistance2d(pPlayer) + pPlayer->GetDistance2d(m_creature) - m_portal[portalIndex]->GetDistance2d(m_creature);
+
+                if (delta >= -beamHitbox && delta <= 0)
+                    success = true;
+            }
+
+            return success;
+        }
+
+        Player* GetClosestPlayerToPortalBetweenPortalAndNetherspite(uint8 portalIndex)
+        {
+            Player* closestPlayer = 0;
+            Map::PlayerList const& lPlayers = m_pInstance->instance->GetPlayers();
+
+            for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
+            {
+                if (Player* pPlayer = itr->getSource())
+                {
+                    if (m_portal[portalIndex] && !pPlayer->HasAura(auiPortalVector[PORTAL_DEBUFF][portalIndex]) && IsPlayerPositionBetweenPortalAndNetherspite(portalIndex, pPlayer) && m_portal[portalIndex]->GetDistance2d(m_creature) > m_portal[portalIndex]->GetDistance2d(pPlayer))
+                    {
+                        if (!closestPlayer || m_portal[portalIndex]->GetDistance2d(closestPlayer) > m_portal[portalIndex]->GetDistance2d(pPlayer))
+                            closestPlayer = pPlayer;
+                    }
+                }
+            }
+
+            return closestPlayer;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            //PHASE SWITCH
+            if (m_uiPhaseSwitchTimer <= uiDiff)
+                SwitchPhases();
+            else
+                m_uiPhaseSwitchTimer -= uiDiff;
+
+            //ENRAGE
+            if (m_uiEnrageTimer)
+            {
+                if (m_uiEnrageTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_NETHER_INFUSION) == CAST_OK)
+                        m_uiEnrageTimer = 0;
+                }
+                else
+                    m_uiEnrageTimer -= uiDiff;
+            }
+
+            if (m_uiVoidZoneTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_VOID_ZONE) == CAST_OK)
+                        m_uiVoidZoneTimer = 15000;
+                }
+            }
+            else
+                m_uiVoidZoneTimer -= uiDiff;
+
+            //BEAM PHASE
+            if (m_uiActivePhase == BEAM_PHASE)
+            {
+                if (m_uiConnectionTimer < uiDiff)
+                {
+                    UpdatePortalConnection();
+                    m_uiConnectionTimer = 1000;
+                }
+                else
+                    m_uiConnectionTimer -= uiDiff;
+
+                if (m_uiEmpowermentTimer)
+                {
+                    if (m_uiEmpowermentTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_EMPOWERMENT) == CAST_OK)
+                        {
+                            DoCastSpellIfCan(m_creature, SPELL_PORTAL_ATTUNEMENT, CAST_TRIGGERED);
+                            m_uiEmpowermentTimer = 0;
+                        }
+                    }
+                    else
+                        m_uiEmpowermentTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+            }
+            //BANISH PHASE
+            else
+            {
+                if (m_uiNetherbreathTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_NETHERBREATH) == CAST_OK)
+                        m_uiNetherbreathTimer = urand(4000, 5000);
+                }
+                else
+                    m_uiNetherbreathTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_netherspiteAI(pCreature);
+    }
+//#if defined (TODO)
+//        /*######
+//        ## npc_netherspite_portal
+//        ######*/
+//
+//        struct npc_netherspite_portalAI : public Scripted_NoMovementAI
+//        {
+//            npc_netherspite_portalAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+//            {
+//                m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+//                Reset();
+//            }
+//
+//            ScriptedInstance* m_pInstance;
+//
+//            uint32 m_uiPassiveSpellTimer;
+//            uint32 m_uiOrientationTimer;
+//
+//            void Reset()
+//            {
+//                m_uiPassiveSpellTimer = 0;
+//                m_uiOrientationTimer = 0;
+//            }
+//#endif
+//#if defined (TBC)
+//            void MoveInLineOfSight(Unit* pWho) { }
+//            void AttackStart(Unit* pWho) { }
+//#endif
+//#if defined (WOTLK) || defined (CATA)
+//            void MoveInLineOfSight(Unit* /*pWho*/) { }
+//            void AttackStart(Unit* /*pWho*/) { }
+//#endif
+//#if defined (TODO)
+//            void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+//            {
+//                if (eventType == AI_EVENT_CUSTOM_A)
+//                {
+//                    if (pInvoker->GetEntry() != NPC_NETHERSPITE)
+//                        return;
+//
+//                    // update orientation every second to focus on Netherspite
+//                    m_uiOrientationTimer = 1000;
+//                    m_creature->SetFacingToObject(pInvoker);
+//
+//                    switch (m_creature->GetEntry())
+//                    {
+//                    case NPC_PORTAL_GREEN:
+//                        if (!m_creature->HasAura(SPELL_SERENITY_PASSIVE))
+//                            DoCastSpellIfCan(m_creature, SPELL_SERENITY_PASSIVE, CAST_TRIGGERED);
+//                        break;
+//                    case NPC_PORTAL_BLUE:
+//                        if (!m_creature->HasAura(SPELL_DOMINANCE_PASSIVE))
+//                            DoCastSpellIfCan(m_creature, SPELL_DOMINANCE_PASSIVE, CAST_TRIGGERED);
+//                        break;
+//                    case NPC_PORTAL_RED:
+//                        // Red portal spell is missing - handled in script
+//                        if (!m_uiPassiveSpellTimer)
+//                            m_uiPassiveSpellTimer = 1000;
+//                        break;
+//                    }
+//                }
+//            }
+//
+//            void UpdateAI(const uint32 uiDiff)
+//            {
+//                if (m_uiPassiveSpellTimer)
+//                {
+//                    if (m_uiPassiveSpellTimer <= uiDiff)
+//                    {
+//                        if (DoCastSpellIfCan(m_creature, SPELL_NETHER_BEAM, CAST_TRIGGERED) == CAST_OK)
+//                            m_uiPassiveSpellTimer = 1000;
+//                    }
+//                    else
+//                        m_uiPassiveSpellTimer -= uiDiff;
+//                }
+//
+//                if (m_uiOrientationTimer)
+//                {
+//                    if (m_uiOrientationTimer <= uiDiff)
+//                    {
+//                        if (m_pInstance)
+//                        {
+//                            if (Creature* pNetherspite = m_pInstance->GetSingleCreatureFromStorage(NPC_NETHERSPITE))
+//                                m_creature->SetFacingToObject(pNetherspite);
+//                        }
+//                        m_uiOrientationTimer = 1000;
+//                    }
+//                    else
+//                        m_uiOrientationTimer -= uiDiff;
+//                }
+//            }
+//        }
+//
+//        CreatureAI* GetAI_npc_netherspite_portal(Creature* pCreature)
+//        {
+//            return new npc_netherspite_portalAI(pCreature);
+//        }
+//
+//        bool EffectScriptEffectCreature_spell_portal_attunement(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Creature* pCreatureTarget, ObjectGuid /*originalCasterGuid*/)
+//        {
+//            if (uiSpellId == SPELL_PORTAL_ATTUNEMENT && uiEffIndex == EFFECT_INDEX_0)
+//            {
+//                if (pCreatureTarget->GetEntry() == NPC_PORTAL_RED || pCreatureTarget->GetEntry() == NPC_PORTAL_GREEN || pCreatureTarget->GetEntry() == NPC_PORTAL_BLUE)
+//                    pCreatureTarget->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pCreatureTarget);
+//
+//                return true;
+//            }
+//
+//            return false;
+//        }
+//#endif
+};
+
+void AddSC_boss_netherspite()
+{
+    Script* s;
+    s = new boss_netherspite();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_netherspite";
+    //pNewScript->GetAI = &GetAI_boss_netherspite;
+    //pNewScript->RegisterSelf();
+
+//#if defined (TODO)
+//        pNewScript = new Script;
+//        pNewScript->Name = "npc_netherspite_portal";
+//        pNewScript->GetAI = &GetAI_npc_netherspite_portal;
+//        pNewScript->pEffectScriptEffectNPC = &EffectScriptEffectCreature_spell_portal_attunement;
+//        pNewScript->RegisterSelf();
+//#endif
+};
+
+
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp
new file mode 100644
index 000000000..dced7a161
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp
@@ -0,0 +1,463 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Nightbane
+SD%Complete: 80
+SDComment: Intro movement is a little choppy because of the lack of waypoint movement support. Air phase movement requires improvement. Timers need adjustment.
+SDCategory: Karazhan
+EndScriptData */
+
+#include "precompiled.h"
+#include "karazhan.h"
+#include "escort_ai.h"
+
+enum
+{
+    EMOTE_AWAKEN                = -1532125,
+    SAY_AGGRO                   = -1532126,
+    SAY_AIR_PHASE               = -1532127,
+    SAY_LAND_PHASE_1            = -1532128,
+    SAY_LAND_PHASE_2            = -1532129,
+    EMOTE_DEEP_BREATH           = -1532130,
+
+    // ground phase spells
+    SPELL_BELLOWING_ROAR        = 39427,
+    SPELL_CHARRED_EARTH         = 30129,                    // Also 30209 (Target Charred Earth) triggers this
+    SPELL_SMOLDERING_BREATH     = 30210,
+    SPELL_TAIL_SWEEP            = 25653,
+    SPELL_CLEAVE                = 30131,
+
+    // air phase spells
+    SPELL_DISTRACTING_ASH       = 30130,
+    SPELL_RAIN_OF_BONES         = 37098,                    // should trigger 30170
+    SPELL_SMOKING_BLAST         = 37057,
+    SPELL_FIREBALL_BARRAGE      = 30282,
+
+    PHASE_GROUND                = 1,
+    PHASE_AIR                   = 2,
+    PHASE_TRANSITION            = 3,
+
+    // These points are a placeholder for the air phase movement. The dragon should do some circles around the area before landing again
+    POINT_ID_AIR                = 1,
+    POINT_ID_GROUND             = 2,
+};
+
+struct boss_nightbane : public CreatureScript
+{
+    boss_nightbane() : CreatureScript("boss_nightbane") {}
+
+    struct boss_nightbaneAI : public npc_escortAI
+    {
+        boss_nightbaneAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+        uint8 m_uiFlightPhase;
+        uint32 m_uiPhaseResetTimer;
+
+        uint32 m_uiBellowingRoarTimer;
+        uint32 m_uiCharredEarthTimer;
+        uint32 m_uiSmolderingBreathTimer;
+        uint32 m_uiTailSweepTimer;
+        uint32 m_uiCleavetimer;
+
+        uint32 m_uiDistractingAshTimer;
+        uint32 m_uiRainBonesTimer;
+        uint32 m_uiSmokingBlastTimer;
+        uint32 m_uiFireballBarrageTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_GROUND;
+            m_uiFlightPhase = 1;
+
+            m_uiBellowingRoarTimer = urand(20000, 30000);
+            m_uiCharredEarthTimer = urand(10000, 15000);
+            m_uiSmolderingBreathTimer = urand(9000, 13000);
+            m_uiTailSweepTimer = urand(12000, 15000);
+            m_uiCleavetimer = urand(4000, 8000);
+
+            SetCombatMovement(true);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void DoResetAirTimers()
+        {
+            m_uiPhaseResetTimer = urand(20000, 40000);
+            m_uiRainBonesTimer = 3000;
+            m_uiDistractingAshTimer = urand(10000, 12000);
+            m_uiSmokingBlastTimer = urand(10000, 12000);
+            m_uiFireballBarrageTimer = 10000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NIGHTBANE, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NIGHTBANE, FAIL);
+            }
+
+            // Reset escort waypoints
+            npc_escortAI::JustRespawned();
+        }
+
+        void EnterEvadeMode() override
+        {
+            // Use standard AI evade, in order to reset position
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            // Set in combat after the intro is done
+            if (uiPointId == 31)
+            {
+                SetEscortPaused(true);
+                m_creature->SetLevitate(false);
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+
+                m_creature->SetInCombatWithZone();
+            }
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            if (!m_creature->getVictim())
+            {
+                npc_escortAI::MovementInform(uiMotionType, uiPointId);
+            }
+            else
+            {
+                switch (uiPointId)
+                {
+                case POINT_ID_AIR:
+                    m_uiPhase = PHASE_AIR;
+                    break;
+                case POINT_ID_GROUND:
+                    m_creature->SetLevitate(false);
+                    m_creature->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+
+                    m_uiPhase = PHASE_GROUND;
+                    SetCombatMovement(true);
+                    DoStartMovement(m_creature->getVictim());
+                    break;
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (m_creature->getVictim())
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_GROUND:
+
+                if (m_uiBellowingRoarTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BELLOWING_ROAR) == CAST_OK)
+                    {
+                        m_uiBellowingRoarTimer = urand(20000, 30000);
+                    }
+                }
+                else
+                {
+                    m_uiBellowingRoarTimer -= uiDiff;
+                }
+
+                if (m_uiSmolderingBreathTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SMOLDERING_BREATH) == CAST_OK)
+                    {
+                        m_uiSmolderingBreathTimer = urand(14000, 20000);
+                    }
+                }
+                else
+                {
+                    m_uiSmolderingBreathTimer -= uiDiff;
+                }
+
+                if (m_uiCharredEarthTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_CHARRED_EARTH) == CAST_OK)
+                        {
+                            m_uiCharredEarthTimer = urand(25000, 35000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiCharredEarthTimer -= uiDiff;
+                }
+
+                if (m_uiTailSweepTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TAIL_SWEEP) == CAST_OK)
+                    {
+                        m_uiTailSweepTimer = urand(14000, 20000);
+                    }
+                }
+                else
+                {
+                    m_uiTailSweepTimer -= uiDiff;
+                }
+
+                if (m_uiCleavetimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                    {
+                        m_uiCleavetimer = urand(6000, 12000);
+                    }
+                }
+                else
+                {
+                    m_uiCleavetimer -= uiDiff;
+                }
+
+                if (m_creature->GetHealthPercent() < 100 - 25 * m_uiFlightPhase)
+                {
+                    // Start air phase movement (handled by creature_movement_template)
+                    SetCombatMovement(false);
+                    m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+                    m_creature->SetLevitate(true);
+                    DoMoveToClosestTrigger(false);
+
+                    DoScriptText(SAY_AIR_PHASE, m_creature);
+                    m_uiPhase = PHASE_TRANSITION;
+                    DoResetAirTimers();
+                    ++m_uiFlightPhase;
+                }
+
+                DoMeleeAttackIfReady();
+
+                break;
+            case PHASE_AIR:
+
+                if (m_uiRainBonesTimer)
+                {
+                    if (m_uiRainBonesTimer <= uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        {
+                            if (DoCastSpellIfCan(pTarget, SPELL_RAIN_OF_BONES) == CAST_OK)
+                            {
+                                DoScriptText(EMOTE_DEEP_BREATH, m_creature);
+                                m_uiRainBonesTimer = 0;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiRainBonesTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiDistractingAshTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_DISTRACTING_ASH) == CAST_OK)
+                        {
+                            m_uiDistractingAshTimer = urand(7000, 13000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiDistractingAshTimer -= uiDiff;
+                }
+
+                if (m_uiSmokingBlastTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SMOKING_BLAST) == CAST_OK)
+                        {
+                            m_uiSmokingBlastTimer = urand(1000, 3000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiSmokingBlastTimer -= uiDiff;
+                }
+
+                if (m_uiFireballBarrageTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_FIREBALL_BARRAGE, SELECT_FLAG_NOT_IN_MELEE_RANGE))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_FIREBALL_BARRAGE) == CAST_OK)
+                        {
+                            m_uiFireballBarrageTimer = urand(3000, 6000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiFireballBarrageTimer -= uiDiff;
+                }
+
+                if (m_uiPhaseResetTimer < uiDiff)
+                {
+                    // ToDo: more circle movement should be done here!
+                    DoScriptText(urand(0, 1) ? SAY_LAND_PHASE_1 : SAY_LAND_PHASE_2, m_creature);
+                    DoMoveToClosestTrigger(true);
+
+                    m_uiPhase = PHASE_TRANSITION;
+                    m_uiPhaseResetTimer = 20000;
+                }
+                else
+                {
+                    m_uiPhaseResetTimer -= uiDiff;
+                }
+
+                break;
+            case PHASE_TRANSITION:
+                // nothing here
+                break;
+            }
+        }
+
+    private:
+        // Wrapper to handle movement to the closest trigger
+        void DoMoveToClosestTrigger(bool bGround)
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            ObjectGuid tguid = ObjectGuid(m_pInstance->GetData64(bGround ? TYPE_NIGHTBANE_TRIGGER_GROUND : TYPE_NIGHTBANE_TRIGGER_AIR));
+            if (Creature* trigger = m_pInstance->instance->GetCreature(tguid))
+            {
+                float fX, fY, fZ;
+                trigger->GetPosition(fX, fY, fZ);
+                m_creature->GetMotionMaster()->MovePoint(bGround ? POINT_ID_GROUND : POINT_ID_AIR, fX, fY, fZ);
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_nightbaneAI(pCreature);
+    }
+};
+
+struct event_spell_summon_nightbane : public MapEventScript
+{
+    event_spell_summon_nightbane() : MapEventScript("event_spell_summon_nightbane") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* /*pTarget*/, bool bIsStart) override
+    {
+        if (bIsStart && pSource->GetTypeId() == TYPEID_PLAYER)
+        {
+            ScriptedInstance* pInstance = (ScriptedInstance*)((Player*)pSource)->GetInstanceData();
+            if (!pInstance)
+            {
+                return false;
+            }
+
+            if (pInstance->GetData(TYPE_NIGHTBANE) == NOT_STARTED || pInstance->GetData(TYPE_NIGHTBANE) == FAIL)
+            {
+                if (Creature* pNightbane = pInstance->GetSingleCreatureFromStorage(NPC_NIGHTBANE))
+                {
+                    DoScriptText(EMOTE_AWAKEN, ((Player*)pSource));
+                    pInstance->SetData(TYPE_NIGHTBANE, IN_PROGRESS);
+
+                    // Sort of a hack, it is unclear how this really work but the values appear to be valid (see Onyxia, too)
+                    pNightbane->SetStandState(UNIT_STAND_STATE_STAND);
+                    pNightbane->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+                    pNightbane->SetLevitate(true);
+
+                    // Switch to waypoint movement
+                    if (npc_escortAI* pNightbaneAI = dynamic_cast<npc_escortAI*>(pNightbane->AI()))
+                    {
+                        pNightbaneAI->Start(true);
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+};
+
+void AddSC_boss_nightbane()
+{
+    Script* s;
+
+    s = new boss_nightbane();
+    s->RegisterSelf();
+    s = new event_spell_summon_nightbane();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_nightbane";
+    //pNewScript->GetAI = &GetAI_boss_nightbane;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_spell_summon_nightbane";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_spell_summon_nightbane;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
new file mode 100644
index 000000000..f4cc3b981
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
@@ -0,0 +1,428 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Prince_Malchezzar
+SD%Complete: 100
+SDComment:
+SDCategory: Karazhan
+EndScriptData */
+
+#include "precompiled.h"
+#include "karazhan.h"
+
+enum
+{
+    SAY_AGGRO                   = -1532091,
+    SAY_AXE_TOSS1               = -1532092,
+    SAY_AXE_TOSS2               = -1532093,
+    SAY_SPECIAL1                = -1532094,
+    SAY_SPECIAL2                = -1532095,
+    SAY_SPECIAL3                = -1532096,
+    SAY_SLAY1                   = -1532097,
+    SAY_SLAY2                   = -1532098,
+    SAY_SLAY3                   = -1532099,
+    SAY_SUMMON1                 = -1532100,
+    SAY_SUMMON2                 = -1532101,
+    SAY_DEATH                   = -1532102,
+
+    // Enfeeble is supposed to reduce hp to 1 and then heal player back to full when it ends
+    SPELL_ENFEEBLE              = 30843,                    // Enfeeble during phases 1 and 2
+    SPELL_ENFEEBLE_EFFECT       = 41624,                    // purpose unk - cast during the transition from phase 2 to 3
+    SPELL_SHADOW_NOVA           = 30852,                    // Shadownova used during all phases
+    SPELL_SW_PAIN_PHASE1        = 30854,                    // Shadow word pain during phase 1
+    SPELL_SW_PAIN_PHASE3        = 30898,                    // Shadow word pain during phase 3
+    SPELL_SUNDER_ARMOR          = 30901,                    // Sunder armor during phase 2
+    SPELL_THRASH_AURA           = 12787,                    // Passive proc chance for thrash
+    SPELL_SUMMON_AXES           = 30891,                    // Summon 17650
+    SPELL_EQUIP_AXES            = 30857,                    // Visual for axe equiping - transition to phase 2
+    SPELL_AMPLIFY_DAMAGE        = 39095,                    // Amplifiy during phase 3 3
+    // SPELL_CLEAVE              = 30131,                   // spell not confirmed
+    // SPELL_INFERNAL_RELAY      = 30834,                   // purpose unk
+    SPELL_INFERNAL_RELAY_SUMMON = 30835,                    // triggers 30836, which summons an infernal
+
+    SPELL_HELLFIRE              = 30859,                    // Infernal damage aura
+
+    NPC_NETHERSPITE_INFERNAL    = 17646,                    // The netherspite infernal creature
+    NPC_MALCHEZARS_AXE          = 17650,                    // Malchezar's axes summoned during phase 3
+
+    EQUIP_ID_AXE                = 23996,                    // Axes info
+
+#if defined (TBC)
+    ATTACK_TIMER_DEFAULT        = 2400,                     // note: for WotLK it is 2000
+    ATTACK_TIMER_AXES           = 1600,                     // note: for WotLK it is 1333
+#endif
+#if defined (WOTLK) || defined (CATA)
+    ATTACK_TIMER_DEFAULT        = 2000,                     // note: for TBC it was 2400
+    ATTACK_TIMER_AXES           = 1333,                     // note: for TBC it was 1600
+#endif
+    MAX_ENFEEBLE_TARGETS        = 5,
+};
+
+struct boss_malchezaar : public CreatureScript
+{
+    boss_malchezaar() : CreatureScript("boss_malchezaar") {}
+
+    struct boss_malchezaarAI : public ScriptedAI
+    {
+        boss_malchezaarAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiEnfeebleIndex;
+        uint32 m_uiEnfeebleTimer;
+        uint32 m_uiEnfeebleResetTimer;
+        uint32 m_uiShadowNovaTimer;
+        uint32 m_uiSWPainTimer;
+        uint32 m_uiSunderArmorTimer;
+        uint32 m_uiAmplifyDamageTimer;
+        uint32 m_uiInfernalTimer;
+
+        ObjectGuid m_aEnfeebleTargetGuid[MAX_ENFEEBLE_TARGETS];
+        uint32 m_auiEnfeebleHealth[MAX_ENFEEBLE_TARGETS];
+
+        uint8 m_uiPhase;
+
+        void Reset() override
+        {
+            for (uint8 i = 0; i < MAX_ENFEEBLE_TARGETS; ++i)
+            {
+                m_aEnfeebleTargetGuid[i].Clear();
+                m_auiEnfeebleHealth[i] = 0;
+            }
+
+            m_uiEnfeebleIndex = 0;
+            m_uiEnfeebleTimer = 30000;
+            m_uiEnfeebleResetTimer = 0;
+            m_uiShadowNovaTimer = 35500;
+            m_uiSWPainTimer = 20000;
+            m_uiAmplifyDamageTimer = 5000;
+            m_uiInfernalTimer = 40000;
+            m_uiSunderArmorTimer = urand(5000, 10000);
+
+            m_uiPhase = 1;
+
+            // Reset equipment and attack
+            SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_UNEQUIP, EQUIP_NO_CHANGE);
+            m_creature->SetAttackTime(BASE_ATTACK, ATTACK_TIMER_DEFAULT);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            // Remove the summoned axe - which is considered a guardian
+            m_creature->RemoveGuardians();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MALCHEZZAR, DONE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MALCHEZZAR, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MALCHEZZAR, FAIL);
+            }
+
+            // Remove the summoned axe - which is considered a guardian
+            m_creature->RemoveGuardians();
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_NETHERSPITE_INFERNAL)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_HELLFIRE, false);
+            }
+            else if (pSummoned->GetEntry() == NPC_MALCHEZARS_AXE)
+            {
+                pSummoned->SetInCombatWithZone();
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, SpellEntry const* pSpellEntry) override
+        {
+            // Target selection is already handled properly in core (doesn't affect tank)
+            if (pSpellEntry->Id == SPELL_ENFEEBLE && pTarget->GetTypeId() == TYPEID_PLAYER)
+            {
+                // Workaround to handle health set to 1
+                m_aEnfeebleTargetGuid[m_uiEnfeebleIndex] = pTarget->GetObjectGuid();
+                m_auiEnfeebleHealth[m_uiEnfeebleIndex] = pTarget->GetHealth();
+                pTarget->SetHealth(1);
+                ++m_uiEnfeebleIndex;
+            }
+        }
+
+        // Wrapper to reset health of the Enfeebled targets
+        void DoHandleEnfeebleHealthReset()
+        {
+            for (int i = 0; i < m_uiEnfeebleIndex; ++i)
+            {
+                Player* pTarget = m_creature->GetMap()->GetPlayer(m_aEnfeebleTargetGuid[i]);
+
+                if (pTarget && pTarget->IsAlive())
+                {
+                    pTarget->SetHealth(m_auiEnfeebleHealth[i]);
+                }
+
+                m_aEnfeebleTargetGuid[i].Clear();
+                m_auiEnfeebleHealth[i] = 0;
+            }
+
+            m_uiEnfeebleIndex = 0;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Phase 1 - over 60% HP
+            if (m_uiPhase == 1)
+            {
+                // transition to phase 2
+                if (m_creature->GetHealthPercent() < 60.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_EQUIP_AXES, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_THRASH_AURA, CAST_TRIGGERED);
+                        DoScriptText(SAY_AXE_TOSS1, m_creature);
+
+                        SetEquipmentSlots(false, EQUIP_ID_AXE, EQUIP_ID_AXE, EQUIP_NO_CHANGE);
+                        m_creature->SetAttackTime(BASE_ATTACK, ATTACK_TIMER_AXES);
+                        m_uiPhase = 2;
+                    }
+                }
+            }
+            // Phase 2 - over 30% HP
+            else if (m_uiPhase == 2)
+            {
+                // transition to phase 3
+                if (m_creature->GetHealthPercent() < 30.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_AXES) == CAST_OK)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_ENFEEBLE_EFFECT, CAST_TRIGGERED);
+                        DoScriptText(SAY_SPECIAL3, m_creature);
+
+                        SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_UNEQUIP, EQUIP_NO_CHANGE);
+                        m_creature->SetAttackTime(BASE_ATTACK, ATTACK_TIMER_DEFAULT);
+
+                        // Reset Enfeebled targets if necessary
+                        DoHandleEnfeebleHealthReset();
+                        m_uiEnfeebleResetTimer = 0;
+
+                        m_creature->RemoveAurasDueToSpell(SPELL_THRASH_AURA);
+                        m_uiShadowNovaTimer = m_uiEnfeebleTimer + 5000;
+                        m_uiInfernalTimer = 15000;
+                        m_uiPhase = 3;
+
+                        return;
+                    }
+                }
+
+                if (m_uiSunderArmorTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SUNDER_ARMOR) == CAST_OK)
+                    {
+                        m_uiSunderArmorTimer = urand(10000, 18000);
+                    }
+                }
+                else
+                {
+                    m_uiSunderArmorTimer -= uiDiff;
+                }
+            }
+            // Phase 3
+            else
+            {
+                if (m_uiAmplifyDamageTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_AMPLIFY_DAMAGE) == CAST_OK)
+                    {
+                        m_uiAmplifyDamageTimer = urand(20000, 30000);
+                    }
+                }
+                else
+                {
+                    m_uiAmplifyDamageTimer -= uiDiff;
+                }
+            }
+
+            // Summon an infernal on timer
+            if (m_uiInfernalTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_INFERNAL_RELAY_SUMMON) == CAST_OK)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_SUMMON1 : SAY_SUMMON2, m_creature);
+                    m_uiInfernalTimer = m_uiPhase == 3 ? 17000 : 45000;
+                }
+            }
+            else
+            {
+                m_uiInfernalTimer -= uiDiff;
+            }
+
+            // Cast shadow nova - on timer during phase 3, or after Enfeeble during phases 1 and 2
+            if (m_uiShadowNovaTimer)
+            {
+                if (m_uiShadowNovaTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_NOVA) == CAST_OK)
+                    {
+                        m_uiShadowNovaTimer = m_uiPhase == 3 ? 30000 : 0;
+                    }
+                }
+                else
+                {
+                    m_uiShadowNovaTimer -= uiDiff;
+                }
+            }
+
+            // Cast SW pain during phase 1 and 3
+            if (m_uiPhase != 2)
+            {
+                if (m_uiSWPainTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_uiPhase == 1 ? m_creature->getVictim() : m_creature, m_uiPhase == 1 ? SPELL_SW_PAIN_PHASE1 : SPELL_SW_PAIN_PHASE3) == CAST_OK)
+                    {
+                        m_uiSWPainTimer = 20000;
+                    }
+                }
+                else
+                {
+                    m_uiSWPainTimer -= uiDiff;
+                }
+            }
+
+            // Cast Enfeeble during phase 1 and 2
+            if (m_uiPhase != 3)
+            {
+                if (m_uiEnfeebleTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ENFEEBLE) == CAST_OK)
+                    {
+                        m_uiEnfeebleTimer = 30000;
+                        m_uiShadowNovaTimer = 5000;
+                        m_uiEnfeebleResetTimer = 9000;
+                    }
+                }
+                else
+                {
+                    m_uiEnfeebleTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiEnfeebleResetTimer)
+            {
+                if (m_uiEnfeebleResetTimer <= uiDiff)
+                {
+                    DoHandleEnfeebleHealthReset();
+                    m_uiEnfeebleResetTimer = 0;
+                }
+                else
+                {
+                    m_uiEnfeebleResetTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_malchezaarAI(pCreature);
+    }
+};
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_infernal_target : public CreatureScript
+{
+    npc_infernal_target() : CreatureScript("npc_infernal_target") {}
+
+    struct npc_infernal_targetAI : public Scripted_NoMovementAI
+    {
+        npc_infernal_targetAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) {}
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_infernal_targetAI(pCreature);
+    }
+};
+
+void AddSC_boss_prince_malchezaar()
+{
+    Script* s;
+
+    s = new boss_malchezaar();
+    s->RegisterSelf();
+    s = new npc_infernal_target();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_malchezaar";
+    //pNewScript->GetAI = &GetAI_boss_malchezaar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_infernal_target";
+    //pNewScript->GetAI = &GetAI_npc_infernal_target;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
new file mode 100644
index 000000000..053a60592
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
@@ -0,0 +1,493 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Shade_of_Aran
+SD%Complete: 95
+SDComment: When drinking mana, it should remove all negative damage auras and should sit. Timers may need adjustments.
+SDCategory: Karazhan
+EndScriptData */
+
+#include "precompiled.h"
+#include "karazhan.h"
+
+enum
+{
+    SAY_AGGRO1                  = -1532073,
+    SAY_AGGRO2                  = -1532074,
+    SAY_AGGRO3                  = -1532075,
+    SAY_FLAMEWREATH1            = -1532076,
+    SAY_FLAMEWREATH2            = -1532077,
+    SAY_BLIZZARD1               = -1532078,
+    SAY_BLIZZARD2               = -1532079,
+    SAY_EXPLOSION1              = -1532080,
+    SAY_EXPLOSION2              = -1532081,
+    SAY_DRINK                   = -1532082,                 // Low Mana / AoE Pyroblast
+    SAY_ELEMENTALS              = -1532083,
+    SAY_KILL1                   = -1532084,
+    SAY_KILL2                   = -1532085,
+    SAY_TIMEOVER                = -1532086,
+    SAY_DEATH                   = -1532087,
+    SAY_ATIESH                  = -1532088,                 // Atiesh is equipped by a raid member
+
+    // basic spells
+    SPELL_FROSTBOLT             = 29954,
+    SPELL_FIREBALL              = 29953,
+    SPELL_ARCANE_MISSILES       = 29955,
+    // SPELL_DRAGONS_BREATH      = 29964,                   // not used since 2.1.0
+    SPELL_CHAINS_OF_ICE         = 29991,
+    SPELL_COUNTERSPELL          = 29961,
+    // SPELL_COMBUSTION          = 29977,                   // spell not confirmed
+    // SPELL_PRESENCE_OF_MIND    = 29976,                   // spell not confirmed
+    // SPELL_WATER_BREAK         = 39177,                   // purpose unk
+
+    // low mana spells
+    SPELL_MASS_POLYMORPH        = 29963,
+    SPELL_CONJURE_WATER         = 29975,
+    SPELL_DRINK                 = 30024,
+    SPELL_MANA_POTION           = 32453,
+    SPELL_PYROBLAST             = 29978,
+
+    // super spells
+    SPELL_FLAME_WREATH          = 30004,                // triggers 29946 on targets
+    SPELL_SUMMON_BLIZZARD       = 29969,                // script target on npc 17161 - triggers spell 29952 on target
+    SPELL_BLINK_CENTER          = 29967,
+    SPELL_MASSIVE_MAGNETIC_PULL = 29979,                // triggers 30010 on target
+    SPELL_MASS_SLOW             = 30035,
+    SPELL_ARCANE_EXPLOSION      = 29973,
+
+    // summon elemental spells
+    SPELL_SUMMON_WATER_ELEM_1   = 29962,
+    SPELL_SUMMON_WATER_ELEM_2   = 37051,
+    SPELL_SUMMON_WATER_ELEM_3   = 37052,
+    SPELL_SUMMON_WATER_ELEM_4   = 37053,
+
+    // Creatures
+    NPC_WATER_ELEMENTAL         = 17167,
+    NPC_SHADOW_OF_ARAN          = 18254,
+
+    MAX_SHADOWS_OF_ARAN         = 5,                    // this is not confirmed
+};
+
+enum SuperSpells
+{
+    SUPER_FLAME_WREATH  = 0,
+    SUPER_BLIZZARD      = 1,
+    SUPER_ARCANE_EXPL   = 2,
+};
+
+struct boss_shade_of_aran : public CreatureScript
+{
+    boss_shade_of_aran() : CreatureScript("boss_shade_of_aran") {}
+
+    struct boss_aranAI : public ScriptedAI
+    {
+        boss_aranAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiSecondarySpellTimer;
+        uint32 m_uiNormalCastTimer;
+        uint32 m_uiSuperCastTimer;
+        uint32 m_uiBerserkTimer;
+
+        uint8 m_uiLastSuperSpell;
+        uint8 m_uiLastNormalSpell;
+
+        uint32 m_uiManaRecoveryTimer;
+        uint8 m_uiManaRecoveryStage;
+
+        bool m_bElementalsSpawned;
+        bool m_bIsDrinking;
+        bool m_bDrinkInturrupted;
+
+        void Reset() override
+        {
+            m_uiLastSuperSpell = urand(SUPER_FLAME_WREATH, SUPER_ARCANE_EXPL);
+            m_uiLastNormalSpell = urand(0, 2);
+
+            m_uiSecondarySpellTimer = 5000;
+            m_uiNormalCastTimer = 0;
+            m_uiSuperCastTimer = 35000;
+            m_uiManaRecoveryTimer = 0;
+            m_uiManaRecoveryStage = 0;
+            m_uiBerserkTimer = 12 * MINUTE * IN_MILLISECONDS;
+
+            m_bElementalsSpawned = false;
+            m_bIsDrinking = false;
+            m_bDrinkInturrupted = false;
+
+            SetCombatMovement(true);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, m_creature);
+        }
+
+        void JustDied(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            // Remove the summoned elementals - which are considered guardians
+            m_creature->RemoveGuardians();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ARAN, DONE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ARAN, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ARAN, FAIL);
+            }
+
+            // Remove the summoned elementals - which are considered guardians
+            m_creature->RemoveGuardians();
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (!m_bDrinkInturrupted && m_bIsDrinking && uiDamage > 0)
+            {
+                if (!m_creature->HasAura(SPELL_DRINK))
+                {
+                    return;
+                }
+
+                if (DoCastSpellIfCan(m_creature, SPELL_MANA_POTION) == CAST_OK)
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_DRINK);
+                    m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                    m_uiManaRecoveryTimer = 1000;
+                    m_uiManaRecoveryStage = 2;
+                    m_bDrinkInturrupted = true;
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_WATER_ELEMENTAL:
+            case NPC_SHADOW_OF_ARAN:
+                pSummoned->SetInCombatWithZone();
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Start drinking when below 20% mana
+            if (!m_bIsDrinking && m_creature->GetPowerType() == POWER_MANA && (m_creature->GetPower(POWER_MANA) * 100 / m_creature->GetMaxPower(POWER_MANA)) < 20)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MASS_POLYMORPH) == CAST_OK)
+                {
+                    DoScriptText(SAY_DRINK, m_creature);
+                    SetCombatMovement(false);
+                    m_creature->GetMotionMaster()->MoveIdle();
+
+                    m_uiManaRecoveryStage = 0;
+                    m_uiManaRecoveryTimer = 2000;
+                    m_bDrinkInturrupted = false;
+                    m_bIsDrinking = true;
+                    return;
+                }
+            }
+
+            if (m_bIsDrinking)
+            {
+                // Do the mana recovery process
+                if (m_uiManaRecoveryTimer < uiDiff)
+                {
+                    switch (m_uiManaRecoveryStage)
+                    {
+                    case 0:
+                        if (DoCastSpellIfCan(m_creature, SPELL_CONJURE_WATER) == CAST_OK)
+                        {
+                            m_uiManaRecoveryTimer = 2000;
+                        }
+                        break;
+                    case 1:
+                        if (DoCastSpellIfCan(m_creature, SPELL_DRINK) == CAST_OK)
+                        {
+                            m_creature->SetStandState(UNIT_STAND_STATE_SIT);
+                            m_uiManaRecoveryTimer = 5000;
+                        }
+                        break;
+                    case 2:
+                        if (DoCastSpellIfCan(m_creature, SPELL_PYROBLAST) == CAST_OK)
+                        {
+                            SetCombatMovement(true);
+                            DoStartMovement(m_creature->getVictim());
+                            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+
+                            m_uiManaRecoveryTimer = 2000;
+                            m_bIsDrinking = false;
+                        }
+                        break;
+                    }
+                    ++m_uiManaRecoveryStage;
+                }
+                else
+                {
+                    m_uiManaRecoveryTimer -= uiDiff;
+                }
+
+                // no other spells during mana recovery
+                return;
+            }
+
+            // Normal spell casts
+            if (m_uiNormalCastTimer < uiDiff)
+            {
+                if (!m_creature->IsNonMeleeSpellCasted(false))
+                {
+                    Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0);
+                    if (!pTarget)
+                    {
+                        return;
+                    }
+
+                    uint8 uiCurrentSpell = urand(0, 2);
+                    uint32 uiCurrentSpellId = 0;
+
+                    // randomize so it won't be the same spell twice in a row
+                    while (uiCurrentSpell == m_uiLastNormalSpell)
+                    {
+                        uiCurrentSpell = urand(0, 2);
+                    }
+
+                    m_uiLastNormalSpell = uiCurrentSpell;
+
+                    switch (uiCurrentSpell)
+                    {
+                    case 0:
+                        uiCurrentSpellId = SPELL_ARCANE_MISSILES;
+                        m_uiNormalCastTimer = urand(6000, 7000);
+                        break;
+                    case 1:
+                        uiCurrentSpellId = SPELL_FIREBALL;
+                        m_uiNormalCastTimer = urand(2000, 3000);
+                        break;
+                    case 2:
+                        uiCurrentSpellId = SPELL_FROSTBOLT;
+                        m_uiNormalCastTimer = urand(2000, 3000);
+                        break;
+                    }
+
+                    if (uiCurrentSpellId)
+                    {
+                        DoCastSpellIfCan(pTarget, uiCurrentSpellId);
+                    }
+                }
+            }
+            else
+            {
+                m_uiNormalCastTimer -= uiDiff;
+            }
+
+            // Secondary spells
+            if (m_uiSecondarySpellTimer < uiDiff)
+            {
+                CanCastResult spellResult = CAST_OK;
+
+                switch (urand(0, 1))
+                {
+                case 0:
+                    spellResult = DoCastSpellIfCan(m_creature, SPELL_COUNTERSPELL);
+                    break;
+                case 1:
+                    if (Unit* pUnit = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        spellResult = DoCastSpellIfCan(pUnit, SPELL_CHAINS_OF_ICE);
+                    }
+                    break;
+                }
+                if (spellResult == CAST_OK)
+                {
+                    m_uiSecondarySpellTimer = urand(5000, 20000);
+                }
+            }
+            else
+            {
+                m_uiSecondarySpellTimer -= uiDiff;
+            }
+
+            if (m_uiSuperCastTimer < uiDiff)
+            {
+                if (!m_creature->IsNonMeleeSpellCasted(false))
+                {
+                    uint8 uiAvailableSpell = urand(SUPER_FLAME_WREATH, SUPER_ARCANE_EXPL);
+
+                    // randomize so it won't be the same spell twice in a row
+                    while (uiAvailableSpell == m_uiLastSuperSpell)
+                    {
+                        uiAvailableSpell = urand(SUPER_FLAME_WREATH, SUPER_ARCANE_EXPL);
+                    }
+
+                    m_uiLastSuperSpell = uiAvailableSpell;
+
+                    switch (m_uiLastSuperSpell)
+                    {
+                    case SUPER_ARCANE_EXPL:
+                        if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_EXPLOSION) == CAST_OK)
+                        {
+                            DoCastSpellIfCan(m_creature, SPELL_BLINK_CENTER, CAST_TRIGGERED);
+                            DoCastSpellIfCan(m_creature, SPELL_MASSIVE_MAGNETIC_PULL, CAST_TRIGGERED);
+                            DoCastSpellIfCan(m_creature, SPELL_MASS_SLOW, CAST_TRIGGERED);
+
+                            DoScriptText(urand(0, 1) ? SAY_EXPLOSION1 : SAY_EXPLOSION2, m_creature);
+                        }
+                        break;
+                    case SUPER_FLAME_WREATH:
+                        if (DoCastSpellIfCan(m_creature, SPELL_FLAME_WREATH) == CAST_OK)
+                        {
+                            DoScriptText(urand(0, 1) ? SAY_FLAMEWREATH1 : SAY_FLAMEWREATH2, m_creature);
+                        }
+                        break;
+                    case SUPER_BLIZZARD:
+                        if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_BLIZZARD) == CAST_OK)
+                        {
+                            DoScriptText(urand(0, 1) ? SAY_BLIZZARD1 : SAY_BLIZZARD2, m_creature);
+                        }
+                        break;
+                    }
+                    m_uiSuperCastTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiSuperCastTimer -= uiDiff;
+            }
+
+            if (!m_bElementalsSpawned && m_creature->GetHealthPercent() < 40.0f)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_WATER_ELEM_1, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_WATER_ELEM_2, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_WATER_ELEM_3, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_WATER_ELEM_4, CAST_TRIGGERED);
+
+                DoScriptText(SAY_ELEMENTALS, m_creature);
+
+                m_bElementalsSpawned = true;
+            }
+
+            // Berserk timer - the summons position is guesswork
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    for (uint8 i = 0; i < MAX_SHADOWS_OF_ARAN; ++i)
+                    {
+                        DoSpawnCreature(NPC_SHADOW_OF_ARAN, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                    }
+
+                    DoScriptText(SAY_TIMEOVER, m_creature);
+                    m_uiBerserkTimer = 0;
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_aranAI(pCreature);
+    }
+};
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_shade_of_aran_blizzard : public CreatureScript
+{
+    npc_shade_of_aran_blizzard() : CreatureScript("npc_shade_of_aran_blizzard") {}
+
+    struct npc_shade_of_aran_blizzardAI : public ScriptedAI
+    {
+        npc_shade_of_aran_blizzardAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_shade_of_aran_blizzardAI(pCreature);
+    }
+};
+
+void AddSC_boss_shade_of_aran()
+{
+    Script* s;
+
+    s = new boss_shade_of_aran();
+    s->RegisterSelf();
+    s = new npc_shade_of_aran_blizzard();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_shade_of_aran";
+    //pNewScript->GetAI = &GetAI_boss_aran;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_shade_of_aran_blizzard";
+    //pNewScript->GetAI = &GetAI_npc_shade_of_aran_blizzard;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp
new file mode 100644
index 000000000..4535d9036
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp
@@ -0,0 +1,365 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Terestian_Illhoof
+SD%Complete: 100
+SDComment:
+SDCategory: Karazhan
+EndScriptData */
+
+#include "precompiled.h"
+#include "karazhan.h"
+
+enum
+{
+    SAY_SLAY1                   = -1532065,
+    SAY_SLAY2                   = -1532066,
+    SAY_DEATH                   = -1532067,
+    SAY_AGGRO                   = -1532068,
+    SAY_SACRIFICE1              = -1532069,
+    SAY_SACRIFICE2              = -1532070,
+    SAY_SUMMON1                 = -1532071,
+    SAY_SUMMON2                 = -1532072,
+
+    // spells
+    SPELL_SUMMON_DEMONCHAINS    = 30120,                    // Summons demonic chains that maintain the ritual of sacrifice.
+    SPELL_SHADOW_BOLT           = 30055,                    // Hurls a bolt of dark magic at an enemy, inflicting Shadow damage.
+    SPELL_SACRIFICE             = 30115,                    // Teleports and adds the debuff
+    SPELL_BERSERK               = 32965,                    // Increases attack speed by 75%. Periodically casts Shadow Bolt Volley.
+    SPELL_SUMMON_IMP            = 30066,                    // Summons Kil'rek
+    SPELL_FIENDISH_PORTAL       = 30171,                    // Opens portal and summons Fiendish Portal, 2 sec cast
+    SPELL_FIENDISH_PORTAL_1     = 30179,                    // Opens portal and summons Fiendish Portal, instant cast
+
+    // Chains spells
+    SPELL_DEMON_CHAINS          = 30206,                    // Instant - Visual Effect
+
+    // Portal spells
+    SPELL_SUMMON_FIENDISH_IMP   = 30184,
+
+    // Kilrek
+    SPELL_BROKEN_PACT           = 30065,                    // All damage taken increased by 25%.
+
+    // summoned npcs
+    NPC_DEMONCHAINS             = 17248,
+    NPC_FIENDISHIMP             = 17267,
+    NPC_PORTAL                  = 17265,
+    NPC_KILREK                  = 17229
+};
+
+struct boss_terestian_illhoof : public CreatureScript
+{
+    boss_terestian_illhoof() : CreatureScript("boss_terestian_illhoof") {}
+
+    struct boss_terestianAI : public ScriptedAI
+    {
+        boss_terestianAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        ObjectGuid m_sacrificeGuid;
+
+        uint32 m_uiSummonKilrekTimer;
+        uint32 m_uiSacrificeTimer;
+        uint32 m_uiShadowboltTimer;
+        uint32 m_uiSummonTimer;
+        uint32 m_uiBerserkTimer;
+
+        bool m_bSummonedPortals;
+
+        void Reset() override
+        {
+            m_uiSummonKilrekTimer = 0;
+            m_uiSacrificeTimer = 30000;
+            m_uiShadowboltTimer = 5000;
+            m_uiSummonTimer = 10000;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            m_bSummonedPortals = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (!m_creature->GetPet())
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_IMP);
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_TERESTIAN, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_TERESTIAN, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_PORTAL:
+                if (!m_bSummonedPortals)
+                {
+                    m_bSummonedPortals = true;
+                    DoCastSpellIfCan(m_creature, SPELL_FIENDISH_PORTAL_1, CAST_TRIGGERED);
+                }
+                break;
+            case NPC_KILREK:
+                m_creature->RemoveAurasDueToSpell(SPELL_BROKEN_PACT);
+                pSummoned->SetInCombatWithZone();
+                break;
+            case NPC_DEMONCHAINS:
+                pSummoned->CastSpell(pSummoned, SPELL_DEMON_CHAINS, false);
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_KILREK:
+                pSummoned->CastSpell(m_creature, SPELL_BROKEN_PACT, true);
+                m_uiSummonKilrekTimer = 30000;
+                break;
+            case NPC_DEMONCHAINS:
+                if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_sacrificeGuid))
+                {
+                    pPlayer->RemoveAurasDueToSpell(SPELL_SACRIFICE);
+                }
+                break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_TERESTIAN, DONE);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Respawn Kilrek if killed
+            if (m_uiSummonKilrekTimer)
+            {
+                if (m_uiSummonKilrekTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_IMP) == CAST_OK)
+                    {
+                        m_uiSummonKilrekTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiSummonKilrekTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiSacrificeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_SACRIFICE, SELECT_FLAG_PLAYER))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SACRIFICE) == CAST_OK)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_DEMONCHAINS, CAST_TRIGGERED);
+                        DoScriptText(urand(0, 1) ? SAY_SACRIFICE1 : SAY_SACRIFICE2, m_creature);
+                        m_sacrificeGuid = pTarget->GetObjectGuid();
+                        m_uiSacrificeTimer = 43000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiSacrificeTimer -= uiDiff;
+            }
+
+            if (m_uiShadowboltTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHADOW_BOLT) == CAST_OK)
+                {
+                    m_uiShadowboltTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiShadowboltTimer -= uiDiff;
+            }
+
+            if (m_uiSummonTimer)
+            {
+                if (m_uiSummonTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FIENDISH_PORTAL) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_SUMMON1 : SAY_SUMMON2, m_creature);
+                        m_uiSummonTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiSummonTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_terestianAI(pCreature);
+    }
+};
+
+struct npc_fiendish_portal : public CreatureScript
+{
+    npc_fiendish_portal() : CreatureScript("npc_fiendish_portal") {}
+
+    struct npc_fiendish_portalAI : public ScriptedAI
+    {
+        npc_fiendish_portalAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiSummonTimer;
+
+        void Reset() override
+        {
+            m_uiSummonTimer = 5000;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true);
+            pSummoned->SetInCombatWithZone();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiSummonTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_FIENDISH_IMP) == CAST_OK)
+                {
+                    m_uiSummonTimer = 5000;
+                }
+            }
+            else
+            {
+                m_uiSummonTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_fiendish_portalAI(pCreature);
+    }
+};
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct mob_demon_chain : public CreatureScript
+{
+    mob_demon_chain() : CreatureScript("mob_demon_chain") {}
+
+    struct mob_demon_chainAI : public Scripted_NoMovementAI
+    {
+        mob_demon_chainAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { Reset(); }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_demon_chainAI(pCreature);
+    }
+};
+
+void AddSC_boss_terestian_illhoof()
+{
+    Script* s;
+
+    s = new boss_terestian_illhoof();
+    s->RegisterSelf();
+    s = new npc_fiendish_portal();
+    s->RegisterSelf();
+    s = new mob_demon_chain();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_terestian_illhoof";
+    //pNewScript->GetAI = &GetAI_boss_terestian_illhoof;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_fiendish_portal";
+    //pNewScript->GetAI = &GetAI_npc_fiendish_portal;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_demon_chain";
+    //pNewScript->GetAI = &GetAI_mob_demon_chain;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp
new file mode 100644
index 000000000..26d0fbcad
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp
@@ -0,0 +1,1604 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Bosses_Opera
+SD%Complete: 95
+SDComment: Oz, Hood, and RAJ event implemented. Spell timers may need adjustments.
+SDCategory: Karazhan
+EndScriptData */
+
+#include "precompiled.h"
+#include "karazhan.h"
+
+/***********************************/
+/*** OPERA WIZARD OF OZ EVENT *****/
+/*********************************/
+
+enum
+{
+    SAY_DOROTHEE_DEATH          = -1532025,
+    SAY_DOROTHEE_SUMMON         = -1532026,
+    SAY_DOROTHEE_TITO_DEATH     = -1532027,
+    SAY_DOROTHEE_AGGRO          = -1532028,
+
+    SAY_ROAR_AGGRO              = -1532029,
+    SAY_ROAR_DEATH              = -1532030,
+    SAY_ROAR_SLAY               = -1532031,
+
+    SAY_STRAWMAN_AGGRO          = -1532032,
+    SAY_STRAWMAN_DEATH          = -1532033,
+    SAY_STRAWMAN_SLAY           = -1532034,
+
+    SAY_TINHEAD_AGGRO           = -1532035,
+    SAY_TINHEAD_DEATH           = -1532036,
+    SAY_TINHEAD_SLAY            = -1532037,
+    EMOTE_RUST                  = -1532038,
+
+    SAY_CRONE_AGGRO             = -1532039,
+    SAY_CRONE_AGGRO2            = -1532040,
+    SAY_CRONE_DEATH             = -1532041,
+    SAY_CRONE_SLAY              = -1532042,
+
+    /**** Spells ****/
+    // Dorothee
+    SPELL_WATERBOLT             = 31012,
+    SPELL_SCREAM                = 31013,
+    SPELL_SUMMONTITO            = 31014,
+
+    // Strawman
+    SPELL_BRAIN_BASH            = 31046,
+    SPELL_BRAIN_WIPE            = 31069,
+    SPELL_CONFLAG_PROC          = 31073,            // procs 31075 on fire damage
+
+    // Tinhead
+    SPELL_CLEAVE                = 31043,
+    SPELL_RUST                  = 31086,
+
+    // Roar
+    SPELL_MANGLE                = 31041,
+    SPELL_SHRED                 = 31042,
+    SPELL_FRIGHTENED_SCREAM     = 31013,
+
+    // Crone
+    SPELL_CHAIN_LIGHTNING       = 32337,
+
+    // Cyclone
+    SPELL_CYCLONE               = 32334,
+    SPELL_CYCLONE_VISUAL        = 32332,
+
+    /** Creature Entries **/
+    NPC_TITO                    = 17548,
+    NPC_CYCLONE                 = 18412,
+};
+
+struct boss_dorothee : public CreatureScript
+{
+    boss_dorothee() : CreatureScript("boss_dorothee") {}
+
+    struct boss_dorotheeAI : public ScriptedAI
+    {
+        boss_dorotheeAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiAggroTimer;
+        uint32 m_uiIntroTimer;
+
+        uint32 m_uiWaterBoltTimer;
+        uint32 m_uiFearTimer;
+        uint32 m_uiSummonTitoTimer;
+
+        bool m_bTitoDied;
+
+        void Reset() override
+        {
+            m_uiIntroTimer = 2000;
+            m_uiAggroTimer = 12000;
+
+            m_uiWaterBoltTimer = 5000;
+            m_uiFearTimer = 15000;
+            m_uiSummonTitoTimer = 47500;
+
+            m_bTitoDied = false;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OPERA, FAIL);
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DOROTHEE_DEATH, m_creature);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // Allow a short delay before attacking
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE))
+            {
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (m_creature->getVictim())
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_TITO)
+            {
+                DoScriptText(SAY_DOROTHEE_TITO_DEATH, m_creature);
+                m_bTitoDied = true;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiIntroTimer)
+            {
+                if (m_uiIntroTimer <= uiDiff)
+                {
+                    DoScriptText(SAY_DOROTHEE_AGGRO, m_creature);
+                    m_uiIntroTimer = 0;
+                }
+                else
+                {
+                    m_uiIntroTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiAggroTimer)
+            {
+                if (m_uiAggroTimer <= uiDiff)
+                {
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                    m_creature->SetInCombatWithZone();
+                    m_uiAggroTimer = 0;
+                }
+                else
+                {
+                    m_uiAggroTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiWaterBoltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_WATERBOLT) == CAST_OK)
+                    {
+                        m_uiWaterBoltTimer = m_bTitoDied ? 1500 : 5000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiWaterBoltTimer -= uiDiff;
+            }
+
+            if (m_uiFearTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SCREAM) == CAST_OK)
+                {
+                    m_uiFearTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiFearTimer -= uiDiff;
+            }
+
+            if (m_uiSummonTitoTimer)
+            {
+                if (m_uiSummonTitoTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMONTITO) == CAST_OK)
+                    {
+                        DoScriptText(SAY_DOROTHEE_SUMMON, m_creature);
+                        m_uiSummonTitoTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiSummonTitoTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_dorotheeAI(pCreature);
+    }
+};
+
+struct boss_strawman : public CreatureScript
+{
+    boss_strawman() : CreatureScript("boss_strawman") {}
+
+    struct boss_strawmanAI : public ScriptedAI
+    {
+        boss_strawmanAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiAggroTimer;
+        uint32 m_uiBrainBashTimer;
+        uint32 m_uiBrainWipeTimer;
+
+        void Reset() override
+        {
+            m_uiAggroTimer = 27000;
+            m_uiBrainBashTimer = 5000;
+            m_uiBrainWipeTimer = 7000;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE))
+            {
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE))
+            {
+                return;
+            }
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_CONFLAG_PROC);
+            DoScriptText(SAY_STRAWMAN_AGGRO, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OPERA, FAIL);
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_STRAWMAN_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_STRAWMAN_SLAY, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiAggroTimer)
+            {
+                if (m_uiAggroTimer <= uiDiff)
+                {
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                    m_creature->SetInCombatWithZone();
+                    m_uiAggroTimer = 0;
+                }
+                else
+                {
+                    m_uiAggroTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiBrainBashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_BRAIN_BASH) == CAST_OK)
+                {
+                    m_uiBrainBashTimer = 15000;
+                }
+            }
+            else
+            {
+                m_uiBrainBashTimer -= uiDiff;
+            }
+
+            if (m_uiBrainWipeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_BRAIN_WIPE) == CAST_OK)
+                    {
+                        m_uiBrainWipeTimer = 20000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiBrainWipeTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_strawmanAI(pCreature);
+    }
+};
+
+struct boss_tinhead : public CreatureScript
+{
+    boss_tinhead() : CreatureScript("boss_tinhead") {}
+
+    struct boss_tinheadAI : public ScriptedAI
+    {
+        boss_tinheadAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiAggroTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiRustTimer;
+
+        void Reset() override
+        {
+            m_uiAggroTimer = 37000;
+            m_uiCleaveTimer = 5000;
+            m_uiRustTimer = 30000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_TINHEAD_AGGRO, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OPERA, FAIL);
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE))
+            {
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE))
+            {
+                return;
+            }
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_TINHEAD_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_TINHEAD_SLAY, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiAggroTimer)
+            {
+                if (m_uiAggroTimer <= uiDiff)
+                {
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                    m_creature->SetInCombatWithZone();
+                    m_uiAggroTimer = 0;
+                }
+                else
+                {
+                    m_uiAggroTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                {
+                    m_uiCleaveTimer = 5000;
+                }
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            if (m_uiRustTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_RUST) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_RUST, m_creature);
+                    m_uiRustTimer = 6000;
+                }
+            }
+            else
+            {
+                m_uiRustTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_tinheadAI(pCreature);
+    }
+};
+
+struct boss_roar : public CreatureScript
+{
+    boss_roar() : CreatureScript("boss_roar") {}
+
+    struct boss_roarAI : public ScriptedAI
+    {
+        boss_roarAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiAggroTimer;
+        uint32 m_uiMangleTimer;
+        uint32 m_uiShredTimer;
+        uint32 m_uiScreamTimer;
+
+        void Reset() override
+        {
+            m_uiAggroTimer = 17000;
+            m_uiMangleTimer = 5000;
+            m_uiShredTimer = 10000;
+            m_uiScreamTimer = 15000;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE))
+            {
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE))
+            {
+                return;
+            }
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_ROAR_AGGRO, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OPERA, FAIL);
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_ROAR_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_ROAR_SLAY, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiAggroTimer)
+            {
+                if (m_uiAggroTimer <= uiDiff)
+                {
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                    m_creature->SetInCombatWithZone();
+                    m_uiAggroTimer = 0;
+                }
+                else
+                {
+                    m_uiAggroTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiMangleTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MANGLE) == CAST_OK)
+                {
+                    m_uiMangleTimer = urand(5000, 8000);
+                }
+            }
+            else
+            {
+                m_uiMangleTimer -= uiDiff;
+            }
+
+            if (m_uiShredTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHRED) == CAST_OK)
+                {
+                    m_uiShredTimer = urand(10000, 15000);
+                }
+            }
+            else
+            {
+                m_uiShredTimer -= uiDiff;
+            }
+
+            if (m_uiScreamTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FRIGHTENED_SCREAM) == CAST_OK)
+                {
+                    m_uiScreamTimer = urand(20000, 30000);
+                }
+            }
+            else
+            {
+                m_uiScreamTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_roarAI(pCreature);
+    }
+};
+
+static const float afCycloneSpawnLoc[4] = { -10907.68f, -1778.651f, 90.56018f, 0.61f };
+
+struct boss_crone : public CreatureScript
+{
+    boss_crone() : CreatureScript("boss_crone") {}
+
+    struct boss_croneAI : public ScriptedAI
+    {
+        boss_croneAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiChainLightningTimer;
+
+        void Reset() override
+        {
+            m_uiChainLightningTimer = 10000;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OPERA, FAIL);
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_CRONE_AGGRO : SAY_CRONE_AGGRO2, m_creature);
+
+            // spawn the cyclone on aggro
+            m_creature->SummonCreature(NPC_CYCLONE, afCycloneSpawnLoc[0], afCycloneSpawnLoc[1], afCycloneSpawnLoc[2], afCycloneSpawnLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_CRONE_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OPERA, DONE);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->CastSpell(pSummoned, SPELL_CYCLONE, true);
+            pSummoned->CastSpell(pSummoned, SPELL_CYCLONE_VISUAL, true);
+            pSummoned->GetMotionMaster()->MoveRandomAroundPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 15.0f);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiChainLightningTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_CHAIN_LIGHTNING) == CAST_OK)
+                    {
+                        m_uiChainLightningTimer = 15000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiChainLightningTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_croneAI(pCreature);
+    }
+};
+
+/**************************************/
+/**** Opera Red Riding Hood Event ****/
+/************************************/
+
+enum
+{
+    /**** Yells for the Wolf ****/
+    SAY_WOLF_AGGRO                  = -1532043,
+    SAY_WOLF_SLAY                   = -1532044,
+    SAY_WOLF_HOOD                   = -1532045,
+    SOUND_WOLF_DEATH                = 9275,                // Only sound on death, no text.
+
+    /**** Spells For The Wolf ****/
+    SPELL_PICK_RED_RIDING_HOOD      = 30769,               // targeting spell - triggers 30768
+    SPELL_TERRIFYING_HOWL           = 30752,
+    SPELL_WIDE_SWIPE                = 30761,
+
+    GOSSIP_ITEM_GRANDMA             = -3532005,
+    TEXT_ID_GRANDMA                 = 8990,
+
+    /**** The Wolf's Entry ****/
+    NPC_BIG_BAD_WOLF                = 17521
+};
+
+struct npc_grandmother : public CreatureScript
+{
+    npc_grandmother() : CreatureScript("npc_grandmother") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GRANDMA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        pPlayer->SEND_GOSSIP_MENU(TEXT_ID_GRANDMA, pCreature->GetObjectGuid());
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF)
+        {
+            if (Creature* pBigBadWolf = pCreature->SummonCreature(NPC_BIG_BAD_WOLF, 0, 0, 0, 0, TEMPSUMMON_DEAD_DESPAWN, 0))
+            {
+                pBigBadWolf->AI()->AttackStart(pPlayer);
+            }
+
+            pCreature->ForcedDespawn();
+        }
+
+        return true;
+    }
+};
+
+struct boss_bigbadwolf : public CreatureScript
+{
+    boss_bigbadwolf() : CreatureScript("boss_bigbadwolf") {}
+
+    struct boss_bigbadwolfAI : public ScriptedAI
+    {
+        boss_bigbadwolfAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiRedRidingHoodTimer;
+        uint32 m_uiFearTimer;
+        uint32 m_uiSwipeTimer;
+
+        void Reset() override
+        {
+            m_uiRedRidingHoodTimer = 30000;
+            m_uiFearTimer = urand(25000, 35000);
+            m_uiSwipeTimer = 5000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_WOLF_AGGRO, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OPERA, FAIL);
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoPlaySoundToSet(m_creature, SOUND_WOLF_DEATH);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OPERA, DONE);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiRedRidingHoodTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_PICK_RED_RIDING_HOOD) == CAST_OK)
+                {
+                    DoScriptText(SAY_WOLF_HOOD, m_creature);
+                    m_uiRedRidingHoodTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiRedRidingHoodTimer -= uiDiff;
+            }
+
+            if (m_uiFearTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TERRIFYING_HOWL) == CAST_OK)
+                {
+                    m_uiFearTimer = 24000;
+                }
+            }
+            else
+            {
+                m_uiFearTimer -= uiDiff;
+            }
+
+            if (m_uiSwipeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WIDE_SWIPE) == CAST_OK)
+                {
+                    m_uiSwipeTimer = urand(25000, 30000);
+                }
+            }
+            else
+            {
+                m_uiSwipeTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_bigbadwolfAI(pCreature);
+    }
+};
+
+/**********************************************/
+/******** Opera Romeo and Juliet Event *******/
+/********************************************/
+
+enum
+{
+    /**** Speech *****/
+    SAY_JULIANNE_AGGRO              = -1532046,
+    SAY_JULIANNE_ENTER              = -1532047,
+    SAY_JULIANNE_DEATH01            = -1532048,
+    SAY_JULIANNE_DEATH02            = -1532049,
+    SAY_JULIANNE_RESURRECT          = -1532050,
+    SAY_JULIANNE_SLAY               = -1532051,
+
+    SAY_ROMULO_AGGRO                = -1532052,
+    SAY_ROMULO_DEATH                = -1532053,
+    SAY_ROMULO_ENTER                = -1532054,
+    SAY_ROMULO_RESURRECT            = -1532055,
+    SAY_ROMULO_SLAY                 = -1532056,
+
+    /***** Spells For Julianne *****/
+    SPELL_BLINDING_PASSION          = 30890,
+    SPELL_DEVOTION                  = 30887,
+    SPELL_ETERNAL_AFFECTION         = 30878,
+    SPELL_POWERFUL_ATTRACTION       = 30889,
+    SPELL_DRINK_POISON              = 30907,
+
+    /***** Spells For Romulo ****/
+    SPELL_BACKWARD_LUNGE            = 30815,
+    SPELL_DARING                    = 30841,
+    SPELL_DEADLY_SWATHE             = 30817,
+    SPELL_POISON_THRUST             = 30822,
+
+    /**** Other Misc. Spells ****/
+    SPELL_FULL_HEALTH               = 43979,                // res effect on Julianne
+    SPELL_UNDYING_LOVE              = 30951,                // res effect on Romulo
+};
+
+enum OperaPhase
+{
+    PHASE_JULIANNE      = 0,
+    PHASE_ROMULO        = 1,
+    PHASE_BOTH          = 2,
+};
+
+static const float afRomuloSpawnLoc[4] = { -10893.62f, -1760.78f, 90.55f, 4.76f};
+
+struct boss_julianne : public CreatureScript
+{
+    boss_julianne() : CreatureScript("boss_julianne") {}
+
+    struct boss_julianneAI : public ScriptedAI
+    {
+        boss_julianneAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        OperaPhase m_Phase;
+
+        uint32 m_uiBlindingPassionTimer;
+        uint32 m_uiDevotionTimer;
+        uint32 m_uiEternalAffectionTimer;
+        uint32 m_uiPowerfulAttractionTimer;
+        uint32 m_uiSummonRomuloTimer;
+        uint32 m_uiResurrectSelfTimer;
+
+        bool m_bIsFakingDeath;
+
+        void Reset() override
+        {
+            m_Phase = PHASE_JULIANNE;
+
+            m_uiBlindingPassionTimer = 30000;
+            m_uiDevotionTimer = 15000;
+            m_uiEternalAffectionTimer = 25000;
+            m_uiPowerfulAttractionTimer = 5000;
+            m_uiSummonRomuloTimer = 0;
+            m_uiResurrectSelfTimer = 0;
+
+            m_bIsFakingDeath = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_JULIANNE_AGGRO, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OPERA, FAIL);
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (uiDamage < m_creature->GetHealth())
+            {
+                return;
+            }
+
+            uiDamage = 0;
+
+            if (m_bIsFakingDeath)
+            {
+                return;
+            }
+
+            if (m_Phase == PHASE_JULIANNE)
+            {
+                // Prepare fake death
+                if (DoCastSpellIfCan(m_creature, SPELL_DRINK_POISON, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                {
+                    m_Phase = PHASE_BOTH;
+                    m_bIsFakingDeath = true;
+                    m_uiSummonRomuloTimer = 12000;
+                }
+            }
+            else if (m_Phase == PHASE_BOTH)
+            {
+                // set fake death and allow 10 sec timer to kill Romulos
+                DoScriptText(SAY_JULIANNE_DEATH02, m_creature);
+                DoSetFakeDeath();
+                m_uiResurrectSelfTimer = 10000;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OPERA, DONE);
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            DoScriptText(SAY_JULIANNE_SLAY, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (m_creature->getVictim())
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        // Wrapper to set fake death
+        void DoSetFakeDeath()
+        {
+            m_bIsFakingDeath = true;
+
+            m_creature->InterruptNonMeleeSpells(false);
+            m_creature->SetHealth(1);
+            m_creature->StopMoving();
+            m_creature->ClearComboPointHolders();
+            m_creature->RemoveAllAurasOnDeath();
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            m_creature->ClearAllReactives();
+            m_creature->SetTargetGuid(ObjectGuid());
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MoveIdle();
+            m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+        }
+
+        // Wrapper to remove fake death
+        void DoRemoveFakeDeath()
+        {
+            m_bIsFakingDeath = false;
+
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            m_creature->GetMotionMaster()->Clear();
+            DoStartMovement(m_creature->getVictim());
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit* pInvoker, uint32 /*data*/) override
+        {
+            switch (eventType)
+            {
+            case AI_EVENT_CUSTOM_A: // Wrapper to start phase 3
+                if (pSender->GetEntry() == NPC_ROMULO && pSender == pInvoker)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_UNDYING_LOVE) == CAST_OK)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_FULL_HEALTH, CAST_TRIGGERED);
+                        DoScriptText(SAY_JULIANNE_RESURRECT, m_creature);
+                        DoRemoveFakeDeath();
+                    }
+                }
+                break;
+            case AI_EVENT_CUSTOM_B:
+                if (pSender == m_creature && pInvoker == m_creature)
+                {
+                    DoSetFakeDeath();
+                    DoScriptText(SAY_JULIANNE_DEATH01, m_creature);
+                }
+                break;
+            default:
+                break;
+            }
+        }
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // spawn Romulo on timer after fake death
+            if (m_uiSummonRomuloTimer)
+            {
+                if (m_uiSummonRomuloTimer <= uiDiff)
+                {
+                    m_creature->SummonCreature(NPC_ROMULO, afRomuloSpawnLoc[0], afRomuloSpawnLoc[1], afRomuloSpawnLoc[2], afRomuloSpawnLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                    m_uiSummonRomuloTimer = 0;
+                }
+                else
+                {
+                    m_uiSummonRomuloTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiResurrectSelfTimer)
+            {
+                if (m_uiResurrectSelfTimer <= uiDiff)
+                {
+                    if (m_pInstance)
+                    {
+                        if (Creature* pRomulo = m_pInstance->GetSingleCreatureFromStorage(NPC_ROMULO))
+                        {
+                            // if Romulos is dead, then self kill
+                            if (pRomulo->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+                            {
+                                m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                                pRomulo->DealDamage(pRomulo, pRomulo->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                            }
+                            else
+                            {
+                                DoRemoveFakeDeath();
+                                DoCastSpellIfCan(m_creature, SPELL_FULL_HEALTH, CAST_TRIGGERED);
+                            }
+                        }
+                    }
+                    m_uiResurrectSelfTimer = 0;
+                }
+                else
+                {
+                    m_uiResurrectSelfTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // don't use spells during transition
+            if (m_bIsFakingDeath)
+            {
+                return;
+            }
+
+            if (m_uiBlindingPassionTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_BLINDING_PASSION) == CAST_OK)
+                    {
+                        m_uiBlindingPassionTimer = urand(30000, 45000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiBlindingPassionTimer -= uiDiff;
+            }
+
+            if (m_uiDevotionTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DEVOTION) == CAST_OK)
+                {
+                    m_uiDevotionTimer = urand(15000, 45000);
+                }
+            }
+            else
+            {
+                m_uiDevotionTimer -= uiDiff;
+            }
+
+            if (m_uiPowerfulAttractionTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_POWERFUL_ATTRACTION) == CAST_OK)
+                    {
+                        m_uiPowerfulAttractionTimer = urand(5000, 30000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiPowerfulAttractionTimer -= uiDiff;
+            }
+
+            if (m_uiEternalAffectionTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(30.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_ETERNAL_AFFECTION) == CAST_OK)
+                    {
+                        m_uiEternalAffectionTimer = urand(45000, 60000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiEternalAffectionTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_julianneAI(pCreature);
+    }
+};
+
+struct spell_drink_poison : public SpellScript
+{
+    spell_drink_poison() : SpellScript("spell_drink_poison") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_DRINK_POISON && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            // Set fake death on poison
+            if (CreatureAI* pJulianneAI = dynamic_cast<CreatureAI*>(pCreatureTarget->AI()))
+            {
+                pJulianneAI->ReceiveAIEvent(AI_EVENT_CUSTOM_B, pCreatureTarget, pCreatureTarget, 0);
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+struct boss_romulo : public CreatureScript
+{
+    boss_romulo() : CreatureScript("boss_romulo") {}
+
+    struct boss_romuloAI : public ScriptedAI
+    {
+        boss_romuloAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        OperaPhase m_Phase;
+
+        uint32 m_uiBackwardLungeTimer;
+        uint32 m_uiDaringTimer;
+        uint32 m_uiDeadlySwatheTimer;
+        uint32 m_uiPoisonThrustTimer;
+        uint32 m_uiResurrectTimer;
+        uint32 m_uiResurrectSelfTimer;
+
+        bool m_bIsFakingDeath;
+
+        void Reset() override
+        {
+            m_Phase = PHASE_ROMULO;
+
+            m_uiBackwardLungeTimer = 15000;
+            m_uiDaringTimer = 20000;
+            m_uiDeadlySwatheTimer = 25000;
+            m_uiPoisonThrustTimer = 10000;
+            m_uiResurrectTimer = 0;
+            m_uiResurrectSelfTimer = 0;
+
+            m_bIsFakingDeath = false;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OPERA, FAIL);
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (uiDamage < m_creature->GetHealth())
+            {
+                return;
+            }
+
+            uiDamage = 0;
+
+            if (m_Phase == PHASE_ROMULO)
+            {
+                DoScriptText(SAY_ROMULO_DEATH, m_creature);
+                DoSetFakeDeath();
+                m_Phase = PHASE_BOTH;
+                m_uiResurrectTimer = 10000;
+            }
+            else if (m_Phase == PHASE_BOTH)
+            {
+                // set fake death and allow 10 sec timer to kill Julianne
+                DoSetFakeDeath();
+                m_uiResurrectSelfTimer = 10000;
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_ROMULO_AGGRO, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OPERA, DONE);
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            DoScriptText(SAY_ROMULO_SLAY, m_creature);
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            // remove fake death on res
+            if (pSpell->Id == SPELL_UNDYING_LOVE && pCaster->GetEntry() == NPC_JULIANNE)
+            {
+                DoRemoveFakeDeath();
+            }
+        }
+
+        // Wrapper to set fake death
+        void DoSetFakeDeath()
+        {
+            m_bIsFakingDeath = true;
+
+            m_creature->InterruptNonMeleeSpells(false);
+            m_creature->SetHealth(1);
+            m_creature->StopMoving();
+            m_creature->ClearComboPointHolders();
+            m_creature->RemoveAllAurasOnDeath();
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            m_creature->ClearAllReactives();
+            m_creature->SetTargetGuid(ObjectGuid());
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MoveIdle();
+            m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+        }
+
+        // Wrapper to remove fake death
+        void DoRemoveFakeDeath()
+        {
+            m_bIsFakingDeath = false;
+
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            m_creature->GetMotionMaster()->Clear();
+            DoStartMovement(m_creature->getVictim());
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Resurrect both of them at the beginning of phase 3
+            if (m_uiResurrectTimer)
+            {
+                if (m_uiResurrectTimer <= uiDiff)
+                {
+                    if (m_pInstance)
+                    {
+                        if (Creature* pJulianne = m_pInstance->GetSingleCreatureFromStorage(NPC_JULIANNE))
+                        {
+                            SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pJulianne);
+                        }
+                    }
+                    m_uiResurrectTimer = 0;
+                }
+                else
+                {
+                    m_uiResurrectTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiResurrectSelfTimer)
+            {
+                if (m_uiResurrectSelfTimer <= uiDiff)
+                {
+                    if (m_pInstance)
+                    {
+                        if (Creature* pJulianne = m_pInstance->GetSingleCreatureFromStorage(NPC_JULIANNE))
+                        {
+                            // if Julianne is dead, then self kill
+                            if (pJulianne->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+                            {
+                                m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                                pJulianne->DealDamage(pJulianne, pJulianne->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                            }
+                            else
+                            {
+                                DoRemoveFakeDeath();
+                                DoScriptText(SAY_ROMULO_RESURRECT, m_creature);
+                                DoCastSpellIfCan(m_creature, SPELL_FULL_HEALTH, CAST_TRIGGERED);
+                            }
+                        }
+                    }
+                    m_uiResurrectSelfTimer = 0;
+                }
+                else
+                {
+                    m_uiResurrectSelfTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // don't use spells on fake death
+            if (m_bIsFakingDeath)
+            {
+                return;
+            }
+
+            if (m_uiBackwardLungeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BACKWARD_LUNGE) == CAST_OK)
+                {
+                    m_uiBackwardLungeTimer = urand(15000, 30000);
+                }
+            }
+            else
+            {
+                m_uiBackwardLungeTimer -= uiDiff;
+            }
+
+            if (m_uiDaringTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DARING) == CAST_OK)
+                {
+                    m_uiDaringTimer = urand(20000, 40000);
+                }
+            }
+            else
+            {
+                m_uiDaringTimer -= uiDiff;
+            }
+
+            if (m_uiDeadlySwatheTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_DEADLY_SWATHE) == CAST_OK)
+                    {
+                        m_uiDeadlySwatheTimer = urand(15000, 25000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiDeadlySwatheTimer -= uiDiff;
+            }
+
+            if (m_uiPoisonThrustTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_POISON_THRUST) == CAST_OK)
+                {
+                    m_uiPoisonThrustTimer = urand(10000, 20000);
+                }
+            }
+            else
+            {
+                m_uiPoisonThrustTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_romuloAI(pCreature);
+    }
+};
+
+void AddSC_bosses_opera()
+{
+    Script* s;
+
+    //Oz
+    s = new boss_dorothee();
+    s->RegisterSelf();
+    s = new boss_strawman();
+    s->RegisterSelf();
+    s = new boss_tinhead();
+    s->RegisterSelf();
+    s = new boss_roar();
+    s->RegisterSelf();
+    s = new boss_crone();
+    s->RegisterSelf();
+
+    //Hood
+    s = new npc_grandmother();
+    s->RegisterSelf();
+
+    s = new boss_bigbadwolf();
+    s->RegisterSelf();
+
+    // Romeo And Juliet
+    s = new boss_julianne();
+    s->RegisterSelf();
+    s = new boss_romulo();
+    s->RegisterSelf();
+    s = new spell_drink_poison();
+    s->RegisterSelf();
+
+    //// Oz
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_dorothee";
+    //pNewScript->GetAI = &GetAI_boss_dorothee;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_strawman";
+    //pNewScript->GetAI = &GetAI_boss_strawman;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_tinhead";
+    //pNewScript->GetAI = &GetAI_boss_tinhead;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_roar";
+    //pNewScript->GetAI = &GetAI_boss_roar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_crone";
+    //pNewScript->GetAI = &GetAI_boss_crone;
+    //pNewScript->RegisterSelf();
+
+    //// Hood
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_grandmother";
+    //pNewScript->pGossipHello = &GossipHello_npc_grandmother;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_grandmother;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_bigbadwolf";
+    //pNewScript->GetAI = &GetAI_boss_bigbadwolf;
+    //pNewScript->RegisterSelf();
+
+    //// Romeo And Juliet
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_julianne";
+    //pNewScript->GetAI = &GetAI_boss_julianne;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_drink_poison;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_romulo";
+    //pNewScript->GetAI = &GetAI_boss_romulo;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/karazhan/chess_event.cpp b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/chess_event.cpp
new file mode 100644
index 000000000..e4b310bda
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/chess_event.cpp
@@ -0,0 +1,1950 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: chess_event
+SD%Complete: 80
+SDComment: Chess AI could use some improvements.
+SDCategory: Karazhan
+EndScriptData */
+
+#include "precompiled.h"
+#include "karazhan.h"
+
+enum
+{
+    // texts
+    EMOTE_LIFT_CURSE                = -1532131,
+    EMOTE_CHEAT                     = -1532132,
+
+    SOUND_ID_GAME_BEGIN             = 10338,
+    SOUND_ID_LOSE_PAWN_PLAYER_1     = 10339,
+    SOUND_ID_LOSE_PAWN_PLAYER_2     = 10340,
+    SOUND_ID_LOSE_PAWN_PLAYER_3     = 10341,
+    SOUND_ID_LOSE_PAWN_MEDIVH_1     = 10342,
+    SOUND_ID_LOSE_PAWN_MEDIVH_2     = 10343,
+    SOUND_ID_LOSE_PAWN_MEDIVH_3     = 10344,
+    SOUND_ID_LOSE_ROOK_PLAYER       = 10345,
+    SOUND_ID_LOSE_ROOK_MEDIVH       = 10346,
+    SOUND_ID_LOSE_BISHOP_PLAYER     = 10347,
+    SOUND_ID_LOSE_BISHOP_MEDIVH     = 10348,
+    SOUND_ID_LOSE_KNIGHT_PLAYER     = 10349,
+    SOUND_ID_LOSE_KNIGHT_MEDIVH     = 10350,
+    SOUND_ID_LOSE_QUEEN_PLAYER      = 10351,
+    SOUND_ID_LOSE_QUEEN_MEDIVH      = 10352,
+    SOUND_ID_CHECK_PLAYER           = 10353,
+    SOUND_ID_CHECK_MEDIVH           = 10354,
+    SOUND_ID_WIN_PLAYER             = 10355,
+    SOUND_ID_WIN_MEDIVH             = 10356,
+    SOUND_ID_CHEAT_1                = 10357,
+    SOUND_ID_CHEAT_2                = 10358,
+    SOUND_ID_CHEAT_3                = 10359,
+
+    // movement spells
+    SPELL_MOVE_GENERIC              = 30012,                    // spell which sends the signal to move - handled in core
+    SPELL_MOVE_1                    = 32312,                    // spell which selects AI move square (for short range pieces)
+    SPELL_MOVE_2                    = 37388,                    // spell which selects AI move square (for long range pieces)
+    // SPELL_MOVE_PAWN              = 37146,                    // individual move spells (used only by controlled npcs)
+    // SPELL_MOVE_KNIGHT            = 37144,
+    // SPELL_MOVE_QUEEN             = 37148,
+    // SPELL_MOVE_ROCK              = 37151,
+    // SPELL_MOVE_BISHOP            = 37152,
+    // SPELL_MOVE_KING              = 37153,
+
+    // additional movement spells
+    SPELL_CHANGE_FACING             = 30284,                    // spell which sends the initial facing request - handled in core
+    SPELL_FACE_SQUARE               = 30270,                    // change facing - finalize facing update
+
+    SPELL_MOVE_TO_SQUARE            = 30253,                    // spell which sends the move response from the square to the piece
+    SPELL_MOVE_COOLDOWN             = 30543,                    // add some cooldown to movement
+    SPELL_MOVE_MARKER               = 32261,                    // white beam visual - used to mark the movement as complete
+    SPELL_DISABLE_SQUARE            = 32745,                    // used by the White / Black triggers on the squares when a chess piece moves into place
+    SPELL_IS_SQUARE_USED            = 39400,                    // cast when a chess piece moves to another square
+    // SPELL_SQUARED_OCCUPIED       = 39399,                    // triggered by 39400; used to check if the square is occupied (if hits a target); Missing in 2.4.3
+
+    // generic spells
+    SPELL_IN_GAME                   = 30532,                    // teleport player near the entrance
+    SPELL_CONTROL_PIECE             = 30019,                    // control a chess piece
+    SPELL_RECENTLY_IN_GAME          = 30529,                    // debuff on player after chess piece uncharm
+
+    SPELL_CHESS_AI_ATTACK_TIMER     = 32226,                    // melee action timer - triggers 32225
+    SPELL_ACTION_MELEE              = 32225,                    // handle melee attacks
+    SPELL_MELEE_DAMAGE              = 32247,                    // melee damage spell - used by all chess pieces
+    // SPELL_AI_SNAPSHOT_TIMER      = 37440,                    // used to trigger spell 32260; purpose and usage unk
+    // SPELL_DISABLE_SQUARE_SELF    = 32260,                    // used when a piece moves to another square
+    // SPELL_AI_ACTION_TIMER        = 37504,                    // handle some kind of event check. Cast by npc 17459. Currently the way it works is unk
+    // SPELL_DISABLE_SQUARE         = 30271,                    // not used
+    // SPELL_FIND_ENEMY             = 32303,                    // not used
+    // SPELL_MOVE_NEAR_UNIT         = 30417,                    // not used
+    // SPELL_GET_EMPTY_SQUARE       = 30418,                    // not used
+    // SPELL_FACE_NEARBY_ENEMY      = 37787,                    // not used
+    // SPELL_POST_MOVE_FACING       = 38011,                    // not used
+
+    // melee action spells
+    SPELL_MELEE_FOOTMAN             = 32227,
+    SPELL_MELEE_WATER_ELEM          = 37142,
+    SPELL_MELEE_CHARGER             = 37143,
+    SPELL_MELEE_CLERIC              = 37147,
+    SPELL_MELEE_CONJURER            = 37149,
+    SPELL_MELEE_KING_LLANE          = 37150,
+    SPELL_MELEE_GRUNT               = 32228,
+    SPELL_MELEE_DAEMON              = 37220,
+    SPELL_MELEE_NECROLYTE           = 37337,
+    SPELL_MELEE_WOLF                = 37339,
+    SPELL_MELEE_WARLOCK             = 37345,
+    SPELL_MELEE_WARCHIEF_BLACKHAND  = 37348,
+
+    // cheat spells
+    SPELL_HAND_OF_MEDIVH_HORDE      = 39338,                    // triggers 39339
+    SPELL_HAND_OF_MEDIVH_ALLIANCE   = 39342,                    // triggers 39339
+    SPELL_FURY_OF_MEDIVH_HORDE      = 39341,                    // triggers 39343
+    SPELL_FURY_OF_MEDIVH_ALLIANCE   = 39344,                    // triggers 39345
+    SPELL_FURY_OF_MEDIVH_AURA       = 39383,
+    // SPELL_FULL_HEAL_HORDE        = 39334,                    // spells are not confirmed (probably removed after 2.4.3)
+    // SPELL_FULL_HEAL_ALLIANCE     = 39335,
+
+    // spells used by the chess npcs
+    SPELL_HEROISM                   = 37471,                    // human king
+    SPELL_SWEEP                     = 37474,
+    SPELL_BLOODLUST                 = 37472,                    // orc king
+    SPELL_CLEAVE                    = 37476,
+    SPELL_HEROIC_BLOW               = 37406,                    // human pawn
+    SPELL_SHIELD_BLOCK              = 37414,
+    SPELL_VICIOUS_STRIKE            = 37413,                    // orc pawn
+    SPELL_WEAPON_DEFLECTION         = 37416,
+    SPELL_SMASH                     = 37453,                    // human knight
+    SPELL_STOMP                     = 37498,
+    SPELL_BITE                      = 37454,                    // orc knight
+    SPELL_HOWL                      = 37502,
+    SPELL_ELEMENTAL_BLAST           = 37462,                    // human queen
+    SPELL_RAIN_OF_FIRE              = 37465,
+    SPELL_FIREBALL                  = 37463,                    // orc queen
+    // SPELL_POISON_CLOUD           = 37469,
+    SPELL_POISON_CLOUD_ACTION       = 37775,                    // triggers 37469 - acts as a target selector spell for orc queen
+    SPELL_HEALING                   = 37455,                    // human bishop
+    SPELL_HOLY_LANCE                = 37459,
+    // SPELL_SHADOW_MEND            = 37456,                    // orc bishop
+    SPELL_SHADOW_MEND_ACTION        = 37824,                    // triggers 37456 - acts as a target selector spell for orc bishop
+    SPELL_SHADOW_SPEAR              = 37461,
+    SPELL_GEYSER                    = 37427,                    // human rook
+    SPELL_WATER_SHIELD              = 37432,
+    SPELL_HELLFIRE                  = 37428,                    // orc rook
+    SPELL_FIRE_SHIELD               = 37434,
+
+    // spells used to transform side trigger when npc dies
+    SPELL_TRANSFORM_FOOTMAN         = 39350,
+    SPELL_TRANSFORM_CHARGER         = 39352,
+    SPELL_TRANSFORM_CLERIC          = 39353,
+    SPELL_TRANSFORM_WATER_ELEM      = 39354,
+    SPELL_TRANSFORM_CONJURER        = 39355,
+    SPELL_TRANSFORM_KING_LLANE      = 39356,
+    SPELL_TRANSFORM_GRUNT           = 39357,
+    SPELL_TRANSFORM_WOLF            = 39358,
+    SPELL_TRANSFORM_NECROLYTE       = 39359,
+    SPELL_TRANSFORM_DAEMON          = 39360,
+    SPELL_TRANSFORM_WARLOCK         = 39361,
+    SPELL_TRANSFORM_BLACKHAND       = 39362,
+
+    // generic npcs
+    // NPC_SQUARE_OUTSIDE_B         = 17316,                    // used to check the interior of the board
+    // NPC_SQUARE_OUTSIDE_W         = 17317,                    // not used in our script; keep for reference only
+    NPC_FURY_MEDIVH_VISUAL          = 22521,                    // has aura 39383
+
+    // gossip texts
+    GOSSIP_ITEM_ORC_GRUNT           = -3532006,
+    GOSSIP_ITEM_ORC_WOLF            = -3532007,
+    GOSSIP_ITEM_SUMMONED_DEAMON     = -3532008,
+    GOSSIP_ITEM_ORC_WARLOCK         = -3532009,
+    GOSSIP_ITEM_ORC_NECROLYTE       = -3532010,
+    GOSSIP_ITEM_WARCHIEF_BLACKHAND  = -3532011,
+    GOSSIP_ITEM_HUMAN_FOOTMAN       = -3532012,
+    GOSSIP_ITEM_HUMAN_CHARGER       = -3532013,
+    GOSSIP_ITEM_WATER_ELEMENTAL     = -3532014,
+    GOSSIP_ITEM_HUMAN_CONJURER      = -3532015,
+    GOSSIP_ITEM_HUMAN_CLERIC        = -3532016,
+    GOSSIP_ITEM_KING_LLANE          = -3532017,
+    GOSSIP_ITEM_RESET_BOARD         = -3532018,
+
+    // gossip menu
+    GOSSIP_MENU_ID_GRUNT            = 10425,
+    GOSSIP_MENU_ID_WOLF             = 10439,
+    GOSSIP_MENU_ID_WARLOCK          = 10440,
+    GOSSIP_MENU_ID_NECROLYTE        = 10434,
+    GOSSIP_MENU_ID_DEAMON           = 10426,
+    GOSSIP_MENU_ID_BLACKHAND        = 10442,
+    GOSSIP_MENU_ID_FOOTMAN          = 8952,
+    GOSSIP_MENU_ID_CHARGER          = 10414,
+    GOSSIP_MENU_ID_CONJURER         = 10417,
+    GOSSIP_MENU_ID_CLERIC           = 10416,
+    GOSSIP_MENU_ID_ELEMENTAL        = 10413,
+    GOSSIP_MENU_ID_LLANE            = 10418,
+    GOSSIP_MENU_ID_MEDIVH           = 10506,
+    GOSSIP_MENU_ID_MEDIVH_BEATEN    = 10718,
+};
+
+/*######
+## npc_echo_of_medivh
+######*/
+
+struct npc_echo_of_medivh : public CreatureScript
+{
+    npc_echo_of_medivh() : CreatureScript("npc_echo_of_medivh") {}
+
+    struct npc_echo_of_medivhAI : public ScriptedAI
+    {
+        npc_echo_of_medivhAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiCheatTimer;
+
+        void Reset() override
+        {
+            m_uiCheatTimer = 90000;
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_FURY_MEDIVH_VISUAL)
+                pSummoned->CastSpell(pSummoned, SPELL_FURY_OF_MEDIVH_AURA, true);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_pInstance || m_pInstance->GetData(TYPE_CHESS) != IN_PROGRESS)
+                return;
+
+            if (m_uiCheatTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, urand(0, 1) ? (m_pInstance->GetData(TYPE_PLAYER_TEAM) == ALLIANCE ? SPELL_HAND_OF_MEDIVH_HORDE : SPELL_HAND_OF_MEDIVH_ALLIANCE) :
+                    (m_pInstance->GetData(TYPE_PLAYER_TEAM) == ALLIANCE ? SPELL_FURY_OF_MEDIVH_ALLIANCE : SPELL_FURY_OF_MEDIVH_HORDE));
+
+                switch (urand(0, 2))
+                {
+                case 0: DoPlaySoundToSet(m_creature, SOUND_ID_CHEAT_1); break;
+                case 1: DoPlaySoundToSet(m_creature, SOUND_ID_CHEAT_2); break;
+                case 2: DoPlaySoundToSet(m_creature, SOUND_ID_CHEAT_3); break;
+                }
+
+                DoScriptText(EMOTE_CHEAT, m_creature);
+                m_uiCheatTimer = 90000;
+            }
+            else
+                m_uiCheatTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_echo_of_medivhAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_CHESS) != DONE && pInstance->GetData(TYPE_CHESS) != SPECIAL)
+                pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_MEDIVH, pCreature->GetObjectGuid());
+            else
+            {
+                if (pInstance->GetData(TYPE_CHESS) == SPECIAL)
+                    pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RESET_BOARD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+
+                pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_MEDIVH_BEATEN, pCreature->GetObjectGuid());
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            // reset the board
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+                pInstance->SetData(TYPE_CHESS, DONE);
+
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_chess_piece_generic : common CreatureScript and AI parts
+######*/
+
+struct ChessPieceScript : public CreatureScript
+{
+    ChessPieceScript(const char *name) : CreatureScript(name) {}
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            // start event when used on the king
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+            {
+                // teleport at the entrance and control the chess piece
+                pPlayer->CastSpell(pPlayer, SPELL_IN_GAME, true);
+                pPlayer->CastSpell(pCreature, SPELL_CONTROL_PIECE, true);
+
+                if (pInstance->GetData(TYPE_CHESS) == NOT_STARTED)
+                    pInstance->SetData(TYPE_CHESS, IN_PROGRESS);
+                else if (pInstance->GetData(TYPE_CHESS) == DONE)
+                    pInstance->SetData(TYPE_CHESS, SPECIAL);
+            }
+
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+        return true;
+    }
+};
+
+struct npc_chess_piece_genericAI : public ScriptedAI
+{
+    npc_chess_piece_genericAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        Reset();
+    }
+
+    ScriptedInstance* m_pInstance;
+
+    ObjectGuid m_currentSquareGuid;
+
+    uint32 m_uiMoveTimer;
+    uint32 m_uiMoveCommandTimer;
+    uint32 m_uiSpellCommandTimer;
+
+    bool m_bIsPrimarySpell;
+    float m_fCurrentOrientation;
+
+    void Reset() override
+    {
+        m_uiMoveTimer = 0;
+        m_uiMoveCommandTimer = 1000;
+        m_uiSpellCommandTimer = m_creature->HasAura(SPELL_CONTROL_PIECE) ? 0 : 1000;
+        m_bIsPrimarySpell = true;
+
+        // cancel move timer for player faction npcs or for friendly games
+        if (m_pInstance)
+        {
+            if ((m_pInstance->GetData(TYPE_PLAYER_TEAM) == ALLIANCE && m_creature->getFaction() == FACTION_ID_CHESS_ALLIANCE) ||
+                (m_pInstance->GetData(TYPE_PLAYER_TEAM) == HORDE && m_creature->getFaction() == FACTION_ID_CHESS_HORDE) ||
+                m_pInstance->GetData(TYPE_CHESS) == DONE)
+                m_uiMoveCommandTimer = 0;
+        }
+    }
+
+    // no default attacking or evading
+    void MoveInLineOfSight(Unit* /*pWho*/) override { }
+    void AttackStart(Unit* /*pWho*/) override { }
+    void EnterEvadeMode() override { }
+
+    void JustDied(Unit* /*pKiller*/) override
+    {
+        if (Creature* pSquare = m_creature->GetMap()->GetCreature(m_currentSquareGuid))
+            pSquare->RemoveAllAuras();
+
+        // ToDo: remove corpse after 10 sec
+    }
+
+    void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+    {
+        // handle move event
+        if (eventType == AI_EVENT_CUSTOM_A)
+        {
+            // clear the current square
+            if (Creature* pSquare = m_creature->GetMap()->GetCreature(m_currentSquareGuid))
+                pSquare->RemoveAllAuras();
+
+            m_currentSquareGuid = pInvoker->GetObjectGuid();
+            m_uiMoveTimer = 2000;
+        }
+        // handle encounter start event
+        else if (eventType == AI_EVENT_CUSTOM_B)
+        {
+            // reset the variables
+            Reset();
+            m_currentSquareGuid = pInvoker->GetObjectGuid();
+
+            // ToDo: enable this when the scope of the spell is clear
+            //if (Creature* pStalker = m_pInstance->GetSingleCreatureFromStorage(NPC_WAITING_ROOM_STALKER))
+            //    pStalker->CastSpell(pStalker, SPELL_AI_ACTION_TIMER, true);
+
+            //DoCastSpellIfCan(m_creature, SPELL_AI_SNAPSHOT_TIMER, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_CHESS_AI_ATTACK_TIMER, CAST_TRIGGERED);
+
+            pInvoker->CastSpell(pInvoker, SPELL_DISABLE_SQUARE, true);
+            pInvoker->CastSpell(pInvoker, SPELL_IS_SQUARE_USED, true);
+        }
+    }
+
+    void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+    {
+        if (uiMotionType != POINT_MOTION_TYPE || !uiPointId)
+            return;
+
+        // update facing
+        if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 5.0f))
+            DoCastSpellIfCan(pTarget, SPELL_CHANGE_FACING);
+        else
+            m_creature->SetFacingTo(m_fCurrentOrientation);
+    }
+
+    void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+    {
+        // do a soft reset when the piece is controlled
+        if (pCaster->GetTypeId() == TYPEID_PLAYER && pSpell->Id == SPELL_CONTROL_PIECE)
+            Reset();
+    }
+
+    // Function which returns a random target by type and range
+    Unit* GetTargetByType(uint8 uiType, float fRange, float fArc = M_PI_F)
+    {
+        if (m_pInstance)
+        {
+            m_pInstance->SetData(TYPE_CHESS_TARGET, uint32(uiType));
+            m_pInstance->SetData(TYPE_CHESS_RANGE, uint32(fRange));
+            m_pInstance->SetData(TYPE_CHESS_ARC_PART, uint32(M_PI_F / fArc));
+            m_pInstance->SetData64(TYPE_CHESS_TARGET, m_creature->GetObjectGuid().GetRawValue());
+            uint64 guid = m_pInstance->GetData64(TYPE_CHESS_TARGET);
+
+            if (Creature *target = m_pInstance->instance->GetCreature(ObjectGuid(guid)))
+                return target;
+        }
+        return NULL;
+    }
+
+    // Function to get a square as close as possible to the enemy
+    Unit* GetMovementSquare()
+    {
+        if (m_pInstance)
+        {
+            m_pInstance->SetData64(TYPE_CHESS_TARGET, m_creature->GetObjectGuid().GetRawValue());
+            uint64 guid = m_pInstance->GetData64(TYPE_CHESS_MOVEMENT_SQUARE);
+
+            if (Creature *square = m_pInstance->instance->GetCreature(ObjectGuid(guid)))
+                return square;
+        }
+        return NULL;
+    }
+
+    virtual uint32 DoCastPrimarySpell() { return 5000; }
+    virtual uint32 DoCastSecondarySpell() { return 5000; }
+
+    void UpdateAI(const uint32 uiDiff) override
+    {
+        if (!m_pInstance || m_pInstance->GetData(TYPE_CHESS) != IN_PROGRESS)
+            return;
+
+        // issue move command
+        if (m_uiMoveCommandTimer)
+        {
+            if (m_uiMoveCommandTimer <= uiDiff)
+            {
+                // just update facing if some enemy is near
+                if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 5.0f))
+                    DoCastSpellIfCan(pTarget, SPELL_CHANGE_FACING);
+                else
+                {
+                    // the npc doesn't have a 100% chance to move; also there should be some GCD check in core for this part
+                    if (roll_chance_i(15))
+                    {
+                        // Note: in a normal case the target would be chosen using the spells above
+                        // However, because the core doesn't support special targeting, we'll provide explicit target
+                        //uint32 uiMoveSpell = SPELL_MOVE_1;
+                        //switch (m_creature->GetEntry())
+                        //{
+                        //    case NPC_HUMAN_CONJURER:
+                        //    case NPC_ORC_WARLOCK:
+                        //    case NPC_HUMAN_CHARGER:
+                        //    case NPC_ORC_WOLF:
+                        //        uiMoveSpell = SPELL_MOVE_2;
+                        //        break;
+                        //}
+                        //DoCastSpellIfCan(m_creature, uiMoveSpell, CAST_TRIGGERED);
+
+                        // workaround which provides specific move target
+                        if (Unit* pTarget = GetMovementSquare())
+                            DoCastSpellIfCan(pTarget, SPELL_MOVE_GENERIC, CAST_TRIGGERED | CAST_INTERRUPT_PREVIOUS);
+
+                        m_fCurrentOrientation = m_creature->GetOrientation();
+                    }
+                }
+
+                m_uiMoveCommandTimer = 5000;
+            }
+            else
+                m_uiMoveCommandTimer -= uiDiff;
+        }
+
+        // issue spell command
+        if (m_uiSpellCommandTimer)
+        {
+            if (m_uiSpellCommandTimer <= uiDiff)
+            {
+                // alternate the spells and also reset the timer
+                m_uiSpellCommandTimer = m_bIsPrimarySpell ? DoCastPrimarySpell() : DoCastSecondarySpell();
+                m_bIsPrimarySpell = !m_bIsPrimarySpell;
+            }
+            else
+                m_uiSpellCommandTimer -= uiDiff;
+        }
+
+        // finish move timer
+        if (m_uiMoveTimer)
+        {
+            if (m_uiMoveTimer <= uiDiff)
+            {
+                if (Creature* pSquare = m_creature->GetMap()->GetCreature(m_currentSquareGuid))
+                {
+                    DoCastSpellIfCan(pSquare, SPELL_MOVE_MARKER, CAST_TRIGGERED);
+                    m_creature->GetMotionMaster()->MovePoint(1, pSquare->GetPositionX(), pSquare->GetPositionY(), pSquare->GetPositionZ());
+                }
+                m_uiMoveTimer = 0;
+            }
+            else
+                m_uiMoveTimer -= uiDiff;
+        }
+
+        if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            return;
+    }
+
+    protected:
+        void DoMoveChessPieceToSides(uint32 uiSpellId, uint32 uiFaction, bool bGameEnd = false)
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_CHESS_RANGE, uiSpellId);
+                m_pInstance->SetData(TYPE_CHESS_ARC_PART, uiFaction);
+                m_pInstance->SetData(TYPE_CHESS_MOVE_TO_SIDES, uint32(bGameEnd));
+            }
+        }
+};
+
+//*********
+//** spells
+//*********
+struct spell_move_to_square : public SpellScript
+{
+    spell_move_to_square() : SpellScript("spell_move_to_square") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // movement perform spell
+        if (uiSpellId == SPELL_MOVE_TO_SQUARE && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            if (pCaster->GetTypeId() == TYPEID_UNIT)
+            {
+                pCaster->CastSpell(pCaster, SPELL_DISABLE_SQUARE, true);
+                pCaster->CastSpell(pCaster, SPELL_IS_SQUARE_USED, true);
+
+                pCreatureTarget->CastSpell(pCreatureTarget, SPELL_MOVE_COOLDOWN, true);
+                pCreatureTarget->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pCreatureTarget);
+            }
+
+            return true;
+        }
+        return false;
+    }
+};
+
+struct spell_action_melee : public SpellScript
+{
+    spell_action_melee() : SpellScript("spell_action_melee") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // generic melee tick
+        if (uiSpellId == SPELL_ACTION_MELEE && uiEffIndex == EFFECT_INDEX_0)
+        {
+            uint32 uiMeleeSpell = 0;
+            Creature *pCreatureTarget = pTarget->ToCreature();
+
+            switch (pCreatureTarget->GetEntry())
+            {
+                case NPC_KING_LLANE:            uiMeleeSpell = SPELL_MELEE_KING_LLANE;          break;
+                case NPC_HUMAN_CHARGER:         uiMeleeSpell = SPELL_MELEE_CHARGER;             break;
+                case NPC_HUMAN_CLERIC:          uiMeleeSpell = SPELL_MELEE_CLERIC;              break;
+                case NPC_HUMAN_CONJURER:        uiMeleeSpell = SPELL_MELEE_CONJURER;            break;
+                case NPC_HUMAN_FOOTMAN:         uiMeleeSpell = SPELL_MELEE_FOOTMAN;             break;
+                case NPC_CONJURED_WATER_ELEMENTAL: uiMeleeSpell = SPELL_MELEE_WATER_ELEM;       break;
+                case NPC_WARCHIEF_BLACKHAND:    uiMeleeSpell = SPELL_MELEE_WARCHIEF_BLACKHAND;  break;
+                case NPC_ORC_GRUNT:             uiMeleeSpell = SPELL_MELEE_GRUNT;               break;
+                case NPC_ORC_NECROLYTE:         uiMeleeSpell = SPELL_MELEE_NECROLYTE;           break;
+                case NPC_ORC_WARLOCK:           uiMeleeSpell = SPELL_MELEE_WARLOCK;             break;
+                case NPC_ORC_WOLF:              uiMeleeSpell = SPELL_MELEE_WOLF;                break;
+                case NPC_SUMMONED_DAEMON:       uiMeleeSpell = SPELL_MELEE_DAEMON;              break;
+            }
+
+            pCreatureTarget->CastSpell(pCreatureTarget, uiMeleeSpell, true);
+            return true;
+        }
+        return false;
+    }
+};
+
+struct spell_face_square : public SpellScript
+{
+    spell_face_square() : SpellScript("spell_face_square") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // square facing
+        if (uiSpellId == SPELL_FACE_SQUARE && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            if (pCaster->GetTypeId() == TYPEID_UNIT)
+                pCreatureTarget->SetFacingToObject(pCaster);
+
+            return true;
+        }
+        return false;
+    }
+};
+
+/*######
+## npc_king_llane
+######*/
+
+struct npc_king_llane : public ChessPieceScript
+{
+    npc_king_llane() : ChessPieceScript("npc_king_llane") {}
+
+    struct npc_king_llaneAI : public npc_chess_piece_genericAI
+    {
+        npc_king_llaneAI(Creature* pCreature) : npc_chess_piece_genericAI(pCreature)
+        {
+            m_bIsAttacked = false;
+        }
+
+        bool m_bIsAttacked;
+
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+        {
+            if (!uiDamage || !m_bIsAttacked || !m_pInstance || pDoneBy->GetTypeId() != TYPEID_UNIT)
+                return;
+
+            if (Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH))
+            {
+                if (m_pInstance->GetData(TYPE_PLAYER_TEAM) == ALLIANCE)
+                    DoPlaySoundToSet(pMedivh, SOUND_ID_CHECK_PLAYER);
+                else
+                    DoPlaySoundToSet(pMedivh, SOUND_ID_CHECK_MEDIVH);
+            }
+
+            m_bIsAttacked = true;
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            npc_chess_piece_genericAI::JustDied(pKiller);
+
+            if (!m_pInstance)
+                return;
+
+            Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH);
+            if (!pMedivh)
+                return;
+
+            if (m_pInstance->GetData(TYPE_CHESS) == SPECIAL)
+                m_pInstance->SetData(TYPE_CHESS, DONE);
+            else
+            {
+                if (m_pInstance->GetData(TYPE_PLAYER_TEAM) == HORDE)
+                {
+                    DoPlaySoundToSet(pMedivh, SOUND_ID_WIN_PLAYER);
+                    DoScriptText(EMOTE_LIFT_CURSE, pMedivh);
+
+                    m_pInstance->SetData(TYPE_CHESS, DONE);
+                }
+                else
+                {
+                    DoPlaySoundToSet(pMedivh, SOUND_ID_WIN_MEDIVH);
+                    m_pInstance->SetData(TYPE_CHESS, FAIL);
+                }
+            }
+
+            DoMoveChessPieceToSides(SPELL_TRANSFORM_KING_LLANE, FACTION_ID_CHESS_ALLIANCE, true);
+        }
+
+        uint32 DoCastPrimarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 20.0f))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_HEROISM);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_HEROISM);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+
+        uint32 DoCastSecondarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 10.0f))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SWEEP);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_SWEEP);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_king_llaneAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->HasAura(SPELL_RECENTLY_IN_GAME) || pCreature->HasAura(SPELL_CONTROL_PIECE))
+            return true;
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if ((pInstance->GetData(TYPE_CHESS) != DONE && pPlayer->GetTeam() == ALLIANCE) || pInstance->GetData(TYPE_CHESS_GAME_READY))
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KING_LLANE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_LLANE, pCreature->GetObjectGuid());
+        return true;
+    }
+};
+
+/*######
+## npc_warchief_blackhand
+######*/
+
+struct npc_warchief_blackhand : public ChessPieceScript
+{
+    npc_warchief_blackhand() : ChessPieceScript("npc_warchief_blackhand") {}
+
+    struct npc_warchief_blackhandAI : public npc_chess_piece_genericAI
+    {
+        npc_warchief_blackhandAI(Creature* pCreature) : npc_chess_piece_genericAI(pCreature)
+        {
+            m_bIsAttacked = false;
+        }
+
+        bool m_bIsAttacked;
+
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+        {
+            if (!uiDamage || !m_bIsAttacked || !m_pInstance || pDoneBy->GetTypeId() != TYPEID_UNIT)
+                return;
+
+            if (Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH))
+            {
+                if (m_pInstance->GetData(TYPE_PLAYER_TEAM) == HORDE)
+                    DoPlaySoundToSet(pMedivh, SOUND_ID_CHECK_PLAYER);
+                else
+                    DoPlaySoundToSet(pMedivh, SOUND_ID_CHECK_MEDIVH);
+            }
+
+            m_bIsAttacked = true;
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            npc_chess_piece_genericAI::JustDied(pKiller);
+
+            if (!m_pInstance)
+                return;
+
+            Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH);
+            if (!pMedivh)
+                return;
+
+            if (m_pInstance->GetData(TYPE_CHESS) == SPECIAL)
+                m_pInstance->SetData(TYPE_CHESS, DONE);
+            else
+            {
+                if (m_pInstance->GetData(TYPE_PLAYER_TEAM) == ALLIANCE)
+                {
+                    DoPlaySoundToSet(pMedivh, SOUND_ID_WIN_PLAYER);
+                    DoScriptText(EMOTE_LIFT_CURSE, pMedivh);
+
+                    m_pInstance->SetData(TYPE_CHESS, DONE);
+                }
+                else
+                {
+                    DoPlaySoundToSet(pMedivh, SOUND_ID_WIN_MEDIVH);
+                    m_pInstance->SetData(TYPE_CHESS, FAIL);
+                }
+            }
+
+            DoMoveChessPieceToSides(SPELL_TRANSFORM_BLACKHAND, FACTION_ID_CHESS_HORDE, true);
+        }
+
+        uint32 DoCastPrimarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 20.0f))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_BLOODLUST);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_BLOODLUST);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+
+        uint32 DoCastSecondarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 10.0f))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_CLEAVE);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_CLEAVE);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_warchief_blackhandAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->HasAura(SPELL_RECENTLY_IN_GAME) || pCreature->HasAura(SPELL_CONTROL_PIECE))
+            return true;
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_CHESS) != DONE && pPlayer->GetTeam() == HORDE || pInstance->GetData(TYPE_CHESS_GAME_READY))
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_WARCHIEF_BLACKHAND, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_BLACKHAND, pCreature->GetObjectGuid());
+        return true;
+    }
+};
+
+/*######
+## npc_human_conjurer
+######*/
+
+struct npc_human_conjurer : public ChessPieceScript
+{
+    npc_human_conjurer() : ChessPieceScript("npc_human_conjurer") {}
+
+    struct npc_human_conjurerAI : public npc_chess_piece_genericAI
+    {
+        npc_human_conjurerAI(Creature* pCreature) : npc_chess_piece_genericAI(pCreature) { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            npc_chess_piece_genericAI::JustDied(pKiller);
+
+            if (!m_pInstance)
+                return;
+
+            Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH);
+            if (!pMedivh)
+                return;
+
+            if (m_pInstance->GetData(TYPE_PLAYER_TEAM) == ALLIANCE)
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_QUEEN_PLAYER);
+            else
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_QUEEN_MEDIVH);
+
+            DoMoveChessPieceToSides(SPELL_TRANSFORM_CONJURER, FACTION_ID_CHESS_ALLIANCE);
+        }
+
+        uint32 DoCastPrimarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 20.0f))
+            {
+                DoCastSpellIfCan(pTarget, SPELL_ELEMENTAL_BLAST);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_ELEMENTAL_BLAST);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+
+        uint32 DoCastSecondarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 25.0f))
+            {
+                DoCastSpellIfCan(pTarget, SPELL_RAIN_OF_FIRE);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_RAIN_OF_FIRE);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_human_conjurerAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->HasAura(SPELL_RECENTLY_IN_GAME) || pCreature->HasAura(SPELL_CONTROL_PIECE))
+            return true;
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if ((pInstance->GetData(TYPE_CHESS) == IN_PROGRESS && pPlayer->GetTeam() == ALLIANCE) || pInstance->GetData(TYPE_CHESS) == SPECIAL)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_HUMAN_CONJURER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_CONJURER, pCreature->GetObjectGuid());
+        return true;
+    }
+};
+
+/*######
+## npc_orc_warlock
+######*/
+
+struct npc_orc_warlock : public ChessPieceScript
+{
+    npc_orc_warlock() : ChessPieceScript("npc_orc_warlock") {}
+
+    struct npc_orc_warlockAI : public npc_chess_piece_genericAI
+    {
+        npc_orc_warlockAI(Creature* pCreature) : npc_chess_piece_genericAI(pCreature) { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            npc_chess_piece_genericAI::JustDied(pKiller);
+
+            if (!m_pInstance)
+                return;
+
+            Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH);
+            if (!pMedivh)
+                return;
+
+            if (m_pInstance->GetData(TYPE_PLAYER_TEAM) == HORDE)
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_QUEEN_PLAYER);
+            else
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_QUEEN_MEDIVH);
+
+            DoMoveChessPieceToSides(SPELL_TRANSFORM_WARLOCK, FACTION_ID_CHESS_HORDE);
+        }
+
+        uint32 DoCastPrimarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 20.0f))
+            {
+                DoCastSpellIfCan(pTarget, SPELL_FIREBALL);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_FIREBALL);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+
+        uint32 DoCastSecondarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 25.0f))
+            {
+                DoCastSpellIfCan(pTarget, SPELL_POISON_CLOUD_ACTION);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_POISON_CLOUD_ACTION);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_orc_warlockAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->HasAura(SPELL_RECENTLY_IN_GAME) || pCreature->HasAura(SPELL_CONTROL_PIECE))
+            return true;
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if ((pInstance->GetData(TYPE_CHESS) == IN_PROGRESS && pPlayer->GetTeam() == HORDE) || pInstance->GetData(TYPE_CHESS) == SPECIAL)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ORC_WARLOCK, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_WARLOCK, pCreature->GetObjectGuid());
+        return true;
+    }
+};
+
+/*######
+## npc_human_footman
+######*/
+
+struct npc_human_footman : public ChessPieceScript
+{
+    npc_human_footman() : ChessPieceScript("npc_human_footman") {}
+
+    struct npc_human_footmanAI : public npc_chess_piece_genericAI
+    {
+        npc_human_footmanAI(Creature* pCreature) : npc_chess_piece_genericAI(pCreature) { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            npc_chess_piece_genericAI::JustDied(pKiller);
+
+            if (!m_pInstance)
+                return;
+
+            Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH);
+            if (!pMedivh)
+                return;
+
+            if (m_pInstance->GetData(TYPE_PLAYER_TEAM) == ALLIANCE)
+            {
+                switch (urand(0, 2))
+                {
+                case 0: DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_PAWN_PLAYER_1); break;
+                case 1: DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_PAWN_PLAYER_2); break;
+                case 2: DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_PAWN_PLAYER_3); break;
+                }
+            }
+            else
+            {
+                switch (urand(0, 2))
+                {
+                case 0: DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_PAWN_MEDIVH_1); break;
+                case 1: DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_PAWN_MEDIVH_2); break;
+                case 2: DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_PAWN_MEDIVH_3); break;
+                }
+            }
+
+            DoMoveChessPieceToSides(SPELL_TRANSFORM_FOOTMAN, FACTION_ID_CHESS_ALLIANCE);
+        }
+
+        uint32 DoCastPrimarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 8.0f, M_PI_F / 12))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_HEROIC_BLOW);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_HEROIC_BLOW);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+
+        uint32 DoCastSecondarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 8.0f))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SHIELD_BLOCK);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_SHIELD_BLOCK);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_human_footmanAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->HasAura(SPELL_RECENTLY_IN_GAME) || pCreature->HasAura(SPELL_CONTROL_PIECE))
+            return true;
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if ((pInstance->GetData(TYPE_CHESS) == IN_PROGRESS && pPlayer->GetTeam() == ALLIANCE) || pInstance->GetData(TYPE_CHESS) == SPECIAL)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_HUMAN_FOOTMAN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_FOOTMAN, pCreature->GetObjectGuid());
+        return true;
+    }
+};
+
+/*######
+## npc_orc_grunt
+######*/
+
+struct npc_orc_grunt : public ChessPieceScript
+{
+    npc_orc_grunt() : ChessPieceScript("npc_orc_grunt") {}
+
+    struct npc_orc_gruntAI : public npc_chess_piece_genericAI
+    {
+        npc_orc_gruntAI(Creature* pCreature) : npc_chess_piece_genericAI(pCreature) { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            npc_chess_piece_genericAI::JustDied(pKiller);
+
+            if (!m_pInstance)
+                return;
+
+            Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH);
+            if (!pMedivh)
+                return;
+
+            if (m_pInstance->GetData(TYPE_PLAYER_TEAM) == HORDE)
+            {
+                switch (urand(0, 2))
+                {
+                case 0: DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_PAWN_PLAYER_1); break;
+                case 1: DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_PAWN_PLAYER_2); break;
+                case 2: DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_PAWN_PLAYER_3); break;
+                }
+            }
+            else
+            {
+                switch (urand(0, 2))
+                {
+                case 0: DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_PAWN_MEDIVH_1); break;
+                case 1: DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_PAWN_MEDIVH_2); break;
+                case 2: DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_PAWN_MEDIVH_3); break;
+                }
+            }
+
+            DoMoveChessPieceToSides(SPELL_TRANSFORM_GRUNT, FACTION_ID_CHESS_HORDE);
+        }
+
+        uint32 DoCastPrimarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 8.0f, M_PI_F / 12))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_VICIOUS_STRIKE);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_VICIOUS_STRIKE);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+
+        uint32 DoCastSecondarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 8.0f))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_WEAPON_DEFLECTION);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_WEAPON_DEFLECTION);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_orc_gruntAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->HasAura(SPELL_RECENTLY_IN_GAME) || pCreature->HasAura(SPELL_CONTROL_PIECE))
+            return true;
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if ((pInstance->GetData(TYPE_CHESS) == IN_PROGRESS && pPlayer->GetTeam() == HORDE) || pInstance->GetData(TYPE_CHESS) == SPECIAL)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ORC_GRUNT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_GRUNT, pCreature->GetObjectGuid());
+        return true;
+    }
+};
+
+/*######
+## npc_water_elemental
+######*/
+
+struct npc_water_elemental : public ChessPieceScript
+{
+    npc_water_elemental() : ChessPieceScript("npc_water_elemental") {}
+
+    struct npc_water_elementalAI : public npc_chess_piece_genericAI
+    {
+        npc_water_elementalAI(Creature* pCreature) : npc_chess_piece_genericAI(pCreature) { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            npc_chess_piece_genericAI::JustDied(pKiller);
+
+            if (!m_pInstance)
+                return;
+
+            Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH);
+            if (!pMedivh)
+                return;
+
+            if (m_pInstance->GetData(TYPE_PLAYER_TEAM) == ALLIANCE)
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_ROOK_PLAYER);
+            else
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_ROOK_MEDIVH);
+
+            DoMoveChessPieceToSides(SPELL_TRANSFORM_WATER_ELEM, FACTION_ID_CHESS_ALLIANCE);
+        }
+
+        uint32 DoCastPrimarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 9.0f))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_GEYSER);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_GEYSER);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+
+        uint32 DoCastSecondarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 9.0f))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_WATER_SHIELD);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_WATER_SHIELD);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_water_elementalAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->HasAura(SPELL_RECENTLY_IN_GAME) || pCreature->HasAura(SPELL_CONTROL_PIECE))
+            return true;
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if ((pInstance->GetData(TYPE_CHESS) == IN_PROGRESS && pPlayer->GetTeam() == ALLIANCE) || pInstance->GetData(TYPE_CHESS) == SPECIAL)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_WATER_ELEMENTAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_ELEMENTAL, pCreature->GetObjectGuid());
+        return true;
+    }
+};
+
+/*######
+## npc_summoned_daemon
+######*/
+
+struct npc_summoned_daemon : public ChessPieceScript
+{
+    npc_summoned_daemon() : ChessPieceScript("npc_summoned_daemon") {}
+
+    struct npc_summoned_daemonAI : public npc_chess_piece_genericAI
+    {
+        npc_summoned_daemonAI(Creature* pCreature) : npc_chess_piece_genericAI(pCreature) { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            npc_chess_piece_genericAI::JustDied(pKiller);
+
+            if (!m_pInstance)
+                return;
+
+            Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH);
+            if (!pMedivh)
+                return;
+
+            if (m_pInstance->GetData(TYPE_PLAYER_TEAM) == HORDE)
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_ROOK_PLAYER);
+            else
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_ROOK_MEDIVH);
+
+            DoMoveChessPieceToSides(SPELL_TRANSFORM_DAEMON, FACTION_ID_CHESS_HORDE);
+        }
+
+        uint32 DoCastPrimarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 9.0f))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_HELLFIRE);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_HELLFIRE);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+
+        uint32 DoCastSecondarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 9.0f))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_FIRE_SHIELD);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_FIRE_SHIELD);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_summoned_daemonAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->HasAura(SPELL_RECENTLY_IN_GAME) || pCreature->HasAura(SPELL_CONTROL_PIECE))
+            return true;
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if ((pInstance->GetData(TYPE_CHESS) == IN_PROGRESS && pPlayer->GetTeam() == HORDE) || pInstance->GetData(TYPE_CHESS) == SPECIAL)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SUMMONED_DEAMON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_DEAMON, pCreature->GetObjectGuid());
+        return true;
+    }
+};
+
+/*######
+## npc_human_charger
+######*/
+
+struct npc_human_charger : public ChessPieceScript
+{
+    npc_human_charger() : ChessPieceScript("npc_human_charger") {}
+
+    struct npc_human_chargerAI : public npc_chess_piece_genericAI
+    {
+        npc_human_chargerAI(Creature* pCreature) : npc_chess_piece_genericAI(pCreature) { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            npc_chess_piece_genericAI::JustDied(pKiller);
+
+            if (!m_pInstance)
+                return;
+
+            Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH);
+            if (!pMedivh)
+                return;
+
+            if (m_pInstance->GetData(TYPE_PLAYER_TEAM) == ALLIANCE)
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_KNIGHT_PLAYER);
+            else
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_KNIGHT_MEDIVH);
+
+            DoMoveChessPieceToSides(SPELL_TRANSFORM_CHARGER, FACTION_ID_CHESS_ALLIANCE);
+        }
+
+        uint32 DoCastPrimarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 8.0f, M_PI_F / 12))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SMASH);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_SMASH);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+
+        uint32 DoCastSecondarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 10.0f, M_PI_F / 12))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_STOMP);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_STOMP);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_human_chargerAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->HasAura(SPELL_RECENTLY_IN_GAME) || pCreature->HasAura(SPELL_CONTROL_PIECE))
+            return true;
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if ((pInstance->GetData(TYPE_CHESS) == IN_PROGRESS && pPlayer->GetTeam() == ALLIANCE) || pInstance->GetData(TYPE_CHESS) == SPECIAL)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_HUMAN_CHARGER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_CHARGER, pCreature->GetObjectGuid());
+        return true;
+    }
+};
+
+/*######
+## npc_orc_wolf
+######*/
+
+struct npc_orc_wolf : public ChessPieceScript
+{
+    npc_orc_wolf() : ChessPieceScript("npc_orc_wolf") {}
+
+    struct npc_orc_wolfAI : public npc_chess_piece_genericAI
+    {
+        npc_orc_wolfAI(Creature* pCreature) : npc_chess_piece_genericAI(pCreature) { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            npc_chess_piece_genericAI::JustDied(pKiller);
+
+            if (!m_pInstance)
+                return;
+
+            Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH);
+            if (!pMedivh)
+                return;
+
+            if (m_pInstance->GetData(TYPE_PLAYER_TEAM) == HORDE)
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_KNIGHT_PLAYER);
+            else
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_KNIGHT_MEDIVH);
+
+            DoMoveChessPieceToSides(SPELL_TRANSFORM_WOLF, FACTION_ID_CHESS_HORDE);
+        }
+
+        uint32 DoCastPrimarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 8.0f, M_PI_F / 12))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_BITE);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_BITE);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+
+        uint32 DoCastSecondarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 10.0f, M_PI_F / 12))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_HOWL);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_HOWL);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_orc_wolfAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->HasAura(SPELL_RECENTLY_IN_GAME) || pCreature->HasAura(SPELL_CONTROL_PIECE))
+            return true;
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if ((pInstance->GetData(TYPE_CHESS) == IN_PROGRESS && pPlayer->GetTeam() == HORDE) || pInstance->GetData(TYPE_CHESS) == SPECIAL)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ORC_WOLF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_WOLF, pCreature->GetObjectGuid());
+        return true;
+    }
+};
+
+/*######
+## npc_human_cleric
+######*/
+
+struct npc_human_cleric : public ChessPieceScript
+{
+    npc_human_cleric() : ChessPieceScript("npc_human_cleric") {}
+
+    struct npc_human_clericAI : public npc_chess_piece_genericAI
+    {
+        npc_human_clericAI(Creature* pCreature) : npc_chess_piece_genericAI(pCreature) { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            npc_chess_piece_genericAI::JustDied(pKiller);
+
+            if (!m_pInstance)
+                return;
+
+            Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH);
+            if (!pMedivh)
+                return;
+
+            if (m_pInstance->GetData(TYPE_PLAYER_TEAM) == ALLIANCE)
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_BISHOP_PLAYER);
+            else
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_BISHOP_MEDIVH);
+
+            DoMoveChessPieceToSides(SPELL_TRANSFORM_CLERIC, FACTION_ID_CHESS_ALLIANCE);
+        }
+
+        uint32 DoCastPrimarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_FRIENDLY, 25.0f))
+            {
+                DoCastSpellIfCan(pTarget, SPELL_HEALING);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_HEALING);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+
+        uint32 DoCastSecondarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 18.0f, M_PI_F / 12))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_HOLY_LANCE);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_HOLY_LANCE);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_human_clericAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->HasAura(SPELL_RECENTLY_IN_GAME) || pCreature->HasAura(SPELL_CONTROL_PIECE))
+            return true;
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if ((pInstance->GetData(TYPE_CHESS) == IN_PROGRESS && pPlayer->GetTeam() == ALLIANCE) || pInstance->GetData(TYPE_CHESS) == SPECIAL)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_HUMAN_CLERIC, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_CLERIC, pCreature->GetObjectGuid());
+        return true;
+    }
+};
+
+/*######
+## npc_orc_necrolyte
+######*/
+
+struct npc_orc_necrolyte : public ChessPieceScript
+{
+    npc_orc_necrolyte() : ChessPieceScript("npc_orc_necrolyte") {}
+
+    struct npc_orc_necrolyteAI : public npc_chess_piece_genericAI
+    {
+        npc_orc_necrolyteAI(Creature* pCreature) : npc_chess_piece_genericAI(pCreature) { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            npc_chess_piece_genericAI::JustDied(pKiller);
+
+            if (!m_pInstance)
+                return;
+
+            Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH);
+            if (!pMedivh)
+                return;
+
+            if (m_pInstance->GetData(TYPE_PLAYER_TEAM) == HORDE)
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_BISHOP_PLAYER);
+            else
+                DoPlaySoundToSet(pMedivh, SOUND_ID_LOSE_BISHOP_MEDIVH);
+
+            DoMoveChessPieceToSides(SPELL_TRANSFORM_NECROLYTE, FACTION_ID_CHESS_HORDE);
+        }
+
+        uint32 DoCastPrimarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_FRIENDLY, 25.0f))
+            {
+                DoCastSpellIfCan(pTarget, SPELL_SHADOW_MEND_ACTION);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_SHADOW_MEND_ACTION);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+
+            }
+
+            return 5000;
+        }
+
+        uint32 DoCastSecondarySpell() override
+        {
+            if (Unit* pTarget = GetTargetByType(TARGET_TYPE_RANDOM, 18.0f, M_PI_F / 12))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SHADOW_SPEAR);
+
+                // reset timer based on spell values
+                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_SHADOW_SPEAR);
+#if defined(CATA)
+                return pSpell->GetRecoveryTime() ? pSpell->GetRecoveryTime() : pSpell->GetCategoryRecoveryTime();
+#else
+                return pSpell->RecoveryTime ? pSpell->RecoveryTime : pSpell->CategoryRecoveryTime;
+#endif
+            }
+
+            return 5000;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_orc_necrolyteAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->HasAura(SPELL_RECENTLY_IN_GAME) || pCreature->HasAura(SPELL_CONTROL_PIECE))
+            return true;
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if ((pInstance->GetData(TYPE_CHESS) == IN_PROGRESS && pPlayer->GetTeam() == HORDE) || pInstance->GetData(TYPE_CHESS) == SPECIAL)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ORC_NECROLYTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_NECROLYTE, pCreature->GetObjectGuid());
+        return true;
+    }
+};
+
+void AddSC_chess_event()
+{
+    Script* s;
+
+    s = new npc_echo_of_medivh();
+    s->RegisterSelf();
+    s = new npc_king_llane();
+    s->RegisterSelf();
+    s = new npc_warchief_blackhand();
+    s->RegisterSelf();
+    s = new npc_human_conjurer();
+    s->RegisterSelf();
+    s = new npc_orc_warlock();
+    s->RegisterSelf();
+    s = new npc_human_footman();
+    s->RegisterSelf();
+    s = new npc_orc_grunt();
+    s->RegisterSelf();
+    s = new npc_water_elemental();
+    s->RegisterSelf();
+    s = new npc_summoned_daemon();
+    s->RegisterSelf();
+    s = new npc_human_charger();
+    s->RegisterSelf();
+    s = new npc_orc_wolf();
+    s->RegisterSelf();
+    s = new npc_human_cleric();
+    s->RegisterSelf();
+    s = new npc_orc_necrolyte();
+    s->RegisterSelf();
+
+    s = new spell_action_melee();
+    s->RegisterSelf();
+    s = new spell_face_square();
+    s->RegisterSelf();
+    s = new spell_move_to_square();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_echo_of_medivh";
+    //pNewScript->GetAI = GetAI_npc_echo_of_medivh;
+    //pNewScript->pGossipHello = GossipHello_npc_echo_of_medivh;
+    //pNewScript->pGossipSelect = GossipSelect_npc_echo_of_medivh;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_king_llane";
+    //pNewScript->GetAI = GetAI_npc_king_llane;
+    //pNewScript->pGossipHello = GossipHello_npc_king_llane;
+    //pNewScript->pGossipSelect = GossipSelect_npc_chess_generic;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_chess_generic;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_warchief_blackhand";
+    //pNewScript->GetAI = GetAI_npc_warchief_blackhand;
+    //pNewScript->pGossipHello = GossipHello_npc_warchief_blackhand;
+    //pNewScript->pGossipSelect = GossipSelect_npc_chess_generic;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_chess_generic;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_human_conjurer";
+    //pNewScript->GetAI = GetAI_npc_human_conjurer;
+    //pNewScript->pGossipHello = GossipHello_npc_human_conjurer;
+    //pNewScript->pGossipSelect = GossipSelect_npc_chess_generic;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_chess_generic;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_orc_warlock";
+    //pNewScript->GetAI = GetAI_npc_orc_warlock;
+    //pNewScript->pGossipHello = GossipHello_npc_orc_warlock;
+    //pNewScript->pGossipSelect = GossipSelect_npc_chess_generic;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_chess_generic;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_human_footman";
+    //pNewScript->GetAI = GetAI_npc_human_footman;
+    //pNewScript->pGossipHello = GossipHello_npc_human_footman;
+    //pNewScript->pGossipSelect = GossipSelect_npc_chess_generic;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_chess_generic;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_orc_grunt";
+    //pNewScript->GetAI = GetAI_npc_orc_grunt;
+    //pNewScript->pGossipHello = GossipHello_npc_orc_grunt;
+    //pNewScript->pGossipSelect = GossipSelect_npc_chess_generic;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_chess_generic;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_water_elemental";
+    //pNewScript->GetAI = GetAI_npc_water_elemental;
+    //pNewScript->pGossipHello = GossipHello_npc_water_elemental;
+    //pNewScript->pGossipSelect = GossipSelect_npc_chess_generic;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_chess_generic;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_summoned_daemon";
+    //pNewScript->GetAI = GetAI_npc_summoned_daemon;
+    //pNewScript->pGossipHello = GossipHello_npc_summoned_daemon;
+    //pNewScript->pGossipSelect = GossipSelect_npc_chess_generic;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_chess_generic;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_human_charger";
+    //pNewScript->GetAI = GetAI_npc_human_charger;
+    //pNewScript->pGossipHello = GossipHello_npc_human_charger;
+    //pNewScript->pGossipSelect = GossipSelect_npc_chess_generic;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_chess_generic;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_orc_wolf";
+    //pNewScript->GetAI = GetAI_npc_orc_wolf;
+    //pNewScript->pGossipHello = GossipHello_npc_orc_wolf;
+    //pNewScript->pGossipSelect = GossipSelect_npc_chess_generic;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_chess_generic;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_human_cleric";
+    //pNewScript->GetAI = GetAI_npc_human_cleric;
+    //pNewScript->pGossipHello = GossipHello_npc_human_cleric;
+    //pNewScript->pGossipSelect = GossipSelect_npc_chess_generic;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_chess_generic;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_orc_necrolyte";
+    //pNewScript->GetAI = GetAI_npc_orc_necrolyte;
+    //pNewScript->pGossipHello = GossipHello_npc_orc_necrolyte;
+    //pNewScript->pGossipSelect = GossipSelect_npc_chess_generic;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_chess_generic;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp
new file mode 100644
index 000000000..34e79bafb
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp
@@ -0,0 +1,873 @@
+/**
+ * ScriptDev3 is an extension for mangos-one providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos-one.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Karazhan
+SD%Complete: 70
+SDComment: Instance Script for Karazhan to help in various encounters.
+SDCategory: Karazhan
+EndScriptData */
+
+#include "precompiled.h"
+#include "karazhan.h"
+
+/*
+0  - Attumen + Midnight (optional)
+1  - Moroes
+2  - Maiden of Virtue (optional)
+3  - Opera Event
+4  - Curator
+5  - Terestian Illhoof (optional)
+6  - Shade of Aran (optional)
+7  - Netherspite (optional)
+8  - Chess Event
+9  - Prince Malchezzar
+10 - Nightbane
+*/
+
+struct OperaSpawns
+{
+    uint32 uiEntry;
+    float fX, fY, fZ, fO;
+};
+
+static const OperaSpawns aOperaLocOz[MAX_OZ_OPERA_MOBS] =
+{
+    { NPC_DOROTHEE, -10896.65f, -1757.62f, 90.55f, 4.86f },
+    { NPC_ROAR, -10889.53f, -1758.10f, 90.55f, 4.57f },
+    { NPC_TINHEAD, -10883.84f, -1758.85f, 90.55f, 4.53f },
+    { NPC_STRAWMAN, -10902.11f, -1756.45f, 90.55f, 4.66f },
+};
+
+static const OperaSpawns aOperaLocWolf = { NPC_GRANDMOTHER, -10892.01f, -1758.01f, 90.55f, 4.73f };
+static const OperaSpawns aOperaLocJul = { NPC_JULIANNE, -10893.56f, -1760.43f, 90.55f, 4.55f };
+
+static const float afChroneSpawnLoc[4] = { -10893.11f, -1757.85f, 90.55f, 4.60f };
+
+struct is_karazhan : public InstanceScript
+{
+    is_karazhan() : InstanceScript("instance_karazhan") {}
+
+    class instance_karazhan : public ScriptedInstance
+    {
+    public:
+        instance_karazhan(Map* pMap) : ScriptedInstance(pMap),
+            m_uiOperaEvent(0),
+            m_uiOzDeathCount(0),
+            m_uiTeam(0),
+            m_uiChessResetTimer(0),
+            m_uiAllianceStalkerCount(0),
+            m_uiHordeStalkerCount(0),
+            m_bFriendlyGame(false),
+            m_uiChessTargetType(0),
+            m_uiChessRange(0),
+            m_uiChessArcPart(1)
+        {
+            Initialize();
+        }
+
+        ~instance_karazhan() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    return true;
+            }
+
+            return false;
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            if (!m_uiTeam)                                          // very first player to enter
+                m_uiTeam = pPlayer->GetTeam();
+
+            // If the opera event is already set, return
+            if (GetData(TYPE_OPERA_PERFORMANCE) != 0)
+                return;
+
+            // Set the Opera Performance type on the first player enter
+            SetData(TYPE_OPERA_PERFORMANCE, urand(OPERA_EVENT_WIZARD_OZ, OPERA_EVENT_ROMULO_AND_JUL));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_ATTUMEN:
+            case NPC_MIDNIGHT:
+            case NPC_MOROES:
+            case NPC_BARNES:
+            case NPC_NIGHTBANE:
+            case NPC_NETHERSPITE:
+            case NPC_JULIANNE:
+            case NPC_ROMULO:
+            case NPC_LADY_KEIRA_BERRYBUCK:
+            case NPC_LADY_CATRIONA_VON_INDI:
+            case NPC_LORD_CRISPIN_FERENCE:
+            case NPC_BARON_RAFE_DREUGER:
+            case NPC_BARONESS_DOROTHEA_MILLSTIPE:
+            case NPC_LORD_ROBIN_DARIS:
+            case NPC_IMAGE_OF_MEDIVH:
+            case NPC_IMAGE_OF_ARCANAGOS:
+            case NPC_ECHO_MEDIVH:
+            case NPC_CHESS_VICTORY_CONTROLLER:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_NIGHTBANE_HELPER:
+                if (pCreature->GetPositionZ() < 100.0f)
+                    m_lNightbaneGroundTriggers.push_back(pCreature->GetObjectGuid());
+                else
+                    m_lNightbaneAirTriggers.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_INVISIBLE_STALKER:
+                if (pCreature->GetPositionY() < -1870.0f)
+                    m_lChessHordeStalkerList.push_back(pCreature->GetObjectGuid());
+                else
+                    m_lChessAllianceStalkerList.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_CHESS_STATUS_BAR:
+                if (pCreature->GetPositionY() < -1870.0f)
+                    m_HordeStatusGuid = pCreature->GetObjectGuid();
+                else
+                    m_AllianceStatusGuid = pCreature->GetObjectGuid();
+                break;
+            case NPC_HUMAN_CHARGER:
+            case NPC_HUMAN_CLERIC:
+            case NPC_HUMAN_CONJURER:
+            case NPC_HUMAN_FOOTMAN:
+            case NPC_CONJURED_WATER_ELEMENTAL:
+            case NPC_KING_LLANE:
+                m_lChessPiecesAlliance.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_ORC_GRUNT:
+            case NPC_ORC_NECROLYTE:
+            case NPC_ORC_WARLOCK:
+            case NPC_ORC_WOLF:
+            case NPC_SUMMONED_DAEMON:
+            case NPC_WARCHIEF_BLACKHAND:
+                m_lChessPiecesHorde.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_STAGE_DOOR_LEFT:
+            case GO_STAGE_DOOR_RIGHT:
+                if (m_auiEncounter[3] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_GAMESMANS_HALL_EXIT_DOOR:
+                if (m_auiEncounter[8] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_SIDE_ENTRANCE_DOOR:
+                if (m_auiEncounter[3] == DONE)
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED);
+                break;
+            case GO_STAGE_CURTAIN:
+            case GO_PRIVATE_LIBRARY_DOOR:
+            case GO_MASSIVE_DOOR:
+            case GO_GAMESMANS_HALL_DOOR:
+            case GO_NETHERSPACE_DOOR:
+            case GO_DUST_COVERED_CHEST:
+            case GO_MASTERS_TERRACE_DOOR_1:
+            case GO_MASTERS_TERRACE_DOOR_2:
+                break;
+
+                // Opera event backgrounds
+            case GO_OZ_BACKDROP:
+            case GO_HOOD_BACKDROP:
+            case GO_HOOD_HOUSE:
+            case GO_RAJ_BACKDROP:
+            case GO_RAJ_MOON:
+            case GO_RAJ_BALCONY:
+                break;
+            case GO_OZ_HAY:
+                m_lOperaHayGuidList.push_back(pGo->GetObjectGuid());
+                return;
+            case GO_HOOD_TREE:
+                m_lOperaTreeGuidList.push_back(pGo->GetObjectGuid());
+                return;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_DOROTHEE:
+            case NPC_ROAR:
+            case NPC_TINHEAD:
+            case NPC_STRAWMAN:
+                ++m_uiOzDeathCount;
+                // Summon Chrone when all 4 Oz mobs are killed
+                if (m_uiOzDeathCount == MAX_OZ_OPERA_MOBS)
+                {
+                    if (Creature* pCrone = pCreature->SummonCreature(NPC_CRONE, afChroneSpawnLoc[0], afChroneSpawnLoc[1], afChroneSpawnLoc[2], afChroneSpawnLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0))
+                    {
+                        if (pCreature->getVictim())
+                            pCrone->AI()->AttackStart(pCreature->getVictim());
+                    }
+                }
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_ATTUMEN:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == FAIL)
+                {
+                    // Respawn Midnight on Fail
+                    if (Creature* pMidnight = GetSingleCreatureFromStorage(NPC_MIDNIGHT))
+                    {
+                        if (!pMidnight->IsAlive())
+                            pMidnight->Respawn();
+                    }
+                }
+                break;
+            case TYPE_MOROES:
+            case TYPE_MAIDEN:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_OPERA:
+                // Don't store the same data twice
+                if (uiData == m_auiEncounter[uiType])
+                    break;
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                    m_uiOzDeathCount = 0;
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_STAGE_DOOR_LEFT);
+                    DoUseDoorOrButton(GO_STAGE_DOOR_RIGHT);
+                    DoToggleGameObjectFlags(GO_SIDE_ENTRANCE_DOOR, GO_FLAG_LOCKED, false);
+                }
+                // use curtain only for event start or fail
+                else
+                    DoUseDoorOrButton(GO_STAGE_CURTAIN);
+                break;
+            case TYPE_CURATOR:
+            case TYPE_TERESTIAN:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_ARAN:
+                if (uiData == FAIL || uiData == DONE)
+                    DoToggleGameObjectFlags(GO_PRIVATE_LIBRARY_DOOR, GO_FLAG_LOCKED, false);
+                if (uiData == IN_PROGRESS)
+                    DoToggleGameObjectFlags(GO_PRIVATE_LIBRARY_DOOR, GO_FLAG_LOCKED, true);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_NETHERSPITE:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_MASSIVE_DOOR);
+                break;
+            case TYPE_CHESS:
+                if (uiData == DONE)
+                {
+                    // doors and loot are not handled for friendly games
+                    if (GetData(TYPE_CHESS) != SPECIAL)
+                    {
+                        DoUseDoorOrButton(GO_GAMESMANS_HALL_EXIT_DOOR);
+                        DoRespawnGameObject(GO_DUST_COVERED_CHEST, DAY);
+                        DoToggleGameObjectFlags(GO_DUST_COVERED_CHEST, GO_FLAG_NO_INTERACT, false);
+                    }
+
+                    // cast game end spells
+                    if (Creature* pMedivh = GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH))
+                    {
+                        pMedivh->CastSpell(pMedivh, SPELL_FORCE_KILL_BUNNY, true);
+                        pMedivh->CastSpell(pMedivh, SPELL_GAME_OVER, true);
+                        pMedivh->CastSpell(pMedivh, SPELL_CLEAR_BOARD, true);
+                    }
+                    if (Creature* pController = GetSingleCreatureFromStorage(NPC_CHESS_VICTORY_CONTROLLER))
+                        pController->CastSpell(pController, SPELL_VICTORY_VISUAL, true);
+
+                    // remove silence debuff
+                    Map::PlayerList const& players = instance->GetPlayers();
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    {
+                        if (Player* pPlayer = itr->getSource())
+                            pPlayer->RemoveAurasDueToSpell(SPELL_GAME_IN_SESSION);
+                    }
+
+                    m_bFriendlyGame = false;
+                    m_uiChessResetTimer = 35000;
+                }
+                else if (uiData == FAIL)
+                {
+                    // clean the board for reset
+                    if (Creature* pMedivh = GetSingleCreatureFromStorage(NPC_ECHO_MEDIVH))
+                    {
+                        pMedivh->CastSpell(pMedivh, SPELL_GAME_OVER, true);
+                        pMedivh->CastSpell(pMedivh, SPELL_CLEAR_BOARD, true);
+                    }
+
+                    // remove silence debuff
+                    Map::PlayerList const& players = instance->GetPlayers();
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    {
+                        if (Player* pPlayer = itr->getSource())
+                            pPlayer->RemoveAurasDueToSpell(SPELL_GAME_IN_SESSION);
+                    }
+
+                    m_uiChessResetTimer = 35000;
+                }
+                else if (uiData == IN_PROGRESS || uiData == SPECIAL)
+                    DoPrepareChessEvent();
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_MALCHEZZAR:
+                DoUseDoorOrButton(GO_NETHERSPACE_DOOR);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_NIGHTBANE:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_MASTERS_TERRACE_DOOR_1);
+                DoUseDoorOrButton(GO_MASTERS_TERRACE_DOOR_2);
+                break;
+                // Store the event type for the Opera
+            case TYPE_OPERA_PERFORMANCE:
+                m_uiOperaEvent = uiData;
+                break;
+            case TYPE_CHESS_TARGET:
+                m_uiChessTargetType = uiData;
+                return;
+            case TYPE_CHESS_RANGE:
+                m_uiChessRange = uiData;
+                return;
+            case TYPE_CHESS_ARC_PART:
+                m_uiChessArcPart = uiData;
+                return;
+            case TYPE_CHESS_MOVE_TO_SIDES:
+                DoMoveChessPieceToSides(bool(uiData));
+                return;
+            }
+
+            // Also save the opera performance, once it's set
+            if (uiData == DONE || uiType == TYPE_OPERA_PERFORMANCE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6] << " " << m_auiEncounter[7] << " " << m_auiEncounter[8] << " "
+                    << m_auiEncounter[9] << " " << m_auiEncounter[10] << " " << m_uiOperaEvent;
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            switch (uiType)
+            {
+            case TYPE_OPERA_PERFORMANCE:
+                return m_uiOperaEvent;
+            case TYPE_PLAYER_TEAM:
+                return m_uiTeam;
+            case TYPE_CHESS_GAME_READY:
+                return uint32(m_bFriendlyGame);
+            default:
+                break;
+            }
+            return 0;
+        }
+
+        void SetData64(uint32 type, uint64 guid) override
+        {
+            switch (type)
+            {
+            case 0:
+                if (Creature *pOrganizer = instance->GetCreature(ObjectGuid(guid)))
+                    DoPrepareOperaStage(pOrganizer);
+                break;
+            case TYPE_CHESS_TARGET:
+                m_ChessTargetSearcher = ObjectGuid(guid);
+                break;
+            default:
+                break;
+            }
+        }
+
+        uint64 GetData64(uint32 type) const override
+        {
+            switch (type)
+            {
+            case TYPE_NIGHTBANE_TRIGGER_GROUND:
+                return GetNightbaneTrigger(true);
+                break;
+            case TYPE_NIGHTBANE_TRIGGER_AIR:
+                return GetNightbaneTrigger(false);
+            case TYPE_CHESS_TARGET:
+                return GetChessTarget();
+            case TYPE_CHESS_MOVEMENT_SQUARE:
+                return GetChessMovementSquare();
+            default:
+                break;
+            }
+            return 0;
+        }
+
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7]
+                >> m_auiEncounter[8] >> m_auiEncounter[9] >> m_auiEncounter[10] >> m_uiOperaEvent;
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)               // Do not load an encounter as "In Progress" - reset it instead.
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_uiChessResetTimer)
+            {
+                // respawn all chess pieces and side stalkers on the original position
+                if (m_uiChessResetTimer <= uiDiff)
+                {
+                    for (GuidList::const_iterator itr = m_lChessPiecesAlliance.begin(); itr != m_lChessPiecesAlliance.end(); ++itr)
+                    {
+                        if (Creature* pTemp = instance->GetCreature(*itr))
+                            pTemp->Respawn();
+                    }
+                    for (GuidList::const_iterator itr = m_lChessPiecesHorde.begin(); itr != m_lChessPiecesHorde.end(); ++itr)
+                    {
+                        if (Creature* pTemp = instance->GetCreature(*itr))
+                            pTemp->Respawn();
+                    }
+
+                    for (GuidList::const_iterator itr = m_lChessAllianceStalkerList.begin(); itr != m_lChessAllianceStalkerList.end(); ++itr)
+                    {
+                        if (Creature* pTemp = instance->GetCreature(*itr))
+                        {
+                            pTemp->Respawn();
+                            pTemp->HandleEmote(EMOTE_STATE_NONE);
+                        }
+                    }
+                    for (GuidList::const_iterator itr = m_lChessHordeStalkerList.begin(); itr != m_lChessHordeStalkerList.end(); ++itr)
+                    {
+                        if (Creature* pTemp = instance->GetCreature(*itr))
+                        {
+                            pTemp->Respawn();
+                            pTemp->HandleEmote(EMOTE_STATE_NONE);
+                        }
+                    }
+
+                    if (GetData(TYPE_CHESS) == FAIL)
+                        SetData(TYPE_CHESS, NOT_STARTED);
+                    else if (GetData(TYPE_CHESS) == DONE)
+                        m_bFriendlyGame = true;
+
+                    m_uiChessResetTimer = 0;
+                }
+                else
+                    m_uiChessResetTimer -= uiDiff;
+            }
+        }
+
+    private:
+        void DoPrepareChessEvent()
+        {
+            // Allow all the chess pieces to init start position
+            for (GuidList::const_iterator itr = m_lChessPiecesAlliance.begin(); itr != m_lChessPiecesAlliance.end(); ++itr)
+            {
+                if (Creature* pChessPiece = instance->GetCreature(*itr))
+                {
+                    Creature* pSquare = GetClosestCreatureWithEntry(pChessPiece, NPC_SQUARE_BLACK, 2.0f);
+                    if (!pSquare)
+                        pSquare = GetClosestCreatureWithEntry(pChessPiece, NPC_SQUARE_WHITE, 2.0f);
+                    if (!pSquare)
+                    {
+                        script_error_log("Instance Karazhan: ERROR Failed to properly load the Chess square for %s.", pChessPiece->GetGuidStr().c_str());
+                        return;
+                    }
+
+                    // send event which will prepare the current square
+                    pChessPiece->AI()->SendAIEvent(AI_EVENT_CUSTOM_B, pSquare, pChessPiece);
+                }
+            }
+
+            for (GuidList::const_iterator itr = m_lChessPiecesHorde.begin(); itr != m_lChessPiecesHorde.end(); ++itr)
+            {
+                if (Creature* pChessPiece = instance->GetCreature(*itr))
+                {
+                    Creature* pSquare = GetClosestCreatureWithEntry(pChessPiece, NPC_SQUARE_BLACK, 2.0f);
+                    if (!pSquare)
+                        pSquare = GetClosestCreatureWithEntry(pChessPiece, NPC_SQUARE_WHITE, 2.0f);
+                    if (!pSquare)
+                    {
+                        script_error_log("Instance Karazhan: ERROR Failed to properly load the Chess square for %s.", pChessPiece->GetGuidStr().c_str());
+                        return;
+                    }
+
+                    // send event which will prepare the current square
+                    pChessPiece->AI()->SendAIEvent(AI_EVENT_CUSTOM_B, pSquare, pChessPiece);
+                }
+            }
+
+            // add silence debuff
+            Map::PlayerList const& players = instance->GetPlayers();
+            for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+            {
+                if (Player* pPlayer = itr->getSource())
+                    pPlayer->CastSpell(pPlayer, SPELL_GAME_IN_SESSION, true);
+            }
+
+            m_uiAllianceStalkerCount = 0;
+            m_uiHordeStalkerCount = 0;
+            m_vHordeStalkers.clear();
+            m_vAllianceStalkers.clear();
+
+            // sort stalkers depending on side
+            std::list<Creature*> lStalkers;
+            for (GuidList::const_iterator itr = m_lChessHordeStalkerList.begin(); itr != m_lChessHordeStalkerList.end(); ++itr)
+            {
+                if (Creature* pTemp = instance->GetCreature(*itr))
+                    lStalkers.push_back(pTemp);
+            }
+
+            if (lStalkers.empty())
+            {
+                script_error_log("Instance Karazhan: ERROR Failed to properly load the horde side stalkers for the Chess Event.");
+                return;
+            }
+
+            // get the proper statusBar npc
+            Creature* pStatusBar = instance->GetCreature(m_HordeStatusGuid);
+            if (!pStatusBar)
+                return;
+
+            lStalkers.sort(ObjectDistanceOrder(pStatusBar));
+            for (std::list<Creature*>::const_iterator itr = lStalkers.begin(); itr != lStalkers.end(); ++itr)
+                m_vHordeStalkers.push_back((*itr)->GetObjectGuid());
+
+            lStalkers.clear();
+            for (GuidList::const_iterator itr = m_lChessAllianceStalkerList.begin(); itr != m_lChessAllianceStalkerList.end(); ++itr)
+            {
+                if (Creature* pTemp = instance->GetCreature(*itr))
+                    lStalkers.push_back(pTemp);
+            }
+
+            if (lStalkers.empty())
+            {
+                script_error_log("Instance Karazhan: ERROR Failed to properly load the alliance side stalkers for the Chess Event.");
+                return;
+            }
+
+            // get the proper statusBar npc
+            pStatusBar = instance->GetCreature(m_AllianceStatusGuid);
+            if (!pStatusBar)
+                return;
+
+            lStalkers.sort(ObjectDistanceOrder(pStatusBar));
+            for (std::list<Creature*>::const_iterator itr = lStalkers.begin(); itr != lStalkers.end(); ++itr)
+                m_vAllianceStalkers.push_back((*itr)->GetObjectGuid());
+        }
+
+        void DoPrepareOperaStage(Creature* pOrganizer)
+        {
+            debug_log("SD3: Barnes Opera Event - Introduction complete - preparing encounter %d", GetData(TYPE_OPERA_PERFORMANCE));
+
+            // summon the bosses and respawn the stage background
+            switch (GetData(TYPE_OPERA_PERFORMANCE))
+            {
+            case OPERA_EVENT_WIZARD_OZ:
+                for (uint8 i = 0; i < MAX_OZ_OPERA_MOBS; ++i)
+                    pOrganizer->SummonCreature(aOperaLocOz[i].uiEntry, aOperaLocOz[i].fX, aOperaLocOz[i].fY, aOperaLocOz[i].fZ, aOperaLocOz[i].fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+                DoRespawnGameObject(GO_OZ_BACKDROP, 12 * HOUR);
+                for (GuidList::const_iterator itr = m_lOperaHayGuidList.begin(); itr != m_lOperaHayGuidList.end(); ++itr)
+                    DoRespawnGameObject(*itr, 12 * HOUR);
+                break;
+            case OPERA_EVENT_RED_RIDING_HOOD:
+                pOrganizer->SummonCreature(aOperaLocWolf.uiEntry, aOperaLocWolf.fX, aOperaLocWolf.fY, aOperaLocWolf.fZ, aOperaLocWolf.fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+                DoRespawnGameObject(GO_HOOD_BACKDROP, 12 * HOUR);
+                DoRespawnGameObject(GO_HOOD_HOUSE, 12 * HOUR);
+                for (GuidList::const_iterator itr = m_lOperaTreeGuidList.begin(); itr != m_lOperaTreeGuidList.end(); ++itr)
+                    DoRespawnGameObject(*itr, 12 * HOUR);
+                break;
+            case OPERA_EVENT_ROMULO_AND_JUL:
+                pOrganizer->SummonCreature(aOperaLocJul.uiEntry, aOperaLocJul.fX, aOperaLocJul.fY, aOperaLocJul.fZ, aOperaLocJul.fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+                DoRespawnGameObject(GO_RAJ_BACKDROP, 12 * HOUR);
+                DoRespawnGameObject(GO_RAJ_MOON, 12 * HOUR);
+                DoRespawnGameObject(GO_RAJ_BALCONY, 12 * HOUR);
+                break;
+            }
+
+            SetData(TYPE_OPERA, IN_PROGRESS);
+        }
+
+        uint64 GetNightbaneTrigger(bool ground) const
+        {
+            GuidList lList = ground ? m_lNightbaneGroundTriggers : m_lNightbaneAirTriggers;
+
+            if (m_mNpcEntryGuidStore.find(NPC_NIGHTBANE) != m_mNpcEntryGuidStore.end())
+            {
+                if (Creature* nightbane = instance->GetCreature(m_mNpcEntryGuidStore.find(NPC_NIGHTBANE)->second))
+                {
+                    Unit* pChosenTrigger = NULL;
+                    for (GuidList::const_iterator itr = lList.begin(); itr != lList.end(); ++itr)
+                    {
+                        if (Creature* pTrigger = instance->GetCreature(*itr))
+                        {
+                            if (!pChosenTrigger || nightbane->GetDistanceOrder(pTrigger, pChosenTrigger, false))
+                            {
+                                pChosenTrigger = pTrigger;
+                            }
+                        }
+                    }
+                    if (pChosenTrigger)
+                        return pChosenTrigger->GetObjectGuid().GetRawValue();
+                }
+            }
+            return 0;
+        }
+
+        uint64 GetChessTarget() const
+        {
+            if (Creature *searcher = instance->GetCreature(m_ChessTargetSearcher))
+            {
+                uint32 uiTeam;
+
+                if (m_uiChessTargetType == TARGET_TYPE_FRIENDLY)
+                    uiTeam = searcher->getFaction();    // get friendly list for this type
+                else
+                    searcher->getFaction() == FACTION_ID_CHESS_ALLIANCE ? FACTION_ID_CHESS_HORDE : FACTION_ID_CHESS_ALLIANCE;
+
+                // Get the list of enemies
+                GuidList lTempList;
+                std::vector<Creature*> vTargets;
+                vTargets.reserve(lTempList.size());
+
+                lTempList = uiTeam == FACTION_ID_CHESS_ALLIANCE ? m_lChessPiecesAlliance : m_lChessPiecesHorde;
+                for (GuidList::const_iterator itr = lTempList.begin(); itr != lTempList.end(); ++itr)
+                {
+                    Creature* pTemp = searcher->GetMap()->GetCreature(*itr);
+                    if (pTemp && pTemp->IsAlive())
+                    {
+                        // check for specified range targets and angle; Note: to be checked if the angle is right
+                        if (m_uiChessRange && !searcher->isInFrontInMap(pTemp, float(m_uiChessRange), M_PI_F/m_uiChessArcPart))
+                            continue;
+
+                        // skip friendly targets which are at full HP
+                        if (m_uiChessTargetType == TARGET_TYPE_FRIENDLY && pTemp->GetHealth() == pTemp->GetMaxHealth())
+                            continue;
+
+                        vTargets.push_back(pTemp);
+                    }
+                }
+
+                if (!vTargets.empty())
+                    return vTargets[urand(0, vTargets.size() - 1)]->GetObjectGuid().GetRawValue();
+            }
+            return 0;
+        }
+
+        uint64 GetChessMovementSquare() const
+        {
+            if (Creature *searcher = instance->GetCreature(m_ChessTargetSearcher))
+            {
+                // define distance based on the spell radius
+                // this will replace the targeting system of spells SPELL_MOVE_1 and SPELL_MOVE_2
+                float fRadius = 10.0f;
+                std::list<Creature*> lSquaresList;
+
+                // some pieces have special distance
+                switch (searcher->GetEntry())
+                {
+                case NPC_HUMAN_CONJURER:
+                case NPC_ORC_WARLOCK:
+                case NPC_HUMAN_CHARGER:
+                case NPC_ORC_WOLF:
+                    fRadius = 15.0f;
+                    break;
+                }
+
+                // get all available squares for movement
+                GetCreatureListWithEntryInGrid(lSquaresList, searcher, NPC_SQUARE_BLACK, fRadius);
+                GetCreatureListWithEntryInGrid(lSquaresList, searcher, NPC_SQUARE_WHITE, fRadius);
+
+                if (lSquaresList.empty())
+                    return 0;
+
+                // Get the list of enemies
+                GuidList lTempList;
+                std::list<Creature*> lEnemies;
+
+                lTempList = searcher->getFaction() == FACTION_ID_CHESS_ALLIANCE ? m_lChessPiecesHorde : m_lChessPiecesAlliance;
+                for (GuidList::const_iterator itr = lTempList.begin(); itr != lTempList.end(); ++itr)
+                {
+                    Creature* pTemp = searcher->GetMap()->GetCreature(*itr);
+                    if (pTemp && pTemp->IsAlive())
+                        lEnemies.push_back(pTemp);
+                }
+
+                if (lEnemies.empty())
+                    return 0;
+
+                // Sort the enemies by distance and the squares compared to the distance to the closest enemy
+                lEnemies.sort(ObjectDistanceOrder(searcher));
+                lSquaresList.sort(ObjectDistanceOrder(lEnemies.front()));
+
+                return lSquaresList.front()->GetObjectGuid().GetRawValue();
+            }
+            return 0;
+        }
+
+        void DoMoveChessPieceToSides(bool bGameEnd)
+        {
+            uint32 uiSpellId = m_uiChessRange;
+            uint32 uiFaction = m_uiChessArcPart;
+
+            // assign proper faction variables
+            GuidVector& vStalkers = uiFaction == FACTION_ID_CHESS_ALLIANCE ? m_vAllianceStalkers : m_vHordeStalkers;
+            uint32 uiCount = uiFaction == FACTION_ID_CHESS_ALLIANCE ? m_uiAllianceStalkerCount : m_uiHordeStalkerCount;
+
+            // get the proper statusBar npc
+            Creature* pStatusBar = instance->GetCreature(uiFaction == FACTION_ID_CHESS_ALLIANCE ? m_AllianceStatusGuid : m_HordeStatusGuid);
+            if (!pStatusBar)
+                return;
+
+            if (vStalkers.size() < uiCount + 1)
+                return;
+
+            // handle stalker transformation
+            if (Creature* pStalker = instance->GetCreature(vStalkers[uiCount]))
+            {
+                // need to provide specific target, in order to ensure the logic of the event
+                pStatusBar->CastSpell(pStalker, uiSpellId, true);
+                uiFaction == FACTION_ID_CHESS_ALLIANCE ? ++m_uiAllianceStalkerCount : ++m_uiHordeStalkerCount;
+            }
+
+            // handle emote on end game
+            if (bGameEnd)
+            {
+                // inverse factions
+                vStalkers.clear();
+                vStalkers = uiFaction == FACTION_ID_CHESS_ALLIANCE ? m_vHordeStalkers : m_vAllianceStalkers;
+
+                for (GuidVector::const_iterator itr = vStalkers.begin(); itr != vStalkers.end(); ++itr)
+                {
+                    if (Creature* pStalker = instance->GetCreature(*itr))
+                        pStalker->HandleEmote(EMOTE_STATE_APPLAUD);
+                }
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiOperaEvent;
+        uint32 m_uiOzDeathCount;
+        uint32 m_uiTeam;                                    // Team of first entered player, used for the Chess event
+        uint32 m_uiChessResetTimer;
+
+        uint8 m_uiAllianceStalkerCount;
+        uint8 m_uiHordeStalkerCount;
+
+        bool m_bFriendlyGame;
+
+        //chess encounter specific
+        uint32 m_uiChessTargetType;
+        uint32 m_uiChessRange;
+        uint32 m_uiChessArcPart;
+        ObjectGuid m_ChessTargetSearcher;
+
+        ObjectGuid m_HordeStatusGuid;
+        ObjectGuid m_AllianceStatusGuid;
+
+        GuidList m_lOperaTreeGuidList;
+        GuidList m_lOperaHayGuidList;
+        GuidList m_lNightbaneGroundTriggers;
+        GuidList m_lNightbaneAirTriggers;
+
+        GuidList m_lChessHordeStalkerList;
+        GuidList m_lChessAllianceStalkerList;
+        GuidList m_lChessPiecesAlliance;
+        GuidList m_lChessPiecesHorde;
+        GuidVector m_vHordeStalkers;
+        GuidVector m_vAllianceStalkers;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_karazhan(pMap);
+    }
+};
+
+void AddSC_instance_karazhan()
+{
+    Script* s;
+    s = new is_karazhan();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_karazhan";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_karazhan;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/karazhan/karazhan.cpp b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/karazhan.cpp
new file mode 100644
index 000000000..a869376ba
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/karazhan.cpp
@@ -0,0 +1,609 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Karazhan
+SD%Complete: 100
+SDComment: Quest support: 9645. Support for Barnes (Opera controller) and Berthold (Doorman).
+SDCategory: Karazhan
+EndScriptData */
+
+/* ContentData
+npc_barnes
+npc_berthold
+npc_image_of_medivh
+npc_image_arcanagos
+event_spell_medivh_journal
+EndContentData */
+
+#include "precompiled.h"
+#include "karazhan.h"
+#include "escort_ai.h"
+
+/*######
+# npc_barnesAI
+######*/
+
+enum
+{
+    SAY_BARNES_EVENT_START  = -1532115,
+
+    SAY_BARNES_OZ_1         = -1532103,
+    SAY_BARNES_OZ_2         = -1532104,
+    SAY_BARNES_OZ_3         = -1532105,
+    SAY_BARNES_OZ_4         = -1532106,
+
+    SAY_BARNES_HOOD_1       = -1532107,
+    SAY_BARNES_HOOD_2       = -1532108,
+    SAY_BARNES_HOOD_3       = -1532109,
+    SAY_BARNES_HOOD_4       = -1532110,
+
+    SAY_BARNES_RAJ_1        = -1532111,
+    SAY_BARNES_RAJ_2        = -1532112,
+    SAY_BARNES_RAJ_3        = -1532113,
+    SAY_BARNES_RAJ_4        = -1532114,
+
+    // ToDo: it's not very clear which is the gossip sequence for event FAIL case
+    GOSSIP_ITEM_OPERA_1     = -3532001,
+    GOSSIP_ITEM_OPERA_2     = -3532002,
+    GOSSIP_ITEM_JUL_WIPE    = -3532003,
+    GOSSIP_ITEM_WOLF_WIPE   = -3532004,
+
+    TEXT_ID_OPERA_1         = 8970,
+    TEXT_ID_OPERA_2         = 8971,
+    TEXT_ID_OPERA_WOLF_WIPE = 8975,
+    TEXT_ID_OPERA_OZ_WIPE   = 8781,             // guesswork, not confirmed
+    // TEXT_ID_OPERA_JUL_WIPE  = ????,           // Item not found in DB: "The romantic plays are really tough, but you'll do better this time. You have TALENT. Ready?"
+
+    // SPELL_SPOTLIGHT       = 25824,            // in creature_template_addon
+    SPELL_TUXEDO            = 32616,
+
+    NPC_SPOTLIGHT           = 19525,
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {SAY_BARNES_OZ_1,   NPC_BARNES,  6000},
+    {SAY_BARNES_OZ_2,   NPC_BARNES,  18000},
+    {SAY_BARNES_OZ_3,   NPC_BARNES,  9000},
+    {SAY_BARNES_OZ_4,   NPC_BARNES,  15000},
+    {OPERA_EVENT_WIZARD_OZ, 0,       0},
+    {SAY_BARNES_HOOD_1, NPC_BARNES,  6000},
+    {SAY_BARNES_HOOD_2, NPC_BARNES,  10000},
+    {SAY_BARNES_HOOD_3, NPC_BARNES,  14000},
+    {SAY_BARNES_HOOD_4, NPC_BARNES,  15000},
+    {OPERA_EVENT_RED_RIDING_HOOD, 0, 0},
+    {SAY_BARNES_RAJ_1,  NPC_BARNES,  5000},
+    {SAY_BARNES_RAJ_2,  NPC_BARNES,  7000},
+    {SAY_BARNES_RAJ_3,  NPC_BARNES,  14000},
+    {SAY_BARNES_RAJ_4,  NPC_BARNES,  14000},
+    {OPERA_EVENT_ROMULO_AND_JUL, 0,  0},
+    {0, 0, 0},
+};
+
+struct npc_barnes : public CreatureScript
+{
+    npc_barnes() : CreatureScript("npc_barnes") {}
+
+    struct npc_barnesAI : public npc_escortAI, private DialogueHelper
+    {
+        npc_barnesAI(Creature* pCreature) : npc_escortAI(pCreature),
+        DialogueHelper(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        ObjectGuid m_spotlightGuid;
+
+        void Reset() override
+        {
+            m_spotlightGuid.Clear();
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SPOTLIGHT)
+            {
+                m_spotlightGuid = pSummoned->GetObjectGuid();
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 0:
+                DoCastSpellIfCan(m_creature, SPELL_TUXEDO);
+                m_pInstance->DoUseDoorOrButton(GO_STAGE_DOOR_LEFT);
+                break;
+            case 4:
+                switch (m_pInstance->GetData(TYPE_OPERA_PERFORMANCE))
+                {
+                case OPERA_EVENT_WIZARD_OZ:
+                    StartNextDialogueText(SAY_BARNES_OZ_1);
+                    break;
+                case OPERA_EVENT_RED_RIDING_HOOD:
+                    StartNextDialogueText(SAY_BARNES_HOOD_1);
+                    break;
+                case OPERA_EVENT_ROMULO_AND_JUL:
+                    StartNextDialogueText(SAY_BARNES_RAJ_1);
+                    break;
+                }
+                SetEscortPaused(true);
+                m_creature->SummonCreature(NPC_SPOTLIGHT, 0, 0, 0, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                break;
+            case 8:
+                m_pInstance->DoUseDoorOrButton(GO_STAGE_DOOR_LEFT);
+                break;
+            case 9:
+                m_pInstance->SetData64(0, m_creature->GetObjectGuid().GetRawValue());
+                break;
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case OPERA_EVENT_WIZARD_OZ:
+            case OPERA_EVENT_RED_RIDING_HOOD:
+            case OPERA_EVENT_ROMULO_AND_JUL:
+                // Despawn spotlight and resume escort
+                if (Creature* pSpotlight = m_creature->GetMap()->GetCreature(m_spotlightGuid))
+                {
+                    pSpotlight->ForcedDespawn();
+                }
+                SetEscortPaused(false);
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override { DialogueUpdate(uiDiff); }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_barnesAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            // Check if opera event is not yet in progress
+            if (pInstance->GetData(TYPE_OPERA) == IN_PROGRESS || pInstance->GetData(TYPE_OPERA) == DONE)
+            { return true; }
+
+            // Check for death of Moroes
+            if (pInstance->GetData(TYPE_MOROES) == DONE)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_OPERA_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+
+                // for GMs we add the possibility to change the event
+                if (pPlayer->isGameMaster())
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, "[GM] Change event to EVENT_OZ",   GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, "[GM] Change event to EVENT_HOOD", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, "[GM] Change event to EVENT_RAJ",  GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+                }
+
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_OPERA_1, pCreature->GetObjectGuid());
+
+                return true;
+            }
+        }
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiAction)
+        {
+            case GOSSIP_ACTION_INFO_DEF+1:
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_OPERA_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_OPERA_2, pCreature->GetObjectGuid());
+                break;
+            case GOSSIP_ACTION_INFO_DEF+2:
+                pPlayer->CLOSE_GOSSIP_MENU();
+                DoScriptText(SAY_BARNES_EVENT_START, pCreature);
+                // start the stage escort
+                if (npc_barnesAI* pBarnesAI = dynamic_cast<npc_barnesAI*>(pCreature->AI()))
+                { pBarnesAI->Start(false, NULL, NULL, true); }
+                break;
+                // GM gossip options
+            case GOSSIP_ACTION_INFO_DEF+3:
+                pPlayer->CLOSE_GOSSIP_MENU();
+                if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+                {
+                    pInstance->SetData(TYPE_OPERA_PERFORMANCE, OPERA_EVENT_WIZARD_OZ);
+                    outstring_log("SD3: %s manually set Opera event to EVENT_OZ", pPlayer->GetGuidStr().c_str());
+                }
+                break;
+            case GOSSIP_ACTION_INFO_DEF+4:
+                pPlayer->CLOSE_GOSSIP_MENU();
+                if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+                {
+                    pInstance->SetData(TYPE_OPERA_PERFORMANCE, OPERA_EVENT_RED_RIDING_HOOD);
+                    outstring_log("SD3: %s manually set Opera event to EVENT_HOOD", pPlayer->GetGuidStr().c_str());
+                }
+                break;
+            case GOSSIP_ACTION_INFO_DEF+5:
+                pPlayer->CLOSE_GOSSIP_MENU();
+                if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+                {
+                    pInstance->SetData(TYPE_OPERA_PERFORMANCE, OPERA_EVENT_ROMULO_AND_JUL);
+                    outstring_log("SD3: %s manually set Opera event to EVENT_RAJ", pPlayer->GetGuidStr().c_str());
+                }
+                break;
+        }
+
+        return true;
+    }
+};
+
+/*###
+# npc_berthold
+####*/
+
+enum
+{
+    GOSSIP_ITEM_TELEPORT        = -3532000,
+
+    SPELL_TELEPORT              = 39567
+};
+
+struct npc_berthold : public CreatureScript
+{
+    npc_berthold() : CreatureScript("npc_berthold") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            // Check if Shade of Aran event is done
+            if (pInstance->GetData(TYPE_ARAN) == DONE)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            }
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            pPlayer->CastSpell(pPlayer, SPELL_TELEPORT, true);
+        }
+
+        pPlayer->CLOSE_GOSSIP_MENU();
+        return true;
+    }
+};
+
+/*######
+# npc_image_of_medivh
+######*/
+
+enum
+{
+    // yells
+    SAY_MEDIVH_1            = -1532116,
+    SAY_ARCANAGOS_2         = -1532117,
+    SAY_MEDIVH_3            = -1532118,
+    SAY_ARCANAGOS_4         = -1532119,
+    SAY_MEDIVH_5            = -1532120,
+    SAY_ARCANAGOS_6         = -1532121,
+    EMOTE_CAST_SPELL        = -1532122,
+    SAY_ARCANAGOS_7         = -1532123,
+    SAY_MEDIVH_8            = -1532124,
+
+    // spells
+    // Arcanagos
+    // SPELL_NOTIFY_FLEE     = 30985,            // not used - allow Medivh to return inside after the dragon has escaped
+    // SPELL_PREPARE_FIREBALL= 30970,            // not used - allow Medivh to cast fireball
+    SPELL_REFLECTION        = 30969,
+    // SPELL_SHOOT_FIREBALL  = 30968,            // not used
+    SPELL_FIREBALL_REFLECT  = 30971,
+
+    // Medivh
+    // SPELL_FROST_BREATH    = 30974,            // not used
+    SPELL_CONFLAG_BLAST     = 30977,            // cast on Arcanagos
+    SPELL_EVOCATION         = 30972,            // prepare the Conflagration Blast
+    SPELL_FIREBALL          = 30967,
+    // SPELL_FLY_TO_DEATH    = 30936,            // not used - inform the dragon to move to death Location
+    SPELL_MANA_SHIELD       = 30973,
+
+    // NPC_ARCANAGOS_CREDIT  = 17665,            // purpose unk
+
+    QUEST_MASTERS_TERRACE   = 9645,
+
+    POINT_ID_INTRO          = 1,
+    POINT_ID_DESPAWN        = 2,
+};
+
+/* Notes for future development of the event:
+ * this whole event includes a lot of guesswork
+ * the dummy spells usage is unk; for the moment they are not used
+ * also all coords are guesswork
+ */
+static const float afMedivhSpawnLoc[4] = { -11153.18f, -1889.65f, 91.47f, 2.07f};
+static const float afMedivhExitLoc[3] = { -11121.81f, -1881.24f, 91.47f};
+
+static const float afArcanagosSpawnLoc[4] = { -11242.66f, -1778.55f, 125.35f, 0.0f};
+static const float afArcanagosMoveLoc[3] = { -11170.28f, -1865.09f, 125.35f};
+static const float afArcanagosFleeLoc[3] = { -11003.70f, -1760.18f, 180.25f};
+
+static const DialogueEntry aMedivhDialogue[] =
+{
+    {NPC_IMAGE_OF_MEDIVH,   0,                      10000},
+    {SAY_MEDIVH_1,          NPC_IMAGE_OF_MEDIVH,    6000},
+    {SAY_ARCANAGOS_2,       NPC_IMAGE_OF_ARCANAGOS, 10000},
+    {SAY_MEDIVH_3,          NPC_IMAGE_OF_MEDIVH,    6000},
+    {SAY_ARCANAGOS_4,       NPC_IMAGE_OF_ARCANAGOS, 8000},
+    {SAY_MEDIVH_5,          NPC_IMAGE_OF_MEDIVH,    7000},
+    {SAY_ARCANAGOS_6,       NPC_IMAGE_OF_ARCANAGOS, 0},
+    {SPELL_MANA_SHIELD,     0,                      4000},
+    {EMOTE_CAST_SPELL,      NPC_IMAGE_OF_MEDIVH,    5000},
+    {SPELL_CONFLAG_BLAST,   0,                      1000},
+    {SAY_ARCANAGOS_7,       NPC_IMAGE_OF_ARCANAGOS, 10000},
+    {SAY_MEDIVH_8,          NPC_IMAGE_OF_MEDIVH,    0},
+    {0, 0, 0},
+};
+
+struct npc_image_of_medivh : public CreatureScript
+{
+    npc_image_of_medivh() : CreatureScript("npc_image_of_medivh") {}
+
+    struct npc_image_of_medivhAI : public ScriptedAI, private DialogueHelper
+    {
+        npc_image_of_medivhAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aMedivhDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        ObjectGuid m_eventStarterGuid;
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_IMAGE_OF_ARCANAGOS)
+            {
+                pSummoned->SetLevitate(true);
+                pSummoned->SetWalk(false);
+                pSummoned->GetMotionMaster()->MovePoint(POINT_ID_INTRO, afArcanagosMoveLoc[0], afArcanagosMoveLoc[1], afArcanagosMoveLoc[2]);
+                pSummoned->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || pSummoned->GetEntry() != NPC_IMAGE_OF_ARCANAGOS)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case POINT_ID_INTRO:
+                StartNextDialogueText(NPC_IMAGE_OF_MEDIVH);
+                break;
+            case POINT_ID_DESPAWN:
+                pSummoned->ForcedDespawn();
+                m_creature->ForcedDespawn(10000);
+                m_creature->GetMotionMaster()->MovePoint(0, afMedivhExitLoc[0], afMedivhExitLoc[1], afMedivhExitLoc[2]);
+                // complete quest
+                if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_eventStarterGuid))
+                {
+                    pPlayer->GroupEventHappens(QUEST_MASTERS_TERRACE, m_creature);
+                }
+                break;
+            }
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_FIREBALL_REFLECT && pCaster->GetEntry() == NPC_IMAGE_OF_ARCANAGOS)
+            {
+                StartNextDialogueText(SPELL_MANA_SHIELD);
+                DoCastSpellIfCan(m_creature, SPELL_MANA_SHIELD);
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            switch (iEntry)
+            {
+            case SAY_ARCANAGOS_6:
+                if (Creature* pDragon = m_pInstance->GetSingleCreatureFromStorage(NPC_IMAGE_OF_ARCANAGOS))
+                {
+                    DoCastSpellIfCan(pDragon, SPELL_FIREBALL);
+                }
+                break;
+            case EMOTE_CAST_SPELL:
+                DoCastSpellIfCan(m_creature, SPELL_EVOCATION);
+                break;
+            case SPELL_CONFLAG_BLAST:
+                m_creature->RemoveAurasDueToSpell(SPELL_EVOCATION);
+                if (Creature* pDragon = m_pInstance->GetSingleCreatureFromStorage(NPC_IMAGE_OF_ARCANAGOS))
+                {
+                    DoCastSpellIfCan(pDragon, SPELL_CONFLAG_BLAST, CAST_TRIGGERED);
+                    pDragon->GetMotionMaster()->MovePoint(POINT_ID_DESPAWN, afArcanagosFleeLoc[0], afArcanagosFleeLoc[1], afArcanagosFleeLoc[2]);
+                }
+                break;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature && pInvoker->GetTypeId() == TYPEID_PLAYER)
+                m_eventStarterGuid = pInvoker->GetObjectGuid();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override { DialogueUpdate(uiDiff); }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_image_of_medivhAI(pCreature);
+    }
+};
+
+/*######
+# npc_image_arcanagos
+######*/
+
+struct npc_image_arcanagos : public CreatureScript
+{
+    npc_image_arcanagos() : CreatureScript("npc_image_arcanagos") {}
+
+    struct npc_image_arcanagosAI : public ScriptedAI
+    {
+        npc_image_arcanagosAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_FIREBALL && pCaster->GetEntry() == NPC_IMAGE_OF_MEDIVH)
+            {
+                // !!!Workaround Alert!!! - the spell should be cast on Medivh without changing the unit flags!
+                pCaster->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+                DoCastSpellIfCan(pCaster, SPELL_FIREBALL_REFLECT, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_REFLECTION, CAST_TRIGGERED);
+
+                pCaster->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+            }
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_image_arcanagosAI(pCreature);
+    }
+};
+
+/*######
+# event_spell_medivh_journal
+######*/
+
+struct event_spell_medivh_journal : public MapEventScript
+{
+    event_spell_medivh_journal() : MapEventScript("event_spell_medivh_journal") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* /*pTarget*/, bool bIsStart) override
+    {
+        if (bIsStart && pSource->GetTypeId() == TYPEID_PLAYER)
+        {
+            // Summon Medivh and Arcanagos
+            if (Creature* pMedivh = ((Player*)pSource)->SummonCreature(NPC_IMAGE_OF_MEDIVH, afMedivhSpawnLoc[0], afMedivhSpawnLoc[1], afMedivhSpawnLoc[2], afMedivhSpawnLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0))
+            {
+                pMedivh->SummonCreature(NPC_IMAGE_OF_ARCANAGOS, afArcanagosSpawnLoc[0], afArcanagosSpawnLoc[1], afArcanagosSpawnLoc[2], afArcanagosSpawnLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                // store the player who started the event
+                if (CreatureAI* pMedivhAI = pMedivh->AI())
+                {
+                    pMedivhAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pMedivh, pSource->ToPlayer(), 0);
+
+                }
+            }
+        }
+
+        return true;
+    }
+};
+
+void AddSC_karazhan()
+{
+    Script* s;
+
+    s = new npc_barnes();
+    s->RegisterSelf();
+    s = new npc_berthold();
+    s->RegisterSelf();
+    s = new npc_image_of_medivh();
+    s->RegisterSelf();
+    s = new npc_image_arcanagos();
+    s->RegisterSelf();
+    s = new event_spell_medivh_journal();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_barnes";
+    //pNewScript->GetAI = &GetAI_npc_barnesAI;
+    //pNewScript->pGossipHello = &GossipHello_npc_barnes;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_barnes;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_berthold";
+    //pNewScript->pGossipHello = &GossipHello_npc_berthold;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_berthold;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_image_of_medivh";
+    //pNewScript->GetAI = &GetAI_npc_image_of_medivhAI;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_image_arcanagos";
+    //pNewScript->GetAI = &GetAI_npc_image_arcanagosAI;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_spell_medivh_journal";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_spell_medivh_journal;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/karazhan/karazhan.h b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/karazhan.h
new file mode 100644
index 000000000..75033924c
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/karazhan/karazhan.h
@@ -0,0 +1,156 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_KARAZHAN_H
+#define DEF_KARAZHAN_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 11,
+    MAX_OZ_OPERA_MOBS               = 4,
+
+    TYPE_ATTUMEN                    = 0,
+    TYPE_MOROES                     = 1,
+    TYPE_MAIDEN                     = 2,
+    TYPE_OPERA                      = 3,
+    TYPE_CURATOR                    = 4,
+    TYPE_TERESTIAN                  = 5,
+    TYPE_ARAN                       = 6,
+    TYPE_NETHERSPITE                = 7,
+    TYPE_CHESS                      = 8,
+    TYPE_MALCHEZZAR                 = 9,
+    TYPE_NIGHTBANE                  = 10,
+    TYPE_OPERA_PERFORMANCE          = 11,               // no regular encounter - just store one random opera event
+    TYPE_NIGHTBANE_TRIGGER_GROUND   = MAX_ENCOUNTER+1,
+    TYPE_NIGHTBANE_TRIGGER_AIR      = MAX_ENCOUNTER+2,
+    TYPE_PLAYER_TEAM                = MAX_ENCOUNTER+3,
+    TYPE_CHESS_TARGET               = MAX_ENCOUNTER+4,
+    TYPE_CHESS_RANGE                = MAX_ENCOUNTER+5,
+    TYPE_CHESS_ARC_PART             = MAX_ENCOUNTER+6,
+    TYPE_CHESS_MOVEMENT_SQUARE      = MAX_ENCOUNTER+7,
+    TYPE_CHESS_MOVE_TO_SIDES        = MAX_ENCOUNTER+8,
+    TYPE_CHESS_GAME_READY           = MAX_ENCOUNTER+9,
+
+    NPC_ATTUMEN                     = 15550,
+    NPC_MIDNIGHT                    = 16151,
+    NPC_MOROES                      = 15687,
+    NPC_BARNES                      = 16812,
+    // NPC_TERESTIAN                = 15688,
+    NPC_NIGHTBANE                   = 17225,
+    NPC_NIGHTBANE_HELPER            = 17260,
+    NPC_NETHERSPITE                 = 15689,
+    NPC_ECHO_MEDIVH                 = 16816,
+    NPC_INVISIBLE_STALKER           = 22519,                    // placeholder for dead chess npcs
+    NPC_CHESS_STATUS_BAR            = 22520,                    // npc that controlls the transformation of dead pieces
+    NPC_CHESS_VICTORY_CONTROLLER    = 22524,
+    // NPC_CHESS_SOUND_BUNNY        = 21921,                    // npc that handles the encounter sounds
+    // NPC_WAITING_ROOM_STALKER     = 17459,                    // trigger which marks the teleport location of the players; also used to cast some control spells during the game
+    NPC_SQUARE_WHITE                = 17208,                    // chess white square
+    NPC_SQUARE_BLACK                = 17305,                    // chess black square
+    // NPC_SQUARE_OUTSIDE_BLACK     = 17316,                    // outside chess black square
+    // NPC_SQUARE_OUTSIDE_WHITE     = 17317,                    // outside chess white square
+
+    // Moroes event related
+    NPC_LADY_KEIRA_BERRYBUCK        = 17007,
+    NPC_LADY_CATRIONA_VON_INDI      = 19872,
+    NPC_LORD_CRISPIN_FERENCE        = 19873,
+    NPC_BARON_RAFE_DREUGER          = 19874,
+    NPC_BARONESS_DOROTHEA_MILLSTIPE = 19875,
+    NPC_LORD_ROBIN_DARIS            = 19876,
+
+    // Opera event
+    NPC_DOROTHEE                    = 17535,
+    NPC_ROAR                        = 17546,
+    NPC_TINHEAD                     = 17547,
+    NPC_STRAWMAN                    = 17543,
+    NPC_CRONE                       = 18168,
+    NPC_GRANDMOTHER                 = 17603,
+    NPC_JULIANNE                    = 17534,
+    NPC_ROMULO                      = 17533,
+
+    // The Master's Terrace quest related
+    NPC_IMAGE_OF_MEDIVH             = 17651,
+    NPC_IMAGE_OF_ARCANAGOS          = 17652,
+
+    // Chess event
+    NPC_ORC_GRUNT                   = 17469,                    // pawn
+    NPC_ORC_WOLF                    = 21748,                    // knight
+    NPC_ORC_WARLOCK                 = 21750,                    // queen
+    NPC_ORC_NECROLYTE               = 21747,                    // bishop
+    NPC_SUMMONED_DAEMON             = 21726,                    // rook
+    NPC_WARCHIEF_BLACKHAND          = 21752,                    // king
+    NPC_HUMAN_FOOTMAN               = 17211,                    // pawn
+    NPC_HUMAN_CHARGER               = 21664,                    // knight
+    NPC_HUMAN_CONJURER              = 21683,                    // queen
+    NPC_HUMAN_CLERIC                = 21682,                    // bishop
+    NPC_CONJURED_WATER_ELEMENTAL    = 21160,                    // rook
+    NPC_KING_LLANE                  = 21684,                    // king
+
+    GO_STAGE_CURTAIN                = 183932,
+    GO_STAGE_DOOR_LEFT              = 184278,
+    GO_STAGE_DOOR_RIGHT             = 184279,
+    GO_PRIVATE_LIBRARY_DOOR         = 184517,
+    GO_MASSIVE_DOOR                 = 185521,
+    GO_GAMESMANS_HALL_DOOR          = 184276,
+    GO_GAMESMANS_HALL_EXIT_DOOR     = 184277,
+    GO_NETHERSPACE_DOOR             = 185134,
+    GO_SIDE_ENTRANCE_DOOR           = 184275,
+    GO_DUST_COVERED_CHEST           = 185119,
+    GO_MASTERS_TERRACE_DOOR_1       = 184274,
+    GO_MASTERS_TERRACE_DOOR_2       = 184280,
+
+    // Opera event stage decoration
+    GO_OZ_BACKDROP                  = 183442,
+    GO_OZ_HAY                       = 183496,
+    GO_HOOD_BACKDROP                = 183491,
+    GO_HOOD_TREE                    = 183492,
+    GO_HOOD_HOUSE                   = 183493,
+    GO_RAJ_BACKDROP                 = 183443,
+    GO_RAJ_MOON                     = 183494,
+    GO_RAJ_BALCONY                  = 183495,
+
+    // Chess event spells
+    SPELL_CLEAR_BOARD               = 37366,                    // spell cast to clear the board at the end of the event
+    SPELL_GAME_IN_SESSION           = 39331,                    // debuff on players received while the game is in session
+    SPELL_FORCE_KILL_BUNNY          = 45260,                    // triggers 45259
+    SPELL_GAME_OVER                 = 39401,                    // cast by Medivh on game end
+    SPELL_VICTORY_VISUAL            = 39395,                    // cast by the Victory controller on game end
+
+    FACTION_ID_CHESS_HORDE          = 1689,
+    FACTION_ID_CHESS_ALLIANCE       = 1690,
+
+    TARGET_TYPE_RANDOM = 1,
+    TARGET_TYPE_FRIENDLY = 2,
+};
+
+enum OperaEvents
+{
+    OPERA_EVENT_WIZARD_OZ           = 1,
+    OPERA_EVENT_RED_RIDING_HOOD     = 2,
+    OPERA_EVENT_ROMULO_AND_JUL      = 3
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/loch_modan.cpp b/src/modules/SD3/scripts/eastern_kingdoms/loch_modan.cpp
new file mode 100644
index 000000000..a6d9c84f2
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/loch_modan.cpp
@@ -0,0 +1,238 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Loch_Modan
+ * SD%Complete: 100
+ * SDComment:   Quest support: 309, 3181 (only to argue with pebblebitty to get to searing gorge, before quest rewarded).
+ * SDCategory:  Loch Modan
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_mountaineer_pebblebitty
+ * npc_miran
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_mountaineer_pebblebitty
+######*/
+
+struct npc_mountaineer_pebblebitty : public CreatureScript  //TODO localisation
+{
+    npc_mountaineer_pebblebitty() : CreatureScript("npc_mountaineer_pebblebitty") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+
+        if (!pPlayer->GetQuestRewardStatus(3181) == 1)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Open the gate please, i need to get to Searing Gorge", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "But i need to get there, now open the gate!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(1833, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Ok, so what is this other way?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(1834, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 3:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Doesn't matter, i'm invulnerable.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(1835, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 4:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(1836, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 5:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Ok, i'll try to remember that.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->SEND_GOSSIP_MENU(1837, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 6:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "A key? Ok!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->SEND_GOSSIP_MENU(1838, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 7:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        }
+        return true;
+    }
+};
+
+/*######
+## npc_miran
+######*/
+
+enum
+{
+    QUEST_PROTECTING_THE_SHIPMENT = 309,
+
+    SAY_MIRAN_1           = -1000571,
+    SAY_DARK_IRON_DWARF   = -1000572,
+    SAY_MIRAN_2           = -1000573,
+    SAY_MIRAN_3           = -1000574,
+
+    NPC_DARK_IRON_DWARF   = 2149
+};
+
+struct Location
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+static const Location m_afAmbushSpawn[] =
+{
+    { -5691.93f, -3745.91f, 319.159f, 2.21f},
+    { -5706.98f, -3745.39f, 318.728f, 1.04f}
+};
+
+struct npc_miran : public CreatureScript
+{
+    npc_miran() : CreatureScript("npc_miran") {}
+
+    struct npc_miranAI : public npc_escortAI
+    {
+        npc_miranAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+        }
+
+        uint8 m_uiDwarves;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiDwarves = 0;
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 19:
+                DoScriptText(SAY_MIRAN_1, m_creature);
+                m_creature->SummonCreature(NPC_DARK_IRON_DWARF, m_afAmbushSpawn[0].m_fX, m_afAmbushSpawn[0].m_fY, m_afAmbushSpawn[0].m_fZ, m_afAmbushSpawn[0].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 25000);
+                m_creature->SummonCreature(NPC_DARK_IRON_DWARF, m_afAmbushSpawn[1].m_fX, m_afAmbushSpawn[1].m_fY, m_afAmbushSpawn[1].m_fZ, m_afAmbushSpawn[1].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 25000);
+                break;
+            case 23:
+                DoScriptText(SAY_MIRAN_3, m_creature);
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_PROTECTING_THE_SHIPMENT, m_creature);
+                }
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_DARK_IRON_DWARF)
+            {
+                --m_uiDwarves;
+                if (!m_uiDwarves)
+                {
+                    DoScriptText(SAY_MIRAN_2, m_creature);
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_DARK_IRON_DWARF)
+            {
+                if (!m_uiDwarves)
+                {
+                    DoScriptText(SAY_DARK_IRON_DWARF, pSummoned);
+                }
+                ++m_uiDwarves;
+                pSummoned->AI()->AttackStart(m_creature);
+            }
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_PROTECTING_THE_SHIPMENT)
+        {
+            if (npc_miranAI* pEscortAI = dynamic_cast<npc_miranAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_miranAI(pCreature);
+    }
+};
+
+void AddSC_loch_modan()
+{
+    Script* s;
+    s = new npc_mountaineer_pebblebitty();
+    s->RegisterSelf();
+    s = new npc_miran();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_mountaineer_pebblebitty";
+    //pNewScript->pGossipHello =  &GossipHello_npc_mountaineer_pebblebitty;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_mountaineer_pebblebitty;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_miran";
+    //pNewScript->GetAI = &GetAI_npc_miran;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_miran;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp b/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
new file mode 100644
index 000000000..b48bfb91c
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
@@ -0,0 +1,775 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Felblood_Kaelthas
+SD%Complete: 90
+SDComment: Minor adjustments required; Timers.
+SDCategory: Magisters' Terrace
+EndScriptData */
+
+#include "precompiled.h"
+#include "magisters_terrace.h"
+
+enum
+{
+    SAY_INTRO_1                 = -1585023,                 // This yell should be done when the room is cleared. For now, set it as a movelineofsight yell.
+    SAY_INTRO_2                 = -1585030,
+    SAY_PHOENIX                 = -1585024,
+    SAY_FLAMESTRIKE             = -1585025,
+    SAY_GRAVITY_LAPSE           = -1585026,
+    SAY_TIRED                   = -1585027,
+    SAY_RECAST_GRAVITY          = -1585028,
+    SAY_DEATH                   = -1585029,
+
+    // Phase 1 spells
+    SPELL_FIREBALL              = 44189,                    // Deals 2700-3300 damage at current target
+    SPELL_FIREBALL_H            = 46164,                    //       4950-6050
+    SPELL_PHOENIX               = 44194,                    // Summons a phoenix
+    SPELL_FLAME_STRIKE          = 44192,                    // Summons the trigger + animation (projectile)
+    SPELL_SHOCK_BARRIER         = 46165,                    // Heroic only; 10k damage shield, followed by Pyroblast
+    SPELL_PYROBLAST             = 36819,                    // Heroic only; 45-55k fire damage
+
+    // Phase 2 spells
+    SPELL_GRAVITY_LAPSE         = 44224,                    // Cast at the beginning of every Gravity Lapse
+    SPELL_GRAVITY_LAPSE_VISUAL  = 44251,                    // Channeled; blue beam animation to every enemy in range - when removed the Gravity Lapse auras are removed from players
+    SPELL_TELEPORT_CENTER       = 44218,                    // Teleport the boss in the center. Requires DB entry in spell_target_position.
+    SPELL_GRAVITY_LAPSE_FLY     = 44227,                    // Hastens flyspeed and allows flying for 1 minute. Requires aura stacking exception for 44226.
+    SPELL_GRAVITY_LAPSE_DOT     = 44226,                    // Knocks up in the air and applies a 300 DPS DoT.
+    SPELL_ARCANE_SPHERE_SUMMON  = 44265,                    // Summons 1 arcane sphere
+    SPELL_POWER_FEEDBACK        = 44233,                    // Stuns him, making him take 50% more damage for 10 seconds. Cast after Gravity Lapse
+
+    // Summoned spells
+    SPELL_ARCANE_SPHERE_PASSIVE = 44263,                    // Passive auras on Arcane Spheres
+    SPELL_FLAME_STRIKE_DUMMY    = 44191,                    // Flamestrike indicator before the damage
+    SPELL_EMBER_BLAST           = 44199,                    // On Phoenix death
+    SPELL_PHOENIX_BURN          = 44197,                    // A spell Phoenix uses to damage everything around
+    SPELL_REBIRTH_DMG           = 44196,                    // DMG if a Phoenix rebirth happen
+
+    // Summoned creatures
+    NPC_FLAME_STRIKE_TRIGGER    = 24666,
+    NPC_PHOENIX                 = 24674,
+    NPC_PHOENIX_EGG             = 24675,
+    NPC_ARCANE_SPHERE           = 24708,
+
+    MAX_ARCANE_SPHERES          = 3,
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {SAY_INTRO_1,         NPC_KAELTHAS, 16000},
+    {EMOTE_ONESHOT_LAUGH, 0,            2000},
+    {EMOTE_STATE_TALK,    0,            2000},
+    {SAY_INTRO_2,         NPC_KAELTHAS, 16000},
+    {NPC_PHOENIX,         0,            0},
+    {SAY_DEATH,           NPC_KAELTHAS, 4000},
+    {EMOTE_ONESHOT_POINT, 0,            5000},
+    {EMOTE_ONESHOT_ROAR,  0,            3000},
+    {NPC_PHOENIX_EGG,     0,            0},
+    {0, 0, 0},
+};
+
+// Spells used to teleport players for Gravity Lapse
+static const uint32 aGravityLapseSpells[] = {44219, 44220, 44221, 44222, 44223};
+
+/*######
+## boss_felblood_kaelthas
+######*/
+
+struct boss_felblood_kaelthas : public CreatureScript
+{
+    boss_felblood_kaelthas() : CreatureScript("boss_felblood_kaelthas") {}
+
+    struct boss_felblood_kaelthasAI : public ScriptedAI, private DialogueHelper
+    {
+        boss_felblood_kaelthasAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            InitializeDialogueHelper(m_pInstance);
+            m_bHasTaunted = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiFireballTimer;
+        uint32 m_uiPhoenixTimer;
+        uint32 m_uiFlameStrikeTimer;
+
+        // Heroic only
+        uint32 m_uiShockBarrierTimer;
+        uint32 m_uiPyroblastTimer;
+
+        uint32 m_uiGravityLapseTimer;
+        uint32 m_uiGravityLapseStage;
+        uint8 m_uiGravityIndex;
+
+        bool m_bIsFirstPhase;
+        bool m_bFirstGravityLapse;
+        bool m_bHasTaunted;
+
+        void Reset() override
+        {
+            m_uiFireballTimer = 0;
+            m_uiPhoenixTimer = 10000;
+            m_uiFlameStrikeTimer = 25000;
+
+            m_uiPyroblastTimer = 0;
+            m_uiShockBarrierTimer = 60000;
+
+            m_uiGravityLapseTimer = 1000;
+            m_uiGravityLapseStage = 0;
+            m_uiGravityIndex = 0;
+
+            m_bFirstGravityLapse = true;
+            m_bIsFirstPhase = true;
+
+            SetCombatMovement(true);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KAELTHAS, DONE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KAELTHAS, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KAELTHAS, FAIL);
+            }
+        }
+
+        // Boss has an interesting speech before killed, so we need to fake death (without stand state) and allow him to finish his theatre
+        void DamageTaken(Unit* /*pKiller*/, uint32& uiDamage) override
+        {
+            if (uiDamage < m_creature->GetHealth())
+            {
+                return;
+            }
+
+            // Make sure it won't die by accident
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+            {
+                uiDamage = 0;
+                return;
+            }
+
+            uiDamage = 0;
+            RemoveGravityLapse();
+            StartNextDialogueText(SAY_DEATH);
+            m_creature->HandleEmote(EMOTE_STATE_TALK);
+
+            m_creature->InterruptNonMeleeSpells(true);
+            m_creature->SetHealth(1);
+            m_creature->StopMoving();
+            m_creature->ClearComboPointHolders();
+            m_creature->RemoveAllAurasOnDeath();
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            m_creature->ClearAllReactives();
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MoveIdle();
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasTaunted && pWho->GetTypeId() == TYPEID_PLAYER && !((Player*)pWho)->isGameMaster() &&
+                m_creature->IsWithinDistInMap(pWho, 40.0) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                StartNextDialogueText(SAY_INTRO_1);
+                m_creature->HandleEmote(EMOTE_STATE_TALK);
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                m_bHasTaunted = true;
+            }
+
+            // Allow him to finish intro
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE))
+            {
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case EMOTE_ONESHOT_LAUGH:
+                m_creature->HandleEmote(EMOTE_ONESHOT_LAUGH);
+                break;
+            case EMOTE_STATE_TALK:
+                m_creature->HandleEmote(EMOTE_STATE_TALK);
+                break;
+            case NPC_PHOENIX:
+                m_creature->HandleEmote(EMOTE_STATE_NONE);
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                break;
+            case EMOTE_ONESHOT_POINT:
+                m_creature->HandleEmote(EMOTE_ONESHOT_POINT);
+                break;
+            case EMOTE_ONESHOT_ROAR:
+                m_creature->HandleEmote(EMOTE_ONESHOT_ROAR);
+                break;
+            case NPC_PHOENIX_EGG:
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                break;
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                DoStartMovement(pWho, 20.0f);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_FLAME_STRIKE_TRIGGER)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_FLAME_STRIKE_DUMMY, false, NULL, NULL, m_creature->GetObjectGuid());
+            }
+            else
+            {
+                // Attack or follow target
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (pSummoned->GetEntry() == NPC_ARCANE_SPHERE)
+                    {
+                        pSummoned->GetMotionMaster()->MoveFollow(pTarget, 0, 0);
+                    }
+                    else
+                    {
+                        pSummoned->AI()->AttackStart(pTarget);
+                    }
+                }
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            // Handle Gravity Lapse on targets
+            if (pSpell->Id == SPELL_GRAVITY_LAPSE && pTarget->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoCastSpellIfCan(pTarget, aGravityLapseSpells[m_uiGravityIndex], CAST_TRIGGERED);
+                pTarget->CastSpell(pTarget, SPELL_GRAVITY_LAPSE_FLY, true, 0, 0, m_creature->GetObjectGuid());
+                pTarget->CastSpell(pTarget, SPELL_GRAVITY_LAPSE_DOT, true, 0, 0, m_creature->GetObjectGuid());
+                ++m_uiGravityIndex;
+            }
+        }
+
+        // Wrapper to remove Gravity Lapse - this should be removed on aura 44251 expires
+        void RemoveGravityLapse()
+        {
+            GuidVector vGuids;
+            m_creature->FillGuidsListFromThreatList(vGuids);
+
+            for (GuidVector::const_iterator itr = vGuids.begin(); itr != vGuids.end(); ++itr)
+            {
+                Unit* pUnit = m_creature->GetMap()->GetUnit(*itr);
+
+                if (pUnit && pUnit->GetTypeId() == TYPEID_PLAYER)
+                {
+                    pUnit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_FLY);
+                    pUnit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_DOT);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Don't use spells during the epilogue
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+            {
+                return;
+            }
+
+            if (m_bIsFirstPhase)
+            {
+                // *Heroic mode only:
+                if (!m_bIsRegularMode)
+                {
+                    if (m_uiShockBarrierTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_SHOCK_BARRIER) == CAST_OK)
+                        {
+                            m_uiPyroblastTimer = 1000;
+                            m_uiShockBarrierTimer = 60000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiShockBarrierTimer -= uiDiff;
+                    }
+
+                    if (m_uiPyroblastTimer)
+                    {
+                        if (m_uiPyroblastTimer <= uiDiff)
+                        {
+                            if (DoCastSpellIfCan(m_creature, SPELL_PYROBLAST) == CAST_OK)
+                            {
+                                m_uiPyroblastTimer = 0;
+                            }
+                        }
+                        else
+                        {
+                            m_uiPyroblastTimer -= uiDiff;
+                        }
+                    }
+                }
+
+                if (m_uiFireballTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_FIREBALL : SPELL_FIREBALL_H) == CAST_OK)
+                        {
+                            m_uiFireballTimer = urand(2000, 4000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiFireballTimer -= uiDiff;
+                }
+
+                if (m_uiPhoenixTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_PHOENIX) == CAST_OK)
+                    {
+                        DoScriptText(SAY_PHOENIX, m_creature);
+                        m_uiPhoenixTimer = 45000;
+                    }
+                }
+                else
+                {
+                    m_uiPhoenixTimer -= uiDiff;
+                }
+
+                if (m_uiFlameStrikeTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_FLAME_STRIKE) == CAST_OK)
+                        {
+                            DoScriptText(SAY_FLAMESTRIKE, m_creature);
+                            m_uiFlameStrikeTimer = urand(15000, 25000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiFlameStrikeTimer -= uiDiff;
+                }
+
+                // Below 50%
+                if (m_creature->GetHealthPercent() < 50.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT_CENTER, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        SetCombatMovement(false);
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MoveIdle();
+
+                        m_bIsFirstPhase = false;
+                    }
+                }
+
+                DoMeleeAttackIfReady();
+            }
+            else
+            {
+                if (m_uiGravityLapseTimer < uiDiff)
+                {
+                    switch (m_uiGravityLapseStage)
+                    {
+                    case 0:
+                        // Cast Gravity Lapse on Players
+                        if (DoCastSpellIfCan(m_creature, SPELL_GRAVITY_LAPSE) == CAST_OK)
+                        {
+                            if (m_bFirstGravityLapse)
+                            {
+                                DoScriptText(SAY_GRAVITY_LAPSE, m_creature);
+                                m_bFirstGravityLapse = false;
+                            }
+                            else
+                            {
+                                DoScriptText(SAY_RECAST_GRAVITY, m_creature);
+                            }
+
+                            m_uiGravityLapseTimer = 2000;
+                            m_uiGravityIndex = 0;
+                            ++m_uiGravityLapseStage;
+                        }
+                        break;
+                    case 1:
+                        // Summon spheres and apply the Gravity Lapse visual - upon visual expire, the gravity lapse is removed
+                        if (DoCastSpellIfCan(m_creature, SPELL_GRAVITY_LAPSE_VISUAL) == CAST_OK)
+                        {
+                            for (uint8 i = 0; i < MAX_ARCANE_SPHERES; ++i)
+                            {
+                                DoCastSpellIfCan(m_creature, SPELL_ARCANE_SPHERE_SUMMON, CAST_TRIGGERED);
+                            }
+
+                            m_uiGravityLapseTimer = 30000;
+                            ++m_uiGravityLapseStage;
+                        }
+                        break;
+                    case 2:
+                        // Cast Power Feedback and stay stunned for 10 secs - also break the statues if they are not broken
+                        if (DoCastSpellIfCan(m_creature, SPELL_POWER_FEEDBACK) == CAST_OK)
+                        {
+                            DoScriptText(SAY_TIRED, m_creature);
+                            RemoveGravityLapse();
+                            m_uiGravityLapseTimer = 10000;
+                            m_uiGravityLapseStage = 0;
+                        }
+                        break;
+                    }
+                }
+                else
+                {
+                    m_uiGravityLapseTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_felblood_kaelthasAI(pCreature);
+    }
+};
+
+/*######
+## mob_felkael_phoenix
+######*/
+struct mob_felkael_phoenix : public CreatureScript
+{
+    mob_felkael_phoenix() : CreatureScript("mob_felkael_phoenix") {}
+
+    struct mob_felkael_phoenixAI : public ScriptedAI
+    {
+        mob_felkael_phoenixAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        uint32 m_uiBurnTimer;
+
+        bool m_bFakeDeath;
+
+        void Reset() override
+        {
+            m_uiBurnTimer = 2000;
+            m_bFakeDeath = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_PHOENIX_BURN);
+        }
+
+        void EnterEvadeMode() override
+        {
+            // Don't evade during ember blast
+            if (m_bFakeDeath)
+            {
+                return;
+            }
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void DamageTaken(Unit* /*pKiller*/, uint32& uiDamage) override
+        {
+            if (uiDamage < m_creature->GetHealth())
+            {
+                return;
+            }
+
+            // Prevent glitch if in fake death
+            if (m_bFakeDeath)
+            {
+                uiDamage = 0;
+                return;
+            }
+
+            // prevent death
+            uiDamage = 0;
+            DoSetFakeDeath();
+        }
+
+        void DoSetFakeDeath()
+        {
+            m_bFakeDeath = true;
+
+            m_creature->InterruptNonMeleeSpells(false);
+            m_creature->SetHealth(1);
+            m_creature->StopMoving();
+            m_creature->ClearComboPointHolders();
+            m_creature->RemoveAllAurasOnDeath();
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            m_creature->ClearAllReactives();
+            m_creature->SetTargetGuid(ObjectGuid());
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MoveIdle();
+            m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+
+            // Spawn egg and make invisible
+            DoCastSpellIfCan(m_creature, SPELL_EMBER_BLAST, CAST_TRIGGERED);
+            m_creature->SummonCreature(NPC_PHOENIX_EGG, 0, 0, 0, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 10000);
+        }
+
+        void SummonedCreatureDespawn(Creature* /*pSummoned*/) override
+        {
+            m_creature->RemoveAurasDueToSpell(SPELL_EMBER_BLAST);
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+            // Remove fake death on egg despawn after 10 secs
+            if (DoCastSpellIfCan(m_creature, SPELL_REBIRTH_DMG) == CAST_OK)
+            {
+                m_creature->SetHealth(m_creature->GetMaxHealth());
+                m_creature->GetMotionMaster()->Clear();
+                DoStartMovement(m_creature->getVictim());
+                m_bFakeDeath = false;
+
+                DoCastSpellIfCan(m_creature, SPELL_PHOENIX_BURN, CAST_TRIGGERED);
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* /*pSummoned*/) override
+        {
+            // Self kill if the egg is killed
+            if (m_bFakeDeath)
+            {
+                m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_bFakeDeath)
+            {
+                return;
+            }
+
+            // ToDo: research if this is correct and how can this be done by spell
+            if (m_uiBurnTimer < uiDiff)
+            {
+                // spell Burn should possible do this, but it doesn't, so do this for now.
+                uint32 uiDmg = urand(1650, 2050);
+                if (uiDmg > m_creature->GetHealth())
+                {
+                    DoSetFakeDeath();
+                }
+                else
+                {
+                    m_creature->DealDamage(m_creature, uiDmg, 0, DOT, SPELL_SCHOOL_MASK_FIRE, NULL, false);
+                }
+
+                m_uiBurnTimer = 2000;
+            }
+            else
+            {
+                m_uiBurnTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_felkael_phoenixAI(pCreature);
+    }
+};
+
+/*######
+## mob_felkael_phoenix_egg
+######*/
+
+// TODO Remove this 'script' when combat movement can be proper prevented from core-side
+struct mob_felkael_phoenix_egg : public CreatureScript
+{
+    mob_felkael_phoenix_egg() : CreatureScript("mob_felkael_phoenix_egg") {}
+
+    struct mob_felkael_phoenix_eggAI : public Scripted_NoMovementAI
+    {
+        mob_felkael_phoenix_eggAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { Reset(); }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+        void AttackStart(Unit* /*pWho*/) override {}
+        void UpdateAI(const uint32 /*uiDiff*/) override {}
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_felkael_phoenix_eggAI(pCreature);
+    }
+};
+
+/*######
+## mob_arcane_sphere
+######*/
+
+struct mob_arcane_sphere : public CreatureScript
+{
+    mob_arcane_sphere() : CreatureScript("mob_arcane_sphere") {}
+
+    struct mob_arcane_sphereAI : public ScriptedAI
+    {
+        mob_arcane_sphereAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiDespawnTimer;
+        uint32 m_uiChangeTargetTimer;
+
+        void Reset() override
+        {
+            m_uiDespawnTimer = 30000;
+            m_uiChangeTargetTimer = urand(6000, 12000);
+
+            DoCastSpellIfCan(m_creature, SPELL_ARCANE_SPHERE_PASSIVE);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Should despawn when aura 44251 expires
+            if (m_uiDespawnTimer < uiDiff)
+            {
+                m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                m_uiDespawnTimer = 0;
+            }
+            else
+            {
+                m_uiDespawnTimer -= uiDiff;
+            }
+
+            if (m_uiChangeTargetTimer < uiDiff)
+            {
+                if (!m_pInstance)
+                {
+                    return;
+                }
+
+                // Follow the target - do not attack
+                if (Creature* pKael = m_pInstance->GetSingleCreatureFromStorage(NPC_KAELTHAS))
+                {
+                    if (Unit* pTarget = pKael->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        m_creature->GetMotionMaster()->MoveFollow(pTarget, 0, 0);
+                    }
+                }
+
+                m_uiChangeTargetTimer = urand(5000, 15000);
+            }
+            else
+            {
+                m_uiChangeTargetTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_arcane_sphereAI(pCreature);
+    }
+};
+
+void AddSC_boss_felblood_kaelthas()
+{
+    Script* s;
+    s = new boss_felblood_kaelthas();
+    s->RegisterSelf();
+    s = new mob_arcane_sphere();
+    s->RegisterSelf();
+    s = new mob_felkael_phoenix();
+    s->RegisterSelf();
+    s = new mob_felkael_phoenix_egg();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_felblood_kaelthas";
+    //pNewScript->GetAI = &GetAI_boss_felblood_kaelthas;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_arcane_sphere";
+    //pNewScript->GetAI = &GetAI_mob_arcane_sphere;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_felkael_phoenix";
+    //pNewScript->GetAI = &GetAI_mob_felkael_phoenix;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_felkael_phoenix_egg";
+    //pNewScript->GetAI = &GetAI_mob_felkael_phoenix_egg;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp b/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
new file mode 100644
index 000000000..7d11b7733
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
@@ -0,0 +1,1627 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Priestess_Delrissa
+SD%Complete: 90
+SDComment: Script handles Delrissa and her companions AI. They need special PvP-like behavior. Timers need adjustments
+SDCategory: Magister's Terrace
+EndScriptData */
+
+#include "precompiled.h"
+#include "magisters_terrace.h"
+
+enum
+{
+    SAY_AGGRO                   = -1585012,
+    SAY_DEATH                   = -1585022,
+
+    SPELL_HEALING_POTION        = 15503,
+    SPELL_DISPEL_MAGIC          = 27609,
+    SPELL_MEDALLION             = 46227,
+    SPELL_FLASH_HEAL            = 17843,
+    SPELL_SHADOW_WORD_PAIN      = 14032,
+    SPELL_SHADOW_WORD_PAIN_H    = 15654,
+    SPELL_SCREAM                = 27610,
+    SPELL_SHIELD                = 44291,            // maybe 44175?
+    SPELL_SHIELD_H              = 46193,
+    SPELL_RENEW                 = 44174,
+    SPELL_RENEW_H               = 46192,
+
+    MAX_COMPANIONS              = 8,
+};
+
+static const int32 aPlayerDeath[] = { -1585017, -1585018, -1585019, -1585020, -1585021};
+static const uint32 aDelrissaLackeys[MAX_COMPANIONS] = {NPC_KAGANI, NPC_ELLRYS, NPC_ERAMAS, NPC_YAZZAI, NPC_SALARIS, NPC_GARAXXAS, NPC_APOKO, NPC_ZELFAN};
+
+static const float aLackeyLocations[MAX_DELRISSA_ADDS][4] =
+{
+    {123.77f,  17.6007f, -19.921f, 4.98f},
+    {131.731f, 15.0827f, -19.921f, 4.98f},
+    {121.563f, 15.6213f, -19.921f, 4.98f},
+    {129.988f, 17.2355f, -19.921f, 4.98f},
+};
+
+/*######
+## boss_priestess_delrissa
+######*/
+
+struct boss_priestess_delrissa : public CreatureScript
+{
+    boss_priestess_delrissa() : CreatureScript("boss_priestess_delrissa") {}
+
+    struct boss_priestess_delrissaAI : public ScriptedAI
+    {
+        boss_priestess_delrissaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        std::vector<uint32> m_vuiLackeyEnties;
+
+        uint32 m_uiHealTimer;
+        uint32 m_uiRenewTimer;
+        uint32 m_uiShieldTimer;
+        uint32 m_uiSWPainTimer;
+        uint32 m_uiDispelTimer;
+        uint32 m_uiScreamTimer;
+        uint32 m_uiMedallionTimer;
+        uint8 m_uiPlayersKilled;
+
+        void Reset() override
+        {
+            m_uiHealTimer = 15000;
+            m_uiRenewTimer = 10000;
+            m_uiShieldTimer = 2000;
+            m_uiSWPainTimer = 5000;
+            m_uiDispelTimer = 7500;
+            m_uiScreamTimer = 9000;
+            m_uiPlayersKilled = 0;
+            m_uiMedallionTimer = urand(1000, 2000);
+
+            DoInitializeCompanions();
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_DELRISSA, FAIL);
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (pWho->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_DELRISSA, IN_PROGRESS);
+            }
+        }
+
+        // Summon four random adds to help during the fight
+        void DoInitializeCompanions()
+        {
+            // can be called if creature are dead, so avoid
+            if (!m_creature->IsAlive())
+            {
+                return;
+            }
+
+            // it's empty, so first time
+            if (m_vuiLackeyEnties.empty())
+            {
+                // pre-allocate size for speed
+                m_vuiLackeyEnties.resize(MAX_COMPANIONS);
+
+                // fill vector array with entries from creature array
+                for (uint8 i = 0; i < MAX_COMPANIONS; ++i)
+                {
+                    m_vuiLackeyEnties[i] = aDelrissaLackeys[i];
+                }
+
+                std::random_shuffle(m_vuiLackeyEnties.begin(), m_vuiLackeyEnties.end());
+
+                // Summon the 4 entries
+                for (uint8 i = 0; i < MAX_DELRISSA_ADDS; ++i)
+                {
+                    m_creature->SummonCreature(m_vuiLackeyEnties[i], aLackeyLocations[i][0], aLackeyLocations[i][1], aLackeyLocations[i][2], aLackeyLocations[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
+                }
+            }
+            // Resummon the killed adds
+            else
+            {
+                if (!m_pInstance)
+                {
+                    return;
+                }
+
+                for (uint8 i = 0; i < MAX_DELRISSA_ADDS; ++i)
+                {
+                    // If we already have the creature on the map, then don't summon it
+                    if (m_pInstance->GetSingleCreatureFromStorage(m_vuiLackeyEnties[i], true))
+                    {
+                        continue;
+                    }
+
+                    m_creature->SummonCreature(m_vuiLackeyEnties[i], aLackeyLocations[i][0], aLackeyLocations[i][1], aLackeyLocations[i][2], aLackeyLocations[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
+                }
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            DoScriptText(aPlayerDeath[m_uiPlayersKilled], m_creature);
+            ++m_uiPlayersKilled;
+
+            // reset counter
+            if (m_uiPlayersKilled == 5)
+            {
+                m_uiPlayersKilled = 0;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // Remove lootable flag if the lackeys are not killed
+            if (m_pInstance->GetData(TYPE_DELRISSA) == SPECIAL)
+            {
+                m_pInstance->SetData(TYPE_DELRISSA, DONE);
+            }
+            else
+            {
+                m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiHealTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(50.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_FLASH_HEAL) == CAST_OK)
+                    {
+                        m_uiHealTimer = urand(15000, 20000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiHealTimer -= uiDiff;
+            }
+
+            if (m_uiRenewTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(50.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_RENEW : SPELL_RENEW_H) == CAST_OK)
+                    {
+                        m_uiRenewTimer = urand(5000, 10000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiRenewTimer -= uiDiff;
+            }
+
+            if (m_uiShieldTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SHIELD : SPELL_SHIELD_H) == CAST_OK)
+                {
+                    m_uiShieldTimer = urand(30000, 35000);
+                }
+            }
+            else
+            {
+                m_uiShieldTimer -= uiDiff;
+            }
+
+            if (m_uiDispelTimer < uiDiff)
+            {
+                Unit* pTarget = NULL;
+                std::list<Creature*> lTempList = DoFindFriendlyCC(50.0f);
+
+                if (!lTempList.empty())
+                {
+                    pTarget = *(lTempList.begin());
+                }
+                else
+                {
+                    pTarget = DoSelectLowestHpFriendly(50.0f);
+                }
+
+                if (pTarget)
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_DISPEL_MAGIC) == CAST_OK)
+                    {
+                        m_uiDispelTimer = urand(12000, 15000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiDispelTimer -= uiDiff;
+            }
+
+            // Use the Medallion if CC - only on heroic. Not sure how many times they are allowed to use it.
+            if (!m_bIsRegularMode && m_uiMedallionTimer)
+            {
+                if (m_creature->IsFrozen() || m_creature->hasUnitState(UNIT_STAT_CAN_NOT_REACT))
+                {
+                    if (m_uiMedallionTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_MEDALLION, CAST_TRIGGERED) == CAST_OK)
+                        {
+                            m_uiMedallionTimer = 0;
+                        }
+                    }
+                    else
+                    {
+                        m_uiMedallionTimer -= uiDiff;
+                    }
+                }
+            }
+
+            if (m_uiSWPainTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_SHADOW_WORD_PAIN : SPELL_SHADOW_WORD_PAIN_H) == CAST_OK)
+                    {
+                        m_uiSWPainTimer = 10000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiSWPainTimer -= uiDiff;
+            }
+
+            if (m_uiScreamTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SCREAM) == CAST_OK)
+                {
+                    m_uiScreamTimer = urand(15000, 20000);
+                }
+            }
+            else
+            {
+                m_uiScreamTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_priestess_delrissaAI(pCreature);
+    }
+};
+
+/*######
+## priestess_companion_common : common AI part
+######*/
+
+struct priestess_companion_commonAI : public ScriptedAI
+{
+    priestess_companion_commonAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+    }
+
+    ScriptedInstance* m_pInstance;
+    bool m_bIsRegularMode;
+
+    uint32 m_uiResetThreatTimer;
+    uint32 m_uiMedallionTimer;
+    bool m_bUsedPotion;
+
+    void Reset() override
+    {
+        m_bUsedPotion = false;
+
+        // These guys does not follow normal threat system rules
+        // 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
+        m_uiResetThreatTimer = urand(5000, 15000);
+        m_uiMedallionTimer   = urand(1000, 2000);
+    }
+
+    void KilledUnit(Unit* pVictim) override
+    {
+        if (!m_pInstance)
+        { return; }
+
+        if (Creature* pDelrissa = m_pInstance->GetSingleCreatureFromStorage(NPC_DELRISSA))
+        { pDelrissa->AI()->KilledUnit(pVictim); }
+    }
+
+    // Return true to handle shared timers and MeleeAttack
+    virtual bool UpdateCompanionAI(const uint32 /*uiDiff*/) { return true; }
+
+    void UpdateAI(const uint32 uiDiff) override
+    {
+        // Return since we have no target
+        if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+        { return; }
+
+        // Call specific virtual function
+        if (!UpdateCompanionAI(uiDiff))
+        { return; }
+
+        if (!m_bUsedPotion && m_creature->GetHealthPercent() < 25.0f)
+        {
+            if (DoCastSpellIfCan(m_creature, SPELL_HEALING_POTION) == CAST_OK)
+            { m_bUsedPotion = true; }
+        }
+
+        // Change target
+        if (m_uiResetThreatTimer < uiDiff)
+        {
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+            {
+                DoResetThreat();
+                AttackStart(pTarget);
+                m_uiResetThreatTimer = urand(5000, 15000);
+            }
+        }
+        else
+        { m_uiResetThreatTimer -= uiDiff; }
+
+        // Use the Medallion if CC - only on heroic. Not sure how many times they are allowed to use it.
+        if (!m_bIsRegularMode && m_uiMedallionTimer)
+        {
+            if (m_creature->IsFrozen() || m_creature->hasUnitState(UNIT_STAT_CAN_NOT_REACT))
+            {
+                if (m_uiMedallionTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_MEDALLION, CAST_TRIGGERED) == CAST_OK)
+                    { m_uiMedallionTimer = 0; }
+                }
+                else
+                { m_uiMedallionTimer -= uiDiff; }
+            }
+        }
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+enum
+{
+    SPELL_KIDNEY_SHOT       = 27615,
+    SPELL_GOUGE             = 12540,
+    SPELL_KICK              = 27613,
+    SPELL_VANISH            = 44290,
+    SPELL_BACKSTAB          = 15657,
+    SPELL_BACKSTAB_H        = 15582,
+    SPELL_EVISCERATE        = 27611,
+    SPELL_EVISCERATE_H      = 46189,
+};
+
+/*######
+## npc_kagani_nightstrike - Rogue
+######*/
+
+struct npc_kagani_nightstrike : public CreatureScript
+{
+    npc_kagani_nightstrike() : CreatureScript("npc_kagani_nightstrike") {}
+
+    struct npc_kagani_nightstrikeAI : public priestess_companion_commonAI
+    {
+        npc_kagani_nightstrikeAI(Creature* pCreature) : priestess_companion_commonAI(pCreature) { }
+
+        uint32 m_uiGougeTimer;
+        uint32 m_uiKickTimer;
+        uint32 m_uiVanishTimer;
+        uint32 m_uiEviscerateTimer;
+        uint32 m_uiVanishEndTimer;
+
+        void Reset() override
+        {
+            m_uiGougeTimer = 5500;
+            m_uiKickTimer = 7000;
+            m_uiVanishTimer = 2000;
+            m_uiEviscerateTimer = 6000;
+            m_uiVanishEndTimer = 0;
+
+            priestess_companion_commonAI::Reset();
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (m_uiVanishEndTimer)
+            {
+                return;
+            }
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        bool UpdateCompanionAI(const uint32 uiDiff)
+        {
+            if (m_uiVanishEndTimer)
+            {
+                if (m_uiVanishEndTimer <= uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_BACKSTAB, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_KIDNEY_SHOT, CAST_TRIGGERED);
+                    m_uiVanishEndTimer = 0;
+                }
+                else
+                {
+                    m_uiVanishEndTimer -= uiDiff;
+                }
+
+                return false;
+            }
+
+            if (m_uiVanishTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_VANISH) == CAST_OK)
+                {
+                    // Prefer targets with mana
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_POWER_MANA))
+                    {
+                        DoResetThreat();
+                        AttackStart(pTarget);
+                    }
+
+                    m_uiVanishTimer = 30000;
+                    m_uiVanishEndTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiVanishTimer -= uiDiff;
+            }
+
+            if (m_uiGougeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_GOUGE) == CAST_OK)
+                {
+                    m_uiGougeTimer = 5500;
+                }
+            }
+            else
+            {
+                m_uiGougeTimer -= uiDiff;
+            }
+
+            if (m_uiKickTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_KICK) == CAST_OK)
+                {
+                    m_uiKickTimer = 7000;
+                }
+            }
+            else
+            {
+                m_uiKickTimer -= uiDiff;
+            }
+
+            if (m_uiEviscerateTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_EVISCERATE : SPELL_EVISCERATE_H) == CAST_OK)
+                {
+                    m_uiEviscerateTimer = 4000;
+                }
+            }
+            else
+            {
+                m_uiEviscerateTimer -= uiDiff;
+            }
+
+            return true;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kagani_nightstrikeAI(pCreature);
+    }
+};
+
+enum
+{
+    SPELL_IMMOLATE              = 44267,
+    SPELL_IMMOLATE_H            = 46191,
+    SPELL_SHADOW_BOLT           = 12471,
+    SPELL_SHADOW_BOLT_H         = 15232,
+    SPELL_SEED_OF_CORRUPTION    = 44141,
+    SPELL_CURSE_OF_AGONY        = 14875,
+    SPELL_CURSE_OF_AGONY_H      = 46190,
+    SPELL_FEAR                  = 38595,
+    SPELL_DEATH_COIL            = 44142,
+    SPELL_SUMMON_IMP            = 44163,
+
+    NPC_FIZZLE                  = 24656,
+};
+
+/*######
+## npc_ellris_duskhallow - Warlock
+######*/
+
+struct npc_ellris_duskhallow : public CreatureScript
+{
+    npc_ellris_duskhallow() : CreatureScript("npc_ellris_duskhallow") {}
+
+    struct npc_ellris_duskhallowAI : public priestess_companion_commonAI
+    {
+        npc_ellris_duskhallowAI(Creature* pCreature) : priestess_companion_commonAI(pCreature) { Reset(); }
+
+        uint32 m_uiImmolateTimer;
+        uint32 m_uiShadowBoltTimer;
+        uint32 m_uiSeedCorruptionTimer;
+        uint32 m_uiCurseAgonyTimer;
+        uint32 m_uiFearTimer;
+        uint32 m_uiDeathCoilTimer;
+
+        void Reset() override
+        {
+            m_uiImmolateTimer = 6000;
+            m_uiShadowBoltTimer = 3000;
+            m_uiSeedCorruptionTimer = 2000;
+            m_uiCurseAgonyTimer = 1000;
+            m_uiFearTimer = 10000;
+            m_uiDeathCoilTimer = 8000;
+
+            priestess_companion_commonAI::Reset();
+
+            // Check if we already have an imp summoned
+            if (!GetClosestCreatureWithEntry(m_creature, NPC_FIZZLE, 50.0f))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_IMP);
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                DoStartMovement(pWho, 20.0f);
+            }
+        }
+
+        bool UpdateCompanionAI(const uint32 uiDiff)
+        {
+            if (m_uiImmolateTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_IMMOLATE : SPELL_IMMOLATE_H) == CAST_OK)
+                    {
+                        m_uiImmolateTimer = 6000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiImmolateTimer -= uiDiff;
+            }
+
+            if (m_uiShadowBoltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_SHADOW_BOLT : SPELL_SHADOW_BOLT_H) == CAST_OK)
+                    {
+                        m_uiShadowBoltTimer = 5000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiShadowBoltTimer -= uiDiff;
+            }
+
+            if (m_uiSeedCorruptionTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SEED_OF_CORRUPTION) == CAST_OK)
+                    {
+                        m_uiSeedCorruptionTimer = 10000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiSeedCorruptionTimer -= uiDiff;
+            }
+
+            if (m_uiCurseAgonyTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_CURSE_OF_AGONY : SPELL_CURSE_OF_AGONY_H) == CAST_OK)
+                    {
+                        m_uiCurseAgonyTimer = 13000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiCurseAgonyTimer -= uiDiff;
+            }
+
+            if (m_uiFearTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_FEAR) == CAST_OK)
+                    {
+                        m_uiFearTimer = 10000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiFearTimer -= uiDiff;
+            }
+
+            if (m_uiDeathCoilTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_DEATH_COIL) == CAST_OK)
+                    {
+                        m_uiDeathCoilTimer = urand(8000, 13000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiDeathCoilTimer -= uiDiff;
+            }
+
+            return true;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ellris_duskhallowAI(pCreature);
+    }
+};
+
+enum
+{
+    SPELL_KNOCKDOWN     = 11428,
+    SPELL_KNOCKDOWN_H   = 46183,
+    SPELL_SNAP_KICK     = 46182
+};
+
+/*######
+## npc_eramas_brightblaze - Monk
+######*/
+
+struct npc_eramas_brightblaze : public CreatureScript
+{
+    npc_eramas_brightblaze() : CreatureScript("npc_eramas_brightblaze") {}
+
+    struct npc_eramas_brightblazeAI : public priestess_companion_commonAI
+    {
+        npc_eramas_brightblazeAI(Creature* pCreature) : priestess_companion_commonAI(pCreature) { }
+
+        uint32 m_uiKnockdownTimer;
+        uint32 m_uiSnapKickTimer;
+
+        void Reset() override
+        {
+            m_uiKnockdownTimer = 6000;
+            m_uiSnapKickTimer = 4500;
+
+            priestess_companion_commonAI::Reset();
+        }
+
+        bool UpdateCompanionAI(const uint32 uiDiff)
+        {
+            if (m_uiKnockdownTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_KNOCKDOWN : SPELL_KNOCKDOWN_H) == CAST_OK)
+                {
+                    m_uiKnockdownTimer = 6000;
+                }
+            }
+            else
+            {
+                m_uiKnockdownTimer -= uiDiff;
+            }
+
+            if (m_uiSnapKickTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SNAP_KICK) == CAST_OK)
+                {
+                    m_uiSnapKickTimer = 4500;
+                }
+            }
+            else
+            {
+                m_uiSnapKickTimer -= uiDiff;
+            }
+
+            return true;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_eramas_brightblazeAI(pCreature);
+    }
+};
+
+enum
+{
+    SPELL_POLYMORPH         = 13323,
+    SPELL_ICE_BLOCK         = 27619,
+    SPELL_BLIZZARD          = 44178,
+    SPELL_BLIZZARD_H        = 46195,
+    SPELL_ICE_LANCE         = 44176,
+    SPELL_ICE_LANCE_H       = 46194,
+    SPELL_CONE_OF_COLD      = 12611,
+    SPELL_CONE_OF_COLD_H    = 38384,
+    SPELL_FROSTBOLT         = 15043,
+    SPELL_FROSTBOLT_H       = 15530,
+    SPELL_BLINK             = 14514
+};
+
+/*######
+## npc_yazzai - Mage
+######*/
+
+struct npc_yazzai : public CreatureScript
+{
+    npc_yazzai() : CreatureScript("npc_yazzai") {}
+
+    struct npc_yazzaiAI : public priestess_companion_commonAI
+    {
+        npc_yazzaiAI(Creature* pCreature) : priestess_companion_commonAI(pCreature) { }
+
+        bool m_bHasIceBlocked;
+
+        uint32 m_uiPolymorphTimer;
+        uint32 m_uiIceBlockTimer;
+        uint32 m_uiWait_Timer;
+        uint32 m_uiBlizzardTimer;
+        uint32 m_uiIceLanceTimer;
+        uint32 m_uiConeColdTimer;
+        uint32 m_uiFrostboltTimer;
+        uint32 m_uiBlinkTimer;
+
+        void Reset() override
+        {
+            m_bHasIceBlocked = false;
+
+            m_uiPolymorphTimer = 1000;
+            m_uiIceBlockTimer = 20000;
+            m_uiWait_Timer = 10000;
+            m_uiBlizzardTimer = 8000;
+            m_uiIceLanceTimer = 12000;
+            m_uiConeColdTimer = 10000;
+            m_uiFrostboltTimer = 3000;
+            m_uiBlinkTimer = 8000;
+
+            priestess_companion_commonAI::Reset();
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                DoStartMovement(pWho, 20.0f);
+            }
+        }
+
+        bool UpdateCompanionAI(const uint32 uiDiff)
+        {
+            if (m_uiPolymorphTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_POLYMORPH) == CAST_OK)
+                    {
+                        m_uiPolymorphTimer = 20000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiPolymorphTimer -= uiDiff;
+            }
+
+            if (m_creature->GetHealthPercent() < 35.0f && !m_bHasIceBlocked)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ICE_BLOCK) == CAST_OK)
+                {
+                    m_bHasIceBlocked = true;
+                }
+            }
+
+            if (m_uiBlizzardTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_BLIZZARD : SPELL_BLIZZARD_H) == CAST_OK)
+                    {
+                        m_uiBlizzardTimer = urand(8000, 15000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiBlizzardTimer -= uiDiff;
+            }
+
+            if (m_uiIceLanceTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_ICE_LANCE : SPELL_ICE_LANCE_H) == CAST_OK)
+                    {
+                        m_uiIceLanceTimer = 12000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiIceLanceTimer -= uiDiff;
+            }
+
+            if (m_uiConeColdTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_CONE_OF_COLD : SPELL_CONE_OF_COLD_H) == CAST_OK)
+                {
+                    m_uiConeColdTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiConeColdTimer -= uiDiff;
+            }
+
+            if (m_uiFrostboltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_FROSTBOLT : SPELL_FROSTBOLT_H) == CAST_OK)
+                    {
+                        m_uiFrostboltTimer = 8000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiFrostboltTimer -= uiDiff;
+            }
+
+            if (m_uiBlinkTimer < uiDiff)
+            {
+                // if anybody is in melee range than escape by blink
+                if (m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_IN_MELEE_RANGE))
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BLINK) == CAST_OK)
+                    {
+                        m_uiBlinkTimer = 8000;
+                    }
+                }
+                else
+                {
+                    m_uiBlinkTimer = 2000;
+                }
+            }
+            else
+            {
+                m_uiBlinkTimer -= uiDiff;
+            }
+
+            return true;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_yazzaiAI(pCreature);
+    }
+};
+
+enum
+{
+    SPELL_INTERCEPT_STUN        = 27577,
+    SPELL_DISARM                = 27581,
+    SPELL_PIERCING_HOWL         = 23600,
+    SPELL_FRIGHTENING_SHOUT     = 19134,
+    SPELL_HAMSTRING             = 27584,
+    SPELL_BATTLE_SHOUT          = 27578,
+    SPELL_MORTAL_STRIKE         = 44268
+};
+
+/*######
+## npc_warlord_salaris - Warrior
+######*/
+
+struct npc_warlord_salaris : public CreatureScript
+{
+    npc_warlord_salaris() : CreatureScript("npc_warlord_salaris") {}
+
+    struct npc_warlord_salarisAI : public priestess_companion_commonAI
+    {
+        npc_warlord_salarisAI(Creature* pCreature) : priestess_companion_commonAI(pCreature) { }
+
+        uint32 m_uiInterceptStunTimer;
+        uint32 m_uiDisarmTimer;
+        uint32 m_uiPiercingHowlTimer;
+        uint32 m_uiFrighteningShoutTimer;
+        uint32 m_uiHamstringTimer;
+        uint32 m_uiMortalStrikeTimer;
+
+        void Reset() override
+        {
+            m_uiInterceptStunTimer = 500;
+            m_uiDisarmTimer = 6000;
+            m_uiPiercingHowlTimer = 10000;
+            m_uiFrighteningShoutTimer = 18000;
+            m_uiHamstringTimer = 4500;
+            m_uiMortalStrikeTimer = 8000;
+
+            priestess_companion_commonAI::Reset();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_BATTLE_SHOUT);
+        }
+
+        bool UpdateCompanionAI(const uint32 uiDiff)
+        {
+            if (m_uiInterceptStunTimer < uiDiff)
+            {
+                // if nobody is in melee range than try to use Intercept
+                if (!m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_IN_MELEE_RANGE))
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_INTERCEPT_STUN, SELECT_FLAG_NOT_IN_MELEE_RANGE | SELECT_FLAG_IN_LOS))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_INTERCEPT_STUN) == CAST_OK)
+                        {
+                            m_uiInterceptStunTimer = 10000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiInterceptStunTimer = 2000;
+                }
+            }
+            else
+            {
+                m_uiInterceptStunTimer -= uiDiff;
+            }
+
+            if (m_uiDisarmTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DISARM) == CAST_OK)
+                {
+                    m_uiDisarmTimer = 6000;
+                }
+            }
+            else
+            {
+                m_uiDisarmTimer -= uiDiff;
+            }
+
+            if (m_uiHamstringTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HAMSTRING) == CAST_OK)
+                {
+                    m_uiHamstringTimer = 4500;
+                }
+            }
+            else
+            {
+                m_uiHamstringTimer -= uiDiff;
+            }
+
+            if (m_uiMortalStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MORTAL_STRIKE) == CAST_OK)
+                {
+                    m_uiMortalStrikeTimer = 4500;
+                }
+            }
+            else
+            {
+                m_uiMortalStrikeTimer -= uiDiff;
+            }
+
+            if (m_uiPiercingHowlTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_PIERCING_HOWL) == CAST_OK)
+                {
+                    m_uiPiercingHowlTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiPiercingHowlTimer -= uiDiff;
+            }
+
+            if (m_uiFrighteningShoutTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FRIGHTENING_SHOUT) == CAST_OK)
+                {
+                    m_uiFrighteningShoutTimer = 18000;
+                }
+            }
+            else
+            {
+                m_uiFrighteningShoutTimer -= uiDiff;
+            }
+
+            return true;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_warlord_salarisAI(pCreature);
+    }
+};
+
+enum
+{
+    SPELL_AIMED_SHOT            = 44271,
+    SPELL_SHOOT                 = 15620,
+    SPELL_SHOOT_H               = 22907,
+    SPELL_CONCUSSIVE_SHOT       = 27634,
+    SPELL_MULTI_SHOT            = 31942,
+    SPELL_MULTI_SHOT_H          = 44285,
+    SPELL_WING_CLIP             = 44286,
+    SPELL_FREEZING_TRAP         = 44136,
+
+    NPC_SLIVER                  = 24552
+};
+
+/*######
+## npc_garaxxas - Hunter
+######*/
+
+struct npc_garaxxas : public CreatureScript
+{
+    npc_garaxxas() : CreatureScript("npc_garaxxas") {}
+
+    struct npc_garaxxasAI : public priestess_companion_commonAI
+    {
+        npc_garaxxasAI(Creature* pCreature) : priestess_companion_commonAI(pCreature) { }
+
+        uint32 m_uiAimedShotTimer;
+        uint32 m_uiShootTimer;
+        uint32 m_uiConcussiveShotTimer;
+        uint32 m_uiMultiShotTimer;
+        uint32 m_uiWingClipTimer;
+        uint32 m_uiFreezingTrapTimer;
+
+        void Reset() override
+        {
+            m_uiAimedShotTimer = 6000;
+            m_uiShootTimer = 2500;
+            m_uiConcussiveShotTimer = 8000;
+            m_uiMultiShotTimer = 10000;
+            m_uiWingClipTimer = 4000;
+            m_uiFreezingTrapTimer = 15000;
+
+            priestess_companion_commonAI::Reset();
+
+            // Check if the pet was killed
+            if (!GetClosestCreatureWithEntry(m_creature, NPC_SLIVER, 50.0f))
+            {
+                m_creature->SummonCreature(NPC_SLIVER, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                DoStartMovement(pWho, 20.0f);
+            }
+        }
+
+        bool UpdateCompanionAI(const uint32 uiDiff)
+        {
+            if (m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+            {
+                if (m_uiWingClipTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_WING_CLIP) == CAST_OK)
+                    {
+                        m_uiWingClipTimer = 4000;
+                    }
+                }
+                else
+                {
+                    m_uiWingClipTimer -= uiDiff;
+                }
+
+                if (m_uiFreezingTrapTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FREEZING_TRAP) == CAST_OK)
+                    {
+                        m_uiFreezingTrapTimer = urand(15000, 30000);
+                    }
+                }
+                else
+                {
+                    m_uiFreezingTrapTimer -= uiDiff;
+                }
+            }
+            else
+            {
+                if (m_uiConcussiveShotTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_CONCUSSIVE_SHOT) == CAST_OK)
+                        {
+                            m_uiConcussiveShotTimer = 8000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiConcussiveShotTimer -= uiDiff;
+                }
+
+                if (m_uiMultiShotTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_MULTI_SHOT : SPELL_MULTI_SHOT_H) == CAST_OK)
+                        {
+                            m_uiMultiShotTimer = 10000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiMultiShotTimer -= uiDiff;
+                }
+
+                if (m_uiAimedShotTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_AIMED_SHOT) == CAST_OK)
+                        {
+                            m_uiAimedShotTimer = 6000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiAimedShotTimer -= uiDiff;
+                }
+
+                if (m_uiShootTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_SHOOT : SPELL_SHOOT_H) == CAST_OK)
+                        {
+                            m_uiShootTimer = 2500;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiShootTimer -= uiDiff;
+                }
+            }
+
+            return true;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_garaxxasAI(pCreature);
+    }
+};
+
+enum
+{
+    SPELL_WAR_STOMP             = 46026,
+    SPELL_PURGE                 = 27626,
+    SPELL_LESSER_HEALING_WAVE   = 44256,
+    SPELL_LESSER_HEALING_WAVE_H = 46181,
+    SPELL_FROST_SHOCK           = 21401,
+    SPELL_FROST_SHOCK_H         = 46180,
+    SPELL_WINDFURY_TOTEM        = 27621,
+    SPELL_FIRE_NOVA_TOTEM       = 44257,
+    SPELL_EARTHBIND_TOTEM       = 15786
+};
+
+/*######
+## npc_apoko - Shaman
+######*/
+
+struct npc_apoko : public CreatureScript
+{
+    npc_apoko() : CreatureScript("npc_apoko") {}
+
+    struct npc_apokoAI : public priestess_companion_commonAI
+    {
+        npc_apokoAI(Creature* pCreature) : priestess_companion_commonAI(pCreature) { }
+
+        uint32 m_uiTotemTimer;
+        uint32 m_uiWarStompTimer;
+        uint32 m_uiPurgeTimer;
+        uint32 m_uiHealingWaveTimer;
+        uint32 m_uiFrostShockTimer;
+
+        void Reset() override
+        {
+            m_uiTotemTimer = 0;
+            m_uiWarStompTimer = 10000;
+            m_uiPurgeTimer = 8000;
+            m_uiHealingWaveTimer = 5000;
+            m_uiFrostShockTimer = 7000;
+
+            priestess_companion_commonAI::Reset();
+        }
+
+        bool UpdateCompanionAI(const uint32 uiDiff)
+        {
+            if (m_uiTotemTimer < uiDiff)
+            {
+                // It's not very clear how exactly these spells should be cast
+                switch (urand(0, 2))
+                {
+                case 0: DoCastSpellIfCan(m_creature, SPELL_WINDFURY_TOTEM);  break;
+                case 1: DoCastSpellIfCan(m_creature, SPELL_FIRE_NOVA_TOTEM); break;
+                case 2: DoCastSpellIfCan(m_creature, SPELL_EARTHBIND_TOTEM); break;
+                }
+                m_uiTotemTimer = urand(2000, 6000);
+            }
+            else
+            {
+                m_uiTotemTimer -= uiDiff;
+            }
+
+            if (m_uiWarStompTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WAR_STOMP) == CAST_OK)
+                {
+                    m_uiWarStompTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiWarStompTimer -= uiDiff;
+            }
+
+            if (m_uiPurgeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_PURGE) == CAST_OK)
+                    {
+                        m_uiPurgeTimer = 15000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiPurgeTimer -= uiDiff;
+            }
+
+            if (m_uiFrostShockTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_FROST_SHOCK : SPELL_FROST_SHOCK_H) == CAST_OK)
+                {
+                    m_uiFrostShockTimer = 7000;
+                }
+            }
+            else
+            {
+                m_uiFrostShockTimer -= uiDiff;
+            }
+
+            if (m_uiHealingWaveTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(50.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_LESSER_HEALING_WAVE : SPELL_LESSER_HEALING_WAVE_H) == CAST_OK)
+                    {
+                        m_uiHealingWaveTimer = 5000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiHealingWaveTimer -= uiDiff;
+            }
+
+            return true;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_apokoAI(pCreature);
+    }
+};
+
+enum
+{
+    SPELL_GOBLIN_DRAGON_GUN     = 44272,
+    SPELL_GOBLIN_DRAGON_GUN_H   = 46185,
+    SPELL_ROCKET_LAUNCH         = 44137,
+    SPELL_ROCKET_LAUNCH_H       = 46187,
+    SPELL_RECOMBOBULATE         = 44274,
+    SPELL_HIGH_EXPLOSIVE_SHEEP  = 44276,
+    SPELL_FEL_IRON_BOMB         = 46024,
+    SPELL_FEL_IRON_BOMB_H       = 46184,
+};
+
+/*######
+## npc_zelfan - Engineer
+######*/
+
+struct npc_zelfan : public CreatureScript
+{
+    npc_zelfan() : CreatureScript("npc_zelfan") {}
+
+    struct npc_zelfanAI : public priestess_companion_commonAI
+    {
+        npc_zelfanAI(Creature* pCreature) : priestess_companion_commonAI(pCreature) { }
+
+        uint32 m_uiGoblinDragonGunTimer;
+        uint32 m_uiRocketLaunchTimer;
+        uint32 m_uiRecombobulateTimer;
+        uint32 m_uiHighExplosiveSheepTimer;
+        uint32 m_uiFelIronBombTimer;
+
+        void Reset() override
+        {
+            m_uiGoblinDragonGunTimer = 20000;
+            m_uiRocketLaunchTimer = 7000;
+            m_uiRecombobulateTimer = 4000;
+            m_uiHighExplosiveSheepTimer = 10000;
+            m_uiFelIronBombTimer = 15000;
+
+            priestess_companion_commonAI::Reset();
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (m_creature->getVictim())
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        bool UpdateCompanionAI(const uint32 uiDiff)
+        {
+            if (m_uiGoblinDragonGunTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_GOBLIN_DRAGON_GUN : SPELL_GOBLIN_DRAGON_GUN_H) == CAST_OK)
+                {
+                    m_uiGoblinDragonGunTimer = urand(10000, 20000);
+                }
+            }
+            else
+            {
+                m_uiGoblinDragonGunTimer -= uiDiff;
+            }
+
+            if (m_uiRocketLaunchTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_ROCKET_LAUNCH : SPELL_ROCKET_LAUNCH_H) == CAST_OK)
+                    {
+                        m_uiRocketLaunchTimer = 9000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiRocketLaunchTimer -= uiDiff;
+            }
+
+            if (m_uiFelIronBombTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_FEL_IRON_BOMB : SPELL_FEL_IRON_BOMB_H) == CAST_OK)
+                    {
+                        m_uiFelIronBombTimer = 15000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiFelIronBombTimer -= uiDiff;
+            }
+
+            if (m_uiRecombobulateTimer < uiDiff)
+            {
+                // Note: this should be casted only on Polyformed targets
+                Unit* pTarget = NULL;
+                std::list<Creature*> lTempList = DoFindFriendlyCC(50.0f);
+
+                if (!lTempList.empty())
+                {
+                    pTarget = *(lTempList.begin());
+                }
+                else
+                {
+                    pTarget = DoSelectLowestHpFriendly(50.0f);
+                }
+
+                if (pTarget)
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_RECOMBOBULATE) == CAST_OK)
+                    {
+                        m_uiRecombobulateTimer = 2000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiRecombobulateTimer -= uiDiff;
+            }
+
+            if (m_uiHighExplosiveSheepTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_HIGH_EXPLOSIVE_SHEEP) == CAST_OK)
+                {
+                    m_uiHighExplosiveSheepTimer = 65000;
+                }
+            }
+            else
+            {
+                m_uiHighExplosiveSheepTimer -= uiDiff;
+            }
+
+            return true;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_zelfanAI(pCreature);
+    }
+};
+
+void AddSC_boss_priestess_delrissa()
+{
+    Script* s;
+    s = new boss_priestess_delrissa();
+    s->RegisterSelf();
+    s = new npc_kagani_nightstrike();
+    s->RegisterSelf();
+    s = new npc_ellris_duskhallow();
+    s->RegisterSelf();
+    s = new npc_eramas_brightblaze();
+    s->RegisterSelf();
+    s = new npc_yazzai();
+    s->RegisterSelf();
+    s = new npc_warlord_salaris();
+    s->RegisterSelf();
+    s = new npc_garaxxas();
+    s->RegisterSelf();
+    s = new npc_apoko();
+    s->RegisterSelf();
+    s = new npc_zelfan();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_priestess_delrissa";
+    //pNewScript->GetAI = &GetAI_boss_priestess_delrissa;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kagani_nightstrike";
+    //pNewScript->GetAI = &GetAI_npc_kagani_nightstrike;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ellris_duskhallow";
+    //pNewScript->GetAI = &GetAI_npc_ellris_duskhallow;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_eramas_brightblaze";
+    //pNewScript->GetAI = &GetAI_npc_eramas_brightblaze;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_yazzai";
+    //pNewScript->GetAI = &GetAI_npc_yazzai;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_warlord_salaris";
+    //pNewScript->GetAI = &GetAI_npc_warlord_salaris;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_garaxxas";
+    //pNewScript->GetAI = &GetAI_npc_garaxxas;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_apoko";
+    //pNewScript->GetAI = &GetAI_npc_apoko;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_zelfan";
+    //pNewScript->GetAI = &GetAI_npc_zelfan;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp b/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
new file mode 100644
index 000000000..c079613af
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
@@ -0,0 +1,391 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Selin_Fireheart
+SD%Complete: 90
+SDComment: Timers.
+SDCategory: Magister's Terrace
+EndScriptData */
+
+#include "precompiled.h"
+#include "magisters_terrace.h"
+
+enum
+{
+    SAY_AGGRO                       = -1585000,
+    SAY_ENERGY                      = -1585001,
+    SAY_EMPOWERED                   = -1585002,
+    SAY_KILL_1                      = -1585003,
+    SAY_KILL_2                      = -1585004,
+    SAY_DEATH                       = -1585005,
+    EMOTE_CRYSTAL                   = -1585006,
+
+    // Selin's spells
+    SPELL_DRAIN_LIFE                = 44294,
+    SPELL_DRAIN_LIFE_H              = 46155,
+    SPELL_FEL_EXPLOSION             = 44314,
+    SPELL_DRAIN_MANA                = 46153,                // Heroic only
+    // SPELL_FEL_CRYSTAL_DUMMY       = 44329,               // used by Selin to select a nearby Crystal - not used in script
+    SPELL_MANA_RAGE                 = 44320,                // This spell triggers 44321, which changes scale and regens mana Requires an entry in spell_script_target
+
+    // Crystal spells and npcs
+    SPELL_FEL_CRYSTAL_COSMETIC      = 44374,                // cosmetic - used by the guys around Selin
+    SPELL_FEL_CRYSTAL_VISUAL        = 44355,                // cosmetic
+
+    NPC_HUSK                        = 24690,
+    NPC_SKULER                      = 24688,
+    NPC_BRUISER                     = 24689,
+};
+
+struct boss_selin_fireheart : public CreatureScript
+{
+    boss_selin_fireheart() : CreatureScript("boss_selin_fireheart") {}
+
+    struct boss_selin_fireheartAI : public ScriptedAI
+    {
+        boss_selin_fireheartAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiDrainLifeTimer;
+        uint32 m_uiDrainManaTimer;
+        uint32 m_uiFelExplosionTimer;
+        uint32 m_uiDrainCrystalTimer;
+        uint32 m_uiManaRageTimer;
+
+        bool m_bDrainingCrystal;
+
+        ObjectGuid m_crystalGuid;
+
+        void Reset() override
+        {
+            m_uiDrainLifeTimer = urand(3000, 7000);
+            m_uiDrainManaTimer = m_uiDrainLifeTimer + 5000;
+            m_uiFelExplosionTimer = 2100;
+            m_uiDrainCrystalTimer = m_bIsRegularMode ? urand(20000, 25000) : urand(10000, 15000);
+            m_uiManaRageTimer = 0;
+
+            m_bDrainingCrystal = false;
+        }
+
+        // Get the closest alive crystal for draining
+        bool DoSelectNearestCrystal()
+        {
+            // Wait to finish casting
+            if (m_creature->IsNonMeleeSpellCasted(false))
+            {
+                return false;
+            }
+
+            if (Creature* pCrystal = GetClosestCreatureWithEntry(m_creature, NPC_FEL_CRYSTAL, 60.0f))
+            {
+                m_crystalGuid = pCrystal->GetObjectGuid();
+                DoScriptText(SAY_ENERGY, m_creature);
+                DoScriptText(EMOTE_CRYSTAL, m_creature);
+                m_creature->InterruptNonMeleeSpells(false);
+
+                float fX, fY, fZ;
+                SetCombatMovement(false);
+                m_creature->GetContactPoint(pCrystal, fX, fY, fZ, INTERACTION_DISTANCE);
+                m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                m_bDrainingCrystal = true;
+
+                return true;
+            }
+
+            return false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SELIN, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SELIN, FAIL);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL_1 : SAY_KILL_2, m_creature);
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || !uiPointId)
+            {
+                return;
+            }
+
+            Creature* pCrystal = m_creature->GetMap()->GetCreature(m_crystalGuid);
+            if (pCrystal && pCrystal->IsAlive())
+            {
+                if (DoCastSpellIfCan(pCrystal, SPELL_MANA_RAGE) == CAST_OK)
+                {
+                    // Allow the crystal to be killed
+                    pCrystal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    m_uiManaRageTimer = 10000;
+                }
+            }
+            else
+            {
+                // Make an error message in case something weird happened here
+                script_error_log("Selin Fireheart unable to drain crystal as the crystal is either dead or deleted..");
+                m_bDrainingCrystal = false;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SELIN, DONE);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && (pSender->GetEntry() == NPC_FEL_CRYSTAL || pSender->GetEntry() == m_creature->GetEntry()))
+            {
+                m_bDrainingCrystal = false;
+                SetCombatMovement(true);
+                m_creature->GetMotionMaster()->Clear();
+                DoStartMovement(m_creature->getVictim());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (!m_bDrainingCrystal)
+            {
+                if (m_creature->GetPower(POWER_MANA) * 100 / m_creature->GetMaxPower(POWER_MANA) < 10)
+                {
+                    if (m_uiDrainLifeTimer < uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        {
+                            if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_DRAIN_LIFE : SPELL_DRAIN_LIFE_H) == CAST_OK)
+                            {
+                                m_uiDrainLifeTimer = 10000;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiDrainLifeTimer -= uiDiff;
+                    }
+
+                    // Heroic only
+                    if (!m_bIsRegularMode)
+                    {
+                        if (m_uiDrainManaTimer < uiDiff)
+                        {
+                            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_DRAIN_MANA, SELECT_FLAG_POWER_MANA))
+                            {
+                                if (DoCastSpellIfCan(pTarget, SPELL_DRAIN_MANA) == CAST_OK)
+                                {
+                                    m_uiDrainManaTimer = 10000;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            m_uiDrainManaTimer -= uiDiff;
+                        }
+                    }
+
+                    if (m_uiDrainCrystalTimer < uiDiff)
+                    {
+                        if (DoSelectNearestCrystal())
+                        {
+                            m_uiDrainCrystalTimer = m_bIsRegularMode ? urand(20000, 25000) : urand(10000, 15000);
+                        }
+                    }
+                    else
+                    {
+                        m_uiDrainCrystalTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiFelExplosionTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FEL_EXPLOSION) == CAST_OK)
+                    {
+                        m_uiFelExplosionTimer = 2000;
+                    }
+                }
+                else
+                {
+                    m_uiFelExplosionTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+            }
+            else
+            {
+                if (m_uiManaRageTimer)
+                {
+                    if (m_uiManaRageTimer <= uiDiff)
+                    {
+                        DoScriptText(SAY_EMPOWERED, m_creature);
+                        ReceiveAIEvent(AI_EVENT_CUSTOM_A, m_creature, m_creature, 0);
+
+                        // Kill the drained crystal
+                        Creature* pCrystalChosen = m_creature->GetMap()->GetCreature(m_crystalGuid);
+                        if (pCrystalChosen && pCrystalChosen->IsAlive())
+                        {
+                            pCrystalChosen->DealDamage(pCrystalChosen, pCrystalChosen->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                        }
+
+                        m_uiManaRageTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiManaRageTimer -= uiDiff;
+                    }
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_selin_fireheartAI(pCreature);
+    }
+};
+
+struct mob_fel_crystal : public CreatureScript
+{
+    mob_fel_crystal() : CreatureScript("mob_fel_crystal") {}
+
+    struct mob_fel_crystalAI : public ScriptedAI
+    {
+        mob_fel_crystalAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        GuidSet m_sWretchedGuids;
+
+        uint32 m_uiVisualTimer;
+
+        void Reset() override
+        {
+            m_uiVisualTimer = 1000;
+            m_sWretchedGuids.clear();
+        }
+
+        void AttackStart(Unit* /*pWho*/) override {}
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // Cosmetic spell
+            if (m_sWretchedGuids.find(pWho->GetObjectGuid()) == m_sWretchedGuids.end() && pWho->IsWithinDist(m_creature, 5.0f) && pWho->IsAlive() &&
+                (pWho->GetEntry() == NPC_SKULER || pWho->GetEntry() == NPC_BRUISER || pWho->GetEntry() == NPC_HUSK))
+            {
+                pWho->CastSpell(m_creature, SPELL_FEL_CRYSTAL_COSMETIC, false);
+                m_sWretchedGuids.insert(pWho->GetObjectGuid());
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)m_creature->GetInstanceData())
+            {
+                Creature* pSelin = pInstance->GetSingleCreatureFromStorage(NPC_SELIN_FIREHEART);
+                if (!pSelin || !pSelin->IsAlive())
+                {
+                    return;
+                }
+
+                // Mark Mana rage as completed
+                pSelin->InterruptNonMeleeSpells(false);
+                SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pSelin);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiVisualTimer)
+            {
+                if (m_uiVisualTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FEL_CRYSTAL_VISUAL) == CAST_OK)
+                    {
+                        m_uiVisualTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiVisualTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_fel_crystalAI(pCreature);
+    }
+};
+
+void AddSC_boss_selin_fireheart()
+{
+    Script* s;
+    s = new boss_selin_fireheart();
+    s->RegisterSelf();
+    s = new mob_fel_crystal();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_selin_fireheart";
+    //pNewScript->GetAI = &GetAI_boss_selin_fireheart;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_fel_crystal";
+    //pNewScript->GetAI = &GetAI_mob_fel_crystal;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp b/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp
new file mode 100644
index 000000000..5a5a7d4d9
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp
@@ -0,0 +1,289 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Vexallus
+SD%Complete: 90
+SDComment: Timers.
+SDCategory: Magister's Terrace
+EndScriptData */
+
+#include "precompiled.h"
+#include "magisters_terrace.h"
+#include "TemporarySummon.h"
+
+enum
+{
+    SAY_AGGRO                       = -1585007,
+    SAY_ENERGY                      = -1585008,
+    SAY_OVERLOAD                    = -1585009,
+    SAY_KILL                        = -1585010,
+    EMOTE_DISCHARGE_ENERGY          = -1585011,
+
+    // is this text for real?
+    //#define SAY_DEATH             "What...happen...ed."
+
+    // Pure energy spell info
+    SPELL_ENERGY_BOLT               = 46156,
+    SPELL_ENERGY_FEEDBACK           = 44335,
+    SPELL_ENERGY_PASSIVE            = 44326,
+
+    // Vexallus spell info
+    SPELL_CHAIN_LIGHTNING           = 44318,
+    SPELL_CHAIN_LIGHTNING_H         = 46380,                // heroic spell
+    SPELL_OVERLOAD                  = 44353,
+    SPELL_ARCANE_SHOCK              = 44319,
+    SPELL_ARCANE_SHOCK_H            = 46381,                // heroic spell
+
+    SPELL_SUMMON_PURE_ENERGY        = 44322,                // mod scale -10
+    SPELL_SUMMON_PURE_ENERGY1_H     = 46154,                // mod scale -5
+    SPELL_SUMMON_PURE_ENERGY2_H     = 46159,                // mod scale -5
+
+    // Creatures
+    NPC_PURE_ENERGY                 = 24745,
+};
+
+struct boss_vexallus : public CreatureScript
+{
+    boss_vexallus() : CreatureScript("boss_vexallus") {}
+
+    struct boss_vexallusAI : public ScriptedAI
+    {
+        boss_vexallusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiChainLightningTimer;
+        uint32 m_uiArcaneShockTimer;
+        uint32 m_uiOverloadTimer;
+        uint32 m_uiIntervalHealthAmount;
+        bool m_bEnraged;
+
+        void Reset() override
+        {
+            m_uiChainLightningTimer = 8000;
+            m_uiArcaneShockTimer = 5000;
+            m_uiOverloadTimer = 1200;
+            m_uiIntervalHealthAmount = 1;
+            m_bEnraged = false;
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_KILL, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VEXALLUS, FAIL);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VEXALLUS, DONE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VEXALLUS, IN_PROGRESS);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                pSummoned->GetMotionMaster()->MoveFollow(pTarget, 0.0f, 0.0f);
+            }
+
+            pSummoned->CastSpell(pSummoned, SPELL_ENERGY_PASSIVE, true, NULL, NULL, m_creature->GetObjectGuid());
+            pSummoned->CastSpell(pSummoned, SPELL_ENERGY_BOLT, true, NULL, NULL, m_creature->GetObjectGuid());
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (!m_bEnraged)
+            {
+                // Enrage at 20% hp
+                if (m_creature->GetHealthPercent() < 20.0f)
+                {
+                    m_bEnraged = true;
+                    return;
+                }
+
+                // used for check, when Vexallus cast adds 85%, 70%, 55%, 40%, 25%
+                if (m_creature->GetHealthPercent() <= float(100.0f - 15.0f * m_uiIntervalHealthAmount))
+                {
+                    DoScriptText(SAY_ENERGY, m_creature);
+                    DoScriptText(EMOTE_DISCHARGE_ENERGY, m_creature);
+                    ++m_uiIntervalHealthAmount;
+
+                    if (m_bIsRegularMode)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_PURE_ENERGY);
+                    }
+                    else
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_PURE_ENERGY1_H, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_PURE_ENERGY2_H, CAST_TRIGGERED);
+                    }
+                }
+
+                if (m_uiChainLightningTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_CHAIN_LIGHTNING : SPELL_CHAIN_LIGHTNING_H) == CAST_OK)
+                        {
+                            m_uiChainLightningTimer = 8000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiChainLightningTimer -= uiDiff;
+                }
+
+                if (m_uiArcaneShockTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_ARCANE_SHOCK : SPELL_ARCANE_SHOCK_H) == CAST_OK)
+                        {
+                            m_uiArcaneShockTimer = 8000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiArcaneShockTimer -= uiDiff;
+                }
+            }
+            else
+            {
+                if (m_uiOverloadTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_OVERLOAD) == CAST_OK)
+                    {
+                        m_uiOverloadTimer = 2000;
+                    }
+                }
+                else
+                {
+                    m_uiOverloadTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_vexallusAI(pCreature);
+    }
+};
+
+struct mob_pure_energy : public CreatureScript
+{
+    mob_pure_energy() : CreatureScript("mob_pure_energy") {}
+
+    struct mob_pure_energyAI : public ScriptedAI
+    {
+        mob_pure_energyAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            if (m_creature->IsTemporarySummon())
+            {
+                TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+                if (pTemporary->GetSummonerGuid().IsCreature())
+                {
+                    Creature* pVex = m_creature->GetMap()->GetCreature(pTemporary->GetSummonerGuid());
+
+                    if (!pVex || !pVex->IsAlive())
+                    {
+                        return;
+                    }
+
+                    if (Player* pPlayer = pKiller->GetCharmerOrOwnerPlayerOrPlayerItself())
+                    {
+                        pPlayer->CastSpell(pPlayer, SPELL_ENERGY_FEEDBACK, true, NULL, NULL, pVex->GetObjectGuid());
+                    }
+                }
+            }
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+        void AttackStart(Unit* /*pWho*/) override {}
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_pure_energyAI(pCreature);
+    }
+};
+
+void AddSC_boss_vexallus()
+{
+    Script* s;
+
+    s = new boss_vexallus();
+    s->RegisterSelf();
+    s = new mob_pure_energy();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_vexallus";
+    //pNewScript->GetAI = &GetAI_boss_vexallus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_pure_energy";
+    //pNewScript->GetAI = &GetAI_mob_pure_energy;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp b/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp
new file mode 100644
index 000000000..8eafc97e6
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp
@@ -0,0 +1,299 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Magisters_Terrace
+SD%Complete: 80
+SDComment:
+SDCategory: Magister's Terrace
+EndScriptData */
+
+#include "precompiled.h"
+#include "magisters_terrace.h"
+
+/*
+0  - Selin Fireheart
+1  - Vexallus
+2  - Priestess Delrissa
+3  - Kael'thas Sunstrider
+*/
+
+static const int32 aDelrissaAddDeath[MAX_DELRISSA_ADDS] = { -1585013, -1585014, -1585015, -1585016 };
+
+struct is_magisters_terrace : public InstanceScript
+{
+    is_magisters_terrace() : InstanceScript("instance_magisters_terrace") {}
+
+    class instance_magisters_terrace : public ScriptedInstance
+    {
+    public:
+        instance_magisters_terrace(Map* pMap) : ScriptedInstance(pMap),
+            m_uiDelrissaDeathCount(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_SELIN_FIREHEART:
+            case NPC_DELRISSA:
+            case NPC_KALECGOS_DRAGON:
+            case NPC_KAELTHAS:
+                // insert Delrissa adds here, for better handling
+            case NPC_KAGANI:
+            case NPC_ELLRYS:
+            case NPC_ERAMAS:
+            case NPC_YAZZAI:
+            case NPC_SALARIS:
+            case NPC_GARAXXAS:
+            case NPC_APOKO:
+            case NPC_ZELFAN:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_FEL_CRYSTAL:
+                m_lFelCrystalGuid.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_VEXALLUS_DOOR:
+                if (m_auiEncounter[TYPE_VEXALLUS] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_SELIN_DOOR:
+                if (m_auiEncounter[TYPE_SELIN] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_DELRISSA_DOOR:
+                if (m_auiEncounter[TYPE_DELRISSA] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_SELIN_ENCOUNTER_DOOR:
+            case GO_KAEL_DOOR:
+            case GO_ESCAPE_QUEL_DANAS:
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_KAGANI:
+            case NPC_ELLRYS:
+            case NPC_ERAMAS:
+            case NPC_YAZZAI:
+            case NPC_SALARIS:
+            case NPC_GARAXXAS:
+            case NPC_APOKO:
+            case NPC_ZELFAN:
+                ++m_uiDelrissaDeathCount;
+                if (m_uiDelrissaDeathCount == MAX_DELRISSA_ADDS)
+                {
+                    SetData(TYPE_DELRISSA, SPECIAL);
+                }
+                // yell on summoned death
+                if (Creature* pDelrissa = GetSingleCreatureFromStorage(NPC_DELRISSA))
+                {
+                    if (pDelrissa->IsAlive())
+                    {
+                        DoScriptText(aDelrissaAddDeath[m_uiDelrissaDeathCount - 1], pDelrissa);
+                    }
+                    else if (GetData(TYPE_DELRISSA) == SPECIAL)
+                    {
+                        SetData(TYPE_DELRISSA, DONE);
+                        pDelrissa->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+                    }
+                }
+                break;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_SELIN:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_SELIN_DOOR);
+                }
+                if (uiData == FAIL)
+                {
+                    // Reset crystals - respawn and kill is handled by creature linking
+                    for (GuidList::const_iterator itr = m_lFelCrystalGuid.begin(); itr != m_lFelCrystalGuid.end(); ++itr)
+                    {
+                        if (Creature* pTemp = instance->GetCreature(*itr))
+                        {
+                            if (!pTemp->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+                            {
+                                pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                            }
+
+                            if (pTemp->IsAlive())
+                            {
+                                pTemp->AI()->EnterEvadeMode();
+                            }
+                        }
+                    }
+                }
+                if (uiData == IN_PROGRESS)
+                {
+                    // Stop channeling when the fight starts
+                    for (GuidList::const_iterator itr = m_lFelCrystalGuid.begin(); itr != m_lFelCrystalGuid.end(); ++itr)
+                    {
+                        if (Creature* pTemp = instance->GetCreature(*itr))
+                        {
+                            pTemp->InterruptNonMeleeSpells(false);
+                        }
+                    }
+                }
+                DoUseDoorOrButton(GO_SELIN_ENCOUNTER_DOOR);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_VEXALLUS:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_VEXALLUS_DOOR);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_DELRISSA:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_DELRISSA_DOOR);
+                }
+                if (uiData == IN_PROGRESS)
+                {
+                    m_uiDelrissaDeathCount = 0;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_KAELTHAS:
+                DoUseDoorOrButton(GO_KAEL_DOOR);
+                if (uiData == DONE)
+                {
+                    DoToggleGameObjectFlags(GO_ESCAPE_QUEL_DANAS, GO_FLAG_NO_INTERACT, false);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiDelrissaDeathCount;
+
+        GuidList m_lFelCrystalGuid;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_magisters_terrace(pMap);
+    }
+};
+
+void AddSC_instance_magisters_terrace()
+{
+    Script* s;
+    s = new is_magisters_terrace();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_magisters_terrace";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_magisters_terrace;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp b/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp
new file mode 100644
index 000000000..451c3584c
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp
@@ -0,0 +1,163 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Magisters_Terrace
+SD%Complete: 100
+SDComment: Quest support: 11490(post-event)
+SDCategory: Magisters Terrace
+EndScriptData */
+
+/* ContentData
+npc_kalecgos
+EndContentData */
+
+#include "precompiled.h"
+#include "magisters_terrace.h"
+
+/*######
+## npc_kalecgos
+######*/
+
+enum
+{
+    SPELL_TRANSFORM_TO_KAEL     = 44670,
+    SPELL_ORB_KILL_CREDIT       = 46307,
+    NPC_KALECGOS                = 24848,                    // human form entry
+
+    MAP_ID_MAGISTER             = 585,
+};
+
+static const float afKaelLandPoint[4] = {200.36f, -270.77f, -8.73f, 0.01f};
+
+// This is friendly keal that appear after used Orb.
+// If we assume DB handle summon, summon appear somewhere outside the platform where Orb is
+struct npc_kalecgos : public CreatureScript
+{
+    npc_kalecgos() : CreatureScript("npc_kalecgos") {}
+
+    struct npc_kalecgosAI : public ScriptedAI
+    {
+        npc_kalecgosAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        uint32 m_uiTransformTimer;
+
+        void Reset() override
+        {
+            // Check the map id because the same creature entry is involved in other scripted event in other instance
+            if (m_creature->GetMapId() != MAP_ID_MAGISTER)
+                return;
+
+            m_uiTransformTimer = 0;
+
+            // Move the dragon to landing point
+            m_creature->GetMotionMaster()->MovePoint(1, afKaelLandPoint[0], afKaelLandPoint[1], afKaelLandPoint[2]);
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            if (uiPointId)
+            {
+                m_creature->SetLevitate(false);
+                m_creature->SetFacingTo(afKaelLandPoint[3]);
+                m_uiTransformTimer = MINUTE * IN_MILLISECONDS;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiTransformTimer)
+            {
+                if (m_uiTransformTimer <= uiDiff)
+                {
+                    // Transform and update entry, now ready for quest/read gossip
+                    if (DoCastSpellIfCan(m_creature, SPELL_TRANSFORM_TO_KAEL) == CAST_OK)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_ORB_KILL_CREDIT, CAST_TRIGGERED);
+                        m_creature->UpdateEntry(NPC_KALECGOS);
+
+                        m_uiTransformTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiTransformTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kalecgosAI(pCreature);
+    }
+};
+
+struct event_go_scrying_orb : public MapEventScript //TODO something with this mechanic, dropping the script
+{
+    event_go_scrying_orb() : MapEventScript("event_go_scrying_orb") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* /*pTarget*/, bool bIsStart) override
+    {
+        if (bIsStart && pSource->GetTypeId() == TYPEID_PLAYER)
+        {
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)((Player*)pSource)->GetInstanceData())
+            {
+                // Check if the Dragon is already spawned and don't allow it to spawn it multiple times
+                if (pInstance->GetSingleCreatureFromStorage(NPC_KALECGOS_DRAGON, true))
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+};
+
+void AddSC_magisters_terrace()
+{
+    Script* s;
+
+    s = new npc_kalecgos();
+    s->RegisterSelf();
+    s = new event_go_scrying_orb();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kalecgos";
+    //pNewScript->GetAI = &GetAI_npc_kalecgos;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_go_scrying_orb";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_go_scrying_orb;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.h b/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.h
new file mode 100644
index 000000000..b825a38a3
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.h
@@ -0,0 +1,67 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_MAGISTERS_TERRACE_H
+#define DEF_MAGISTERS_TERRACE_H
+
+enum
+{
+    MAX_ENCOUNTER               = 4,
+    MAX_DELRISSA_ADDS           = 4,
+
+    TYPE_SELIN                  = 0,
+    TYPE_VEXALLUS               = 1,
+    TYPE_DELRISSA               = 2,
+    TYPE_KAELTHAS               = 3,
+
+    NPC_SELIN_FIREHEART         = 24723,
+    NPC_DELRISSA                = 24560,
+    NPC_FEL_CRYSTAL             = 24722,
+    NPC_KALECGOS_DRAGON         = 24844,
+    NPC_KAELTHAS                = 24664,
+
+    // Delrissa adds
+    NPC_KAGANI                  = 24557,
+    NPC_ELLRYS                  = 24558,
+    NPC_ERAMAS                  = 24554,
+    NPC_YAZZAI                  = 24561,
+    NPC_SALARIS                 = 24559,
+    NPC_GARAXXAS                = 24555,
+    NPC_APOKO                   = 24553,
+    NPC_ZELFAN                  = 24556,
+
+    GO_VEXALLUS_DOOR            = 187896,
+    GO_SELIN_DOOR               = 187979,                   // SunwellRaid Gate 02
+    GO_DELRISSA_DOOR            = 187770,
+    GO_SELIN_ENCOUNTER_DOOR     = 188065,                   // Assembly Chamber Door
+
+    GO_KAEL_DOOR                = 188064,
+    // GO_KAEL_STATUE_LEFT       = 188165,                  // animation statues - they do not reset on fail
+    // GO_KAEL_STATUE_RIGHT      = 188166,
+    GO_ESCAPE_QUEL_DANAS        = 188173,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_anubrekhan.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_anubrekhan.cpp
new file mode 100644
index 000000000..abed889fe
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_anubrekhan.cpp
@@ -0,0 +1,281 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Anubrekhan
+ * SD%Complete: 95
+ * SDComment:   Intro text usage is not very clear. Requires additional research.
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    SAY_GREET                   = -1533000,
+    SAY_AGGRO1                  = -1533001,
+    SAY_AGGRO2                  = -1533002,
+    SAY_AGGRO3                  = -1533003,
+    SAY_TAUNT1                  = -1533004,
+    SAY_TAUNT2                  = -1533005,
+    SAY_TAUNT3                  = -1533006,
+    SAY_TAUNT4                  = -1533007,
+    SAY_SLAY                    = -1533008,
+
+    EMOTE_CRYPT_GUARD           = -1533153,
+    EMOTE_INSECT_SWARM          = -1533154,
+    EMOTE_CORPSE_SCARABS        = -1533155,
+
+    SPELL_IMPALE                = 28783,                    // May be wrong spell id. Causes more dmg than I expect
+    SPELL_LOCUSTSWARM           = 28785,                    // This is a self buff that triggers the dmg debuff
+
+    // spellId invalid
+    // SPELL_SUMMONGUARD         = 29508,                   // Summons 1 crypt guard at targeted location - spell doesn't exist in 3.x.x
+
+    SPELL_SELF_SPAWN_5          = 29105,                    // This spawns 5 corpse scarabs ontop of us (most likely the pPlayer casts this on death)
+    SPELL_SELF_SPAWN_10         = 28864,                    // This is used by the crypt guards when they die
+
+    NPC_CRYPT_GUARD             = 16573
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {SAY_GREET,   NPC_ANUB_REKHAN,  7000},
+    {SAY_TAUNT1,  NPC_ANUB_REKHAN,  13000},
+    {SAY_TAUNT2,  NPC_ANUB_REKHAN,  11000},
+    {SAY_TAUNT3,  NPC_ANUB_REKHAN,  10000},
+    {SAY_TAUNT4,  NPC_ANUB_REKHAN,  0},
+    {0, 0, 0}
+};
+
+static const float aCryptGuardLoc[4] = {3333.5f, -3475.9f, 287.1f, 3.17f};
+
+struct boss_anubrekhan : public CreatureScript
+{
+    boss_anubrekhan() : CreatureScript("boss_anubrekhan") {}
+
+    struct boss_anubrekhanAI : public ScriptedAI
+    {
+        boss_anubrekhanAI(Creature* pCreature) : ScriptedAI(pCreature),
+        m_introDialogue(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_introDialogue.InitializeDialogueHelper(m_pInstance);
+            m_bHasTaunted = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        DialogueHelper m_introDialogue;
+
+        uint32 m_uiImpaleTimer;
+        uint32 m_uiLocustSwarmTimer;
+        uint32 m_uiSummonTimer;
+        bool   m_bHasTaunted;
+
+        void Reset() override
+        {
+            m_uiImpaleTimer = 15000;
+            m_uiLocustSwarmTimer = 90000;
+            m_uiSummonTimer = 0;
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            // Force the player to spawn corpse scarabs via spell
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                pVictim->CastSpell(pVictim, SPELL_SELF_SPAWN_5, true, NULL, NULL, m_creature->GetObjectGuid());
+            }
+
+            if (urand(0, 4))
+            {
+                return;
+            }
+
+            DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(SAY_AGGRO1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_AGGRO2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_AGGRO3, m_creature);
+                break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ANUB_REKHAN, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ANUB_REKHAN, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ANUB_REKHAN, FAIL);
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasTaunted && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 110.0f) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                m_introDialogue.StartNextDialogueText(SAY_GREET);
+                m_bHasTaunted = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_CRYPT_GUARD)
+            {
+                DoScriptText(EMOTE_CRYPT_GUARD, pSummoned);
+            }
+
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void SummonedCreatureDespawn(Creature* pSummoned) override
+        {
+            // If creature despawns on out of combat, skip this
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (pSummoned->GetEntry() == NPC_CRYPT_GUARD)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_SELF_SPAWN_10, true, NULL, NULL, m_creature->GetObjectGuid());
+                DoScriptText(EMOTE_CORPSE_SCARABS, pSummoned);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            m_introDialogue.DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Impale
+            if (m_uiImpaleTimer < uiDiff)
+            {
+                // Cast Impale on a random target
+                // Do NOT cast it when we are afflicted by locust swarm
+                if (!m_creature->HasAura(SPELL_LOCUSTSWARM))
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        DoCastSpellIfCan(pTarget, SPELL_IMPALE);
+                    }
+                }
+
+                m_uiImpaleTimer = 15000;
+            }
+            else
+            {
+                m_uiImpaleTimer -= uiDiff;
+            }
+
+            // Locust Swarm
+            if (m_uiLocustSwarmTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_LOCUSTSWARM) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_INSECT_SWARM, m_creature);
+
+                    // Summon a crypt guard
+                    m_uiSummonTimer = 3000;
+                    m_uiLocustSwarmTimer = 100000;
+                }
+            }
+            else
+            {
+                m_uiLocustSwarmTimer -= uiDiff;
+            }
+
+            // Summon
+            if (m_uiSummonTimer)
+            {
+                if (m_uiSummonTimer <= uiDiff)
+                {
+                    // Workaround for the not existing spell
+                    m_creature->SummonCreature(NPC_CRYPT_GUARD, aCryptGuardLoc[0], aCryptGuardLoc[1], aCryptGuardLoc[2], aCryptGuardLoc[3], TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_uiSummonTimer = 0;
+                }
+                else
+                {
+                    m_uiSummonTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_anubrekhanAI(pCreature);
+    }
+};
+
+void AddSC_boss_anubrekhan()
+{
+    Script* s;
+    s = new boss_anubrekhan();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_anubrekhan";
+    //pNewScript->GetAI = &GetAI_boss_anubrekhan;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_faerlina.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_faerlina.cpp
new file mode 100644
index 000000000..72c442b2e
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_faerlina.cpp
@@ -0,0 +1,239 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Faerlina
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    SAY_GREET                   = -1533009,
+    SAY_AGGRO_1                 = -1533010,
+    SAY_AGGRO_2                 = -1533011,
+    SAY_AGGRO_3                 = -1533012,
+    SAY_AGGRO_4                 = -1533013,
+    SAY_SLAY_1                  = -1533014,
+    SAY_SLAY_2                  = -1533015,
+    SAY_DEATH                   = -1533016,
+
+    EMOTE_BOSS_GENERIC_FRENZY   = -1000005,
+
+    // SOUND_RANDOM_AGGRO       = 8955,                     // soundId containing the 4 aggro sounds, we not using this
+
+    SPELL_POSIONBOLT_VOLLEY     = 28796,
+    SPELL_ENRAGE                = 28798,
+    SPELL_RAIN_OF_FIRE          = 28794,
+    SPELL_WIDOWS_EMBRACE        = 28732,
+};
+
+struct boss_faerlina : public CreatureScript
+{
+    boss_faerlina() : CreatureScript("boss_faerlina") {}
+
+    struct boss_faerlinaAI : public ScriptedAI
+    {
+        boss_faerlinaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bHasTaunted = false;  //TODO check move it to Reset()
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiPoisonBoltVolleyTimer;
+        uint32 m_uiRainOfFireTimer;
+        uint32 m_uiEnrageTimer;
+        bool   m_bHasTaunted;
+
+        void Reset() override
+        {
+            m_uiPoisonBoltVolleyTimer = 8000;
+            m_uiRainOfFireTimer = 16000;
+            m_uiEnrageTimer = 60000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 3))
+            {
+            case 0:
+                DoScriptText(SAY_AGGRO_1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_AGGRO_2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_AGGRO_3, m_creature);
+                break;
+            case 3:
+                DoScriptText(SAY_AGGRO_4, m_creature);
+                break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FAERLINA, IN_PROGRESS);
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasTaunted && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 80.0f) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                DoScriptText(SAY_GREET, m_creature);
+                m_bHasTaunted = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FAERLINA, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FAERLINA, FAIL);
+            }
+        }
+
+        // Widow's Embrace prevents frenzy and poison bolt, if it removes frenzy, next frenzy is sceduled in 60s
+        // It is likely that this _should_ be handled with some dummy aura(s) - but couldn't find any
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpellEntry) override
+        {
+            // Check if we hit with Widow's Embrave
+            if (pSpellEntry->Id == SPELL_WIDOWS_EMBRACE)
+            {
+                //bool bIsFrenzyRemove = false;
+
+                // If we remove the Frenzy, the Enrage Timer is reseted to 60s
+                if (m_creature->HasAura(SPELL_ENRAGE))
+                {
+                    m_uiEnrageTimer = 60000;
+                    m_creature->RemoveAurasDueToSpell(SPELL_ENRAGE);
+
+                    //bIsFrenzyRemove = true;
+                }
+
+                // In any case we prevent Frenzy and Poison Bolt Volley for Widow's Embrace Duration (30s)
+                // We do this be setting the timers to at least bigger than 30s
+                m_uiEnrageTimer = std::max(m_uiEnrageTimer, (uint32)30000);
+                m_uiPoisonBoltVolleyTimer = std::max(m_uiPoisonBoltVolleyTimer, urand(33000, 38000));
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Poison Bolt Volley
+            if (m_uiPoisonBoltVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_POSIONBOLT_VOLLEY) == CAST_OK)
+                {
+                    m_uiPoisonBoltVolleyTimer = 11000;
+                }
+            }
+            else
+            {
+                m_uiPoisonBoltVolleyTimer -= uiDiff;
+            }
+
+            // Rain Of Fire
+            if (m_uiRainOfFireTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_RAIN_OF_FIRE) == CAST_OK)
+                    {
+                        m_uiRainOfFireTimer = 16000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiRainOfFireTimer -= uiDiff;
+            }
+
+            // Enrage Timer
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_BOSS_GENERIC_FRENZY, m_creature);
+                    m_uiEnrageTimer = 60000;
+                }
+            }
+            else
+            {
+                m_uiEnrageTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_faerlinaAI(pCreature);
+    }
+};
+
+void AddSC_boss_faerlina()
+{
+    Script* s;
+    s = new boss_faerlina();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_faerlina";
+    //pNewScript->GetAI = &GetAI_boss_faerlina;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_four_horsemen.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_four_horsemen.cpp
new file mode 100644
index 000000000..22a63505d
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_four_horsemen.cpp
@@ -0,0 +1,568 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Four_Horsemen
+ * SD%Complete: 80
+ * SDComment:   Lady Blaumeux, Thane Korthazz, Sir Zeliek, Alexandros Mograine; Berserk NYI.
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    // ***** Yells *****
+    // lady blaumeux
+    SAY_BLAU_AGGRO          = -1533044,
+    SAY_BLAU_SPECIAL        = -1533048,
+    SAY_BLAU_SLAY           = -1533049,
+    SAY_BLAU_DEATH          = -1533050,
+    // EMOTE_UNYIELDING_PAIN = -1533156,
+
+    // alexandros mograine
+    SAY_MORG_AGGRO1         = -1533065,
+    SAY_MORG_AGGRO2         = -1533066,
+    SAY_MORG_AGGRO3         = -1533067,
+    SAY_MORG_SLAY1          = -1533068,
+    SAY_MORG_SLAY2          = -1533069,
+    SAY_MORG_SPECIAL        = -1533070,
+    SAY_MORG_DEATH          = -1533074,
+
+    // thane korthazz
+    SAY_KORT_AGGRO          = -1533051,
+    SAY_KORT_SPECIAL        = -1533055,
+    SAY_KORT_SLAY           = -1533056,
+    SAY_KORT_DEATH          = -1533057,
+
+    // sir zeliek
+    SAY_ZELI_AGGRO          = -1533058,
+    SAY_ZELI_SPECIAL        = -1533062,
+    SAY_ZELI_SLAY           = -1533063,
+    SAY_ZELI_DEATH          = -1533064,
+    // EMOTE_CONDEMATION     = -1533157,
+
+    // ***** Spells *****
+    // all horsemen
+    SPELL_SHIELDWALL        = 29061,
+    SPELL_BESERK            = 26662,
+    // Note: Berserk should be applied once 100 marks are casted.
+
+    // lady blaumeux
+    SPELL_MARK_OF_BLAUMEUX  = 28833,
+    SPELL_VOID_ZONE         = 28863,
+    SPELL_SPIRIT_BLAUMEUX   = 28931,
+
+    // highlord mograine
+    SPELL_MARK_OF_MOGRAINE  = 28834,
+    SPELL_RIGHTEOUS_FIRE    = 28882,
+    SPELL_SPIRIT_MOGRAINE   = 28928,
+
+    // thane korthazz
+    SPELL_MARK_OF_KORTHAZZ  = 28832,
+    SPELL_METEOR            = 28884,
+    SPELL_SPIRIT_KORTHAZZ   = 28932,
+
+    // sir zeliek
+    SPELL_MARK_OF_ZELIEK    = 28835,
+    SPELL_HOLY_WRATH        = 28883,
+    SPELL_SPIRIT_ZELIEK     = 28934,
+};
+
+struct boss_lady_blaumeux : public CreatureScript
+{
+    boss_lady_blaumeux() : CreatureScript("boss_lady_blaumeux") {}
+
+    struct boss_lady_blaumeuxAI : public ScriptedAI
+    {
+        boss_lady_blaumeuxAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiMarkTimer;
+        uint32 m_uiVoidZoneTimer;
+        float m_fHealthCheck;
+
+        void Reset() override
+        {
+            m_uiMarkTimer = 20000;
+            m_uiVoidZoneTimer = 15000;
+            m_fHealthCheck = 50.0f;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_BLAU_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_BLAU_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_BLAU_DEATH, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_SPIRIT_BLAUMEUX, CAST_TRIGGERED);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, SPECIAL);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->GetHealthPercent() <= m_fHealthCheck)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHIELDWALL) == CAST_OK)
+                {
+                    m_fHealthCheck -= 30.0f;
+                }
+            }
+
+            if (m_uiMarkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MARK_OF_BLAUMEUX) == CAST_OK)
+                {
+                    m_uiMarkTimer = 12000;
+                }
+            }
+            else
+            {
+                m_uiMarkTimer -= uiDiff;
+            }
+
+            if (m_uiVoidZoneTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_VOID_ZONE) == CAST_OK)
+                {
+                    m_uiVoidZoneTimer = 15000;
+                }
+            }
+            else
+            {
+                m_uiVoidZoneTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_lady_blaumeuxAI(pCreature);
+    }
+};
+
+struct boss_alexandros_mograine : public CreatureScript
+{
+    boss_alexandros_mograine() : CreatureScript("boss_alexandros_mograine") {}
+
+    struct boss_alexandros_mograineAI : public ScriptedAI
+    {
+        boss_alexandros_mograineAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiMarkTimer;
+        uint32 m_uiRighteousFireTimer;
+        float m_fHealthCheck;
+
+        void Reset() override
+        {
+            m_uiMarkTimer = 20000;
+            m_uiRighteousFireTimer = 15000;
+            m_fHealthCheck = 50.0f;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(SAY_MORG_AGGRO1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_MORG_AGGRO2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_MORG_AGGRO3, m_creature);
+                break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_MORG_SLAY1 : SAY_MORG_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_MORG_DEATH, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_SPIRIT_MOGRAINE, CAST_TRIGGERED);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, SPECIAL);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->GetHealthPercent() <= m_fHealthCheck)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHIELDWALL) == CAST_OK)
+                {
+                    m_fHealthCheck -= 30.0f;
+                }
+            }
+
+            if (m_uiMarkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MARK_OF_MOGRAINE) == CAST_OK)
+                {
+                    m_uiMarkTimer = 12000;
+                }
+            }
+            else
+            {
+                m_uiMarkTimer -= uiDiff;
+            }
+
+            if (m_uiRighteousFireTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_RIGHTEOUS_FIRE) == CAST_OK)
+                {
+                    m_uiRighteousFireTimer = 15000;
+                }
+            }
+            else
+            {
+                m_uiRighteousFireTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_alexandros_mograineAI(pCreature);
+    }
+};
+
+struct boss_thane_korthazz : public CreatureScript
+{
+    boss_thane_korthazz() : CreatureScript("boss_thane_korthazz") {}
+
+    struct boss_thane_korthazzAI : public ScriptedAI
+    {
+        boss_thane_korthazzAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiMarkTimer;
+        uint32 m_uiMeteorTimer;
+        float m_fHealthCheck;
+
+        void Reset() override
+        {
+            m_uiMarkTimer = 20000;
+            m_uiMeteorTimer = 30000;
+            m_fHealthCheck = 50.0f;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_KORT_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_KORT_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_KORT_DEATH, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_SPIRIT_KORTHAZZ, CAST_TRIGGERED);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, SPECIAL);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->GetHealthPercent() <= m_fHealthCheck)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHIELDWALL) == CAST_OK)
+                {
+                    m_fHealthCheck -= 30.0f;
+                }
+            }
+
+            if (m_uiMarkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MARK_OF_KORTHAZZ) == CAST_OK)
+                {
+                    m_uiMarkTimer = 12000;
+                }
+            }
+            else
+            {
+                m_uiMarkTimer -= uiDiff;
+            }
+
+            if (m_uiMeteorTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_METEOR) == CAST_OK)
+                {
+                    m_uiMeteorTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiMeteorTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_thane_korthazzAI(pCreature);
+    }
+};
+
+struct boss_sir_zeliek : public CreatureScript
+{
+    boss_sir_zeliek() : CreatureScript("boss_sir_zeliek") {}
+
+    struct boss_sir_zeliekAI : public ScriptedAI
+    {
+        boss_sir_zeliekAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiMarkTimer;
+        uint32 m_uiHolyWrathTimer;
+        float m_fHealthCheck;
+
+        void Reset() override
+        {
+            m_uiMarkTimer = 20000;
+            m_uiHolyWrathTimer = 12000;
+            m_fHealthCheck = 50.0f;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_ZELI_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_ZELI_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_ZELI_DEATH, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_SPIRIT_ZELIEK, CAST_TRIGGERED);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, SPECIAL);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->GetHealthPercent() <= m_fHealthCheck)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHIELDWALL) == CAST_OK)
+                {
+                    m_fHealthCheck -= 30.0f;
+                }
+            }
+
+            if (m_uiMarkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MARK_OF_ZELIEK) == CAST_OK)
+                {
+                    m_uiMarkTimer = 12000;
+                }
+            }
+            else
+            {
+                m_uiMarkTimer -= uiDiff;
+            }
+
+            if (m_uiHolyWrathTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HOLY_WRATH) == CAST_OK)
+                {
+                    m_uiHolyWrathTimer = 15000;
+                }
+            }
+            else
+            {
+                m_uiHolyWrathTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_sir_zeliekAI(pCreature);
+    }
+};
+
+void AddSC_boss_four_horsemen()
+{
+    Script* s;
+    s = new boss_lady_blaumeux();
+    s->RegisterSelf();
+    s = new boss_alexandros_mograine();
+    s->RegisterSelf();
+    s = new boss_thane_korthazz();
+    s->RegisterSelf();
+    s = new boss_sir_zeliek();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_lady_blaumeux";
+    //pNewScript->GetAI = &GetAI_boss_lady_blaumeux;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_alexandros_mograine";
+    //pNewScript->GetAI = &GetAI_boss_alexandros_mograine;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_thane_korthazz";
+    //pNewScript->GetAI = &GetAI_boss_thane_korthazz;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_sir_zeliek";
+    //pNewScript->GetAI = &GetAI_boss_sir_zeliek;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_gluth.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_gluth.cpp
new file mode 100644
index 000000000..1a55351e4
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_gluth.cpp
@@ -0,0 +1,302 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Gluth
+ * SD%Complete: 95
+ * SDComment:   Gluth should turn around to face the victim when he devours a Zombie
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    EMOTE_ZOMBIE                    = -1533119,
+    EMOTE_BOSS_GENERIC_ENRAGED      = -1000006,
+    EMOTE_DECIMATE                  = -1533152,
+
+    SPELL_MORTALWOUND               = 25646,
+    SPELL_DECIMATE                  = 28374,
+    SPELL_ENRAGE                    = 28371,
+    SPELL_BERSERK                   = 26662,
+    SPELL_TERRIFYING_ROAR           = 29685,
+    // SPELL_SUMMON_ZOMBIE_CHOW      = 28216,               // removed from dbc: triggers 28217 every 6 secs
+    // SPELL_CALL_ALL_ZOMBIE_CHOW    = 29681,               // removed from dbc: triggers 29682
+    // SPELL_ZOMBIE_CHOW_SEARCH      = 28235,               // removed from dbc: triggers 28236 every 3 secs
+
+    NPC_ZOMBIE_CHOW                 = 16360,                // old vanilla summoning spell 28217
+
+    MAX_ZOMBIE_LOCATIONS            = 3,
+};
+
+static const float aZombieSummonLoc[MAX_ZOMBIE_LOCATIONS][3] =
+{
+    {3267.9f, -3172.1f, 297.42f},
+    {3253.2f, -3132.3f, 297.42f},
+    {3308.3f, -3185.8f, 297.42f},
+};
+
+struct boss_gluth : public CreatureScript
+{
+    boss_gluth() : CreatureScript("boss_gluth") {}
+
+    struct boss_gluthAI : public ScriptedAI
+    {
+        boss_gluthAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiMortalWoundTimer;
+        uint32 m_uiDecimateTimer;
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiRoarTimer;
+        uint32 m_uiSummonTimer;
+        uint32 m_uiZombieSearchTimer;
+
+        uint32 m_uiBerserkTimer;
+
+        GuidList m_lZombieChowGuidList;
+
+        void Reset() override
+        {
+            m_uiMortalWoundTimer = 10000;
+            m_uiDecimateTimer = 110000;
+            m_uiEnrageTimer = 25000;
+            m_uiSummonTimer = 6000;
+            m_uiRoarTimer = 15000;
+            m_uiZombieSearchTimer = 3000;
+
+            m_uiBerserkTimer = MINUTE * 8 * IN_MILLISECONDS;
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GLUTH, DONE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GLUTH, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            // Restore 5% hp when killing a zombie
+            if (pVictim->GetEntry() == NPC_ZOMBIE_CHOW)
+            {
+                DoScriptText(EMOTE_ZOMBIE, m_creature);
+                m_creature->SetHealth(m_creature->GetHealth() + m_creature->GetMaxHealth() * 0.05f);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GLUTH, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->GetMotionMaster()->MoveFollow(m_creature, ATTACK_DISTANCE, 0);
+            m_lZombieChowGuidList.push_back(pSummoned->GetObjectGuid());
+        }
+
+        void SummonedCreatureDespawn(Creature* pSummoned) override
+        {
+            m_lZombieChowGuidList.remove(pSummoned->GetObjectGuid());
+        }
+
+        // Replaces missing spell 29682
+        void DoCallAllZombieChow()
+        {
+            for (GuidList::const_iterator itr = m_lZombieChowGuidList.begin(); itr != m_lZombieChowGuidList.end(); ++itr)
+            {
+                if (Creature* pZombie = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pZombie->GetMotionMaster()->MoveFollow(m_creature, ATTACK_DISTANCE, 0);
+                }
+            }
+        }
+
+        // Replaces missing spell 28236
+        void DoSearchZombieChow()
+        {
+            for (GuidList::const_iterator itr = m_lZombieChowGuidList.begin(); itr != m_lZombieChowGuidList.end(); ++itr)
+            {
+                if (Creature* pZombie = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    if (!pZombie->IsAlive())
+                    {
+                        continue;
+                    }
+
+                    // Devour a Zombie
+                    if (pZombie->IsWithinDistInMap(m_creature, 15.0f))
+                    {
+                        m_creature->DealDamage(pZombie, pZombie->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiZombieSearchTimer < uiDiff)
+            {
+                DoSearchZombieChow();
+                m_uiZombieSearchTimer = 3000;
+            }
+            else
+            {
+                m_uiZombieSearchTimer -= uiDiff;
+            }
+
+            // Mortal Wound
+            if (m_uiMortalWoundTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MORTALWOUND) == CAST_OK)
+                {
+                    m_uiMortalWoundTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiMortalWoundTimer -= uiDiff;
+            }
+
+            // Decimate
+            if (m_uiDecimateTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DECIMATE) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_DECIMATE, m_creature);
+                    DoCallAllZombieChow();
+                    m_uiDecimateTimer = 100000;
+                }
+            }
+            else
+            {
+                m_uiDecimateTimer -= uiDiff;
+            }
+
+            // Enrage
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_BOSS_GENERIC_ENRAGED, m_creature);
+                    m_uiEnrageTimer = urand(20000, 30000);
+                }
+            }
+            else
+            {
+                m_uiEnrageTimer -= uiDiff;
+            }
+
+            // Terrifying Roar
+            if (m_uiRoarTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TERRIFYING_ROAR) == CAST_OK)
+                {
+                    m_uiRoarTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiRoarTimer -= uiDiff;
+            }
+
+            // Summon
+            if (m_uiSummonTimer < uiDiff)
+            {
+                uint8 uiPos1 = urand(0, MAX_ZOMBIE_LOCATIONS - 1);
+                m_creature->SummonCreature(NPC_ZOMBIE_CHOW, aZombieSummonLoc[uiPos1][0], aZombieSummonLoc[uiPos1][1], aZombieSummonLoc[uiPos1][2], 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                uint8 uiPos2 = (uiPos1 + urand(1, MAX_ZOMBIE_LOCATIONS - 1)) % MAX_ZOMBIE_LOCATIONS;
+                m_creature->SummonCreature(NPC_ZOMBIE_CHOW, aZombieSummonLoc[uiPos2][0], aZombieSummonLoc[uiPos2][1], aZombieSummonLoc[uiPos2][2], 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                m_uiSummonTimer = 6000;
+            }
+            else
+            {
+                m_uiSummonTimer -= uiDiff;
+            }
+
+            // Berserk
+            if (m_uiBerserkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                {
+                    m_uiBerserkTimer = MINUTE * 5 * IN_MILLISECONDS;
+                }
+            }
+            else
+            {
+                m_uiBerserkTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_gluthAI(pCreature);
+    }
+};
+
+void AddSC_boss_gluth()
+{
+    Script* s;
+    s = new boss_gluth();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_gluth";
+    //pNewScript->GetAI = &GetAI_boss_gluth;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_gothik.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_gothik.cpp
new file mode 100644
index 000000000..138e0bd65
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_gothik.cpp
@@ -0,0 +1,474 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Gothik
+ * SD%Complete: 95
+ * SDComment:   Prevent Gothik from turning and "in combat state" while on balcony
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    SAY_SPEECH_1                = -1533040,
+    SAY_SPEECH_2                = -1533140,
+    SAY_SPEECH_3                = -1533141,
+    SAY_SPEECH_4                = -1533142,
+
+    SAY_KILL                    = -1533041,
+    SAY_DEATH                   = -1533042,
+    SAY_TELEPORT                = -1533043,
+
+    EMOTE_TO_FRAY               = -1533138,
+    EMOTE_GATE                  = -1533139,
+
+    PHASE_SPEECH                = 0,
+    PHASE_BALCONY               = 1,
+    PHASE_STOP_SUMMONING        = 2,
+    PHASE_TELEPORTING           = 3,
+    PHASE_STOP_TELEPORTING      = 4,
+
+    // Right is right side from gothik (eastern)
+    SPELL_TELEPORT_RIGHT        = 28025,
+    SPELL_TELEPORT_LEFT         = 28026,
+
+    SPELL_HARVESTSOUL           = 28679,
+    SPELL_SHADOWBOLT            = 29317,
+};
+
+struct boss_gothik : public CreatureScript
+{
+    boss_gothik() : CreatureScript("boss_gothik") {}
+
+    struct boss_gothikAI : public ScriptedAI
+    {
+        boss_gothikAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            SetCombatMovement(false);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        GuidList m_lSummonedAddGuids;
+
+        uint8 m_uiPhase;
+        uint8 m_uiSpeech;
+
+        uint32 m_uiTraineeTimer;
+        uint32 m_uiDeathKnightTimer;
+        uint32 m_uiRiderTimer;
+        uint32 m_uiTeleportTimer;
+        uint32 m_uiShadowboltTimer;
+        uint32 m_uiHarvestSoulTimer;
+        uint32 m_uiPhaseTimer;
+        uint32 m_uiControlZoneTimer;
+        uint32 m_uiSpeechTimer;
+
+        void Reset() override
+        {
+            // Remove immunity
+            m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ALL, false);
+
+            m_uiPhase = PHASE_SPEECH;
+            m_uiSpeech = 1;
+
+            m_uiTraineeTimer = 24 * IN_MILLISECONDS;
+            m_uiDeathKnightTimer = 74 * IN_MILLISECONDS;
+            m_uiRiderTimer = 134 * IN_MILLISECONDS;
+            m_uiTeleportTimer = 20 * IN_MILLISECONDS;
+            m_uiShadowboltTimer = 2 * IN_MILLISECONDS;
+            m_uiHarvestSoulTimer = 2500;
+            m_uiPhaseTimer = 4 * MINUTE * IN_MILLISECONDS + 7 * IN_MILLISECONDS; // last summon at 4:04, next would be 4:09
+            m_uiControlZoneTimer = urand(120 * IN_MILLISECONDS, 150 * IN_MILLISECONDS);
+            m_uiSpeechTimer = 1 * IN_MILLISECONDS;
+
+            // Despawn Adds
+            for (GuidList::const_iterator itr = m_lSummonedAddGuids.begin(); itr != m_lSummonedAddGuids.end(); itr++)
+            {
+                if (Creature* pCreature = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pCreature->ForcedDespawn();
+                }
+            }
+
+            m_lSummonedAddGuids.clear();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            m_pInstance->SetData(TYPE_GOTHIK, IN_PROGRESS);
+
+            // Make immune
+            m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ALL, true);
+
+            m_pInstance->SetData(TYPE_SIGNAL_3, 0);    //Set trigger map and summon positions; Q: may be joined with IN_PROGRESS?
+        }
+
+        bool IsCentralDoorClosed()
+        {
+            return m_pInstance && m_pInstance->GetData(TYPE_GOTHIK) != SPECIAL;
+        }
+
+        void ProcessCentralDoor()
+        {
+            if (IsCentralDoorClosed())
+            {
+                m_pInstance->SetData(TYPE_GOTHIK, SPECIAL);
+                DoScriptText(EMOTE_GATE, m_creature);
+            }
+        }
+
+        bool HasPlayersInLeftSide()
+        {
+            return m_pInstance && bool(m_pInstance->GetData(TYPE_SIGNAL_4));
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoScriptText(SAY_KILL, m_creature);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GOTHIK, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GOTHIK, FAIL);
+            }
+        }
+
+        void SummonAdds(uint32 uiSummonEntry)
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SIGNAL_11, uiSummonEntry);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            m_lSummonedAddGuids.push_back(pSummoned->GetObjectGuid());
+            if (!IsCentralDoorClosed())
+            {
+                pSummoned->SetInCombatWithZone();
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (!m_pInstance)
+                return;
+
+            m_lSummonedAddGuids.remove(pSummoned->GetObjectGuid());
+
+            m_pInstance->SetData64(TYPE_SIGNAL_6, pSummoned->GetObjectGuid().GetRawValue());
+            if (Creature* pAnchor = m_pInstance->instance->GetCreature(ObjectGuid(m_pInstance->GetData64(TYPE_SIGNAL_6))))
+            {
+                switch (pSummoned->GetEntry())
+                {
+                    // Wrong caster, it expected to be pSummoned.
+                    // Mangos deletes the spell event at caster death, so for delayed spell like this
+                    // it's just a workaround. Does not affect other than the visual though (+ spell takes longer to "travel")
+                case NPC_UNREL_TRAINEE:
+                    m_creature->CastSpell(pAnchor, SPELL_A_TO_ANCHOR_1, true, NULL, NULL, pSummoned->GetObjectGuid());
+                    break;
+                case NPC_UNREL_DEATH_KNIGHT:
+                    m_creature->CastSpell(pAnchor, SPELL_B_TO_ANCHOR_1, true, NULL, NULL, pSummoned->GetObjectGuid());
+                    break;
+                case NPC_UNREL_RIDER:
+                    m_creature->CastSpell(pAnchor, SPELL_C_TO_ANCHOR_1, true, NULL, NULL, pSummoned->GetObjectGuid());
+                    break;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_SPEECH:
+                if (m_uiSpeechTimer < uiDiff)
+                {
+                    switch (m_uiSpeech)
+                    {
+                    case 1:
+                        DoScriptText(SAY_SPEECH_1, m_creature);
+                        m_uiSpeechTimer = 4 * IN_MILLISECONDS;
+                        break;
+                    case 2:
+                        DoScriptText(SAY_SPEECH_2, m_creature);
+                        m_uiSpeechTimer = 6 * IN_MILLISECONDS;
+                        break;
+                    case 3:
+                        DoScriptText(SAY_SPEECH_3, m_creature);
+                        m_uiSpeechTimer = 5 * IN_MILLISECONDS;
+                        break;
+                    case 4:
+                        DoScriptText(SAY_SPEECH_4, m_creature);
+                        m_uiPhase = PHASE_BALCONY;
+                        break;
+                    }
+                    m_uiSpeech++;
+                }
+                else
+                {
+                    m_uiSpeechTimer -= uiDiff;
+                }
+
+                // No break here
+
+            case PHASE_BALCONY:                            // Do summoning
+                if (m_uiTraineeTimer < uiDiff)
+                {
+                    SummonAdds(NPC_UNREL_TRAINEE);
+                    m_uiTraineeTimer = 20 * IN_MILLISECONDS;
+                }
+                else
+                {
+                    m_uiTraineeTimer -= uiDiff;
+                }
+                if (m_uiDeathKnightTimer < uiDiff)
+                {
+                    SummonAdds(NPC_UNREL_DEATH_KNIGHT);
+                    m_uiDeathKnightTimer = 25 * IN_MILLISECONDS;
+                }
+                else
+                {
+                    m_uiDeathKnightTimer -= uiDiff;
+                }
+                if (m_uiRiderTimer < uiDiff)
+                {
+                    SummonAdds(NPC_UNREL_RIDER);
+                    m_uiRiderTimer = 30 * IN_MILLISECONDS;
+                }
+                else
+                {
+                    m_uiRiderTimer -= uiDiff;
+                }
+
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    m_uiPhase = PHASE_STOP_SUMMONING;
+                    m_uiPhaseTimer = 27 * IN_MILLISECONDS;
+                }
+                else
+                {
+                    m_uiPhaseTimer -= uiDiff;
+                }
+
+                break;
+
+            case PHASE_STOP_SUMMONING:
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT_RIGHT, CAST_TRIGGERED) == CAST_OK)
+                    {
+                        m_uiPhase = m_pInstance ? PHASE_TELEPORTING : PHASE_STOP_TELEPORTING;
+
+                        DoScriptText(SAY_TELEPORT, m_creature);
+                        DoScriptText(EMOTE_TO_FRAY, m_creature);
+
+                        // Remove Immunity
+                        m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ALL, false);
+
+                        DoResetThreat();
+                        m_creature->SetInCombatWithZone();
+                    }
+                }
+                else
+                {
+                    m_uiPhaseTimer -= uiDiff;
+                }
+
+                break;
+
+            case PHASE_TELEPORTING:                         // Phase is only reached if m_pInstance is valid
+                if (m_uiTeleportTimer < uiDiff)
+                {
+                    m_pInstance->SetData64(TYPE_SIGNAL_7, m_creature->GetObjectGuid().GetRawValue());
+                    uint32 uiTeleportSpell = m_pInstance->GetData(TYPE_SIGNAL_7) ? SPELL_TELEPORT_LEFT : SPELL_TELEPORT_RIGHT;
+                    if (DoCastSpellIfCan(m_creature, uiTeleportSpell) == CAST_OK)
+                    {
+                        m_uiTeleportTimer = 20 * IN_MILLISECONDS;
+                        m_uiShadowboltTimer = 2 * IN_MILLISECONDS;
+                    }
+                }
+                else
+                {
+                    m_uiTeleportTimer -= uiDiff;
+                }
+
+                if (m_creature->GetHealthPercent() <= 30.0f)
+                {
+                    m_uiPhase = PHASE_STOP_TELEPORTING;
+                    ProcessCentralDoor();
+                    // as the doors now open, recheck whether mobs are standing around
+                    m_uiControlZoneTimer = 1;
+                }
+                // no break here
+
+            case PHASE_STOP_TELEPORTING:
+                if (m_uiHarvestSoulTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_HARVESTSOUL) == CAST_OK)
+                    {
+                        m_uiHarvestSoulTimer = 15 * IN_MILLISECONDS;
+                    }
+                }
+                else
+                {
+                    m_uiHarvestSoulTimer -= uiDiff;
+                }
+
+                if (m_uiShadowboltTimer)
+                {
+                    if (m_uiShadowboltTimer <= uiDiff)
+                    {
+                        m_uiShadowboltTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiShadowboltTimer -= uiDiff;
+                    }
+                }
+                // Shadowbold cooldown finished, cast when ready
+                else if (!m_creature->IsNonMeleeSpellCasted(true))
+                {
+                    // Select valid target
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0, SPELL_SHADOWBOLT, SELECT_FLAG_IN_LOS))
+                    {
+                        DoCastSpellIfCan(pTarget, SPELL_SHADOWBOLT);
+                    }
+                }
+
+                break;
+            }
+
+            // Control Check, if Death zone empty
+            if (m_uiControlZoneTimer)
+            {
+                if (m_uiControlZoneTimer <= uiDiff)
+                {
+                    m_uiControlZoneTimer = 0;
+
+                    if (m_pInstance && !HasPlayersInLeftSide())
+                    {
+                        ProcessCentralDoor();
+                        for (GuidList::const_iterator itr = m_lSummonedAddGuids.begin(); itr != m_lSummonedAddGuids.end(); itr++)
+                        {
+                            if (Creature* pCreature = m_pInstance->instance->GetCreature(*itr))
+                            {
+                                if (!pCreature->IsInCombat())
+                                {
+                                    pCreature->SetInCombatWithZone();
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiControlZoneTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_gothikAI(pCreature);
+    }
+};
+
+struct spell_anchor : public SpellScript
+{
+    spell_anchor() : SpellScript("spell_anchor") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiEffIndex != EFFECT_INDEX_0 || pCreatureTarget->GetEntry() != NPC_SUB_BOSS_TRIGGER)
+        {
+            return true;
+        }
+
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreatureTarget->ToCreature()->GetInstanceData();
+
+        if (!pInstance)
+        {
+            return true;
+        }
+        pInstance->SetData64(TYPE_SIGNAL_2, pCreatureTarget->GetObjectGuid().GetRawValue());
+        pInstance->SetData(TYPE_SIGNAL_2, uiSpellId);
+
+
+        return true;
+    }
+};
+
+void AddSC_boss_gothik()
+{
+    Script* s;
+    s = new boss_gothik();
+    s->RegisterSelf();
+    s = new spell_anchor();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_gothik";
+    //pNewScript->GetAI = &GetAI_boss_gothik;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "spell_anchor";
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_anchor;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_grobbulus.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_grobbulus.cpp
new file mode 100644
index 000000000..b01349139
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_grobbulus.cpp
@@ -0,0 +1,269 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Grobbulus
+ * SD%Complete: 80
+ * SDComment:   Timer need more care; Spells of Adds (Posion Cloud) need Mangos Fixes, and further handling
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+/**
+ * Spell 26590: Poison Cloud
+ * Spell 28157: Slime Spray
+ * Spell 28218: Fallout slime
+ * Spell 28169: Mutating Injection
+ * Spell 26527: Enrages
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    EMOTE_SPRAY_SLIME               = -1533021,
+    EMOTE_INJECTION                 = -1533158,
+
+    SPELL_SLIME_STREAM              = 28137,
+    SPELL_MUTATING_INJECTION        = 28169,
+    SPELL_POISON_CLOUD              = 28240,
+    SPELL_SLIME_SPRAY               = 28157,
+    SPELL_BERSERK                   = 26662,
+
+    NPC_FALLOUT_SLIME               = 16290
+};
+
+struct boss_grobbulus : public CreatureScript
+{
+    boss_grobbulus() : CreatureScript("boss_grobbulus") {}
+
+    struct boss_grobbulusAI : public ScriptedAI
+    {
+        boss_grobbulusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiInjectionTimer;
+        uint32 m_uiPoisonCloudTimer;
+        uint32 m_uiSlimeSprayTimer;
+        uint32 m_uiBerserkTimeSecs;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiSlimeStreamTimer;
+
+        void Reset() override
+        {
+            m_uiInjectionTimer = 12 * IN_MILLISECONDS;
+            m_uiPoisonCloudTimer = urand(20 * IN_MILLISECONDS, 25 * IN_MILLISECONDS);
+            m_uiSlimeSprayTimer = urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS);
+            m_uiBerserkTimeSecs = 12 * MINUTE;
+            m_uiBerserkTimer = m_uiBerserkTimeSecs * IN_MILLISECONDS;
+            m_uiSlimeStreamTimer = 5 * IN_MILLISECONDS;         // The first few secs it is ok to be out of range
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GROBBULUS, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GROBBULUS, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GROBBULUS, FAIL);
+            }
+        }
+
+        // This custom selecting function, because we only want to select players without mutagen aura
+        bool DoCastMutagenInjection()
+        {
+            if (m_creature->IsNonMeleeSpellCasted(true))
+            {
+                return false;
+            }
+
+            std::vector<Unit*> suitableTargets;
+            ThreatList const& threatList = m_creature->GetThreatManager().getThreatList();
+
+            for (ThreatList::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
+            {
+                if (Unit* pTarget = m_creature->GetMap()->GetUnit((*itr)->getUnitGuid()))
+                {
+                    if (pTarget->GetTypeId() == TYPEID_PLAYER && !pTarget->HasAura(SPELL_MUTATING_INJECTION))
+                    {
+                        suitableTargets.push_back(pTarget);
+                    }
+                }
+            }
+
+            if (suitableTargets.empty())
+            {
+                return false;
+            }
+
+            Unit* pTarget = suitableTargets[urand(0, suitableTargets.size() - 1)];
+            if (DoCastSpellIfCan(pTarget, SPELL_MUTATING_INJECTION) == CAST_OK)
+            {
+                DoScriptText(EMOTE_INJECTION, m_creature, pTarget);
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            if ((pSpell->Id == SPELL_SLIME_SPRAY) && pTarget->GetTypeId() == TYPEID_PLAYER)
+            {
+                m_creature->SummonCreature(NPC_FALLOUT_SLIME, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 10 * IN_MILLISECONDS);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Slime Stream
+            if (!m_uiSlimeStreamTimer)
+            {
+                if (!m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SLIME_STREAM) == CAST_OK)
+                        // Give some time, to re-reach grobbulus
+                    {
+                        m_uiSlimeStreamTimer = 3 * IN_MILLISECONDS;
+                    }
+                }
+            }
+            else
+            {
+                if (m_uiSlimeStreamTimer < uiDiff)
+                {
+                    m_uiSlimeStreamTimer = 0;
+                }
+                else
+                {
+                    m_uiSlimeStreamTimer -= uiDiff;
+                }
+            }
+
+            // Berserk
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            // SlimeSpray
+            if (m_uiSlimeSprayTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SLIME_SPRAY) == CAST_OK)
+                {
+                    m_uiSlimeSprayTimer = urand(30 * IN_MILLISECONDS, 60 * IN_MILLISECONDS);
+                    DoScriptText(EMOTE_SPRAY_SLIME, m_creature);
+                }
+            }
+            else
+            {
+                m_uiSlimeSprayTimer -= uiDiff;
+            }
+
+            // Mutagen Injection
+            if (m_uiInjectionTimer < uiDiff)
+            {
+                if (DoCastMutagenInjection())
+                {
+                    m_uiInjectionTimer = urand(10 * IN_MILLISECONDS, 13 * IN_MILLISECONDS) - 5 * (m_uiBerserkTimeSecs * IN_MILLISECONDS - m_uiBerserkTimer) / m_uiBerserkTimeSecs;
+                }
+            }
+            else
+            {
+                m_uiInjectionTimer -= uiDiff;
+            }
+
+            // Poison Cloud
+            if (m_uiPoisonCloudTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_POISON_CLOUD) == CAST_OK)
+                {
+                    m_uiPoisonCloudTimer = 15 * IN_MILLISECONDS;
+                }
+            }
+            else
+            {
+                m_uiPoisonCloudTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_grobbulusAI(pCreature);
+    }
+};
+
+void AddSC_boss_grobbulus()
+{
+    Script* s;
+    s = new boss_grobbulus();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_grobbulus";
+    //pNewScript->GetAI = &GetAI_boss_grobbulus;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_heigan.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_heigan.cpp
new file mode 100644
index 000000000..b26bc795a
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_heigan.cpp
@@ -0,0 +1,335 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Heigan
+ * SD%Complete: 80
+ * SDComment:   Missing poison inside the tunnel in phase 2
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    PHASE_GROUND            = 1,
+    PHASE_PLATFORM          = 2,
+
+    SAY_AGGRO1              = -1533109,
+    SAY_AGGRO2              = -1533110,
+    SAY_AGGRO3              = -1533111,
+    SAY_SLAY                = -1533112,
+    SAY_TAUNT1              = -1533113,
+    SAY_TAUNT2              = -1533114,
+    SAY_TAUNT3              = -1533115,
+    SAY_TAUNT4              = -1533117,
+    SAY_CHANNELING          = -1533116,
+    SAY_DEATH               = -1533118,
+    EMOTE_TELEPORT          = -1533136,
+    EMOTE_RETURN            = -1533137,
+
+    // Spells by boss
+    SPELL_DECREPIT_FEVER    = 29998,
+    SPELL_DISRUPTION        = 29310,
+    SPELL_TELEPORT          = 30211,
+    SPELL_PLAGUE_CLOUD      = 29350,
+    // SPELL_PLAGUE_WAVE_SLOW    = 29351,                // removed from dbc. activates the traps during phase 1; triggers spell 30116, 30117, 30118, 30119 each 10 secs
+    // SPELL_PLAGUE_WAVE_FAST    = 30114,                // removed from dbc. activates the traps during phase 2; triggers spell 30116, 30117, 30118, 30119 each 3 secs
+
+    MAX_PLAYERS_TELEPORT    = 3
+};
+
+static const float aTunnelLoc[4] = {2905.63f, -3769.96f, 273.62f, 3.13f};
+
+struct boss_heigan : public CreatureScript
+{
+    boss_heigan() : CreatureScript("boss_heigan") {}
+
+    struct boss_heiganAI : public ScriptedAI
+    {
+        boss_heiganAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+        uint8 m_uiPhaseEruption;
+
+        uint32 m_uiTeleportTimer;
+        uint32 m_uiFeverTimer;
+        uint32 m_uiDisruptionTimer;
+        uint32 m_uiEruptionTimer;
+        uint32 m_uiPhaseTimer;
+        uint32 m_uiTauntTimer;
+        uint32 m_uiStartChannelingTimer;
+
+        void ResetPhase()
+        {
+            m_uiPhaseEruption = 0;
+            m_uiFeverTimer = 4000;
+            m_uiEruptionTimer = m_uiPhase == PHASE_GROUND ? 15000 : 7500;
+            m_uiDisruptionTimer = 5000;
+            m_uiStartChannelingTimer = 1000;
+            m_uiPhaseTimer = m_uiPhase == PHASE_GROUND ? 90000 : 45000;
+            m_uiTeleportTimer = 60000;
+        }
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_GROUND;
+            m_uiTauntTimer = urand(20000, 60000);               // TODO, find information
+            ResetPhase();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(SAY_AGGRO1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_AGGRO2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_AGGRO3, m_creature);
+                break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HEIGAN, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HEIGAN, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HEIGAN, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiPhase == PHASE_GROUND)
+            {
+                // Teleport to platform
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_TELEPORT, m_creature);
+                        m_creature->GetMotionMaster()->MoveIdle();
+
+                        m_uiPhase = PHASE_PLATFORM;
+                        ResetPhase();
+                        return;
+                    }
+                }
+                else
+                {
+                    m_uiPhaseTimer -= uiDiff;
+                }
+
+                // Fever
+                if (m_uiFeverTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_DECREPIT_FEVER);
+                    m_uiFeverTimer = 21000;
+                }
+                else
+                {
+                    m_uiFeverTimer -= uiDiff;
+                }
+
+                // Disruption
+                if (m_uiDisruptionTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_DISRUPTION);
+                    m_uiDisruptionTimer = 10000;
+                }
+                else
+                {
+                    m_uiDisruptionTimer -= uiDiff;
+                }
+
+                if (m_uiTeleportTimer < uiDiff)
+                {
+                    float fX, fY, fZ;
+                    // Teleport players in the tunnel
+                    for (uint8 i = 0; i < MAX_PLAYERS_TELEPORT; i++)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, uint32(0), SELECT_FLAG_PLAYER))
+                        {
+                            m_creature->GetRandomPoint(aTunnelLoc[0], aTunnelLoc[1], aTunnelLoc[2], 5.0f, fX, fY, fZ);
+                            pTarget->NearTeleportTo(fX, fY, fZ, aTunnelLoc[3]);
+                        }
+                    }
+
+                    m_uiTeleportTimer = 70000;
+                }
+                else
+                {
+                    m_uiTeleportTimer -= uiDiff;
+                }
+
+            }
+            else                                                // Platform Phase
+            {
+                if (m_uiPhaseTimer <= uiDiff)                   // Return to fight
+                {
+                    m_creature->InterruptNonMeleeSpells(true);
+                    DoScriptText(EMOTE_RETURN, m_creature);
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+
+                    m_uiPhase = PHASE_GROUND;
+                    ResetPhase();
+                    return;
+                }
+                else
+                {
+                    m_uiPhaseTimer -= uiDiff;
+                }
+
+                if (m_uiStartChannelingTimer)
+                {
+                    if (m_uiStartChannelingTimer <= uiDiff)
+                    {
+                        DoScriptText(SAY_CHANNELING, m_creature);
+                        DoCastSpellIfCan(m_creature, SPELL_PLAGUE_CLOUD);
+
+                        // ToDo: fill the tunnel with poison - required further research
+                        m_uiStartChannelingTimer = 0;           // no more
+                    }
+                    else
+                    {
+                        m_uiStartChannelingTimer -= uiDiff;
+                    }
+                }
+            }
+
+            // Taunt
+            if (m_uiTauntTimer < uiDiff)
+            {
+                switch (urand(0, 3))
+                {
+                case 0:
+                    DoScriptText(SAY_TAUNT1, m_creature);
+                    break;
+                case 1:
+                    DoScriptText(SAY_TAUNT2, m_creature);
+                    break;
+                case 2:
+                    DoScriptText(SAY_TAUNT3, m_creature);
+                    break;
+                case 3:
+                    DoScriptText(SAY_TAUNT4, m_creature);
+                    break;
+                }
+                m_uiTauntTimer = urand(20000, 70000);
+            }
+            else
+            {
+                m_uiTauntTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+
+            // Handling of the erruptions, this is not related to melee attack or spell-casting
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // Eruption
+            if (m_uiEruptionTimer < uiDiff)
+            {
+                for (uint8 uiArea = 0; uiArea < MAX_HEIGAN_TRAP_AREAS; ++uiArea)
+                {
+                    // Actually this is correct :P
+                    if (uiArea == (m_uiPhaseEruption % 6) || uiArea == 6 - (m_uiPhaseEruption % 6))
+                    {
+                        continue;
+                    }
+
+                    m_pInstance->SetData64(TYPE_SIGNAL_8, m_creature->GetObjectGuid().GetRawValue());
+                    m_pInstance->SetData(TYPE_SIGNAL_8, uiArea);
+                    //m_pInstance->DoTriggerHeiganTraps(m_creature, uiArea);
+                }
+
+                m_uiEruptionTimer = m_uiPhase == PHASE_GROUND ? 10000 : 3000;
+                ++m_uiPhaseEruption;
+            }
+            else
+            {
+                m_uiEruptionTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature)
+    {
+        return new boss_heiganAI(pCreature);
+    }
+};
+
+void AddSC_boss_heigan()
+{
+    Script* s;
+    s = new boss_heigan();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_heigan";
+    //pNewScript->GetAI = &GetAI_boss_heigan;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_kelthuzad.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_kelthuzad.cpp
new file mode 100644
index 000000000..c1b4721ab
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_kelthuzad.cpp
@@ -0,0 +1,676 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_KelThuzad
+ * SD%Complete: 75
+ * SDComment:   Timers will need adjustments, along with tweaking positions and amounts
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+/**
+ * Notes
+ *
+ * - will intro mobs, not sent to center, despawn when phase 2 start?
+ * - what happens if raid fail, can they start the event as soon after as they want?
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    SAY_SUMMON_MINIONS                  = -1533105,         // start of phase 1
+
+    EMOTE_PHASE2                        = -1533135,         // start of phase 2
+    SAY_AGGRO1                          = -1533094,
+    SAY_AGGRO2                          = -1533095,
+    SAY_AGGRO3                          = -1533096,
+
+    SAY_SLAY1                           = -1533097,
+    SAY_SLAY2                           = -1533098,
+
+    SAY_DEATH                           = -1533099,
+
+    SAY_CHAIN1                          = -1533100,
+    SAY_CHAIN2                          = -1533101,
+    SAY_FROST_BLAST                     = -1533102,
+
+    SAY_REQUEST_AID                     = -1533103,         // start of phase 3
+    SAY_ANSWER_REQUEST                  = -1533104,         // lich king answer
+
+    SAY_SPECIAL1_MANA_DET               = -1533106,
+    SAY_SPECIAL3_MANA_DET               = -1533107,
+    SAY_SPECIAL2_DISPELL                = -1533108,
+
+    EMOTE_GUARDIAN                      = -1533134,         // at each guardian summon
+
+    // spells to be casted
+    SPELL_FROST_BOLT                    = 28478,
+    SPELL_FROST_BOLT_NOVA               = 28479,
+
+    SPELL_CHAINS_OF_KELTHUZAD           = 28408,            // 3.x, heroic only
+    SPELL_CHAINS_OF_KELTHUZAD_TARGET    = 28410,
+
+    SPELL_MANA_DETONATION               = 27819,
+    SPELL_SHADOW_FISSURE                = 27810,
+    SPELL_FROST_BLAST                   = 27808,
+
+    SPELL_CHANNEL_VISUAL                = 29423,
+
+    MAX_SOLDIER_COUNT                   = 71,
+    MAX_ABOMINATION_COUNT               = 8,
+    MAX_BANSHEE_COUNT                   = 8,
+};
+
+static float M_F_ANGLE = 0.2f;                              // to adjust for map rotation
+static float M_F_HEIGHT = 2.0f;                             // adjust for height difference
+static float M_F_RANGE = 55.0f;                             // ~ range from center of chamber to center of alcove
+
+enum Phase
+{
+    PHASE_INTRO,
+    PHASE_NORMAL,
+    PHASE_GUARDIANS,
+};
+
+struct boss_kelthuzad : public CreatureScript
+{
+    boss_kelthuzad() : CreatureScript("boss_kelthuzad") {}
+
+    struct boss_kelthuzadAI : public ScriptedAI
+    {
+        boss_kelthuzadAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+            m_uiGuardiansCountMax = 4;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiGuardiansCount;
+        uint32 m_uiGuardiansCountMax;
+        uint32 m_uiGuardiansTimer;
+        uint32 m_uiLichKingAnswerTimer;
+        uint32 m_uiFrostBoltTimer;
+        uint32 m_uiFrostBoltNovaTimer;
+        uint32 m_uiChainsTimer;
+        uint32 m_uiManaDetonationTimer;
+        uint32 m_uiShadowFissureTimer;
+        uint32 m_uiFrostBlastTimer;
+
+        uint32 m_uiPhase1Timer;
+        uint32 m_uiSoldierTimer;
+        uint32 m_uiBansheeTimer;
+        uint32 m_uiAbominationTimer;
+        uint8  m_uiPhase;
+        uint32 m_uiSoldierCount;
+        uint32 m_uiBansheeCount;
+        uint32 m_uiAbominationCount;
+        uint32 m_uiSummonIntroTimer;
+        uint32 m_uiIntroPackCount;
+
+        GuidSet m_lIntroMobsSet;
+        GuidSet m_lAddsSet;
+
+        void Reset() override
+        {
+            m_uiFrostBoltTimer = urand(1000, 60000);       // It won't be more than a minute without cast it
+            m_uiFrostBoltNovaTimer = 15000;                    // Cast every 15 seconds
+            m_uiChainsTimer = urand(30000, 60000);      // Cast no sooner than once every 30 seconds
+            m_uiManaDetonationTimer = 20000;                    // Seems to cast about every 20 seconds
+            m_uiShadowFissureTimer = 25000;                    // 25 seconds
+            m_uiFrostBlastTimer = urand(30000, 60000);      // Random time between 30-60 seconds
+            m_uiGuardiansTimer = 5000;                     // 5 seconds for summoning each Guardian of Icecrown in phase 3
+            m_uiLichKingAnswerTimer = 4000;
+            m_uiGuardiansCount = 0;
+            m_uiSummonIntroTimer = 0;
+            m_uiIntroPackCount = 0;
+
+            m_uiPhase1Timer = 228000;                   // Phase 1 lasts "3 minutes and 48 seconds"
+            m_uiSoldierTimer = 5000;
+            m_uiBansheeTimer = 5000;
+            m_uiAbominationTimer = 5000;
+            m_uiSoldierCount = 0;
+            m_uiBansheeCount = 0;
+            m_uiAbominationCount = 0;
+            m_uiPhase = PHASE_INTRO;
+
+            // it may be some spell should be used instead, to control the intro phase
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+            SetCombatMovement(false);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            if (urand(0, 1))
+            {
+                DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+            DespawnAdds();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KELTHUZAD, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            DespawnIntroCreatures();
+            DespawnAdds();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KELTHUZAD, NOT_STARTED);
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_pInstance && m_pInstance->GetData(TYPE_KELTHUZAD) != IN_PROGRESS)
+            {
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void DespawnIntroCreatures()
+        {
+            if (m_pInstance)
+            {
+                for (GuidSet::const_iterator itr = m_lIntroMobsSet.begin(); itr != m_lIntroMobsSet.end(); ++itr)
+                {
+                    if (Creature* pCreature = m_pInstance->instance->GetCreature(*itr))
+                    {
+                        pCreature->ForcedDespawn();
+                    }
+                }
+            }
+
+            m_lIntroMobsSet.clear();
+        }
+
+        void DespawnAdds()
+        {
+            if (m_pInstance)
+            {
+                for (GuidSet::const_iterator itr = m_lAddsSet.begin(); itr != m_lAddsSet.end(); ++itr)
+                {
+                    if (Creature* pCreature = m_pInstance->instance->GetCreature(*itr))
+                    {
+                        if (pCreature->IsAlive())
+                        {
+                            pCreature->AI()->EnterEvadeMode();
+                            pCreature->ForcedDespawn(15000);
+                        }
+                    }
+                }
+            }
+
+            m_lAddsSet.clear();
+        }
+
+        float GetLocationAngle(uint32 uiId)
+        {
+            switch (uiId)
+            {
+            case 1:
+                return M_PI_F - M_F_ANGLE;              // south
+            case 2:
+                return M_PI_F / 2 * 3 - M_F_ANGLE;      // east
+            case 3:
+                return M_PI_F / 2 - M_F_ANGLE;          // west
+            case 4:
+                return M_PI_F / 4 - M_F_ANGLE;          // north-west
+            case 5:
+                return M_PI_F / 4 * 7 - M_F_ANGLE;      // north-east
+            case 6:
+                return M_PI_F / 4 * 5 - M_F_ANGLE;      // south-east
+            case 7:
+                return M_PI_F / 4 * 3 - M_F_ANGLE;      // south-west
+            }
+
+            return M_F_ANGLE;
+        }
+
+        void SummonIntroCreatures(uint32 packId)
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            float fAngle = GetLocationAngle(packId + 1);
+
+            float fX, fY, fZ;
+            if (AreaTriggerEntry const *at = sAreaTriggerStore.LookupEntry(m_pInstance->GetData(TYPE_SIGNAL_1)))
+            {
+                fX = at->x;
+                fY = at->y;
+                fZ = at->z;
+            }
+
+            fX += M_F_RANGE * cos(fAngle);
+            fY += M_F_RANGE * sin(fAngle);
+            fZ += M_F_HEIGHT;
+
+            MaNGOS::NormalizeMapCoord(fX);
+            MaNGOS::NormalizeMapCoord(fY);
+
+            uint32 uiNpcEntry = NPC_SOUL_WEAVER;
+
+            for (uint8 uiI = 0; uiI < 14; ++uiI)
+            {
+                if (uiI > 0)
+                {
+                    if (uiI < 4)
+                    {
+                        uiNpcEntry = NPC_UNSTOPPABLE_ABOM;
+                    }
+                    else
+                    {
+                        uiNpcEntry = NPC_SOLDIER_FROZEN;
+                    }
+                }
+
+                float fNewX, fNewY, fNewZ;
+                m_creature->GetRandomPoint(fX, fY, fZ, 12.0f, fNewX, fNewY, fNewZ);
+
+                m_creature->SummonCreature(uiNpcEntry, fNewX, fNewY, fNewZ, fAngle + M_PI_F, TEMPSUMMON_CORPSE_DESPAWN, 5000);
+            }
+        }
+
+        void SummonMob(uint32 uiType)
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            float fAngle = GetLocationAngle(urand(1, 7));
+
+            float fX, fY, fZ;
+            if (AreaTriggerEntry const *at = sAreaTriggerStore.LookupEntry(m_pInstance->GetData(TYPE_SIGNAL_1)))
+            {
+                fX = at->x;
+                fY = at->y;
+                fZ = at->z;
+            }
+
+            fX += M_F_RANGE * cos(fAngle);
+            fY += M_F_RANGE * sin(fAngle);
+            fZ += M_F_HEIGHT;
+
+            MaNGOS::NormalizeMapCoord(fX);
+            MaNGOS::NormalizeMapCoord(fY);
+
+            m_creature->SummonCreature(uiType, fX, fY, fZ, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 5000);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_GUARDIAN:
+                DoScriptText(EMOTE_GUARDIAN, m_creature);
+
+                m_lAddsSet.insert(pSummoned->GetObjectGuid());
+                ++m_uiGuardiansCount;
+
+                pSummoned->SetInCombatWithZone();
+                break;
+            case NPC_SOLDIER_FROZEN:
+            case NPC_UNSTOPPABLE_ABOM:
+            case NPC_SOUL_WEAVER:
+                if (m_uiIntroPackCount < 7)
+                {
+                    m_lIntroMobsSet.insert(pSummoned->GetObjectGuid());
+                }
+                else
+                {
+                    m_lAddsSet.insert(pSummoned->GetObjectGuid());
+
+                    if (m_pInstance)
+                    {
+                        uint32 atID = m_pInstance->GetData(TYPE_SIGNAL_1);
+                        if (AreaTriggerEntry const *at = sAreaTriggerStore.LookupEntry(atID))
+                        {
+                            pSummoned->GetMotionMaster()->MovePoint(0, at->x, at->y, at->z);
+                        }
+                    }
+                }
+
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_GUARDIAN:
+            case NPC_SOLDIER_FROZEN:
+            case NPC_SOUL_WEAVER:
+                m_lAddsSet.erase(pSummoned->GetObjectGuid());
+                break;
+            case NPC_UNSTOPPABLE_ABOM:
+                m_lAddsSet.erase(pSummoned->GetObjectGuid());
+                break;
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType == POINT_MOTION_TYPE && uiPointId == 0)
+            {
+                pSummoned->SetInCombatWithZone();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (!m_pInstance || m_pInstance->GetData(TYPE_KELTHUZAD) != IN_PROGRESS)
+            {
+                return;
+            }
+
+            if (m_uiPhase == PHASE_INTRO)
+            {
+                if (m_uiIntroPackCount < 7)
+                {
+                    if (m_uiSummonIntroTimer < uiDiff)
+                    {
+                        if (!m_uiIntroPackCount)
+                        {
+                            DoScriptText(SAY_SUMMON_MINIONS, m_creature);
+                        }
+
+                        SummonIntroCreatures(m_uiIntroPackCount);
+                        ++m_uiIntroPackCount;
+                        m_uiSummonIntroTimer = 2000;
+                    }
+                    else
+                    {
+                        m_uiSummonIntroTimer -= uiDiff;
+                    }
+                }
+                else
+                {
+                    if (m_uiPhase1Timer < uiDiff)
+                    {
+                        m_uiPhase = PHASE_NORMAL;
+                        DespawnIntroCreatures();
+
+                        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                        SetCombatMovement(true);
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+
+                        DoScriptText(EMOTE_PHASE2, m_creature);
+
+                        switch (urand(0, 2))
+                        {
+                        case 0:
+                            DoScriptText(SAY_AGGRO1, m_creature);
+                            break;
+                        case 1:
+                            DoScriptText(SAY_AGGRO2, m_creature);
+                            break;
+                        case 2:
+                            DoScriptText(SAY_AGGRO3, m_creature);
+                            break;
+                        };
+                    }
+                    else
+                    {
+                        m_uiPhase1Timer -= uiDiff;
+                    }
+
+                    if (m_uiSoldierCount < MAX_SOLDIER_COUNT)
+                    {
+                        if (m_uiSoldierTimer < uiDiff)
+                        {
+                            SummonMob(NPC_SOLDIER_FROZEN);
+                            ++m_uiSoldierCount;
+                            m_uiSoldierTimer = 3000;
+                        }
+                        else
+                        {
+                            m_uiSoldierTimer -= uiDiff;
+                        }
+                    }
+
+                    if (m_uiAbominationCount < MAX_ABOMINATION_COUNT)
+                    {
+                        if (m_uiAbominationTimer < uiDiff)
+                        {
+                            SummonMob(NPC_UNSTOPPABLE_ABOM);
+                            ++m_uiAbominationCount;
+                            m_uiAbominationTimer = 25000;
+                        }
+                        else
+                        {
+                            m_uiAbominationTimer -= uiDiff;
+                        }
+                    }
+
+                    if (m_uiBansheeCount < MAX_BANSHEE_COUNT)
+                    {
+                        if (m_uiBansheeTimer < uiDiff)
+                        {
+                            SummonMob(NPC_SOUL_WEAVER);
+                            ++m_uiBansheeCount;
+                            m_uiBansheeTimer = 25000;
+                        }
+                        else
+                        {
+                            m_uiBansheeTimer -= uiDiff;
+                        }
+                    }
+                }
+            }
+            else // normal or guardian phase
+            {
+                if (m_uiFrostBoltTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROST_BOLT) == CAST_OK)
+                    {
+                        m_uiFrostBoltTimer = urand(1000, 60000);
+                    }
+                }
+                else
+                {
+                    m_uiFrostBoltTimer -= uiDiff;
+                }
+
+                if (m_uiFrostBoltNovaTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROST_BOLT_NOVA) == CAST_OK)
+                    {
+                        m_uiFrostBoltNovaTimer = 15000;
+                    }
+                }
+                else
+                {
+                    m_uiFrostBoltNovaTimer -= uiDiff;
+                }
+
+                if (m_uiManaDetonationTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_MANA_DETONATION, SELECT_FLAG_PLAYER | SELECT_FLAG_POWER_MANA))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_MANA_DETONATION) == CAST_OK)
+                        {
+                            if (urand(0, 1))
+                            {
+                                DoScriptText(SAY_SPECIAL1_MANA_DET, m_creature);
+                            }
+
+                            m_uiManaDetonationTimer = 20000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiManaDetonationTimer -= uiDiff;
+                }
+
+                if (m_uiShadowFissureTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_FISSURE) == CAST_OK)
+                        {
+                            if (urand(0, 1))
+                            {
+                                DoScriptText(SAY_SPECIAL3_MANA_DET, m_creature);
+                            }
+
+                            m_uiShadowFissureTimer = 25000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiShadowFissureTimer -= uiDiff;
+                }
+
+                if (m_uiFrostBlastTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROST_BLAST) == CAST_OK)
+                    {
+                        if (urand(0, 1))
+                        {
+                            DoScriptText(SAY_FROST_BLAST, m_creature);
+                        }
+
+                        m_uiFrostBlastTimer = urand(30000, 60000);
+                    }
+                }
+                else
+                {
+                    m_uiFrostBlastTimer -= uiDiff;
+                }
+
+                if (m_uiChainsTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CHAINS_OF_KELTHUZAD) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_CHAIN1 : SAY_CHAIN2, m_creature);
+
+                        m_uiChainsTimer = urand(30000, 60000);
+                    }
+                }
+                else
+                {
+                    m_uiChainsTimer -= uiDiff;
+                }
+
+                if (m_uiPhase == PHASE_NORMAL)
+                {
+                    if (m_creature->GetHealthPercent() < 45.0f)
+                    {
+                        m_uiPhase = PHASE_GUARDIANS;
+                        DoScriptText(SAY_REQUEST_AID, m_creature);
+                    }
+                }
+                else if (m_uiPhase == PHASE_GUARDIANS && m_uiGuardiansCount < m_uiGuardiansCountMax)
+                {
+                    if (m_uiGuardiansTimer < uiDiff)
+                    {
+                        // Summon a Guardian of Icecrown in a random alcove
+                        SummonMob(NPC_GUARDIAN);
+                        m_uiGuardiansTimer = 5000;
+                    }
+                    else
+                    {
+                        m_uiGuardiansTimer -= uiDiff;
+                    }
+
+                    if (m_uiLichKingAnswerTimer && m_pInstance)
+                    {
+                        if (m_uiLichKingAnswerTimer <= uiDiff)
+                        {
+                            if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICHKING))
+                            {
+                                DoScriptText(SAY_ANSWER_REQUEST, pLichKing);
+                            }
+
+                            m_pInstance->DoUseDoorOrButton(GO_KELTHUZAD_WINDOW_1);
+                            m_pInstance->DoUseDoorOrButton(GO_KELTHUZAD_WINDOW_2);
+                            m_pInstance->DoUseDoorOrButton(GO_KELTHUZAD_WINDOW_3);
+                            m_pInstance->DoUseDoorOrButton(GO_KELTHUZAD_WINDOW_4);
+
+                            m_uiLichKingAnswerTimer = 0;
+                        }
+                        else
+                        {
+                            m_uiLichKingAnswerTimer -= uiDiff;
+                        }
+                    }
+                }
+
+                DoMeleeAttackIfReady();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_kelthuzadAI(pCreature);
+    }
+};
+
+void AddSC_boss_kelthuzad()
+{
+    Script* s;
+    s = new boss_kelthuzad();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_kelthuzad";
+    //pNewScript->GetAI = &GetAI_boss_kelthuzad;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_loatheb.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_loatheb.cpp
new file mode 100644
index 000000000..5be327839
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_loatheb.cpp
@@ -0,0 +1,226 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Loatheb
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    // EMOTE_AURA_BLOCKING   = -1533143,
+    // EMOTE_AURA_WANE       = -1533144,
+    // EMOTE_AURA_FADING     = -1533145,
+
+    SPELL_CORRUPTED_MIND    = 29201,            // this triggers the following spells on targets (based on class): 29185, 29194, 29196, 29198
+    SPELL_POISON_AURA       = 29865,
+    SPELL_INEVITABLE_DOOM   = 29204,
+    SPELL_SUMMON_SPORE      = 29234,
+    SPELL_REMOVE_CURSE      = 30281,
+    // SPELL_BERSERK         = 26662,
+
+    NPC_SPORE               = 16286
+};
+
+struct boss_loatheb : public CreatureScript
+{
+    boss_loatheb() : CreatureScript("boss_loatheb") {}
+
+    struct boss_loathebAI : public ScriptedAI
+    {
+        boss_loathebAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiPoisonAuraTimer;
+        uint32 m_uiCorruptedMindTimer;
+        uint32 m_uiInevitableDoomTimer;
+        uint32 m_uiRemoveCurseTimer;
+        uint32 m_uiSummonTimer;
+        // uint32 m_uiBerserkTimer;
+        uint8 m_uiCorruptedMindCount;
+
+        void Reset() override
+        {
+            m_uiPoisonAuraTimer = 5000;
+            m_uiCorruptedMindTimer = 4000;
+            m_uiRemoveCurseTimer = 2000;
+            m_uiInevitableDoomTimer = MINUTE * 2 * IN_MILLISECONDS;
+            m_uiSummonTimer = urand(10000, 15000);              // first seen in vid after approx 12s
+            // m_uiBerserkTimer = MINUTE*12*IN_MILLISECONDS;    // not used
+            m_uiCorruptedMindCount = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LOATHEB, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LOATHEB, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LOATHEB, NOT_STARTED);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() != NPC_SPORE)
+            {
+                return;
+            }
+
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                pSummoned->AddThreat(pTarget);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            /* Berserk - not used
+            if (m_uiBerserkTimer < uiDiff)
+            {
+            DoCastSpellIfCan(m_creature, SPELL_BERSERK);
+            m_uiBerserkTimer = 300000;
+            }
+            else
+            m_uiBerserkTimer -= uiDiff;*/
+
+            // Inevitable Doom
+            if (m_uiInevitableDoomTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_INEVITABLE_DOOM) == CAST_OK)
+                {
+                    m_uiInevitableDoomTimer = (m_uiCorruptedMindCount <= 5) ? 30000 : 15000;
+                }
+            }
+            else
+            {
+                m_uiInevitableDoomTimer -= uiDiff;
+            }
+
+            // Corrupted Mind
+            if (m_uiCorruptedMindTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CORRUPTED_MIND) == CAST_OK)
+                {
+                    ++m_uiCorruptedMindCount;
+                    m_uiCorruptedMindTimer = 60000;
+                }
+            }
+            else
+            {
+                m_uiCorruptedMindTimer -= uiDiff;
+            }
+
+            // Summon
+            if (m_uiSummonTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_SPORE) == CAST_OK)
+                {
+                    m_uiSummonTimer = 13000;
+                }
+            }
+            else
+            {
+                m_uiSummonTimer -= uiDiff;
+            }
+
+            // Poison Aura
+            if (m_uiPoisonAuraTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_POISON_AURA) == CAST_OK)
+                {
+                    m_uiPoisonAuraTimer = 12000;
+                }
+            }
+            else
+            {
+                m_uiPoisonAuraTimer -= uiDiff;
+            }
+
+            // Remove Curse
+            if (m_uiRemoveCurseTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_REMOVE_CURSE) == CAST_OK)
+                {
+                    m_uiRemoveCurseTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiRemoveCurseTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_loathebAI(pCreature);
+    }
+};
+
+void AddSC_boss_loatheb()
+{
+    Script* s;
+    s = new boss_loatheb();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_loatheb";
+    //pNewScript->GetAI = &GetAI_boss_loatheb;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_maexxna.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_maexxna.cpp
new file mode 100644
index 000000000..76ef47d6f
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_maexxna.cpp
@@ -0,0 +1,386 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Maexxna
+ * SD%Complete: 90
+ * SDComment:   Web wrap effect still needs more love and research.
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    EMOTE_SPIN_WEB              = -1533146,
+    EMOTE_SPIDERLING            = -1533147,
+    EMOTE_SPRAY                 = -1533148,
+    EMOTE_BOSS_GENERIC_FRENZY   = -1000005,
+
+    SPELL_WEBWRAP               = 28622,
+    SPELL_WEBWRAP_2             = 28673,                    // purpose unknown
+
+    SPELL_WEBSPRAY              = 29484,
+    SPELL_POISONSHOCK           = 28741,
+    SPELL_NECROTICPOISON        = 28776,
+    SPELL_FRENZY                = 28747,
+
+    // SPELL_SUMMON_SPIDERLING_1 = 29434,                   // removed from dbc. Summons 10 spiderlings
+    // SPELL_SUMMON_SPIDERLING_2 = 30076,                   // removed from dbc. Summons 3 spiderlings
+    // SPELL_SUMMON_WEB_WRAP     = 28627,                   // removed from dbc. Summons one web wrap and transforms it into creature 17286
+
+    NPC_WEB_WRAP                = 16486,
+    NPC_SPIDERLING              = 17055,
+
+    MAX_SPIDERLINGS             = 8,
+    MAX_WEB_WRAP_POSITIONS      = 3,
+};
+
+static const float aWebWrapLoc[MAX_WEB_WRAP_POSITIONS][3] =
+{
+    {3546.796f, -3869.082f, 296.450f},
+    {3531.271f, -3847.424f, 299.450f},
+    {3497.067f, -3843.384f, 302.384f}
+};
+
+struct npc_web_wrap : public CreatureScript
+{
+    npc_web_wrap() : CreatureScript("npc_web_wrap") {}
+
+    struct npc_web_wrapAI : public ScriptedAI
+    {
+        npc_web_wrapAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_victimGuid;
+        uint32 m_uiWebWrapTimer;
+
+        void Reset() override
+        {
+            m_uiWebWrapTimer = 0;
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+        void AttackStart(Unit* /*pWho*/) override {}
+
+        void SetVictim(Unit* pVictim)
+        {
+            if (pVictim && pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                // Vanilla spell 28618, 28619, 28620, 28621 had effect SPELL_EFFECT_PLAYER_PULL with EffectMiscValue = 200, 300, 400 and 500
+                // All these spells trigger 28622 after 1 or 2 seconds
+                // the EffectMiscValue may have been based on the distance between the victim and the target
+
+                // NOTE: This implementation may not be 100% correct, but it gets very close to the expected result
+
+                float fDist = m_creature->GetDistance2d(pVictim);
+                // Switch the speed multiplier based on the distance from the web wrap
+                uint32 uiEffectMiscValue = 500;
+                if (fDist < 25.0f)
+                {
+                    uiEffectMiscValue = 200;
+                }
+                else if (fDist < 50.0f)
+                {
+                    uiEffectMiscValue = 300;
+                }
+                else if (fDist < 75.0f)
+                {
+                    uiEffectMiscValue = 400;
+                }
+
+                // This doesn't give the expected result in all cases
+                ((Player*)pVictim)->KnockBackFrom(m_creature, -fDist, uiEffectMiscValue * 0.033f);
+
+                // Jump movement not supported on 2.4.3
+                // float fSpeed = fDist * (uiEffectMiscValue * 0.01f);
+                // pVictim->GetMotionMaster()->MoveJump(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), fSpeed, 0.0f);
+
+                m_victimGuid = pVictim->GetObjectGuid();
+                m_uiWebWrapTimer = uiEffectMiscValue == 200 ? 1000 : 2000;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_victimGuid)
+            {
+                if (Player* pVictim = m_creature->GetMap()->GetPlayer(m_victimGuid))
+                {
+                    if (pVictim->IsAlive())
+                    {
+                        pVictim->RemoveAurasDueToSpell(SPELL_WEBWRAP);
+                    }
+                }
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender->GetEntry() == NPC_WEB_WRAP)
+                SetVictim(pInvoker);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiWebWrapTimer)
+            {
+                // Finally the player gets web wrapped and he should change the display id until the creature is killed
+                if (m_uiWebWrapTimer <= uiDiff)
+                {
+                    if (Player* pVictim = m_creature->GetMap()->GetPlayer(m_victimGuid))
+                    {
+                        pVictim->CastSpell(pVictim, SPELL_WEBWRAP, true, NULL, NULL, m_creature->GetObjectGuid());
+                    }
+
+                    m_uiWebWrapTimer = 0;
+                }
+                else
+                {
+                    m_uiWebWrapTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_web_wrapAI(pCreature);
+    }
+};
+
+struct boss_maexxna : public CreatureScript
+{
+    boss_maexxna() : CreatureScript("boss_maexxna") {}
+
+    struct boss_maexxnaAI : public ScriptedAI
+    {
+        boss_maexxnaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiWebWrapTimer;
+        uint32 m_uiWebSprayTimer;
+        uint32 m_uiPoisonShockTimer;
+        uint32 m_uiNecroticPoisonTimer;
+        uint32 m_uiSummonSpiderlingTimer;
+        bool   m_bEnraged;
+
+        void Reset() override
+        {
+            m_uiWebWrapTimer = 15000;
+            m_uiWebSprayTimer = 40000;
+            m_uiPoisonShockTimer = urand(10000, 20000);
+            m_uiNecroticPoisonTimer = urand(20000, 30000);
+            m_uiSummonSpiderlingTimer = 30000;
+            m_bEnraged = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAEXXNA, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAEXXNA, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAEXXNA, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_WEB_WRAP)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_WEBWRAP, SELECT_FLAG_PLAYER))
+                {
+                    SendAIEvent(AI_EVENT_CUSTOM_A, pTarget, pSummoned);
+                }
+            }
+            else if (pSummoned->GetEntry() == NPC_SPIDERLING)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+        }
+
+        bool DoCastWebWrap()
+        {
+            // If we can't select a player for web wrap then skip the summoning
+            if (!m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, uint32(0), SELECT_FLAG_PLAYER))
+            {
+                return false;
+            }
+
+            uint8 uiPos1 = urand(0, MAX_WEB_WRAP_POSITIONS - 1);
+            m_creature->SummonCreature(NPC_WEB_WRAP, aWebWrapLoc[uiPos1][0], aWebWrapLoc[uiPos1][1], aWebWrapLoc[uiPos1][2], 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+
+            uint8 uiPos2 = (uiPos1 + urand(1, MAX_WEB_WRAP_POSITIONS - 1)) % MAX_WEB_WRAP_POSITIONS;
+            m_creature->SummonCreature(NPC_WEB_WRAP, aWebWrapLoc[uiPos2][0], aWebWrapLoc[uiPos2][1], aWebWrapLoc[uiPos2][2], 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+
+            return true;
+        }
+
+        // Summons spiderlings around the boss
+        void SummonSpiderlings()
+        {
+            for (uint8 i = 0; i < MAX_SPIDERLINGS; ++i)
+            {
+                m_creature->SummonCreature(NPC_SPIDERLING, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Web Wrap
+            if (m_uiWebWrapTimer < uiDiff)
+            {
+                if (DoCastWebWrap())
+                {
+                    DoScriptText(EMOTE_SPIN_WEB, m_creature);
+                }
+
+                m_uiWebWrapTimer = 40000;
+            }
+            else
+            {
+                m_uiWebWrapTimer -= uiDiff;
+            }
+
+            // Web Spray
+            if (m_uiWebSprayTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WEBSPRAY) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_SPRAY, m_creature);
+                    m_uiWebSprayTimer = 40000;
+                }
+            }
+            else
+            {
+                m_uiWebSprayTimer -= uiDiff;
+            }
+
+            // Poison Shock
+            if (m_uiPoisonShockTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_POISONSHOCK) == CAST_OK)
+                {
+                    m_uiPoisonShockTimer = urand(10000, 20000);
+                }
+            }
+            else
+            {
+                m_uiPoisonShockTimer -= uiDiff;
+            }
+
+            // Necrotic Poison
+            if (m_uiNecroticPoisonTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_NECROTICPOISON) == CAST_OK)
+                {
+                    m_uiNecroticPoisonTimer = urand(20000, 30000);
+                }
+            }
+            else
+            {
+                m_uiNecroticPoisonTimer -= uiDiff;
+            }
+
+            // Summon Spiderling
+            if (m_uiSummonSpiderlingTimer < uiDiff)
+            {
+                SummonSpiderlings();
+                DoScriptText(EMOTE_SPIDERLING, m_creature);
+                m_uiSummonSpiderlingTimer = 30000;
+            }
+            else
+            {
+                m_uiSummonSpiderlingTimer -= uiDiff;
+            }
+
+            // Enrage if not already enraged and below 30%
+            if (!m_bEnraged && m_creature->GetHealthPercent() < 30.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_BOSS_GENERIC_FRENZY, m_creature);
+                    m_bEnraged = true;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_maexxnaAI(pCreature);
+    }
+};
+
+void AddSC_boss_maexxna()
+{
+    Script* s;
+    s = new boss_maexxna();
+    s->RegisterSelf();
+    s = new npc_web_wrap();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_maexxna";
+    //pNewScript->GetAI = &GetAI_boss_maexxna;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_web_wrap";
+    //pNewScript->GetAI = &GetAI_npc_web_wrap;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_noth.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_noth.cpp
new file mode 100644
index 000000000..122651327
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_noth.cpp
@@ -0,0 +1,385 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Noth
+ * SD%Complete: 80
+ * SDComment:   Summons need verify, need better phase-switch support (unattackable?)
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    SAY_AGGRO1                          = -1533075,
+    SAY_AGGRO2                          = -1533076,
+    SAY_AGGRO3                          = -1533077,
+    SAY_SUMMON                          = -1533078,
+    SAY_SLAY1                           = -1533079,
+    SAY_SLAY2                           = -1533080,
+    SAY_DEATH                           = -1533081,
+
+    EMOTE_WARRIOR                       = -1533130,
+    EMOTE_SKELETON                      = -1533131,
+    EMOTE_TELEPORT                      = -1533132,
+    EMOTE_TELEPORT_RETURN               = -1533133,
+
+    SPELL_TELEPORT                      = 29216,
+    SPELL_TELEPORT_RETURN               = 29231,
+
+    SPELL_BLINK_1                       = 29208,
+    SPELL_BLINK_2                       = 29209,
+    SPELL_BLINK_3                       = 29210,
+    SPELL_BLINK_4                       = 29211,
+
+    SPELL_CRIPPLE                       = 29212,
+    SPELL_CURSE_PLAGUEBRINGER           = 29213,
+
+    SPELL_BERSERK                       = 26662,            // guesswork, but very common berserk spell in naxx
+
+    SPELL_SUMMON_WARRIOR_1              = 29247,
+    SPELL_SUMMON_WARRIOR_2              = 29248,
+    SPELL_SUMMON_WARRIOR_3              = 29249,
+
+    SPELL_SUMMON_WARRIOR_THREE          = 29237,
+
+    SPELL_SUMMON_CHAMP01                = 29217,
+    SPELL_SUMMON_CHAMP02                = 29224,
+    SPELL_SUMMON_CHAMP03                = 29225,
+    SPELL_SUMMON_CHAMP04                = 29227,
+    SPELL_SUMMON_CHAMP05                = 29238,
+    SPELL_SUMMON_CHAMP06                = 29255,
+    SPELL_SUMMON_CHAMP07                = 29257,
+    SPELL_SUMMON_CHAMP08                = 29258,
+    SPELL_SUMMON_CHAMP09                = 29262,
+    SPELL_SUMMON_CHAMP10                = 29267,
+
+    SPELL_SUMMON_GUARD01                = 29226,
+    SPELL_SUMMON_GUARD02                = 29239,
+    SPELL_SUMMON_GUARD03                = 29256,
+    SPELL_SUMMON_GUARD04                = 29268,
+
+    PHASE_GROUND                        = 0,
+    PHASE_BALCONY                       = 1,
+
+    PHASE_SKELETON_1                    = 1,
+    PHASE_SKELETON_2                    = 2,
+    PHASE_SKELETON_3                    = 3
+};
+
+struct boss_noth : public CreatureScript
+{
+    boss_noth() : CreatureScript("boss_noth") {}
+
+    struct boss_nothAI : public ScriptedAI
+    {
+        boss_nothAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+        uint8 m_uiPhaseSub;
+        uint32 m_uiPhaseTimer;
+
+        uint32 m_uiBlinkTimer;
+        uint32 m_uiCurseTimer;
+        uint32 m_uiSummonTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_GROUND;
+            m_uiPhaseSub = PHASE_GROUND;
+            m_uiPhaseTimer = 90000;
+
+            m_uiBlinkTimer = 25000;
+            m_uiCurseTimer = 4000;
+            m_uiSummonTimer = 12000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(SAY_AGGRO1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_AGGRO2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_AGGRO3, m_creature);
+                break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NOTH, IN_PROGRESS);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->SetInCombatWithZone();
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NOTH, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NOTH, FAIL);
+            }
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pCaster == m_creature && pSpell->Effect[EFFECT_INDEX_0] == SPELL_EFFECT_LEAP)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_CRIPPLE);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiPhase == PHASE_GROUND)
+            {
+                if (m_uiPhaseTimer)                             // After PHASE_SKELETON_3 we won't have a balcony phase
+                {
+                    if (m_uiPhaseTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT) == CAST_OK)
+                        {
+                            DoScriptText(EMOTE_TELEPORT, m_creature);
+                            m_creature->GetMotionMaster()->MoveIdle();
+                            m_uiPhase = PHASE_BALCONY;
+                            ++m_uiPhaseSub;
+
+                            switch (m_uiPhaseSub)               // Set Duration of Skeleton phase
+                            {
+                            case PHASE_SKELETON_1:
+                                m_uiPhaseTimer = 70000;
+                                break;
+                            case PHASE_SKELETON_2:
+                                m_uiPhaseTimer = 97000;
+                                break;
+                            case PHASE_SKELETON_3:
+                                m_uiPhaseTimer = 120000;
+                                break;
+                            }
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        m_uiPhaseTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiBlinkTimer < uiDiff)
+                {
+                    static uint32 const auiSpellBlink[4] =
+                    {
+                        SPELL_BLINK_1, SPELL_BLINK_2, SPELL_BLINK_3, SPELL_BLINK_4
+                    };
+
+                    if (DoCastSpellIfCan(m_creature, auiSpellBlink[urand(0, 3)]) == CAST_OK)
+                    {
+                        DoResetThreat();
+                        m_uiBlinkTimer = 25000;
+                    }
+                }
+                else
+                {
+                    m_uiBlinkTimer -= uiDiff;
+                }
+
+                if (m_uiCurseTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_CURSE_PLAGUEBRINGER);
+                    m_uiCurseTimer = 28000;
+                }
+                else
+                {
+                    m_uiCurseTimer -= uiDiff;
+                }
+
+                if (m_uiSummonTimer < uiDiff)
+                {
+                    DoScriptText(SAY_SUMMON, m_creature);
+                    DoScriptText(EMOTE_WARRIOR, m_creature);
+
+                    // It's not very clear how many warriors it should summon, so we'll just leave it as random for now
+                    if (urand(0, 1))
+                    {
+                        static uint32 const auiSpellSummonPlaguedWarrior[3] =
+                        {
+                            SPELL_SUMMON_WARRIOR_1, SPELL_SUMMON_WARRIOR_2, SPELL_SUMMON_WARRIOR_3
+                        };
+
+                        for (uint8 i = 0; i < 2; ++i)
+                        {
+                            DoCastSpellIfCan(m_creature, auiSpellSummonPlaguedWarrior[urand(0, 2)], CAST_TRIGGERED);
+                        }
+                    }
+                    else
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_WARRIOR_THREE, CAST_TRIGGERED);
+                    }
+
+                    m_uiSummonTimer = 30000;
+                }
+                else
+                {
+                    m_uiSummonTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+            }
+            else                                                // PHASE_BALCONY
+            {
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT_RETURN) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_TELEPORT_RETURN, m_creature);
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                        switch (m_uiPhaseSub)
+                        {
+                        case PHASE_SKELETON_1:
+                            m_uiPhaseTimer = 110000;
+                            break;
+                        case PHASE_SKELETON_2:
+                            m_uiPhaseTimer = 180000;
+                            break;
+                        case PHASE_SKELETON_3:
+                            m_uiPhaseTimer = 0;
+                            // Go Berserk after third Balcony Phase
+                            DoCastSpellIfCan(m_creature, SPELL_BERSERK, CAST_TRIGGERED);
+                            break;
+                        }
+                        m_uiPhase = PHASE_GROUND;
+
+                        return;
+                    }
+                }
+                else
+                {
+                    m_uiPhaseTimer -= uiDiff;
+                }
+
+                if (m_uiSummonTimer < uiDiff)
+                {
+                    DoScriptText(EMOTE_SKELETON, m_creature);
+
+                    static uint32 const auiSpellSummonPlaguedChampion[10] =
+                    {
+                        SPELL_SUMMON_CHAMP01, SPELL_SUMMON_CHAMP02, SPELL_SUMMON_CHAMP03, SPELL_SUMMON_CHAMP04, SPELL_SUMMON_CHAMP05, SPELL_SUMMON_CHAMP06, SPELL_SUMMON_CHAMP07, SPELL_SUMMON_CHAMP08, SPELL_SUMMON_CHAMP09, SPELL_SUMMON_CHAMP10
+                    };
+
+                    static uint32 const auiSpellSummonPlaguedGuardian[4] =
+                    {
+                        SPELL_SUMMON_GUARD01, SPELL_SUMMON_GUARD02, SPELL_SUMMON_GUARD03, SPELL_SUMMON_GUARD04
+                    };
+
+                    // A bit unclear how many in each sub phase
+                    switch (m_uiPhaseSub)
+                    {
+                    case PHASE_SKELETON_1:
+                        for (uint8 i = 0; i < 4; ++i)
+                        {
+                            DoCastSpellIfCan(m_creature, auiSpellSummonPlaguedChampion[urand(0, 9)], CAST_TRIGGERED);
+                        }
+
+                        break;
+                    case PHASE_SKELETON_2:
+                        for (uint8 i = 0; i < 2; ++i)
+                        {
+                            DoCastSpellIfCan(m_creature, auiSpellSummonPlaguedChampion[urand(0, 9)], CAST_TRIGGERED);
+                            DoCastSpellIfCan(m_creature, auiSpellSummonPlaguedGuardian[urand(0, 3)], CAST_TRIGGERED);
+                        }
+                        break;
+                    case PHASE_SKELETON_3:
+                        for (uint8 i = 0; i < 4; ++i)
+                        {
+                            DoCastSpellIfCan(m_creature, auiSpellSummonPlaguedGuardian[urand(0, 3)], CAST_TRIGGERED);
+                        }
+
+                        break;
+                    }
+
+                    m_uiSummonTimer = 30000;
+                }
+                else
+                {
+                    m_uiSummonTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_nothAI(pCreature);
+    }
+};
+
+void AddSC_boss_noth()
+{
+    Script* s;
+    s = new boss_noth();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_noth";
+    //pNewScript->GetAI = &GetAI_boss_noth;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_patchwerk.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_patchwerk.cpp
new file mode 100644
index 000000000..c16688df5
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_patchwerk.cpp
@@ -0,0 +1,244 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Patchwerk
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    SAY_AGGRO1            = -1533017,
+    SAY_AGGRO2            = -1533018,
+    SAY_SLAY              = -1533019,
+    SAY_DEATH             = -1533020,
+
+    EMOTE_GENERIC_BERSERK   = -1000004,
+    EMOTE_GENERIC_ENRAGED   = -1000003,
+
+    SPELL_HATEFULSTRIKE   = 28308,
+    SPELL_ENRAGE          = 28131,
+    SPELL_BERSERK         = 26662,
+    SPELL_SLIMEBOLT       = 32309
+};
+
+struct boss_patchwerk : public CreatureScript
+{
+    boss_patchwerk() : CreatureScript("boss_patchwerk") {}
+
+    struct boss_patchwerkAI : public ScriptedAI
+    {
+        boss_patchwerkAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiHatefulStrikeTimer;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiSlimeboltTimer;
+        bool   m_bEnraged;
+        bool   m_bBerserk;
+
+        void Reset() override
+        {
+            m_uiHatefulStrikeTimer = 1000;                      // 1 second
+            m_uiBerserkTimer = MINUTE * 6 * IN_MILLISECONDS;    // 6 minutes
+            m_uiSlimeboltTimer = 10000;
+            m_bEnraged = false;
+            m_bBerserk = false;
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (urand(0, 4))
+            {
+                return;
+            }
+
+            DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_PATCHWERK, DONE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_AGGRO1 : SAY_AGGRO2, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_PATCHWERK, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_PATCHWERK, FAIL);
+            }
+        }
+
+        void DoHatefulStrike()
+        {
+            // The ability is used on highest HP target choosen of the top 2 (3 heroic) targets on threat list being in melee range
+            Unit* pTarget = NULL;
+            uint32 uiHighestHP = 0;
+            uint32 uiTargets = 2;
+
+            ThreatList const& tList = m_creature->GetThreatManager().getThreatList();
+            if (tList.size() > 1)                               // Check if more than two targets, and start loop with second-most aggro
+            {
+                ThreatList::const_iterator iter = tList.begin();
+                std::advance(iter, 1);
+                for (; iter != tList.end(); ++iter)
+                {
+                    if (!uiTargets)
+                    {
+                        break;
+                    }
+
+                    if (Unit* pTempTarget = m_creature->GetMap()->GetUnit((*iter)->getUnitGuid()))
+                    {
+                        if (m_creature->CanReachWithMeleeAttack(pTempTarget))
+                        {
+                            if (pTempTarget->GetHealth() > uiHighestHP)
+                            {
+                                uiHighestHP = pTempTarget->GetHealth();
+                                pTarget = pTempTarget;
+                            }
+                            --uiTargets;
+                        }
+                    }
+                }
+            }
+
+            if (!pTarget)
+            {
+                pTarget = m_creature->getVictim();
+            }
+
+            DoCastSpellIfCan(pTarget, SPELL_HATEFULSTRIKE);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Hateful Strike
+            if (m_uiHatefulStrikeTimer < uiDiff)
+            {
+                DoHatefulStrike();
+                m_uiHatefulStrikeTimer = 1000;
+            }
+            else
+            {
+                m_uiHatefulStrikeTimer -= uiDiff;
+            }
+
+            // Soft Enrage at 5%
+            if (!m_bEnraged)
+            {
+                if (m_creature->GetHealthPercent() < 5.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_GENERIC_ENRAGED, m_creature);
+                        m_bEnraged = true;
+                    }
+                }
+            }
+
+            // Berserk after 6 minutes
+            if (!m_bBerserk)
+            {
+                if (m_uiBerserkTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_GENERIC_BERSERK, m_creature);
+                        m_bBerserk = true;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+            else
+            {
+                // Slimebolt - casted only while Berserking to prevent kiting
+                if (m_uiSlimeboltTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_SLIMEBOLT);
+                    m_uiSlimeboltTimer = 5000;
+                }
+                else
+                {
+                    m_uiSlimeboltTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_patchwerkAI(pCreature);
+    }
+};
+
+void AddSC_boss_patchwerk()
+{
+    Script* s;
+    s = new boss_patchwerk();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_patchwerk";
+    //pNewScript->GetAI = &GetAI_boss_patchwerk;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_razuvious.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_razuvious.cpp
new file mode 100644
index 000000000..54fa61513
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_razuvious.cpp
@@ -0,0 +1,219 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Razuvious
+ * SD%Complete: 85
+ * SDComment:   TODO: Timers and sounds need confirmation
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    SAY_AGGRO1               = -1533120,
+    SAY_AGGRO2               = -1533121,
+    SAY_AGGRO3               = -1533122,
+    SAY_SLAY1                = -1533123,
+    SAY_SLAY2                = -1533124,
+    SAY_COMMAND1             = -1533125,
+    SAY_COMMAND2             = -1533126,
+    SAY_COMMAND3             = -1533127,
+    SAY_COMMAND4             = -1533128,
+    SAY_DEATH                = -1533129,
+
+    SPELL_UNBALANCING_STRIKE = 26613,
+    SPELL_DISRUPTING_SHOUT   = 29107,
+    SPELL_HOPELESS           = 29125
+};
+
+struct boss_razuvious : public CreatureScript
+{
+    boss_razuvious() : CreatureScript("boss_razuvious") {}
+
+    struct boss_razuviousAI : public ScriptedAI
+    {
+        boss_razuviousAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiUnbalancingStrikeTimer;
+        uint32 m_uiDisruptingShoutTimer;
+        uint32 m_uiCommandSoundTimer;
+
+        void Reset() override
+        {
+            m_uiUnbalancingStrikeTimer = 30000;                 // 30 seconds
+            m_uiDisruptingShoutTimer = 15000;                 // 15 seconds
+            m_uiCommandSoundTimer = 40000;                 // 40 seconds
+        }
+
+        void KilledUnit(Unit* /*Victim*/) override
+        {
+            if (urand(0, 3))
+            {
+                return;
+            }
+
+            switch (urand(0, 1))
+            {
+            case 0:
+                DoScriptText(SAY_SLAY1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_SLAY2, m_creature);
+                break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            DoCastSpellIfCan(m_creature, SPELL_HOPELESS, CAST_TRIGGERED);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_RAZUVIOUS, DONE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(SAY_AGGRO1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_AGGRO2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_AGGRO3, m_creature);
+                break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_RAZUVIOUS, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_RAZUVIOUS, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Unbalancing Strike
+            if (m_uiUnbalancingStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_UNBALANCING_STRIKE) == CAST_OK)
+                {
+                    m_uiUnbalancingStrikeTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiUnbalancingStrikeTimer -= uiDiff;
+            }
+
+            // Disrupting Shout
+            if (m_uiDisruptingShoutTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DISRUPTING_SHOUT) == CAST_OK)
+                {
+                    m_uiDisruptingShoutTimer = 25000;
+                }
+            }
+            else
+            {
+                m_uiDisruptingShoutTimer -= uiDiff;
+            }
+
+            // Random say
+            if (m_uiCommandSoundTimer < uiDiff)
+            {
+                switch (urand(0, 3))
+                {
+                case 0:
+                    DoScriptText(SAY_COMMAND1, m_creature);
+                    break;
+                case 1:
+                    DoScriptText(SAY_COMMAND2, m_creature);
+                    break;
+                case 2:
+                    DoScriptText(SAY_COMMAND3, m_creature);
+                    break;
+                case 3:
+                    DoScriptText(SAY_COMMAND4, m_creature);
+                    break;
+                }
+
+                m_uiCommandSoundTimer = 40000;
+            }
+            else
+            {
+                m_uiCommandSoundTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_razuviousAI(pCreature);
+    }
+};
+
+void AddSC_boss_razuvious()
+{
+    Script* s;
+    s = new boss_razuvious();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_razuvious";
+    //pNewScript->GetAI = &GetAI_boss_razuvious;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_sapphiron.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_sapphiron.cpp
new file mode 100644
index 000000000..cc0fa01d8
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_sapphiron.cpp
@@ -0,0 +1,406 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Sapphiron
+ * SD%Complete: 0
+ * SDComment:   Some spells need core implementation
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+/**
+ * Additional comments:
+ * Bugged spells:   28560 (needs maxTarget = 1, Summon of 16474 implementation, TODO, 30s duration)
+ *                  28526 (needs ScriptEffect to cast 28522 onto random target)
+ *
+ * Frost-Breath ability: the dummy spell 30101 is self cast, so it won't take the needed delay of ~7s until it reaches its target
+ *                       As Sapphiron is displayed visually in hight (hovering), and the spell is cast with target=self-location
+ *                       which is still on the ground, the client shows a nice slow falling of the visual animation
+ *                       Insisting on using the Dummy-Effect to cast the breath-dmg spells, would require, to relocate Sapphi internally,
+ *                       and to hack the targeting to be "on the ground" - Hence the prefered way as it is now!
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    EMOTE_BREATH                = -1533082,
+    EMOTE_GENERIC_ENRAGED       = -1000003,
+    EMOTE_FLY                   = -1533022,
+    EMOTE_GROUND                = -1533083,
+
+    SPELL_CLEAVE                = 19983,
+    SPELL_TAIL_SWEEP            = 15847,
+    SPELL_ICEBOLT               = 28526,
+    SPELL_FROST_BREATH_DUMMY    = 30101,
+    SPELL_FROST_BREATH          = 28524,            // triggers 29318
+    SPELL_FROST_AURA            = 28531,
+    SPELL_LIFE_DRAIN            = 28542,
+    SPELL_CHILL                 = 28547,
+    SPELL_SUMMON_BLIZZARD       = 28560,
+    SPELL_BESERK                = 26662,
+
+    NPC_YOU_KNOW_WHO            = 16474,
+};
+
+static const float aLiftOffPosition[3] = {3522.386f, -5236.784f, 137.709f};
+
+enum Phases
+{
+    PHASE_GROUND        = 1,
+    PHASE_LIFT_OFF      = 2,
+    PHASE_AIR_BOLTS     = 3,
+    PHASE_AIR_BREATH    = 4,
+    PHASE_LANDING       = 5,
+};
+
+struct boss_sapphiron : public CreatureScript
+{
+    boss_sapphiron() : CreatureScript("boss_sapphiron") {}
+
+    struct boss_sapphironAI : public ScriptedAI
+    {
+        boss_sapphironAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiTailSweepTimer;
+        uint32 m_uiIceboltTimer;
+        uint32 m_uiFrostBreathTimer;
+        uint32 m_uiLifeDrainTimer;
+        uint32 m_uiBlizzardTimer;
+        uint32 m_uiFlyTimer;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiLandTimer;
+
+        uint32 m_uiIceboltCount;
+        Phases m_Phase;
+
+        void Reset() override
+        {
+            m_uiCleaveTimer = 5000;
+            m_uiTailSweepTimer = 12000;
+            m_uiFrostBreathTimer = 7000;
+            m_uiLifeDrainTimer = 11000;
+            m_uiBlizzardTimer = 15000;                          // "Once the encounter starts,based on your version of Naxx, this will be used x2 for normal and x6 on HC"
+            m_uiFlyTimer = 46000;
+            m_uiIceboltTimer = 5000;
+            m_uiLandTimer = 0;
+            m_uiBerserkTimer = 15 * MINUTE * IN_MILLISECONDS;
+            m_Phase = PHASE_GROUND;
+            m_uiIceboltCount = 0;
+
+            SetCombatMovement(true);
+            m_creature->SetLevitate(false);
+            // m_creature->ApplySpellMod(SPELL_FROST_AURA, SPELLMOD_DURATION, -1);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_FROST_AURA);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SAPPHIRON, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SAPPHIRON, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SAPPHIRON, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_YOU_KNOW_WHO)
+            {
+                if (Unit* pEnemy = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pEnemy);
+                }
+            }
+        }
+
+        void MovementInform(uint32 uiType, uint32 /*uiPointId*/) override
+        {
+            if (uiType == POINT_MOTION_TYPE && m_Phase == PHASE_LIFT_OFF)
+            {
+                DoScriptText(EMOTE_FLY, m_creature);
+                m_creature->HandleEmote(EMOTE_ONESHOT_LIFTOFF);
+                m_creature->SetLevitate(true);
+                m_Phase = PHASE_AIR_BOLTS;
+
+                m_uiFrostBreathTimer = 5000;
+                m_uiIceboltTimer = 5000;
+                m_uiIceboltCount = 0;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            switch (m_Phase)
+            {
+            case PHASE_GROUND:
+                if (m_uiCleaveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                    {
+                        m_uiCleaveTimer = urand(5000, 10000);
+                    }
+                }
+                else
+                {
+                    m_uiCleaveTimer -= uiDiff;
+                }
+
+                if (m_uiTailSweepTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TAIL_SWEEP) == CAST_OK)
+                    {
+                        m_uiTailSweepTimer = urand(7000, 10000);
+                    }
+                }
+                else
+                {
+                    m_uiTailSweepTimer -= uiDiff;
+                }
+
+                if (m_uiLifeDrainTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_LIFE_DRAIN) == CAST_OK)
+                    {
+                        m_uiLifeDrainTimer = 23000;
+                    }
+                }
+                else
+                {
+                    m_uiLifeDrainTimer -= uiDiff;
+                }
+
+                if (m_uiBlizzardTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_BLIZZARD) == CAST_OK)
+                    {
+                        m_uiBlizzardTimer = 20000;
+                    }
+                }
+                else
+                {
+                    m_uiBlizzardTimer -= uiDiff;
+                }
+
+                if (m_creature->GetHealthPercent() > 10.0f)
+                {
+                    if (m_uiFlyTimer < uiDiff)
+                    {
+                        m_Phase = PHASE_LIFT_OFF;
+                        m_creature->InterruptNonMeleeSpells(false);
+                        SetCombatMovement(false);
+                        m_creature->GetMotionMaster()->Clear(false);
+                        m_creature->GetMotionMaster()->MovePoint(1, aLiftOffPosition[0], aLiftOffPosition[1], aLiftOffPosition[2]);
+                        // TODO This should clear the target, too
+
+                        return;
+                    }
+                    else
+                    {
+                        m_uiFlyTimer -= uiDiff;
+                    }
+                }
+
+                // Only Phase in which we have melee attack!
+                DoMeleeAttackIfReady();
+                break;
+            case PHASE_LIFT_OFF:
+                break;
+            case PHASE_AIR_BOLTS:
+                if (m_uiIceboltCount == 5)
+                {
+                    if (m_uiFrostBreathTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_FROST_BREATH) == CAST_OK)
+                        {
+                            DoCastSpellIfCan(m_creature, SPELL_FROST_BREATH_DUMMY, CAST_TRIGGERED);
+                            DoScriptText(EMOTE_BREATH, m_creature);
+                            m_Phase = PHASE_AIR_BREATH;
+                            m_uiFrostBreathTimer = 5000;
+                            m_uiLandTimer = 11000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiFrostBreathTimer -= uiDiff;
+                    }
+                }
+                else
+                {
+                    if (m_uiIceboltTimer < uiDiff)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_ICEBOLT);
+
+                        ++m_uiIceboltCount;
+                        m_uiIceboltTimer = 4000;
+                    }
+                    else
+                    {
+                        m_uiIceboltTimer -= uiDiff;
+                    }
+                }
+
+                break;
+            case PHASE_AIR_BREATH:
+                if (m_uiLandTimer)
+                {
+                    if (m_uiLandTimer <= uiDiff)
+                    {
+                        // Begin Landing
+                        DoScriptText(EMOTE_GROUND, m_creature);
+                        m_creature->HandleEmote(EMOTE_ONESHOT_LAND);
+                        m_creature->SetLevitate(false);
+
+                        m_Phase = PHASE_LANDING;
+                        m_uiLandTimer = 2000;
+                    }
+                    else
+                    {
+                        m_uiLandTimer -= uiDiff;
+                    }
+                }
+
+                break;
+            case PHASE_LANDING:
+                if (m_uiLandTimer < uiDiff)
+                {
+                    m_Phase = PHASE_GROUND;
+
+                    SetCombatMovement(true);
+                    m_creature->GetMotionMaster()->Clear(false);
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+
+                    m_uiFlyTimer = 67000;
+                    m_uiLandTimer = 0;
+                }
+                else
+                {
+                    m_uiLandTimer -= uiDiff;
+                }
+
+                break;
+            }
+
+            // Enrage can happen in any phase
+            if (m_uiBerserkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BESERK) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_GENERIC_ENRAGED, m_creature);
+                    m_uiBerserkTimer = 300000;
+                }
+            }
+            else
+            {
+                m_uiBerserkTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_sapphironAI(pCreature);
+    }
+};
+
+struct go_sapphiron_birth : public GameObjectScript
+{
+    go_sapphiron_birth() : GameObjectScript("go_sapphiron_birth") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+
+        if (!pInstance)
+        {
+            return true;
+        }
+
+        if (pInstance->GetData(TYPE_SAPPHIRON) != NOT_STARTED)
+        {
+            return true;
+        }
+
+        // If already summoned return (safety check)
+        if (pInstance->GetSingleCreatureFromStorage(NPC_SAPPHIRON, true))
+        {
+            return true;
+        }
+
+        // Set data to special and allow the Go animation to proceed
+        pInstance->SetData(TYPE_SAPPHIRON, SPECIAL);
+        return false;
+    }
+};
+
+void AddSC_boss_sapphiron()
+{
+    Script* s;
+    s = new boss_sapphiron();
+    s->RegisterSelf();
+    s = new go_sapphiron_birth();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_sapphiron";
+    //pNewScript->GetAI = &GetAI_boss_sapphiron;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_sapphiron_birth";
+    //pNewScript->pGOUse = &GOUse_go_sapphiron_birth;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_thaddius.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_thaddius.cpp
new file mode 100644
index 000000000..610326909
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/boss_thaddius.cpp
@@ -0,0 +1,899 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Thaddius
+ * SD%Complete: 85
+ * SDComment:   Magnetic Pull, Tesla-Chains, Polaritiy-Shift missing (core!)
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * boss_thaddius
+ * npc_tesla_coil
+ * boss_stalagg
+ * boss_feugen
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    // Stalagg
+    SAY_STAL_AGGRO                  = -1533023,
+    SAY_STAL_SLAY                   = -1533024,
+    SAY_STAL_DEATH                  = -1533025,
+
+    // Feugen
+    SAY_FEUG_AGGRO                  = -1533026,
+    SAY_FEUG_SLAY                   = -1533027,
+    SAY_FEUG_DEATH                  = -1533028,
+
+    // Tesla Coils
+    EMOTE_LOSING_LINK               = -1533149,
+    EMOTE_TESLA_OVERLOAD            = -1533150,
+
+    // Thaddus
+    SAY_AGGRO_1                     = -1533030,
+    SAY_AGGRO_2                     = -1533031,
+    SAY_AGGRO_3                     = -1533032,
+    SAY_SLAY                        = -1533033,
+    SAY_ELECT                       = -1533034,
+    SAY_DEATH                       = -1533035,
+    // Background screams in Instance if Thaddius still alive, needs general support most likely
+    SAY_SCREAM1                     = -1533036,
+    SAY_SCREAM2                     = -1533037,
+    SAY_SCREAM3                     = -1533038,
+    SAY_SCREAM4                     = -1533039,
+    EMOTE_POLARITY_SHIFT            = -1533151,
+
+    // Thaddius Spells
+    SPELL_THADIUS_SPAWN             = 28160,
+    SPELL_THADIUS_LIGHTNING_VISUAL  = 28136,
+    SPELL_BALL_LIGHTNING            = 28299,
+    SPELL_CHAIN_LIGHTNING           = 28167,
+    SPELL_POLARITY_SHIFT            = 28089,
+    SPELL_BESERK                    = 27680,
+
+    // Stalagg & Feugen Spells
+    SPELL_WARSTOMP                  = 28125,
+    SPELL_MAGNETIC_PULL_A           = 28338,
+    SPELL_STATIC_FIELD              = 28135,
+    SPELL_POWERSURGE                = 28134,
+
+    // Tesla Spells
+    SPELL_FEUGEN_CHAIN              = 28111,
+    SPELL_STALAGG_CHAIN             = 28096,
+    SPELL_FEUGEN_TESLA_PASSIVE      = 28109,
+    SPELL_STALAGG_TESLA_PASSIVE     = 28097,
+    SPELL_SHOCK_OVERLOAD            = 28159,
+    SPELL_SHOCK                     = 28099,
+};
+
+/************
+** boss_thaddius
+************/
+
+// Actually this boss behaves like a NoMovement Boss (SPELL_BALL_LIGHTNING) - but there are some movement packages used, unknown what this means!
+struct boss_thaddius : public CreatureScript
+{
+    boss_thaddius() : CreatureScript("boss_thaddius") {}
+
+    struct boss_thaddiusAI : public Scripted_NoMovementAI
+    {
+        boss_thaddiusAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiPolarityShiftTimer;
+        uint32 m_uiChainLightningTimer;
+        uint32 m_uiBallLightningTimer;
+        uint32 m_uiBerserkTimer;
+
+        void Reset() override
+        {
+            m_uiPolarityShiftTimer = 15 * IN_MILLISECONDS;
+            m_uiChainLightningTimer = 8 * IN_MILLISECONDS;
+            m_uiBallLightningTimer = 1 * IN_MILLISECONDS;
+            m_uiBerserkTimer = 6 * MINUTE * IN_MILLISECONDS;
+
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(SAY_AGGRO_1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_AGGRO_2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_AGGRO_3, m_creature);
+                break;
+            }
+
+            // Make Attackable
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THADDIUS, FAIL);
+
+                // Respawn Adds:
+                Creature* pFeugen = m_pInstance->GetSingleCreatureFromStorage(NPC_FEUGEN);
+                Creature* pStalagg = m_pInstance->GetSingleCreatureFromStorage(NPC_STALAGG);
+                if (pFeugen)
+                {
+                    pFeugen->ForcedDespawn();
+                    pFeugen->Respawn();
+                }
+                if (pStalagg)
+                {
+                    pStalagg->ForcedDespawn();
+                    pStalagg->Respawn();
+                }
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THADDIUS, DONE);
+
+                // Force Despawn of Adds
+                Creature* pFeugen = m_pInstance->GetSingleCreatureFromStorage(NPC_FEUGEN);
+                Creature* pStalagg = m_pInstance->GetSingleCreatureFromStorage(NPC_STALAGG);
+
+                if (pFeugen)
+                {
+                    pFeugen->ForcedDespawn();
+                }
+                if (pStalagg)
+                {
+                    pStalagg->ForcedDespawn();
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Berserk
+            if (m_uiBerserkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BESERK) == CAST_OK)                  // allow combat movement?
+                {
+                    m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+                }
+            }
+            else
+            {
+                m_uiBerserkTimer -= uiDiff;
+            }
+
+            // Polarity Shift
+            if (m_uiPolarityShiftTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_POLARITY_SHIFT, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                {
+                    DoScriptText(SAY_ELECT, m_creature);
+                    DoScriptText(EMOTE_POLARITY_SHIFT, m_creature);
+                    m_uiPolarityShiftTimer = 30 * IN_MILLISECONDS;
+                }
+            }
+            else
+            {
+                m_uiPolarityShiftTimer -= uiDiff;
+            }
+
+            // Chain Lightning
+            if (m_uiChainLightningTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0);
+                if (pTarget && DoCastSpellIfCan(pTarget, SPELL_CHAIN_LIGHTNING) == CAST_OK)
+                {
+                    m_uiChainLightningTimer = 15 * IN_MILLISECONDS;
+                }
+            }
+            else
+            {
+                m_uiChainLightningTimer -= uiDiff;
+            }
+
+            // Ball Lightning if target not in melee range
+            // TODO: Verify, likely that the boss should attack any enemy in melee range before starting to cast
+            if (!m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+            {
+                if (m_uiBallLightningTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_BALL_LIGHTNING) == CAST_OK)
+                    {
+                        m_uiBallLightningTimer = 1 * IN_MILLISECONDS;
+                    }
+                }
+                else
+                {
+                    m_uiBallLightningTimer -= uiDiff;
+                }
+            }
+            else
+            {
+                DoMeleeAttackIfReady();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_thaddiusAI(pCreature);
+    }
+};
+
+struct spell_thaddius_encounter : public SpellScript
+{
+    spell_thaddius_encounter() : SpellScript("spell_thaddius_encounter") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        switch (uiSpellId)
+        {
+        case SPELL_SHOCK_OVERLOAD:
+            if (uiEffIndex == EFFECT_INDEX_0)
+            {
+                // Only do something to Thaddius, and on the first hit.
+                if (pCreatureTarget->GetEntry() != NPC_THADDIUS || !pCreatureTarget->ToCreature()->HasAura(SPELL_THADIUS_SPAWN))
+                {
+                    return true;
+                }
+                // remove Stun and then Cast
+                pCreatureTarget->ToCreature()->RemoveAurasDueToSpell(SPELL_THADIUS_SPAWN);
+                pCreatureTarget->ToCreature()->CastSpell(pCreatureTarget->ToCreature(), SPELL_THADIUS_LIGHTNING_VISUAL, false);
+            }
+            return true;
+        case SPELL_THADIUS_LIGHTNING_VISUAL:
+            if (uiEffIndex == EFFECT_INDEX_0 && pCreatureTarget->GetEntry() == NPC_THADDIUS)
+            {
+                if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreatureTarget->ToCreature()->GetInstanceData())
+                {
+                    if (Player* pPlayer = pInstance->GetPlayerInMap(true, false))
+                    {
+                        pCreatureTarget->ToCreature()->AI()->AttackStart(pPlayer);
+                    }
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+};
+
+/************
+** npc_tesla_coil
+************/
+
+struct npc_tesla_coil : public CreatureScript
+{
+    npc_tesla_coil() : CreatureScript("npc_tesla_coil") {}
+
+    struct npc_tesla_coilAI : public Scripted_NoMovementAI
+    {
+        npc_tesla_coilAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_uiSetupTimer = 1 * IN_MILLISECONDS;
+            m_uiOverloadTimer = 0;
+            m_bReapply = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bToFeugen;
+        bool m_bReapply;
+
+        uint32 m_uiSetupTimer;
+        uint32 m_uiOverloadTimer;
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(EMOTE_LOSING_LINK, m_creature);
+        }
+
+        // Overwrite this function here to
+        // * Keep Chain spells casted when evading after useless EnterCombat caused by 'buffing' the add
+        // * To not remove the Passive spells when evading after ie killed a player
+        void EnterEvadeMode() override
+        {
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop();
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* /*pInvoker*/, uint32 uiMiscValue) override
+        {
+            if (pSender == m_creature)
+            {
+                switch (eventType)
+                {
+                case AI_EVENT_CUSTOM_A:
+                    ReApplyChain(uiMiscValue);
+                    break;
+                case AI_EVENT_CUSTOM_B:
+                    SetOverloading();
+                    break;
+                default:
+                    break;
+                }
+            }
+        }
+
+        bool SetupChain()
+        {
+            // Check, if instance_ script failed or encounter finished
+            if (!m_pInstance || m_pInstance->GetData(TYPE_THADDIUS) == DONE)
+            {
+                return true;
+            }
+
+            GameObject* pNoxTeslaFeugen = m_pInstance->GetSingleGameObjectFromStorage(GO_CONS_NOX_TESLA_FEUGEN);
+            GameObject* pNoxTeslaStalagg = m_pInstance->GetSingleGameObjectFromStorage(GO_CONS_NOX_TESLA_STALAGG);
+
+            // Try again, till Tesla GOs are spawned
+            if (!pNoxTeslaFeugen || !pNoxTeslaStalagg)
+            {
+                return false;
+            }
+
+            m_bToFeugen = m_creature->GetDistanceOrder(pNoxTeslaFeugen, pNoxTeslaStalagg);
+
+            if (DoCastSpellIfCan(m_creature, m_bToFeugen ? SPELL_FEUGEN_CHAIN : SPELL_STALAGG_CHAIN) == CAST_OK)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        void ReApplyChain(uint32 uiEntry)
+        {
+            if (uiEntry)                                        // called from Stalagg/Feugen with their entry
+            {
+                // Only apply chain to own add
+                if ((uiEntry == NPC_FEUGEN && !m_bToFeugen) || (uiEntry == NPC_STALAGG && m_bToFeugen))
+                {
+                    return;
+                }
+
+                m_bReapply = true;                              // Reapply Chains on next tick
+            }
+            else                                                // if called from next tick, needed because otherwise the spell doesn't bind
+            {
+                m_bReapply = false;
+                m_creature->InterruptNonMeleeSpells(true);
+                GameObject* pGo = m_pInstance->GetSingleGameObjectFromStorage(m_bToFeugen ? GO_CONS_NOX_TESLA_FEUGEN : GO_CONS_NOX_TESLA_STALAGG);
+
+                if (pGo && pGo->GetGoType() == GAMEOBJECT_TYPE_BUTTON && pGo->getLootState() == GO_ACTIVATED)
+                {
+                    pGo->ResetDoorOrButton();
+                }
+
+                DoCastSpellIfCan(m_creature, m_bToFeugen ? SPELL_FEUGEN_CHAIN : SPELL_STALAGG_CHAIN);
+            }
+        }
+
+        void SetOverloading()
+        {
+            m_uiOverloadTimer = 14 * IN_MILLISECONDS;           // it takes some time to overload and activate Thaddius
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            m_creature->SelectHostileTarget();
+
+            if (!m_uiOverloadTimer && !m_uiSetupTimer && !m_bReapply)
+            {
+                return;    // Nothing to do this tick
+            }
+
+            if (m_uiSetupTimer)
+            {
+                if (m_uiSetupTimer <= uiDiff)
+                {
+                    if (SetupChain())
+                    {
+                        m_uiSetupTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiSetupTimer = 5 * IN_MILLISECONDS;
+                    }
+                }
+                else
+                {
+                    m_uiSetupTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiOverloadTimer)
+            {
+                if (m_uiOverloadTimer <= uiDiff)
+                {
+                    m_uiOverloadTimer = 0;
+                    m_creature->RemoveAurasDueToSpell(m_bToFeugen ? SPELL_FEUGEN_TESLA_PASSIVE : SPELL_STALAGG_TESLA_PASSIVE);
+                    DoCastSpellIfCan(m_creature, SPELL_SHOCK_OVERLOAD, CAST_INTERRUPT_PREVIOUS);
+                    DoScriptText(EMOTE_TESLA_OVERLOAD, m_creature);
+                    m_pInstance->DoUseDoorOrButton(m_bToFeugen ? GO_CONS_NOX_TESLA_FEUGEN : GO_CONS_NOX_TESLA_STALAGG);
+                }
+                else
+                {
+                    m_uiOverloadTimer -= uiDiff;
+                }
+            }
+
+            if (m_bReapply)
+            {
+                ReApplyChain(0);
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_tesla_coilAI(pCreature);
+    }
+};
+
+/************
+** boss_thaddiusAddsAI - Superclass for Feugen & Stalagg
+************/
+
+struct boss_thaddiusAddsAI : public ScriptedAI
+{
+    boss_thaddiusAddsAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        Reset();
+    }
+
+    ScriptedInstance* m_pInstance;
+
+    bool m_bFakeDeath;
+    bool m_bBothDead;
+
+    uint32 m_uiHoldTimer;
+    uint32 m_uiWarStompTimer;
+    uint32 m_uiReviveTimer;
+
+    void Reset() override
+    {
+        m_bFakeDeath = false;
+        m_bBothDead = false;
+
+        m_uiReviveTimer = 5 * IN_MILLISECONDS;
+        m_uiHoldTimer = 2 * IN_MILLISECONDS;
+        m_uiWarStompTimer = urand(8 * IN_MILLISECONDS, 10 * IN_MILLISECONDS);
+
+        // We might Reset while faking death, so undo this
+        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        m_creature->SetHealth(m_creature->GetMaxHealth());
+        m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+    }
+
+    Creature* GetOtherAdd()                                 // For Stalagg returns pFeugen, for Feugen returns pStalagg
+    {
+        switch (m_creature->GetEntry())
+        {
+            case NPC_FEUGEN:
+                return m_pInstance->GetSingleCreatureFromStorage(NPC_STALAGG);
+            case NPC_STALAGG:
+                return m_pInstance->GetSingleCreatureFromStorage(NPC_FEUGEN);
+            default:
+                return NULL;
+        }
+    }
+
+    void Aggro(Unit* pWho) override
+    {
+        if (!m_pInstance)
+        {
+            return;
+        }
+
+        m_pInstance->SetData(TYPE_THADDIUS, IN_PROGRESS);
+
+        if (Creature* pOtherAdd = GetOtherAdd())
+        {
+            if (!pOtherAdd->IsInCombat())
+            {
+                pOtherAdd->AI()->AttackStart(pWho);
+            }
+        }
+    }
+
+    void JustRespawned() override
+    {
+        Reset();                                            // Needed to reset the flags properly
+
+        if (m_pInstance)
+        {
+            m_pInstance->SetData(TYPE_SIGNAL_9, m_creature->GetEntry());    //TODO why do not SendAIEventAround??
+        }
+
+    }
+
+    void JustReachedHome() override
+    {
+        if (!m_pInstance)
+        {
+            return;
+        }
+
+        if (Creature* pOther = GetOtherAdd())
+        {
+            if (boss_thaddiusAddsAI* pOtherAI = dynamic_cast<boss_thaddiusAddsAI*>(pOther->AI()))
+            {
+                if (pOtherAI->IsCountingDead())
+                {
+                    pOther->ForcedDespawn();
+                    pOther->Respawn();
+                }
+            }
+        }
+
+        // Reapply Chains if needed
+        if (!m_creature->HasAura(SPELL_FEUGEN_CHAIN) && !m_creature->HasAura(SPELL_STALAGG_CHAIN))
+        {
+            JustRespawned();
+        }
+
+        m_pInstance->SetData(TYPE_THADDIUS, FAIL);
+    }
+
+    void Revive()
+    {
+        DoResetThreat();
+        PauseCombatMovement();
+        Reset();
+    }
+
+    bool IsCountingDead()
+    {
+        return m_bFakeDeath || m_creature->IsDead();
+    }
+
+    void PauseCombatMovement()
+    {
+        SetCombatMovement(false);
+        m_uiHoldTimer = 1500;
+    }
+
+    virtual void UpdateAddAI(const uint32 /*uiDiff*/) {}        // Used for Add-specific spells
+
+    void UpdateAI(const uint32 uiDiff) override
+    {
+        if (m_bBothDead)                                    // This is the case while fighting Thaddius
+        {
+            return;
+        }
+
+        if (m_bFakeDeath)
+        {
+            if (m_uiReviveTimer < uiDiff)
+            {
+                if (Creature* pOther = GetOtherAdd())
+                {
+                    if (boss_thaddiusAddsAI* pOtherAI = dynamic_cast<boss_thaddiusAddsAI*>(pOther->AI()))
+                    {
+                        if (!pOtherAI->IsCountingDead())    // Raid was to slow to kill the second add
+                        {
+                            Revive();
+                        }
+                        else
+                        {
+                            m_bBothDead = true;             // Now both adds are counting dead
+                            pOtherAI->m_bBothDead = true;
+                            // Set both Teslas to overload
+                            m_pInstance->SetData(TYPE_SIGNAL_10, 0);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                m_uiReviveTimer -= uiDiff;
+            }
+            return;
+        }
+
+        if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+        {
+            return;
+        }
+
+        if (m_uiHoldTimer)                                  // A short timer preventing combat movement after revive
+        {
+            if (m_uiHoldTimer <= uiDiff)
+            {
+                SetCombatMovement(true);
+                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                m_uiHoldTimer = 0;
+            }
+            else
+            {
+                m_uiHoldTimer -= uiDiff;
+            }
+        }
+
+        if (m_uiWarStompTimer < uiDiff)
+        {
+            if (DoCastSpellIfCan(m_creature, SPELL_WARSTOMP) == CAST_OK)
+            {
+                m_uiWarStompTimer = urand(8 * IN_MILLISECONDS, 10 * IN_MILLISECONDS);
+            }
+        }
+        else
+            { m_uiWarStompTimer -= uiDiff; }
+
+        UpdateAddAI(uiDiff);                    // For Add Specific Abilities
+
+        DoMeleeAttackIfReady();
+    }
+
+    void DamageTaken(Unit* pKiller, uint32& uiDamage) override
+    {
+        if (uiDamage < m_creature->GetHealth())
+        {
+            return;
+        }
+
+        // Prevent glitch if in fake death
+        if (m_bFakeDeath)
+        {
+            uiDamage = 0;
+            return;
+        }
+
+        // prevent death
+        uiDamage = 0;
+        m_bFakeDeath = true;
+
+        m_creature->InterruptNonMeleeSpells(false);
+        m_creature->SetHealth(0);
+        m_creature->StopMoving();
+        m_creature->ClearComboPointHolders();
+        m_creature->RemoveAllAurasOnDeath();
+#if defined (CLASSIC)
+        m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+#else
+        m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+#endif
+        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        m_creature->ClearAllReactives();
+        m_creature->GetMotionMaster()->Clear();
+        m_creature->GetMotionMaster()->MoveIdle();
+        m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+
+        JustDied(pKiller);                                  // Texts
+    }
+};
+
+/************
+** boss_stalagg
+************/
+
+struct boss_stalagg : public CreatureScript
+{
+    boss_stalagg() : CreatureScript("boss_stalagg") {}
+
+    struct boss_stalaggAI : public boss_thaddiusAddsAI
+    {
+        boss_stalaggAI(Creature* pCreature) : boss_thaddiusAddsAI(pCreature)
+        {
+        }
+        uint32 m_uiPowerSurgeTimer;
+
+        void Reset() override
+        {
+            boss_thaddiusAddsAI::Reset();
+            m_uiPowerSurgeTimer = urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS);
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            DoScriptText(SAY_STAL_AGGRO, m_creature);
+            boss_thaddiusAddsAI::Aggro(pWho);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_STAL_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoScriptText(SAY_STAL_SLAY, m_creature);
+            }
+        }
+
+        void UpdateAddAI(const uint32 uiDiff)
+        {
+            if (m_uiPowerSurgeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_POWERSURGE) == CAST_OK)
+                {
+                    m_uiPowerSurgeTimer = urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS);
+                }
+            }
+            else
+            {
+                m_uiPowerSurgeTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_stalaggAI(pCreature);
+    }
+};
+
+/************
+** boss_feugen
+************/
+
+struct boss_feugen : public CreatureScript
+{
+    boss_feugen() : CreatureScript("boss_feugen") {}
+
+    struct boss_feugenAI : public boss_thaddiusAddsAI
+    {
+        boss_feugenAI(Creature* pCreature) : boss_thaddiusAddsAI(pCreature)
+        {
+        }
+        uint32 m_uiStaticFieldTimer;
+        uint32 m_uiMagneticPullTimer;                           // TODO, missing
+
+        void Reset() override
+        {
+            boss_thaddiusAddsAI::Reset();
+            m_uiStaticFieldTimer = urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS);
+            m_uiMagneticPullTimer = 20 * IN_MILLISECONDS;
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            DoScriptText(SAY_FEUG_AGGRO, m_creature);
+            boss_thaddiusAddsAI::Aggro(pWho);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_FEUG_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoScriptText(SAY_FEUG_SLAY, m_creature);
+            }
+        }
+
+        void UpdateAddAI(const uint32 uiDiff)
+        {
+            if (m_uiStaticFieldTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_STATIC_FIELD) == CAST_OK)
+                {
+                    m_uiStaticFieldTimer = urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS);
+                }
+            }
+            else
+            {
+                m_uiStaticFieldTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_feugenAI(pCreature);
+    }
+};
+
+void AddSC_boss_thaddius()
+{
+    Script* s;
+    s = new boss_thaddius();
+    s->RegisterSelf();
+    s = new boss_stalagg();
+    s->RegisterSelf();
+    s = new boss_feugen();
+    s->RegisterSelf();
+    s = new npc_tesla_coil();
+    s->RegisterSelf();
+    s = new spell_thaddius_encounter();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_thaddius";
+    //pNewScript->GetAI = &GetAI_boss_thaddius;
+    //pNewScript->pEffectDummyNPC = &EffectDummyNPC_spell_thaddius_encounter;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_stalagg";
+    //pNewScript->GetAI = &GetAI_boss_stalagg;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_feugen";
+    //pNewScript->GetAI = &GetAI_boss_feugen;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_tesla_coil";
+    //pNewScript->GetAI = &GetAI_npc_tesla_coil;
+    //pNewScript->pEffectDummyNPC = &EffectDummyNPC_spell_thaddius_encounter;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/instance_naxxramas.cpp b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/instance_naxxramas.cpp
new file mode 100644
index 000000000..e16235d39
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/instance_naxxramas.cpp
@@ -0,0 +1,1131 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Naxxramas
+ * SD%Complete: 90
+ * SDComment:   None
+ * SDCategory:  Naxxramas
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+static const DialogueEntry aNaxxDialogue[] =
+{
+    {NPC_KELTHUZAD,         0,                  10000},
+    {SAY_SAPP_DIALOG1,      NPC_KELTHUZAD,      5000},
+    {SAY_SAPP_DIALOG2_LICH, NPC_THE_LICHKING,   17000},
+    {SAY_SAPP_DIALOG3,      NPC_KELTHUZAD,      6000},
+    {SAY_SAPP_DIALOG4_LICH, NPC_THE_LICHKING,   8000},
+    {SAY_SAPP_DIALOG5,      NPC_KELTHUZAD,      0},
+    {NPC_THANE,             0,                  10000},
+    {SAY_KORT_TAUNT1,       NPC_THANE,          5000},
+    {SAY_ZELI_TAUNT1,       NPC_ZELIEK,         6000},
+    {SAY_BLAU_TAUNT1,       NPC_BLAUMEUX,       6000},
+    {SAY_MORG_TAUNT1,       NPC_MOGRAINE,       7000},
+    {SAY_BLAU_TAUNT2,       NPC_BLAUMEUX,       6000},
+    {SAY_ZELI_TAUNT2,       NPC_ZELIEK,         5000},
+    {SAY_KORT_TAUNT2,       NPC_THANE,          7000},
+    {SAY_MORG_TAUNT2,       NPC_MOGRAINE,       0},
+    {0, 0, 0}
+};
+
+struct GothTrigger
+{
+    bool bIsRightSide;
+    bool bIsAnchorHigh;
+};
+
+static const float aSapphPositions[4] = { 3521.48f, -5234.87f, 137.626f, 4.53329f };
+
+struct is_naxxramas : public InstanceScript
+{
+    is_naxxramas() : InstanceScript("instance_naxxramas") {}
+
+    class instance_naxxramas : public ScriptedInstance
+    {
+    public:
+        instance_naxxramas(Map* pMap) : ScriptedInstance(pMap),
+            m_tempCreatureGuid(0),
+            m_playerNearGothik(0),
+            m_fChamberCenterX(0.0f),
+            m_fChamberCenterY(0.0f),
+            m_fChamberCenterZ(0.0f),
+            m_uiSapphSpawnTimer(0),
+            m_uiTauntTimer(0),
+            m_uiChanberCenterAT(0),
+            m_uiHorseMenKilled(0),
+            m_dialogueHelper(aNaxxDialogue)
+        {
+            Initialize();
+        }
+
+        ~instance_naxxramas() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+
+            m_dialogueHelper.InitializeDialogueHelper(this, true);
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i <= TYPE_KELTHUZAD; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    return true;
+                }
+            }
+
+            // Some Encounters use SPECIAL while in progress
+            if (m_auiEncounter[TYPE_GOTHIK] == SPECIAL)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            // Function only used to summon Sapphiron in case of server reload
+            if (GetData(TYPE_SAPPHIRON) != SPECIAL)
+            {
+                return;
+            }
+
+            // Check if already summoned
+            if (GetSingleCreatureFromStorage(NPC_SAPPHIRON, true))
+            {
+                return;
+            }
+
+            pPlayer->SummonCreature(NPC_SAPPHIRON, aSapphPositions[0], aSapphPositions[1], aSapphPositions[2], aSapphPositions[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_ANUB_REKHAN:
+            case NPC_FAERLINA:
+            case NPC_THADDIUS:
+            case NPC_STALAGG:
+            case NPC_FEUGEN:
+            case NPC_ZELIEK:
+            case NPC_THANE:
+            case NPC_BLAUMEUX:
+            case NPC_MOGRAINE:
+            case NPC_SPIRIT_OF_BLAUMEUX:
+            case NPC_SPIRIT_OF_MOGRAINE:
+            case NPC_SPIRIT_OF_KORTHAZZ:
+            case NPC_SPIRIT_OF_ZELIREK:
+            case NPC_GOTHIK:
+            case NPC_SAPPHIRON:
+            case NPC_KELTHUZAD:
+            case NPC_THE_LICHKING:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+
+            case NPC_SUB_BOSS_TRIGGER:
+                m_lGothTriggerList.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_TESLA_COIL:
+                m_lThadTeslaCoilList.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+                // Arachnid Quarter
+            case GO_ARAC_ANUB_DOOR:
+                break;
+            case GO_ARAC_ANUB_GATE:
+                if (m_auiEncounter[TYPE_ANUB_REKHAN] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_ARAC_FAER_WEB:
+                break;
+            case GO_ARAC_FAER_DOOR:
+                if (m_auiEncounter[TYPE_FAERLINA] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_ARAC_MAEX_INNER_DOOR:
+                break;
+            case GO_ARAC_MAEX_OUTER_DOOR:
+                if (m_auiEncounter[TYPE_FAERLINA] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+
+                // Plague Quarter
+            case GO_PLAG_NOTH_ENTRY_DOOR:
+                break;
+            case GO_PLAG_NOTH_EXIT_DOOR:
+                if (m_auiEncounter[TYPE_NOTH] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_PLAG_HEIG_ENTRY_DOOR:
+                if (m_auiEncounter[TYPE_NOTH] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_PLAG_HEIG_EXIT_HALLWAY:
+                if (m_auiEncounter[TYPE_HEIGAN] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_PLAG_LOAT_DOOR:
+                break;
+
+                // Military Quarter
+            case GO_MILI_GOTH_ENTRY_GATE:
+                break;
+            case GO_MILI_GOTH_EXIT_GATE:
+                if (m_auiEncounter[TYPE_GOTHIK] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_MILI_GOTH_COMBAT_GATE:
+                break;
+            case GO_MILI_HORSEMEN_DOOR:
+                if (m_auiEncounter[TYPE_GOTHIK] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_CHEST_HORSEMEN_NORM:
+                break;
+
+                // Construct Quarter
+            case GO_CONS_PATH_EXIT_DOOR:
+                if (m_auiEncounter[TYPE_PATCHWERK] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_CONS_GLUT_EXIT_DOOR:
+                if (m_auiEncounter[TYPE_GLUTH] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_CONS_THAD_DOOR:
+                if (m_auiEncounter[TYPE_GLUTH] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_CONS_NOX_TESLA_FEUGEN:
+                if (m_auiEncounter[TYPE_THADDIUS] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_READY);
+                }
+                break;
+            case GO_CONS_NOX_TESLA_STALAGG:
+                if (m_auiEncounter[TYPE_THADDIUS] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_READY);
+                }
+                break;
+
+                // Frostwyrm Lair
+            case GO_KELTHUZAD_WATERFALL_DOOR:
+                if (m_auiEncounter[TYPE_SAPPHIRON] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_KELTHUZAD_EXIT_DOOR:
+            case GO_KELTHUZAD_WINDOW_1:
+            case GO_KELTHUZAD_WINDOW_2:
+            case GO_KELTHUZAD_WINDOW_3:
+            case GO_KELTHUZAD_WINDOW_4:
+                break;
+
+                // Eyes
+            case GO_ARAC_EYE_RAMP:
+            case GO_ARAC_EYE_BOSS:
+                if (m_auiEncounter[TYPE_MAEXXNA] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_PLAG_EYE_RAMP:
+            case GO_PLAG_EYE_BOSS:
+                if (m_auiEncounter[TYPE_LOATHEB] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_MILI_EYE_RAMP:
+            case GO_MILI_EYE_BOSS:
+                if (m_auiEncounter[TYPE_FOUR_HORSEMEN] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_CONS_EYE_RAMP:
+            case GO_CONS_EYE_BOSS:
+                if (m_auiEncounter[TYPE_THADDIUS] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+
+                // Portals
+            case GO_ARAC_PORTAL:
+                if (m_auiEncounter[TYPE_MAEXXNA] == DONE)
+                {
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                }
+                break;
+            case GO_PLAG_PORTAL:
+                if (m_auiEncounter[TYPE_LOATHEB] == DONE)
+                {
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                }
+                break;
+            case GO_MILI_PORTAL:
+                if (m_auiEncounter[TYPE_FOUR_HORSEMEN] == DONE)
+                {
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                }
+                break;
+            case GO_CONS_PORTAL:
+                if (m_auiEncounter[TYPE_THADDIUS] == DONE)
+                {
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                }
+                break;
+
+            default:
+                // Heigan Traps - many different entries which are only required for sorting
+                if (pGo->GetGoType() == GAMEOBJECT_TYPE_TRAP)
+                {
+                    uint32 uiGoEntry = pGo->GetEntry();
+
+                    if ((uiGoEntry >= 181517 && uiGoEntry <= 181524) || uiGoEntry == 181678)
+                    {
+                        m_alHeiganTrapGuids[0].push_back(pGo->GetObjectGuid());
+                    }
+                    else if ((uiGoEntry >= 181510 && uiGoEntry <= 181516) || (uiGoEntry >= 181525 && uiGoEntry <= 181531) || uiGoEntry == 181533 || uiGoEntry == 181676)
+                    {
+                        m_alHeiganTrapGuids[1].push_back(pGo->GetObjectGuid());
+                    }
+                    else if ((uiGoEntry >= 181534 && uiGoEntry <= 181544) || uiGoEntry == 181532 || uiGoEntry == 181677)
+                    {
+                        m_alHeiganTrapGuids[2].push_back(pGo->GetObjectGuid());
+                    }
+                    else if ((uiGoEntry >= 181545 && uiGoEntry <= 181552) || uiGoEntry == 181695)
+                    {
+                        m_alHeiganTrapGuids[3].push_back(pGo->GetObjectGuid());
+                    }
+                }
+
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_MR_BIGGLESWORTH && m_auiEncounter[TYPE_KELTHUZAD] != DONE)
+            {
+                DoOrSimulateScriptTextForThisInstance(SAY_KELTHUZAD_CAT_DIED, NPC_KELTHUZAD);
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_ANUB_REKHAN:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_ARAC_ANUB_DOOR);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_ARAC_ANUB_GATE);
+                }
+                break;
+            case TYPE_FAERLINA:
+                DoUseDoorOrButton(GO_ARAC_FAER_WEB);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_ARAC_FAER_DOOR);
+                    DoUseDoorOrButton(GO_ARAC_MAEX_OUTER_DOOR);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_MAEXXNA:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_ARAC_MAEX_INNER_DOOR, uiData);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_ARAC_EYE_RAMP);
+                    DoUseDoorOrButton(GO_ARAC_EYE_BOSS);
+                    DoRespawnGameObject(GO_ARAC_PORTAL, 30 * MINUTE);
+                    DoToggleGameObjectFlags(GO_ARAC_PORTAL, GO_FLAG_NO_INTERACT, false);
+                    m_uiTauntTimer = 5000;
+                }
+                break;
+            case TYPE_NOTH:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_PLAG_NOTH_ENTRY_DOOR);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_PLAG_NOTH_EXIT_DOOR);
+                    DoUseDoorOrButton(GO_PLAG_HEIG_ENTRY_DOOR);
+                }
+                break;
+            case TYPE_HEIGAN:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_PLAG_HEIG_ENTRY_DOOR);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_PLAG_HEIG_EXIT_HALLWAY);
+                }
+                break;
+            case TYPE_LOATHEB:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_PLAG_LOAT_DOOR);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_PLAG_EYE_RAMP);
+                    DoUseDoorOrButton(GO_PLAG_EYE_BOSS);
+                    DoRespawnGameObject(GO_PLAG_PORTAL, 30 * MINUTE);
+                    DoToggleGameObjectFlags(GO_PLAG_PORTAL, GO_FLAG_NO_INTERACT, false);
+                    m_uiTauntTimer = 5000;
+                }
+                break;
+            case TYPE_RAZUVIOUS:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_GOTHIK:
+                switch (uiData)
+                {
+                case IN_PROGRESS:
+                    DoUseDoorOrButton(GO_MILI_GOTH_ENTRY_GATE);
+                    DoUseDoorOrButton(GO_MILI_GOTH_COMBAT_GATE);
+                    break;
+                case SPECIAL:
+                    DoUseDoorOrButton(GO_MILI_GOTH_COMBAT_GATE);
+                    break;
+                case FAIL:
+                    if (m_auiEncounter[uiType] == IN_PROGRESS)
+                    {
+                        DoUseDoorOrButton(GO_MILI_GOTH_COMBAT_GATE);
+                    }
+
+                    DoUseDoorOrButton(GO_MILI_GOTH_ENTRY_GATE);
+                    break;
+                case DONE:
+                    DoUseDoorOrButton(GO_MILI_GOTH_ENTRY_GATE);
+                    DoUseDoorOrButton(GO_MILI_GOTH_EXIT_GATE);
+                    DoUseDoorOrButton(GO_MILI_HORSEMEN_DOOR);
+
+                    m_dialogueHelper.StartNextDialogueText(NPC_THANE);
+                    break;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_FOUR_HORSEMEN:
+                // Skip if already set
+                if (m_auiEncounter[uiType] == uiData)
+                {
+                    return;
+                }
+                if (uiData == SPECIAL)
+                {
+                    ++m_uiHorseMenKilled;
+
+                    if (m_uiHorseMenKilled == 4)
+                    {
+                        SetData(TYPE_FOUR_HORSEMEN, DONE);
+                    }
+
+                    // Don't store special data
+                    break;
+                }
+                if (uiData == FAIL)
+                {
+                    m_uiHorseMenKilled = 0;
+                }
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_MILI_HORSEMEN_DOOR);
+                if (uiData == DONE)
+                {
+                    // Despawn spirits
+                    if (Creature* pSpirit = GetSingleCreatureFromStorage(NPC_SPIRIT_OF_BLAUMEUX))
+                    {
+                        pSpirit->ForcedDespawn();
+                    }
+                    if (Creature* pSpirit = GetSingleCreatureFromStorage(NPC_SPIRIT_OF_MOGRAINE))
+                    {
+                        pSpirit->ForcedDespawn();
+                    }
+                    if (Creature* pSpirit = GetSingleCreatureFromStorage(NPC_SPIRIT_OF_KORTHAZZ))
+                    {
+                        pSpirit->ForcedDespawn();
+                    }
+                    if (Creature* pSpirit = GetSingleCreatureFromStorage(NPC_SPIRIT_OF_ZELIREK))
+                    {
+                        pSpirit->ForcedDespawn();
+                    }
+
+                    DoUseDoorOrButton(GO_MILI_EYE_RAMP);
+                    DoUseDoorOrButton(GO_MILI_EYE_BOSS);
+                    DoRespawnGameObject(GO_MILI_PORTAL, 30 * MINUTE);
+                    DoToggleGameObjectFlags(GO_MILI_PORTAL, GO_FLAG_NO_INTERACT, false);
+                    DoRespawnGameObject(GO_CHEST_HORSEMEN_NORM, 30 * MINUTE);
+                    m_uiTauntTimer = 5000;
+                }
+                break;
+            case TYPE_PATCHWERK:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_CONS_PATH_EXIT_DOOR);
+                }
+                break;
+            case TYPE_GROBBULUS:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_GLUTH:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_CONS_GLUT_EXIT_DOOR);
+                    DoUseDoorOrButton(GO_CONS_THAD_DOOR);
+                }
+                break;
+            case TYPE_THADDIUS:
+                // Only process real changes here
+                if (m_auiEncounter[uiType] == uiData)
+                {
+                    return;
+                }
+
+                m_auiEncounter[uiType] = uiData;
+                if (uiData != SPECIAL)
+                {
+                    DoUseDoorOrButton(GO_CONS_THAD_DOOR, uiData);
+                }
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_CONS_EYE_RAMP);
+                    DoUseDoorOrButton(GO_CONS_EYE_BOSS);
+                    DoRespawnGameObject(GO_CONS_PORTAL, 30 * MINUTE);
+                    DoToggleGameObjectFlags(GO_CONS_PORTAL, GO_FLAG_NO_INTERACT, false);
+                    m_uiTauntTimer = 5000;
+                }
+                break;
+            case TYPE_SAPPHIRON:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_KELTHUZAD_WATERFALL_DOOR);
+                    m_dialogueHelper.StartNextDialogueText(NPC_KELTHUZAD);
+                }
+                // Start Sapph summoning process
+                if (uiData == SPECIAL)
+                {
+                    m_uiSapphSpawnTimer = 22000;
+                }
+                break;
+            case TYPE_KELTHUZAD:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_KELTHUZAD_EXIT_DOOR);
+                if (uiData == NOT_STARTED)
+                {
+                    if (GameObject* pWindow = GetSingleGameObjectFromStorage(GO_KELTHUZAD_WINDOW_1))
+                    {
+                        pWindow->ResetDoorOrButton();
+                    }
+                    if (GameObject* pWindow = GetSingleGameObjectFromStorage(GO_KELTHUZAD_WINDOW_2))
+                    {
+                        pWindow->ResetDoorOrButton();
+                    }
+                    if (GameObject* pWindow = GetSingleGameObjectFromStorage(GO_KELTHUZAD_WINDOW_3))
+                    {
+                        pWindow->ResetDoorOrButton();
+                    }
+                    if (GameObject* pWindow = GetSingleGameObjectFromStorage(GO_KELTHUZAD_WINDOW_4))
+                    {
+                        pWindow->ResetDoorOrButton();
+                    }
+                }
+                break;
+            case TYPE_SIGNAL_1:
+                if (AreaTriggerEntry const *at = sAreaTriggerStore.LookupEntry(uiData))
+                    SetChamberCenterCoords(at);
+                return;
+            case TYPE_SIGNAL_2:
+                if (Creature *pCreatureTarget = instance->GetCreature(ObjectGuid(m_tempCreatureGuid)))
+                {
+                    switch (uiData)
+                    {
+                    case SPELL_A_TO_ANCHOR_1:                           // trigger mobs at high right side
+                    case SPELL_B_TO_ANCHOR_1:
+                    case SPELL_C_TO_ANCHOR_1:
+                        if (Creature* pAnchor2 = GetClosestAnchorForGoth(pCreatureTarget, false))
+                        {
+                            uint32 uiTriggered = SPELL_A_TO_ANCHOR_2;
+
+                            if (uiData == SPELL_B_TO_ANCHOR_1)
+                            {
+                                uiTriggered = SPELL_B_TO_ANCHOR_2;
+                            }
+                            else if (uiData == SPELL_C_TO_ANCHOR_1)
+                            {
+                                uiTriggered = SPELL_C_TO_ANCHOR_2;
+                            }
+
+                            pCreatureTarget->ToCreature()->CastSpell(pAnchor2, uiTriggered, true);
+                        }
+                        break;
+                    case SPELL_A_TO_ANCHOR_2:                           // trigger mobs at high left side
+                    case SPELL_B_TO_ANCHOR_2:
+                    case SPELL_C_TO_ANCHOR_2:
+                    {
+                        std::list<Creature*> lTargets;
+                        GetGothSummonPointCreatures(lTargets, false);
+
+                        if (!lTargets.empty())
+                        {
+                            std::list<Creature*>::iterator itr = lTargets.begin();
+                            uint32 uiPosition = urand(0, lTargets.size() - 1);
+                            advance(itr, uiPosition);
+
+                            if (Creature* pTarget = (*itr))
+                            {
+                                uint32 uiTriggered = SPELL_A_TO_SKULL;
+
+                                if (uiData == SPELL_B_TO_ANCHOR_2)
+                                {
+                                    uiTriggered = SPELL_B_TO_SKULL;
+                                }
+                                else if (uiData == SPELL_C_TO_ANCHOR_2)
+                                {
+                                    uiTriggered = SPELL_C_TO_SKULL;
+                                }
+
+                                pCreatureTarget->CastSpell(pTarget, uiTriggered, true);
+                            }
+                        }
+                        break;
+                    }
+                    case SPELL_A_TO_SKULL:                              // final destination trigger mob
+                    case SPELL_B_TO_SKULL:
+                    case SPELL_C_TO_SKULL:
+                        if (Creature* pGoth = GetSingleCreatureFromStorage(NPC_GOTHIK))
+                        {
+                            uint32 uiNpcEntry = NPC_SPECT_TRAINEE;
+
+                            if (uiData == SPELL_B_TO_SKULL)
+                            {
+                                uiNpcEntry = NPC_SPECT_DEATH_KNIGHT;
+                            }
+                            else if (uiData == SPELL_C_TO_SKULL)
+                            {
+                                uiNpcEntry = NPC_SPECT_RIDER;
+                            }
+
+                            pGoth->SummonCreature(uiNpcEntry, pCreatureTarget->GetPositionX(), pCreatureTarget->GetPositionY(), pCreatureTarget->GetPositionZ(), pCreatureTarget->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                            if (uiNpcEntry == NPC_SPECT_RIDER)
+                            {
+                                pGoth->SummonCreature(NPC_SPECT_HORSE, pCreatureTarget->GetPositionX(), pCreatureTarget->GetPositionY(), pCreatureTarget->GetPositionZ(), pCreatureTarget->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 0);
+                            }
+                            break;
+                        }
+                    }
+                }
+                return;
+            case TYPE_SIGNAL_3:
+                 SetGothTriggers();
+                return;
+            case TYPE_SIGNAL_8:
+                DoTriggerHeiganTraps(instance->GetCreature(ObjectGuid(m_tempCreatureGuid)), uint8(uiData));
+                return;
+            case TYPE_SIGNAL_9:
+            case TYPE_SIGNAL_10:
+                for (GuidList::const_iterator itr = m_lThadTeslaCoilList.begin(); itr != m_lThadTeslaCoilList.end(); ++itr)
+                {
+                    if (Creature* pTesla = instance->GetCreature(*itr))
+                    {
+                        if (CreatureAI* pTeslaAI = pTesla->AI())
+                        {
+                            pTeslaAI->ReceiveAIEvent(uiType == TYPE_SIGNAL_9 ? AI_EVENT_CUSTOM_A : AI_EVENT_CUSTOM_B, pTesla, pTesla, uiData);
+                        }
+                    }
+                }
+                return;
+            }
+
+            if (uiData == DONE || (uiData == SPECIAL && uiType == TYPE_SAPPHIRON))
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6] << " " << m_auiEncounter[7] << " " << m_auiEncounter[8] << " "
+                    << m_auiEncounter[9] << " " << m_auiEncounter[10] << " " << m_auiEncounter[11] << " "
+                    << m_auiEncounter[12] << " " << m_auiEncounter[13] << " " << m_auiEncounter[14] << " " << m_auiEncounter[15];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+            else
+            {
+                switch (uiType)
+                {
+                case TYPE_SIGNAL_1:
+                    return m_uiChanberCenterAT;
+                case TYPE_SIGNAL_4:
+                    if (Player *pPlayer = instance->GetPlayer(m_playerNearGothik))
+                        return uint32(const_cast<instance_naxxramas*>(this)->IsInRightSideGothArea(pPlayer));
+                    else
+                        return uint32(false);
+                    break;
+                case TYPE_SIGNAL_7:
+                    return uint32(const_cast<instance_naxxramas*>(this)->IsInRightSideGothArea(instance->GetCreature(m_tempCreatureGuid)));
+                default:
+                    break;
+                }
+            }
+
+            return 0;
+        }
+
+        void SetData64(uint32 type, uint64 data) override
+        {
+            switch (type)
+            {
+            case TYPE_SIGNAL_2:
+            case TYPE_SIGNAL_6:
+            case TYPE_SIGNAL_7:
+            case TYPE_SIGNAL_8:
+                m_tempCreatureGuid = data;
+                break;
+            case TYPE_SIGNAL_4:
+                m_playerNearGothik = data;
+                break;
+            default:
+                break;
+            }
+        }
+
+        uint64 GetData64(uint32 type) const override
+        {
+            switch(type)
+            {
+            case TYPE_SIGNAL_5: //sequential retrieving of required trigger GUIDs; TODO fix the whole Gothik encounter code design
+                if (gtit == m_mGothTriggerMap.end())
+                {
+                    (const_cast<instance_naxxramas*>(this))->gtit = m_mGothTriggerMap.begin();
+                    return 0;
+                }
+                else
+                {
+                    while (gtit != m_mGothTriggerMap.end() && (gtit->second.bIsAnchorHigh || !gtit->second.bIsRightSide))
+                        ++(const_cast<instance_naxxramas*>(this))->gtit;
+                    if (gtit == m_mGothTriggerMap.end())
+                        return 0;
+                    return gtit->first.GetRawValue();
+                }
+                break;
+            case TYPE_SIGNAL_6: //the same design flaw...
+                if (Creature *anchor = (const_cast<instance_naxxramas*>(this))->GetClosestAnchorForGoth(instance->GetCreature(ObjectGuid(m_tempCreatureGuid)), true))
+                    return anchor->GetObjectGuid().GetRawValue();
+            }
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7]
+                >> m_auiEncounter[8] >> m_auiEncounter[9] >> m_auiEncounter[10] >> m_auiEncounter[11]
+                >> m_auiEncounter[12] >> m_auiEncounter[13] >> m_auiEncounter[14] >> m_auiEncounter[15];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_uiTauntTimer)
+            {
+                if (m_uiTauntTimer <= uiDiff)
+                {
+                    DoTaunt();
+                    m_uiTauntTimer = 0;
+                }
+                else
+                {
+                    m_uiTauntTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiSapphSpawnTimer)
+            {
+                if (m_uiSapphSpawnTimer <= uiDiff)
+                {
+                    if (Player* pPlayer = GetPlayerInMap())
+                    {
+                        pPlayer->SummonCreature(NPC_SAPPHIRON, aSapphPositions[0], aSapphPositions[1], aSapphPositions[2], aSapphPositions[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                    }
+
+                    m_uiSapphSpawnTimer = 0;
+                }
+                else
+                {
+                    m_uiSapphSpawnTimer -= uiDiff;
+                }
+            }
+
+            m_dialogueHelper.DialogueUpdate(uiDiff);
+        }
+
+        // Heigan
+        void DoTriggerHeiganTraps(Creature* pHeigan, uint32 uiAreaIndex)
+        {
+            if (uiAreaIndex >= MAX_HEIGAN_TRAP_AREAS)
+            {
+                return;
+            }
+
+            for (GuidList::const_iterator itr = m_alHeiganTrapGuids[uiAreaIndex].begin(); itr != m_alHeiganTrapGuids[uiAreaIndex].end(); ++itr)
+            {
+                if (GameObject* pTrap = instance->GetGameObject(*itr))
+                {
+                    pTrap->Use(pHeigan);
+                }
+            }
+        }
+
+        // goth
+        // Right is right side from gothik (eastern)
+        bool IsInRightSideGothArea(Unit* pUnit)
+        {
+            if (GameObject* pCombatGate = GetSingleGameObjectFromStorage(GO_MILI_GOTH_COMBAT_GATE))
+            {
+                return (pCombatGate->GetPositionY() >= pUnit->GetPositionY());
+            }
+
+            script_error_log("left/right side check, Gothik combat area failed.");
+            return true;
+        }
+
+        // thaddius
+        void GetThadTeslaCreatures(GuidList& lList) { lList = m_lThadTeslaCoilList; };
+
+        // kel
+        void SetChamberCenterCoords(AreaTriggerEntry const *at)
+        {
+            m_uiChanberCenterAT = at->id;
+        }
+
+        void GetChamberCenterCoords(float& fX, float& fY, float& fZ) { fX = m_fChamberCenterX; fY = m_fChamberCenterY; fZ = m_fChamberCenterZ; }
+        void DoTaunt()
+        {
+            if (m_auiEncounter[TYPE_KELTHUZAD] != DONE)
+            {
+                uint8 uiWingsCleared = 0;
+
+                if (m_auiEncounter[TYPE_MAEXXNA] == DONE)
+                {
+                    ++uiWingsCleared;
+                }
+
+                if (m_auiEncounter[TYPE_LOATHEB] == DONE)
+                {
+                    ++uiWingsCleared;
+                }
+
+                if (m_auiEncounter[TYPE_FOUR_HORSEMEN] == DONE)
+                {
+                    ++uiWingsCleared;
+                }
+
+                if (m_auiEncounter[TYPE_THADDIUS] == DONE)
+                {
+                    ++uiWingsCleared;
+                }
+
+                switch (uiWingsCleared)
+                {
+                case 1:
+                    DoOrSimulateScriptTextForThisInstance(SAY_KELTHUZAD_TAUNT1, NPC_KELTHUZAD);
+                    break;
+                case 2:
+                    DoOrSimulateScriptTextForThisInstance(SAY_KELTHUZAD_TAUNT2, NPC_KELTHUZAD);
+                    break;
+                case 3:
+                    DoOrSimulateScriptTextForThisInstance(SAY_KELTHUZAD_TAUNT3, NPC_KELTHUZAD);
+                    break;
+                case 4:
+                    DoOrSimulateScriptTextForThisInstance(SAY_KELTHUZAD_TAUNT4, NPC_KELTHUZAD);
+                    break;
+                }
+            }
+        }
+
+    private:
+        //Gothik
+        Creature* GetClosestAnchorForGoth(Creature* pSource, bool bRightSide)
+        {
+            std::list<Creature* > lList;
+
+            for (UNORDERED_MAP<ObjectGuid, GothTrigger>::iterator itr = m_mGothTriggerMap.begin(); itr != m_mGothTriggerMap.end(); ++itr)
+            {
+                if (!itr->second.bIsAnchorHigh)
+                {
+                    continue;
+                }
+
+                if (itr->second.bIsRightSide != bRightSide)
+                {
+                    continue;
+                }
+
+                if (Creature* pCreature = instance->GetCreature(itr->first))
+                {
+                    lList.push_back(pCreature);
+                }
+            }
+
+            if (!lList.empty())
+            {
+                lList.sort(ObjectDistanceOrder(pSource));
+                return lList.front();
+            }
+
+            return NULL;
+        }
+
+        void GetGothSummonPointCreatures(std::list<Creature*>& lList, bool bRightSide)
+        {
+            for (UNORDERED_MAP<ObjectGuid, GothTrigger>::iterator itr = m_mGothTriggerMap.begin(); itr != m_mGothTriggerMap.end(); ++itr)
+            {
+                if (itr->second.bIsAnchorHigh)
+                {
+                    continue;
+                }
+
+                if (itr->second.bIsRightSide != bRightSide)
+                {
+                    continue;
+                }
+
+                if (Creature* pCreature = instance->GetCreature(itr->first))
+                {
+                    lList.push_back(pCreature);
+                }
+            }
+        }
+
+        void SetGothTriggers()
+        {
+            Creature* pGoth = GetSingleCreatureFromStorage(NPC_GOTHIK);
+
+            if (!pGoth)
+            {
+                return;
+            }
+
+            for (GuidList::const_iterator itr = m_lGothTriggerList.begin(); itr != m_lGothTriggerList.end(); ++itr)
+            {
+                if (Creature* pTrigger = instance->GetCreature(*itr))
+                {
+                    GothTrigger pGt;
+                    pGt.bIsAnchorHigh = (pTrigger->GetPositionZ() >= (pGoth->GetPositionZ() - 5.0f));
+                    pGt.bIsRightSide = IsInRightSideGothArea(pTrigger);
+
+                    m_mGothTriggerMap[pTrigger->GetObjectGuid()] = pGt;
+                }
+            }
+            gtit = m_mGothTriggerMap.begin();
+        }
+
+        // data
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        GuidList m_lThadTeslaCoilList;
+        GuidList m_lGothTriggerList;
+        uint64 m_tempCreatureGuid;
+        uint64 m_playerNearGothik;
+
+        UNORDERED_MAP<ObjectGuid, GothTrigger> m_mGothTriggerMap;
+        UNORDERED_MAP<ObjectGuid, GothTrigger>::const_iterator gtit;
+
+        GuidList m_alHeiganTrapGuids[MAX_HEIGAN_TRAP_AREAS];
+
+        float m_fChamberCenterX;
+        float m_fChamberCenterY;
+        float m_fChamberCenterZ;
+
+        uint32 m_uiSapphSpawnTimer;
+        uint32 m_uiTauntTimer;
+        uint32 m_uiChanberCenterAT;
+        uint8 m_uiHorseMenKilled;
+
+        DialogueHelper m_dialogueHelper;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_naxxramas(pMap);
+    }
+};
+
+struct at_naxxramas : public AreaTriggerScript
+{
+    at_naxxramas() : AreaTriggerScript("at_naxxramas") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData();
+        switch (pAt->id)
+        {
+        case AREATRIGGER_KELTHUZAD:
+            if (pPlayer->isGameMaster() || !pPlayer->IsAlive())
+            {
+                return false;
+            }
+
+            if (pInstance)
+            {
+                pInstance->SetData(TYPE_SIGNAL_1, pAt->id); //it is unclear why do not hardcode AREATRIGGER_KELTHUZAD constant into the single place it used: boss_kelthuzad::JustSummoned
+
+                if (pInstance->GetData(TYPE_KELTHUZAD) == NOT_STARTED)
+                {
+                    if (Creature* pKelthuzad = pInstance->GetSingleCreatureFromStorage(NPC_KELTHUZAD))
+                    {
+                        if (pKelthuzad->IsAlive())
+                        {
+                            pInstance->SetData(TYPE_KELTHUZAD, IN_PROGRESS);
+                            pKelthuzad->SetInCombatWithZone();
+                        }
+                    }
+                }
+            }
+            else
+                return false;
+            break;
+        case AREATRIGGER_THADDIUS_DOOR:
+            if (pInstance && pInstance->GetData(TYPE_THADDIUS) == NOT_STARTED)
+            {
+                if (Creature* pThaddius = pInstance->GetSingleCreatureFromStorage(NPC_THADDIUS))
+                {
+                    pInstance->SetData(TYPE_THADDIUS, SPECIAL);
+                    DoScriptText(SAY_THADDIUS_GREET, pThaddius);
+                }
+            }
+            break;
+        case AREATRIGGER_FROSTWYRM_TELE:
+            if (pInstance)
+            {
+                // Area trigger handles teleport in DB. Here we only need to check if all the end wing encounters are done
+                if (pInstance->GetData(TYPE_THADDIUS) != DONE || pInstance->GetData(TYPE_LOATHEB) != DONE || pInstance->GetData(TYPE_MAEXXNA) != DONE ||
+                    pInstance->GetData(TYPE_FOUR_HORSEMEN) != DONE)
+                {
+                    return true;
+                }
+            }
+            break;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_instance_naxxramas()
+{
+    Script* s;
+    s = new is_naxxramas();
+    s->RegisterSelf();
+    s = new at_naxxramas();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_naxxramas";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_naxxramas;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_naxxramas";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_naxxramas;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/naxxramas.h b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/naxxramas.h
new file mode 100644
index 000000000..23c3735d7
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/naxxramas/naxxramas.h
@@ -0,0 +1,215 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_NAXXRAMAS_H
+#define DEF_NAXXRAMAS_H
+
+enum
+{
+    MAX_ENCOUNTER               = 16,
+
+    // A few instance-script related texts
+    SAY_THADDIUS_GREET          = -1533029,
+
+    // Kel'Thuzad
+    SAY_KELTHUZAD_CAT_DIED      = -1533089,
+    // Kel'Thuzad's taunts after killing Wing Bosses
+    SAY_KELTHUZAD_TAUNT1        = -1533090,
+    SAY_KELTHUZAD_TAUNT2        = -1533091,
+    SAY_KELTHUZAD_TAUNT3        = -1533092,
+    SAY_KELTHUZAD_TAUNT4        = -1533093,
+    // Dialogues with Lich King
+    SAY_SAPP_DIALOG1            = -1533084,
+    SAY_SAPP_DIALOG2_LICH       = -1533085,
+    SAY_SAPP_DIALOG3            = -1533086,
+    SAY_SAPP_DIALOG4_LICH       = -1533087,
+    SAY_SAPP_DIALOG5            = -1533088,
+    // Horsemen dialogue texts
+    SAY_BLAU_TAUNT1             = -1533045,
+    SAY_BLAU_TAUNT2             = -1533046,
+    SAY_BLAU_TAUNT3             = -1533047,             // NYI - requires additiona research
+    SAY_MORG_TAUNT1             = -1533071,
+    SAY_MORG_TAUNT2             = -1533072,
+    SAY_MORG_TAUNT3             = -1533073,             // NYI - requires additiona research
+    SAY_KORT_TAUNT1             = -1533052,
+    SAY_KORT_TAUNT2             = -1533053,
+    SAY_KORT_TAUNT3             = -1533054,             // NYI - requires additiona research
+    SAY_ZELI_TAUNT1             = -1533059,
+    SAY_ZELI_TAUNT2             = -1533060,
+    SAY_ZELI_TAUNT3             = -1533061,             // NYI - requires additiona research
+
+    TYPE_ANUB_REKHAN            = 0,
+    TYPE_FAERLINA               = 1,
+    TYPE_MAEXXNA                = 2,
+
+    TYPE_NOTH                   = 3,
+    TYPE_HEIGAN                 = 4,
+    TYPE_LOATHEB                = 5,
+
+    TYPE_RAZUVIOUS              = 6,
+    TYPE_GOTHIK                 = 7,
+    TYPE_FOUR_HORSEMEN          = 8,
+
+    TYPE_PATCHWERK              = 9,
+    TYPE_GROBBULUS              = 10,
+    TYPE_GLUTH                  = 11,
+    TYPE_THADDIUS               = 12,
+
+    TYPE_SAPPHIRON              = 13,
+    TYPE_KELTHUZAD              = 14,
+    TYPE_SIGNAL_1               = MAX_ENCOUNTER,
+    TYPE_SIGNAL_2               = MAX_ENCOUNTER + 1,
+    TYPE_SIGNAL_3               = MAX_ENCOUNTER + 2,
+    TYPE_SIGNAL_4               = MAX_ENCOUNTER + 3,
+    TYPE_SIGNAL_5               = MAX_ENCOUNTER + 4,
+    TYPE_SIGNAL_6               = MAX_ENCOUNTER + 5,
+    TYPE_SIGNAL_7               = MAX_ENCOUNTER + 6,
+    TYPE_SIGNAL_8               = MAX_ENCOUNTER + 7,
+    TYPE_SIGNAL_9               = MAX_ENCOUNTER + 8,
+    TYPE_SIGNAL_10              = MAX_ENCOUNTER + 9,
+    TYPE_SIGNAL_11              = MAX_ENCOUNTER + 10,
+
+    MAX_HEIGAN_TRAP_AREAS       = 4,
+
+    NPC_ANUB_REKHAN             = 15956,
+    NPC_FAERLINA                = 15953,
+
+    NPC_THADDIUS                = 15928,
+    NPC_STALAGG                 = 15929,
+    NPC_FEUGEN                  = 15930,
+    NPC_TESLA_COIL              = 16218,
+
+    NPC_MOGRAINE                = 16062,
+    NPC_ZELIEK                  = 16063,
+    NPC_THANE                   = 16064,
+    NPC_BLAUMEUX                = 16065,
+
+    NPC_SPIRIT_OF_MOGRAINE      = 16775,
+    NPC_SPIRIT_OF_BLAUMEUX      = 16776,
+    NPC_SPIRIT_OF_ZELIREK       = 16777,
+    NPC_SPIRIT_OF_KORTHAZZ      = 16778,
+
+    NPC_SAPPHIRON               = 15989,
+    NPC_KELTHUZAD               = 15990,
+    NPC_THE_LICHKING            = 16980,
+    NPC_MR_BIGGLESWORTH         = 16998,
+
+    // Gothik
+    NPC_GOTHIK                  = 16060,
+    NPC_SUB_BOSS_TRIGGER        = 16137,                    // summon locations
+    NPC_UNREL_TRAINEE           = 16124,
+    NPC_UNREL_DEATH_KNIGHT      = 16125,
+    NPC_UNREL_RIDER             = 16126,
+    NPC_SPECT_TRAINEE           = 16127,
+    NPC_SPECT_DEATH_KNIGHT      = 16148,
+    NPC_SPECT_RIDER             = 16150,
+    NPC_SPECT_HORSE             = 16149,
+
+    // Kel'Thuzad
+    NPC_SOLDIER_FROZEN          = 16427,
+    NPC_UNSTOPPABLE_ABOM        = 16428,
+    NPC_SOUL_WEAVER             = 16429,
+    NPC_GUARDIAN                = 16441,
+
+    // Arachnid Quarter
+    GO_ARAC_ANUB_DOOR           = 181126,                   // encounter door
+    GO_ARAC_ANUB_GATE           = 181195,                   // open after boss is dead
+    GO_ARAC_FAER_WEB            = 181235,                   // encounter door
+    GO_ARAC_FAER_DOOR           = 194022,                   // after faerlina, to outer ring
+    GO_ARAC_MAEX_INNER_DOOR     = 181197,                   // encounter door
+    GO_ARAC_MAEX_OUTER_DOOR     = 181209,                   // right before maex
+
+    // Plague Quarter
+    GO_PLAG_SLIME01_DOOR        = 181198,                   // not used
+    GO_PLAG_SLIME02_DOOR        = 181199,                   // not used
+    GO_PLAG_NOTH_ENTRY_DOOR     = 181200,                   // encounter door
+    GO_PLAG_NOTH_EXIT_DOOR      = 181201,                   // exit, open when boss dead
+    GO_PLAG_HEIG_ENTRY_DOOR     = 181202,
+    GO_PLAG_HEIG_EXIT_DOOR      = 181203,                   // exit door - not used here
+    GO_PLAG_HEIG_EXIT_HALLWAY   = 181496,                   // exit door, at the end of the hallway
+    GO_PLAG_LOAT_DOOR           = 181241,                   // encounter door
+
+    // Military Quarter
+    GO_MILI_GOTH_ENTRY_GATE     = 181124,                   // used while encounter is in progress
+    GO_MILI_GOTH_EXIT_GATE      = 181125,                   // exit, open at boss dead
+    GO_MILI_GOTH_COMBAT_GATE    = 181170,                   // used while encounter is in progress
+    GO_MILI_HORSEMEN_DOOR       = 181119,                   // encounter door
+
+    GO_CHEST_HORSEMEN_NORM      = 181366,                   // four horsemen event, DoRespawnGameObject() when event == DONE
+
+    // Construct Quarter
+    GO_CONS_PATH_EXIT_DOOR      = 181123,
+    GO_CONS_GLUT_EXIT_DOOR      = 181120,
+    GO_CONS_THAD_DOOR           = 181121,                   // Thaddius enc door
+    GO_CONS_NOX_TESLA_FEUGEN    = 181477,
+    GO_CONS_NOX_TESLA_STALAGG   = 181478,
+
+    // Frostwyrm Lair
+    GO_KELTHUZAD_WATERFALL_DOOR = 181225,                   // exit, open after sapphiron is dead
+    GO_KELTHUZAD_EXIT_DOOR      = 181228,
+    GO_KELTHUZAD_WINDOW_1       = 181402,
+    GO_KELTHUZAD_WINDOW_2       = 181403,
+    GO_KELTHUZAD_WINDOW_3       = 181404,
+    GO_KELTHUZAD_WINDOW_4       = 181405,
+
+    // Eyes
+    GO_ARAC_EYE_RAMP            = 181212,
+    GO_PLAG_EYE_RAMP            = 181211,
+    GO_MILI_EYE_RAMP            = 181210,
+    GO_CONS_EYE_RAMP            = 181213,
+
+    GO_ARAC_EYE_BOSS            = 181233,
+    GO_PLAG_EYE_BOSS            = 181231,
+    GO_MILI_EYE_BOSS            = 181230,
+    GO_CONS_EYE_BOSS            = 181232,
+
+    // Portals
+    GO_ARAC_PORTAL              = 181575,
+    GO_PLAG_PORTAL              = 181577,
+    GO_MILI_PORTAL              = 181578,
+    GO_CONS_PORTAL              = 181576,
+
+    AREATRIGGER_FROSTWYRM       = 4120,                     // not needed here, but AT to be scripted
+    AREATRIGGER_KELTHUZAD       = 4112,
+    AREATRIGGER_GOTHIK          = 4116,
+    AREATRIGGER_THADDIUS_DOOR   = 4113,
+    AREATRIGGER_FROSTWYRM_TELE  = 4156,
+
+    //Gothik dummy spells, implemented in InstanceScript actually
+    SPELL_A_TO_ANCHOR_1 = 27892,
+    SPELL_B_TO_ANCHOR_1 = 27928,
+    SPELL_C_TO_ANCHOR_1 = 27935,
+
+    SPELL_A_TO_ANCHOR_2 = 27893,
+    SPELL_B_TO_ANCHOR_2 = 27929,
+    SPELL_C_TO_ANCHOR_2 = 27936,
+
+    SPELL_A_TO_SKULL = 27915,
+    SPELL_B_TO_SKULL = 27931,
+    SPELL_C_TO_SKULL = 27937,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/redridge_mountains.cpp b/src/modules/SD3/scripts/eastern_kingdoms/redridge_mountains.cpp
new file mode 100644
index 000000000..f08854fd6
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/redridge_mountains.cpp
@@ -0,0 +1,184 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      redridge_mountains
+ * SD%Complete: 100
+ * SDComment:   Quest support: 219.
+ * SDCategory:  Redridge Mountains
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_corporal_keeshan
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_corporal_leehsan
+######*/
+
+enum
+{
+    QUEST_MISSING_IN_ACTION = 219,
+
+    SPELL_MOCKING_BLOW      = 21008,
+    SPELL_SHIELD_BASH       = 11972,
+
+    SAY_CORPORAL_KEESHAN_1  = -1000561,
+    SAY_CORPORAL_KEESHAN_2  = -1000562,
+    SAY_CORPORAL_KEESHAN_3  = -1000563,
+    SAY_CORPORAL_KEESHAN_4  = -1000564,
+    SAY_CORPORAL_KEESHAN_5  = -1000565,
+};
+
+struct npc_corporal_keeshan_escort : public CreatureScript
+{
+    npc_corporal_keeshan_escort() : CreatureScript("npc_corporal_keeshan") {}
+
+    struct npc_corporal_keeshan_escortAI : public npc_escortAI
+    {
+        npc_corporal_keeshan_escortAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        uint32 m_uiMockingBlowTimer;
+        uint32 m_uiShieldBashTimer;
+
+        void Reset() override
+        {
+            m_uiMockingBlowTimer = 5000;
+            m_uiShieldBashTimer = 8000;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoScriptText(SAY_CORPORAL_KEESHAN_1, m_creature);
+#if defined (WOTLK) || defined (CATA)
+            m_creature->SetFactionTemporary(FACTION_ESCORT_A_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+#endif
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+            }
+        }
+
+        void WaypointStart(uint32 uiWP) override
+        {
+            switch (uiWP)
+            {
+            case 27:                                        // break outside
+                DoScriptText(SAY_CORPORAL_KEESHAN_3, m_creature);
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                break;
+            case 54:                                        // say goodbye
+                DoScriptText(SAY_CORPORAL_KEESHAN_5, m_creature);
+                break;
+            }
+        }
+
+        void WaypointReached(uint32 uiWP) override
+        {
+            switch (uiWP)
+            {
+            case 26:                                        // break outside
+                m_creature->SetStandState(UNIT_STAND_STATE_SIT);
+                DoScriptText(SAY_CORPORAL_KEESHAN_2, m_creature);
+                break;
+            case 53:                                        // quest_complete
+                DoScriptText(SAY_CORPORAL_KEESHAN_4, m_creature);
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_MISSING_IN_ACTION, m_creature);
+                }
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            // Combat check
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiMockingBlowTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_MOCKING_BLOW);
+                m_uiMockingBlowTimer = 5000;
+            }
+            else
+            {
+                m_uiMockingBlowTimer -= uiDiff;
+            }
+
+            if (m_uiShieldBashTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHIELD_BASH);
+                m_uiShieldBashTimer = 8000;
+            }
+            else
+            {
+                m_uiShieldBashTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_corporal_keeshan_escortAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_MISSING_IN_ACTION)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_redridge_mountains()
+{
+    Script* s;
+    s = new npc_corporal_keeshan_escort();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_corporal_keeshan";
+    //pNewScript->GetAI = &GetAI_npc_corporal_keeshan;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_corporal_keeshan;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/scarlet_enclave/ebon_hold.cpp b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_enclave/ebon_hold.cpp
new file mode 100644
index 000000000..d887b8c86
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_enclave/ebon_hold.cpp
@@ -0,0 +1,3219 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Ebon_Hold
+SD%Complete: 95
+SDComment: Quest support: 12641, 12687, 12698, 12727, 12733, 12739(and 12742 to 12750), 12801, 12848
+SDCategory: Ebon Hold
+EndScriptData */
+
+/* ContentData
+npc_a_special_surprise
+npc_death_knight_initiate
+npc_unworthy_initiate_anchor
+npc_unworthy_initiate
+go_acherus_soul_prison
+npc_eye_of_acherus
+npc_scarlet_ghoul
+npc_highlord_darion_mograine
+npc_fellow_death_knight
+npc_acherus_deathcharger
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "world_map_ebon_hold.h"
+#include "pet_ai.h"
+
+// four guards spawned for the outro
+static sSpawnLocation aGuardsSpawnLoc[MAX_LIGHT_GUARDS] =
+{
+    { 2287.581f, -5284.991f, 82.535f, 2.60f, 0 },
+    { 2287.856f, -5281.127f, 82.225f, 3.44f, 0 },
+    { 2275.964f, -5282.389f, 82.301f, 5.80f, 0 },
+    { 2275.471f, -5277.668f, 82.058f, 5.79f, 0 }
+};
+
+/*######
+## npc_a_special_surprise
+######*/
+
+enum SpecialSurprise
+{
+    SAY_EXEC_START_1            = -1609025,                 // speech for all
+    SAY_EXEC_START_2            = -1609026,
+    SAY_EXEC_START_3            = -1609027,
+    SAY_EXEC_PROG_1             = -1609028,
+    SAY_EXEC_PROG_2             = -1609029,
+    SAY_EXEC_PROG_3             = -1609030,
+    SAY_EXEC_PROG_4             = -1609031,
+    SAY_EXEC_PROG_5             = -1609032,
+    SAY_EXEC_PROG_6             = -1609033,
+    SAY_EXEC_PROG_7             = -1609034,
+    SAY_EXEC_NAME_1             = -1609035,
+    SAY_EXEC_NAME_2             = -1609036,
+    SAY_EXEC_RECOG_1            = -1609037,
+    SAY_EXEC_RECOG_2            = -1609038,
+    SAY_EXEC_RECOG_3            = -1609039,
+    SAY_EXEC_RECOG_4            = -1609040,
+    SAY_EXEC_RECOG_5            = -1609041,
+    SAY_EXEC_RECOG_6            = -1609042,
+    SAY_EXEC_NOREM_1            = -1609043,
+    SAY_EXEC_NOREM_2            = -1609044,
+    SAY_EXEC_NOREM_3            = -1609045,
+    SAY_EXEC_NOREM_4            = -1609046,
+    SAY_EXEC_NOREM_5            = -1609047,
+    SAY_EXEC_NOREM_6            = -1609048,
+    SAY_EXEC_NOREM_7            = -1609049,
+    SAY_EXEC_NOREM_8            = -1609050,
+    SAY_EXEC_NOREM_9            = -1609051,
+    SAY_EXEC_THINK_1            = -1609052,
+    SAY_EXEC_THINK_2            = -1609053,
+    SAY_EXEC_THINK_3            = -1609054,
+    SAY_EXEC_THINK_4            = -1609055,
+    SAY_EXEC_THINK_5            = -1609056,
+    SAY_EXEC_THINK_6            = -1609057,
+    SAY_EXEC_THINK_7            = -1609058,
+    SAY_EXEC_THINK_8            = -1609059,
+    SAY_EXEC_THINK_9            = -1609060,
+    SAY_EXEC_THINK_10           = -1609061,
+    SAY_EXEC_LISTEN_1           = -1609062,
+    SAY_EXEC_LISTEN_2           = -1609063,
+    SAY_EXEC_LISTEN_3           = -1609064,
+    SAY_EXEC_LISTEN_4           = -1609065,
+    SAY_PLAGUEFIST              = -1609066,
+    SAY_EXEC_TIME_1             = -1609067,
+    SAY_EXEC_TIME_2             = -1609068,
+    SAY_EXEC_TIME_3             = -1609069,
+    SAY_EXEC_TIME_4             = -1609070,
+    SAY_EXEC_TIME_5             = -1609071,
+    SAY_EXEC_TIME_6             = -1609072,
+    SAY_EXEC_TIME_7             = -1609073,
+    SAY_EXEC_TIME_8             = -1609074,
+    SAY_EXEC_TIME_9             = -1609075,
+    SAY_EXEC_TIME_10            = -1609076,
+    SAY_EXEC_WAITING            = -1609077,
+    EMOTE_DIES                  = -1609078,
+
+    NPC_PLAGUEFIST              = 29053
+};
+
+struct npc_a_special_surprise : public CreatureScript
+{
+    npc_a_special_surprise() : CreatureScript("npc_a_special_surprise") {}
+
+    struct  npc_a_special_surpriseAI : public ScriptedAI
+    {
+        npc_a_special_surpriseAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        uint32 m_uiExecuteSpeech_Timer;
+        uint32 m_uiExecuteSpeech_Counter;
+        ObjectGuid m_playerGuid;
+
+        void Reset() override
+        {
+            m_uiExecuteSpeech_Timer = 0;
+            m_uiExecuteSpeech_Counter = 0;
+            m_playerGuid.Clear();
+        }
+
+        bool MeetQuestCondition(Player* pPlayer)
+        {
+            switch (m_creature->GetEntry())
+            {
+            case 29061:                                     // Ellen Stanbridge
+                if (pPlayer->GetQuestStatus(12742) == QUEST_STATUS_INCOMPLETE)
+                    return true;
+                break;
+            case 29072:                                     // Kug Ironjaw
+                if (pPlayer->GetQuestStatus(12748) == QUEST_STATUS_INCOMPLETE)
+                    return true;
+                break;
+            case 29067:                                     // Donovan Pulfrost
+                if (pPlayer->GetQuestStatus(12744) == QUEST_STATUS_INCOMPLETE)
+                    return true;
+                break;
+            case 29065:                                     // Yazmina Oakenthorn
+                if (pPlayer->GetQuestStatus(12743) == QUEST_STATUS_INCOMPLETE)
+                    return true;
+                break;
+            case 29071:                                     // Antoine Brack
+                if (pPlayer->GetQuestStatus(12750) == QUEST_STATUS_INCOMPLETE)
+                    return true;
+                break;
+            case 29032:                                     // Malar Bravehorn
+                if (pPlayer->GetQuestStatus(12739) == QUEST_STATUS_INCOMPLETE)
+                    return true;
+                break;
+            case 29068:                                     // Goby Blastenheimer
+                if (pPlayer->GetQuestStatus(12745) == QUEST_STATUS_INCOMPLETE)
+                    return true;
+                break;
+            case 29073:                                     // Iggy Darktusk
+                if (pPlayer->GetQuestStatus(12749) == QUEST_STATUS_INCOMPLETE)
+                    return true;
+                break;
+            case 29074:                                     // Lady Eonys
+                if (pPlayer->GetQuestStatus(12747) == QUEST_STATUS_INCOMPLETE)
+                    return true;
+                break;
+            case 29070:                                     // Valok the Righteous
+                if (pPlayer->GetQuestStatus(12746) == QUEST_STATUS_INCOMPLETE)
+                    return true;
+                break;
+            }
+
+            return false;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_playerGuid || pWho->GetTypeId() != TYPEID_PLAYER || !pWho->IsWithinDist(m_creature, INTERACTION_DISTANCE))
+                return;
+
+            if (MeetQuestCondition((Player*)pWho))
+                m_playerGuid = pWho->GetObjectGuid();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_playerGuid && !m_creature->getVictim() && m_creature->IsAlive())
+            {
+                if (m_uiExecuteSpeech_Timer < uiDiff)
+                {
+                    Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+
+                    if (!pPlayer)
+                    {
+                        Reset();
+                        return;
+                    }
+
+                    // TODO: simplify text's selection
+
+                    switch (pPlayer->getRace())
+                    {
+                    case RACE_HUMAN:
+                        switch (m_uiExecuteSpeech_Counter)
+                        {
+                        case 0: DoScriptText(SAY_EXEC_START_1, m_creature, pPlayer); break;
+                        case 1: m_creature->SetStandState(UNIT_STAND_STATE_STAND); break;
+                        case 2: DoScriptText(SAY_EXEC_PROG_5, m_creature, pPlayer); break;
+                        case 3: DoScriptText(SAY_EXEC_NAME_1, m_creature, pPlayer); break;
+                        case 4: DoScriptText(SAY_EXEC_RECOG_1, m_creature, pPlayer); break;
+                        case 5: DoScriptText(SAY_EXEC_NOREM_5, m_creature, pPlayer); break;
+                        case 6: DoScriptText(SAY_EXEC_THINK_7, m_creature, pPlayer); break;
+                        case 7: DoScriptText(SAY_EXEC_LISTEN_1, m_creature, pPlayer); break;
+                        case 8:
+                            if (Creature* pPlaguefist = GetClosestCreatureWithEntry(m_creature, NPC_PLAGUEFIST, 85.0f))
+                                DoScriptText(SAY_PLAGUEFIST, pPlaguefist, pPlayer);
+                            break;
+                        case 9:
+                            DoScriptText(SAY_EXEC_TIME_6, m_creature, pPlayer);
+                            m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                            break;
+                        case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break;
+                        case 11:
+                            DoScriptText(EMOTE_DIES, m_creature);
+                            m_creature->SetDeathState(JUST_DIED);
+                            m_creature->SetHealth(0);
+                            return;
+                        }
+                        break;
+                    case RACE_ORC:
+                        switch (m_uiExecuteSpeech_Counter)
+                        {
+                        case 0: DoScriptText(SAY_EXEC_START_1, m_creature, pPlayer); break;
+                        case 1: m_creature->SetStandState(UNIT_STAND_STATE_STAND); break;
+                        case 2: DoScriptText(SAY_EXEC_PROG_6, m_creature, pPlayer); break;
+                        case 3: DoScriptText(SAY_EXEC_NAME_1, m_creature, pPlayer); break;
+                        case 4: DoScriptText(SAY_EXEC_RECOG_1, m_creature, pPlayer); break;
+                        case 5: DoScriptText(SAY_EXEC_NOREM_7, m_creature, pPlayer); break;
+                        case 6: DoScriptText(SAY_EXEC_THINK_8, m_creature, pPlayer); break;
+                        case 7: DoScriptText(SAY_EXEC_LISTEN_1, m_creature, pPlayer); break;
+                        case 8:
+                            if (Creature* pPlaguefist = GetClosestCreatureWithEntry(m_creature, NPC_PLAGUEFIST, 85.0f))
+                                DoScriptText(SAY_PLAGUEFIST, pPlaguefist, pPlayer);
+                            break;
+                        case 9:
+                            DoScriptText(SAY_EXEC_TIME_8, m_creature, pPlayer);
+                            m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                            break;
+                        case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break;
+                        case 11:
+                            DoScriptText(EMOTE_DIES, m_creature);
+                            m_creature->SetDeathState(JUST_DIED);
+                            m_creature->SetHealth(0);
+                            return;
+                        }
+                        break;
+                    case RACE_DWARF:
+                        switch (m_uiExecuteSpeech_Counter)
+                        {
+                        case 0: DoScriptText(SAY_EXEC_START_2, m_creature, pPlayer); break;
+                        case 1: m_creature->SetStandState(UNIT_STAND_STATE_STAND); break;
+                        case 2: DoScriptText(SAY_EXEC_PROG_2, m_creature, pPlayer); break;
+                        case 3: DoScriptText(SAY_EXEC_NAME_1, m_creature, pPlayer); break;
+                        case 4: DoScriptText(SAY_EXEC_RECOG_3, m_creature, pPlayer); break;
+                        case 5: DoScriptText(SAY_EXEC_NOREM_2, m_creature, pPlayer); break;
+                        case 6: DoScriptText(SAY_EXEC_THINK_5, m_creature, pPlayer); break;
+                        case 7: DoScriptText(SAY_EXEC_LISTEN_2, m_creature, pPlayer); break;
+                        case 8:
+                            if (Creature* pPlaguefist = GetClosestCreatureWithEntry(m_creature, NPC_PLAGUEFIST, 85.0f))
+                                DoScriptText(SAY_PLAGUEFIST, pPlaguefist, pPlayer);
+                            break;
+                        case 9:
+                            DoScriptText(SAY_EXEC_TIME_3, m_creature, pPlayer);
+                            m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                            break;
+                        case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break;
+                        case 11:
+                            DoScriptText(EMOTE_DIES, m_creature);
+                            m_creature->SetDeathState(JUST_DIED);
+                            m_creature->SetHealth(0);
+                            return;
+                        }
+                        break;
+                    case RACE_NIGHTELF:
+                        switch (m_uiExecuteSpeech_Counter)
+                        {
+                        case 0: DoScriptText(SAY_EXEC_START_1, m_creature, pPlayer); break;
+                        case 1: m_creature->SetStandState(UNIT_STAND_STATE_STAND); break;
+                        case 2: DoScriptText(SAY_EXEC_PROG_5, m_creature, pPlayer); break;
+                        case 3: DoScriptText(SAY_EXEC_NAME_1, m_creature, pPlayer); break;
+                        case 4: DoScriptText(SAY_EXEC_RECOG_1, m_creature, pPlayer); break;
+                        case 5: DoScriptText(SAY_EXEC_NOREM_6, m_creature, pPlayer); break;
+                        case 6: DoScriptText(SAY_EXEC_THINK_2, m_creature, pPlayer); break;
+                        case 7: DoScriptText(SAY_EXEC_LISTEN_1, m_creature, pPlayer); break;
+                        case 8:
+                            if (Creature* pPlaguefist = GetClosestCreatureWithEntry(m_creature, NPC_PLAGUEFIST, 85.0f))
+                                DoScriptText(SAY_PLAGUEFIST, pPlaguefist, pPlayer);
+                            break;
+                        case 9:
+                            DoScriptText(SAY_EXEC_TIME_7, m_creature, pPlayer);
+                            m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                            break;
+                        case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break;
+                        case 11:
+                            DoScriptText(EMOTE_DIES, m_creature);
+                            m_creature->SetDeathState(JUST_DIED);
+                            m_creature->SetHealth(0);
+                            return;
+                        }
+                        break;
+                    case RACE_UNDEAD:
+                        switch (m_uiExecuteSpeech_Counter)
+                        {
+                        case 0: DoScriptText(SAY_EXEC_START_1, m_creature, pPlayer); break;
+                        case 1: m_creature->SetStandState(UNIT_STAND_STATE_STAND); break;
+                        case 2: DoScriptText(SAY_EXEC_PROG_3, m_creature, pPlayer); break;
+                        case 3: DoScriptText(SAY_EXEC_NAME_1, m_creature, pPlayer); break;
+                        case 4: DoScriptText(SAY_EXEC_RECOG_4, m_creature, pPlayer); break;
+                        case 5: DoScriptText(SAY_EXEC_NOREM_3, m_creature, pPlayer); break;
+                        case 6: DoScriptText(SAY_EXEC_THINK_1, m_creature, pPlayer); break;
+                        case 7: DoScriptText(SAY_EXEC_LISTEN_3, m_creature, pPlayer); break;
+                        case 8:
+                            if (Creature* pPlaguefist = GetClosestCreatureWithEntry(m_creature, NPC_PLAGUEFIST, 85.0f))
+                                DoScriptText(SAY_PLAGUEFIST, pPlaguefist, pPlayer);
+                            break;
+                        case 9:
+                            DoScriptText(SAY_EXEC_TIME_4, m_creature, pPlayer);
+                            m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                            break;
+                        case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break;
+                        case 11:
+                            DoScriptText(EMOTE_DIES, m_creature);
+                            m_creature->SetDeathState(JUST_DIED);
+                            m_creature->SetHealth(0);
+                            return;
+                        }
+                        break;
+                    case RACE_TAUREN:
+                        switch (m_uiExecuteSpeech_Counter)
+                        {
+                        case 0: DoScriptText(SAY_EXEC_START_1, m_creature, pPlayer); break;
+                        case 1: m_creature->SetStandState(UNIT_STAND_STATE_STAND); break;
+                        case 2: DoScriptText(SAY_EXEC_PROG_1, m_creature, pPlayer); break;
+                        case 3: DoScriptText(SAY_EXEC_NAME_1, m_creature, pPlayer); break;
+                        case 4: DoScriptText(SAY_EXEC_RECOG_5, m_creature, pPlayer); break;
+                        case 5: DoScriptText(SAY_EXEC_NOREM_8, m_creature, pPlayer); break;
+                        case 6: DoScriptText(SAY_EXEC_THINK_9, m_creature, pPlayer); break;
+                        case 7: DoScriptText(SAY_EXEC_LISTEN_1, m_creature, pPlayer); break;
+                        case 8:
+                            if (Creature* pPlaguefist = GetClosestCreatureWithEntry(m_creature, NPC_PLAGUEFIST, 85.0f))
+                                DoScriptText(SAY_PLAGUEFIST, pPlaguefist, pPlayer);
+                            break;
+                        case 9:
+                            DoScriptText(SAY_EXEC_TIME_9, m_creature, pPlayer);
+                            m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                            break;
+                        case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break;
+                        case 11:
+                            DoScriptText(EMOTE_DIES, m_creature);
+                            m_creature->SetDeathState(JUST_DIED);
+                            m_creature->SetHealth(0);
+                            return;
+                        }
+                        break;
+                    case RACE_GNOME:
+                        switch (m_uiExecuteSpeech_Counter)
+                        {
+                        case 0: DoScriptText(SAY_EXEC_START_1, m_creature, pPlayer); break;
+                        case 1: m_creature->SetStandState(UNIT_STAND_STATE_STAND); break;
+                        case 2: DoScriptText(SAY_EXEC_PROG_4, m_creature, pPlayer); break;
+                        case 3: DoScriptText(SAY_EXEC_NAME_1, m_creature, pPlayer); break;
+                        case 4: DoScriptText(SAY_EXEC_RECOG_1, m_creature, pPlayer); break;
+                        case 5: DoScriptText(SAY_EXEC_NOREM_4, m_creature, pPlayer); break;
+                        case 6: DoScriptText(SAY_EXEC_THINK_6, m_creature, pPlayer); break;
+                        case 7: DoScriptText(SAY_EXEC_LISTEN_1, m_creature, pPlayer); break;
+                        case 8:
+                            if (Creature* pPlaguefist = GetClosestCreatureWithEntry(m_creature, NPC_PLAGUEFIST, 85.0f))
+                                DoScriptText(SAY_PLAGUEFIST, pPlaguefist, pPlayer);
+                            break;
+                        case 9:
+                            DoScriptText(SAY_EXEC_TIME_5, m_creature, pPlayer);
+                            m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                            break;
+                        case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break;
+                        case 11:
+                            DoScriptText(EMOTE_DIES, m_creature);
+                            m_creature->SetDeathState(JUST_DIED);
+                            m_creature->SetHealth(0);
+                            return;
+                        }
+                        break;
+                    case RACE_TROLL:
+                        switch (m_uiExecuteSpeech_Counter)
+                        {
+                        case 0: DoScriptText(SAY_EXEC_START_3, m_creature, pPlayer); break;
+                        case 1: m_creature->SetStandState(UNIT_STAND_STATE_STAND); break;
+                        case 2: DoScriptText(SAY_EXEC_PROG_7, m_creature, pPlayer); break;
+                        case 3: DoScriptText(SAY_EXEC_NAME_2, m_creature, pPlayer); break;
+                        case 4: DoScriptText(SAY_EXEC_RECOG_6, m_creature, pPlayer); break;
+                        case 5: DoScriptText(SAY_EXEC_NOREM_9, m_creature, pPlayer); break;
+                        case 6: DoScriptText(SAY_EXEC_THINK_10, m_creature, pPlayer); break;
+                        case 7: DoScriptText(SAY_EXEC_LISTEN_4, m_creature, pPlayer); break;
+                        case 8:
+                            if (Creature* pPlaguefist = GetClosestCreatureWithEntry(m_creature, NPC_PLAGUEFIST, 85.0f))
+                                DoScriptText(SAY_PLAGUEFIST, pPlaguefist, pPlayer);
+                            break;
+                        case 9:
+                            DoScriptText(SAY_EXEC_TIME_10, m_creature, pPlayer);
+                            m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                            break;
+                        case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break;
+                        case 11:
+                            DoScriptText(EMOTE_DIES, m_creature);
+                            m_creature->SetDeathState(JUST_DIED);
+                            m_creature->SetHealth(0);
+                            return;
+                        }
+                        break;
+                    case RACE_BLOODELF:
+                        switch (m_uiExecuteSpeech_Counter)
+                        {
+                        case 0: DoScriptText(SAY_EXEC_START_1, m_creature, pPlayer); break;
+                        case 1: m_creature->SetStandState(UNIT_STAND_STATE_STAND); break;
+                        case 2: DoScriptText(SAY_EXEC_PROG_1, m_creature, pPlayer); break;
+                        case 3: DoScriptText(SAY_EXEC_NAME_1, m_creature, pPlayer); break;
+                        case 4: DoScriptText(SAY_EXEC_RECOG_1, m_creature, pPlayer); break;
+                            // case 5: // unknown
+                        case 6: DoScriptText(SAY_EXEC_THINK_3, m_creature, pPlayer); break;
+                        case 7: DoScriptText(SAY_EXEC_LISTEN_1, m_creature, pPlayer); break;
+                        case 8:
+                            if (Creature* pPlaguefist = GetClosestCreatureWithEntry(m_creature, NPC_PLAGUEFIST, 85.0f))
+                                DoScriptText(SAY_PLAGUEFIST, pPlaguefist, pPlayer);
+                            break;
+                        case 9:
+                            DoScriptText(SAY_EXEC_TIME_1, m_creature, pPlayer);
+                            m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                            break;
+                        case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break;
+                        case 11:
+                            DoScriptText(EMOTE_DIES, m_creature);
+                            m_creature->SetDeathState(JUST_DIED);
+                            m_creature->SetHealth(0);
+                            return;
+                        }
+                        break;
+                    case RACE_DRAENEI:
+                        switch (m_uiExecuteSpeech_Counter)
+                        {
+                        case 0: DoScriptText(SAY_EXEC_START_1, m_creature, pPlayer); break;
+                        case 1: m_creature->SetStandState(UNIT_STAND_STATE_STAND); break;
+                        case 2: DoScriptText(SAY_EXEC_PROG_1, m_creature, pPlayer); break;
+                        case 3: DoScriptText(SAY_EXEC_NAME_1, m_creature, pPlayer); break;
+                        case 4: DoScriptText(SAY_EXEC_RECOG_2, m_creature, pPlayer); break;
+                        case 5: DoScriptText(SAY_EXEC_NOREM_1, m_creature, pPlayer); break;
+                        case 6: DoScriptText(SAY_EXEC_THINK_4, m_creature, pPlayer); break;
+                        case 7: DoScriptText(SAY_EXEC_LISTEN_1, m_creature, pPlayer); break;
+                        case 8:
+                            if (Creature* pPlaguefist = GetClosestCreatureWithEntry(m_creature, NPC_PLAGUEFIST, 85.0f))
+                                DoScriptText(SAY_PLAGUEFIST, pPlaguefist, pPlayer);
+                            break;
+                        case 9:
+                            DoScriptText(SAY_EXEC_TIME_2, m_creature, pPlayer);
+                            m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                            break;
+                        case 10: DoScriptText(SAY_EXEC_WAITING, m_creature, pPlayer); break;
+                        case 11:
+                            DoScriptText(EMOTE_DIES, m_creature);
+                            m_creature->SetDeathState(JUST_DIED);
+                            m_creature->SetHealth(0);
+                            return;
+                        }
+                        break;
+                    }
+
+                    if (m_uiExecuteSpeech_Counter >= 9)
+                        m_uiExecuteSpeech_Timer = 15000;
+                    else
+                        m_uiExecuteSpeech_Timer = 7000;
+
+                    ++m_uiExecuteSpeech_Counter;
+                }
+                else
+                    m_uiExecuteSpeech_Timer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_a_special_surpriseAI(pCreature);
+    }
+};
+
+/*######
+## npc_death_knight_initiate
+######*/
+
+enum
+{
+    SAY_DUEL_A = -1609016,
+    SAY_DUEL_B = -1609017,
+    SAY_DUEL_C = -1609018,
+    SAY_DUEL_D = -1609019,
+    SAY_DUEL_E = -1609020,
+    SAY_DUEL_F = -1609021,
+    SAY_DUEL_G = -1609022,
+    SAY_DUEL_H = -1609023,
+    SAY_DUEL_I = -1609024,
+
+    EMOTE_DUEL_BEGIN = -1001137,
+    EMOTE_DUEL_BEGIN_3 = -1001138,
+    EMOTE_DUEL_BEGIN_2 = -1001139,
+    EMOTE_DUEL_BEGIN_1 = -1001140,
+
+    GOSSIP_ITEM_ACCEPT_DUEL = -3609000,
+    GOSSIP_TEXT_ID_DUEL = 13433,
+
+    SPELL_DUEL = 52996,
+    SPELL_DUEL_TRIGGERED = 52990,
+    SPELL_DUEL_VICTORY = 52994,
+    SPELL_DUEL_FLAG = 52991,
+
+    // generic DK spells. used in many scripts here
+    SPELL_BLOOD_STRIKE = 52374,
+    SPELL_DEATH_COIL = 52375,
+    SPELL_ICY_TOUCH = 52372,
+    SPELL_PLAGUE_STRIKE = 52373,
+
+    GO_DUEL_FLAG = 191126,
+
+    QUEST_DEATH_CHALLENGE = 12733,
+    FACTION_HOSTILE = 2068
+};
+
+int32 m_auiRandomSay[] =
+{
+    SAY_DUEL_A, SAY_DUEL_B, SAY_DUEL_C, SAY_DUEL_D, SAY_DUEL_E, SAY_DUEL_F, SAY_DUEL_G, SAY_DUEL_H, SAY_DUEL_I
+};
+
+struct npc_death_knight_initiate : public CreatureScript
+{
+    npc_death_knight_initiate() : CreatureScript("npc_death_knight_initiate") {}
+
+    struct  npc_death_knight_initiateAI : public ScriptedAI
+    {
+        npc_death_knight_initiateAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        ObjectGuid m_duelerGuid;
+        uint8 m_uiDuelStartStage;
+        uint32 m_uiDuelTimer;
+        uint32 m_uiBloodStrikeTimer;
+        uint32 m_uiDeathCoilTimer;
+        uint32 m_uiIcyTouchTimer;
+        uint32 m_uiPlagueStrikeTimer;
+
+        bool m_bIsDuelComplete;
+
+        void Reset() override
+        {
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_15);
+            m_duelerGuid.Clear();
+
+            m_uiDuelStartStage = 0;
+            m_uiDuelTimer = 0;
+            m_bIsDuelComplete = false;
+
+            m_uiBloodStrikeTimer = 4000;
+            m_uiDeathCoilTimer = 6000;
+            m_uiIcyTouchTimer = 2000;
+            m_uiPlagueStrikeTimer = 5000;
+        }
+
+        void JustReachedHome() override
+        {
+            // reset encounter
+            if (GameObject* pFlag = GetClosestGameObjectWithEntry(m_creature, GO_DUEL_FLAG, 30.0f))
+                pFlag->SetLootState(GO_JUST_DEACTIVATED);
+
+            m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_DUEL_TRIGGERED)
+            {
+                SendAIEvent(AI_EVENT_START_EVENT, pCaster, m_creature);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            // start duel
+            if (eventType == AI_EVENT_START_EVENT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                m_duelerGuid = pInvoker->GetObjectGuid();
+                m_uiDuelStartStage = 0;
+                m_uiDuelTimer = 5000;
+            }
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                if (!m_bIsDuelComplete)
+                {
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_duelerGuid))
+                    {
+                        m_creature->CastSpell(pPlayer, SPELL_DUEL_VICTORY, true);
+                        m_creature->SetFacingToObject(pPlayer);
+                    }
+
+                    // complete duel and evade (without home movemnet)
+                    m_bIsDuelComplete = true;
+                    m_creature->RemoveAllAurasOnEvade();
+                    m_creature->DeleteThreatList();
+                    m_creature->CombatStop(true);
+                    m_creature->SetLootRecipient(NULL);
+
+                    // remove duel flag
+                    if (GameObject* pFlag = GetClosestGameObjectWithEntry(m_creature, GO_DUEL_FLAG, 30.0f))
+                        pFlag->SetLootState(GO_JUST_DEACTIVATED);
+
+                    m_creature->HandleEmoteCommand(EMOTE_ONESHOT_BEG);
+                    m_creature->ForcedDespawn(10000);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiDuelTimer)
+            {
+                if (m_uiDuelTimer <= uiDiff)
+                {
+                    Player* pPlayer = m_creature->GetMap()->GetPlayer(m_duelerGuid);
+                    if (!pPlayer)
+                        return;
+
+                    switch (m_uiDuelStartStage)
+                    {
+                    case 0:
+                        DoScriptText(EMOTE_DUEL_BEGIN, m_creature, pPlayer);
+                        m_uiDuelTimer = 1000;
+                        break;
+                    case 1:
+                        DoScriptText(EMOTE_DUEL_BEGIN_3, m_creature, pPlayer);
+                        m_uiDuelTimer = 1000;
+                        break;
+                    case 2:
+                        DoScriptText(EMOTE_DUEL_BEGIN_2, m_creature, pPlayer);
+                        m_uiDuelTimer = 1000;
+                        break;
+                    case 3:
+                        DoScriptText(EMOTE_DUEL_BEGIN_1, m_creature, pPlayer);
+                        m_uiDuelTimer = 1000;
+                        break;
+                    case 4:
+                        m_creature->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_COMBAT_STOP | TEMPFACTION_RESTORE_RESPAWN);
+                        AttackStart(pPlayer);
+                        m_uiDuelTimer = 0;
+                        break;
+                    }
+                    ++m_uiDuelStartStage;
+                }
+                else
+                    m_uiDuelTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiBloodStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_BLOOD_STRIKE) == CAST_OK)
+                    m_uiBloodStrikeTimer = 9000;
+            }
+            else
+                m_uiBloodStrikeTimer -= uiDiff;
+
+            if (m_uiDeathCoilTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DEATH_COIL) == CAST_OK)
+                    m_uiDeathCoilTimer = 8000;
+            }
+            else
+                m_uiDeathCoilTimer -= uiDiff;
+
+            if (m_uiIcyTouchTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ICY_TOUCH) == CAST_OK)
+                    m_uiIcyTouchTimer = 8000;
+            }
+            else
+                m_uiIcyTouchTimer -= uiDiff;
+
+            if (m_uiPlagueStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_PLAGUE_STRIKE) == CAST_OK)
+                    m_uiPlagueStrikeTimer = 8000;
+            }
+            else
+                m_uiPlagueStrikeTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_death_knight_initiateAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_DEATH_CHALLENGE) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ACCEPT_DUEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_DUEL, pCreature->GetObjectGuid());
+            return true;
+        }
+        return false;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+            pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_15);
+            pCreature->SetFacingToObject(pPlayer);
+
+            DoScriptText(m_auiRandomSay[urand(0, countof(m_auiRandomSay) - 1)], pCreature, pPlayer);
+
+            pCreature->CastSpell(pPlayer, SPELL_DUEL, true);
+            pCreature->CastSpell(pPlayer, SPELL_DUEL_FLAG, true);
+        }
+        return true;
+    }
+};
+
+/*######
+## npc_koltira_deathweaver
+######*/
+
+enum eKoltira
+{
+    SAY_BREAKOUT1 = -1609079,
+    SAY_BREAKOUT2 = -1609080,
+    SAY_BREAKOUT3 = -1609081,
+    SAY_BREAKOUT4 = -1609082,
+    SAY_BREAKOUT5 = -1609083,
+    SAY_BREAKOUT6 = -1609084,
+    SAY_BREAKOUT7 = -1609085,
+    SAY_BREAKOUT8 = -1609086,
+    SAY_BREAKOUT9 = -1609087,
+    SAY_BREAKOUT10 = -1609088,
+
+    SPELL_KOLTIRA_TRANSFORM = 52899,
+    SPELL_ANTI_MAGIC_ZONE = 52894,
+
+    QUEST_BREAKOUT = 12727,
+
+    NPC_CRIMSON_ACOLYTE = 29007,
+    NPC_HIGH_INQUISITOR_VALROTH = 29001,
+    NPC_KOLTIRA_ALT = 28447,
+
+    // not sure about this id
+    // NPC_DEATH_KNIGHT_MOUNT          = 29201,
+    MODEL_DEATH_KNIGHT_MOUNT = 25278
+};
+
+struct npc_koltira_deathweaver : public CreatureScript
+{
+    npc_koltira_deathweaver() : CreatureScript("npc_koltira_deathweaver") {}
+
+    struct  npc_koltira_deathweaverAI : public npc_escortAI
+    {
+        npc_koltira_deathweaverAI(Creature* pCreature) : npc_escortAI(pCreature) { Reset(); }
+
+        uint32 m_uiWave;
+        uint32 m_uiWave_Timer;
+        ObjectGuid m_valrothGuid;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiWave = 0;
+                m_uiWave_Timer = 3000;
+                m_valrothGuid.Clear();
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                DoScriptText(SAY_BREAKOUT1, m_creature);
+                break;
+            case 1:
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                break;
+            case 2:
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                // m_creature->UpdateEntry(NPC_KOLTIRA_ALT);// unclear if we must update or not
+                DoCastSpellIfCan(m_creature, SPELL_KOLTIRA_TRANSFORM);
+                break;
+            case 3:
+                SetEscortPaused(true);
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                DoScriptText(SAY_BREAKOUT2, m_creature);
+                DoCastSpellIfCan(m_creature, SPELL_ANTI_MAGIC_ZONE);  // cast again that makes bubble up
+                break;
+            case 4:
+                SetRun(true);
+                break;
+            case 9:
+                m_creature->Mount(MODEL_DEATH_KNIGHT_MOUNT);
+                break;
+            case 10:
+                m_creature->Unmount();
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (Player* pPlayer = GetPlayerForEscort())
+                pSummoned->AI()->AttackStart(pPlayer);
+
+            if (pSummoned->GetEntry() == NPC_HIGH_INQUISITOR_VALROTH)
+                m_valrothGuid = pSummoned->GetObjectGuid();
+        }
+
+        void SummonAcolyte(uint32 uiAmount)
+        {
+            for (uint32 i = 0; i < uiAmount; ++i)
+                m_creature->SummonCreature(NPC_CRIMSON_ACOLYTE, 1642.329f, -6045.818f, 127.583f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (HasEscortState(STATE_ESCORT_PAUSED))
+            {
+                if (m_uiWave_Timer < uiDiff)
+                {
+                    switch (m_uiWave)
+                    {
+                    case 0:
+                        DoScriptText(SAY_BREAKOUT3, m_creature);
+                        SummonAcolyte(3);
+                        m_uiWave_Timer = 20000;
+                        break;
+                    case 1:
+                        DoScriptText(SAY_BREAKOUT4, m_creature);
+                        SummonAcolyte(3);
+                        m_uiWave_Timer = 20000;
+                        break;
+                    case 2:
+                        DoScriptText(SAY_BREAKOUT5, m_creature);
+                        SummonAcolyte(4);
+                        m_uiWave_Timer = 20000;
+                        break;
+                    case 3:
+                        DoScriptText(SAY_BREAKOUT6, m_creature);
+                        m_creature->SummonCreature(NPC_HIGH_INQUISITOR_VALROTH, 1642.329f, -6045.818f, 127.583f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 1000);
+                        m_uiWave_Timer = 1000;
+                        break;
+                    case 4:
+                    {
+                              Creature* pTemp = m_creature->GetMap()->GetCreature(m_valrothGuid);
+
+                              if (!pTemp || !pTemp->IsAlive())
+                              {
+                                  DoScriptText(SAY_BREAKOUT8, m_creature);
+                                  m_uiWave_Timer = 5000;
+                              }
+                              else
+                              {
+                                  m_uiWave_Timer = 2500;
+                                  return;                         // return, we don't want m_uiWave to increment now
+                              }
+                              break;
+                    }
+                    case 5:
+                        DoScriptText(SAY_BREAKOUT9, m_creature);
+                        m_creature->RemoveAurasDueToSpell(SPELL_ANTI_MAGIC_ZONE);
+                        m_uiWave_Timer = 2500;
+                        break;
+                    case 6:
+                        DoScriptText(SAY_BREAKOUT10, m_creature);
+                        SetEscortPaused(false);
+                        break;
+                    }
+
+                    ++m_uiWave;
+                }
+                else
+                    m_uiWave_Timer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_koltira_deathweaverAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_BREAKOUT)
+        {
+            pCreature->SetStandState(UNIT_STAND_STATE_STAND);
+
+            if (npc_koltira_deathweaverAI* pEscortAI = dynamic_cast<npc_koltira_deathweaverAI*>(pCreature->AI()))
+                pEscortAI->Start(false, pPlayer, pQuest);
+        }
+        return true;
+    }
+};
+
+/*######
+##
+######*/
+
+enum
+{
+    SAY_START                       = -1609000,             // 8 texts in total, GetTextId() generates random with this as base
+    SAY_AGGRO                       = -1609008,             // 8 texts in total, GetTextId() generates random with this as base
+
+    // SPELL_CHAINED_PESANT_LH         = 54602,             // not used. possible it determine side, where to go get "weapon"
+    // SPELL_CHAINED_PESANT_RH         = 54610,
+    SPELL_CHAINED_PESANT_CHEST      = 54612,
+    SPELL_CHAINED_PESANT_BREATH     = 54613,
+    SPELL_INITIATE_VISUAL           = 51519,
+
+    NPC_ANCHOR                      = 29521,
+    FACTION_MONSTER                 = 16,
+
+    PHASE_INACTIVE_OR_COMBAT        = 0,
+    PHASE_DRESSUP                   = 1,
+    PHASE_ACTIVATE                  = 2
+};
+
+/*######
+## npc_unworthy_initiate_anchor
+######*/
+
+struct npc_unworthy_initiate_anchor : public CreatureScript
+{
+    npc_unworthy_initiate_anchor() : CreatureScript("npc_unworthy_initiate_anchor") {}
+
+    struct  npc_unworthy_initiate_anchorAI : public ScriptedAI
+    {
+        npc_unworthy_initiate_anchorAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_myInitiateGuid;
+        ObjectGuid m_myPrisonGuid;
+
+        void Reset() override {}
+
+        void ReceiveAIEvent(AIEventType type, Creature* sender, Unit* invoker, uint32 data)
+        {
+            switch (type)
+            {
+            case AI_EVENT_CUSTOM_A: // reset prison
+                ResetPrison();
+                break;
+            case AI_EVENT_CUSTOM_B: // register close initiate
+                RegisterCloseInitiate(sender);
+                break;
+            case AI_EVENT_CUSTOM_C: // notify me; @TODO inplement normal ObjectGuid transfer between scripts
+                {
+                ObjectGuid guid = ObjectGuid(HIGHGUID_GAMEOBJECT, 0, data);
+                if (GameObject *pGo = m_creature->GetMap()->GetGameObject(guid))
+                    NotifyMe(invoker, pGo);
+                break;
+                }
+            default:
+                break;
+            }
+        }
+
+    private:
+        void NotifyMe(Unit* pSource, GameObject* pGo)
+        {
+            m_myPrisonGuid = pGo->GetObjectGuid();
+            Creature* pInitiate = m_creature->GetMap()->GetCreature(m_myInitiateGuid);
+
+            if (pInitiate && pSource)
+            {
+                pInitiate->SetLootRecipient(pSource);
+                m_creature->CastSpell(pInitiate, SPELL_CHAINED_PESANT_BREATH, true);
+            }
+        }
+
+        void RegisterCloseInitiate(Creature* pCreature)
+        {
+            m_myInitiateGuid = pCreature->GetObjectGuid();
+        }
+
+        void ResetPrison()
+        {
+            if (GameObject* pPrison = m_creature->GetMap()->GetGameObject(m_myPrisonGuid))
+                pPrison->ResetDoorOrButton();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_unworthy_initiate_anchorAI(pCreature);
+    }
+};
+
+/*######
+## npc_unworthy_initiate
+######*/
+
+struct npc_unworthy_initiate : public CreatureScript
+{
+    npc_unworthy_initiate() : CreatureScript("npc_unworthy_initiate") {}
+
+    struct  npc_unworthy_initiateAI : public ScriptedAI
+    {
+        npc_unworthy_initiateAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            Reset();
+        }
+
+        ObjectGuid m_myAnchorGuid;
+        uint32 m_uiAnchorCheckTimer;
+        uint32 m_uiPhase;
+        uint32 m_uiPhaseTimer;
+        uint32 m_uiBloodStrike_Timer;
+        uint32 m_uiDeathCoil_Timer;
+        uint32 m_uiIcyTouch_Timer;
+        uint32 m_uiPlagueStrike_Timer;
+
+        void Reset() override
+        {
+            m_uiAnchorCheckTimer = 5000;
+            m_uiPhase = PHASE_INACTIVE_OR_COMBAT;
+            m_uiPhaseTimer = 7500;
+            m_uiBloodStrike_Timer = 4000;
+            m_uiDeathCoil_Timer = 6000;
+            m_uiIcyTouch_Timer = 2000;
+            m_uiPlagueStrike_Timer = 5000;
+        }
+
+        void JustReachedHome() override
+        {
+            SetAnchor();
+
+            if (Creature* pAnchor = GetAnchor())
+            {
+                SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pAnchor);
+            }
+        }
+
+        void JustRespawned() override
+        {
+            if (Creature* pAnchor = GetAnchor())
+            {
+                SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pAnchor);
+            }
+
+            Reset();
+        }
+
+        int32 GetTextId()
+        {
+            return m_uiPhase == PHASE_DRESSUP ? SAY_START - urand(0, 7) : SAY_AGGRO - urand(0, 7);
+        }
+
+        Creature* GetAnchor()
+        {
+            if (m_myAnchorGuid)
+                return m_creature->GetMap()->GetCreature(m_myAnchorGuid);
+            else
+                return GetClosestCreatureWithEntry(m_creature, NPC_ANCHOR, INTERACTION_DISTANCE * 2);
+        }
+
+        void SetAnchor()
+        {
+            if (Creature* pAnchor = GetAnchor())
+            {
+                SendAIEvent(AI_EVENT_CUSTOM_B, m_creature, pAnchor);
+
+                pAnchor->CastSpell(m_creature, SPELL_CHAINED_PESANT_CHEST, false);
+                m_myAnchorGuid = pAnchor->GetObjectGuid();
+
+                m_uiAnchorCheckTimer = 0;
+                return;
+            }
+
+            m_uiAnchorCheckTimer = 5000;
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_CHAINED_PESANT_BREATH)
+            {
+                pCaster->InterruptNonMeleeSpells(true);
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+
+                m_uiPhase = PHASE_DRESSUP;
+
+                if (Player* pSource = m_creature->GetLootRecipient())
+                    DoScriptText(GetTextId(), m_creature, pSource);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiAnchorCheckTimer)
+            {
+                if (m_uiAnchorCheckTimer <= uiDiff)
+                    SetAnchor();
+                else
+                    m_uiAnchorCheckTimer -= uiDiff;
+            }
+
+            if (m_uiPhase == PHASE_INACTIVE_OR_COMBAT)
+            {
+                if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                    return;
+
+                if (m_uiBloodStrike_Timer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_BLOOD_STRIKE);
+                    m_uiBloodStrike_Timer = 9000;
+                }
+                else
+                    m_uiBloodStrike_Timer -= uiDiff;
+
+                if (m_uiDeathCoil_Timer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_DEATH_COIL);
+                    m_uiDeathCoil_Timer = 8000;
+                }
+                else
+                    m_uiDeathCoil_Timer -= uiDiff;
+
+                if (m_uiIcyTouch_Timer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_ICY_TOUCH);
+                    m_uiIcyTouch_Timer = 8000;
+                }
+                else
+                    m_uiIcyTouch_Timer -= uiDiff;
+
+                if (m_uiPlagueStrike_Timer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_PLAGUE_STRIKE);
+                    m_uiPlagueStrike_Timer = 8000;
+                }
+                else
+                    m_uiPlagueStrike_Timer -= uiDiff;
+
+                DoMeleeAttackIfReady();
+            }
+            else
+            {
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    if (m_uiPhase == PHASE_DRESSUP)
+                    {
+                        m_creature->CastSpell(m_creature, SPELL_INITIATE_VISUAL, false);
+
+                        m_uiPhase = PHASE_ACTIVATE;
+                    }
+                    else
+                    {
+                        m_creature->SetFactionTemporary(FACTION_MONSTER, TEMPFACTION_RESTORE_COMBAT_STOP | TEMPFACTION_RESTORE_RESPAWN);
+
+                        m_uiPhase = PHASE_INACTIVE_OR_COMBAT;
+
+                        if (Player* pTarget = m_creature->GetLootRecipient())
+                        {
+                            DoScriptText(GetTextId(), m_creature, pTarget);
+                            AttackStart(pTarget);
+                        }
+                    }
+
+                    m_uiPhaseTimer = 5000;
+                }
+                else
+                    m_uiPhaseTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_unworthy_initiateAI(pCreature);
+    }
+};
+
+/*######
+## go_acherus_soul_prison
+######*/
+
+struct go_acherus_soul_prison : public GameObjectScript
+{
+    go_acherus_soul_prison() : GameObjectScript("go_acherus_soul_prison") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        if (Creature* pAnchor = GetClosestCreatureWithEntry(pGo, NPC_ANCHOR, INTERACTION_DISTANCE))
+        {
+            if (CreatureAI* ai = pAnchor->AI())
+            {
+                ai->ReceiveAIEvent(AI_EVENT_CUSTOM_C, (Creature*)NULL, pPlayer, pGo->GetGUIDLow());
+            }
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_eye_of_acherus
+######*/
+
+enum
+{
+    SPELL_EYE_CONTROL       = 51852,                        // player control aura
+    SPELL_EYE_VISUAL        = 51892,
+    SPELL_EYE_FLIGHT        = 51890,                        // player flight control
+    SPELL_EYE_FLIGHT_BOOST  = 51923,                        // flight boost to reach new avalon
+
+    EMOTE_DESTIANTION       = -1609089,
+    EMOTE_CONTROL           = -1609090,
+
+    POINT_EYE_DESTINATION   = 0
+};
+
+// movement destination coords
+static const float aEyeDestination[3] = {1750.8276f, -5873.788f, 147.2266f};
+
+struct npc_eye_of_acherus : public CreatureScript
+{
+    npc_eye_of_acherus() : CreatureScript("npc_eye_of_acherus") {}
+
+    struct  npc_eye_of_acherusAI : public ScriptedAI
+    {
+        npc_eye_of_acherusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsInitialized = false;
+            m_creature->SetPhaseMask(3, true);                  // HACK as mangos cannot handle auras proberly, also HACK below
+            Reset();
+        }
+
+        bool m_bIsInitialized;
+
+        void Reset() override {}
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            m_creature->CastSpell(m_creature, 52694, true);     // HACK - Remove this when mangos supports proper spell casting
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || uiPointId != POINT_EYE_DESTINATION)
+                return;
+
+            if (Player* pPlayer = m_creature->GetCharmerOrOwnerPlayerOrPlayerItself())
+                DoScriptText(EMOTE_CONTROL, m_creature, pPlayer);
+
+            DoCastSpellIfCan(m_creature, SPELL_EYE_FLIGHT, CAST_TRIGGERED);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override {}
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (m_bIsInitialized)
+                return;
+
+            if (Player* pPlayer = m_creature->GetCharmerOrOwnerPlayerOrPlayerItself())
+            {
+                m_creature->SetPhaseMask(2, true);              // HACK remove when summon spells and auras are implemented properly in mangos
+
+                DoScriptText(EMOTE_DESTIANTION, m_creature, pPlayer);
+
+                DoCastSpellIfCan(m_creature, SPELL_EYE_VISUAL, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_EYE_FLIGHT_BOOST, CAST_TRIGGERED);
+                // Update Speed for Eye
+                m_creature->UpdateSpeed(MOVE_FLIGHT, true, pPlayer->GetSpeed(MOVE_FLIGHT));
+
+                //m_creature->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
+                m_creature->GetMotionMaster()->MovePoint(POINT_EYE_DESTINATION, aEyeDestination[0], aEyeDestination[1], aEyeDestination[2]);
+
+                m_bIsInitialized = true;
+            }
+            else
+                m_creature->ForcedDespawn();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_eye_of_acherusAI(pCreature);
+    }
+};
+
+/*######
+## npc_scarlet_ghoul
+######*/
+
+enum
+{
+    SAY_GHUL_SPAWN_1            = -1609091,
+    SAY_GHUL_SPAWN_2            = -1609092,
+    SAY_GHUL_SPAWN_3            = -1609093,
+    SAY_GHUL_SPAWN_4            = -1609094,
+    SAY_GHUL_SPAWN_5            = -1609095,
+    SAY_GOTHIK_THROW_IN_PIT     = -1609096,                 // TODO: Unclear if there exist more texts
+
+    SPELL_GHOUL_SUMMONED        = 52500,
+    SPELL_GOTHIK_GHOUL_PING     = 52514,
+    SPELL_QUEST_CREDIT          = 52517,
+    SPELL_GHOUL_UNSUMMON        = 52555,
+
+    NPC_GOTHIK                  = 28658,
+};
+
+static const float aPitPosition[3] = {2380.13f, -5783.06f, 151.367f};
+
+struct npc_scarlet_ghoul : public CreatureScript
+{
+    npc_scarlet_ghoul() : CreatureScript("npc_scarlet_ghoul") {}
+
+    struct  npc_scarlet_ghoulAI : public ScriptedPetAI
+    {
+        npc_scarlet_ghoulAI(Creature* pCreature) : ScriptedPetAI(pCreature)
+        {
+            m_bGotHit = false;
+            m_bIsJumping = false;
+            m_bDidInitText = false;
+            m_uiUnsummonTimer = 0;
+            DoCastSpellIfCan(m_creature, SPELL_GHOUL_SUMMONED);
+            Reset();
+        }
+
+        bool m_bGotHit;
+        bool m_bIsJumping;
+        bool m_bDidInitText;
+        uint32 m_uiUnsummonTimer;
+
+        void Reset() override {}
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType == EFFECT_MOTION_TYPE && uiPointId == 1)
+            {
+                m_uiUnsummonTimer = 1000;
+                DoCastSpellIfCan(m_creature, SPELL_GHOUL_UNSUMMON);
+                m_creature->GetMotionMaster()->MoveIdle();
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_GHOUL_UNSUMMON, CAST_TRIGGERED);
+        }
+
+        void ReceiveAIEvent(AIEventType type, Creature *sender, Unit *invoker, uint32 /*data*/)
+        {
+            if (type != AI_EVENT_CUSTOM_A || sender != m_creature)
+                return;
+
+            if (!m_bGotHit)                       // First hit
+            {
+                m_creature->CastSpell(m_creature, 52517, false);
+                m_bGotHit = true;
+            }
+            else                                            // Second hit
+            {
+                InstanceData* pInstance = m_creature->GetInstanceData();
+                if (invoker && pInstance && pInstance->GetData(TYPE_GOTHIK_YELL))
+                    DoScriptText(SAY_GOTHIK_THROW_IN_PIT, invoker);
+
+                float fX, fY, fZ;
+                m_creature->GetRandomPoint(aPitPosition[0], aPitPosition[1], aPitPosition[2], 10.0f, fX, fY, fZ);
+                m_bIsJumping = true;
+                m_creature->GetMotionMaster()->MoveJump(fX, fY, fZ, 24.21229f, 6.0f, 1);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_bDidInitText)
+            {
+                Unit* pOwner = m_creature->GetCharmerOrOwner();
+                DoScriptText(SAY_GHUL_SPAWN_1 - urand(0, 4), m_creature, pOwner);
+
+                m_bDidInitText = true;
+            }
+
+            if (m_uiUnsummonTimer)
+            {
+                if (m_uiUnsummonTimer <= uiDiff)
+                {
+                    m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                    if (m_creature->IsPet())
+                        ((Pet*)m_creature)->Unsummon(PET_SAVE_AS_DELETED);
+                    return;
+                }
+                else
+                    m_uiUnsummonTimer -= uiDiff;
+            }
+
+            if (m_bIsJumping)
+                return;
+
+            ScriptedPetAI::UpdateAI(uiDiff);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_scarlet_ghoulAI(pCreature);
+    }
+};
+
+struct spell_gothik_ghoul_ping : public SpellScript
+{
+    spell_gothik_ghoul_ping() : SpellScript("spell_gothik_ghoul_ping") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_GOTHIK_GHOUL_PING && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            if (CreatureAI* pGhoulAi = pCreatureTarget->AI())
+            {
+                pGhoulAi->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pCreatureTarget, pCaster, 0);
+            }
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_highlord_darion_mograine
+######*/
+
+enum LightOfDawn
+{
+    // yells
+    SAY_LIGHT_OF_DAWN_INTRO_1           = -1609201,         // Highlord Darion Mograine
+    SAY_LIGHT_OF_DAWN_INTRO_2           = -1609202,
+
+    SAY_LIGHT_OF_DAWN_PREPARE_1         = -1609203,
+    SAY_LIGHT_OF_DAWN_PREPARE_2         = -1609204,
+    SAY_LIGHT_OF_DAWN_PREPARE_3         = -1609205,
+    SAY_LIGHT_OF_DAWN_PREPARE_4         = -1609206,
+
+    SAY_LIGHT_OF_DAWN_STAND_1           = -1609207,         // Korfax
+    SAY_LIGHT_OF_DAWN_STAND_2           = -1609208,         // Lord Maxwell Tyrosus
+
+    SAY_LIGHT_OF_DAWN_BATTLE_1          = -1609209,         // Highlord Darion Mograine
+    SAY_LIGHT_OF_DAWN_BATTLE_2          = -1609210,
+    SAY_LIGHT_OF_DAWN_BATTLE_3          = -1609211,
+    SAY_LIGHT_OF_DAWN_BATTLE_4          = -1609212,
+    SAY_LIGHT_OF_DAWN_BATTLE_5          = -1609213,
+    SAY_LIGHT_OF_DAWN_BATTLE_6          = -1609214,
+    SAY_LIGHT_OF_DAWN_BATTLE_7          = -1609215,
+    SAY_LIGHT_OF_DAWN_BATTLE_8          = -1609216,
+    SAY_LIGHT_OF_DAWN_BATTLE_9          = -1609224,
+
+    SAY_LIGHT_OF_DAWN_BATTLE_10         = -1609217,         // Battle end yells
+    SAY_LIGHT_OF_DAWN_BATTLE_11         = -1609218,
+    SAY_LIGHT_OF_DAWN_BATTLE_12         = -1609219,
+    SAY_LIGHT_OF_DAWN_BATTLE_13         = -1609220,
+    SAY_LIGHT_OF_DAWN_BATTLE_14         = -1609221,
+    SAY_LIGHT_OF_DAWN_BATTLE_15         = -1609222,
+    SAY_LIGHT_OF_DAWN_BATTLE_16         = -1609223,
+
+    SAY_LIGHT_OF_DAWN_OUTRO_1           = -1609225,         // Highlord Tirion Fordring
+    SAY_LIGHT_OF_DAWN_OUTRO_2           = -1609226,
+    SAY_LIGHT_OF_DAWN_OUTRO_3           = -1609227,         // Highlord Darion Mograine
+    SAY_LIGHT_OF_DAWN_OUTRO_4           = -1609228,         // Highlord Tirion Fordring
+    SAY_LIGHT_OF_DAWN_OUTRO_5           = -1609229,
+    SAY_LIGHT_OF_DAWN_OUTRO_6           = -1609230,
+    SAY_LIGHT_OF_DAWN_OUTRO_7           = -1609231,         // Highlord Darion Mograine
+
+    SAY_LIGHT_OF_DAWN_VISION_1          = -1609232,         // Highlord Alexandros Mograine
+    SAY_LIGHT_OF_DAWN_VISION_2          = -1609233,         // Highlord Darion Mograine
+    SAY_LIGHT_OF_DAWN_VISION_3          = -1609234,
+    SAY_LIGHT_OF_DAWN_VISION_4          = -1609235,         // Darion Mograine
+    SAY_LIGHT_OF_DAWN_VISION_5          = -1609236,
+    SAY_LIGHT_OF_DAWN_VISION_6          = -1609237,         // Highlord Alexandros Mograine
+    SAY_LIGHT_OF_DAWN_VISION_7          = -1609238,         // Darion Mograine
+    SAY_LIGHT_OF_DAWN_VISION_8          = -1609239,         // Highlord Alexandros Mograine
+    SAY_LIGHT_OF_DAWN_VISION_9          = -1609240,         // Darion Mograine
+    SAY_LIGHT_OF_DAWN_VISION_10         = -1609241,         // Highlord Alexandros Mograine
+    SAY_LIGHT_OF_DAWN_VISION_11         = -1609242,
+
+    SAY_LIGHT_OF_DAWN_KING_VISIT_1      = -1609243,         // The Lich King
+    SAY_LIGHT_OF_DAWN_KING_VISIT_2      = -1609245,
+    SAY_LIGHT_OF_DAWN_KING_VISIT_3      = -1609244,         // Highlord Darion Mograine
+    SAY_LIGHT_OF_DAWN_KING_VISIT_4      = -1609246,         // The Lich King
+    SAY_LIGHT_OF_DAWN_KING_VISIT_5      = -1609247,         // Highlord Tirion Fordring
+    SAY_LIGHT_OF_DAWN_KING_VISIT_6      = -1609248,         // The Lich King
+    SAY_LIGHT_OF_DAWN_KING_VISIT_7      = -1609249,
+    SAY_LIGHT_OF_DAWN_KING_VISIT_8      = -1609250,         // Lord Maxwell Tyrosus
+    SAY_LIGHT_OF_DAWN_KING_VISIT_9      = -1609251,         // The Lich King
+    SAY_LIGHT_OF_DAWN_KING_VISIT_10     = -1609252,         // Highlord Darion Mograine
+    SAY_LIGHT_OF_DAWN_KING_VISIT_11     = -1609253,
+    SAY_LIGHT_OF_DAWN_KING_VISIT_12     = -1609254,         // Highlord Tirion Fordring
+    SAY_LIGHT_OF_DAWN_KING_VISIT_13     = -1609255,         // The Lich King
+    SAY_LIGHT_OF_DAWN_KING_VISIT_14     = -1609256,         // Highlord Tirion Fordring
+    SAY_LIGHT_OF_DAWN_KING_VISIT_15     = -1609257,         // The Lich King
+    SAY_LIGHT_OF_DAWN_KING_VISIT_16     = -1609258,
+    SAY_LIGHT_OF_DAWN_KING_VISIT_17     = -1609259,
+
+    SAY_LIGHT_OF_DAWN_EPILOGUE_1        = -1609260,         // Highlord Tirion Fordring
+    SAY_LIGHT_OF_DAWN_EPILOGUE_2        = -1609261,
+    SAY_LIGHT_OF_DAWN_EPILOGUE_3        = -1609262,
+    SAY_LIGHT_OF_DAWN_EPILOGUE_4        = -1609263,
+    SAY_LIGHT_OF_DAWN_EPILOGUE_5        = -1609264,
+    SAY_LIGHT_OF_DAWN_EPILOGUE_6        = -1609265,
+    SAY_LIGHT_OF_DAWN_EPILOGUE_7        = -1609266,
+    SAY_LIGHT_OF_DAWN_EPILOGUE_8        = -1609267,
+    SAY_LIGHT_OF_DAWN_EPILOGUE_9        = -1609268,         // Highlord Darion Mograine
+
+    // Emotes
+    EMOTE_LIGHT_OF_DAWN_ARMY_RISE       = -1609269,         // Emotes
+    EMOTE_LIGHT_OF_DAWN_ARMY_MARCH      = -1609270,
+    EMOTE_LIGHT_OF_DAWN_TIRION          = -1609271,
+    EMOTE_LIGHT_OF_DAWN_FLEE            = -1609272,
+    EMOTE_LIGHT_OF_DAWN_KNEEL           = -1609273,
+    EMOTE_LIGHT_OF_DAWN_ALEXANDROS      = -1609274,
+    EMOTE_LIGHT_OF_DAWN_SHADE           = -1609275,
+    EMOTE_LIGHT_OF_DAWN_HUG             = -1609276,
+    EMOTE_LIGHT_OF_DAWN_LICH_KING       = -1609277,
+    EMOTE_LIGHT_OF_DAWN_ANGRY           = -1609278,
+    EMOTE_LIGHT_OF_DAWN_CAST_SPELL      = -1609279,
+    EMOTE_LIGHT_OF_DAWN_GRASP           = -1609280,
+    EMOTE_LIGHT_OF_DAWN_POWERFULL       = -1609281,
+    EMOTE_LIGHT_OF_DAWN_ASHBRINGER      = -1609282,
+    EMOTE_LIGHT_OF_DAWN_COLAPSE         = -1609283,
+    EMOTE_LIGHT_OF_DAWN_CHARGE          = -1609284,
+    EMOTE_LIGHT_OF_DAWN_KING_LEAVE      = -1609285,
+    EMOTE_LIGHT_OF_DAWN_LIGHT           = -1609286,
+
+    // Spells
+    // Highlord Darion Mograine
+    SPELL_HERO_AGGRO_AURA               = 53627,
+    SPELL_SCOURGE_AGGRO_AURA            = 53624,
+    SPELL_ANTI_MAGIC_ZONE_DARION        = 52893,
+    SPELL_DEATH_STRIKE                  = 53639,
+    SPELL_DEATH_EMBRACE                 = 53635,
+    SPELL_ICY_TOUCH_DARION              = 49723,
+    SPELL_PLAGUE_STRIKE_KNIGHTS         = 50688,
+    SPELL_THE_MIGHT_OF_MOGRAINE         = 53642,            // on players when battle begins
+    SPELL_UNHOLY_BLIGHT                 = 53640,
+
+    SPELL_BIRTH                         = 53603,            // ground shake
+    SPELL_THE_LIGHT_OF_DAWN_DUMMY       = 53658,            // light globe
+    SPELL_THE_LIGHT_OF_DAWN_DAMAGE_LOSS = 53645,            // cast by the scourge units
+    SPELL_ALEXANDROS_MOGRAINE_SPAWN     = 53667,            // spawn effect for Alexandros
+    SPELL_MOGRAINE_CHARGE               = 53679,            // charge to the Lich King
+    SPELL_ASHBRINGER                    = 53701,            // throw Ashbringer to Tirion
+    SPELL_THE_LIGHT_OF_DAWN_CREDIT      = 53606,            // quest credit
+
+    // Lich King spells
+    SPELL_APOCALYPSE                    = 53210,            // knocks back all enemies
+    SPELL_APOCALYPSE_STUN               = 53745,            // stuns all enemies
+    SPELL_POST_APOCALYPSE               = 53211,            // after apocalypse - not sure where to use it
+    SPELL_TELEPORT_VISUAL               = 52233,            // on leave
+    SPELL_SOUL_FEAST_ALEX               = 53677,            // on Alexandros
+    SPELL_SOUL_FEAST_TIRION             = 53685,            // on Tirion
+    SPELL_ICEBOUND_VISAGE               = 53274,            // ice effect
+    SPELL_REBUKE                        = 53680,            // knockback
+
+    // Highlord Tirion Fordring
+    //EQUIP_HIGHLORD_TIRION_FORDRING      = 13262,
+    SPELL_LAY_ON_HANDS                  = 53778,            // heal effect
+    SPELL_REBIRTH_OF_THE_ASHBRINGER     = 53702,            // globe sphere
+    SPELL_TIRION_CHARGE                 = 53705,            // on the lich king
+
+    POINT_MOVE_CHAPEL                   = 100,              // Use high entries to not conflict with escortAI waypoints
+    POINT_MOVE_OTHER                    = 101,
+    POINT_MOVE_RETURN_BATTLE            = 102,
+
+    // others
+    QUEST_ID_LIGHT_OF_DAWN              = 12801,
+
+    GOSSIP_ITEM_READY                   = -3609001,
+    GOSSIP_TEXT_ID_READY                = 13485,
+};
+
+struct npc_highlord_darion_mograine : public CreatureScript
+{
+    npc_highlord_darion_mograine() : CreatureScript("npc_highlord_darion_mograine") {}
+
+    struct  npc_highlord_darion_mograineAI : public npc_escortAI
+    {
+        npc_highlord_darion_mograineAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        // event timers
+        uint8 m_uiIntroYell;
+        uint32 m_uiPrepareTimer;
+
+        uint32 m_uiEventStep;
+        uint32 m_uiEventTimer;
+        uint32 m_uiFightTimer;
+
+        bool m_bIsBattleEnd;
+
+        uint8 m_uiLightWarriorsDead;
+        uint8 m_uiScourgeWarriorsDead;
+
+        // spell timers
+        uint32 m_uiAntimagicZoneTimer;
+        uint32 m_uiDeathStrikeTimer;
+        uint32 m_uiDeathEmbraceTimer;
+        uint32 m_uiIcyTouchTimer;
+        uint32 m_uiUnholyBlightTimer;
+        uint32 m_uiFightSpeechTimer;
+
+        uint32 m_uiSpawncheck;
+        uint32 m_uiTargetcheck;
+
+        // others
+        GuidList m_lDefendersGUIDs;                             // light of dawn defenders
+        GuidList m_lAttackersGUIDs;                             // scourge attackers
+
+        void Reset() override
+        {
+            // reset only when event is not in progress
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiIntroYell           = 0;
+                m_uiPrepareTimer        = 5 * MINUTE * IN_MILLISECONDS;
+
+                m_uiEventStep           = 0;
+                m_uiEventTimer          = 3000;
+                m_uiFightTimer          = 0;
+
+                m_bIsBattleEnd          = false;
+
+                m_uiLightWarriorsDead   = 0;
+                m_uiScourgeWarriorsDead = 0;
+
+                m_uiAntimagicZoneTimer  = urand(1000, 5000);
+                m_uiDeathStrikeTimer    = urand(5000, 10000);
+                m_uiDeathEmbraceTimer   = urand(5000, 10000);
+                m_uiIcyTouchTimer       = urand(5000, 10000);
+                m_uiUnholyBlightTimer   = urand(5000, 10000);
+                m_uiFightSpeechTimer    = 15000;
+            }
+        }
+
+        void GetAIInformation(ChatHandler& reader) override
+        {
+            npc_escortAI::GetAIInformation(reader);
+
+            if (m_pInstance)
+                reader.PSendSysMessage("Current state for TYPE_BATTLE: %u", m_pInstance->GetData(TYPE_BATTLE));
+
+            reader.PSendSysMessage("Current Event step: %u (%s)", m_uiEventStep, m_uiEventStep == 0 ? "Not-Started" : m_uiEventStep < 7 ? "Intro"  : m_uiEventStep < 10 ? "Battle" : "Outro");
+            reader.PSendSysMessage("Event-processing is %s, Fighting is %s", reader.GetOnOffStr(m_uiEventTimer), reader.GetOnOffStr(m_uiFightTimer));
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            // cast aggro aura
+            DoCastSpellIfCan(m_creature, SPELL_HERO_AGGRO_AURA);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // store summoned guid for easy handle
+            switch (pSummoned->GetEntry())
+            {
+                case NPC_VOLATILE_GHOUL:
+                    pSummoned->CastSpell(pSummoned, SPELL_BIRTH, true);
+                    // no break;
+                case NPC_WARRIOR_OF_THE_FROZEN_WASTES:
+                    m_lAttackersGUIDs.push_back(pSummoned->GetObjectGuid());
+                    // make the scourge attack only during the battle
+                    if (m_creature->IsInCombat())
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                            pSummoned->AI()->AttackStart(pTarget);
+                    }
+                    break;
+                case NPC_DEFENDER_OF_THE_LIGHT:
+                    m_lDefendersGUIDs.push_back(pSummoned->GetObjectGuid());
+                    break;
+            }
+
+            // set respawn delay
+            pSummoned->SetRespawnDelay(DAY);
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // if battle has ended return
+            if (m_pInstance->GetData(TYPE_BATTLE) != IN_PROGRESS)
+                return;
+
+            // should we count the 2 behemots and 5 abominations as well?
+            switch (pSummoned->GetEntry())
+            {
+                case NPC_VOLATILE_GHOUL:
+                case NPC_WARRIOR_OF_THE_FROZEN_WASTES:
+                    ++m_uiScourgeWarriorsDead;
+                    m_lAttackersGUIDs.remove(pSummoned->GetObjectGuid());
+
+                    if (m_pInstance)
+                        m_pInstance->SetData(WORLD_STATE_FORCES_SCOURGE, MAX_FORCES_SCOURGE - m_uiScourgeWarriorsDead);
+
+                    // if 5 soldiers are dead summon others
+                    if (m_uiScourgeWarriorsDead % MAX_WARRIORS_SUMMONED_PER_TURN == 0)
+                    {
+                        float fX, fY, fZ;
+                        // Actually this is some sort of cheat - but so many scourge numbers fall (currently), that I think it is ok to increase the summon amount
+                        for (uint8 i = 0; i < MAX_WARRIORS_SUMMONED_PER_TURN + 1; ++i)
+                        {
+                            uint32 uiSummonEntry = urand(0, 1) ? NPC_VOLATILE_GHOUL : NPC_WARRIOR_OF_THE_FROZEN_WASTES;
+                            m_creature->GetRandomPoint(aEventLocations[1].m_fX, aEventLocations[1].m_fY, aEventLocations[1].m_fZ, 30.0f, fX, fY, fZ);
+                            m_creature->SummonCreature(uiSummonEntry, fX, fY, fZ, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 5000);
+                        }
+                    }
+                    break;
+                case NPC_DEFENDER_OF_THE_LIGHT:
+                    ++m_uiLightWarriorsDead;
+                    m_lDefendersGUIDs.remove(pSummoned->GetObjectGuid());
+
+                    if (m_pInstance)
+                        m_pInstance->SetData(WORLD_STATE_FORCES_LIGHT, MAX_FORCES_LIGHT - m_uiLightWarriorsDead);
+
+                    // if 5 light soldiers are dead summon others
+                    if (m_uiLightWarriorsDead % MAX_WARRIORS_SUMMONED_PER_TURN == 0)
+                    {
+                        float fX, fY, fZ;
+                        for (uint8 i = 0; i < MAX_WARRIORS_SUMMONED_PER_TURN; i++)
+                        {
+                            m_creature->GetRandomPoint(aEventLocations[1].m_fX, aEventLocations[1].m_fY, aEventLocations[1].m_fZ, 30.0f, fX, fY, fZ);
+                            m_creature->SummonCreature(NPC_DEFENDER_OF_THE_LIGHT, fX, fY, fZ, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 5000);
+                        }
+                    }
+                    break;
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || uiPointId != POINT_MOVE_CHAPEL)
+                return;
+
+            if (!m_pInstance)
+                return;
+
+            switch (pSummoned->GetEntry())
+            {
+                    // hug father
+                case NPC_DARION_MOGRAINE:
+                    if (Creature* pAlexandros = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_ALEXANDROS_MOGRAINE))
+                        DoScriptText(EMOTE_LIGHT_OF_DAWN_HUG, pSummoned, pAlexandros);
+                    break;
+                case NPC_HIGHLORD_TIRION_FORDRING:
+                    // tirions stops the battle and brings the DK in front of the chapel
+                    DoScriptText(SAY_LIGHT_OF_DAWN_OUTRO_2, pSummoned);
+                    m_pInstance->SetData(TYPE_BATTLE, DONE);
+
+                    // scourge fighters die, if not already dead
+                    for (GuidList::const_iterator itr = m_lAttackersGUIDs.begin(); itr != m_lAttackersGUIDs.end(); ++itr)
+                    {
+                        if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                            pTemp->DealDamage(pTemp, pTemp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                    }
+
+                    // light fighters despawn
+                    for (GuidList::const_iterator itr = m_lDefendersGUIDs.begin(); itr != m_lDefendersGUIDs.end(); ++itr)
+                    {
+                        if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                            pTemp->ForcedDespawn();
+                    }
+
+                    // despawn big units
+                    m_pInstance->SetData(TYPE_DO_ACTION, DATA_ACTION_DESPAWN);
+
+                    // facing and mount
+                    pSummoned->Unmount();
+                    pSummoned->SetFacingTo(aEventLocations[1].m_fO);
+
+                    m_creature->Unmount();
+                    m_bIsBattleEnd = false;
+
+                    if (!HasEscortState(STATE_ESCORT_PAUSED))
+                    {
+                        SetEscortPaused(true);                  // In case something didn't go as expected
+                        SetCurrentWaypoint(5);
+                        m_uiEventTimer = 60000;                 // Another failsafe
+                    }
+
+                    SetEscortPaused(false);
+                    m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                    SetRun(false);
+                    m_creature->AI()->EnterEvadeMode();
+
+                    DoCastSpellIfCan(m_creature, SPELL_THE_LIGHT_OF_DAWN_DUMMY);
+
+                    // death knights are defeated
+                    if (Creature* pKoltira = m_pInstance->GetSingleCreatureFromStorage(NPC_KOLTIRA_DEATHWEAVER))
+                        pKoltira->AI()->EnterEvadeMode();
+                    if (Creature* pThassarian = m_pInstance->GetSingleCreatureFromStorage(NPC_THASSARIAN))
+                        pThassarian->AI()->EnterEvadeMode();
+                    // Orbaz flees -> despawn
+                    if (Creature* pOrbaz = m_pInstance->GetSingleCreatureFromStorage(NPC_ORBAZ_BLOODBANE))
+                    {
+                        DoScriptText(EMOTE_LIGHT_OF_DAWN_FLEE, pOrbaz);
+                        pOrbaz->AI()->EnterEvadeMode();
+                        pOrbaz->ForcedDespawn(30000);
+                    }
+
+                    // ligth champs evade to their summon points
+                    for (uint8 i = 0; i < MAX_LIGHT_CHAMPIONS; i++)
+                    {
+                        if (Creature* pTemp = m_pInstance->GetSingleCreatureFromStorage(aLightArmySpawnLoc[i].m_uiEntry))
+                        {
+                            // normally it shouldn't happen
+                            if (!pTemp->IsAlive())
+                                pTemp->Respawn();
+                            else
+                                pTemp->AI()->EnterEvadeMode();
+
+                            pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                            pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                        }
+                    }
+
+                    // clear defenders list
+                    m_lDefendersGUIDs.clear();
+
+                    // spawn soldiers
+                    for (uint8 i = 0; i < MAX_LIGHT_GUARDS; ++i)
+                    {
+                        if (Creature* pGuard = m_creature->SummonCreature(NPC_DEFENDER_OF_THE_LIGHT, aGuardsSpawnLoc[i].m_fX, aGuardsSpawnLoc[i].m_fY, aGuardsSpawnLoc[i].m_fZ, aGuardsSpawnLoc[i].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 0))
+                        {
+                            // make guard passive and with weapon
+                            pGuard->SetFacingToObject(m_creature);
+                            // should be 2 handed when the DB data is correct
+                            pGuard->HandleEmoteCommand(EMOTE_STATE_READY2H);
+                            pGuard->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                            pGuard->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                        }
+                    }
+
+                    break;
+            }
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId)
+        {
+            if (uiPointId < POINT_MOVE_CHAPEL || uiPointId > 10 * POINT_MOVE_RETURN_BATTLE)
+            {
+                npc_escortAI::MovementInform(uiMotionType, uiPointId);
+                return;
+            }
+
+            if (uiMotionType == POINT_MOTION_TYPE && uiPointId == POINT_MOVE_RETURN_BATTLE)
+            {
+                SetCombatMovement(false);
+                DoStartMovement(m_creature->getVictim());
+            }
+        }
+
+        void JustRespawned() override
+        {
+            m_creature->SetActiveObjectState(false);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_BATTLE, NOT_STARTED);
+
+            npc_escortAI::JustRespawned();
+        }
+
+        void WaypointReached(uint32 uiPoint) override
+        {
+            if (!m_pInstance)
+                return;
+
+            switch (uiPoint)
+            {
+                case 0:
+                    // summon light champions
+                    for (uint8 i = 0; i < MAX_LIGHT_CHAMPIONS; i++)
+                        m_creature->SummonCreature(aLightArmySpawnLoc[i].m_uiEntry, aLightArmySpawnLoc[i].m_fX, aLightArmySpawnLoc[i].m_fY, aLightArmySpawnLoc[i].m_fZ, aLightArmySpawnLoc[i].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5 * MINUTE * IN_MILLISECONDS);
+
+                    // summon light soldiers
+                    float fX, fY, fZ;
+                    for (uint8 i = 0; i < 5 * MAX_WARRIORS_SUMMONED_PER_TURN; ++i)
+                    {
+                        m_creature->GetRandomPoint(aEventLocations[1].m_fX, aEventLocations[1].m_fY, aEventLocations[1].m_fZ, 30.0f, fX, fY, fZ);
+                        m_creature->SummonCreature(NPC_DEFENDER_OF_THE_LIGHT, fX, fY, fZ, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 5000);
+                    }
+                    break;
+                case 2:
+                    // yell dawn 1
+                    if (Creature* pKorfax = m_pInstance->GetSingleCreatureFromStorage(NPC_KORFAX_CHAMPION_OF_THE_LIGHT))
+                        DoScriptText(SAY_LIGHT_OF_DAWN_STAND_1, pKorfax);
+                    break;
+                case 3:
+                    // yell dawn 2
+                    if (Creature* pMaxwell = m_pInstance->GetSingleCreatureFromStorage(NPC_LORD_MAXWELL_TYROSUS))
+                        DoScriptText(SAY_LIGHT_OF_DAWN_STAND_2, pMaxwell);
+
+                    DoCastSpellIfCan(m_creature, SPELL_THE_MIGHT_OF_MOGRAINE);
+                    // max fight timer
+                    m_uiFightTimer = 5 * MINUTE * IN_MILLISECONDS;
+                    break;
+                case 4:
+                    // start the battle
+                    SetEscortPaused(true);
+
+                    // start attacking someone
+                    if (Creature* pChamp = m_pInstance->GetSingleCreatureFromStorage(aLightArmySpawnLoc[urand(0, MAX_LIGHT_CHAMPIONS - 1)].m_uiEntry))
+                        m_creature->AI()->AttackStart(pChamp);
+
+                    // make army attack
+                    for (GuidList::const_iterator itr = m_lAttackersGUIDs.begin(); itr != m_lAttackersGUIDs.end(); ++itr)
+                    {
+                        Creature* pAttacker = m_creature->GetMap()->GetCreature(*itr);
+                        Creature* pChamp = m_pInstance->GetSingleCreatureFromStorage(aLightArmySpawnLoc[urand(0, MAX_LIGHT_CHAMPIONS - 1)].m_uiEntry);
+                        if (pAttacker && pChamp)
+                            pAttacker->AI()->AttackStart(pChamp);
+                    }
+
+                    // need to make sure that all defenders attack
+                    for (GuidList::const_iterator itr = m_lDefendersGUIDs.begin(); itr != m_lDefendersGUIDs.end(); ++itr)
+                    {
+                        if (Creature* pDefender = m_creature->GetMap()->GetCreature(*itr))
+                            pDefender->AI()->AttackStart(m_creature);
+                    }
+                    break;
+                case 5:
+                    // battle finished - remove light of dawn aura
+                    DoScriptText(EMOTE_LIGHT_OF_DAWN_KNEEL, m_creature);
+                    DoScriptText(SAY_LIGHT_OF_DAWN_OUTRO_3, m_creature);
+
+                    if (m_creature->HasAura(SPELL_THE_LIGHT_OF_DAWN_DUMMY))
+                        m_creature->RemoveAurasDueToSpell(SPELL_THE_LIGHT_OF_DAWN_DUMMY);
+
+                    m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+
+                    if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                        m_creature->SetFacingToObject(pTirion);
+
+                    // update guards facing
+                    for (GuidList::const_iterator itr = m_lDefendersGUIDs.begin(); itr != m_lDefendersGUIDs.end(); ++itr)
+                    {
+                        if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                            pTemp->SetFacingToObject(m_creature);
+                    }
+
+                    // escort paused and start cinematic
+                    m_uiEventTimer = 10000;
+                    SetEscortPaused(true);
+                    break;
+            }
+        }
+
+        // override evade function to always check for targets while in battle
+        void EnterEvadeMode() override
+        {
+            if (!m_pInstance)
+                return;
+
+            // if evade while the battle is in progress start attacking another target
+            if (m_pInstance->GetData(TYPE_BATTLE) == IN_PROGRESS)
+            {
+                // attack random champion
+                if (Creature* pChamp = m_pInstance->GetSingleCreatureFromStorage(aLightArmySpawnLoc[urand(0, MAX_LIGHT_CHAMPIONS - 1)].m_uiEntry))
+                    m_creature->AI()->AttackStart(pChamp);
+            }
+            else
+                npc_escortAI::EnterEvadeMode();
+        }
+
+        void DoSendQuestCredit()
+        {
+            Map::PlayerList const& PlayerList = m_creature->GetMap()->GetPlayers();
+
+            for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr)
+            {
+                Player* pPlayer = itr->getSource();
+                if (pPlayer && pPlayer->GetQuestStatus(QUEST_ID_LIGHT_OF_DAWN) == QUEST_STATUS_INCOMPLETE && pPlayer->IsAlive() && m_creature->IsWithinDistInMap(pPlayer, 50.0f))
+                    pPlayer->CastSpell(pPlayer, SPELL_THE_LIGHT_OF_DAWN_CREDIT, true);
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (m_pInstance->GetData(TYPE_BATTLE) == SPECIAL)
+            {
+                // intro event and battle timer
+                if (m_uiIntroYell == 0 && m_uiPrepareTimer < 3 * MINUTE * IN_MILLISECONDS)
+                {
+                    DoScriptText(SAY_LIGHT_OF_DAWN_INTRO_1, m_creature);
+                    ++m_uiIntroYell;
+                }
+                else if (m_uiIntroYell == 1 && m_uiPrepareTimer < 2 * MINUTE * IN_MILLISECONDS)
+                {
+                    DoScriptText(SAY_LIGHT_OF_DAWN_INTRO_2, m_creature);
+                    ++m_uiIntroYell;
+                }
+
+                // battle prepare timer
+                if (m_uiPrepareTimer < uiDiff)
+                {
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_BATTLE, IN_PROGRESS);
+                }
+                else
+                {
+                    m_uiPrepareTimer -= uiDiff;
+
+                    if (m_uiPrepareTimer / IN_MILLISECONDS % 60 == 0)
+                    {
+                        if (m_pInstance)
+                            m_pInstance->SetData(WORLD_STATE_BATTLE_TIMER_TIME, m_uiPrepareTimer / (MINUTE * IN_MILLISECONDS));
+                    }
+                }
+            }
+            else if (m_pInstance->GetData(TYPE_BATTLE) == IN_PROGRESS || m_pInstance->GetData(TYPE_BATTLE) == DONE)
+            {
+                if (m_uiEventTimer)
+                {
+                    if (m_uiEventTimer <= uiDiff)
+                    {
+                        if (!m_pInstance)
+                            return;
+
+                        switch (m_uiEventStep)
+                        {
+                            case 0:
+                                DoScriptText(SAY_LIGHT_OF_DAWN_PREPARE_1, m_creature);
+                                m_uiEventTimer = 5000;
+                                break;
+                            case 1:
+                                DoScriptText(SAY_LIGHT_OF_DAWN_PREPARE_2, m_creature);
+                                m_uiEventTimer = 10000;
+                                break;
+                            case 2:
+                                DoScriptText(SAY_LIGHT_OF_DAWN_PREPARE_3, m_creature);
+                                m_uiEventTimer = 3000;
+                                break;
+                            case 3:
+                                DoScriptText(EMOTE_LIGHT_OF_DAWN_ARMY_RISE, m_creature);
+                            case 4:
+                            case 5:
+                            {
+                                // summon army takes about 20 secs and it's done on a few stages; no break between them
+                                float fX, fY, fZ;
+                                for (uint8 i = 0; i < MAX_WARRIORS_SUMMONED_PER_TURN; ++i)
+                                {
+                                    uint32 uiSummonEntry = urand(0, 1) ? NPC_VOLATILE_GHOUL : NPC_WARRIOR_OF_THE_FROZEN_WASTES;
+                                    m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 50.0f, fX, fY, fZ);
+                                    m_creature->SummonCreature(uiSummonEntry, fX, fY, fZ, 4.7f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                                }
+                                m_uiEventTimer = 6000;
+                                break;
+                            }
+                            case 6:
+                                DoScriptText(SAY_LIGHT_OF_DAWN_PREPARE_4, m_creature);
+                                m_uiEventTimer = 2000;
+                                break;
+                            case 7:
+                                // send army emote
+                                for (GuidList::const_iterator itr = m_lAttackersGUIDs.begin(); itr != m_lAttackersGUIDs.end(); ++itr)
+                                {
+                                    if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                                        pTemp->HandleEmoteCommand(EMOTE_ONESHOT_BATTLEROAR);
+                                }
+                                m_uiEventTimer = 6000;
+                                break;
+                            case 8:
+                                // start attack (escort)
+                                DoScriptText(EMOTE_LIGHT_OF_DAWN_ARMY_MARCH, m_creature);
+                                m_creature->SetActiveObjectState(true);
+                                Start(true);
+
+                                // move the companions as well
+                                float fX, fY, fZ;
+                                if (Creature* pKoltira = m_pInstance->GetSingleCreatureFromStorage(NPC_KOLTIRA_DEATHWEAVER))
+                                {
+                                    pKoltira->SetWalk(false);
+                                    m_creature->GetRandomPoint(aEventLocations[1].m_fX, aEventLocations[1].m_fY, aEventLocations[1].m_fZ, 30.0f, fX, fY, fZ);
+                                    pKoltira->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                                }
+                                if (Creature* pThassarian = m_pInstance->GetSingleCreatureFromStorage(NPC_THASSARIAN))
+                                {
+                                    pThassarian->SetWalk(false);
+                                    m_creature->GetRandomPoint(aEventLocations[1].m_fX, aEventLocations[1].m_fY, aEventLocations[1].m_fZ, 30.0f, fX, fY, fZ);
+                                    pThassarian->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                                }
+                                if (Creature* pOrbaz = m_pInstance->GetSingleCreatureFromStorage(NPC_ORBAZ_BLOODBANE))
+                                {
+                                    pOrbaz->SetWalk(false);
+                                    m_creature->GetRandomPoint(aEventLocations[1].m_fX, aEventLocations[1].m_fY, aEventLocations[1].m_fZ, 30.0f, fX, fY, fZ);
+                                    pOrbaz->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                                }
+
+                                // move army
+                                for (GuidList::const_iterator itr = m_lAttackersGUIDs.begin(); itr != m_lAttackersGUIDs.end(); ++itr)
+                                {
+                                    if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                                    {
+                                        pTemp->SetWalk(false);
+                                        m_creature->GetRandomPoint(aEventLocations[1].m_fX, aEventLocations[1].m_fY, aEventLocations[1].m_fZ, 30.0f, fX, fY, fZ);
+                                        pTemp->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                                    }
+                                }
+                                // move big units
+                                m_pInstance->SetData(TYPE_DO_ACTION, DATA_ACTION_MOVE);
+                                m_uiEventTimer = 0;
+                                break;
+                            case 9:
+                                // after the battle
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_OUTRO_4, pTirion);
+                                m_uiEventTimer = 21000;
+                                break;
+                            case 10:
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_OUTRO_5, pTirion);
+                                m_uiEventTimer = 13000;
+                                break;
+                            case 11:
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_OUTRO_6, pTirion);
+                                m_uiEventTimer = 13000;
+                                break;
+                            case 12:
+                                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                                DoScriptText(SAY_LIGHT_OF_DAWN_OUTRO_7, m_creature);
+                                m_uiEventTimer = 7000;
+                                break;
+                            case 13:
+                                // start Alexandros vision
+                                if (Creature* pAlexandros = m_creature->SummonCreature(NPC_HIGHLORD_ALEXANDROS_MOGRAINE, aEventLocations[4].m_fX, aEventLocations[4].m_fY, aEventLocations[4].m_fZ, aEventLocations[4].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000))
+                                {
+                                    DoScriptText(EMOTE_LIGHT_OF_DAWN_ALEXANDROS, pAlexandros);
+                                    pAlexandros->CastSpell(pAlexandros, SPELL_ALEXANDROS_MOGRAINE_SPAWN, true);
+                                }
+                                m_uiEventTimer = 4000;
+                                break;
+                            case 14:
+                                if (Creature* pAlexandros = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_ALEXANDROS_MOGRAINE))
+                                {
+                                    pAlexandros->GetMotionMaster()->MovePoint(POINT_MOVE_OTHER, aEventLocations[5].m_fX, aEventLocations[5].m_fY, aEventLocations[5].m_fZ);
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_VISION_1, pAlexandros);
+                                    m_creature->SetFacingToObject(pAlexandros);
+                                }
+                                m_uiEventTimer = 2000;
+                                break;
+                            case 15:
+                                DoScriptText(SAY_LIGHT_OF_DAWN_VISION_2, m_creature);
+                                m_uiEventTimer = 4000;
+                                break;
+                            case 16:
+                                DoScriptText(SAY_LIGHT_OF_DAWN_VISION_3, m_creature);
+                                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                                // summon young Darion for 1 min
+                                if (Creature* pDarion = m_creature->SummonCreature(NPC_DARION_MOGRAINE, aEventLocations[6].m_fX, aEventLocations[6].m_fY, aEventLocations[6].m_fZ, aEventLocations[6].m_fO, TEMPSUMMON_TIMED_DESPAWN, 1 * MINUTE * IN_MILLISECONDS))
+                                    DoScriptText(EMOTE_LIGHT_OF_DAWN_SHADE, pDarion);
+                                m_uiEventTimer = 3000;
+                                break;
+                            case 17:
+                                if (Creature* pDarion = m_pInstance->GetSingleCreatureFromStorage(NPC_DARION_MOGRAINE))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_VISION_4, pDarion);
+                                m_uiEventTimer = 3000;
+                                break;
+                            case 18:
+                                // young darion runs to father
+                                if (Creature* pDarion = m_pInstance->GetSingleCreatureFromStorage(NPC_DARION_MOGRAINE))
+                                {
+                                    pDarion->SetWalk(false);
+                                    pDarion->GetMotionMaster()->MovePoint(POINT_MOVE_CHAPEL, aEventLocations[7].m_fX, aEventLocations[7].m_fY, aEventLocations[7].m_fZ);
+                                }
+                                m_uiEventTimer = 5000;
+                                break;
+                            case 19:
+                                if (Creature* pDarion = m_pInstance->GetSingleCreatureFromStorage(NPC_DARION_MOGRAINE))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_VISION_5, pDarion);
+                                m_uiEventTimer = 5000;
+                                break;
+                            case 20:
+                                if (Creature* pAlexandros = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_ALEXANDROS_MOGRAINE))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_VISION_6, pAlexandros);
+                                m_uiEventTimer = 8000;
+                                break;
+                            case 21:
+                                if (Creature* pDarion = m_pInstance->GetSingleCreatureFromStorage(NPC_DARION_MOGRAINE))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_VISION_7, pDarion);
+                                m_uiEventTimer = 8000;
+                                break;
+                            case 22:
+                                if (Creature* pAlexandros = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_ALEXANDROS_MOGRAINE))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_VISION_8, pAlexandros);
+
+                                // move Tirion to the point where the light of dawn is
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                {
+                                    pTirion->SetWalk(true);
+                                    if (GameObject* pLight = m_pInstance->GetSingleGameObjectFromStorage(GO_LIGHT_OF_DAWN))
+                                        pTirion->GetMotionMaster()->MovePoint(POINT_MOVE_OTHER, pLight->GetPositionX(), pLight->GetPositionY(), pLight->GetPositionZ());
+                                }
+                                m_uiEventTimer = 15000;
+                                break;
+                            case 23:
+                                if (Creature* pDarion = m_pInstance->GetSingleCreatureFromStorage(NPC_DARION_MOGRAINE))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_VISION_9, pDarion);
+                                m_uiEventTimer = 11000;
+                                break;
+                            case 24:
+                                if (Creature* pAlexandros = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_ALEXANDROS_MOGRAINE))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_VISION_10, pAlexandros);
+                                m_uiEventTimer = 29000;
+                                break;
+                            case 25:
+                                if (Creature* pAlexandros = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_ALEXANDROS_MOGRAINE))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_VISION_11, pAlexandros);
+                                m_uiEventTimer = 6000;
+                                break;
+                            case 26:
+                                // Lich king visit
+                                if (Creature* pLichKing = m_creature->SummonCreature(NPC_THE_LICH_KING, aEventLocations[8].m_fX, aEventLocations[8].m_fY, aEventLocations[8].m_fZ, aEventLocations[8].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 5000))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_1, pLichKing);
+                                if (Creature* pAlexandros = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_ALEXANDROS_MOGRAINE))
+                                    DoScriptText(EMOTE_LIGHT_OF_DAWN_LICH_KING, pAlexandros);
+                                m_uiEventTimer = 2000;
+                                break;
+                            case 27:
+                                // the LK feasts on Alexandros
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                {
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_2, pLichKing);
+                                    if (Creature* pAlexandros = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_ALEXANDROS_MOGRAINE))
+                                        pLichKing->CastSpell(pAlexandros, SPELL_SOUL_FEAST_ALEX, false);
+                                }
+                                m_uiEventTimer = 2000;
+                                break;
+                            case 28:
+                                if (Creature* pAlexandros = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_ALEXANDROS_MOGRAINE))
+                                    pAlexandros->ForcedDespawn();
+                                m_uiEventTimer = 2000;
+                                break;
+                            case 29:
+                                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                                DoScriptText(EMOTE_LIGHT_OF_DAWN_ANGRY, m_creature);
+                                DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_3, m_creature);
+                                m_uiEventTimer = 3000;
+                                break;
+                            case 30:
+                                // the LK moves forward
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                {
+                                    pLichKing->CastSpell(pLichKing, SPELL_ICEBOUND_VISAGE, true);
+                                    pLichKing->GetMotionMaster()->MovePoint(POINT_MOVE_CHAPEL, aEventLocations[9].m_fX, aEventLocations[9].m_fY, aEventLocations[9].m_fZ);
+                                }
+                                m_uiEventTimer = 5000;
+                                break;
+                            case 31:
+                                // darion charges
+                                DoCastSpellIfCan(m_creature, SPELL_MOGRAINE_CHARGE);
+                                m_uiEventTimer = 3000;
+                                break;
+                            case 32:
+                                // the LK kicks darion
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                {
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_4, pLichKing);
+                                    // Note: this should be cast by the LK - spell bug
+                                    m_creature->CastSpell(m_creature, SPELL_REBUKE, true);
+                                }
+                                m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+                                m_uiEventTimer = 4000;
+                                break;
+                            case 33:
+                                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                    m_creature->SetFacingToObject(pLichKing);
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_5, pTirion);
+                                m_uiEventTimer = 8000;
+                                break;
+                            case 34:
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_6, pLichKing);
+                                m_uiEventTimer = 15000;
+                                break;
+                            case 35:
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_7, pLichKing);
+                                m_uiEventTimer = 17000;
+                                break;
+                            case 36:
+                                // the LK feasts on tirion
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                {
+                                    DoScriptText(EMOTE_LIGHT_OF_DAWN_CAST_SPELL, pLichKing);
+                                    if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    {
+                                        DoScriptText(EMOTE_LIGHT_OF_DAWN_GRASP, pTirion);
+                                        pLichKing->CastSpell(pTirion, SPELL_SOUL_FEAST_TIRION, false);
+                                        pLichKing->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                                    }
+                                }
+                                m_uiEventTimer = 2000;
+                                break;
+                            case 37:
+                                // the light champions attack the LK
+                                if (Creature* pMaxwell = m_pInstance->GetSingleCreatureFromStorage(NPC_LORD_MAXWELL_TYROSUS))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_8, pMaxwell);
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                {
+                                    float fX, fY, fZ;
+                                    pLichKing->GetContactPoint(m_creature, fX, fY, fZ);
+                                    for (GuidList::const_iterator itr = m_lDefendersGUIDs.begin(); itr != m_lDefendersGUIDs.end(); ++itr)
+                                    {
+                                        if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                                        {
+                                            pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                                            pTemp->SetWalk(false);
+                                            pTemp->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                                            // attack gives us some issues
+                                            //pTemp->AI()->AttackStart(pLichKing);
+                                        }
+                                    }
+                                    for (uint8 i = 0; i < MAX_LIGHT_CHAMPIONS; i++)
+                                    {
+                                        if (Creature* pTemp = m_pInstance->GetSingleCreatureFromStorage(aLightArmySpawnLoc[i].m_uiEntry))
+                                        {
+                                            pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                                            pTemp->SetWalk(false);
+                                            pTemp->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                                            // attack gives us some issues
+                                            //pTemp->AI()->AttackStart(pLichKing);
+                                        }
+                                    }
+                                }
+                                m_uiEventTimer = 6000;
+                                break;
+                            case 38:
+                                // the LK throws away all the attackers
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                {
+                                    DoScriptText(EMOTE_LIGHT_OF_DAWN_POWERFULL, pLichKing);
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_9, pLichKing);
+                                    pLichKing->CastSpell(pLichKing, SPELL_APOCALYPSE, true);
+                                }
+                                m_uiEventTimer = 1000;
+                                break;
+                            case 39:
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                {
+                                    pLichKing->CastSpell(pLichKing, SPELL_POST_APOCALYPSE, true);
+
+                                    // despawn guards
+                                    for (GuidList::const_iterator itr = m_lDefendersGUIDs.begin(); itr != m_lDefendersGUIDs.end(); ++itr)
+                                    {
+                                        if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                                            pTemp->DealDamage(pTemp, pTemp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                                    }
+                                    // workaround for the light champions - spell doesn't work right
+                                    for (uint8 i = 0; i < MAX_LIGHT_CHAMPIONS; i++)
+                                    {
+                                        if (Creature* pTemp = m_pInstance->GetSingleCreatureFromStorage(aLightArmySpawnLoc[i].m_uiEntry))
+                                        {
+                                            pTemp->SetStandState(UNIT_STAND_STATE_DEAD);
+                                            pTemp->KnockBackFrom(pLichKing, 50, float(urand(44, 87)) / 10);
+                                        }
+                                    }
+                                }
+                                m_uiEventTimer = 5000;
+                                break;
+                            case 40:
+                                DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_10, m_creature);
+                                m_uiEventTimer = 5000;
+                                break;
+                            case 41:
+                                // darion throws the ashbringer to tirion
+                                DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_11, m_creature);
+                                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                                m_uiEventTimer = 1000;
+                                break;
+                            case 42:
+                                DoScriptText(EMOTE_LIGHT_OF_DAWN_ASHBRINGER, m_creature);
+                                DoCastSpellIfCan(m_creature, SPELL_ASHBRINGER);
+                                SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_UNEQUIP, EQUIP_NO_CHANGE);
+                                m_uiEventTimer = 5000;
+                                break;
+                            case 43:
+                                // darion colapses while tirion is engulfed in light
+                                DoScriptText(EMOTE_LIGHT_OF_DAWN_COLAPSE, m_creature);
+                                m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    pTirion->CastSpell(pTirion, SPELL_REBIRTH_OF_THE_ASHBRINGER, true);
+                                m_pInstance->DoRespawnGameObject(GO_LIGHT_OF_DAWN, 5 * MINUTE);
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                    pLichKing->InterruptNonMeleeSpells(false);
+                                m_uiEventTimer = 2000;
+                                break;
+                            case 44:
+                                // rebirth of the ashbringer
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                {
+                                    if (pTirion->HasAura(SPELL_REBIRTH_OF_THE_ASHBRINGER))
+                                        pTirion->RemoveAurasDueToSpell(SPELL_REBIRTH_OF_THE_ASHBRINGER);
+                                    pTirion->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
+                                }
+                                m_uiEventTimer = 2500;
+                                break;
+                            case 45:
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_12, pTirion);
+                                m_uiEventTimer = 4000;
+                                break;
+                            case 46:
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_13, pLichKing);
+                                m_uiEventTimer = 5000;
+                                break;
+                            case 47:
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_14, pTirion);
+                                m_uiEventTimer = 1000;
+                                break;
+                            case 48:
+                                // tirion charges to the LK
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                {
+                                    DoScriptText(EMOTE_LIGHT_OF_DAWN_CHARGE, pTirion);
+                                    pTirion->CastSpell(pTirion, SPELL_TIRION_CHARGE, true);
+                                }
+                                m_uiEventTimer = 2000;
+                                break;
+                            case 49:
+                                // move the LK back in front of tirion;
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                {
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_15, pLichKing);
+                                    pLichKing->GetMotionMaster()->MovePoint(POINT_MOVE_CHAPEL, aEventLocations[8].m_fX, aEventLocations[8].m_fY, aEventLocations[8].m_fZ);
+                                }
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    pTirion->DeleteThreatList();
+                                m_uiEventTimer = 1000;
+                                break;
+                            case 50:
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                    pLichKing->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL);
+                                m_uiEventTimer = 3000;
+                                break;
+                            case 51:
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_16, pLichKing);
+                                m_uiEventTimer = 10000;
+                                break;
+                            case 52:
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_KING_VISIT_17, pLichKing);
+                                m_uiEventTimer = 10000;
+                                break;
+                            case 53:
+                                // the lich king teleports to leave
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                    pLichKing->CastSpell(pLichKing, SPELL_TELEPORT_VISUAL, false);
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                {
+                                    float fX, fY, fZ;
+                                    pTirion->SetWalk(false);
+                                    m_creature->GetContactPoint(pTirion, fX, fY, fZ, INTERACTION_DISTANCE);
+                                    pTirion->GetMotionMaster()->MovePoint(POINT_MOVE_OTHER, fX, fY, fZ);
+                                }
+                                // make champions stand
+                                for (uint8 i = 0; i < MAX_LIGHT_CHAMPIONS; i++)
+                                {
+                                    if (Creature* pTemp = m_pInstance->GetSingleCreatureFromStorage(aLightArmySpawnLoc[i].m_uiEntry))
+                                    {
+                                        pTemp->SetStandState(UNIT_STAND_STATE_STAND);
+                                        pTemp->SetFacingToObject(m_creature);
+                                    }
+                                }
+                                m_uiEventTimer = 2000;
+                                break;
+                            case 54:
+                                // the lich king leaves
+                                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICH_KING))
+                                {
+                                    DoScriptText(EMOTE_LIGHT_OF_DAWN_KING_LEAVE, pLichKing);
+                                    pLichKing->ForcedDespawn();
+                                }
+                                m_uiEventTimer = 7000;
+                                break;
+                            case 55:
+                                // tirion reaches darion and starts the epilogue
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                {
+                                    pTirion->CastSpell(m_creature, SPELL_LAY_ON_HANDS, true);
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_EPILOGUE_1, pTirion);
+                                }
+                                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                                m_uiEventTimer = 3000;
+                                break;
+                            case 56:
+                                // tirion moves near the light of dawn object
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                {
+                                    pTirion->SetWalk(true);
+                                    pTirion->GetMotionMaster()->MovePoint(POINT_MOVE_OTHER, aEventLocations[10].m_fX, aEventLocations[10].m_fY, aEventLocations[10].m_fZ);
+                                }
+                                m_uiEventTimer = 5000;
+                                break;
+                            case 57:
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                {
+                                    pTirion->SetFacingToObject(m_creature);
+                                    m_creature->SetFacingToObject(pTirion);
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_EPILOGUE_2, pTirion);
+                                }
+                                m_uiEventTimer = 15000;
+                                break;
+                            case 58:
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_EPILOGUE_3, pTirion);
+                                m_uiEventTimer = 7000;
+                                break;
+                            case 59:
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_EPILOGUE_4, pTirion);
+                                m_uiEventTimer = 10000;
+                                break;
+                            case 60:
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_EPILOGUE_5, pTirion);
+                                m_uiEventTimer = 11000;
+                                break;
+                            case 61:
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_EPILOGUE_6, pTirion);
+                                m_uiEventTimer = 10000;
+                                break;
+                            case 62:
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_EPILOGUE_7, pTirion);
+                                m_uiEventTimer = 8000;
+                                break;
+                            case 63:
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    DoScriptText(SAY_LIGHT_OF_DAWN_EPILOGUE_8, pTirion);
+                                m_uiEventTimer = 10000;
+                                break;
+                            case 64:
+                                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                                DoScriptText(SAY_LIGHT_OF_DAWN_EPILOGUE_9, m_creature);
+                                m_uiEventTimer = 10000;
+                                break;
+                            case 65:
+                                // send credit then in 5 min reset
+                                DoSendQuestCredit();
+                                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                                m_uiEventTimer = 5 * MINUTE * IN_MILLISECONDS;
+                                break;
+                            case 66:
+                                m_pInstance->SetData(TYPE_BATTLE, NOT_STARTED);
+                                if (Creature* pKoltira = m_pInstance->GetSingleCreatureFromStorage(NPC_KOLTIRA_DEATHWEAVER))
+                                    pKoltira->ForcedDespawn();
+                                if (Creature* pThassarian = m_pInstance->GetSingleCreatureFromStorage(NPC_THASSARIAN))
+                                    pThassarian->ForcedDespawn();
+                                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                                    pTirion->ForcedDespawn();
+                                for (uint8 i = 0; i < MAX_LIGHT_CHAMPIONS; i++)
+                                {
+                                    if (Creature* pTemp = m_pInstance->GetSingleCreatureFromStorage(aLightArmySpawnLoc[i].m_uiEntry))
+                                        pTemp->ForcedDespawn();
+                                }
+                                SetEscortPaused(false);
+                                m_uiEventTimer = 0;
+                                break;
+                        }
+
+                        ++m_uiEventStep;
+                    }
+                    else
+                        m_uiEventTimer -= uiDiff;
+                }
+
+                // Battle end yells
+                if (m_bIsBattleEnd)
+                {
+                    if (m_uiFightSpeechTimer < uiDiff)
+                    {
+                        switch (urand(0, 6))
+                        {
+                            case 0: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_10, m_creature); break;
+                            case 1: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_11, m_creature); break;
+                            case 2: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_12, m_creature); break;
+                            case 3: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_13, m_creature); break;
+                            case 4: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_14, m_creature); break;
+                            case 5: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_15, m_creature); break;
+                            case 6: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_16, m_creature); break;
+                        }
+                        m_uiFightSpeechTimer = urand(5000, 7000);
+                    }
+                    else
+                        m_uiFightSpeechTimer -= uiDiff;
+                }
+
+                // Handle battle events
+                if (m_uiFightTimer)
+                {
+                    // on blizz the battle takes about 4 min, time in which about 100 light warriors die
+                    if (m_uiFightTimer <= uiDiff || m_uiLightWarriorsDead >= 100)
+                    {
+                        // summon Tirion and move him to the chapel
+                        if (Creature* pTirion = m_creature->SummonCreature(NPC_HIGHLORD_TIRION_FORDRING, aEventLocations[0].m_fX, aEventLocations[0].m_fY, aEventLocations[0].m_fZ, aEventLocations[0].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 5000, true))
+                        {
+                            // decrease Darion's damage
+                            DoCastSpellIfCan(m_creature, SPELL_THE_LIGHT_OF_DAWN_DAMAGE_LOSS, CAST_TRIGGERED);
+
+                            // Damage the scourge army
+                            if (m_pInstance)
+                                m_pInstance->SetData(TYPE_DO_ACTION, DATA_ACTION_ENABLE_TRAPS);
+
+                            DoScriptText(SAY_LIGHT_OF_DAWN_OUTRO_1, pTirion);
+                            DoScriptText(EMOTE_LIGHT_OF_DAWN_TIRION, pTirion);
+
+                            pTirion->SetWalk(false);
+                            pTirion->GetMotionMaster()->MovePoint(POINT_MOVE_CHAPEL, aEventLocations[1].m_fX, aEventLocations[1].m_fY, aEventLocations[1].m_fZ);
+
+                            m_uiFightTimer = 0;
+                            m_uiFightSpeechTimer = 1000;
+                            m_bIsBattleEnd = true;
+                        }
+                    }
+                    else
+                        m_uiFightTimer -= uiDiff;
+
+                    if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                        return;
+
+                    // battle sounds
+                    if (m_uiFightSpeechTimer < uiDiff)
+                    {
+                        switch (urand(0, 8))
+                        {
+                            case 0: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_1, m_creature); break;
+                            case 1: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_2, m_creature); break;
+                            case 2: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_3, m_creature); break;
+                            case 3: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_4, m_creature); break;
+                            case 4: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_5, m_creature); break;
+                            case 5: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_6, m_creature); break;
+                            case 6: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_7, m_creature); break;
+                            case 7: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_8, m_creature); break;
+                            case 8: DoScriptText(SAY_LIGHT_OF_DAWN_BATTLE_9, m_creature); break;
+                        }
+                        m_uiFightSpeechTimer = urand(15000, 20000);
+                    }
+                    else
+                        m_uiFightSpeechTimer -= uiDiff;
+
+                    // make sure that darion always stays in the area
+                    if (!m_creature->IsWithinDist2d(aEventLocations[1].m_fX, aEventLocations[1].m_fY, 50.0f))
+                    {
+                        SetCombatMovement(false);
+                        m_creature->GetMotionMaster()->MovePoint(POINT_MOVE_RETURN_BATTLE, aEventLocations[1].m_fX, aEventLocations[1].m_fY, aEventLocations[1].m_fZ);
+                    }
+
+                    // Darion spells
+                    if (m_uiAntimagicZoneTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_ANTI_MAGIC_ZONE_DARION) == CAST_OK)
+                            m_uiAntimagicZoneTimer = urand(85000, 90000);
+                    }
+                    else
+                        m_uiAntimagicZoneTimer -= uiDiff;
+
+                    if (m_uiDeathStrikeTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DEATH_STRIKE) == CAST_OK)
+                            m_uiDeathStrikeTimer = urand(5000, 10000);
+                    }
+                    else
+                        m_uiDeathStrikeTimer -= uiDiff;
+
+                    if (m_uiDeathEmbraceTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DEATH_EMBRACE) == CAST_OK)
+                            m_uiDeathEmbraceTimer = urand(5000, 10000);
+                    }
+                    else
+                        m_uiDeathEmbraceTimer -= uiDiff;
+
+                    if (m_uiIcyTouchTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ICY_TOUCH_DARION) == CAST_OK)
+                            m_uiIcyTouchTimer = urand(5000, 10000);
+                    }
+                    else
+                        m_uiIcyTouchTimer -= uiDiff;
+
+                    if (m_uiUnholyBlightTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_UNHOLY_BLIGHT) == CAST_OK)
+                            m_uiUnholyBlightTimer = urand(5000, 10000);
+                    }
+                    else
+                        m_uiUnholyBlightTimer -= uiDiff;
+
+                    DoMeleeAttackIfReady();
+                }
+            }
+        }
+    };
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+
+        // Only allow start battle after reset
+        if (InstanceData* pInstance = pCreature->GetInstanceData())
+        {
+            if (pPlayer->GetQuestStatus(QUEST_ID_LIGHT_OF_DAWN) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(TYPE_BATTLE) == NOT_STARTED)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_READY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_READY, pCreature->GetObjectGuid());
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        if (uiAction ==  GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            if (InstanceData* pInstance = pCreature->GetInstanceData())
+            {
+                // set data to special in order to start the event
+                pInstance->SetData(TYPE_BATTLE, SPECIAL);
+                pPlayer->CLOSE_GOSSIP_MENU();
+
+                return true;
+            }
+        }
+        pPlayer->CLOSE_GOSSIP_MENU();
+
+        return false;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_highlord_darion_mograineAI(pCreature);
+    }
+};
+
+/* npc_fellow_death_knight */
+struct npc_fellow_death_knight : public CreatureScript
+{
+    npc_fellow_death_knight() : CreatureScript("npc_fellow_death_knight") {}
+
+    struct  npc_fellow_death_knightAI : public ScriptedAI
+    {
+        npc_fellow_death_knightAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiIcyTouchTimer;
+        uint32 m_uiBloodStrikeTimer;
+        uint32 m_uiPlagueStrikeTimer;
+
+        void Reset() override
+        {
+            m_uiBloodStrikeTimer = urand(5000, 10000);
+            m_uiIcyTouchTimer = urand(5000, 10000);
+            m_uiPlagueStrikeTimer = urand(5000, 10000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_HERO_AGGRO_AURA);
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || uiPointId != POINT_MOVE_CHAPEL)
+                return;
+
+            // make the death knights kneel
+            if (m_creature->HasAura(SPELL_THE_LIGHT_OF_DAWN_DUMMY))
+                m_creature->RemoveAurasDueToSpell(SPELL_THE_LIGHT_OF_DAWN_DUMMY);
+
+            m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+
+            if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                m_creature->SetFacingToObject(pTirion);
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (!m_creature->IsAlive())
+                return;
+
+            if (!m_pInstance)
+                return;
+
+            // if evade while the battle is in progress start attacking another target
+            if (m_pInstance->GetData(TYPE_BATTLE) == IN_PROGRESS)
+            {
+                if (Creature* pDarion = m_pInstance->GetSingleCreatureFromStorage(NPC_HIGHLORD_DARION_MOGRAINE))
+                {
+                    if (Unit* pTarget = pDarion->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        m_creature->AI()->AttackStart(pTarget);
+                }
+            }
+            else if (m_pInstance->GetData(TYPE_BATTLE) == DONE)
+            {
+                m_creature->RemoveAllAurasOnEvade();
+                m_creature->DeleteThreatList();
+                m_creature->CombatStop(true);
+                m_creature->LoadCreatureAddon(true);
+                m_creature->SetLootRecipient(NULL);
+
+                Reset();
+
+                if (m_creature->GetEntry() != NPC_ORBAZ_BLOODBANE)
+                {
+                    // cast light of dawn
+                    if (DoCastSpellIfCan(m_creature, SPELL_THE_LIGHT_OF_DAWN_DUMMY, CAST_TRIGGERED) == CAST_OK)
+                    {
+                        m_creature->Unmount();
+                        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                    }
+                }
+
+                // move to chapel points
+                switch (m_creature->GetEntry())
+                {
+                case NPC_THASSARIAN:
+                    m_creature->GetMotionMaster()->MovePoint(POINT_MOVE_CHAPEL, aEventLocations[3].m_fX, aEventLocations[3].m_fY, aEventLocations[3].m_fZ);
+                    break;
+                case NPC_KOLTIRA_DEATHWEAVER:
+                    m_creature->GetMotionMaster()->MovePoint(POINT_MOVE_CHAPEL, aEventLocations[2].m_fX, aEventLocations[2].m_fY, aEventLocations[2].m_fZ);
+                    break;
+                case NPC_ORBAZ_BLOODBANE:
+                    m_creature->GetMotionMaster()->MoveTargetedHome();
+                    break;
+                }
+            }
+            else
+                ScriptedAI::EnterEvadeMode();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiPlagueStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_PLAGUE_STRIKE_KNIGHTS) == CAST_OK)
+                    m_uiPlagueStrikeTimer = urand(5000, 10000);
+            }
+            else
+                m_uiPlagueStrikeTimer -= uiDiff;
+
+            if (m_uiIcyTouchTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ICY_TOUCH_DARION) == CAST_OK)
+                    m_uiIcyTouchTimer = urand(5000, 10000);
+            }
+            else
+                m_uiIcyTouchTimer -= uiDiff;
+
+            if (m_uiBloodStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_BLOOD_STRIKE) == CAST_OK)
+                    m_uiBloodStrikeTimer = urand(5000, 10000);
+            }
+            else
+                m_uiBloodStrikeTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_fellow_death_knightAI(pCreature);
+    }
+};
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_lich_king_light_dawn : public CreatureScript
+{
+    npc_lich_king_light_dawn() : CreatureScript("npc_lich_king_light_dawn") {}
+
+    struct  npc_lich_king_light_dawnAI : public ScriptedAI
+    {
+        npc_lich_king_light_dawnAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        void Reset() override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_lich_king_light_dawnAI(pCreature);
+    }
+};
+
+/*######
+## npc_acherus_deathcharger
+######*/
+
+enum
+{
+    EMOTE_HORSE_READY           = -1609097,
+    SAY_RACE_FINISHED           = -1609098,
+
+    SPELL_HORSEMAN_SLAIN        = 52692,
+    SPELL_RACE_COMPLETE         = 52361,
+
+    NPC_DARK_RIDER_OF_ACHERUS   = 28768,
+    NPC_SALANAR_THE_HORSEMAN    = 28788,
+
+    FACTION_FRIENDLY            = 35,
+};
+
+struct npc_acherus_deathcharger : public CreatureScript
+{
+    npc_acherus_deathcharger() : CreatureScript("npc_acherus_deathcharger") {}
+
+    struct  npc_acherus_deathchargerAI : public ScriptedAI
+    {
+        npc_acherus_deathchargerAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        bool m_bIsRiderDead;
+
+        uint8 m_uiQuestEndStage;
+        uint32 m_uiQuestEndTimer;
+
+        ObjectGuid m_salaranGuid;
+
+        void Reset() override
+        {
+            m_bIsRiderDead = false;
+            m_uiQuestEndStage = 0;
+            m_uiQuestEndTimer = 0;
+
+            SetCombatMovement(true);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (m_bIsRiderDead)
+            {
+                m_creature->RemoveAllAurasOnEvade();
+                m_creature->DeleteThreatList();
+                m_creature->CombatStop(true);
+                m_creature->LoadCreatureAddon(true);
+                m_creature->SetLootRecipient(NULL);
+
+                // Stop movemnet
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MoveIdle();
+
+                // Prepare to be mounted
+                SetCombatMovement(false);
+                DoScriptText(EMOTE_HORSE_READY, m_creature);
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN);
+            }
+            else
+                ScriptedAI::EnterEvadeMode();
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SALANAR_THE_HORSEMAN)
+            {
+                float fX, fY, fZ;
+                m_creature->GetContactPoint(pSummoned, fX, fY, fZ, INTERACTION_DISTANCE);
+                pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+
+                m_salaranGuid = pSummoned->GetObjectGuid();
+                m_uiQuestEndTimer = 4000;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // Initial vehicle rider - handled in DB
+            if (pSummoned->GetEntry() == NPC_DARK_RIDER_OF_ACHERUS)
+            {
+                m_bIsRiderDead = true;
+                DoCastSpellIfCan(m_creature, SPELL_HORSEMAN_SLAIN, CAST_TRIGGERED);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiQuestEndTimer)
+            {
+                if (m_uiQuestEndTimer <= uiDiff)
+                {
+                    switch (m_uiQuestEndStage)
+                    {
+                    case 0:
+                        if (Creature* pSalaran = m_creature->GetMap()->GetCreature(m_salaranGuid))
+                            DoScriptText(SAY_RACE_FINISHED, pSalaran);
+
+                        m_uiQuestEndTimer = 5000;
+                        break;
+                    case 1:
+                        // Cast completion spell on player
+                        Creature* pSalaran = m_creature->GetMap()->GetCreature(m_salaranGuid);
+                        Player* pPlayer = m_creature->GetCharmerOrOwnerPlayerOrPlayerItself();
+                        if (!pPlayer || !pSalaran)
+                            return;
+
+                        pSalaran->CastSpell(pPlayer, SPELL_RACE_COMPLETE, true);
+                        pSalaran->ForcedDespawn(1000);
+                        m_creature->ForcedDespawn(1000);
+                        m_uiQuestEndTimer = 0;
+                        break;
+                    }
+                    ++m_uiQuestEndStage;
+                }
+                else
+                    m_uiQuestEndTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_acherus_deathchargerAI(pCreature);
+    }
+};
+
+struct spell_horseman_slain : public SpellScript
+{
+    spell_horseman_slain() : SpellScript("spell_horseman_slain") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        Creature* pCreatureTarget = pTarget->ToCreature();
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_HORSEMAN_SLAIN && uiEffIndex == EFFECT_INDEX_0)
+        {
+            // Make horse evade
+            pCreatureTarget->AI()->EnterEvadeMode();
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_ebon_hold()
+{
+    Script* s;
+
+    s = new npc_a_special_surprise();
+    s->RegisterSelf();
+    s = new npc_death_knight_initiate();
+    s->RegisterSelf();
+    s = new npc_koltira_deathweaver();
+    s->RegisterSelf();
+    s = new npc_unworthy_initiate();
+    s->RegisterSelf();
+    s = new npc_unworthy_initiate_anchor();
+    s->RegisterSelf();
+    s = new go_acherus_soul_prison();
+    s->RegisterSelf();
+    s = new npc_eye_of_acherus();
+    s->RegisterSelf();
+    s = new npc_scarlet_ghoul();
+    s->RegisterSelf();
+    s = new npc_highlord_darion_mograine();
+    s->RegisterSelf();
+    s = new npc_fellow_death_knight();
+    s->RegisterSelf();
+    s = new npc_lich_king_light_dawn();
+    s->RegisterSelf();
+    s = new npc_acherus_deathcharger();
+    s->RegisterSelf();
+
+    s = new spell_gothik_ghoul_ping();
+    s->RegisterSelf();
+    s = new spell_horseman_slain();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_a_special_surprise";
+    //pNewScript->GetAI = &GetAI_npc_a_special_surprise;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_death_knight_initiate";
+    //pNewScript->GetAI = &GetAI_npc_death_knight_initiate;
+    //pNewScript->pGossipHello = &GossipHello_npc_death_knight_initiate;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_death_knight_initiate;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_death_knight_initiate;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_koltira_deathweaver";
+    //pNewScript->GetAI = &GetAI_npc_koltira_deathweaver;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_koltira_deathweaver;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_unworthy_initiate";
+    //pNewScript->GetAI = &GetAI_npc_unworthy_initiate;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_unworthy_initiate_anchor";
+    //pNewScript->GetAI = &GetAI_npc_unworthy_initiate_anchor;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_acherus_soul_prison";
+    //pNewScript->pGOUse = &GOUse_go_acherus_soul_prison;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_eye_of_acherus";
+    //pNewScript->GetAI = &GetAI_npc_eye_of_acherus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_scarlet_ghoul";
+    //pNewScript->GetAI = &GetAI_npc_scarlet_ghoul;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_scarlet_ghoul;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_highlord_darion_mograine";
+    //pNewScript->GetAI = &GetAI_npc_highlord_darion_mograine;
+    //pNewScript->pGossipHello =  &GossipHello_npc_highlord_darion_mograine;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_highlord_darion_mograine;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_fellow_death_knight";
+    //pNewScript->GetAI = &GetAI_npc_fellow_death_knight;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_lich_king_light_dawn";
+    //pNewScript->GetAI = &GetAI_npc_lich_king_light_dawn;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_acherus_deathcharger";
+    //pNewScript->GetAI = &GetAI_npc_acherus_deathcharger;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_acherus_deathcharger;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/scarlet_enclave/world_map_ebon_hold.cpp b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_enclave/world_map_ebon_hold.cpp
new file mode 100644
index 000000000..248074a21
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_enclave/world_map_ebon_hold.cpp
@@ -0,0 +1,344 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: world_map_ebon_hold
+SD%Complete: 0
+SDComment:
+SDCategory: Ebon Hold
+EndScriptData */
+
+#include "precompiled.h"
+#include "world_map_ebon_hold.h"
+
+struct map_ebon_hold : public ZoneScript
+{
+    map_ebon_hold() : ZoneScript("world_map_ebon_hold") {}
+
+    struct world_map_ebon_hold : public ScriptedMap
+    {
+        world_map_ebon_hold(Map* pMap) : ScriptedMap(pMap),
+        m_uiGothikYellTimer(0),
+        m_uiBattleEncounter(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() {}
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_HIGHLORD_DARION_MOGRAINE:
+            case NPC_KOLTIRA_DEATHWEAVER:
+            case NPC_ORBAZ_BLOODBANE:
+            case NPC_THASSARIAN:
+
+            case NPC_HIGHLORD_TIRION_FORDRING:
+            case NPC_KORFAX_CHAMPION_OF_THE_LIGHT:
+            case NPC_LORD_MAXWELL_TYROSUS:
+            case NPC_LEONID_BARTHALOMEW_THE_REVERED:
+            case NPC_DUKE_NICHOLAS_ZVERENHOFF:
+            case NPC_COMMANDER_ELIGOR_DAWNBRINGER:
+            case NPC_RIMBLAT_EARTHSHATTER:
+            case NPC_RAYNE:
+
+            case NPC_THE_LICH_KING:
+            case NPC_HIGHLORD_ALEXANDROS_MOGRAINE:
+            case NPC_DARION_MOGRAINE:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+
+                // Behemots and abominations are spawned by default on the map so they need to be handled here
+            case NPC_FLESH_BEHEMOTH:
+            case NPC_RAMPAGING_ABOMINATION:
+                m_lArmyGuids.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            if (GetData(TYPE_BATTLE) != IN_PROGRESS)
+                return;
+
+            switch (pCreature->GetEntry())
+            {
+                // resummon the behemots or abominations if they die
+            case NPC_FLESH_BEHEMOTH:
+            case NPC_RAMPAGING_ABOMINATION:
+                m_lArmyGuids.remove(pCreature->GetObjectGuid());// if remove respawning on reset won't work! (are there any spawned by default?) ?? - unclear related to ResetBattle()
+                if (Creature* pTemp = pCreature->SummonCreature(pCreature->GetEntry(), pCreature->GetPositionX(), pCreature->GetPositionY(), pCreature->GetPositionZ(), pCreature->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0))
+                {
+                    // the new summoned mob should attack
+                    Creature* pDarion = GetSingleCreatureFromStorage(NPC_HIGHLORD_DARION_MOGRAINE);
+                    if (pDarion && pDarion->getVictim())
+                        pTemp->AI()->AttackStart(pDarion->getVictim());
+                }
+                pCreature->ForcedDespawn(1000);
+                break;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            if (GetData(TYPE_BATTLE) != IN_PROGRESS)
+                return;
+
+            switch (pCreature->GetEntry())
+            {
+                // don't let the scourge evade while the battle is running
+            case NPC_FLESH_BEHEMOTH:
+            case NPC_RAMPAGING_ABOMINATION:
+            case NPC_VOLATILE_GHOUL:
+            case NPC_WARRIOR_OF_THE_FROZEN_WASTES:
+                if (Creature* pDarion = GetSingleCreatureFromStorage(NPC_HIGHLORD_DARION_MOGRAINE))
+                {
+                    if (!pDarion->IsInCombat())
+                        return;
+
+                    if (Unit* pTarget = pDarion->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        pCreature->AI()->AttackStart(pTarget);
+                }
+            case NPC_KORFAX_CHAMPION_OF_THE_LIGHT:
+            case NPC_LORD_MAXWELL_TYROSUS:
+            case NPC_COMMANDER_ELIGOR_DAWNBRINGER:
+            case NPC_LEONID_BARTHALOMEW_THE_REVERED:
+            case NPC_DUKE_NICHOLAS_ZVERENHOFF:
+            case NPC_RIMBLAT_EARTHSHATTER:
+            case NPC_RAYNE:
+            case NPC_DEFENDER_OF_THE_LIGHT:
+                if (Creature* pDarion = GetSingleCreatureFromStorage(NPC_HIGHLORD_DARION_MOGRAINE))
+                    pCreature->AI()->AttackStart(pDarion);
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_LIGHT_OF_DAWN:
+                m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+                break;
+            case GO_HOLY_LIGHTNING_1:
+            case GO_HOLY_LIGHTNING_2:
+                m_lLightTrapsGuids.push_back(pGo->GetObjectGuid());
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_BATTLE:
+                switch (uiData)
+                {
+                case NOT_STARTED:
+                    // update world states to default
+                    DoUpdateBattleWorldState(WORLD_STATE_FORCES_SHOW, 1);
+                    DoUpdateBattleWorldState(WORLD_STATE_FORCES_LIGHT, MAX_FORCES_LIGHT);
+                    DoUpdateBattleWorldState(WORLD_STATE_FORCES_SCOURGE, MAX_FORCES_SCOURGE);
+
+                    DoUpdateBattleWorldState(WORLD_STATE_BATTLE_TIMER_SHOW, 0);
+                    DoUpdateBattleWorldState(WORLD_STATE_BATTLE_BEGIN, 0);
+
+                    DoResetBattle();
+                    break;
+                case SPECIAL:
+                    // display timer
+                    DoUpdateBattleWorldState(WORLD_STATE_BATTLE_TIMER_SHOW, 1);
+                    DoUpdateBattleWorldState(WORLD_STATE_BATTLE_TIMER_TIME, MAX_BATTLE_INTRO_TIMER);
+
+                    // update world states to also show the army
+                    DoUpdateBattleWorldState(WORLD_STATE_FORCES_SHOW, 1);
+                    DoUpdateBattleWorldState(WORLD_STATE_FORCES_LIGHT, MAX_FORCES_LIGHT);
+                    DoUpdateBattleWorldState(WORLD_STATE_FORCES_SCOURGE, MAX_FORCES_SCOURGE);
+                    break;
+                case IN_PROGRESS:
+                    DoUpdateBattleWorldState(WORLD_STATE_BATTLE_TIMER_SHOW, 0);
+                    DoUpdateBattleWorldState(WORLD_STATE_BATTLE_BEGIN, 1);
+                    break;
+                }
+
+                m_uiBattleEncounter = uiData;
+                break;
+            case WORLD_STATE_FORCES_SCOURGE:
+            case WORLD_STATE_FORCES_LIGHT:
+            case WORLD_STATE_BATTLE_TIMER_TIME:
+                DoUpdateBattleWorldState(uiType, uiData);
+                break;
+            case TYPE_DO_ACTION:
+                switch (uiData)
+                {
+                case DATA_ACTION_ENABLE_TRAPS:
+                    DoEnableHolyTraps();
+                    break;
+                case DATA_ACTION_MOVE:
+                    DoMoveArmy();
+                    break;
+                case DATA_ACTION_DESPAWN:
+                    DoDespawnArmy();
+                    break;
+                default:
+                    break;
+                }
+                break;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case TYPE_BATTLE:
+                return m_uiBattleEncounter;
+            case TYPE_GOTHIK_YELL:
+                return (const_cast<world_map_ebon_hold*>(this))->CanAndToggleGothikYell();
+            default:
+                break;
+            }
+            return 0;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_uiGothikYellTimer)
+            {
+                if (m_uiGothikYellTimer <= uiDiff)
+                    m_uiGothikYellTimer = 0;
+                else
+                    m_uiGothikYellTimer -= uiDiff;
+            }
+        }
+
+    protected:
+        void DoUpdateBattleWorldState(uint32 uiStateId, uint32 uiStateData)
+        {
+            Map::PlayerList const& lPlayers = instance->GetPlayers();
+
+            for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
+            {
+                if (Player* pPlayer = itr->getSource())
+                {
+                    // we need to manually check the phase mask because the value from DBC is not used yet
+                    if (pPlayer->HasAura(SPELL_CHAPTER_IV) || pPlayer->isGameMaster())
+                        pPlayer->SendUpdateWorldState(uiStateId, uiStateData);
+                }
+            }
+        }
+
+        void DoResetBattle()
+        {
+            // reset all npcs to the original state
+            if (Creature* pKoltira = GetSingleCreatureFromStorage(NPC_KOLTIRA_DEATHWEAVER))
+                pKoltira->Respawn();
+            if (Creature* pThassarian = GetSingleCreatureFromStorage(NPC_THASSARIAN))
+                pThassarian->Respawn();
+            if (Creature* pOrbaz = GetSingleCreatureFromStorage(NPC_ORBAZ_BLOODBANE))
+                pOrbaz->Respawn();
+
+            // respawn all abominations
+            for (GuidList::const_iterator itr = m_lArmyGuids.begin(); itr != m_lArmyGuids.end(); ++itr)
+            {
+                if (Creature* pTemp = instance->GetCreature(*itr))
+                    pTemp->Respawn();
+            }
+
+            // despawn the argent dawn
+            for (uint8 i = 0; i < MAX_LIGHT_CHAMPIONS; i++)
+            {
+                if (Creature* pTemp = GetSingleCreatureFromStorage(aLightArmySpawnLoc[i].m_uiEntry))
+                    pTemp->ForcedDespawn();
+            }
+
+            if (Creature* pTirion = GetSingleCreatureFromStorage(NPC_HIGHLORD_TIRION_FORDRING))
+                pTirion->ForcedDespawn();
+        }
+
+        // Move the behemots and abominations and make them attack
+        void DoMoveArmy()
+        {
+            // move all the army to the chapel
+            float fX, fY, fZ;
+            for (GuidList::const_iterator itr = m_lArmyGuids.begin(); itr != m_lArmyGuids.end(); ++itr)
+            {
+                if (Creature* pTemp = instance->GetCreature(*itr))
+                {
+                    pTemp->SetWalk(false);
+                    pTemp->GetRandomPoint(aEventLocations[1].m_fX, aEventLocations[1].m_fY, aEventLocations[1].m_fZ, 30.0f, fX, fY, fZ);
+                    pTemp->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                }
+            }
+        }
+
+        void DoDespawnArmy()
+        {
+            // despawn all army units when the battle is finished
+            for (GuidList::const_iterator itr = m_lArmyGuids.begin(); itr != m_lArmyGuids.end(); ++itr)
+            {
+                if (Creature* pTemp = instance->GetCreature(*itr))
+                {
+                    if (pTemp->IsAlive())
+                        pTemp->DealDamage(pTemp, pTemp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                }
+            }
+        }
+
+        void DoEnableHolyTraps()
+        {
+            for (GuidList::const_iterator itr = m_lLightTrapsGuids.begin(); itr != m_lLightTrapsGuids.end(); ++itr)
+                DoRespawnGameObject(*itr, 25);
+        }
+
+        bool CanAndToggleGothikYell()
+        {
+            if (m_uiGothikYellTimer)
+                return false;
+
+            m_uiGothikYellTimer = 2000;
+            return true;
+        }
+
+        uint32 m_uiGothikYellTimer;                         // Timer to check if Gothik can yell (related q 12698)
+        uint32 m_uiBattleEncounter;                         // Store state of the battle around  "The Light of Dawn"
+
+        GuidList m_lArmyGuids;
+        GuidList m_lLightTrapsGuids;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new world_map_ebon_hold(pMap);
+    }
+};
+
+void AddSC_world_map_ebon_hold()
+{
+    Script* s;
+    s = new map_ebon_hold();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "world_map_ebon_hold";
+    //pNewScript->GetInstanceData = &GetInstance_world_map_ebon_hold;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/scarlet_enclave/world_map_ebon_hold.h b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_enclave/world_map_ebon_hold.h
new file mode 100644
index 000000000..81ad752a1
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_enclave/world_map_ebon_hold.h
@@ -0,0 +1,114 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_EBON_HOLD_H
+#define DEF_EBON_HOLD_H
+
+enum
+{
+    TYPE_BATTLE                         = 0,
+    TYPE_GOTHIK_YELL                    = 1,
+    TYPE_DO_ACTION                      = 2,
+    // also 3 worldstates, above 3500
+
+    DATA_ACTION_ENABLE_TRAPS            = 0,
+    DATA_ACTION_MOVE                    = 1,
+    DATA_ACTION_DESPAWN                 = 2,
+
+    // npcs
+    // death knights
+    NPC_HIGHLORD_DARION_MOGRAINE        = 29173,
+    NPC_KOLTIRA_DEATHWEAVER             = 29199,
+    NPC_ORBAZ_BLOODBANE                 = 29204,
+    NPC_THASSARIAN                      = 29200,
+
+    // scourge warriors - summond during the event
+    NPC_FLESH_BEHEMOTH                  = 29190,
+    NPC_RAMPAGING_ABOMINATION           = 29186,
+    NPC_VOLATILE_GHOUL                  = 29219,
+    NPC_WARRIOR_OF_THE_FROZEN_WASTES    = 29206,
+
+    // argent dawn commanders
+    NPC_HIGHLORD_TIRION_FORDRING        = 29175,
+    NPC_KORFAX_CHAMPION_OF_THE_LIGHT    = 29176,
+    NPC_LORD_MAXWELL_TYROSUS            = 29178,
+    NPC_COMMANDER_ELIGOR_DAWNBRINGER    = 29177,
+    NPC_LEONID_BARTHALOMEW_THE_REVERED  = 29179,
+    NPC_DUKE_NICHOLAS_ZVERENHOFF        = 29180,
+    NPC_RIMBLAT_EARTHSHATTER            = 29182,
+    NPC_RAYNE                           = 29181,
+
+    // argent warriors
+    NPC_DEFENDER_OF_THE_LIGHT           = 29174,
+
+    // cinematic
+    NPC_THE_LICH_KING                   = 29183,
+    NPC_HIGHLORD_ALEXANDROS_MOGRAINE    = 29227,
+    NPC_DARION_MOGRAINE                 = 29228,
+
+    // object
+    GO_LIGHT_OF_DAWN                    = 191330,
+    GO_HOLY_LIGHTNING_1                 = 191301,
+    GO_HOLY_LIGHTNING_2                 = 191302,
+
+    // spells
+    SPELL_CHAPTER_IV                    = 53405,            // phase aura
+
+    // variables
+    MAX_LIGHT_CHAMPIONS                 = 7,                // the number of the light champions
+    MAX_WARRIORS_SUMMONED_PER_TURN      = 5,                // summoned warriors (light and death) per turn
+    MAX_LIGHT_GUARDS                    = 4,                // guards summond for the outro
+
+    // event variables
+    MAX_BATTLE_INTRO_TIMER              = 5,
+    MAX_FORCES_LIGHT                    = 300,
+    MAX_FORCES_SCOURGE                  = 10000,
+
+    // world states
+    // basically world states should be shown to all players with phase mask = 128 as stated in DBC
+    // because we don't have the possibility to do that we'll just iterate through the players and set the phase mask manually based on the battle status
+    WORLD_STATE_FORCES_SHOW             = 3592,             // show the remaining units
+    WORLD_STATE_FORCES_SCOURGE          = 3591,
+    WORLD_STATE_FORCES_LIGHT            = 3590,
+    WORLD_STATE_BATTLE_TIMER_SHOW       = 3603,             // countdown timer
+    WORLD_STATE_BATTLE_TIMER_TIME       = 3604,
+    WORLD_STATE_BATTLE_BEGIN            = 3605,             // battle has begun
+};
+
+struct sSpawnLocation
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+    uint32 m_uiEntry;
+};
+
+// light champions
+static sSpawnLocation aLightArmySpawnLoc[MAX_LIGHT_CHAMPIONS] =
+{
+    {2285.80f, -5308.82f, 87.04f, 1.67f, NPC_KORFAX_CHAMPION_OF_THE_LIGHT},
+    {2276.96f, -5309.36f, 86.66f, 1.61f, NPC_LORD_MAXWELL_TYROSUS},
+    {2279.82f, -5322.61f, 88.95f, 1.54f, NPC_LEONID_BARTHALOMEW_THE_REVERED},
+    {2287.96f, -5313.96f, 88.27f, 1.63f, NPC_DUKE_NICHOLAS_ZVERENHOFF},
+    {2276.84f, -5313.78f, 87.62f, 1.61f, NPC_COMMANDER_ELIGOR_DAWNBRINGER},
+    {2275.80f, -5322.51f, 88.62f, 1.68f, NPC_RAYNE},
+    {2282.47f, -5319.84f, 88.83f, 1.74f, NPC_RIMBLAT_EARTHSHATTER}
+};
+
+// Tirion is spawned at the edge of the battle and runs toward the chapel
+// When he reach the chapel he cast some powerfull light spell and the battle ends
+static sSpawnLocation aEventLocations[] =
+{
+    {2165.711f, -5266.124f, 95.50f, 0.13f, 0},       // 0 Tirion spawn location
+    {2281.390f, -5299.98f,  85.07f, 1.61f, 0},       // 1 Tirion move location
+    {2289.259f, -5280.350f, 82.11f, 0.0f,  0},       // 2 Koltira chapel loc
+    {2273.289f, -5273.675f, 81.70f, 0.0f,  0},       // 3 Thassarian chapel loc
+    {2280.159f, -5263.561f, 81.15f, 4.70f, 0},       // 4 Alexandros summon location
+    {2279.927f, -5265.84f,  81.39f, 0.0f,  0},       // 5 Alexandros move loc
+    {2280.538f, -5280.103f, 82.41f, 1.60f, 0},       // 6 Young Darion spawn
+    {2279.895f, -5269.334f, 81.73f, 0.0f,  0},       // 7 Young Darion move
+    {2280.304f, -5257.205f, 80.09f, 4.62f, 0},       // 8 Lich King spawn
+    {2281.523f, -5261.058f, 80.87f, 0.0f,  0},       // 9 Lich King move
+    {2273.071f, -5293.428f, 83.06f, 0.0f,  0},       // 10 Tirion final point
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp
new file mode 100644
index 000000000..7a3b9f533
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp
@@ -0,0 +1,178 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Arcanist_Doan
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Scarlet Monastery
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    SAY_AGGRO                   = -1189019,
+    SAY_SPECIALAE               = -1189020,
+
+    SPELL_POLYMORPH             = 13323,
+    SPELL_SILENCE               = 8988,
+    SPELL_ARCANE_EXPLOSION      = 9433,
+    SPELL_DETONATION            = 9435,
+    SPELL_ARCANE_BUBBLE         = 9438,
+};
+
+struct boss_arcanist_doan : public CreatureScript
+{
+    boss_arcanist_doan() : CreatureScript("boss_arcanist_doan") {}
+
+    struct boss_arcanist_doanAI : public ScriptedAI
+    {
+        boss_arcanist_doanAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiPolymorphTimer;
+        uint32 m_uiSilenceTimer;
+        uint32 m_uiArcaneExplosionTimer;
+        uint32 m_uiDetonationTimer;
+        bool bShielded;
+
+        void Reset() override
+        {
+            m_uiPolymorphTimer = 15000;
+            m_uiSilenceTimer = 7500;
+            m_uiArcaneExplosionTimer = urand(1000, 3000);
+            m_uiDetonationTimer = 0;
+            bShielded = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiDetonationTimer)
+            {
+                if (m_uiDetonationTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DETONATION) == CAST_OK)
+                    {
+                        DoScriptText(SAY_SPECIALAE, m_creature);
+                        m_uiDetonationTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiDetonationTimer -= uiDiff;
+                }
+            }
+
+            // Do not attack while having the bubble active
+            if (m_creature->HasAura(SPELL_ARCANE_BUBBLE))
+            {
+                return;
+            }
+
+            // If we are <50% hp cast Arcane Bubble
+            if (!bShielded && m_creature->GetHealthPercent() <= 50.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_BUBBLE) == CAST_OK)
+                {
+                    m_uiDetonationTimer = 1000;
+                    bShielded = true;
+                }
+            }
+
+            if (m_uiPolymorphTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_POLYMORPH) == CAST_OK)
+                    {
+                        m_uiPolymorphTimer = 20000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiPolymorphTimer -= uiDiff;
+            }
+
+            // Silence_Timer
+            if (m_uiSilenceTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SILENCE) == CAST_OK)
+                {
+                    m_uiSilenceTimer = urand(15000, 22000);
+                }
+            }
+            else
+            {
+                m_uiSilenceTimer -= uiDiff;
+            }
+
+            // ArcaneExplosion_Timer
+            if (m_uiArcaneExplosionTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_EXPLOSION) == CAST_OK)
+                {
+                    m_uiArcaneExplosionTimer = urand(2500, 8500);
+                }
+            }
+            else
+            {
+                m_uiArcaneExplosionTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_arcanist_doanAI(pCreature);
+    }
+};
+
+void AddSC_boss_arcanist_doan()
+{
+    Script *s;
+    s = new boss_arcanist_doan();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_arcanist_doan";
+    //pNewScript->GetAI = &GetAI_boss_arcanist_doan;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
new file mode 100644
index 000000000..1bb493402
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
@@ -0,0 +1,522 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_headless_horseman
+SD%Complete: 90
+SDComment: Intro and epilog are handled by DB. Script might require some fine-tune.
+SDCategory: Scarlet Monastery
+EndScriptData */
+
+#include "precompiled.h"
+#include "TemporarySummon.h"
+
+enum
+{
+#if defined (CLASSIC) || defined (TBC)
+    SAY_ENTRANCE           = -1189022,
+#endif
+    SAY_REJOINED           = -1189023,
+    SAY_BODY_DEFEAT        = -1189024,
+    SAY_LOST_HEAD          = -1189025,
+    SAY_CONFLAGRATION      = -1189026,
+    SAY_SPROUTING_PUMPKINS = -1189027,
+    SAY_SLAY               = -1189028,
+    SAY_DEATH              = -1189029,
+
+    // event start yells - handled by dbscripts
+    // SAY_ENTRANCE             = -1189022,
+    // EMOTE_LAUGH              = -1189030,
+    // SAY_PLAYER1              = -1189031,
+    // SAY_PLAYER2              = -1189032,
+    // SAY_PLAYER3              = -1189033,
+    // SAY_PLAYER4              = -1189034,
+
+    // normal phase spells
+    SPELL_BODY_HEAD_VISUAL      = 42413,            // head visual
+    SPELL_JACK_LANTERNED        = 44185,            // on killed player
+    SPELL_HORSEMAN_CLEAVE       = 42587,
+    SPELL_CONFLAGRATION         = 42380,            // triggers 42381
+    SPELL_SUMMON_PUMPKIN        = 52236,            // triggers 42394
+    SPELL_HORSEMAN_SUMMON       = 42394,            // triggered spell - used to do the text
+    SPELL_CONFLAGRATION_SOUND   = 48149,
+    SPELL_BODY_STAGE_1          = 42547,            // phase control spells
+    SPELL_BODY_STAGE_2          = 42548,
+    SPELL_BODY_STAGE_3          = 42549,
+
+    // headless body spells
+    SPELL_SEND_HEAD             = 42399,            // send event 15394 - toss head
+    SPELL_WHIRLWIND             = 43116,            // triggers 43118
+    SPELL_BODY_REGEN_PROC       = 42556,            // procs 42587; also adds immunity
+    SPELL_BODY_REGEN            = 42403,            // change model to headless
+    SPELL_BODY_REGEN_CONFUSE    = 43105,            // confuse spell
+
+    // head spells
+    SPELL_HEAD_VISUAL           = 44241,
+    SPELL_HEAL_BODY             = 43306,            // heal body to 100% on rejoin
+    SPELL_REQUEST_BODY          = 43101,
+    SPELL_HORSEMAN_HEAD_LANDS   = 42400,            // head land visual
+    // SPELL_HEAD_INVISIBLE     = 44312,            // purpose unk
+    // SPELL_HEADS_BREATH       = 43207,            // purpose unk
+
+    // pumpkin spells
+    SPELL_PUMPKIN_LIFE_CYCLE    = 42280,            // visual root aura
+    SPELL_PUMPKIN_AURA          = 42294,            // visual green aura
+    SPELL_SPROUTING             = 42281,            // sprout delay
+    SPELL_PUMPKIN_DEATH         = 42291,            // visual on sprout
+    SPELL_SPROUT_BODY           = 42285,            // visual moving aura
+    SPELL_SQUASH_SOUL           = 42514,
+
+    // event end spells
+    SPELL_HEAD_IS_DEAD          = 42428,            // send event 15407; triggers 42566
+    SPELL_BODY_DEAD             = 42429,            // send event 15331
+    SPELL_BODY_LEAVE_COMBAT     = 43805,            // send event 15407; trigger spell 42556
+
+    // spells used for the intro or epilog (handled by DB)
+    // SPELL_LAUGH                 = 43881,         // play sound 11965
+    // SPELL_LAUGH_MANIACAL        = 43885,         // play sound 11975
+    // SPELL_LAUGH_LOW             = 43894,         // play sound 11976
+    // SPELL_RHYME_SHAKE_MEDIUM    = 42909,         // shake effect on event start
+    // SPELL_RHYME_SHAKE_SMALL     = 42910,
+    // SPELL_WISP_ESCAPE_MISSILE   = 43034,
+    // SPELL_WISP_FLIGHT_MISSILE   = 42821,         // triggers 42818
+    // SPELL_WISP_INVISIBLE        = 42823,
+    // SPELL_ON_KILL_PROC          = 43877,         // procs 13567 - use unk
+    // SPELL_ENRAGE_VISUAL         = 42438,         // use unk
+
+    // creatures
+    NPC_HEADLESS_HORSEMAN       = 23682,
+    NPC_HEAD_OF_HORSEMAN        = 23775,
+    NPC_PULSING_PUMPKIN         = 23694,            // summoned by spell 42277
+    // NPC_HORSEMAN_WISP_INV    = 24034,            // probably used for the epilog
+};
+
+enum HorsemanPhase
+{
+    PHASE_HORSEMAN              = 1,
+    PHASE_CONFLAGRATION         = 2,
+    PHASE_PUMPKINS              = 3,
+    PHASE_HEAD_TOSS             = 4,
+};
+
+struct boss_headless_horseman : public CreatureScript
+{
+    boss_headless_horseman() : CreatureScript("boss_headless_horseman") {}
+
+    struct boss_headless_horsemanAI : public ScriptedAI
+    {
+        boss_headless_horsemanAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_creature->SetWalk(false);
+            m_creature->SetLevitate(true);
+
+            m_bHorsemanLanded = false;
+        }
+
+        bool m_bHorsemanLanded;
+        bool m_bHeadRequested;
+
+        HorsemanPhase m_fightPhase;
+
+        ObjectGuid m_headGuid;
+
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiConflagrationTimer;
+        uint32 m_uiPumpkinTimer;
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_BODY_STAGE_1, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            DoCastSpellIfCan(m_creature, SPELL_BODY_HEAD_VISUAL, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+
+            m_fightPhase = PHASE_HORSEMAN;
+            m_uiCleaveTimer = 3000;
+            m_uiConflagrationTimer = urand(20000, 25000);
+            m_uiPumpkinTimer = urand(35000, 40000);
+            m_bHeadRequested = false;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_bHorsemanLanded)
+                ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoCastSpellIfCan(pVictim, SPELL_JACK_LANTERNED, CAST_TRIGGERED);
+                DoScriptText(SAY_SLAY, m_creature);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_HEAD_OF_HORSEMAN)
+                m_headGuid = pSummoned->GetObjectGuid();
+            else if (pSummoned->GetEntry() == NPC_PULSING_PUMPKIN)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_SPROUTING, false);
+                pSummoned->CastSpell(pSummoned, SPELL_PUMPKIN_AURA, true);
+                pSummoned->CastSpell(pSummoned, SPELL_PUMPKIN_LIFE_CYCLE, true);
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override
+        {
+            if (m_fightPhase != PHASE_HEAD_TOSS && uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+                DoTossHead();
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_HORSEMAN_SUMMON)
+                DoScriptText(SAY_SPROUTING_PUMPKINS, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            // cleanup
+            m_creature->ForcedDespawn();
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            // allow attacking
+            if (uiType == WAYPOINT_MOTION_TYPE && uiPointId == 15)
+            {
+                m_bHorsemanLanded = true;
+                m_creature->SetLevitate(false);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            // rejoin head on request
+            if (eventType == AI_EVENT_CUSTOM_A && pInvoker->GetEntry() == NPC_HEAD_OF_HORSEMAN)
+            {
+                DoRejoinHead();
+                pInvoker->CastSpell(m_creature, SPELL_SEND_HEAD, true);
+            }
+        }
+
+        // function to handle toss head phase
+        void DoTossHead()
+        {
+            // in the first transition; spawn the head
+            if (m_creature->HasAura(SPELL_BODY_STAGE_1))
+            {
+                float fX, fY, fZ;
+                m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 15.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_HEAD_OF_HORSEMAN, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+
+            // make head available
+            if (Creature* pHead = m_creature->GetMap()->GetCreature(m_headGuid))
+                DoCastSpellIfCan(pHead, SPELL_SEND_HEAD, CAST_TRIGGERED);
+
+            // only from second transition we start whirlwind
+            if (m_creature->HasAura(SPELL_BODY_STAGE_2) || m_creature->HasAura(SPELL_BODY_STAGE_3))
+                DoCastSpellIfCan(m_creature, SPELL_WHIRLWIND, CAST_TRIGGERED);
+
+            // remove head visual and set transition phase auras
+            m_creature->RemoveAurasDueToSpell(SPELL_HEAD_VISUAL);
+            DoCastSpellIfCan(m_creature, SPELL_BODY_REGEN_PROC, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_BODY_REGEN, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_BODY_REGEN_CONFUSE, CAST_TRIGGERED);
+
+            m_fightPhase = PHASE_HEAD_TOSS;
+            m_bHeadRequested = false;
+        }
+
+        // function to handle the head rejoin
+        void DoRejoinHead()
+        {
+            // remove transition auras and set the head visual
+            m_creature->RemoveAurasDueToSpell(SPELL_BODY_REGEN_CONFUSE);
+            m_creature->RemoveAurasDueToSpell(SPELL_BODY_REGEN);
+            m_creature->RemoveAurasDueToSpell(SPELL_BODY_REGEN_PROC);
+            m_creature->RemoveAurasDueToSpell(SPELL_WHIRLWIND);
+
+            DoScriptText(SAY_REJOINED, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_BODY_HEAD_VISUAL, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+
+            // switch from phase 1 to phase 2
+            if (m_creature->HasAura(SPELL_BODY_STAGE_1))
+            {
+                m_fightPhase = PHASE_CONFLAGRATION;
+                m_creature->RemoveAurasDueToSpell(SPELL_BODY_STAGE_1);
+                DoCastSpellIfCan(m_creature, SPELL_BODY_STAGE_2, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            }
+            // switch from phase 2 to phase 3 or repeat phase 3
+            else if (m_creature->HasAura(SPELL_BODY_STAGE_2) || m_creature->HasAura(SPELL_BODY_STAGE_3))
+            {
+                m_fightPhase = PHASE_PUMPKINS;
+                m_creature->RemoveAurasDueToSpell(SPELL_BODY_STAGE_2);
+                DoCastSpellIfCan(m_creature, SPELL_BODY_STAGE_3, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_PUMPKIN, CAST_TRIGGERED);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            switch (m_fightPhase)
+            {
+            case PHASE_PUMPKINS:
+
+                if (m_uiPumpkinTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_PUMPKIN) == CAST_OK)
+                        m_uiPumpkinTimer = urand(35000, 40000);
+                }
+                else
+                    m_uiPumpkinTimer -= uiDiff;
+
+                // no break;
+            case PHASE_CONFLAGRATION:
+
+                // conflagration not happening during pumpkin phase
+                if (m_fightPhase != PHASE_PUMPKINS)
+                {
+                    if (m_uiConflagrationTimer < uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                        {
+                            if (DoCastSpellIfCan(pTarget, SPELL_CONFLAGRATION) == CAST_OK)
+                            {
+                                DoScriptText(SAY_CONFLAGRATION, m_creature);
+                                m_uiConflagrationTimer = urand(15000, 20000);
+                            }
+                        }
+                    }
+                    else
+                        m_uiConflagrationTimer -= uiDiff;
+                }
+
+                // no break;
+            case PHASE_HORSEMAN:
+
+                // cleave - all phases
+                if (m_uiCleaveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HORSEMAN_CLEAVE) == CAST_OK)
+                        m_uiCleaveTimer = 5000;
+                }
+                else
+                    m_uiCleaveTimer -= uiDiff;
+
+                DoMeleeAttackIfReady();
+                break;
+            case PHASE_HEAD_TOSS:
+                // rejoin head by force at 100% hp
+                if (!m_bHeadRequested && m_creature->GetHealthPercent() == 100.0f)
+                {
+                    if (Creature* pHead = m_creature->GetMap()->GetCreature(m_headGuid))
+                        SendAIEvent(AI_EVENT_CUSTOM_B, m_creature, pHead);
+
+                    m_bHeadRequested = true;
+                }
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_headless_horsemanAI(pCreature);
+    }
+};
+
+struct spell_request_body : public SpellScript
+{
+    spell_request_body() : SpellScript("spell_request_body") {}
+
+    bool EffectScriptEffect(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Creature* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) 
+    {
+        if (uiSpellId == SPELL_REQUEST_BODY && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (pCreatureTarget->GetEntry() == NPC_HEADLESS_HORSEMAN)
+                pCreatureTarget->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pCreatureTarget);
+
+            return true;
+        }
+
+        return false;
+    }
+};
+
+struct boss_head_of_horseman : public CreatureScript
+{
+    boss_head_of_horseman() : CreatureScript("boss_head_of_horseman") {}
+
+    struct boss_head_of_horsemanAI : public ScriptedAI
+    {
+        boss_head_of_horsemanAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_uiHeadPhase = 1;
+        }
+
+        uint8 m_uiHeadPhase;
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_HEAD_IS_DEAD, CAST_TRIGGERED);
+
+            // end the event
+            if (m_creature->IsTemporarySummon())
+            {
+                TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+                if (Unit* pHorseman = m_creature->GetMap()->GetUnit(pTemporary->GetSummonerGuid()))
+                {
+                    pHorseman->CastSpell(pHorseman, SPELL_BODY_LEAVE_COMBAT, true);
+                    pHorseman->CastSpell(pHorseman, SPELL_BODY_DEAD, true);
+                }
+            }
+        }
+
+        void DamageTaken(Unit* /*pDealer*/, uint32& /*uiDamage*/) override
+        {
+            // allow him to die the last phase
+            if (m_uiHeadPhase >= 3)
+                return;
+
+            // rejoin and switch to next phase
+            if (m_creature->GetHealthPercent() < float(100 - m_uiHeadPhase * 33.3f))
+            {
+                DoRejoinHead(false);
+                ++m_uiHeadPhase;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (pInvoker->GetEntry() != NPC_HEADLESS_HORSEMAN)
+                return;
+
+            // toss head
+            if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                // make visible
+                DoScriptText(SAY_LOST_HEAD, m_creature);
+                DoCastSpellIfCan(m_creature, SPELL_HORSEMAN_HEAD_LANDS, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_HEAD_VISUAL, CAST_TRIGGERED);
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                // run around the graveyard
+                m_creature->SetWalk(false);
+                m_creature->GetMotionMaster()->MoveRandomAroundPoint(pInvoker->GetPositionX(), pInvoker->GetPositionY(), pInvoker->GetPositionZ(), 40.0f);
+            }
+            // rejoin head by force - body healed
+            else if (eventType == AI_EVENT_CUSTOM_B)
+                DoRejoinHead(true);
+        }
+
+        // rejoin the head with the body
+        void DoRejoinHead(bool bForced)
+        {
+            // script targets on body
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MoveIdle();
+
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            DoCastSpellIfCan(m_creature, SPELL_REQUEST_BODY, CAST_TRIGGERED);
+
+            // heal body only if head is not requested by force (Horseman healed)
+            if (!bForced)
+                DoCastSpellIfCan(m_creature, SPELL_HEAL_BODY, CAST_TRIGGERED);
+        }
+
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_head_of_horsemanAI(pCreature);
+    }
+};
+
+struct spell_send_head : public SpellScript
+{
+    spell_send_head() : SpellScript("spell_send_head") {}
+
+    bool EffectScriptEffect(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Creature* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) 
+    {
+        if (uiSpellId == SPELL_SEND_HEAD && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (pCreatureTarget->GetEntry() == NPC_HEAD_OF_HORSEMAN)
+                pCreatureTarget->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pCreatureTarget);
+
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_headless_horseman()
+{
+    Script* s;
+
+    s = new boss_headless_horseman();
+    s->RegisterSelf();
+    s = new boss_head_of_horseman();
+    s->RegisterSelf();
+    s = new spell_request_body();
+    s->RegisterSelf();
+    s = new spell_send_head();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_headless_horseman";
+    //pNewScript->GetAI = GetAI_boss_headless_horseman;
+    //pNewScript->pEffectScriptEffectNPC = &EffectScriptEffectCreature_boss_headless_horseman;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_head_of_horseman";
+    //pNewScript->GetAI = GetAI_boss_head_of_horseman;
+    //pNewScript->pEffectScriptEffectNPC = &EffectScriptEffectCreature_boss_head_of_horseman;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp
new file mode 100644
index 000000000..9d7cb5015
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp
@@ -0,0 +1,224 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Herod
+ * SD%Complete: 95
+ * SDComment:   Should in addition spawn Myrmidons in the hallway outside
+ * SDCategory:  Scarlet Monastery
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+enum
+{
+    SAY_AGGRO              = -1189000,
+    SAY_WHIRLWIND          = -1189001,
+    SAY_ENRAGE             = -1189002,
+    SAY_KILL               = -1189003,
+    EMOTE_GENERIC_ENRAGED  = -1000003,
+
+    SAY_TRAINEE_SPAWN      = -1189035,
+
+    SPELL_RUSHINGCHARGE    = 8260,
+    SPELL_CLEAVE           = 15496,
+    SPELL_WHIRLWIND        = 8989,
+    SPELL_FRENZY           = 8269,
+
+    NPC_SCARLET_TRAINEE    = 6575
+};
+
+struct boss_herod : public CreatureScript
+{
+    boss_herod() : CreatureScript("boss_herod") {}
+
+    struct boss_herodAI : public ScriptedAI
+    {
+        boss_herodAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        bool m_bEnrage;
+        bool m_bTraineeSay;
+
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiWhirlwindTimer;
+
+        void Reset() override
+        {
+            m_bTraineeSay = false;
+            m_bEnrage = false;
+
+            m_uiCleaveTimer = 7500;
+            m_uiWhirlwindTimer = 14500;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_RUSHINGCHARGE);
+        }
+
+        void SummonedCreature(Creature* pSummoned)
+        {
+            // make first Scarlet Trainee say text
+            if (pSummoned->GetEntry() == NPC_SCARLET_TRAINEE && !m_bTraineeSay)
+            {
+                DoScriptText(SAY_TRAINEE_SPAWN, pSummoned);
+                m_bTraineeSay = true;
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_KILL, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            for (uint8 i = 0; i < 20; ++i)
+            {
+                m_creature->SummonCreature(NPC_SCARLET_TRAINEE, 1939.18f, -431.58f, 17.09f, 6.22f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 600000);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // If we are < 30% hp enrage
+            if (!m_bEnrage && m_creature->GetHealthPercent() <= 30.0f && !m_creature->IsNonMeleeSpellCasted(false))
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_GENERIC_ENRAGED, m_creature);
+                    DoScriptText(SAY_ENRAGE, m_creature);
+                    m_bEnrage = true;
+                }
+            }
+
+            // Cleave
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE);
+                m_uiCleaveTimer = urand(7500, 17500);
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            if (m_uiWhirlwindTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_WHIRLWIND) == CAST_OK)
+                {
+                    DoScriptText(SAY_WHIRLWIND, m_creature);
+                    m_uiWhirlwindTimer = urand(15000, 25000);
+                }
+            }
+            else
+            {
+                m_uiWhirlwindTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_herodAI(pCreature);
+    }
+};
+
+struct mob_scarlet_trainee : public CreatureScript
+{
+    mob_scarlet_trainee() : CreatureScript("mob_scarlet_trainee") {}
+
+    struct mob_scarlet_traineeAI : public npc_escortAI
+    {
+        mob_scarlet_traineeAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+        }
+
+        uint32 m_uiStartTimer;
+
+        void Reset() override { m_uiStartTimer = urand(1000, 6000);  }
+
+        void WaypointReached(uint32 /*uiPointId*/) override {}
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (m_uiStartTimer)
+            {
+                if (m_uiStartTimer <= uiDiff)
+                {
+                    Start(true);
+                    m_uiStartTimer = 0;
+                }
+                else
+                {
+                    m_uiStartTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_scarlet_traineeAI(pCreature);
+    }
+};
+
+void AddSC_boss_herod()
+{
+    Script *s;
+    s = new boss_herod();
+    s->RegisterSelf();
+    s = new mob_scarlet_trainee();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_herod";
+    //pNewScript->GetAI = &GetAI_boss_herod;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_scarlet_trainee";
+    //pNewScript->GetAI = &GetAI_mob_scarlet_trainee;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
new file mode 100644
index 000000000..ad31e00b8
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
@@ -0,0 +1,456 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Mograine_And_Whitemane
+ * SD%Complete: 90
+ * SDComment:   None
+ * SDCategory:  Scarlet Monastery
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "scarlet_monastery.h"
+
+enum
+{
+    // Mograine says
+    SAY_MO_AGGRO                 = -1189005,
+    SAY_MO_KILL                  = -1189006,
+    SAY_MO_RESSURECTED           = -1189007,
+
+    // Whitemane says
+    SAY_WH_INTRO                 = -1189008,
+    SAY_WH_KILL                  = -1189009,
+    SAY_WH_RESSURECT             = -1189010,
+
+    // Mograine Spells
+    SPELL_CRUSADERSTRIKE         = 14518,
+    SPELL_HAMMEROFJUSTICE        = 5589,
+    SPELL_LAYONHANDS             = 9257,
+    SPELL_RETRIBUTIONAURA        = 8990,
+
+    // Whitemanes Spells
+    SPELL_DEEPSLEEP              = 9256,
+    SPELL_SCARLETRESURRECTION    = 9232,
+    SPELL_DOMINATEMIND           = 14515,
+    SPELL_HOLYSMITE              = 9481,
+    SPELL_HEAL                   = 12039,
+    SPELL_POWERWORDSHIELD        = 22187
+};
+
+struct boss_scarlet_commander_mograine : public CreatureScript
+{
+    boss_scarlet_commander_mograine() : CreatureScript("boss_scarlet_commander_mograine") {}
+
+    struct boss_scarlet_commander_mograineAI : public ScriptedAI
+    {
+        boss_scarlet_commander_mograineAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiCrusaderStrike_Timer;
+        uint32 m_uiHammerOfJustice_Timer;
+
+        bool m_bHasDied;
+        bool m_bHeal;
+        bool m_bFakeDeath;
+
+        void Reset() override
+        {
+            m_uiCrusaderStrike_Timer = 8400;
+            m_uiHammerOfJustice_Timer = 9600;
+
+            m_bHasDied = false;
+            m_bHeal = false;
+            m_bFakeDeath = false;
+
+            // Incase wipe during phase that mograine fake death
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_MO_AGGRO, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_RETRIBUTIONAURA);
+
+            m_creature->CallForHelp(VISIBLE_RANGE);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_MO_KILL, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            Creature* pWhitemane = m_pInstance->GetSingleCreatureFromStorage(NPC_WHITEMANE);
+            if (pWhitemane && !pWhitemane->IsAlive())
+            {
+                pWhitemane->Respawn();
+            }
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (uiDamage < m_creature->GetHealth() || m_bHasDied)
+            {
+                return;
+            }
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // On first death, fake death and open door, as well as initiate whitemane if exist
+            if (Creature* pWhitemane = m_pInstance->GetSingleCreatureFromStorage(NPC_WHITEMANE))
+            {
+                m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, IN_PROGRESS);
+
+                pWhitemane->GetMotionMaster()->MovePoint(1, 1163.113370f, 1398.856812f, 32.527786f);
+
+                m_creature->GetMotionMaster()->MovementExpired();
+                m_creature->GetMotionMaster()->MoveIdle();
+
+                m_creature->SetHealth(0);
+
+                if (m_creature->IsNonMeleeSpellCasted(false))
+                {
+                    m_creature->InterruptNonMeleeSpells(false);
+                }
+
+                m_creature->ClearComboPointHolders();
+                m_creature->RemoveAllAurasOnDeath();
+                m_creature->ClearAllReactives();
+
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+
+                m_bHasDied = true;
+                m_bFakeDeath = true;
+
+                uiDamage = 0;
+            }
+        }
+
+        void SpellHit(Unit* /*pWho*/, const SpellEntry* pSpell) override
+        {
+            // When hit with ressurection say text
+            if (pSpell->Id == SPELL_SCARLETRESURRECTION)
+            {
+                DoScriptText(SAY_MO_RESSURECTED, m_creature);
+                m_bFakeDeath = false;
+
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, SPECIAL);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_bHasDied && !m_bHeal && m_pInstance && m_pInstance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == SPECIAL)
+            {
+                // On ressurection, stop fake death and heal whitemane and resume fight
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                // spell has script target on Whitemane
+                DoCastSpellIfCan(m_creature, SPELL_LAYONHANDS);
+
+                m_uiCrusaderStrike_Timer = 8400;
+                m_uiHammerOfJustice_Timer = 9600;
+
+                if (m_creature->getVictim())
+                {
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                }
+
+                m_bHeal = true;
+            }
+
+            // This if-check to make sure mograine does not attack while fake death
+            if (m_bFakeDeath)
+            {
+                return;
+            }
+
+            // m_uiCrusaderStrike_Timer
+            if (m_uiCrusaderStrike_Timer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CRUSADERSTRIKE) == CAST_OK)
+                {
+                    m_uiCrusaderStrike_Timer = urand(6000, 15000);
+                }
+            }
+            else
+            {
+                m_uiCrusaderStrike_Timer -= uiDiff;
+            }
+
+            // m_uiHammerOfJustice_Timer
+            if (m_uiHammerOfJustice_Timer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HAMMEROFJUSTICE) == CAST_OK)
+                {
+                    m_uiHammerOfJustice_Timer = urand(7000, 18500);
+                }
+            }
+            else
+            {
+                m_uiHammerOfJustice_Timer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_scarlet_commander_mograineAI(pCreature);
+    }
+};
+
+struct boss_high_inquisitor_whitemane : public CreatureScript
+{
+    boss_high_inquisitor_whitemane() : CreatureScript("boss_high_inquisitor_whitemane") {}
+
+    struct boss_high_inquisitor_whitemaneAI : public ScriptedAI
+    {
+        boss_high_inquisitor_whitemaneAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiHeal_Timer;
+        uint32 m_uiPowerWordShield_Timer;
+        uint32 m_uiHolySmite_Timer;
+        uint32 m_uiWait_Timer;
+
+        bool m_bCanResurrectCheck;
+        bool m_bCanResurrect;
+
+        void Reset() override
+        {
+            m_uiWait_Timer = 7000;
+            m_uiHeal_Timer = 10000;
+            m_uiPowerWordShield_Timer = 15000;
+            m_uiHolySmite_Timer = 4000;
+
+            m_bCanResurrectCheck = false;
+            m_bCanResurrect = false;
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            if (Creature* pMograine = m_pInstance->GetSingleCreatureFromStorage(NPC_MOGRAINE))
+            {
+                if (m_creature->IsAlive() && !pMograine->IsAlive())
+                {
+                    pMograine->Respawn();
+                }
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                if (!(m_pInstance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == NOT_STARTED) || !(m_pInstance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == FAIL))
+                {
+                    m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, FAIL);
+                }
+            }
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override
+        {
+            // This needs to be empty because Whitemane should NOT aggro while fighting Mograine. Mograine will give us a target.
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (uiDamage < m_creature->GetHealth())
+            {
+                return;
+            }
+
+            if (!m_bCanResurrectCheck || m_bCanResurrect)
+            {
+                // prevent killing blow before rezzing commander
+                m_creature->SetHealth(uiDamage + 1);
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_pInstance && (m_pInstance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == NOT_STARTED || m_pInstance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == FAIL))
+            {
+                return;
+            }
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_WH_INTRO, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_WH_KILL, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_bCanResurrect)
+            {
+                // When casting resuruction make sure to delay so on rez when reinstate battle deepsleep runs out
+                if (m_uiWait_Timer < uiDiff)
+                {
+                    // spell has script target on Mograine
+                    DoCastSpellIfCan(m_creature, SPELL_SCARLETRESURRECTION);
+                    DoScriptText(SAY_WH_RESSURECT, m_creature);
+                    m_bCanResurrect = false;
+                }
+                else
+                {
+                    m_uiWait_Timer -= uiDiff;
+                }
+            }
+
+            // Cast Deep sleep when health is less than 50%
+            if (!m_bCanResurrectCheck && m_creature->GetHealthPercent() <= 50.0f)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_DEEPSLEEP, CAST_INTERRUPT_PREVIOUS);
+                m_bCanResurrectCheck = true;
+                m_bCanResurrect = true;
+                return;
+            }
+
+            // while in "resurrect-mode", don't do anything
+            if (m_bCanResurrect)
+            {
+                return;
+            }
+
+            // If we are <75% hp cast healing spells at self or Mograine
+            if (m_uiHeal_Timer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(50.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_HEAL) == CAST_OK)
+                    {
+                        m_uiHeal_Timer = 13000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiHeal_Timer -= uiDiff;
+            }
+
+            // m_uiPowerWordShield_Timer
+            if (m_uiPowerWordShield_Timer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_POWERWORDSHIELD) == CAST_OK)
+                {
+                    m_uiPowerWordShield_Timer = urand(22000, 45000);
+                }
+            }
+            else
+            {
+                m_uiPowerWordShield_Timer -= uiDiff;
+            }
+
+            // m_uiHolySmite_Timer
+            if (m_uiHolySmite_Timer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HOLYSMITE) == CAST_OK)
+                {
+                    m_uiHolySmite_Timer = urand(3500, 5000);
+                }
+            }
+            else
+            {
+                m_uiHolySmite_Timer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_high_inquisitor_whitemaneAI(pCreature);
+    }
+};
+
+void AddSC_boss_mograine_and_whitemane()
+{
+    Script *s;
+    s = new boss_scarlet_commander_mograine();
+    s->RegisterSelf();
+    s = new boss_high_inquisitor_whitemane();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_scarlet_commander_mograine";
+    //pNewScript->GetAI = &GetAI_boss_scarlet_commander_mograine;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_high_inquisitor_whitemane";
+    //pNewScript->GetAI = &GetAI_boss_high_inquisitor_whitemane;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
new file mode 100644
index 000000000..e990b231e
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
@@ -0,0 +1,135 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Scarlet_Monastery
+ * SD%Complete: 50
+ * SDComment:   None
+ * SDCategory:  Scarlet Monastery
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "scarlet_monastery.h"
+
+struct is_scarlet_monastery : public InstanceScript
+{
+    is_scarlet_monastery() : InstanceScript("instance_scarlet_monastery") {}
+
+    class instance_scarlet_monastery : public ScriptedInstance
+    {
+    public:
+        instance_scarlet_monastery(Map* pMap) : ScriptedInstance(pMap)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_MOGRAINE:
+            case NPC_WHITEMANE:
+            case NPC_VORREL:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_INTERROGATOR_VISHAS)
+            {
+                // Any other actions to do with Vorrel? setStandState?
+                if (Creature* pVorrel = GetSingleCreatureFromStorage(NPC_VORREL))
+                {
+                    DoScriptText(SAY_TRIGGER_VORREL, pVorrel);
+                }
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            if (pGo->GetEntry() == GO_WHITEMANE_DOOR)
+            {
+                m_mGoEntryGuidStore[GO_WHITEMANE_DOOR] = pGo->GetObjectGuid();
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            if (uiType == TYPE_MOGRAINE_AND_WHITE_EVENT)
+            {
+                if (uiData == IN_PROGRESS)
+                {
+                    DoUseDoorOrButton(GO_WHITEMANE_DOOR);
+                }
+                if (uiData == FAIL)
+                {
+                    DoUseDoorOrButton(GO_WHITEMANE_DOOR);
+                }
+
+                m_auiEncounter[0] = uiData;
+            }
+        }
+
+        uint32 GetData(uint32 uiData) const override
+        {
+            if (uiData == TYPE_MOGRAINE_AND_WHITE_EVENT)
+            {
+                return m_auiEncounter[0];
+            }
+
+            return 0;
+        }
+
+    private:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_scarlet_monastery(pMap);
+    }
+};
+
+void AddSC_instance_scarlet_monastery()
+{
+    Script* s;
+    s = new is_scarlet_monastery();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_scarlet_monastery";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_scarlet_monastery;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/scarlet_monastery.h b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/scarlet_monastery.h
new file mode 100644
index 000000000..faa8e46bc
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/scarlet_monastery/scarlet_monastery.h
@@ -0,0 +1,46 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_SCARLETM_H
+#define DEF_SCARLETM_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 1,
+
+    TYPE_MOGRAINE_AND_WHITE_EVENT   = 1,
+
+    NPC_MOGRAINE                    = 3976,
+    NPC_WHITEMANE                   = 3977,
+    NPC_VORREL                      = 3981,
+    NPC_INTERROGATOR_VISHAS         = 3983,
+
+    GO_WHITEMANE_DOOR               = 104600,
+
+    SAY_TRIGGER_VORREL              = -1189015,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp b/src/modules/SD3/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp
new file mode 100644
index 000000000..3ce757ce3
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp
@@ -0,0 +1,165 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Darkmaster_Gandling
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Scholomance
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "scholomance.h"
+
+enum
+{
+    SPELL_ARCANE_MISSILES          = 15790,
+    SPELL_SHADOW_SHIELD            = 12040,
+    SPELL_CURSE                    = 18702,
+    SPELL_SHADOW_PORTAL            = 17950
+};
+
+struct boss_darkmaster_gandling : public CreatureScript
+{
+    boss_darkmaster_gandling() : CreatureScript("boss_darkmaster_gandling") {}
+
+    struct boss_darkmaster_gandlingAI : public ScriptedAI
+    {
+        boss_darkmaster_gandlingAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiArcaneMissilesTimer;
+        uint32 m_uiShadowShieldTimer;
+        uint32 m_uiCurseTimer;
+        uint32 m_uiTeleportTimer;
+
+        void Reset() override
+        {
+            m_uiArcaneMissilesTimer = 4500;
+            m_uiShadowShieldTimer = 12000;
+            m_uiCurseTimer = 2000;
+            m_uiTeleportTimer = 16000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Arcane Missiles Timer
+            if (m_uiArcaneMissilesTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ARCANE_MISSILES) == CAST_OK)
+                {
+                    m_uiArcaneMissilesTimer = 8000;
+                }
+            }
+            else
+            {
+                m_uiArcaneMissilesTimer -= uiDiff;
+            }
+
+            // Shadow Shield Timer
+            if (m_uiShadowShieldTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_SHIELD) == CAST_OK)
+                {
+                    m_uiShadowShieldTimer = urand(14000, 28000);
+                }
+            }
+            else
+            {
+                m_uiShadowShieldTimer -= uiDiff;
+            }
+
+            // Curse Timer
+            if (m_uiCurseTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CURSE) == CAST_OK)
+                {
+                    m_uiCurseTimer = urand(15000, 27000);
+                }
+            }
+            else
+            {
+                m_uiCurseTimer -= uiDiff;
+            }
+
+            // Teleporting Random Target to one of the six pre boss rooms and spawn 3-4 skeletons near the gamer.
+            // We will only telport if gandling has more than 3% of hp so teleported gamers can always loot.
+            if (m_creature->GetHealthPercent() > 3.0f)
+            {
+                if (m_uiTeleportTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_SHADOW_PORTAL, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_PORTAL) == CAST_OK)
+                        {
+                            // remove threat
+                            if (m_creature->GetThreatManager().getThreat(pTarget))
+                            {
+                                m_creature->GetThreatManager().modifyThreatPercent(pTarget, -100);
+                            }
+
+                            m_uiTeleportTimer = urand(20000, 35000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiTeleportTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_darkmaster_gandlingAI(pCreature);
+    }
+};
+
+void AddSC_boss_darkmaster_gandling()
+{
+    Script *s;
+    s = new boss_darkmaster_gandling();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_darkmaster_gandling";
+    //pNewScript->GetAI = &GetAI_boss_darkmaster_gandling;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp b/src/modules/SD3/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp
new file mode 100644
index 000000000..c2f2b2bed
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp
@@ -0,0 +1,144 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_jandicebarov
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Scholomance
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_CURSE_OF_BLOOD        = 16098,
+    SPELL_SUMMON_ILLUSIONS      = 17773,
+    SPELL_BANISH                = 8994,
+};
+
+struct boss_jandicebarov : public CreatureScript
+{
+    boss_jandicebarov() : CreatureScript("boss_jandice_barov") {}
+
+    struct boss_jandicebarovAI : public ScriptedAI
+    {
+        boss_jandicebarovAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        uint32 m_uiCurseOfBloodTimer;
+        uint32 m_uiIllusionTimer;
+        uint32 m_uiBanishTimer;
+
+        void Reset() override
+        {
+            m_uiCurseOfBloodTimer = 5000;
+            m_uiIllusionTimer = 15000;
+            m_uiBanishTimer = urand(9000, 13000);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true);
+
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // CurseOfBlood_Timer
+            if (m_uiCurseOfBloodTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CURSE_OF_BLOOD) == CAST_OK)
+                {
+                    m_uiCurseOfBloodTimer = urand(30000, 35000);
+                }
+            }
+            else
+            {
+                m_uiCurseOfBloodTimer -= uiDiff;
+            }
+
+            // Banish
+            if (m_uiBanishTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_BANISH) == CAST_OK)
+                    {
+                        m_uiBanishTimer = urand(17000, 21000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiBanishTimer -= uiDiff;
+            }
+
+            // Illusion_Timer
+            if (m_uiIllusionTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_ILLUSIONS) == CAST_OK)
+                {
+                    m_uiIllusionTimer = 25000;
+                }
+            }
+            else
+            {
+                m_uiIllusionTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_jandicebarovAI(pCreature);
+    }
+};
+
+void AddSC_boss_jandicebarov()
+{
+    Script *s;
+    s = new boss_jandicebarov();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_jandice_barov";
+    //pNewScript->GetAI = &GetAI_boss_jandicebarov;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp b/src/modules/SD3/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp
new file mode 100644
index 000000000..98f0e9fa6
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp
@@ -0,0 +1,526 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Scholomance
+ * SD%Complete: 99
+ * SDComment:   Possible some D2 or other exotic missing
+ * SDCategory:  Scholomance
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "scholomance.h"
+
+struct is_scholomance : public InstanceScript
+{
+    is_scholomance() : InstanceScript("instance_scholomance") {}
+
+    class instance_scholomance : public ScriptedInstance
+    {
+    public:
+        instance_scholomance(Map* pMap) : ScriptedInstance(pMap),
+            m_uiGandlingEvent(0)
+        {
+            Initialize();
+        }
+
+        ~instance_scholomance() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+
+            for (uint8 i = 0; i < MAX_EVENTS; ++i)
+            {
+                m_mGandlingData[aGandlingEvents[i]] = GandlingEventData();
+            }
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_KIRTONOS:
+                SetData(TYPE_KIRTONOS, IN_PROGRESS);
+                break;
+            case NPC_RATTLEGORE:
+                SetData(TYPE_RATTLEGORE, IN_PROGRESS);
+                break;
+            case NPC_RAS_FROSTWHISPER:
+                SetData(TYPE_RAS_FROSTWHISPER, IN_PROGRESS);
+                break;
+            case NPC_THEOLEN_KRASTINOV:
+                SetData(TYPE_THEOLEN, IN_PROGRESS);
+                break;
+            case NPC_LOREKEEPER_POLKELT:
+                SetData(TYPE_POLKELT, IN_PROGRESS);
+                break;
+            case NPC_RAVENIAN:
+                SetData(TYPE_RAVENIAN, IN_PROGRESS);
+                break;
+            case NPC_ILLUCIA_BAROV:
+                SetData(TYPE_ILLUCIA_BAROV, IN_PROGRESS);
+                break;
+            case NPC_ALEXEI_BAROV:
+                SetData(TYPE_ALEXEI_BAROV, IN_PROGRESS);
+                break;
+            case NPC_INSTRUCTOR_MALICIA:
+                SetData(TYPE_MALICIA, IN_PROGRESS);
+                break;
+            case NPC_DARKMASTER_GANDLING:
+                SetData(TYPE_GANDLING, IN_PROGRESS);
+                break;
+
+            case NPC_BONE_MINION:
+                for (GandlingEventMap::iterator itr = m_mGandlingData.begin(); itr != m_mGandlingData.end(); ++itr)
+                {
+                    // if there are no minions for a room, skip it
+                    if (!itr->second.m_sAddGuids.empty())
+                    {
+                        // set data to fail in case of player death
+                        if (itr->second.m_sAddGuids.find(pCreature->GetGUIDLow()) != itr->second.m_sAddGuids.end())
+                        {
+                            HandlePortalEvent(itr->first, IN_PROGRESS);
+                            break;
+                        }
+                    }
+                }
+                break;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_KIRTONOS:
+                SetData(TYPE_KIRTONOS, FAIL);
+                break;
+            case NPC_RATTLEGORE:
+                SetData(TYPE_RATTLEGORE, FAIL);
+                break;
+            case NPC_RAS_FROSTWHISPER:
+                SetData(TYPE_RAS_FROSTWHISPER, FAIL);
+                break;
+            case NPC_THEOLEN_KRASTINOV:
+                SetData(TYPE_THEOLEN, FAIL);
+                break;
+            case NPC_LOREKEEPER_POLKELT:
+                SetData(TYPE_POLKELT, FAIL);
+                break;
+            case NPC_RAVENIAN:
+                SetData(TYPE_RAVENIAN, FAIL);
+                break;
+            case NPC_ILLUCIA_BAROV:
+                SetData(TYPE_ILLUCIA_BAROV, FAIL);
+                break;
+            case NPC_ALEXEI_BAROV:
+                SetData(TYPE_ALEXEI_BAROV, FAIL);
+                break;
+            case NPC_INSTRUCTOR_MALICIA:
+                SetData(TYPE_MALICIA, FAIL);
+                break;
+            case NPC_DARKMASTER_GANDLING:
+                SetData(TYPE_GANDLING, FAIL);
+                break;
+
+            case NPC_BONE_MINION:
+                for (GandlingEventMap::iterator itr = m_mGandlingData.begin(); itr != m_mGandlingData.end(); ++itr)
+                {
+                    // if there are no minions for a room, skip it
+                    if (!itr->second.m_sAddGuids.empty())
+                    {
+                        // set data to fail in case of player death
+                        if (itr->second.m_sAddGuids.find(pCreature->GetGUIDLow()) != itr->second.m_sAddGuids.end())
+                        {
+                            HandlePortalEvent(itr->first, FAIL);
+                            break;
+                        }
+                    }
+                }
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_KIRTONOS:
+                SetData(TYPE_KIRTONOS, DONE);
+                break;
+            case NPC_RATTLEGORE:
+                SetData(TYPE_RATTLEGORE, DONE);
+                break;
+            case NPC_RAS_FROSTWHISPER:
+                SetData(TYPE_RAS_FROSTWHISPER, DONE);
+                break;
+            case NPC_THEOLEN_KRASTINOV:
+                SetData(TYPE_THEOLEN, DONE);
+                break;
+            case NPC_LOREKEEPER_POLKELT:
+                SetData(TYPE_POLKELT, DONE);
+                break;
+            case NPC_RAVENIAN:
+                SetData(TYPE_RAVENIAN, DONE);
+                break;
+            case NPC_ILLUCIA_BAROV:
+                SetData(TYPE_ILLUCIA_BAROV, DONE);
+                break;
+            case NPC_ALEXEI_BAROV:
+                SetData(TYPE_ALEXEI_BAROV, DONE);
+                break;
+            case NPC_INSTRUCTOR_MALICIA:
+                SetData(TYPE_MALICIA, DONE);
+                break;
+            case NPC_DARKMASTER_GANDLING:
+                SetData(TYPE_GANDLING, DONE);
+                break;
+
+            case NPC_BONE_MINION:
+                for (GandlingEventMap::iterator itr = m_mGandlingData.begin(); itr != m_mGandlingData.end(); ++itr)
+                {
+                    // if there are no minions for a room, skip it
+                    if (!itr->second.m_sAddGuids.empty())
+                    {
+                        // search for the dead minion and erase it
+                        if (itr->second.m_sAddGuids.find(pCreature->GetGUIDLow()) != itr->second.m_sAddGuids.end())
+                        {
+                            itr->second.m_sAddGuids.erase(pCreature->GetGUIDLow());
+
+                            // if the current list is empty; set event id as done
+                            if (itr->second.m_sAddGuids.empty())
+                            {
+                                HandlePortalEvent(itr->first, DONE);
+                                break;
+                            }
+                        }
+                    }
+                }
+                break;
+            }
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_DARKMASTER_GANDLING:
+                m_mNpcEntryGuidStore[NPC_DARKMASTER_GANDLING] = pCreature->GetObjectGuid();
+                break;
+            case NPC_BONE_MINION:
+                GandlingEventMap::iterator find = m_mGandlingData.find(m_uiGandlingEvent);
+                if (find != m_mGandlingData.end())
+                {
+                    find->second.m_sAddGuids.insert(pCreature->GetGUIDLow());
+                }
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_GATE_KIRTONOS:
+            case GO_GATE_RAS:
+            case GO_GATE_GANDLING:
+                m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+                break;
+
+            case GO_GATE_MALICIA:
+                m_mGandlingData[EVENT_ID_MALICIA].m_doorGuid = pGo->GetObjectGuid();
+                break;
+            case GO_GATE_THEOLEN:
+                m_mGandlingData[EVENT_ID_THEOLEN].m_doorGuid = pGo->GetObjectGuid();
+                break;
+            case GO_GATE_POLKELT:
+                m_mGandlingData[EVENT_ID_POLKELT].m_doorGuid = pGo->GetObjectGuid();
+                break;
+            case GO_GATE_RAVENIAN:
+                m_mGandlingData[EVENT_ID_RAVENIAN].m_doorGuid = pGo->GetObjectGuid();
+                break;
+            case GO_GATE_BAROV:
+                m_mGandlingData[EVENT_ID_BAROV].m_doorGuid = pGo->GetObjectGuid();
+                break;
+            case GO_GATE_ILLUCIA:
+                m_mGandlingData[EVENT_ID_ILLUCIA].m_doorGuid = pGo->GetObjectGuid();
+                break;
+
+            case GO_VIEWING_ROOM_DOOR:
+                // In normal flow of the instance, this door is opened by a dropped key
+                if (m_auiEncounter[TYPE_RATTLEGORE] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            }
+        }
+
+        void OnPlayerEnter(Player* /*pPlayer*/) override
+        {
+            // Summon Gandling if can
+            DoSpawnGandlingIfCan(true);
+        }
+
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_KIRTONOS:
+                // This door is initially closed by DB-scripts, so only use it in case of FAIL, DONE, or on aggro after wipe
+                if (m_auiEncounter[uiType] != FAIL && uiData == IN_PROGRESS)
+                {
+                    return;
+                }
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_GATE_KIRTONOS);
+                break;
+            case TYPE_RATTLEGORE:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_RAS_FROSTWHISPER:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_GATE_RAS);
+                break;
+            case TYPE_MALICIA:                                  // TODO this code can be simplified, when it is known which event-ids correspond to which room
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(m_mGandlingData[EVENT_ID_MALICIA].m_doorGuid);
+                break;
+            case TYPE_THEOLEN:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(m_mGandlingData[EVENT_ID_THEOLEN].m_doorGuid);
+                break;
+            case TYPE_POLKELT:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(m_mGandlingData[EVENT_ID_POLKELT].m_doorGuid);
+                break;
+            case TYPE_RAVENIAN:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(m_mGandlingData[EVENT_ID_RAVENIAN].m_doorGuid);
+                break;
+            case TYPE_ALEXEI_BAROV:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(m_mGandlingData[EVENT_ID_BAROV].m_doorGuid);
+                break;
+            case TYPE_ILLUCIA_BAROV:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(m_mGandlingData[EVENT_ID_ILLUCIA].m_doorGuid);
+                break;
+            case TYPE_GANDLING:
+                m_auiEncounter[uiType] = uiData;
+                // Close the door to main room, because the encounter will take place only in the main hall and random around all the 6 rooms
+                DoUseDoorOrButton(GO_GATE_GANDLING);
+                break;
+            case TYPE_SIGNAL:
+                HandlePortalEvent(uiData, SPECIAL);
+                return;
+            }
+
+            // Summon Gandling
+            if (uiData == DONE)
+            {
+                DoSpawnGandlingIfCan(false);
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6] << " " << m_auiEncounter[7] << " " << m_auiEncounter[8] << " " << m_auiEncounter[9];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] >> m_auiEncounter[4]
+                >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7] >> m_auiEncounter[8] >> m_auiEncounter[9];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            if (m_auiEncounter[i] == IN_PROGRESS)
+            {
+                m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        void HandlePortalEvent(uint32 uiEventId, uint32 uiData)
+        {
+            GandlingEventMap::iterator find = m_mGandlingData.find(uiEventId);
+            if (find == m_mGandlingData.end())
+            {
+                return;
+            }
+
+            if (uiData == SPECIAL)
+            {
+                // Set current Event index
+                m_uiGandlingEvent = uiEventId;
+
+                // Close door if needed
+                if (!find->second.m_bIsActive)
+                {
+                    find->second.m_bIsActive = true;
+                    DoUseDoorOrButton(find->second.m_doorGuid);
+                }
+            }
+            // Toggle door and event state in case of state-switch
+            else
+            {
+                if ((uiData == IN_PROGRESS && !find->second.m_bIsActive) ||
+                    (uiData == FAIL && find->second.m_bIsActive) ||
+                    (uiData == DONE && find->second.m_bIsActive))
+                {
+                    find->second.m_bIsActive = !find->second.m_bIsActive;
+                    DoUseDoorOrButton(find->second.m_doorGuid);
+                }
+            }
+        }
+        void DoSpawnGandlingIfCan(bool bByPlayerEnter)
+        {
+            // Do not summon, if event finished
+            if (m_auiEncounter[TYPE_GANDLING] == DONE)
+            {
+                return;
+            }
+
+            // Summon only once
+            if (GetSingleCreatureFromStorage(NPC_DARKMASTER_GANDLING))
+            {
+                return;
+            }
+
+            Player* pPlayer = GetPlayerInMap();
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            // Check if all the six bosses are done first
+            if (m_auiEncounter[TYPE_MALICIA] == DONE && m_auiEncounter[TYPE_THEOLEN] == DONE && m_auiEncounter[TYPE_POLKELT] == DONE &&
+                m_auiEncounter[TYPE_RAVENIAN] == DONE && m_auiEncounter[TYPE_ALEXEI_BAROV] == DONE && m_auiEncounter[TYPE_ILLUCIA_BAROV] == DONE)
+            {
+                if (Creature* pGandling = pPlayer->SummonCreature(NPC_DARKMASTER_GANDLING, aGandlingSpawnLocs[0].m_fX, aGandlingSpawnLocs[0].m_fY, aGandlingSpawnLocs[0].m_fZ, aGandlingSpawnLocs[0].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0))
+                {
+                    if (!bByPlayerEnter)
+                    {
+                        DoScriptText(SAY_GANDLING_SPAWN, pGandling);
+                    }
+                }
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiGandlingEvent;
+        GandlingEventMap m_mGandlingData;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_scholomance(pMap);
+    }
+};
+
+struct event_spell_gandling_shadow_portal : public MapEventScript
+{
+    event_spell_gandling_shadow_portal() : MapEventScript("event_spell_gandling_shadow_portal") {}
+
+    bool OnReceived(uint32 uiEventId, Object* pSource, Object* /*pTarget*/, bool /*bIsStart*/) override
+    {
+        if (pSource->GetTypeId() == TYPEID_UNIT)
+        {
+            if (InstanceData* pInstance = ((Creature*)pSource)->GetInstanceData())
+            {
+                // Check if we are handling an event associated with the room events of gandling
+                for (uint8 i = 0; i < MAX_EVENTS; ++i)
+                {
+                    if (uiEventId == aGandlingEvents[i])
+                    {
+                        // Set data in progress for the current event and store current event
+                        pInstance->SetData(TYPE_SIGNAL, uiEventId);
+                        // return false, to allow the DB-scripts to summon some NPCSs
+                        return false;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+};
+
+void AddSC_instance_scholomance()
+{
+    Script* s;
+    s = new is_scholomance();
+    s->RegisterSelf();
+    s = new event_spell_gandling_shadow_portal();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_scholomance";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_scholomance;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_spell_gandling_shadow_portal";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_spell_gandling_shadow_portal;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/scholomance/scholomance.h b/src/modules/SD3/scripts/eastern_kingdoms/scholomance/scholomance.h
new file mode 100644
index 000000000..7601a9fa5
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/scholomance/scholomance.h
@@ -0,0 +1,104 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_SCHOLOMANCE_H
+#define DEF_SCHOLOMANCE_H
+
+enum
+{
+    MAX_ENCOUNTER           = 10,
+    TYPE_SIGNAL             = MAX_ENCOUNTER,
+    MAX_EVENTS              = 6,
+
+    TYPE_KIRTONOS           = 0,
+    TYPE_RATTLEGORE         = 1,
+    TYPE_RAS_FROSTWHISPER   = 2,
+    TYPE_MALICIA            = 3,
+    TYPE_THEOLEN            = 4,
+    TYPE_POLKELT            = 5,
+    TYPE_RAVENIAN           = 6,
+    TYPE_ALEXEI_BAROV       = 7,
+    TYPE_ILLUCIA_BAROV      = 8,
+    TYPE_GANDLING           = 9,
+
+    NPC_KIRTONOS            = 10506,
+    NPC_RATTLEGORE          = 11622,
+    NPC_RAS_FROSTWHISPER    = 10508,
+    NPC_THEOLEN_KRASTINOV   = 11261,
+    NPC_LOREKEEPER_POLKELT  = 10901,
+    NPC_RAVENIAN            = 10507,
+    NPC_ILLUCIA_BAROV       = 10502,
+    NPC_ALEXEI_BAROV        = 10504,
+    NPC_INSTRUCTOR_MALICIA  = 10505,
+    NPC_DARKMASTER_GANDLING = 1853,
+    NPC_BONE_MINION         = 16119,                        // summoned in random rooms by gandling
+
+    GO_GATE_KIRTONOS        = 175570,
+    GO_VIEWING_ROOM_DOOR    = 175167,                       // Must be opened in reload case
+    GO_GATE_RAS             = 177370,
+    GO_GATE_MALICIA         = 177375,
+    GO_GATE_THEOLEN         = 177377,
+    GO_GATE_POLKELT         = 177376,
+    GO_GATE_RAVENIAN        = 177372,
+    GO_GATE_BAROV           = 177373,
+    GO_GATE_ILLUCIA         = 177371,
+    GO_GATE_GANDLING        = 177374,
+
+    // Because the shadow portal teleport coordinates are guesswork (taken from old script) these IDs might be randomized
+    // TODO Syncronise with correct DB coordinates when they will be known
+    EVENT_ID_POLKELT        = 5618,
+    EVENT_ID_THEOLEN        = 5619,
+    EVENT_ID_MALICIA        = 5620,
+    EVENT_ID_ILLUCIA        = 5621,
+    EVENT_ID_BAROV          = 5622,
+    EVENT_ID_RAVENIAN       = 5623,
+
+    SAY_GANDLING_SPAWN      = -1289000,
+};
+
+struct SpawnLocation
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+static const SpawnLocation aGandlingSpawnLocs[1] =
+{
+    {180.771f, -5.4286f, 75.5702f, 1.29154f}
+};
+
+struct GandlingEventData
+{
+    GandlingEventData() : m_bIsActive(false) {}
+    bool m_bIsActive;
+    ObjectGuid m_doorGuid;
+    std::set<uint32> m_sAddGuids;
+};
+
+static const uint32 aGandlingEvents[MAX_EVENTS] = {EVENT_ID_POLKELT, EVENT_ID_THEOLEN, EVENT_ID_MALICIA, EVENT_ID_ILLUCIA, EVENT_ID_BAROV, EVENT_ID_RAVENIAN};
+
+typedef std::map<uint32, GandlingEventData> GandlingEventMap;
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/searing_gorge.cpp b/src/modules/SD3/scripts/eastern_kingdoms/searing_gorge.cpp
new file mode 100644
index 000000000..6abe57ea3
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/searing_gorge.cpp
@@ -0,0 +1,149 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Searing_Gorge
+ * SD%Complete: 80
+ * SDComment:   Quest support: 3367.
+ * SDCategory:  Searing Gorge
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_dorius_stonetender
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_dorius_stonetender
+######*/
+
+enum
+{
+    SAY_DORIUS_AGGRO_1              = -1000993,
+    SAY_DORIUS_AGGRO_2              = -1000994,
+
+    NPC_DARK_IRON_STEELSHIFTER      = 8337,
+    MAX_STEELSHIFTERS               = 4,
+
+    QUEST_ID_SUNTARA_STONES         = 3367,
+};
+
+struct npc_dorius_stonetender : public CreatureScript
+{
+    npc_dorius_stonetender() : CreatureScript("npc_dorius_stonetender") {}
+
+    struct npc_dorius_stonetenderAI : public npc_escortAI
+    {
+        npc_dorius_stonetenderAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void Aggro(Unit* pWho) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_DORIUS_AGGRO_1 : SAY_DORIUS_AGGRO_2, m_creature, pWho);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                // ToDo: research if there is any text here
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                m_creature->SetFactionTemporary(FACTION_ESCORT_A_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue), true);
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 20:
+                // ToDo: research if there is any text here!
+                float fX, fY, fZ;
+                for (uint8 i = 0; i < MAX_STEELSHIFTERS; ++i)
+                {
+                    m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 15.0f, i * M_PI_F / 2);
+                    m_creature->SummonCreature(NPC_DARK_IRON_STEELSHIFTER, fX, fY, fZ, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                }
+                break;
+            case 33:
+                // ToDo: research if there is any event and text here!
+                if (Player* pPlayer = GetPlayerForEscort())
+                    pPlayer->GroupEventHappens(QUEST_ID_SUNTARA_STONES, m_creature);
+                m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_DARK_IRON_STEELSHIFTER)
+                pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void UpdateEscortAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_dorius_stonetenderAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_SUNTARA_STONES)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_searing_gorge()
+{
+    Script* s;
+    s = new npc_dorius_stonetender();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_dorius_stonetender";
+    //pNewScript->GetAI = &GetAI_npc_dorius_stonetender;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_dorius_stonetender;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/shadowfang_keep/boss_hummel.cpp b/src/modules/SD3/scripts/eastern_kingdoms/shadowfang_keep/boss_hummel.cpp
new file mode 100644
index 000000000..5f4015aeb
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/shadowfang_keep/boss_hummel.cpp
@@ -0,0 +1,290 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_hummel
+SD%Complete: 50
+SDComment: The bosses are handled in eventAI; The event needs more research; only the basics are implemented; Check crazed apothecary timer
+SDCategory: Shadowfang Keep
+EndScriptData */
+
+#if defined (WOTLK) || defined (CATA)
+#include "precompiled.h"
+#include "shadowfang_keep.h"
+
+enum
+{
+    SAY_INTRO_1                     = -1033020,
+    SAY_INTRO_2                     = -1033021,
+    SAY_INTRO_3                     = -1033022,
+    SAY_CALL_BAXTER                 = -1033023,
+    SAY_CALL_FRYE                   = -1033024,
+
+    SPELL_SUMMON_VALENTINE_ADD      = 68610,        // summons the crazy apothecary
+
+    // It's unk who is handling the summoning of the crazed apothecary. This may get the following npcs involved: 36212
+    NCP_CRAZED_APOTHECARY           = 36568,        // casts spell 68957 on range check
+
+    QUEST_BEEN_SERVED               = 14488,
+
+    FACTION_HOSTILE                 = 14,
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {QUEST_BEEN_SERVED, 0,          1000},
+    {SAY_INTRO_1,       NPC_HUMMEL, 4000},
+    {SAY_INTRO_2,       NPC_HUMMEL, 4000},
+    {SAY_INTRO_3,       NPC_HUMMEL, 3000},
+    {NPC_HUMMEL,        0,          8000},
+    {NPC_BAXTER,        0,          8000},
+    {NPC_FRYE,          0,          0},
+    {0, 0, 0},
+};
+
+struct npc_valentine_boss_manager : public CreatureScript
+{
+    npc_valentine_boss_manager() : CreatureScript("npc_valentine_boss_manager") {}
+
+    struct  npc_valentine_boss_managerAI : public ScriptedAI, private DialogueHelper
+    {
+        npc_valentine_boss_managerAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiCrazedApothecaryTimer;
+
+        ObjectGuid m_EventStarterGuid;
+
+        void Reset() override
+        {
+            m_uiCrazedApothecaryTimer = 30000;
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            if (!m_pInstance)
+                return;
+
+            Creature* pHummel = m_pInstance->GetSingleCreatureFromStorage(NPC_HUMMEL);
+            switch (iEntry)
+            {
+            case NPC_HUMMEL:
+                if (pHummel)
+                {
+                    // WARNING: workaround -> faction should be set on event start
+                    pHummel->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_REACH_HOME | TEMPFACTION_RESTORE_RESPAWN);
+                    pHummel->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE | UNIT_FLAG_NON_ATTACKABLE);
+
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_EventStarterGuid))
+                        pHummel->AI()->AttackStart(pPlayer);
+                }
+
+                m_pInstance->SetData(TYPE_APOTHECARY, IN_PROGRESS);
+                break;
+            case NPC_BAXTER:
+                if (!pHummel)
+                    return;
+
+                if (Creature* pBaxter = m_pInstance->GetSingleCreatureFromStorage(NPC_BAXTER))
+                {
+                    DoScriptText(SAY_CALL_BAXTER, pHummel);
+
+                    // WARNING: workaround -> faction should be set on event start
+                    pBaxter->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_REACH_HOME | TEMPFACTION_RESTORE_RESPAWN);
+                    pBaxter->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE | UNIT_FLAG_NON_ATTACKABLE);
+                    if (pHummel->getVictim())
+                        pBaxter->AI()->AttackStart(pHummel->getVictim());
+                break;
+            }
+            case NPC_FRYE:
+                if (!pHummel)
+                    return;
+
+                if (Creature* pFrye = m_pInstance->GetSingleCreatureFromStorage(NPC_FRYE))
+                {
+                    DoScriptText(SAY_CALL_FRYE, pHummel);
+
+                    // WARNING: workaround -> faction should be set on event start
+                    pFrye->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_REACH_HOME | TEMPFACTION_RESTORE_RESPAWN);
+                    pFrye->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE | UNIT_FLAG_NON_ATTACKABLE);
+                    if (pHummel->getVictim())
+                        pFrye->AI()->AttackStart(pHummel->getVictim());
+                }
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NCP_CRAZED_APOTHECARY)
+            {
+                if (!m_pInstance)
+                    return;
+
+                // Make it attack a random Target
+                Creature* pBoss = m_pInstance->GetSingleCreatureFromStorage(NPC_HUMMEL);
+                if (!pBoss || !pBoss->IsAlive())
+                    pBoss = m_pInstance->GetSingleCreatureFromStorage(NPC_BAXTER);
+                if (!pBoss || !pBoss->IsAlive())
+                    pBoss = m_pInstance->GetSingleCreatureFromStorage(NPC_FRYE);
+                if (!pBoss || !pBoss->IsAlive())
+                    return;
+
+                // Attack a random target
+                if (Unit* pTarget = pBoss->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType type, Creature* sender, Unit* invoker, uint32 /*data*/)
+        {
+            if (type == AI_EVENT_CUSTOM_A && invoker && sender == m_creature)
+                DoStartValentineEvent(invoker->GetObjectGuid());
+        }
+
+        // Wrapper to get the event started
+        void DoStartValentineEvent(ObjectGuid starterGuid)
+        {
+            if (!m_pInstance)
+                return;
+
+            m_EventStarterGuid = starterGuid;
+
+            if (Creature* pHummel = m_pInstance->GetSingleCreatureFromStorage(NPC_HUMMEL))
+            {
+                // I'm not sure if this unit flag should be used, but it's clear that the NPC shouldn't be attacked until the dialogue is finished
+                pHummel->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                // WARNING: workaround -> faction should be set here - FIX THIS after the aura bug in core is fixed
+                // pHummel->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_REACH_HOME | TEMPFACTION_RESTORE_RESPAWN);
+            }
+
+            StartNextDialogueText(QUEST_BEEN_SERVED);
+
+            // Move Baxter to position
+            if (Creature* pBaxter = m_pInstance->GetSingleCreatureFromStorage(NPC_BAXTER))
+            {
+                pBaxter->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                // WARNING: workaround -> faction should be set here - FIX THIS after the aura bug in core is fixed
+                // pBaxter->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_REACH_HOME | TEMPFACTION_RESTORE_RESPAWN);
+
+                if (GameObject* pVials = m_pInstance->GetSingleGameObjectFromStorage(GO_APOTHECARE_VIALS))
+                {
+                    float fX, fY, fZ;
+                    pVials->GetContactPoint(pBaxter, fX, fY, fZ, CONTACT_DISTANCE);
+                    pBaxter->SetWalk(false);
+                    pBaxter->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                }
+                else
+                    script_error_log("Gameobject %u couldn't be found or something really bad happened.", GO_APOTHECARE_VIALS);
+            }
+
+            // Move Frye to position
+            if (Creature* pFrye = m_pInstance->GetSingleCreatureFromStorage(NPC_FRYE))
+            {
+                pFrye->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                // WARNING: workaround -> faction should be set here - FIX THIS after the aura bug in core is fixed
+                // pFrye->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_REACH_HOME | TEMPFACTION_RESTORE_RESPAWN);
+
+                if (GameObject* pChemistry = m_pInstance->GetSingleGameObjectFromStorage(GO_CHEMISTRY_SET))
+                {
+                    float fX, fY, fZ;
+                    pChemistry->GetContactPoint(pFrye, fX, fY, fZ, CONTACT_DISTANCE);
+                    pFrye->SetWalk(false);
+                    pFrye->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                }
+                else
+                    script_error_log("Gameobject %u couldn't be found or something really bad happened.", GO_CHEMISTRY_SET);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_pInstance)
+                return;
+
+            if (m_pInstance->GetData(TYPE_APOTHECARY) != IN_PROGRESS)
+                return;
+
+            if (m_uiCrazedApothecaryTimer < uiDiff)
+            {
+                if (Creature* pGenerator = m_pInstance->GetSingleCreatureFromStorage(NPC_APOTHECARY_GENERATOR))
+                    pGenerator->CastSpell(pGenerator, SPELL_SUMMON_VALENTINE_ADD, true, NULL, NULL, m_creature->GetObjectGuid());
+
+                m_uiCrazedApothecaryTimer = 30000;
+            }
+            else
+                m_uiCrazedApothecaryTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_valentine_boss_managerAI(pCreature);
+    }
+};
+
+struct npc_apothecary_hummel : public CreatureScript
+{
+    npc_apothecary_hummel() : CreatureScript("npc_apothecary_hummel") {}
+
+    bool OnQuestRewarded(Player* pPlayer, Creature* pCreature, Quest const* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_BEEN_SERVED)
+        {
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+            {
+                if (Creature* pValentineMgr = pInstance->GetSingleCreatureFromStorage(NPC_VALENTINE_BOSS_MGR))
+                {
+                    if (CreatureAI* pManagerAI = pValentineMgr->AI())
+                        pManagerAI->SendAIEvent(AI_EVENT_CUSTOM_A, pPlayer, pValentineMgr);
+                }
+            }
+        }
+
+        return true;
+    }
+};
+
+void AddSC_boss_hummel()
+{
+    Script* s;
+    s = new npc_valentine_boss_manager();
+    s->RegisterSelf();
+    s = new npc_apothecary_hummel();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_valentine_boss_manager";
+    //pNewScript->GetAI = GetAI_npc_valentine_boss_manager;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_apothecary_hummel";
+    //pNewScript->pQuestRewardedNPC = &QuestRewarded_npc_apothecary_hummel;
+    //pNewScript->RegisterSelf();
+}
+#endif
\ No newline at end of file
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp b/src/modules/SD3/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
new file mode 100644
index 000000000..bb923fe85
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
@@ -0,0 +1,339 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Shadowfang_Keep
+ * SD%Complete: 90
+ * SDComment:   None
+ * SDCategory:  Shadowfang Keep
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "shadowfang_keep.h"
+
+struct is_shadowfang_keep : public InstanceScript
+{
+    is_shadowfang_keep() : InstanceScript("instance_shadowfang_keep") {}
+
+    class instance_shadowfang_keep : public ScriptedInstance
+    {
+    public:
+#if defined (CLASSIC) || defined (TBC)
+        instance_shadowfang_keep(Map* pMap) : ScriptedInstance(pMap)
+#endif
+#if defined (WOTLK) || defined (CATA)
+        instance_shadowfang_keep(Map* pMap) : ScriptedInstance(pMap), m_uiApothecaryDead(0)
+#endif
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_ASH:
+            case NPC_ADA:
+            case NPC_FENRUS:
+#if defined (WOTLK) || defined (CATA)
+        case NPC_HUMMEL:
+        case NPC_FRYE:
+        case NPC_BAXTER:
+        case NPC_APOTHECARY_GENERATOR:
+        case NPC_VALENTINE_BOSS_MGR:
+#endif
+                break;
+            case NPC_VINCENT:
+                // If Arugal has done the intro, make Vincent dead!
+                if (m_auiEncounter[4] == DONE)
+                {
+                    pCreature->SetStandState(UNIT_STAND_STATE_DEAD);
+                }
+                break;
+
+            default:
+                return;
+            }
+            m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_COURTYARD_DOOR:
+                if (m_auiEncounter[0] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+                // For this we ignore voidwalkers, because if the server restarts
+                // They won't be there, but Fenrus is dead so the door can't be opened!
+            case GO_SORCERER_DOOR:
+                if (m_auiEncounter[2] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_ARUGAL_DOOR:
+                if (m_auiEncounter[3] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_ARUGAL_FOCUS:
+#if defined (WOTLK) || defined (CATA)
+            case GO_APOTHECARE_VIALS:
+            case GO_CHEMISTRY_SET:
+#endif
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void DoSpeech()
+        {
+            Creature* pAda = GetSingleCreatureFromStorage(NPC_ADA);
+            Creature* pAsh = GetSingleCreatureFromStorage(NPC_ASH);
+
+            if (pAda && pAda->IsAlive() && pAsh && pAsh->IsAlive())
+            {
+                DoScriptText(SAY_BOSS_DIE_AD, pAda);
+                DoScriptText(SAY_BOSS_DIE_AS, pAsh);
+            }
+        }
+
+#if defined (WOTLK) || defined (CATA)
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+                // Remove lootable flag from Hummel
+                // Instance data is set to SPECIAL because the encounter depends on multiple bosses
+            case NPC_HUMMEL:
+                pCreature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+                DoScriptText(SAY_HUMMEL_DEATH, pCreature);
+                // no break;
+            case NPC_FRYE:
+            case NPC_BAXTER:
+                SetData(TYPE_APOTHECARY, SPECIAL);
+                break;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_HUMMEL:
+            case NPC_FRYE:
+            case NPC_BAXTER:
+                SetData(TYPE_APOTHECARY, FAIL);
+                break;
+            }
+        }
+#endif
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_FREE_NPC:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_COURTYARD_DOOR);
+                }
+                m_auiEncounter[0] = uiData;
+                break;
+            case TYPE_RETHILGORE:
+                if (uiData == DONE)
+                {
+                    DoSpeech();
+                }
+                m_auiEncounter[1] = uiData;
+                break;
+            case TYPE_FENRUS:
+                if (uiData == DONE)
+                {
+                    if (Creature* pFenrus = GetSingleCreatureFromStorage(NPC_FENRUS))
+                    {
+                        pFenrus->SummonCreature(NPC_ARCHMAGE_ARUGAL, -136.89f, 2169.17f, 136.58f, 2.794f, TEMPSUMMON_TIMED_DESPAWN, 30000);
+                    }
+                }
+                m_auiEncounter[2] = uiData;
+                break;
+            case TYPE_NANDOS:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_ARUGAL_DOOR);
+                }
+                m_auiEncounter[3] = uiData;
+                break;
+            case TYPE_INTRO:
+                m_auiEncounter[4] = uiData;
+                break;
+            case TYPE_VOIDWALKER:
+                if (uiData == DONE)
+                {
+                    m_auiEncounter[5]++;
+                    if (m_auiEncounter[5] > 3)
+                    {
+                        DoUseDoorOrButton(GO_SORCERER_DOOR);
+                    }
+                }
+                break;
+#if defined (WOTLK) || defined (CATA)
+        case TYPE_APOTHECARY:
+            // Reset apothecary counter on fail
+            if (uiData == IN_PROGRESS)
+                m_uiApothecaryDead = 0;
+            if (uiData == SPECIAL)
+            {
+                ++m_uiApothecaryDead;
+
+                // Set Hummel as lootable only when the others are dead
+                if (m_uiApothecaryDead == MAX_APOTHECARY)
+                {
+                    if (Creature* pHummel = GetSingleCreatureFromStorage(NPC_HUMMEL))
+                        pHummel->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+
+                    SetData(TYPE_APOTHECARY, DONE);
+                }
+            }
+            // We don't want to store the SPECIAL data
+            else
+                m_auiEncounter[6] = uiData;
+            break;
+#endif
+    }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]
+#if defined (CLASSIC) || defined (TBC)
+                    << " " << m_auiEncounter[4] << " " << m_auiEncounter[5];
+#endif
+#if defined (WOTLK) || defined (CATA)
+                   << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " " << m_auiEncounter[6];
+#endif
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case TYPE_FREE_NPC:
+                return m_auiEncounter[0];
+            case TYPE_RETHILGORE:
+                return m_auiEncounter[1];
+            case TYPE_FENRUS:
+                return m_auiEncounter[2];
+            case TYPE_NANDOS:
+                return m_auiEncounter[3];
+            case TYPE_INTRO:
+                return m_auiEncounter[4];
+#if defined (WOTLK) || defined (CATA)
+            case TYPE_APOTHECARY:
+                return m_auiEncounter[6];
+#endif
+            default:
+                return 0;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+#if defined (CLASSIC) || defined (TBC)
+                >> m_auiEncounter[4] >> m_auiEncounter[5];
+#endif
+#if defined (WOTLK) || defined (CATA)
+               >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6];
+#endif
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+
+    private:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint8 m_uiApothecaryDead;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_shadowfang_keep(pMap);
+    }
+};
+
+void AddSC_instance_shadowfang_keep()
+{
+    Script* s;
+    s = new is_shadowfang_keep();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_shadowfang_keep";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_shadowfang_keep;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp b/src/modules/SD3/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
new file mode 100644
index 000000000..89f2053f0
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
@@ -0,0 +1,1110 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Shadowfang_Keep
+ * SD%Complete: 75
+ * SDComment:   npc_shadowfang_prisoner using escortAI for movement to door.
+ * SDCategory:  Shadowfang Keep
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_shadowfang_prisoner
+ * mob_arugal_voidwalker
+ * npc_arugal
+ * boss_arugal
+ * npc_deathstalker_vincent
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "shadowfang_keep.h"
+
+/*######
+## npc_shadowfang_prisoner
+######*/
+
+enum
+{
+    SAY_FREE_AS             = -1033000,
+    SAY_OPEN_DOOR_AS        = -1033001,
+    SAY_POST_DOOR_AS        = -1033002,
+    EMOTE_VANISH_AS         = -1033014,
+    SAY_FREE_AD             = -1033003,
+    SAY_OPEN_DOOR_AD        = -1033004,
+    SAY_POST1_DOOR_AD       = -1033005,
+    SAY_POST2_DOOR_AD       = -1033006,
+    EMOTE_UNLOCK_DOOR_AD    = -1033015,
+
+    SPELL_UNLOCK            = 6421,
+    SPELL_FIRE              = 6422,
+
+    GOSSIP_ITEM_DOOR        = -3033000
+};
+
+struct npc_shadowfang_prisoner : public CreatureScript
+{
+    npc_shadowfang_prisoner() : CreatureScript("npc_shadowfang_prisoner") {}
+
+    struct npc_shadowfang_prisonerAI : public npc_escortAI
+    {
+        npc_shadowfang_prisonerAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_uiNpcEntry = pCreature->GetEntry();
+        }
+
+        ScriptedInstance* m_pInstance;
+        uint32 m_uiNpcEntry;
+
+        void WaypointReached(uint32 uiPoint) override
+        {
+            switch (uiPoint)
+            {
+            case 0:
+                if (m_uiNpcEntry == NPC_ASH)
+                {
+                    DoScriptText(SAY_FREE_AS, m_creature);
+                }
+                else
+                {
+                    DoScriptText(SAY_FREE_AD, m_creature);
+                }
+                break;
+            case 10:
+                if (m_uiNpcEntry == NPC_ASH)
+                {
+                    DoScriptText(SAY_OPEN_DOOR_AS, m_creature);
+                }
+                else
+                {
+                    DoScriptText(SAY_OPEN_DOOR_AD, m_creature);
+                }
+                break;
+            case 11:
+                if (m_uiNpcEntry == NPC_ASH)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_UNLOCK);
+                }
+                else
+                {
+                    DoScriptText(EMOTE_UNLOCK_DOOR_AD, m_creature);
+                }
+                break;
+#if defined (WOTLK) || defined (CATA)
+            case 12:
+                if (m_uiNpcEntry != NPC_ASH)
+                    m_creature->HandleEmote(EMOTE_ONESHOT_USESTANDING);
+                break;
+#endif
+            case 13:
+                if (m_uiNpcEntry == NPC_ASH)
+                {
+                    DoScriptText(SAY_POST_DOOR_AS, m_creature);
+                }
+                else
+                {
+                    DoScriptText(SAY_POST1_DOOR_AD, m_creature);
+                }
+
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_FREE_NPC, DONE);
+                }
+                break;
+            case 14:
+                if (m_uiNpcEntry == NPC_ASH)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_FIRE);
+                }
+                else
+                {
+                    DoScriptText(SAY_POST2_DOOR_AD, m_creature);
+                    SetRun();
+                }
+                break;
+            case 15:
+                if (m_uiNpcEntry == NPC_ASH)
+                {
+                    DoScriptText(EMOTE_VANISH_AS, m_creature);
+                }
+                break;
+            }
+        }
+
+        // Let's prevent Adamant from charging into Ashcrombe's cell
+        // And beating the crap out of him and vice versa XD
+        void AttackStart(Unit* pWho) override
+        {
+            if (pWho)
+            {
+                if (pWho->GetEntry() == NPC_ASH || pWho->GetEntry() == NPC_ADA)
+                {
+                    return;
+                }
+                else
+                {
+                    ScriptedAI::AttackStart(pWho);
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_shadowfang_prisonerAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+        if (pInstance && pInstance->GetData(TYPE_FREE_NPC) != DONE && pInstance->GetData(TYPE_RETHILGORE) == DONE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DOOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+            if (npc_shadowfang_prisonerAI* pEscortAI = dynamic_cast<npc_shadowfang_prisonerAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start();
+            }
+        }
+        return true;
+    }
+};
+
+/*######
+## mob_arugal_voidwalker
+######*/
+
+struct Waypoint
+{
+    float fX, fY, fZ;
+};
+
+// Cordinates for voidwalker spawns
+static const Waypoint VWWaypoints[] =
+{
+    { -146.06f,  2172.84f, 127.953f},                       // This is the initial location, in the middle of the room
+    { -159.547f, 2178.11f, 128.944f},                       // When they come back up, they hit this point then walk back down
+    { -171.113f, 2182.69f, 129.255f},
+    { -177.613f, 2175.59f, 128.161f},
+    { -185.396f, 2178.35f, 126.413f},
+    { -184.004f, 2188.31f, 124.122f},
+    { -172.781f, 2188.71f, 121.611f},
+    { -173.245f, 2176.93f, 119.085f},
+    { -183.145f, 2176.04f, 116.995f},
+    { -185.551f, 2185.77f, 114.784f},
+    { -177.502f, 2190.75f, 112.681f},
+    { -171.218f, 2182.61f, 110.314f},
+    { -173.857f, 2175.1f,  109.255f}
+};
+
+enum
+{
+    LAST_WAYPOINT       = 12,
+
+    NPC_VOIDWALKER      = 4627,
+
+    SPELL_DARK_OFFERING = 7154
+};
+
+struct mob_arugal_voidwalker : public CreatureScript
+{
+    mob_arugal_voidwalker() : CreatureScript("mob_arugal_voidwalker") {}
+
+    struct mob_arugal_voidwalkerAI : public ScriptedAI
+    {
+        mob_arugal_voidwalkerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsLeader = false;
+            m_uiCurrentPoint = 0;
+            m_bReverse = false;
+        }
+
+        uint32 m_uiResetTimer, m_uiDarkOffering;
+        uint8 m_uiCurrentPoint, m_uiPosition;                   // 0 - leader, 1 - behind-right, 2 - behind, 3 - behind-left
+        ObjectGuid m_leaderGuid;
+        ScriptedInstance* m_pInstance;
+        bool m_bIsLeader, m_bReverse, m_bWPDone;
+
+        void Reset() override
+        {
+            m_creature->SetWalk(true);
+            m_uiDarkOffering = urand(4400, 12500);
+            m_bWPDone = true;
+
+            Creature* pLeader = m_creature->GetMap()->GetCreature(m_leaderGuid);
+            if (pLeader && pLeader->IsAlive())
+            {
+                m_creature->GetMotionMaster()->MoveFollow(pLeader, 1.0f, M_PI / 2 * m_uiPosition);
+            }
+            else
+            {
+                std::list<Creature*> lVoidwalkerList;
+                Creature* pNewLeader = NULL;
+                uint8 uiHighestPosition = 0;
+                GetCreatureListWithEntryInGrid(lVoidwalkerList, m_creature, NPC_VOIDWALKER, 50.0f);
+                for (std::list<Creature*>::iterator itr = lVoidwalkerList.begin(); itr != lVoidwalkerList.end(); ++itr)
+                {
+                    if ((*itr)->IsAlive())
+                    {
+                        if (mob_arugal_voidwalkerAI* pVoidwalkerAI = dynamic_cast<mob_arugal_voidwalkerAI*>((*itr)->AI()))
+                        {
+                            uint8 uiPosition = pVoidwalkerAI->GetPosition();
+                            if (uiPosition > uiHighestPosition)
+                            {
+                                pNewLeader = (*itr);
+                                uiHighestPosition = uiPosition;
+                            }
+                        }
+                    }
+                }
+
+                if (pNewLeader)
+                {
+                    m_leaderGuid = pNewLeader->GetObjectGuid();
+                    if (pNewLeader == m_creature)
+                    {
+                        m_bIsLeader = true;
+                        m_bWPDone = true;
+                    }
+                    else
+                    {
+                        m_creature->GetMotionMaster()->MoveFollow(pNewLeader, 1.0f, M_PI / 2 * m_uiPosition);
+                    }
+                }
+                else
+                {
+                    pNewLeader = m_creature;
+                    m_bIsLeader = true;
+                    m_bWPDone = true;
+                }
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 data) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender->GetEntry() == NPC_ARCHMAGE_ARUGAL)
+                SetPosition(data, pInvoker->ToCreature());
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_bIsLeader && m_bWPDone)
+            {
+                m_creature->GetMotionMaster()->MovePoint(m_uiCurrentPoint, VWWaypoints[m_uiCurrentPoint].fX,
+                    VWWaypoints[m_uiCurrentPoint].fY, VWWaypoints[m_uiCurrentPoint].fZ);
+                m_bWPDone = false;
+            }
+
+            if (!m_creature->IsInCombat())
+            {
+                return;
+            }
+
+            if (m_uiDarkOffering < uiDiff)
+            {
+                m_uiDarkOffering = urand(4400, 12500);
+
+                if (Unit* pUnit = DoSelectLowestHpFriendly(10.0f, 290))
+                {
+                    DoCastSpellIfCan(pUnit, SPELL_DARK_OFFERING);
+                }
+            }
+            else
+            {
+                m_uiDarkOffering -= uiDiff;
+            }
+
+            // Check if we have a current target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !m_bIsLeader)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 1:
+                if (m_bReverse)
+                {
+                    m_bReverse = false;
+                }
+                break;
+            case LAST_WAYPOINT:
+                if (!m_bReverse)
+                {
+                    m_bReverse = true;
+                }
+                break;
+            }
+
+            if (m_bReverse)
+            {
+                --m_uiCurrentPoint;
+            }
+            else
+            {
+                ++m_uiCurrentPoint;
+            }
+
+            m_bWPDone = true;
+
+            SendWaypoint();
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VOIDWALKER, DONE);
+            }
+        }
+
+        void SetPosition(uint8 uiPosition, Creature* pLeader)
+        {
+            m_uiPosition = uiPosition;
+
+            if (!uiPosition)
+            {
+                m_bIsLeader = true;
+            }
+            else
+            {
+                if (pLeader)
+                {
+                    m_leaderGuid = pLeader->GetObjectGuid();
+                }
+                else
+                {
+                    m_leaderGuid.Clear();
+                }
+            }
+
+            Reset();
+        }
+
+        uint8 GetPosition()
+        {
+            return m_uiPosition;
+        }
+
+        void SendWaypoint()
+        {
+            std::list<Creature*> lVoidwalkerList;
+            GetCreatureListWithEntryInGrid(lVoidwalkerList, m_creature, NPC_VOIDWALKER, 50.0f);
+            for (std::list<Creature*>::iterator itr = lVoidwalkerList.begin(); itr != lVoidwalkerList.end(); ++itr)
+            {
+                if ((*itr)->IsAlive())
+                if (mob_arugal_voidwalkerAI* pVoidwalkerAI = dynamic_cast<mob_arugal_voidwalkerAI*>((*itr)->AI()))
+                {
+                    pVoidwalkerAI->ReceiveWaypoint(m_uiCurrentPoint, m_bReverse);
+                }
+            }
+        }
+
+        void ReceiveWaypoint(uint32 uiNewPoint, bool bReverse)
+        {
+            m_uiCurrentPoint = uiNewPoint;
+            m_bReverse = bReverse;
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            m_creature->SetLootRecipient(NULL);
+
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_arugal_voidwalkerAI(pCreature);
+    }
+};
+
+/*######
+## boss_arugal
+######*/
+
+enum
+{
+    SPELL_VOID_BOLT                 = 7588,
+    SPELL_SHADOW_PORT_UPPER_LEDGE   = 7587,
+    SPELL_SHADOW_PORT_SPAWN_LEDGE   = 7586,
+    SPELL_SHADOW_PORT_STAIRS        = 7136,
+    SPELL_ARUGALS_CURSE             = 7621,
+    SPELL_THUNDERSHOCK              = 7803,
+
+    YELL_AGGRO                      = -1033017,
+    YELL_KILLED_PLAYER              = -1033018,
+    YELL_COMBAT                     = -1033019,
+    YELL_FENRUS                     = -1033013
+};
+
+enum ArugalPosition
+{
+    POSITION_SPAWN_LEDGE = 0,
+    POSITION_UPPER_LEDGE = 1,
+    POSITION_STAIRS      = 2
+};
+
+struct SpawnPoint
+{
+    float fX, fY, fZ, fO;
+};
+
+// Cordinates for voidwalker spawns
+static const SpawnPoint VWSpawns[] =
+{
+    // fX        fY         fZ        fO
+    { -155.352f, 2172.780f, 128.448f, 4.679f},
+    { -147.059f, 2163.193f, 128.696f, 0.128f},
+    { -148.869f, 2180.859f, 128.448f, 1.814f},
+    { -140.203f, 2175.263f, 128.448f, 0.373f}
+};
+
+// Roughly the height of Fenrus' room,
+// Used to tell how he should behave
+const float HEIGHT_FENRUS_ROOM      = 140.0f;
+
+struct boss_arugal : public CreatureScript
+{
+    boss_arugal() : CreatureScript("boss_arugal") {}
+
+    struct boss_arugalAI : public ScriptedAI
+    {
+        boss_arugalAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+            if (pCreature->GetPositionZ() < HEIGHT_FENRUS_ROOM)
+            {
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                m_creature->SetVisibility(VISIBILITY_OFF);
+                m_bEventMode = true;
+            }
+            else
+            {
+                m_bEventMode = false;
+            }
+        }
+
+        ScriptedInstance* m_pInstance;
+        ArugalPosition m_posPosition;
+        uint32 m_uiTeleportTimer, m_uiCurseTimer, m_uiVoidboltTimer, m_uiThundershockTimer, m_uiYellTimer, m_uiSpeechTimer;
+        uint8 m_uiSpeechStep;
+        bool m_bAttacking, m_bEventMode;
+
+        void Reset() override
+        {
+            m_uiTeleportTimer = urand(22000, 26000);
+            m_uiCurseTimer = urand(20000, 30000);
+            m_uiVoidboltTimer = m_uiThundershockTimer = m_uiSpeechTimer = 0;
+            m_uiYellTimer = urand(32000, 46000);
+            m_bAttacking = true;
+            m_posPosition = POSITION_SPAWN_LEDGE;
+            m_uiSpeechStep = 1;
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            DoScriptText(YELL_AGGRO, m_creature);
+            DoCastSpellIfCan(pWho, SPELL_VOID_BOLT);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoScriptText(YELL_KILLED_PLAYER, m_creature);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_bEventMode)
+            {
+                if (!m_uiSpeechStep)
+                {
+                    return;
+                }
+
+                if (m_uiSpeechTimer < uiDiff)
+                {
+                    switch (m_uiSpeechStep)
+                    {
+                    case 1:
+                        DoScriptText(YELL_FENRUS, m_creature);
+                        m_creature->SetVisibility(VISIBILITY_ON);
+                        m_uiSpeechTimer = 2000;
+                        break;
+                    case 2:
+                        DoCastSpellIfCan(m_creature, SPELL_FIRE);
+                        m_uiSpeechTimer = 5000;
+                        break;
+                    case 3:
+                        if (m_pInstance)
+                        if (GameObject* pLightning = m_pInstance->GetSingleGameObjectFromStorage(GO_ARUGAL_FOCUS))
+                        {
+                            pLightning->Use(m_creature);
+                        }
+
+                        m_uiSpeechTimer = 5000;
+                        break;
+                    case 4:
+                        m_creature->SetVisibility(VISIBILITY_OFF);
+                        m_uiSpeechTimer = 500;
+                        break;
+                    case 5:
+                    {
+                              Creature* pVoidwalker = NULL;
+                              Creature* pLeader = NULL;
+
+                              for (uint8 i = 0; i < 4; ++i)
+                              {
+                                  pVoidwalker = m_creature->SummonCreature(NPC_VOIDWALKER, VWSpawns[i].fX,
+                                      VWSpawns[i].fY, VWSpawns[i].fZ, VWSpawns[i].fO, TEMPSUMMON_DEAD_DESPAWN, 1);
+
+                                  if (!pVoidwalker)
+                                  {
+                                      continue;
+                                  }
+
+                                  if (!i)
+                                  {
+                                      pLeader = pVoidwalker;
+                                  }
+
+                                  if (CreatureAI* pVoidwalkerAI = pVoidwalker->AI())
+                                  {
+                                      SendAIEvent(AI_EVENT_CUSTOM_A, pLeader, pVoidwalker, i);
+                                      //pVoidwalkerAI->SetPosition(i, pLeader);
+                                  }
+
+                                  pVoidwalker = NULL;
+                              }
+                              m_uiSpeechStep = 0;
+                              return;
+                    }
+                    default:
+                        m_uiSpeechStep = 0;
+                        return;
+                    }
+                    ++m_uiSpeechStep;
+                }
+                else
+                {
+                    m_uiSpeechTimer -= uiDiff;
+                }
+
+                return;
+            }
+
+            // Check if we have a current target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (GetManaPercent() < 6.0f && !m_bAttacking)
+            {
+                if (m_posPosition != POSITION_UPPER_LEDGE)
+                {
+                    StartAttacking();
+                }
+                else if (m_uiTeleportTimer > 2000)
+                {
+                    m_uiTeleportTimer = 2000;
+                }
+
+                m_bAttacking = true;
+            }
+            else if (GetManaPercent() > 12.0f && m_bAttacking)
+            {
+                StopAttacking();
+                m_bAttacking = false;
+            }
+
+            if (m_uiYellTimer < uiDiff)
+            {
+                DoScriptText(YELL_COMBAT, m_creature);
+                m_uiYellTimer = urand(34000, 68000);
+            }
+            else
+            {
+                m_uiYellTimer -= uiDiff;
+            }
+
+            if (m_uiCurseTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    DoCastSpellIfCan(pTarget, SPELL_ARUGALS_CURSE);
+                }
+
+                m_uiCurseTimer = urand(20000, 35000);
+            }
+            else
+            {
+                m_uiCurseTimer -= uiDiff;
+            }
+
+            if (m_uiThundershockTimer < uiDiff)
+            {
+                if (GetVictimDistance() < 5.0f)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_THUNDERSHOCK);
+                    m_uiThundershockTimer = urand(30200, 38500);
+                }
+            }
+            else
+            {
+                m_uiThundershockTimer -= uiDiff;
+            }
+
+            if (m_uiVoidboltTimer < uiDiff)
+            {
+                if (!m_bAttacking)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_VOID_BOLT);
+                    m_uiVoidboltTimer = urand(2900, 4800);
+                }
+            }
+            else
+            {
+                m_uiVoidboltTimer -= uiDiff;
+            }
+
+            if (m_uiTeleportTimer < uiDiff)
+            {
+                ArugalPosition posNewPosition;
+
+                if (m_posPosition == POSITION_SPAWN_LEDGE)
+                {
+                    posNewPosition = (ArugalPosition)urand(1, 2);
+                }
+                else
+                {
+                    posNewPosition = (ArugalPosition)urand(0, 1);
+
+                    if (m_posPosition == posNewPosition)
+                    {
+                        posNewPosition = POSITION_STAIRS;
+                    }
+                }
+
+                if (m_creature->IsNonMeleeSpellCasted(false))
+                {
+                    m_creature->InterruptNonMeleeSpells(false);
+                }
+
+                switch (posNewPosition)
+                {
+                case POSITION_SPAWN_LEDGE:
+                    DoCastSpellIfCan(m_creature, SPELL_SHADOW_PORT_SPAWN_LEDGE, true);
+                    break;
+                case POSITION_UPPER_LEDGE:
+                    DoCastSpellIfCan(m_creature, SPELL_SHADOW_PORT_UPPER_LEDGE, true);
+                    break;
+                case POSITION_STAIRS:
+                    DoCastSpellIfCan(m_creature, SPELL_SHADOW_PORT_STAIRS, true);
+                    break;
+                }
+
+                if (GetManaPercent() < 6.0f)
+                {
+                    if (posNewPosition == POSITION_UPPER_LEDGE)
+                    {
+                        StopAttacking();
+                        m_uiTeleportTimer = urand(2000, 2200);
+                    }
+                    else
+                    {
+                        StartAttacking();
+                        m_uiTeleportTimer = urand(48000, 55000);
+                    }
+                }
+                else
+                {
+                    m_uiTeleportTimer = urand(48000, 55000);
+                }
+
+                m_posPosition = posNewPosition;
+            }
+            else
+            {
+                m_uiTeleportTimer -= uiDiff;
+            }
+
+            if (m_bAttacking)
+            {
+                DoMeleeAttackIfReady();
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (!m_bEventMode)
+            {
+                ScriptedAI::AttackStart(pWho);
+            }
+        }
+
+        // Make the code nice and pleasing to the eye
+        inline float GetManaPercent()
+        {
+            return (((float)m_creature->GetPower(POWER_MANA) / (float)m_creature->GetMaxPower(POWER_MANA)) * 100);
+        }
+
+        inline float GetVictimDistance()
+        {
+            return (m_creature->getVictim() ? m_creature->GetDistance2d(m_creature->getVictim()) : 999.9f);
+        }
+
+        void StopAttacking()
+        {
+            if (Unit* victim = m_creature->getVictim())
+            {
+                m_creature->SendMeleeAttackStop(victim);
+            }
+
+            if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
+            {
+                m_creature->GetMotionMaster()->Clear(false);
+                m_creature->GetMotionMaster()->MoveIdle();
+                m_creature->StopMoving();
+            }
+        }
+
+        void StartAttacking()
+        {
+            if (Unit* victim = m_creature->getVictim())
+            {
+                m_creature->SendMeleeAttackStart(victim);
+            }
+
+            if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == IDLE_MOTION_TYPE)
+            {
+                m_creature->GetMotionMaster()->Clear(false);
+                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), 0.0f, 0.0f);
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_arugalAI(pCreature);
+    }
+};
+
+/*######
+## npc_arugal
+######*/
+
+enum
+{
+    SAY_INTRO_1             = -1033009,
+    SAY_INTRO_2             = -1033010,
+    SAY_INTRO_3             = -1033011,
+    SAY_INTRO_4             = -1033012,
+
+    SPELL_SPAWN             = 7741,
+};
+
+struct npc_arugal : public CreatureScript
+{
+    npc_arugal() : CreatureScript("npc_arugal") {}
+
+    struct npc_arugalAI : public ScriptedAI
+    {
+        npc_arugalAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        uint32 m_uiSpeechTimer;
+        uint8 m_uiSpeechStep;
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override
+        {
+            m_uiSpeechTimer = 0;
+            m_uiSpeechStep = 0;
+
+            m_creature->SetVisibility(VISIBILITY_OFF);
+
+            if (m_pInstance && m_pInstance->GetData(TYPE_INTRO) == NOT_STARTED)
+            {
+                m_uiSpeechStep = 1;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_uiSpeechStep)
+            {
+                return;
+            }
+
+            if (m_uiSpeechTimer < uiDiff)
+            {
+                switch (m_uiSpeechStep)
+                {
+                case 1:
+                    m_creature->SetVisibility(VISIBILITY_ON);
+                    m_uiSpeechTimer = 500;
+                    break;
+                case 2:
+                    DoCastSpellIfCan(m_creature, SPELL_SPAWN);
+                    m_uiSpeechTimer = 2000;
+                    break;
+                case 3:
+                    // Make him die
+                    if (Creature* pVincent = GetClosestCreatureWithEntry(m_creature, NPC_VINCENT, 20.0f))
+                    {
+                        pVincent->SetStandState(UNIT_STAND_STATE_DEAD);
+                    }
+
+                    m_uiSpeechTimer = 10000;
+                    break;
+                case 4:
+                    DoScriptText(SAY_INTRO_1, m_creature);
+                    // m_creature->HandleEmote(EMOTE_ONESHOT_TALK);
+                    m_uiSpeechTimer = 1750;
+                    break;
+                case 5:
+                    m_creature->HandleEmote(EMOTE_ONESHOT_POINT);
+                    m_uiSpeechTimer = 1750;
+                    break;
+                case 6:
+                    DoScriptText(SAY_INTRO_2, m_creature);
+                    m_uiSpeechTimer = 1750;
+                    break;
+                case 7:
+                    m_creature->HandleEmote(EMOTE_ONESHOT_EXCLAMATION);
+                    m_uiSpeechTimer = 1750;
+                    break;
+                case 8:
+                    // m_creature->HandleEmote(EMOTE_ONESHOT_TALK);
+                    DoScriptText(SAY_INTRO_3, m_creature);
+                    m_uiSpeechTimer = 1750;
+                    break;
+                case 9:
+                    m_creature->HandleEmote(EMOTE_ONESHOT_LAUGH);
+                    m_uiSpeechTimer = 1750;
+                    break;
+                case 10:
+                    DoScriptText(SAY_INTRO_4, m_creature);
+                    m_uiSpeechTimer = 2000;
+                    break;
+                case 11:
+                    DoCastSpellIfCan(m_creature, SPELL_SPAWN);
+                    m_uiSpeechTimer = 500;
+                    break;
+                case 12:
+                    if (m_pInstance)
+                    {
+                        m_pInstance->SetData(TYPE_INTRO, DONE);
+                    }
+
+                    m_creature->SetVisibility(VISIBILITY_OFF);
+                    m_uiSpeechStep = 0;
+                    return;
+                default:
+                    m_uiSpeechStep = 0;
+                    return;
+                }
+                ++m_uiSpeechStep;
+            }
+            else
+            {
+                m_uiSpeechTimer -= uiDiff;
+            }
+        }
+
+        void AttackStart(Unit* /*who*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_arugalAI(pCreature);
+    }
+};
+
+/*######
+## npc_deathstalker_vincent
+######*/
+
+enum
+{
+    SAY_VINCENT_DIE     = -1033016,
+
+    FACTION_FRIENDLY    = 35
+};
+
+struct npc_deathstalker_vincent : public CreatureScript
+{
+    npc_deathstalker_vincent() : CreatureScript("npc_deathstalker_vincent") {}
+
+    struct npc_deathstalker_vincentAI : public ScriptedAI
+    {
+        npc_deathstalker_vincentAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override
+        {
+            if (m_pInstance && m_pInstance->GetData(TYPE_INTRO) == DONE && !m_creature->GetByteValue(UNIT_FIELD_BYTES_1, 0))
+            {
+                m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+            }
+        }
+
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+        {
+            if (pDoneBy)
+            {
+                m_creature->SetInCombatWith(pDoneBy);
+                pDoneBy->SetInCombatWith(m_creature);
+            }
+
+            if (m_creature->getStandState())
+            {
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            }
+
+            if (uiDamage >= m_creature->GetHealth())
+            {
+                m_creature->GetHealth() > 1 ? uiDamage = m_creature->GetHealth() - 1 : uiDamage = 0;
+                m_creature->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_NONE);
+                EnterEvadeMode();
+                DoScriptText(SAY_VINCENT_DIE, m_creature);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_creature->IsInCombat() && m_creature->getFaction() == FACTION_FRIENDLY)
+            {
+                EnterEvadeMode();
+            }
+
+            ScriptedAI::UpdateAI(uiDiff);
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAuras();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+            m_creature->SetLootRecipient(NULL);
+            Reset();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_deathstalker_vincentAI(pCreature);
+    }
+};
+
+void AddSC_shadowfang_keep()
+{
+    Script *s;
+    s = new npc_shadowfang_prisoner();
+    s->RegisterSelf();
+    s = new mob_arugal_voidwalker();
+    s->RegisterSelf();
+    s = new npc_arugal();
+    s->RegisterSelf();
+    s = new boss_arugal();
+    s->RegisterSelf();
+    s = new npc_deathstalker_vincent();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_shadowfang_prisoner";
+    //pNewScript->pGossipHello =  &GossipHello_npc_shadowfang_prisoner;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_shadowfang_prisoner;
+    //pNewScript->GetAI = &GetAI_npc_shadowfang_prisoner;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_arugal_voidwalker";
+    //pNewScript->GetAI = &GetAI_mob_arugal_voidwalker;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_arugal";
+    //pNewScript->GetAI = &GetAI_npc_arugal;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_arugal";
+    //pNewScript->GetAI = &GetAI_boss_arugal;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_deathstalker_vincent";
+    //pNewScript->GetAI = &GetAI_npc_deathstalker_vincent;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.h b/src/modules/SD3/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.h
new file mode 100644
index 000000000..5bddc172b
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.h
@@ -0,0 +1,80 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_SHADOWFANG_H
+#define DEF_SHADOWFANG_H
+
+enum
+{
+#if defined (CLASSIC) || defined (TBC)
+    MAX_ENCOUNTER           = 6,
+#endif
+#if defined (WOTLK) || defined (CATA)
+    MAX_ENCOUNTER           = 7,
+#endif
+
+    TYPE_FREE_NPC           = 1,
+    TYPE_RETHILGORE         = 2,
+    TYPE_FENRUS             = 3,
+    TYPE_NANDOS             = 4,
+    TYPE_INTRO              = 5,
+    TYPE_VOIDWALKER         = 6,
+#if defined (WOTLK) || defined (CATA)
+    TYPE_APOTHECARY         = 7,
+#endif
+
+    SAY_BOSS_DIE_AD         = -1033007,
+    SAY_BOSS_DIE_AS         = -1033008,
+
+    NPC_ASH                 = 3850,
+    NPC_ADA                 = 3849,
+    //  NPC_ARUGAL              = 10000,                    //"Arugal" says intro text, not used
+    NPC_ARCHMAGE_ARUGAL     = 4275,                         //"Archmage Arugal" does Fenrus event
+    NPC_FENRUS              = 4274,                         // used to summon Arugal in Fenrus event
+    NPC_VINCENT             = 4444,                         // Vincent should be "dead" is Arugal is done the intro already
+
+#if defined (WOTLK) || defined (CATA)
+    NPC_HUMMEL              = 36296,                        // Love is in the Air event
+    NPC_FRYE                = 36272,
+    NPC_BAXTER              = 36565,
+    NPC_VALENTINE_BOSS_MGR  = 36643,                        // controller npc for the apothecary event
+    NPC_APOTHECARY_GENERATOR = 36212,                       // the npc which summons the crazed apothecary
+#endif
+    GO_COURTYARD_DOOR       = 18895,                        // door to open when talking to NPC's
+    GO_SORCERER_DOOR        = 18972,                        // door to open when Fenrus the Devourer
+    GO_ARUGAL_DOOR          = 18971,                        // door to open when Wolf Master Nandos
+    GO_ARUGAL_FOCUS         = 18973,                        // this generates the lightning visual in the Fenrus event
+#if defined (WOTLK) || defined (CATA)
+    GO_APOTHECARE_VIALS     = 190678,                       // move position for Baxter
+    GO_CHEMISTRY_SET        = 200335,                       // move position for Frye
+
+    SAY_HUMMEL_DEATH        = -1033025,
+
+    MAX_APOTHECARY          = 3,
+#endif
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/silvermoon_city.cpp b/src/modules/SD3/scripts/eastern_kingdoms/silvermoon_city.cpp
new file mode 100644
index 000000000..dcbfaa61b
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/silvermoon_city.cpp
@@ -0,0 +1,41 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Silvermoon_City
+SD%Complete: 0
+SDComment: Placeholder
+SDCategory: Silvermoon City
+EndScriptData */
+
+/* ContentData
+EndContentData */
+
+#include "precompiled.h"
+
+void AddSC_silvermoon_city()
+{
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/silverpine_forest.cpp b/src/modules/SD3/scripts/eastern_kingdoms/silverpine_forest.cpp
new file mode 100644
index 000000000..da3b354b6
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/silverpine_forest.cpp
@@ -0,0 +1,682 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Silverpine_Forest
+ * SD%Complete: 100
+ * SDComment:   Quest support: 435, 452.
+ * SDCategory:  Silverpine Forest
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_deathstalker_erland
+ * npc_deathstalker_faerleia
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*#####
+## npc_deathstalker_erland
+#####*/
+
+enum
+{
+    SAY_START_1         = -1000306,
+    SAY_START_2         = -1000307,
+    SAY_AGGRO_1         = -1000308,
+    SAY_AGGRO_2         = -1000309,
+    SAY_AGGRO_3         = -1000310,
+    SAY_PROGRESS        = -1000311,
+    SAY_END             = -1000312,
+    SAY_RANE            = -1000313,
+    SAY_RANE_REPLY      = -1000314,
+    SAY_CHECK_NEXT      = -1000315,
+    SAY_QUINN           = -1000316,
+    SAY_QUINN_REPLY     = -1000317,
+    SAY_BYE             = -1000318,
+
+    QUEST_ERLAND        = 435,
+    NPC_RANE            = 1950,
+#if defined (WOTLK) || defined (CATA)
+    NPC_QUINN           = 1951
+#endif
+#if defined (CLASSIC) || defined (TBC)
+    NPC_QUINN           = 1951,
+
+    PHASE_RANE          = 0,
+    PHASE_QUINN         = 1
+#endif
+};
+
+struct npc_deathstalker_erland : public CreatureScript
+{
+    npc_deathstalker_erland() : CreatureScript("npc_deathstalker_erland") {}
+
+    struct npc_deathstalker_erlandAI : public npc_escortAI
+    {
+        npc_deathstalker_erlandAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+#if defined (CLASSIC) || defined (TBC)
+            lCreatureList.clear();
+            m_uiPhase = 0;
+            m_uiPhaseCounter = 0;
+#endif
+        }
+#if defined (CLASSIC) || defined (TBC)
+        std::list<Creature*> lCreatureList;
+#endif
+
+#if defined (CLASSIC) || defined (TBC)
+        uint32 m_uiPhase;
+        uint32 m_uiPhaseCounter;
+        uint32 m_uiGlobalTimer;
+
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING) && (pWho->GetEntry() == NPC_QUINN || NPC_RANE))
+            {
+                lCreatureList.push_back((Creature*)pWho);
+            }
+
+            npc_escortAI::MoveInLineOfSight(pWho);
+        }
+
+        Creature* GetCreature(uint32 uiCreatureEntry)
+        {
+            if (!lCreatureList.empty())
+            {
+                for (std::list<Creature*>::iterator itr = lCreatureList.begin(); itr != lCreatureList.end(); ++itr)
+                {
+                    if ((*itr)->GetEntry() == uiCreatureEntry && (*itr)->IsAlive())
+                    {
+                        return (*itr);
+                    }
+                }
+            }
+
+            return NULL;
+        }
+#endif
+
+        void WaypointReached(uint32 i) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            switch (i)
+            {
+            case 0:
+                DoScriptText(SAY_START_2, m_creature, pPlayer);
+                break;
+            case 13:
+#if defined (WOTLK) || defined (CATA)
+                DoScriptText(SAY_END, m_creature, pPlayer);
+#endif
+#if defined (CLASSIC) || defined (TBC)
+                switch (urand(0, 1))
+                {
+                case 0:
+                    DoScriptText(SAY_END, m_creature, pPlayer);
+                    break;
+                case 1:
+                    DoScriptText(SAY_PROGRESS, m_creature);
+                    break;
+                }
+#endif
+                pPlayer->GroupEventHappens(QUEST_ERLAND, m_creature);
+#if defined (CLASSIC) || defined (TBC)
+                m_creature->SetWalk(false);
+#endif
+                break;
+#if defined (WOTLK) || defined (CATA)
+            case 14:
+                if (Creature* pRane = GetClosestCreatureWithEntry(m_creature, NPC_RANE, 45.0f))
+                    DoScriptText(SAY_RANE, pRane, m_creature);
+                break;
+            case 15:
+                DoScriptText(SAY_RANE_REPLY, m_creature);
+                break;
+#endif
+            case 16:
+#if defined (WOTLK) || defined (CATA)
+                DoScriptText(SAY_CHECK_NEXT, m_creature);
+#endif
+#if defined (CLASSIC) || defined (TBC)
+                m_creature->SetWalk(true);
+                SetEscortPaused(true);
+#endif
+                break;
+#if defined (WOTLK) || defined (CATA)
+            case 24:
+                DoScriptText(SAY_QUINN, m_creature);
+                break;
+#endif
+            case 25:
+#if defined (CLASSIC) || defined (TBC)
+                SetEscortPaused(true);
+#endif
+#if defined (WOTLK) || defined (CATA)
+                if (Creature* pQuinn = GetClosestCreatureWithEntry(m_creature, NPC_QUINN, 45.0f))
+                    DoScriptText(SAY_QUINN_REPLY, pQuinn, m_creature);
+#endif
+                break;
+#if defined (WOTLK) || defined (CATA)
+            case 26:
+                DoScriptText(SAY_BYE, m_creature);
+                break;
+#endif
+            }
+        }
+
+#if defined (CLASSIC) || defined (TBC)
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (HasEscortState(STATE_ESCORT_PAUSED))
+                {
+                    if (m_uiGlobalTimer < uiDiff)
+                    {
+                        m_uiGlobalTimer = 5000;
+
+                        switch (m_uiPhase)
+                        {
+                        case PHASE_RANE:
+                            switch (m_uiPhaseCounter)
+                            {
+                            case 0:
+                                if (Creature* pRane = GetCreature(NPC_RANE))
+                                {
+                                    DoScriptText(SAY_RANE, pRane);
+                                }
+                                break;
+                            case 1:
+                                DoScriptText(SAY_RANE_REPLY, m_creature);
+                                break;
+                            case 2:
+                                DoScriptText(SAY_CHECK_NEXT, m_creature);
+                                break;
+                            case 3:
+                                SetEscortPaused(false);
+                                m_uiPhase = PHASE_QUINN;
+                                break;
+                            }
+                            break;
+                        case PHASE_QUINN:
+                            switch (m_uiPhaseCounter)
+                            {
+                            case 4:
+                                DoScriptText(SAY_QUINN, m_creature);
+                                break;
+                            case 5:
+                                if (Creature* pQuinn = GetCreature(NPC_QUINN))
+                                {
+                                    DoScriptText(SAY_QUINN_REPLY, pQuinn);
+                                }
+                                break;
+                            case 6:
+                                DoScriptText(SAY_BYE, m_creature);
+                                break;
+                            case 7:
+                                SetEscortPaused(false);
+                                break;
+                            }
+                            break;
+                        }
+                        ++m_uiPhaseCounter;
+                    }
+                    else
+                    {
+                        m_uiGlobalTimer -= uiDiff;
+                    }
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+#endif
+
+        void Reset() override {}
+
+        void Aggro(Unit* pWho) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(SAY_AGGRO_1, m_creature, pWho);
+                break;
+            case 1:
+                DoScriptText(SAY_AGGRO_2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_AGGRO_3, m_creature, pWho);
+                break;
+            }
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ERLAND)
+        {
+            DoScriptText(SAY_START_1, pCreature);
+
+            if (npc_deathstalker_erlandAI* pEscortAI = dynamic_cast<npc_deathstalker_erlandAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_deathstalker_erlandAI(pCreature);
+    }
+};
+
+/*#####
+## npc_deathstalker_faerleia
+#####*/
+
+enum
+{
+    QUEST_PYREWOOD_AMBUSH      = 452,
+
+    // cast it after every wave
+    SPELL_DRINK_POTION         = 3359,
+
+    SAY_START                  = -1000553,
+    SAY_COMPLETED              = -1000554,
+
+    // 1st wave
+    NPC_COUNCILMAN_SMITHERS    = 2060,
+    // 2nd wave
+    NPC_COUNCILMAN_THATHER     = 2061,
+    NPC_COUNCILMAN_HENDRICKS   = 2062,
+    // 3rd wave
+    NPC_COUNCILMAN_WILHELM     = 2063,
+    NPC_COUNCILMAN_HARTIN      = 2064,
+    NPC_COUNCILMAN_HIGARTH     = 2066,
+    // final wave
+    NPC_COUNCILMAN_COOPER      = 2065,
+    NPC_COUNCILMAN_BRUNSWICK   = 2067,
+    NPC_LORD_MAYOR_MORRISON    = 2068
+};
+
+struct SpawnPoint
+{
+    float fX;
+    float fY;
+    float fZ;
+    float fO;
+};
+
+SpawnPoint SpawnPoints[] =
+{
+#if defined (CLASSIC) || defined (TBC)
+    { -397.39f, 1509.78f, 18.87f, 4.73f},
+    { -396.30f, 1511.68f, 18.87f, 4.76f},
+    { -398.26f, 1511.56f, 18.87f, 4.74f}
+#endif
+#if defined (WOTLK) || defined (CATA)
+    { -397.45f, 1509.56f, 18.87f, 4.73f},
+    { -398.35f, 1510.75f, 18.87f, 4.76f},
+    { -396.41f, 1511.06f, 18.87f, 4.74f}
+#endif
+};
+
+#if defined (WOTLK) || defined (CATA)
+static float m_afMoveCoords[] = { -410.69f, 1498.04f, 19.77f};
+#endif
+
+#if defined (CLASSIC) || defined (TBC)
+struct MovePoints
+{
+    float fX;
+    float fY;
+    float fZ;
+};
+
+MovePoints MovePointspy[] =   // Set Movementpoints for Waves
+{
+    { -396.97f, 1494.43f, 19.77f},
+    { -396.21f, 1495.97f, 19.77f},
+    { -398.30f, 1495.97f, 19.77f}
+};
+#endif
+struct npc_deathstalker_faerleia : public CreatureScript
+{
+    npc_deathstalker_faerleia() : CreatureScript("npc_deathstalker_faerleia") {}
+
+    struct npc_deathstalker_faerleiaAI : public ScriptedAI
+    {
+        npc_deathstalker_faerleiaAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void Reset()
+        {
+        }
+
+#if defined (WOTLK) || defined (CATA)
+    ObjectGuid m_playerGuid;
+#endif
+#if defined (CLASSIC) || defined (TBC)
+        uint64 m_uiPlayerGUID;
+#endif
+        uint32 m_uiWaveTimer;
+        uint32 m_uiSummonCount;
+#if defined (CLASSIC) || defined (TBC) || defined (WOTLK) || defined (CATA)
+        uint32 m_uiRunbackTimer;
+#endif
+        uint8  m_uiWaveCount;
+#if defined (CLASSIC) || defined (TBC) || defined (WOTLK) || defined (CATA)
+        uint8  m_uiMoveCount;
+#endif
+        bool   m_bEventStarted;
+#if defined (CLASSIC) || defined (TBC) || defined (WOTLK) || defined (CATA)
+        bool   m_bWaveDied;
+#endif
+
+        void JustRespawned()
+        {
+            m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); // Reseting flags on respawn in case questgiver died durin event
+            Reset();
+        }
+
+#if defined (CLASSIC) || defined (TBC)
+        void StartEvent(uint64 uiPlayerGUID)
+        {
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+
+            m_uiPlayerGUID = uiPlayerGUID;
+            m_bEventStarted = true;
+            m_bWaveDied = false;
+            m_uiWaveTimer = 10000;
+            m_uiSummonCount = 0;
+            m_uiWaveCount = 0;
+            m_uiRunbackTimer = 0;
+            m_uiMoveCount = 0;
+        }
+#endif
+
+#if defined (WOTLK) || defined (CATA)
+    void StartEvent(Player* pPlayer)
+    {
+        m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+
+        m_playerGuid  = pPlayer->GetObjectGuid();
+        m_bEventStarted  = true;
+        m_uiWaveTimer    = 10000;
+        m_uiSummonCount  = 0;
+        m_uiWaveCount    = 0;
+    }
+#endif
+
+        void FinishEvent()
+        {
+#if defined (CLASSIC) || defined (TBC)
+            m_uiPlayerGUID = 0;
+            m_bEventStarted = false;
+            m_bWaveDied = false;
+#endif
+#if defined (WOTLK) || defined (CATA)
+        m_playerGuid.Clear();
+        m_bEventStarted = false;
+        m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+#endif
+        }
+
+        void JustDied(Unit* /*pKiller*/)
+        {
+#if defined (CLASSIC) || defined (TBC)
+            if (Player* pPlayer = (m_creature->GetMap()->GetPlayer(m_uiPlayerGUID)))
+#endif
+#if defined (WOTLK) || defined (CATA)
+        if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+#endif
+            {
+                pPlayer->SendQuestFailed(QUEST_PYREWOOD_AMBUSH);
+            }
+
+            FinishEvent();
+        }
+
+#if defined (CLASSIC) || defined (TBC)
+        void JustSummoned(Creature* pSummoned)
+#endif
+#if defined (WOTLK) || defined (CATA)
+    void JustSummoned(Creature* pSummoned) override
+#endif
+        {
+            ++m_uiSummonCount;
+
+#if defined (CLASSIC) || defined (TBC)
+            // Get waypoint for each creature
+            pSummoned->GetMotionMaster()->MovePoint(0, MovePointspy[m_uiMoveCount].fX, MovePointspy[m_uiMoveCount].fY, MovePointspy[m_uiMoveCount].fZ);
+
+            ++m_uiMoveCount;
+#endif
+#if defined (WOTLK) || defined (CATA)
+        // put them on correct waypoints later on
+        float fX, fY, fZ;
+        pSummoned->GetRandomPoint(m_afMoveCoords[0], m_afMoveCoords[1], m_afMoveCoords[2], 10.0f, fX, fY, fZ);
+        pSummoned->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+#endif
+        }
+
+#if defined (CLASSIC) || defined (TBC)
+        void SummonedCreatureJustDied(Creature* /*pKilled*/)
+        {
+            --m_uiSummonCount;
+
+            if (!m_uiSummonCount)
+            {
+                m_uiRunbackTimer = 3000;  //without timer creature is in evade state running to start point and do not drink potion
+                m_bWaveDied = true;
+            }
+        }
+#endif
+
+#if defined (WOTLK) || defined (CATA)
+    void SummonedCreatureJustDied(Creature* /*pKilled*/) override
+    {
+        --m_uiSummonCount;
+
+        if (!m_uiSummonCount)
+        {
+            DoCastSpellIfCan(m_creature, SPELL_DRINK_POTION);
+
+            // final wave
+            if (m_uiWaveCount == 4)
+            {
+                DoScriptText(SAY_COMPLETED, m_creature);
+
+                if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                    pPlayer->GroupEventHappens(QUEST_PYREWOOD_AMBUSH, m_creature);
+
+                FinishEvent();
+            }
+
+        }
+    }
+#endif
+
+#if defined (CLASSIC) || defined (TBC)
+        void UpdateAI(const uint32 uiDiff)
+#endif
+#if defined (WOTLK) || defined (CATA)
+    void UpdateAI(const uint32 uiDiff) override
+#endif
+        {
+#if defined (CLASSIC) || defined (TBC)
+            if (m_bEventStarted && m_bWaveDied && m_uiRunbackTimer < uiDiff && m_uiWaveCount == 4)
+            {
+                DoScriptText(SAY_COMPLETED, m_creature);
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                if (Player* pPlayer = (m_creature->GetMap()->GetPlayer(m_uiPlayerGUID)))
+                {
+                    pPlayer->GroupEventHappens(QUEST_PYREWOOD_AMBUSH, m_creature);
+                }
+
+                FinishEvent();
+            }
+
+
+            if (m_bEventStarted && m_bWaveDied && m_uiRunbackTimer < uiDiff && m_uiWaveCount <= 3)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_DRINK_POTION);
+                m_bWaveDied = false;
+            }
+#endif
+
+            if (m_bEventStarted && !m_uiSummonCount)
+            {
+                if (m_uiWaveTimer < uiDiff)
+                {
+                    switch (m_uiWaveCount)
+                    {
+                    case 0:
+#if defined (CLASSIC) || defined (TBC)
+                        m_creature->SummonCreature(NPC_COUNCILMAN_SMITHERS, SpawnPoints[0].fX, SpawnPoints[0].fY, SpawnPoints[0].fZ, SpawnPoints[0].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+#endif
+#if defined (WOTLK) || defined (CATA)
+                        m_creature->SummonCreature(NPC_COUNCILMAN_SMITHERS,  SpawnPoints[1].fX, SpawnPoints[1].fY, SpawnPoints[1].fZ, SpawnPoints[1].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+#endif
+                        m_uiWaveTimer = 10000;
+#if defined (CLASSIC) || defined (TBC)
+                        m_uiMoveCount = 0;
+#endif
+                        break;
+                    case 1:
+                        m_creature->SummonCreature(NPC_COUNCILMAN_THATHER, SpawnPoints[2].fX, SpawnPoints[2].fY, SpawnPoints[2].fZ, SpawnPoints[2].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_creature->SummonCreature(NPC_COUNCILMAN_HENDRICKS, SpawnPoints[1].fX, SpawnPoints[1].fY, SpawnPoints[1].fZ, SpawnPoints[1].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_uiWaveTimer = 10000;
+#if defined (CLASSIC) || defined (TBC)
+                        m_uiMoveCount = 0;
+#endif
+                        break;
+                    case 2:
+                        m_creature->SummonCreature(NPC_COUNCILMAN_HARTIN, SpawnPoints[0].fX, SpawnPoints[0].fY, SpawnPoints[0].fZ, SpawnPoints[0].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_creature->SummonCreature(NPC_COUNCILMAN_WILHELM, SpawnPoints[1].fX, SpawnPoints[1].fY, SpawnPoints[1].fZ, SpawnPoints[1].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_creature->SummonCreature(NPC_COUNCILMAN_HIGARTH, SpawnPoints[2].fX, SpawnPoints[2].fY, SpawnPoints[2].fZ, SpawnPoints[2].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_uiWaveTimer = 8000;
+#if defined (CLASSIC) || defined (TBC)
+                        m_uiMoveCount = 0;
+#endif
+                        break;
+                    case 3:
+                        m_creature->SummonCreature(NPC_LORD_MAYOR_MORRISON, SpawnPoints[0].fX, SpawnPoints[0].fY, SpawnPoints[0].fZ, SpawnPoints[0].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_creature->SummonCreature(NPC_COUNCILMAN_COOPER, SpawnPoints[1].fX, SpawnPoints[1].fY, SpawnPoints[1].fZ, SpawnPoints[1].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_creature->SummonCreature(NPC_COUNCILMAN_BRUNSWICK, SpawnPoints[2].fX, SpawnPoints[2].fY, SpawnPoints[2].fZ, SpawnPoints[2].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+#if defined (CLASSIC) || defined (TBC)
+                        m_uiMoveCount = 0;
+#endif
+                        break;
+#if defined (CLASSIC) || defined (TBC)
+                    case 4:
+                        m_uiRunbackTimer -= uiDiff;
+                        return;
+#endif
+                    }
+
+                    ++m_uiWaveCount;
+                }
+                else
+                {
+                    m_uiWaveTimer -= uiDiff;
+                }
+#if defined (CLASSIC) || defined (TBC)
+                m_uiRunbackTimer -= uiDiff;
+#endif
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_PYREWOOD_AMBUSH)
+        {
+            DoScriptText(SAY_START, pCreature, pPlayer);
+
+            if (npc_deathstalker_faerleiaAI* pFaerleiaAI = dynamic_cast<npc_deathstalker_faerleiaAI*>(pCreature->AI()))
+            {
+#if defined (CLASSIC) || defined (TBC)
+                pFaerleiaAI->StartEvent(pPlayer->GetObjectGuid().GetRawValue());
+                return true;
+#endif
+#if defined (WOTLK) || defined (CATA)
+            pFaerleiaAI->StartEvent(pPlayer);
+#endif
+            }
+        }
+        return false;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_deathstalker_faerleiaAI(pCreature);
+    }
+};
+
+void AddSC_silverpine_forest()
+{
+    Script* s;
+    s = new npc_deathstalker_erland();
+    s->RegisterSelf();
+    s = new npc_deathstalker_faerleia();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_deathstalker_erland";
+    //pNewScript->GetAI = &GetAI_npc_deathstalker_erland;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_deathstalker_erland;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_deathstalker_faerleia";
+    //pNewScript->GetAI = &GetAI_npc_deathstalker_faerleia;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_deathstalker_faerleia;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/stormwind_city.cpp b/src/modules/SD3/scripts/eastern_kingdoms/stormwind_city.cpp
new file mode 100644
index 000000000..36c0ce89f
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/stormwind_city.cpp
@@ -0,0 +1,1381 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Stormwind_City
+ * SD%Complete: 100
+ * SDComment:   Quest support: 1640, 1447, 4185, 6402, 6403.
+ * SDCategory:  Stormwind City
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_bartleby
+ * npc_dashel_stonefist
+ * npc_lady_katrana_prestor
+ * npc_squire_rowe
+ * npc_reginald_windsor
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "../scripts/world/world_map_scripts.h"
+#include "escort_ai.h"
+
+#if defined (CLASSIC) || defined (TBC) || defined(WOTLK) || defined (CATA)
+/*######
+## npc_tyrion
+######*/
+
+enum
+{
+    FACTION_ENEMY       = 168,
+    QUEST_BEAT          = 1640,
+    QUEST_THE_ATTACK    = 434
+};
+
+struct npc_tyrion : public CreatureScript
+{
+    npc_tyrion() : CreatureScript("npc_tyrion") {}
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_THE_ATTACK)
+        {
+            pCreature->GetMap()->MonsterYellToMap(pCreature->GetObjectGuid(), -1000824, LANG_UNIVERSAL, pPlayer);
+            pCreature->SetFactionTemporary(FACTION_ENEMY, TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_RESTORE_COMBAT_STOP);
+            pCreature->AI()->AttackStart(pPlayer);
+            return true;
+        }
+
+        return false;
+    }
+};
+#endif
+
+/*######
+## npc_bartleby
+######*/
+
+struct npc_bartleby : public CreatureScript
+{
+    npc_bartleby() : CreatureScript("npc_bartleby") {}
+
+    struct npc_bartlebyAI : public ScriptedAI
+    {
+        npc_bartlebyAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+        }
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            if (m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->IsFriendlyTo(pAttacker))
+            {
+                return;
+            }
+
+            AttackStart(pAttacker);
+        }
+
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+        {
+            if (uiDamage > m_creature->GetHealth() || ((m_creature->GetHealth() - uiDamage) * 100 / m_creature->GetMaxHealth() < 15))
+            {
+                uiDamage = 0;
+
+                if (pDoneBy->GetTypeId() == TYPEID_PLAYER)
+                {
+                    ((Player*)pDoneBy)->AreaExploredOrEventHappens(QUEST_BEAT);
+                }
+
+                EnterEvadeMode();
+            }
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_BEAT)
+        {
+            pCreature->SetFactionTemporary(FACTION_ENEMY, TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_RESTORE_COMBAT_STOP);
+            pCreature->AI()->AttackStart(pPlayer);
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_bartlebyAI(pCreature);
+    }
+};
+
+/*######
+## npc_dashel_stonefist
+######*/
+
+enum
+{
+    QUEST_MISSING_DIPLO_PT8     = 1447,
+    FACTION_HOSTILE             = 168
+};
+
+struct npc_dashel_stonefist : public CreatureScript
+{
+    npc_dashel_stonefist() : CreatureScript("npc_dashel_stonefist") {}
+
+    struct npc_dashel_stonefistAI : public ScriptedAI
+    {
+        npc_dashel_stonefistAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+        }
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            if (m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->IsFriendlyTo(pAttacker))
+            {
+                return;
+            }
+
+            AttackStart(pAttacker);
+        }
+
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+        {
+            if (uiDamage > m_creature->GetHealth() || ((m_creature->GetHealth() - uiDamage) * 100 / m_creature->GetMaxHealth() < 15))
+            {
+                uiDamage = 0;
+
+                if (pDoneBy->GetTypeId() == TYPEID_PLAYER)
+                {
+                    ((Player*)pDoneBy)->AreaExploredOrEventHappens(QUEST_MISSING_DIPLO_PT8);
+                }
+
+                EnterEvadeMode();
+            }
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT8)
+        {
+            pCreature->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_COMBAT_STOP | TEMPFACTION_RESTORE_RESPAWN);
+            pCreature->AI()->AttackStart(pPlayer);
+            return true;
+        }
+        return false;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_dashel_stonefistAI(pCreature);
+    }
+};
+
+/*######
+## npc_lady_katrana_prestor
+######*/
+
+#define GOSSIP_ITEM_KAT_1 "Pardon the intrusion, Lady Prestor, but Highlord Bolvar suggested that I seek your advice."
+#define GOSSIP_ITEM_KAT_2 "My apologies, Lady Prestor."
+#define GOSSIP_ITEM_KAT_3 "Begging your pardon, Lady Prestor. That was not my intent."
+#define GOSSIP_ITEM_KAT_4 "Thank you for your time, Lady Prestor."
+
+struct npc_lady_katrana_prestor : public CreatureScript //TODO localisation
+{
+    npc_lady_katrana_prestor() : CreatureScript("npc_lady_katrana_prestor") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+
+        if (pPlayer->GetQuestStatus(4185) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(2693, pCreature->GetObjectGuid());
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(2694, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(2695, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(2696, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 3:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(4185);
+            break;
+        }
+        return true;
+    }
+};
+
+/*######
+## npc_squire_rowe
+######*/
+
+enum
+{
+    SAY_SIGNAL_SENT             = -1000822,
+    SAY_DISMOUNT                = -1000823,
+    SAY_WELCOME                 = -1000824,
+
+    GOSSIP_ITEM_WINDSOR         = -3000106,
+
+    GOSSIP_TEXT_ID_DEFAULT      = 9063,
+    GOSSIP_TEXT_ID_PROGRESS     = 9064,
+    GOSSIP_TEXT_ID_START        = 9065,
+
+    NPC_WINDSOR_MOUNT           = 12581,
+
+    QUEST_STORMWIND_RENDEZVOUS  = 6402,
+    QUEST_THE_GREAT_MASQUERADE  = 6403,
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {NPC_WINDSOR,                0,           3000},        // wait
+    {NPC_WINDSOR_MOUNT,          0,           1000},        // summon horse
+    {SAY_DISMOUNT,               NPC_WINDSOR, 2000},
+    {QUEST_STORMWIND_RENDEZVOUS, 0,           2000},        // face player
+    {QUEST_THE_GREAT_MASQUERADE, 0,           0},           // say intro to player
+    {0, 0, 0},
+};
+
+static const float aWindsorSpawnLoc[3] = { -9145.68f, 373.79f, 90.64f};
+static const float aWindsorMoveLoc[3] = { -9050.39f, 443.55f, 93.05f};
+
+struct npc_squire_rowe : public CreatureScript
+{
+    npc_squire_rowe() : CreatureScript("npc_squire_rowe") {}
+
+    struct npc_squire_roweAI : public npc_escortAI, private DialogueHelper
+    {
+        npc_squire_roweAI(Creature* m_creature) : npc_escortAI(m_creature),
+        DialogueHelper(aIntroDialogue)
+        {
+            m_bIsEventInProgress = false;
+        }
+
+        bool m_bIsEventInProgress;
+
+        ObjectGuid m_windsorGuid;
+        ObjectGuid m_horseGuid;
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_WINDSOR)
+            {
+                pSummoned->SetWalk(false);
+                pSummoned->GetMotionMaster()->MovePoint(1, aWindsorMoveLoc[0], aWindsorMoveLoc[1], aWindsorMoveLoc[2]);
+
+                m_windsorGuid = pSummoned->GetObjectGuid();
+                m_bIsEventInProgress = true;
+            }
+            else if (pSummoned->GetEntry() == NPC_WINDSOR_MOUNT)
+            {
+                m_horseGuid = pSummoned->GetObjectGuid();
+            }
+        }
+
+        void SummonedCreatureDespawn(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_WINDSOR)
+            {
+                m_windsorGuid.Clear();
+                m_bIsEventInProgress = false;
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId || pSummoned->GetEntry() != NPC_WINDSOR)
+            {
+                return;
+            }
+
+            // Summoned npc has escort and this can trigger twice if escort state is not checked
+            if (uiPointId && HasEscortState(STATE_ESCORT_PAUSED))
+            {
+                StartNextDialogueText(NPC_WINDSOR);
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 2:
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                break;
+            case 3:
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                m_creature->SummonCreature(NPC_WINDSOR, aWindsorSpawnLoc[0], aWindsorSpawnLoc[1], aWindsorSpawnLoc[2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                break;
+            case 6:
+                DoScriptText(SAY_SIGNAL_SENT, m_creature);
+                m_creature->SetFacingTo(2.15f);
+                SetEscortPaused(true);
+                break;
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case NPC_WINDSOR_MOUNT:
+                if (Creature* pWindsor = m_creature->GetMap()->GetCreature(m_windsorGuid))
+                {
+                    pWindsor->Unmount();
+                    m_creature->SummonCreature(NPC_WINDSOR_MOUNT, pWindsor->GetPositionX() - 1.0f, pWindsor->GetPositionY() + 1.0f, pWindsor->GetPositionZ(), pWindsor->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000);
+                }
+                break;
+            case SAY_DISMOUNT:
+                if (Creature* pHorse = m_creature->GetMap()->GetCreature(m_horseGuid))
+                {
+                    pHorse->SetWalk(false);
+                    pHorse->GetMotionMaster()->MovePoint(1, aWindsorSpawnLoc[0], aWindsorSpawnLoc[1], aWindsorSpawnLoc[2]);
+                }
+                break;
+            case QUEST_STORMWIND_RENDEZVOUS:
+            {
+                Creature* pWindsor = m_creature->GetMap()->GetCreature(m_windsorGuid);
+                Player* pPlayer = GetPlayerForEscort();
+                if (!pWindsor || !pPlayer)
+                {
+                    break;
+                }
+
+                pWindsor->SetFacingToObject(pPlayer);
+                break;
+            }
+            case QUEST_THE_GREAT_MASQUERADE:
+            {
+                Creature* pWindsor = m_creature->GetMap()->GetCreature(m_windsorGuid);
+                Player* pPlayer = GetPlayerForEscort();
+                if (!pWindsor || !pPlayer)
+                {
+                    break;
+                }
+
+                DoScriptText(SAY_WELCOME, pWindsor, pPlayer);
+                // Allow players to finish quest and also finish the escort
+                pWindsor->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                SetEscortPaused(false);
+                break;
+            }
+            }
+        }
+
+        Creature* GetSpeakerByEntry(uint32 uiEntry) override
+        {
+            if (uiEntry == NPC_WINDSOR)
+            {
+                return m_creature->GetMap()->GetCreature(m_windsorGuid);
+            }
+
+            return NULL;
+        }
+
+        // Check if the event is already running
+        bool IsStormwindQuestActive() { return m_bIsEventInProgress; }
+
+        void UpdateEscortAI(const uint32 uiDiff) { DialogueUpdate(uiDiff); }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_squire_roweAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        // Allow gossip if quest 6402 is completed but not yet rewarded or 6402 is rewarded but 6403 isn't yet completed
+        if ((pPlayer->GetQuestStatus(QUEST_STORMWIND_RENDEZVOUS) == QUEST_STATUS_COMPLETE && !pPlayer->GetQuestRewardStatus(QUEST_STORMWIND_RENDEZVOUS)) ||
+            (pPlayer->GetQuestRewardStatus(QUEST_STORMWIND_RENDEZVOUS) && pPlayer->GetQuestStatus(QUEST_THE_GREAT_MASQUERADE) != QUEST_STATUS_COMPLETE))
+        {
+            bool bIsEventInProgress = true;
+
+            // Check if event is already in progress
+            if (npc_squire_roweAI* pRoweAI = dynamic_cast<npc_squire_roweAI*>(pCreature->AI()))
+            {
+                bIsEventInProgress = pRoweAI->IsStormwindQuestActive();
+            }
+
+            // If event is already in progress, then inform the player to wait
+            if (bIsEventInProgress)
+            {
+                pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_PROGRESS, pCreature->GetObjectGuid());
+            }
+            else
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_WINDSOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_START, pCreature->GetObjectGuid());
+            }
+        }
+        else
+        {
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_DEFAULT, pCreature->GetObjectGuid());
+        }
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            if (npc_squire_roweAI* pRoweAI = dynamic_cast<npc_squire_roweAI*>(pCreature->AI()))
+            {
+                pRoweAI->Start(true, pPlayer, 0, true, false);
+            }
+
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_reginald_windsor
+######*/
+
+enum
+{
+    SAY_WINDSOR_QUEST_ACCEPT    = -1000825,
+    SAY_WINDSOR_GET_READY       = -1000826,
+    SAY_PRESTOR_SIEZE           = -1000827,
+
+    SAY_JON_DIALOGUE_1          = -1000828,
+    SAY_WINDSOR_DIALOGUE_2      = -1000829,
+    SAY_WINDSOR_DIALOGUE_3      = -1000830,
+    SAY_JON_DIALOGUE_4          = -1000832,
+    SAY_JON_DIALOGUE_5          = -1000833,
+    SAY_WINDSOR_DIALOGUE_6      = -1000834,
+    SAY_WINDSOR_DIALOGUE_7      = -1000835,
+    SAY_JON_DIALOGUE_8          = -1000836,
+    SAY_JON_DIALOGUE_9          = -1000837,
+    SAY_JON_DIALOGUE_10         = -1000838,
+    SAY_JON_DIALOGUE_11         = -1000839,
+    SAY_WINDSOR_DIALOGUE_12     = -1000840,
+    SAY_WINDSOR_DIALOGUE_13     = -1000841,
+
+    SAY_WINDSOR_BEFORE_KEEP     = -1000849,
+    SAY_WINDSOR_TO_KEEP         = -1000850,
+
+    SAY_WINDSOR_KEEP_1          = -1000851,
+    SAY_BOLVAR_KEEP_2           = -1000852,
+    SAY_WINDSOR_KEEP_3          = -1000853,
+    SAY_PRESTOR_KEEP_4          = -1000855,
+    SAY_PRESTOR_KEEP_5          = -1000856,
+    SAY_WINDSOR_KEEP_6          = -1000857,
+    SAY_WINDSOR_KEEP_7          = -1000859,
+    SAY_WINDSOR_KEEP_8          = -1000860,
+    SAY_PRESTOR_KEEP_9          = -1000863,
+    SAY_BOLVAR_KEEP_10          = -1000864,
+    SAY_PRESTOR_KEEP_11         = -1000865,
+    SAY_WINDSOR_KEEP_12         = -1000866,
+    SAY_PRESTOR_KEEP_13         = -1000867,
+    SAY_PRESTOR_KEEP_14         = -1000868,
+    SAY_BOLVAR_KEEP_15          = -1000869,
+    SAY_WINDSOR_KEEP_16         = -1000870,
+
+    EMOTE_CONTEMPLATION         = -1000831,
+    EMOTE_PRESTOR_LAUGH         = -1000854,
+    EMOTE_WINDSOR_TABLETS       = -1000858,
+    EMOTE_WINDSOR_READ          = -1000861,
+    EMOTE_BOLVAR_GASP           = -1000862,
+    EMOTE_WINDSOR_DIE           = -1000871,
+    EMOTE_GUARD_TRANSFORM       = -1000872,
+
+    GOSSIP_ITEM_REGINALD        = -3000107,
+
+    GOSSIP_TEXT_ID_MASQUERADE   = 5633,
+
+    // SPELL_ONYXIA_TRANSFORM    = 20409,            // removed from DBC
+    SPELL_WINDSOR_READ          = 20358,
+    SPELL_WINDSOR_DEATH         = 20465,
+    SPELL_ONYXIA_DESPAWN        = 20466,
+
+    NPC_GUARD_ROYAL             = 1756,
+    NPC_GUARD_CITY              = 68,
+    NPC_GUARD_PATROLLER         = 1976,
+    NPC_GUARD_ONYXIA            = 12739,
+    NPC_LADY_ONYXIA             = 12756,
+
+    MAX_ROYAL_GUARDS            = 6,
+    MAX_GUARD_SALUTES           = 7,
+};
+
+static const float aGuardLocations[MAX_ROYAL_GUARDS][4] =
+{
+    { -8968.510f, 512.556f, 96.352f, 3.849f},               // guard right - left
+    { -8969.780f, 515.012f, 96.593f, 3.955f},               // guard right - middle
+    { -8972.410f, 518.228f, 96.594f, 4.281f},               // guard right - right
+    { -8965.170f, 508.565f, 96.352f, 3.825f},               // guard left - right
+    { -8962.960f, 506.583f, 96.593f, 3.802f},               // guard left - middle
+    { -8961.080f, 503.828f, 96.593f, 3.465f},               // guard left - left
+};
+
+static const float aMoveLocations[10][3] =
+{
+    { -8967.960f, 510.008f, 96.351f},                       // Jonathan move
+    { -8959.440f, 505.424f, 96.595f},                       // Guard Left - Middle kneel
+    { -8957.670f, 507.056f, 96.595f},                       // Guard Left - Right kneel
+    { -8970.680f, 519.252f, 96.595f},                       // Guard Right - Middle kneel
+    { -8969.100f, 520.395f, 96.595f},                       // Guard Right - Left kneel
+    { -8974.590f, 516.213f, 96.590f},                       // Jonathan kneel
+    { -8505.770f, 338.312f, 120.886f},                      // Wrynn safe
+    { -8448.690f, 337.074f, 121.330f},                      // Bolvar help
+    { -8448.279f, 338.398f, 121.329f}                       // Bolvar kneel
+};
+
+static const DialogueEntry aMasqueradeDialogue[] =
+{
+    {SAY_WINDSOR_QUEST_ACCEPT,  NPC_WINDSOR,    7000},
+    {SAY_WINDSOR_GET_READY,     NPC_WINDSOR,    6000},
+    {SAY_PRESTOR_SIEZE,         NPC_PRESTOR,    0},
+
+    {SAY_JON_DIALOGUE_1,        NPC_JONATHAN,   5000},
+    {SAY_WINDSOR_DIALOGUE_2,    NPC_WINDSOR,    6000},
+    {SAY_WINDSOR_DIALOGUE_3,    NPC_WINDSOR,    5000},
+    {EMOTE_CONTEMPLATION,       NPC_JONATHAN,   3000},
+    {SAY_JON_DIALOGUE_4,        NPC_JONATHAN,   6000},
+    {SAY_JON_DIALOGUE_5,        NPC_JONATHAN,   7000},
+    {SAY_WINDSOR_DIALOGUE_6,    NPC_WINDSOR,    8000},
+    {SAY_WINDSOR_DIALOGUE_7,    NPC_WINDSOR,    6000},
+    {SAY_JON_DIALOGUE_8,        NPC_JONATHAN,   7000},
+    {SAY_JON_DIALOGUE_9,        NPC_JONATHAN,   6000},
+    {SAY_JON_DIALOGUE_10,       NPC_JONATHAN,   5000},
+    {EMOTE_ONESHOT_SALUTE,      0,              4000},
+    {SAY_JON_DIALOGUE_11,       NPC_JONATHAN,   3000},
+    {NPC_JONATHAN,              0,              2000},
+    {EMOTE_ONESHOT_KNEEL,       0,              3000},
+    {SAY_WINDSOR_DIALOGUE_12,   NPC_WINDSOR,    5000},
+    {SAY_WINDSOR_DIALOGUE_13,   NPC_WINDSOR,    3000},
+    {EMOTE_ONESHOT_POINT,       0,              3000},
+    {NPC_WINDSOR,               0,              0},
+
+    {NPC_GUARD_ROYAL,           0,              3000},
+    {SAY_WINDSOR_BEFORE_KEEP,   NPC_WINDSOR,    0},
+    {SAY_WINDSOR_TO_KEEP,       NPC_WINDSOR,    4000},
+    {NPC_GUARD_CITY,            0,              0},
+
+    {NPC_WRYNN,                 0,              3000},
+    {SAY_WINDSOR_KEEP_1,        NPC_WINDSOR,    3000},
+    {SAY_BOLVAR_KEEP_2,         NPC_BOLVAR,     2000},
+    {SAY_WINDSOR_KEEP_3,        NPC_WINDSOR,    4000},
+    {EMOTE_PRESTOR_LAUGH,       NPC_PRESTOR,    4000},
+    {SAY_PRESTOR_KEEP_4,        NPC_PRESTOR,    9000},
+    {SAY_PRESTOR_KEEP_5,        NPC_PRESTOR,    7000},
+    {SAY_WINDSOR_KEEP_6,        NPC_WINDSOR,    6000},
+    {EMOTE_WINDSOR_TABLETS,     NPC_WINDSOR,    6000},
+    {SAY_WINDSOR_KEEP_7,        NPC_WINDSOR,    4000},
+    {SAY_WINDSOR_KEEP_8,        NPC_WINDSOR,    5000},
+    {EMOTE_WINDSOR_READ,        NPC_WINDSOR,    3000},
+    {SPELL_WINDSOR_READ,        0,              10000},
+    {EMOTE_BOLVAR_GASP,         NPC_BOLVAR,     3000},
+    {SAY_PRESTOR_KEEP_9,        NPC_PRESTOR,    4000},
+    {SAY_BOLVAR_KEEP_10,        NPC_BOLVAR,     3000},
+    {SAY_PRESTOR_KEEP_11,       NPC_PRESTOR,    2000},
+    {SPELL_WINDSOR_DEATH,       0,              1500},
+    {SAY_WINDSOR_KEEP_12,       NPC_WINDSOR,    4000},
+    {SAY_PRESTOR_KEEP_14,       NPC_PRESTOR,    0},
+
+    {NPC_GUARD_ONYXIA,          0,              14000},
+    {NPC_BOLVAR,                0,              2000},
+    {SAY_BOLVAR_KEEP_15,        NPC_BOLVAR,     8000},
+    {NPC_GUARD_PATROLLER,       0,              0},
+    {0, 0, 0},
+};
+
+static const int32 aGuardSalute[MAX_GUARD_SALUTES] = { -1000842, -1000843, -1000844, -1000845, -1000846, -1000847, -1000848};
+
+struct npc_reginald_windsor : public CreatureScript
+{
+    npc_reginald_windsor() : CreatureScript("npc_reginald_windsor") {}
+
+    struct npc_reginald_windsorAI : public npc_escortAI, private DialogueHelper
+    {
+        npc_reginald_windsorAI(Creature* m_creature) : npc_escortAI(m_creature),
+        DialogueHelper(aMasqueradeDialogue)
+        {
+            m_pScriptedMap = (ScriptedMap*)m_creature->GetInstanceData();
+            // Npc flag is controlled by script
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+            InitializeDialogueHelper(m_pScriptedMap);
+        }
+
+        ScriptedMap* m_pScriptedMap;
+
+        uint32 m_uiGuardCheckTimer;
+        uint8 m_uiOnyxiaGuardCount;
+
+        bool m_bIsKeepReady;
+        bool m_bCanGuardSalute;
+
+        ObjectGuid m_playerGuid;
+        ObjectGuid m_guardsGuid[MAX_ROYAL_GUARDS];
+
+        GuidList m_lRoyalGuardsGuidList;
+        GuidSet m_sGuardsSalutedGuidSet;
+
+        void Reset() override
+        {
+            m_uiGuardCheckTimer = 0;
+            m_bIsKeepReady = false;
+            m_bCanGuardSalute = false;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // Note: this implementation is not the best; It should be better handled by the guard script
+            if (m_bCanGuardSalute && (pWho->GetEntry() == NPC_GUARD_CITY || pWho->GetEntry() == NPC_GUARD_ROYAL ||
+                pWho->GetEntry() == NPC_GUARD_PATROLLER) && pWho->IsWithinDistInMap(m_creature, 15.0f) &&
+                m_sGuardsSalutedGuidSet.find(pWho->GetObjectGuid()) == m_sGuardsSalutedGuidSet.end() && pWho->IsWithinLOSInMap(m_creature))
+            {
+                DoScriptText(aGuardSalute[urand(0, MAX_GUARD_SALUTES - 1)], pWho);
+                m_sGuardsSalutedGuidSet.insert(pWho->GetObjectGuid());
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                if (!m_pScriptedMap)
+                {
+                    break;
+                }
+                // Prepare Jonathan for the first event
+                if (Creature* pJonathan = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_JONATHAN))
+                {
+                    // Summon 3 guards on each side and move Jonathan in the middle
+                    for (uint8 i = 0; i < MAX_ROYAL_GUARDS; ++i)
+                    {
+                        if (Creature* pTemp = m_creature->SummonCreature(NPC_GUARD_ROYAL, aGuardLocations[i][0], aGuardLocations[i][1], aGuardLocations[i][2], aGuardLocations[i][3], TEMPSUMMON_TIMED_DESPAWN, 180000))
+                        {
+                            m_guardsGuid[i] = pTemp->GetObjectGuid();
+                        }
+                    }
+
+                    pJonathan->SetWalk(false);
+                    pJonathan->Unmount();
+                    pJonathan->GetMotionMaster()->MovePoint(0, aMoveLocations[0][0], aMoveLocations[0][1], aMoveLocations[0][2]);
+                }
+                break;
+            case 1:
+                StartNextDialogueText(SAY_JON_DIALOGUE_1);
+                SetEscortPaused(true);
+                break;
+            case 3:
+                m_bCanGuardSalute = true;
+                break;
+            case 11:
+                if (!m_pScriptedMap)
+                {
+                    break;
+                }
+                // We can reset Jonathan now
+                if (Creature* pJonathan = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_JONATHAN))
+                {
+                    pJonathan->SetWalk(true);
+                    pJonathan->SetStandState(UNIT_STAND_STATE_STAND);
+                    pJonathan->GetMotionMaster()->MoveTargetedHome();
+                }
+                break;
+            case 22:
+                SetEscortPaused(true);
+                m_creature->SetFacingTo(5.41f);
+                StartNextDialogueText(NPC_GUARD_ROYAL);
+                break;
+            case 24:
+                m_bCanGuardSalute = false;
+                break;
+            case 25:
+                StartNextDialogueText(NPC_WRYNN);
+                SetEscortPaused(true);
+                m_bCanGuardSalute = false;
+                break;
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId || pSummoned->GetEntry() != NPC_GUARD_ROYAL)
+            {
+                return;
+            }
+
+            // Handle city gates royal guards
+            switch (uiPointId)
+            {
+            case 1:
+            case 2:
+                pSummoned->SetFacingTo(2.234f);
+                pSummoned->SetStandState(UNIT_STAND_STATE_KNEEL);
+                break;
+            case 3:
+            case 4:
+                pSummoned->SetFacingTo(5.375f);
+                pSummoned->SetStandState(UNIT_STAND_STATE_KNEEL);
+                break;
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            if (!m_pScriptedMap)
+            {
+                return;
+            }
+
+            switch (iEntry)
+            {
+                // Set orientation and prepare the npcs for the next event
+            case SAY_WINDSOR_GET_READY:
+                m_creature->SetFacingTo(0.6f);
+                break;
+            case SAY_PRESTOR_SIEZE:
+                if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                {
+                    Start(false, pPlayer);
+                }
+                break;
+            case SAY_JON_DIALOGUE_8:
+                // Turn left and move the guards
+                if (Creature* pJonathan = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_JONATHAN))
+                {
+                    pJonathan->SetFacingTo(5.375f);
+                }
+                if (Creature* pGuard = m_creature->GetMap()->GetCreature(m_guardsGuid[5]))
+                {
+                    pGuard->SetFacingTo(2.234f);
+                    pGuard->SetStandState(UNIT_STAND_STATE_KNEEL);
+                }
+                if (Creature* pGuard = m_creature->GetMap()->GetCreature(m_guardsGuid[4]))
+                {
+                    pGuard->GetMotionMaster()->MovePoint(1, aMoveLocations[1][0], aMoveLocations[1][1], aMoveLocations[1][2]);
+                }
+                if (Creature* pGuard = m_creature->GetMap()->GetCreature(m_guardsGuid[3]))
+                {
+                    pGuard->GetMotionMaster()->MovePoint(2, aMoveLocations[2][0], aMoveLocations[2][1], aMoveLocations[2][2]);
+                }
+                break;
+            case SAY_JON_DIALOGUE_9:
+                // Turn right and move the guards
+                if (Creature* pJonathan = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_JONATHAN))
+                {
+                    pJonathan->SetFacingTo(2.234f);
+                }
+                if (Creature* pGuard = m_creature->GetMap()->GetCreature(m_guardsGuid[2]))
+                {
+                    pGuard->SetFacingTo(5.375f);
+                    pGuard->SetStandState(UNIT_STAND_STATE_KNEEL);
+                }
+                if (Creature* pGuard = m_creature->GetMap()->GetCreature(m_guardsGuid[1]))
+                {
+                    pGuard->GetMotionMaster()->MovePoint(3, aMoveLocations[3][0], aMoveLocations[3][1], aMoveLocations[3][2]);
+                }
+                if (Creature* pGuard = m_creature->GetMap()->GetCreature(m_guardsGuid[0]))
+                {
+                    pGuard->GetMotionMaster()->MovePoint(4, aMoveLocations[4][0], aMoveLocations[4][1], aMoveLocations[4][2]);
+                }
+                break;
+            case SAY_JON_DIALOGUE_10:
+                if (Creature* pJonathan = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_JONATHAN))
+                {
+                    pJonathan->SetFacingToObject(m_creature);
+                }
+                break;
+            case EMOTE_ONESHOT_SALUTE:
+                if (Creature* pJonathan = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_JONATHAN))
+                {
+                    pJonathan->HandleEmote(EMOTE_ONESHOT_SALUTE);
+                }
+                break;
+            case NPC_JONATHAN:
+                if (Creature* pJonathan = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_JONATHAN))
+                {
+                    pJonathan->SetWalk(true);
+                    pJonathan->GetMotionMaster()->MovePoint(0, aMoveLocations[5][0], aMoveLocations[5][1], aMoveLocations[5][2]);
+                }
+                break;
+            case EMOTE_ONESHOT_KNEEL:
+                if (Creature* pJonathan = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_JONATHAN))
+                {
+                    pJonathan->SetFacingToObject(m_creature);
+                    pJonathan->SetStandState(UNIT_STAND_STATE_KNEEL);
+                }
+                break;
+            case SAY_WINDSOR_DIALOGUE_12:
+                if (Creature* pJonathan = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_JONATHAN))
+                {
+                    m_creature->SetFacingToObject(pJonathan);
+                }
+                break;
+            case SAY_WINDSOR_DIALOGUE_13:
+                m_creature->SetFacingTo(0.6f);
+                break;
+            case EMOTE_ONESHOT_POINT:
+                m_creature->HandleEmote(EMOTE_ONESHOT_POINT);
+                break;
+            case NPC_WINDSOR:
+                SetEscortPaused(false);
+                break;
+            case SAY_WINDSOR_BEFORE_KEEP:
+                m_bIsKeepReady = true;
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                break;
+            case NPC_GUARD_CITY:
+                SetEscortPaused(false);
+                break;
+            case NPC_WRYNN:
+                // Remove npc flags during the event
+                if (Creature* pOnyxia = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_PRESTOR))
+                {
+                    pOnyxia->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER);
+                }
+                if (Creature* pWrynn = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_WRYNN))
+                {
+                    pWrynn->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                }
+                if (Creature* pBolvar = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_BOLVAR))
+                {
+                    pBolvar->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                }
+                break;
+            case SAY_BOLVAR_KEEP_2:
+                if (Creature* pWrynn = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_WRYNN))
+                {
+                    pWrynn->SetWalk(false);
+                    pWrynn->ForcedDespawn(15000);
+                    pWrynn->GetMotionMaster()->MovePoint(0, aMoveLocations[6][0], aMoveLocations[6][1], aMoveLocations[6][2]);
+
+                    // Store all the nearby guards, in order to transform them into Onyxia guards
+                    std::list<Creature*> lGuardsList;
+                    GetCreatureListWithEntryInGrid(lGuardsList, pWrynn, NPC_GUARD_ROYAL, 25.0f);
+
+                    for (std::list<Creature*>::const_iterator itr = lGuardsList.begin(); itr != lGuardsList.end(); ++itr)
+                    {
+                        m_lRoyalGuardsGuidList.push_back((*itr)->GetObjectGuid());
+                    }
+                }
+                break;
+            case SPELL_WINDSOR_READ:
+                DoCastSpellIfCan(m_creature, SPELL_WINDSOR_READ);
+                break;
+            case EMOTE_BOLVAR_GASP:
+                if (Creature* pOnyxia = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_PRESTOR))
+                {
+                    pOnyxia->UpdateEntry(NPC_LADY_ONYXIA);
+
+                    if (Creature* pBolvar = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_BOLVAR))
+                    {
+                        pBolvar->SetFacingToObject(pOnyxia);
+                    }
+                }
+                break;
+            case SAY_PRESTOR_KEEP_9:
+                if (Creature* pBolvar = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_BOLVAR))
+                {
+                    pBolvar->SetWalk(false);
+                    pBolvar->GetMotionMaster()->MovePoint(0, aMoveLocations[7][0], aMoveLocations[7][1], aMoveLocations[7][2]);
+                }
+                break;
+            case SAY_BOLVAR_KEEP_10:
+                if (Creature* pBolvar = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_BOLVAR))
+                {
+                    if (Creature* pOnyxia = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_PRESTOR))
+                    {
+                        pBolvar->SetFacingToObject(pOnyxia);
+                        DoScriptText(EMOTE_PRESTOR_LAUGH, pOnyxia);
+                    }
+                }
+                break;
+            case SAY_PRESTOR_KEEP_11:
+                for (GuidList::const_iterator itr = m_lRoyalGuardsGuidList.begin(); itr != m_lRoyalGuardsGuidList.end(); ++itr)
+                {
+                    if (Creature* pGuard = m_creature->GetMap()->GetCreature(*itr))
+                    {
+                        if (!pGuard->IsAlive())
+                        {
+                            continue;
+                        }
+
+                        pGuard->UpdateEntry(NPC_GUARD_ONYXIA);
+                        DoScriptText(EMOTE_GUARD_TRANSFORM, pGuard);
+
+                        if (Creature* pBolvar = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_BOLVAR))
+                        {
+                            pGuard->AI()->AttackStart(pBolvar);
+                        }
+                    }
+                }
+                m_uiGuardCheckTimer = 1000;
+                break;
+            case SPELL_WINDSOR_DEATH:
+                if (Creature* pOnyxia = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_PRESTOR))
+                {
+                    pOnyxia->CastSpell(m_creature, SPELL_WINDSOR_DEATH, false);
+                }
+                break;
+            case SAY_WINDSOR_KEEP_12:
+                if (Creature* pOnyxia = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_PRESTOR))
+                {
+                    DoScriptText(SAY_PRESTOR_KEEP_13, pOnyxia);
+                }
+
+                // Fake death
+                m_creature->InterruptNonMeleeSpells(true);
+                m_creature->SetHealth(0);
+                m_creature->StopMoving();
+                m_creature->ClearComboPointHolders();
+                m_creature->RemoveAllAurasOnDeath();
+                m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+                m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+#endif
+
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->ClearAllReactives();
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MoveIdle();
+                m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+                break;
+            case SAY_PRESTOR_KEEP_14:
+                if (Creature* pOnyxia = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_PRESTOR))
+                {
+                    pOnyxia->ForcedDespawn(1000);
+                    pOnyxia->HandleEmote(EMOTE_ONESHOT_LIFTOFF);
+                    pOnyxia->CastSpell(pOnyxia, SPELL_ONYXIA_DESPAWN, false);
+                }
+                break;
+            case NPC_GUARD_ONYXIA:
+                if (Creature* pBolvar = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_BOLVAR))
+                {
+                    pBolvar->GetMotionMaster()->MovePoint(0, aMoveLocations[7][0], aMoveLocations[7][1], aMoveLocations[7][2]);
+                }
+                break;
+            case NPC_BOLVAR:
+                if (Creature* pBolvar = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_BOLVAR))
+                {
+                    pBolvar->SetWalk(true);
+                    pBolvar->GetMotionMaster()->MovePoint(0, aMoveLocations[8][0], aMoveLocations[8][1], aMoveLocations[8][2]);
+                }
+                break;
+            case SAY_BOLVAR_KEEP_15:
+                if (Creature* pBolvar = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_BOLVAR))
+                {
+                    pBolvar->SetStandState(UNIT_STAND_STATE_KNEEL);
+                }
+
+                DoScriptText(SAY_WINDSOR_KEEP_16, m_creature);
+                DoScriptText(EMOTE_WINDSOR_DIE, m_creature);
+
+                if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                {
+                    pPlayer->GroupEventHappens(QUEST_THE_GREAT_MASQUERADE, m_creature);
+                }
+                break;
+            case NPC_GUARD_PATROLLER:
+                // Reset Bolvar and Wrynn
+                if (Creature* pBolvar = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_BOLVAR))
+                {
+                    pBolvar->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                    pBolvar->SetStandState(UNIT_STAND_STATE_STAND);
+                    pBolvar->GetMotionMaster()->MoveTargetedHome();
+                }
+                if (Creature* pWrynn = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_WRYNN))
+                {
+                    pWrynn->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                    pWrynn->Respawn();
+                    pWrynn->SetWalk(true);
+                    pWrynn->GetMotionMaster()->MoveTargetedHome();
+                }
+                // Onyxia will respawn by herself in about 30 min, so just reset flags
+                if (Creature* pOnyxia = m_pScriptedMap->GetSingleCreatureFromStorage(NPC_PRESTOR))
+                {
+                    pOnyxia->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER);
+                }
+                // Allow creature to despawn
+                SetEscortPaused(false);
+                break;
+            }
+        }
+
+        void DoStartKeepEvent()
+        {
+            StartNextDialogueText(SAY_WINDSOR_TO_KEEP);
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+        }
+
+        void DoStartEscort(Player* pPlayer)
+        {
+            StartNextDialogueText(SAY_WINDSOR_QUEST_ACCEPT);
+            m_playerGuid = pPlayer->GetObjectGuid();
+        }
+
+        bool IsKeepEventReady() { return m_bIsKeepReady; }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            // Check if all Onyxia guards are dead
+            if (m_uiGuardCheckTimer)
+            {
+                if (m_uiGuardCheckTimer <= uiDiff)
+                {
+                    uint8 uiDeadGuardsCount = 0;
+                    for (GuidList::const_iterator itr = m_lRoyalGuardsGuidList.begin(); itr != m_lRoyalGuardsGuidList.end(); ++itr)
+                    {
+                        if (Creature* pGuard = m_creature->GetMap()->GetCreature(*itr))
+                        {
+                            if (!pGuard->IsAlive() && pGuard->GetEntry() == NPC_GUARD_ONYXIA)
+                            {
+                                ++uiDeadGuardsCount;
+                            }
+                        }
+                    }
+                    if (uiDeadGuardsCount == m_lRoyalGuardsGuidList.size())
+                    {
+                        StartNextDialogueText(NPC_GUARD_ONYXIA);
+                        m_uiGuardCheckTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiGuardCheckTimer = 1000;
+                    }
+                }
+                else
+                {
+                    m_uiGuardCheckTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_reginald_windsorAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_THE_GREAT_MASQUERADE)
+        {
+            if (npc_reginald_windsorAI* pReginaldAI = dynamic_cast<npc_reginald_windsorAI*>(pCreature->AI()))
+            {
+                pReginaldAI->DoStartEscort(pPlayer);
+            }
+        }
+
+        return true;
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        bool bIsEventReady = false;
+
+        if (npc_reginald_windsorAI* pReginaldAI = dynamic_cast<npc_reginald_windsorAI*>(pCreature->AI()))
+        {
+            bIsEventReady = pReginaldAI->IsKeepEventReady();
+        }
+
+        // Check if event is possible and also check the status of the quests
+        if (bIsEventReady && pPlayer->GetQuestStatus(QUEST_THE_GREAT_MASQUERADE) != QUEST_STATUS_COMPLETE && pPlayer->GetQuestRewardStatus(QUEST_STORMWIND_RENDEZVOUS))
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_REGINALD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_MASQUERADE, pCreature->GetObjectGuid());
+        }
+        else
+        {
+            if (pCreature->IsQuestGiver())
+            {
+                pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+            }
+
+            pPlayer->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, pCreature->GetObjectGuid());
+        }
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            if (npc_reginald_windsorAI* pReginaldAI = dynamic_cast<npc_reginald_windsorAI*>(pCreature->AI()))
+            {
+                pReginaldAI->DoStartKeepEvent();
+            }
+
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        return true;
+    }
+};
+
+#if defined (CLASSIC) || defined (TBC) || defined (WOTLK) || defined (CATA)
+/*######
+## npc_tyrion_spybot
+######*/
+
+enum eTyrionSpybot
+{
+    SAY_QUEST_ACCEPT_ATTACK = -1000499,
+    SAY_TYRION_1 = -1000450,
+    SAY_SPYBOT_1 = -1000451,
+    SAY_GUARD_1 = -1000452,
+    SAY_SPYBOT_2 = -1000453,
+    SAY_SPYBOT_3 = -1000454,
+    SAY_LESCOVAR_1 = -1000455,
+    SAY_SPYBOT_4 = -1000456,
+
+    NPC_PRIESTESS_TYRIONA = 7779,
+    NPC_LORD_GREGOR_LESCOVAR = 1754,
+};
+
+struct npc_tyrion_spybot : public CreatureScript
+{
+    npc_tyrion_spybot() : CreatureScript("npc_tyrion_spybot") {}
+
+    struct npc_tyrion_spybotAI : public npc_escortAI
+    {
+        npc_tyrion_spybotAI(Creature* pCreature) : npc_escortAI(pCreature) {}
+
+        uint32 uiTimer;
+        uint32 uiPhase;
+        Creature* pTyrion;
+        Creature* pLescovar;
+
+        void Reset()
+        {
+            pLescovar = NULL;
+            pTyrion = NULL;
+            uiTimer = 0;
+            uiPhase = 0;
+        }
+
+        void WaypointReached(uint32 uiPointId)
+        {
+            switch (uiPointId)
+            {
+            case 1:
+                SetEscortPaused(true);
+                uiTimer = 2000;
+                uiPhase = 1;
+                break;
+            case 5:
+                SetEscortPaused(true);
+                DoScriptText(SAY_SPYBOT_1, m_creature);
+                uiTimer = 2000;
+                uiPhase = 5;
+                break;
+            case 17:
+                SetEscortPaused(true);
+                DoScriptText(SAY_SPYBOT_3, m_creature);
+                uiTimer = 3000;
+                uiPhase = 8;
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff)
+        {
+            if (uiPhase)
+            {
+                if (uiTimer <= uiDiff)
+                {
+                    switch (uiPhase)
+                    {
+                    case 1:
+                        DoScriptText(SAY_QUEST_ACCEPT_ATTACK, m_creature);
+                        uiTimer = 3000;
+                        uiPhase = 2;
+                        break;
+                    case 2:
+                        if (pTyrion)
+                            DoScriptText(SAY_TYRION_1, pTyrion);
+                        uiTimer = 3000;
+                        uiPhase = 3;
+                        break;
+                    case 3:
+                        m_creature->UpdateEntry(NPC_PRIESTESS_TYRIONA, ALLIANCE);
+                        uiTimer = 2000;
+                        uiPhase = 4;
+                        break;
+                    case 4:
+                        SetEscortPaused(false);
+                        uiPhase = 0;
+                        uiTimer = 0;
+                        break;
+                    case 5:
+                        /*if (Creature* pGuard = m_creature->FindNearestCreature(NPC_STORMWIND_ROYAL, 10.0f, true))
+                        DoScriptText(SAY_GUARD_1, pGuard);*/
+                        uiTimer = 3000;
+                        uiPhase = 6;
+                        break;
+                    case 6:
+                        DoScriptText(SAY_SPYBOT_2, m_creature);
+                        uiTimer = 3000;
+                        uiPhase = 7;
+                        break;
+                    case 7:
+                        SetEscortPaused(false);
+                        uiTimer = 0;
+                        uiPhase = 0;
+                        break;
+                    case 8:
+                        if (pLescovar)
+                            DoScriptText(SAY_LESCOVAR_1, pLescovar);
+                        uiTimer = 3000;
+                        uiPhase = 9;
+                        break;
+                    case 9:
+                        DoScriptText(SAY_SPYBOT_4, m_creature);
+                        uiTimer = 3000;
+                        uiPhase = 10;
+                        break;
+                    case 10:
+                        if (pLescovar && pLescovar->IsAlive())
+                        {
+                            if (Player* pPlayer = GetPlayerForEscort())
+                                static_cast<npc_escortAI*>(pLescovar->AI())->Start(false, pPlayer, 0, false, false);
+                            //CAST_AI(npc_lord_gregor_lescovarAI, pLescovar->AI())->Start(false, false, pPlayer->GetGUID());
+                            //CAST_AI(npc_lord_gregor_lescovarAI, pLescovar->AI())->SetMaxPlayerDistance(200.0f);
+                        }
+                        //m_creature->DisappearAndDie();
+                        uiTimer = 0;
+                        uiPhase = 0;
+                        break;
+                    }
+                }
+                else uiTimer -= uiDiff;
+            }
+
+            npc_escortAI::UpdateAI(uiDiff);
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_tyrion_spybotAI(pCreature);
+    }
+};
+#endif
+
+void AddSC_stormwind_city()
+{
+    Script* s;
+    s = new npc_tyrion(); //also npc_tyrion_spybot : probably not completed stuff, TODO
+    s->RegisterSelf();
+    s = new npc_bartleby();
+    s->RegisterSelf();
+    s = new npc_dashel_stonefist();
+    s->RegisterSelf();
+    s = new npc_lady_katrana_prestor();
+    s->RegisterSelf();
+    s = new npc_squire_rowe();
+    s->RegisterSelf();
+    s = new npc_reginald_windsor();
+    s->RegisterSelf();
+    s = new npc_tyrion_spybot();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_bartleby";
+    //pNewScript->GetAI = &GetAI_npc_bartleby;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_bartleby;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_dashel_stonefist";
+    //pNewScript->GetAI = &GetAI_npc_dashel_stonefist;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_dashel_stonefist;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_lady_katrana_prestor";
+    //pNewScript->pGossipHello = &GossipHello_npc_lady_katrana_prestor;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_lady_katrana_prestor;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_squire_rowe";
+    //pNewScript->GetAI = &GetAI_npc_squire_rowe;
+    //pNewScript->pGossipHello = &GossipHello_npc_squire_rowe;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_squire_rowe;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_reginald_windsor";
+    //pNewScript->GetAI = &GetAI_npc_reginald_windsor;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_reginald_windsor;
+    //pNewScript->pGossipHello = &GossipHello_npc_reginald_windsor;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_reginald_windsor;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/stranglethorn_vale.cpp b/src/modules/SD3/scripts/eastern_kingdoms/stranglethorn_vale.cpp
new file mode 100644
index 000000000..89a455b22
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/stranglethorn_vale.cpp
@@ -0,0 +1,146 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Stranglethorn_Vale
+ * SD%Complete: 100
+ * SDComment:   Quest support: 592.
+ * SDCategory:  Stranglethorn Vale
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * mob_yenniku
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+/*######
+## mob_yenniku
+######*/
+
+enum
+{
+    SPELL_YENNIKUS_RELEASE      = 3607,
+
+    QUEST_ID_SAVING_YENNIKU     = 592,
+
+    FACTION_ID_HORDE_GENERIC    = 83,                       // Note: faction may not be correct!
+};
+
+struct mob_yenniku : public CreatureScript
+{
+    mob_yenniku() : CreatureScript("mob_yenniku") {}
+
+    struct mob_yennikuAI : public ScriptedAI
+    {
+        mob_yennikuAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiResetTimer;
+
+        void Reset() override { m_uiResetTimer = 0; }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_YENNIKUS_RELEASE && pCaster->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (!m_uiResetTimer && ((Player*)pCaster)->GetQuestStatus(QUEST_ID_SAVING_YENNIKU) == QUEST_STATUS_INCOMPLETE)
+                {
+                    m_uiResetTimer = 60000;
+                    EnterEvadeMode();
+                }
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (m_uiResetTimer)
+            {
+                m_creature->RemoveAllAurasOnEvade();
+                m_creature->DeleteThreatList();
+                m_creature->CombatStop(true);
+                m_creature->LoadCreatureAddon(true);
+
+                m_creature->SetLootRecipient(NULL);
+
+                m_creature->HandleEmote(EMOTE_STATE_STUN);
+                m_creature->SetFactionTemporary(FACTION_ID_HORDE_GENERIC, TEMPFACTION_RESTORE_REACH_HOME);
+            }
+            else
+            {
+                ScriptedAI::EnterEvadeMode();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiResetTimer)
+            {
+                if (m_uiResetTimer <= uiDiff)
+                {
+                    m_creature->HandleEmote(EMOTE_STATE_NONE);
+                    m_uiResetTimer = 0;
+                    EnterEvadeMode();
+                }
+                else
+                {
+                    m_uiResetTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* _Creature) override
+    {
+        return new mob_yennikuAI(_Creature);
+    }
+};
+
+/*######
+##
+######*/
+
+void AddSC_stranglethorn_vale()
+{
+    Script* s;
+    s = new mob_yenniku();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_yenniku";
+    //pNewScript->GetAI = &GetAI_mob_yenniku;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp
new file mode 100644
index 000000000..07e1ca30e
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp
@@ -0,0 +1,218 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Baroness_Anastari
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Stratholme
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_BANSHEE_WAIL      = 16565,
+    SPELL_BANSHEE_CURSE     = 16867,
+    SPELL_SILENCE           = 18327,
+    SPELL_POSSESS           = 17244,
+    SPELL_POSSESSED         = 17246,
+    SPELL_POSSESS_INV       = 17250,        // baroness becomes invisible while possessing a target
+};
+
+struct boss_baroness_anastari : public CreatureScript
+{
+    boss_baroness_anastari() : CreatureScript("boss_baroness_anastari") {}
+
+    struct boss_baroness_anastariAI : public ScriptedAI
+    {
+        boss_baroness_anastariAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiBansheeWailTimer;
+        uint32 m_uiBansheeCurseTimer;
+        uint32 m_uiSilenceTimer;
+        uint32 m_uiPossessTimer;
+        uint32 m_uiPossessEndTimer;
+
+        ObjectGuid m_possessedPlayer;
+
+        void Reset() override
+        {
+            m_uiBansheeWailTimer = 0;
+            m_uiBansheeCurseTimer = 10000;
+            m_uiSilenceTimer = 25000;
+            m_uiPossessTimer = 15000;
+            m_uiPossessEndTimer = 0;
+        }
+
+        void EnterEvadeMode() override
+        {
+            // If it's invisible don't evade
+            if (m_uiPossessEndTimer)
+            {
+                return;
+            }
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiPossessEndTimer)
+            {
+                // Check if the possessed player has been damaged
+                if (m_uiPossessEndTimer <= uiDiff)
+                {
+                    // If aura has expired, return to fight
+                    if (!m_creature->HasAura(SPELL_POSSESS_INV))
+                    {
+                        m_uiPossessEndTimer = 0;
+                        return;
+                    }
+
+                    // Check for possessed player
+                    Player* pPlayer = m_creature->GetMap()->GetPlayer(m_possessedPlayer);
+                    if (!pPlayer || !pPlayer->IsAlive())
+                    {
+                        m_creature->RemoveAurasDueToSpell(SPELL_POSSESS_INV);
+                        m_uiPossessEndTimer = 0;
+                        return;
+                    }
+
+                    // If possessed player has less than 50% health
+                    if (pPlayer->GetHealth() <= pPlayer->GetMaxHealth() * .5f)
+                    {
+                        m_creature->RemoveAurasDueToSpell(SPELL_POSSESS_INV);
+                        pPlayer->RemoveAurasDueToSpell(SPELL_POSSESSED);
+                        pPlayer->RemoveAurasDueToSpell(SPELL_POSSESS);
+                        m_uiPossessEndTimer = 0;
+                        return;
+                    }
+
+                    m_uiPossessEndTimer = 1000;
+                }
+                else
+                {
+                    m_uiPossessEndTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // BansheeWail
+            if (m_uiBansheeWailTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_BANSHEE_WAIL) == CAST_OK)
+                    {
+                        m_uiBansheeWailTimer = urand(2000, 3000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiBansheeWailTimer -= uiDiff;
+            }
+
+            // BansheeCurse
+            if (m_uiBansheeCurseTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BANSHEE_CURSE) == CAST_OK)
+                {
+                    m_uiBansheeCurseTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiBansheeCurseTimer -= uiDiff;
+            }
+
+            // Silence
+            if (m_uiSilenceTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SILENCE) == CAST_OK)
+                    {
+                        m_uiSilenceTimer = 25000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiSilenceTimer -= uiDiff;
+            }
+
+            // Possess
+            if (m_uiPossessTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_POSSESS, SELECT_FLAG_PLAYER))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_POSSESS) == CAST_OK)
+                    {
+                        DoCastSpellIfCan(pTarget, SPELL_POSSESSED, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_POSSESS_INV, CAST_TRIGGERED);
+
+                        m_possessedPlayer = pTarget->GetObjectGuid();
+                        m_uiPossessEndTimer = 1000;
+                        m_uiPossessTimer = 30000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiPossessTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_baroness_anastariAI(pCreature);
+    }
+};
+
+void AddSC_boss_baroness_anastari()
+{
+    Script *s;
+    s = new boss_baroness_anastari();
+    s->RegisterSelf();
+
+    //Script* pNewScript;
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_baroness_anastari";
+    //pNewScript->GetAI = &GetAI_boss_baroness_anastari;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp
new file mode 100644
index 000000000..11893266e
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp
@@ -0,0 +1,158 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      boss_cannon_master_willey
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Stratholme
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_KNOCK_AWAY        = 10101,
+    SPELL_PUMMEL            = 15615,
+    SPELL_SHOOT             = 16496,
+    SPELL_SUMMON_RIFLEMAN   = 17279,        // spell needs script target
+};
+
+struct boss_cannon_master_willey : public CreatureScript
+{
+    boss_cannon_master_willey() : CreatureScript("boss_cannon_master_willey") {}
+
+    struct boss_cannon_master_willeyAI : public ScriptedAI
+    {
+        boss_cannon_master_willeyAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiKnockAwayTimer;
+        uint32 m_uiPummelTimer;
+        uint32 m_uiShootTimer;
+        uint32 m_uiSummonRiflemanTimer;
+
+        void Reset() override
+        {
+            m_uiShootTimer = 1000;
+            m_uiPummelTimer = 7000;
+            m_uiKnockAwayTimer = 11000;
+            m_uiSummonRiflemanTimer = 15000;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (m_creature->getVictim())
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Pummel
+            if (m_uiPummelTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_PUMMEL) == CAST_OK)
+                {
+                    m_uiPummelTimer = 12000;
+                }
+            }
+            else
+            {
+                m_uiPummelTimer -= uiDiff;
+            }
+
+            // KnockAway
+            if (m_uiKnockAwayTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_KNOCK_AWAY) == CAST_OK)
+                {
+                    m_uiKnockAwayTimer = 14000;
+                }
+            }
+            else
+            {
+                m_uiKnockAwayTimer -= uiDiff;
+            }
+
+            // Shoot
+            if (m_uiShootTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_SHOOT, SELECT_FLAG_NOT_IN_MELEE_RANGE))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SHOOT) == CAST_OK)
+                    {
+                        m_uiShootTimer = urand(3000, 4000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiShootTimer -= uiDiff;
+            }
+
+            // SummonRifleman
+            if (m_uiSummonRiflemanTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_RIFLEMAN) == CAST_OK)
+                {
+                    m_uiSummonRiflemanTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiSummonRiflemanTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_cannon_master_willeyAI(pCreature);
+    }
+};
+
+void AddSC_boss_cannon_master_willey()
+{
+    Script *s;
+    s = new boss_cannon_master_willey();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_cannon_master_willey";
+    //pNewScript->GetAI = &GetAI_boss_cannon_master_willey;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp
new file mode 100644
index 000000000..394400a8a
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp
@@ -0,0 +1,264 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Dathrohan_Balnazzar
+ * SD%Complete: 95
+ * SDComment:   Possibly need to fix/improve summons after death
+ * SDCategory:  Stratholme
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    SAY_AGGRO                       = -1329016,
+    SAY_TRANSFORM                   = -1329017,
+    SAY_DEATH                       = -1329018,
+
+    // Dathrohan spells
+    SPELL_CRUSADERSHAMMER           = 17286,                // AOE stun
+    SPELL_CRUSADERSTRIKE            = 17281,
+    SPELL_HOLYSTRIKE                = 17284,                // weapon dmg +3
+
+    // Transform
+    SPELL_BALNAZZARTRANSFORM        = 17288,                // restore full HP/mana, trigger spell Balnazzar Transform Stun
+
+    // Balnazzar spells
+    SPELL_SHADOWSHOCK               = 17399,
+    SPELL_MINDBLAST                 = 17287,
+    SPELL_PSYCHICSCREAM             = 13704,
+    SPELL_SLEEP                     = 12098,
+    SPELL_MINDCONTROL               = 15690,
+
+    NPC_DATHROHAN                   = 10812,
+    NPC_BALNAZZAR                   = 10813,
+    NPC_SKELETAL_GUARDIAN           = 10390,
+    NPC_SKELETAL_BERSERKER          = 10391
+};
+
+struct SummonDef
+{
+    uint32 m_uiEntry;
+    float m_fX, m_fY, m_fZ, m_fOrient;
+};
+
+SummonDef m_aSummonPoint[] =
+{
+    {NPC_SKELETAL_BERSERKER, 3460.356f, -3070.572f, 135.086f, 0.332f},
+    {NPC_SKELETAL_BERSERKER, 3465.289f, -3069.987f, 135.086f, 5.480f},
+    {NPC_SKELETAL_BERSERKER, 3463.616f, -3074.912f, 135.086f, 5.009f},
+
+    {NPC_SKELETAL_GUARDIAN, 3460.012f, -3076.041f, 135.086f, 1.187f},
+    {NPC_SKELETAL_GUARDIAN, 3467.909f, -3076.401f, 135.086f, 3.770f},
+
+    {NPC_SKELETAL_BERSERKER, 3509.269f, -3066.474f, 135.080f, 4.817f},
+    {NPC_SKELETAL_BERSERKER, 3510.966f, -3069.011f, 135.080f, 3.491f},
+
+    {NPC_SKELETAL_GUARDIAN, 3516.042f, -3066.873f, 135.080f, 3.997f},
+    {NPC_SKELETAL_GUARDIAN, 3513.561f, -3063.027f, 135.080f, 2.356f},
+    {NPC_SKELETAL_GUARDIAN, 3518.825f, -3060.926f, 135.080f, 3.944f}
+};
+
+struct boss_dathrohan_balnazzar : public CreatureScript
+{
+    boss_dathrohan_balnazzar() : CreatureScript("boss_dathrohan_balnazzar") {}
+
+    struct boss_dathrohan_balnazzarAI : public ScriptedAI
+    {
+        boss_dathrohan_balnazzarAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiCrusadersHammer_Timer;
+        uint32 m_uiCrusaderStrike_Timer;
+        uint32 m_uiMindBlast_Timer;
+        uint32 m_uiHolyStrike_Timer;
+        uint32 m_uiShadowShock_Timer;
+        uint32 m_uiPsychicScream_Timer;
+        uint32 m_uiDeepSleep_Timer;
+        uint32 m_uiMindControl_Timer;
+        bool m_bTransformed;
+
+        void Reset() override
+        {
+            m_uiCrusadersHammer_Timer = 8000;
+            m_uiCrusaderStrike_Timer = 12000;
+            m_uiMindBlast_Timer = 6000;
+            m_uiHolyStrike_Timer = 18000;
+            m_uiShadowShock_Timer = 4000;
+            m_uiPsychicScream_Timer = 16000;
+            m_uiDeepSleep_Timer = 20000;
+            m_uiMindControl_Timer = 10000;
+            m_bTransformed = false;
+
+            if (m_creature->GetEntry() == NPC_BALNAZZAR)
+            {
+                m_creature->UpdateEntry(NPC_DATHROHAN);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustDied(Unit* /*Victim*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            for (uint32 i = 0; i < countof(m_aSummonPoint); ++i)
+                m_creature->SummonCreature(m_aSummonPoint[i].m_uiEntry,
+                m_aSummonPoint[i].m_fX, m_aSummonPoint[i].m_fY, m_aSummonPoint[i].m_fZ, m_aSummonPoint[i].m_fOrient,
+                TEMPSUMMON_TIMED_DESPAWN, HOUR * IN_MILLISECONDS);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // START NOT TRANSFORMED
+            if (!m_bTransformed)
+            {
+                // MindBlast
+                if (m_uiMindBlast_Timer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_MINDBLAST);
+                    m_uiMindBlast_Timer = urand(15000, 20000);
+                }
+                else { m_uiMindBlast_Timer -= uiDiff; }
+
+                // CrusadersHammer
+                if (m_uiCrusadersHammer_Timer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_CRUSADERSHAMMER);
+                    m_uiCrusadersHammer_Timer = 12000;
+                }
+                else { m_uiCrusadersHammer_Timer -= uiDiff; }
+
+                // CrusaderStrike
+                if (m_uiCrusaderStrike_Timer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_CRUSADERSTRIKE);
+                    m_uiCrusaderStrike_Timer = 15000;
+                }
+                else { m_uiCrusaderStrike_Timer -= uiDiff; }
+
+                // HolyStrike
+                if (m_uiHolyStrike_Timer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_HOLYSTRIKE);
+                    m_uiHolyStrike_Timer = 15000;
+                }
+                else { m_uiHolyStrike_Timer -= uiDiff; }
+
+                // BalnazzarTransform
+                if (m_creature->GetHealthPercent() < 40.0f)
+                {
+                    // restore hp, mana and stun
+                    if (DoCastSpellIfCan(m_creature, SPELL_BALNAZZARTRANSFORM) == CAST_OK)
+                    {
+                        m_creature->UpdateEntry(NPC_BALNAZZAR);
+                        DoScriptText(SAY_TRANSFORM, m_creature);
+                        m_bTransformed = true;
+                    }
+                }
+            }
+            else
+            {
+                // MindBlast
+                if (m_uiMindBlast_Timer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_MINDBLAST);
+                    m_uiMindBlast_Timer = urand(15000, 20000);
+                }
+                else { m_uiMindBlast_Timer -= uiDiff; }
+
+                // ShadowShock
+                if (m_uiShadowShock_Timer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHADOWSHOCK);
+                    m_uiShadowShock_Timer = 11000;
+                }
+                else { m_uiShadowShock_Timer -= uiDiff; }
+
+                // PsychicScream
+                if (m_uiPsychicScream_Timer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        DoCastSpellIfCan(pTarget, SPELL_PSYCHICSCREAM);
+                    }
+
+                    m_uiPsychicScream_Timer = 20000;
+                }
+                else { m_uiPsychicScream_Timer -= uiDiff; }
+
+                // DeepSleep
+                if (m_uiDeepSleep_Timer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        DoCastSpellIfCan(pTarget, SPELL_SLEEP);
+                    }
+
+                    m_uiDeepSleep_Timer = 15000;
+                }
+                else { m_uiDeepSleep_Timer -= uiDiff; }
+
+                // MindControl
+                if (m_uiMindControl_Timer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_MINDCONTROL);
+                    m_uiMindControl_Timer = 15000;
+                }
+                else { m_uiMindControl_Timer -= uiDiff; }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_dathrohan_balnazzarAI(pCreature);
+    }
+};
+
+void AddSC_boss_dathrohan_balnazzar()
+{
+    CreatureScript *s;
+    s = new boss_dathrohan_balnazzar();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_dathrohan_balnazzar";
+    //pNewScript->GetAI = &GetAI_boss_dathrohan_balnazzar;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp
new file mode 100644
index 000000000..1edec0d2e
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp
@@ -0,0 +1,160 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Maleki_the_Pallid
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Stratholme
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_FROSTBOLT     = 17503,
+    SPELL_DRAIN_LIFE    = 17238,
+    SPELL_DRAIN_MANA    = 17243,
+    SPELL_ICE_TOMB      = 16869
+};
+
+struct boss_maleki_the_pallid : public CreatureScript
+{
+    boss_maleki_the_pallid() : CreatureScript("boss_maleki_the_pallid") {}
+
+    struct boss_maleki_the_pallidAI : public ScriptedAI
+    {
+        boss_maleki_the_pallidAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiDrainManaTimer;
+        uint32 m_uiFrostboltTimer;
+        uint32 m_uiIceTombTimer;
+        uint32 m_uiDrainLifeTimer;
+
+        void Reset() override
+        {
+            m_uiDrainManaTimer = 30000;
+            m_uiFrostboltTimer = 0;
+            m_uiIceTombTimer = 15000;
+            m_uiDrainLifeTimer = 20000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Frostbolt
+            if (m_uiFrostboltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_FROSTBOLT) == CAST_OK)
+                    {
+                        m_uiFrostboltTimer = urand(3000, 4000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiFrostboltTimer -= uiDiff;
+            }
+
+            // IceTomb
+            if (m_uiIceTombTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_ICE_TOMB) == CAST_OK)
+                    {
+                        m_uiIceTombTimer = urand(15000, 20000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiIceTombTimer -= uiDiff;
+            }
+
+            // Drain Life
+            if (m_uiDrainLifeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_DRAIN_LIFE) == CAST_OK)
+                    {
+                        m_uiDrainLifeTimer = urand(15000, 20000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiDrainLifeTimer -= uiDiff;
+            }
+
+            // Drain mana
+            if (m_uiDrainManaTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_DRAIN_MANA, SELECT_FLAG_POWER_MANA))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_DRAIN_MANA) == CAST_OK)
+                    {
+                        m_uiDrainManaTimer = urand(20000, 30000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiDrainManaTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_maleki_the_pallidAI(pCreature);
+    }
+};
+
+void AddSC_boss_maleki_the_pallid()
+{
+    Script *s;
+    s = new boss_maleki_the_pallid();
+    s->RegisterSelf();
+
+    //Script* pNewScript;
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_maleki_the_pallid";
+    //pNewScript->GetAI = &GetAI_boss_maleki_the_pallid;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp
new file mode 100644
index 000000000..af01730da
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp
@@ -0,0 +1,209 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Silver_Hand_Bosses
+SD%Complete: 80
+SDComment: Timers; Not sure if we need to respawn dead npcs on evade; May need additional adjustments / research
+SDCategory: Stratholme
+EndScriptData */
+
+#include "precompiled.h"
+#include "stratholme.h"
+
+/*#####
+# Additional:
+# Although this is a working solution, the correct would be in addition to check if Aurius is dead.
+# Once player extinguish the eternal flame (cast spell 31497->start event 11206) Aurius should become hostile.
+# Once Aurius is defeated, he should be the one summoning the ghosts.
+#####*/
+
+enum
+{
+    // Gregor
+    SPELL_HAMMER_JUSTICE        = 13005,
+    SPELL_HAMMER_WRATH          = 32772,
+    SPELL_HOLY_SHOCK            = 32771,
+    // Cathela
+    SPELL_HOLY_SHIELD           = 32777,
+    SPELL_REDOUBT               = 32776,
+    // Aelmar
+    SPELL_JUDGEMENT             = 32778,
+    // Vicar
+    SPELL_BLESSING              = 32770,
+    SPELL_HOLY_LIGHT            = 32769,
+
+    TARGET_TYPE_RANDOM          = 0,
+    TARGET_TYPE_VICTIM          = 1,
+    TARGET_TYPE_SELF            = 2,
+    TARGET_TYPE_FRIENDLY        = 3,
+};
+
+struct SilverHandAbilityStruct
+{
+    uint32 m_uiCreatureEntry, m_uiSpellId;
+    uint8 m_uiTargetType;
+    uint32 m_uiInitialTimer, m_uiCooldown;
+};
+
+static SilverHandAbilityStruct m_aSilverHandAbility[8] =
+{
+    {NPC_GREGOR_THE_JUSTICIAR,  SPELL_HAMMER_JUSTICE,   TARGET_TYPE_RANDOM,     2000,  15000},
+    {NPC_GREGOR_THE_JUSTICIAR,  SPELL_HAMMER_WRATH,     TARGET_TYPE_RANDOM,     10000, 15000},
+    {NPC_GREGOR_THE_JUSTICIAR,  SPELL_HOLY_SHOCK,       TARGET_TYPE_RANDOM,     4000,  7000},
+    {NPC_CATHELA_THE_SEEKER,    SPELL_HOLY_SHIELD,      TARGET_TYPE_SELF,       1000,  60000},
+    {NPC_CATHELA_THE_SEEKER,    SPELL_REDOUBT,          TARGET_TYPE_SELF,       5000,  15000},
+    {NPC_AELMAR_THE_VANQUISHER, SPELL_JUDGEMENT,        TARGET_TYPE_VICTIM,     4000,  9000},
+    {NPC_VICAR_HYERONIMUS,      SPELL_BLESSING,         TARGET_TYPE_FRIENDLY,   2000,  13000},
+    {NPC_VICAR_HYERONIMUS,      SPELL_HOLY_LIGHT,       TARGET_TYPE_FRIENDLY,   5000,  9000},
+};
+struct boss_silver_hand_bosses : public CreatureScript
+{
+    boss_silver_hand_bosses() : CreatureScript("boss_silver_hand_bosses") {}
+
+    struct boss_silver_hand_bossesAI : public ScriptedAI
+    {
+        boss_silver_hand_bossesAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            for (uint8 i = 0; i < countof(m_aSilverHandAbility); ++i)
+            {
+                if (m_aSilverHandAbility[i].m_uiCreatureEntry == m_creature->GetEntry())
+                {
+                    m_mSpellTimers[i] = m_aSilverHandAbility[i].m_uiInitialTimer;
+                }
+            }
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        UNORDERED_MAP<uint8, uint32> m_mSpellTimers;
+
+        void Reset() override
+        {
+            for (UNORDERED_MAP<uint8, uint32>::iterator itr = m_mSpellTimers.begin(); itr != m_mSpellTimers.end(); ++itr)
+            {
+                itr->second = m_aSilverHandAbility[itr->first].m_uiInitialTimer;
+            }
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            if (m_pInstance)
+            {
+                // Set data to special when each paladin dies
+                m_pInstance->SetData(TYPE_TRUE_MASTERS, SPECIAL);
+
+                // For the last one which dies, give the quest credit
+                if (m_pInstance->GetData(TYPE_TRUE_MASTERS) == DONE)
+                {
+                    if (pKiller->GetTypeId() == TYPEID_PLAYER)
+                    {
+                        if (Creature* pCredit = m_pInstance->GetSingleCreatureFromStorage(NPC_PALADIN_QUEST_CREDIT))
+                        {
+                            ((Player*)pKiller)->KilledMonsterCredit(NPC_PALADIN_QUEST_CREDIT, pCredit->GetObjectGuid());
+                        }
+                    }
+                }
+            }
+        }
+
+        bool CanUseSpecialAbility(uint32 uiIndex)
+        {
+            Unit* pTarget = NULL;
+
+            switch (m_aSilverHandAbility[uiIndex].m_uiTargetType)
+            {
+            case TARGET_TYPE_SELF:
+                pTarget = m_creature;
+                break;
+            case TARGET_TYPE_VICTIM:
+                pTarget = m_creature->getVictim();
+                break;
+            case TARGET_TYPE_RANDOM:
+                pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, m_aSilverHandAbility[uiIndex].m_uiSpellId, SELECT_FLAG_IN_LOS);
+                break;
+            case TARGET_TYPE_FRIENDLY:
+                pTarget = DoSelectLowestHpFriendly(10.0f);
+                break;
+            }
+
+            if (pTarget)
+            {
+                if (DoCastSpellIfCan(pTarget, m_aSilverHandAbility[uiIndex].m_uiSpellId) == CAST_OK)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            for (UNORDERED_MAP<uint8, uint32>::iterator itr = m_mSpellTimers.begin(); itr != m_mSpellTimers.end(); ++itr)
+            {
+                if (itr->second < uiDiff)
+                {
+                    if (CanUseSpecialAbility(itr->first))
+                    {
+                        itr->second = m_aSilverHandAbility[itr->first].m_uiCooldown;
+                        break;
+                    }
+                }
+                else
+                {
+                    itr->second -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_silver_hand_bossesAI(pCreature);
+    }
+};
+
+void AddSC_boss_order_of_silver_hand()
+{
+    Script* s;
+    s = new boss_silver_hand_bosses();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_silver_hand_bosses";
+    //pNewScript->GetAI = &GetAI_boss_silver_hand_bossesAI;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
new file mode 100644
index 000000000..b5c1935cc
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
@@ -0,0 +1,1046 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Stratholme
+ * SD%Complete: 70
+ * SDComment:   Undead side 90% implemented, event needs better implementation, Barthildas relocation for reload case is missing, Baron Combat handling is buggy.
+ * SDCategory:  Stratholme
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "stratholme.h"
+
+struct EventLocation
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+static const EventLocation aStratholmeLocation[] =
+{
+    { 3725.577f, -3599.484f, 142.367f, 0.0f },                // Barthilas door run
+    { 4068.284f, -3535.678f, 122.771f, 2.50f },               // Barthilas tele
+    { 4032.643f, -3378.546f, 119.752f, 4.74f },               // Ramstein summon loc
+    { 4032.843f, -3390.246f, 119.732f, 0.0f },                // Ramstein move loc
+    { 3969.357f, -3391.871f, 119.116f, 5.91f },               // Skeletons summon loc
+    { 4033.044f, -3431.031f, 119.055f, 0.0f },                // Skeletons move loc
+    { 4032.602f, -3378.506f, 119.752f, 4.74f },               // Guards summon loc
+    { 4042.575f, -3337.929f, 115.059f, 0.0f },                // Ysida move loc
+    { 3713.681f, -3427.814f, 131.198f, 6.2f }                 // The Unforgiven spawn area
+};
+
+static const EventLocation aTimmyLocation[] =
+{
+    { 3696.851f, -3152.736f, 127.661f, 4.024f },              // Timmy spawn loc
+    { 3668.603f, -3183.314f, 126.215f, 0.0f }                 // Courtyard mobs sort point
+};
+
+struct ZigguratStore
+{
+    ObjectGuid m_doorGuid;
+    ObjectGuid m_crystalGuid;
+    GuidList m_lZigguratAcolyteGuid;
+};
+
+static bool sortByHeight(Creature* pFirst, Creature* pSecond)
+{
+    return pFirst && pSecond && pFirst->GetPositionZ() > pSecond->GetPositionZ();
+}
+
+struct is_stratholme : public InstanceScript
+{
+    is_stratholme() : InstanceScript("instance_stratholme") {}
+
+    class instance_stratholme : public ScriptedInstance
+    {
+    public:
+        instance_stratholme(Map* pMap) : ScriptedInstance(pMap),
+            m_uiBaronRunTimer(0),
+            m_uiBarthilasRunTimer(0),
+            m_uiMindlessSummonTimer(0),
+            m_uiSlaugtherSquareTimer(0),
+            m_uiYellCounter(0),
+            m_uiMindlessCount(0),
+            m_uiPostboxesUsed(0),
+            m_uiSilverHandKilled(0),
+            m_bTheUnforgivenSpawnHasTriggered(0)
+        {
+            Initialize();
+        }
+
+        ~instance_stratholme() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_BARON:
+            case NPC_YSIDA_TRIGGER:
+            case NPC_BARTHILAS:
+            case NPC_PALADIN_QUEST_CREDIT:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+
+            case NPC_CRYSTAL:
+                m_luiCrystalGUIDs.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_ABOM_BILE:
+            case NPC_ABOM_VENOM:
+                m_sAbomnationGUID.insert(pCreature->GetObjectGuid());
+                break;
+            case NPC_THUZADIN_ACOLYTE:
+                m_luiAcolyteGUIDs.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_CRIMSON_INITIATE:
+            case NPC_CRIMSON_GALLANT:
+            case NPC_CRIMSON_GUARDSMAN:
+            case NPC_CRIMSON_CONJURER:
+                // Only store those in the yard
+                if (pCreature->IsWithinDist2d(aTimmyLocation[1].m_fX, aTimmyLocation[1].m_fY, 40.0f))
+                {
+                    m_suiCrimsonLowGuids.insert(pCreature->GetGUIDLow());
+                }
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_SERVICE_ENTRANCE:
+                break;
+            case GO_GAUNTLET_GATE1:
+                // TODO
+                // weird, but unless flag is set, client will not respond as expected. DB bug?
+                pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED);
+                break;
+
+            case GO_ZIGGURAT_DOOR_1:
+                m_zigguratStorage[0].m_doorGuid = pGo->GetObjectGuid();
+                if (m_auiEncounter[TYPE_BARONESS] == DONE || m_auiEncounter[TYPE_BARONESS] == SPECIAL)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                return;
+            case GO_ZIGGURAT_DOOR_2:
+                m_zigguratStorage[1].m_doorGuid = pGo->GetObjectGuid();
+                if (m_auiEncounter[TYPE_NERUB] == DONE || m_auiEncounter[TYPE_NERUB] == SPECIAL)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                return;
+            case GO_ZIGGURAT_DOOR_3:
+                m_zigguratStorage[2].m_doorGuid = pGo->GetObjectGuid();
+                if (m_auiEncounter[TYPE_PALLID] == DONE || m_auiEncounter[TYPE_PALLID] == SPECIAL)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                return;
+
+            case GO_ZIGGURAT_DOOR_4:
+                if (m_auiEncounter[TYPE_RAMSTEIN] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_ZIGGURAT_DOOR_5:
+                if (m_auiEncounter[TYPE_RAMSTEIN] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_PORT_GAUNTLET:
+                if (m_auiEncounter[TYPE_BARONESS] == SPECIAL && m_auiEncounter[TYPE_NERUB] == SPECIAL && m_auiEncounter[TYPE_PALLID] == SPECIAL)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_PORT_SLAUGTHER:
+                if (m_auiEncounter[TYPE_BARONESS] == SPECIAL && m_auiEncounter[TYPE_NERUB] == SPECIAL && m_auiEncounter[TYPE_PALLID] == SPECIAL)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_PORT_SLAUGHTER_GATE:
+                if (m_auiEncounter[TYPE_RAMSTEIN] == DONE)      // Might actually be uneeded
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_PORT_ELDERS:
+            case GO_YSIDA_CAGE:
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            // TODO: Remove the hard-coded indexes from array accessing
+            switch (uiType)
+            {
+            case TYPE_BARON_RUN:
+                switch (uiData)
+                {
+                case IN_PROGRESS:
+                    if (m_auiEncounter[uiType] == IN_PROGRESS || m_auiEncounter[uiType] == FAIL)
+                    {
+                        break;
+                    }
+
+                    DoOrSimulateScriptTextForThisInstance(SAY_ANNOUNCE_RUN_START, NPC_BARON);
+
+                    m_uiBaronRunTimer = 45 * MINUTE * IN_MILLISECONDS;
+                    debug_log("SD3: Instance Stratholme: Baron run in progress.");
+                    break;
+                case FAIL:
+                    // may add code to remove aura from players, but in theory the time should be up already and removed.
+                    break;
+                case DONE:
+                    m_uiBaronRunTimer = 0;
+                    break;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_BARONESS:
+            case TYPE_NERUB:
+            case TYPE_PALLID:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoSortZiggurats();
+                    DoUseDoorOrButton(m_zigguratStorage[uiType - TYPE_BARONESS].m_doorGuid);
+                }
+                if (uiData == SPECIAL)
+                {
+                    StartSlaugtherSquare();
+                }
+                break;
+            case TYPE_RAMSTEIN:
+                if (uiData == SPECIAL)
+                {
+                    if (m_auiEncounter[uiType] != SPECIAL && m_auiEncounter[uiType] != DONE)
+                    {
+                        m_uiSlaugtherSquareTimer = 20000;       // TODO - unknown, also possible that this is not the very correct place..
+                        DoUseDoorOrButton(GO_PORT_GAUNTLET);
+                    }
+
+                    uint32 uiCount = m_sAbomnationGUID.size();
+                    for (GuidSet::iterator itr = m_sAbomnationGUID.begin(); itr != m_sAbomnationGUID.end();)
+                    {
+                        if (Creature* pAbom = instance->GetCreature(*itr))
+                        {
+                            ++itr;
+                            if (!pAbom->IsAlive())
+                            {
+                                --uiCount;
+                            }
+                        }
+                        else
+                        {
+                            // Remove obsolete guid from set and decrement count
+                            m_sAbomnationGUID.erase(itr++);
+                            --uiCount;
+                        }
+                    }
+
+                    if (!uiCount)
+                    {
+                        // Old Comment: a bit itchy, it should close GO_ZIGGURAT_DOOR_4 door after 10 secs, but it doesn't. skipping it for now.
+                        // However looks like that this door is no more closed
+                        DoUseDoorOrButton(GO_ZIGGURAT_DOOR_4);
+
+                        // No more handling of Abominations
+                        m_uiSlaugtherSquareTimer = 0;
+
+                        if (Creature* pBaron = GetSingleCreatureFromStorage(NPC_BARON))
+                        {
+                            DoScriptText(SAY_ANNOUNCE_RAMSTEIN, pBaron);
+                            if (Creature* pRamstein = pBaron->SummonCreature(NPC_RAMSTEIN, aStratholmeLocation[2].m_fX, aStratholmeLocation[2].m_fY, aStratholmeLocation[2].m_fZ, aStratholmeLocation[2].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0))
+                            {
+                                pRamstein->GetMotionMaster()->MovePoint(0, aStratholmeLocation[3].m_fX, aStratholmeLocation[3].m_fY, aStratholmeLocation[3].m_fZ);
+                            }
+
+                            debug_log("SD3: Instance Stratholme - Slaughter event: Ramstein spawned.");
+                        }
+                    }
+                    else
+                    {
+                        debug_log("SD3: Instance Stratholme - Slaughter event: %u Abomination left to kill.", uiCount);
+                    }
+                }
+                // After fail aggroing Ramstein means wipe on Ramstein, so close door again
+                if (uiData == IN_PROGRESS && m_auiEncounter[uiType] == FAIL)
+                {
+                    DoUseDoorOrButton(GO_PORT_GAUNTLET);
+                }
+                if (uiData == DONE)
+                {
+                    // Open side gate and start summoning skeletons
+                    DoUseDoorOrButton(GO_PORT_SLAUGHTER_GATE);
+                    // use this timer as a bool just to start summoning
+                    m_uiMindlessSummonTimer = 500;
+                    m_uiMindlessCount = 0;
+                    m_luiUndeadGUIDs.clear();
+
+                    // Summon 5 guards
+                    if (Creature* pBaron = GetSingleCreatureFromStorage(NPC_BARON))
+                    {
+                        for (uint8 i = 0; i < 5; ++i)
+                        {
+                            float fX, fY, fZ;
+                            pBaron->GetRandomPoint(aStratholmeLocation[6].m_fX, aStratholmeLocation[6].m_fY, aStratholmeLocation[6].m_fZ, 5.0f, fX, fY, fZ);
+                            if (Creature* pTemp = pBaron->SummonCreature(NPC_BLACK_GUARD, aStratholmeLocation[6].m_fX, aStratholmeLocation[6].m_fY, aStratholmeLocation[6].m_fZ, aStratholmeLocation[6].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0))
+                            {
+                                m_luiGuardGUIDs.push_back(pTemp->GetObjectGuid());
+                            }
+                        }
+
+                        debug_log("SD3: Instance Stratholme - Slaughter event: Summoned 5 guards.");
+                    }
+                }
+                // Open Door again and stop Abomination
+                if (uiData == FAIL && m_auiEncounter[uiType] != FAIL)
+                {
+                    DoUseDoorOrButton(GO_PORT_GAUNTLET);
+                    m_uiSlaugtherSquareTimer = 0;
+
+                    // Let already moving Abominations stop
+                    for (GuidSet::const_iterator itr = m_sAbomnationGUID.begin(); itr != m_sAbomnationGUID.end(); ++itr)
+                    {
+                        Creature* pAbom = instance->GetCreature(*itr);
+                        if (pAbom && pAbom->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE)
+                        {
+                            pAbom->GetMotionMaster()->MovementExpired();
+                        }
+                    }
+                }
+
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_BARON:
+                if (uiData == IN_PROGRESS)
+                {
+                    // Reached the Baron within time-limit
+                    if (m_auiEncounter[TYPE_BARON_RUN] == IN_PROGRESS)
+                    {
+                        SetData(TYPE_BARON_RUN, DONE);
+                    }
+
+                    // Close Slaughterhouse door if needed
+                    if (m_auiEncounter[uiType] == FAIL)
+                    {
+                        DoUseDoorOrButton(GO_PORT_GAUNTLET);
+                    }
+                }
+                if (uiData == DONE)
+                {
+                    if (m_auiEncounter[TYPE_BARON_RUN] == DONE)
+                    {
+                        Map::PlayerList const& players = instance->GetPlayers();
+
+                        for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                        {
+                            if (Player* pPlayer = itr->getSource())
+                            {
+                                if (pPlayer->HasAura(SPELL_BARON_ULTIMATUM))
+                                {
+                                    pPlayer->RemoveAurasDueToSpell(SPELL_BARON_ULTIMATUM);
+                                }
+
+                                if (pPlayer->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE)
+                                {
+                                    pPlayer->AreaExploredOrEventHappens(QUEST_DEAD_MAN_PLEA);
+                                }
+                            }
+                        }
+
+                        // Open cage and finish rescue event
+                        if (Creature* pYsidaT = GetSingleCreatureFromStorage(NPC_YSIDA_TRIGGER))
+                        {
+                            if (Creature* pYsida = pYsidaT->SummonCreature(NPC_YSIDA, pYsidaT->GetPositionX(), pYsidaT->GetPositionY(), pYsidaT->GetPositionZ(), pYsidaT->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 1800000))
+                            {
+                                DoScriptText(SAY_EPILOGUE, pYsida);
+                                pYsida->GetMotionMaster()->MovePoint(0, aStratholmeLocation[7].m_fX, aStratholmeLocation[7].m_fY, aStratholmeLocation[7].m_fZ);
+                            }
+                            DoUseDoorOrButton(GO_YSIDA_CAGE);
+                        }
+                    }
+
+                    // Open Slaughterhouse door again
+                    DoUseDoorOrButton(GO_PORT_GAUNTLET);
+                }
+                if (uiData == FAIL)
+                {
+                    DoUseDoorOrButton(GO_PORT_GAUNTLET);
+                }
+
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_BARTHILAS_RUN:
+                if (uiData == IN_PROGRESS)
+                {
+                    Creature* pBarthilas = GetSingleCreatureFromStorage(NPC_BARTHILAS);
+                    if (pBarthilas && pBarthilas->IsAlive() && !pBarthilas->IsInCombat())
+                    {
+                        DoScriptText(SAY_WARN_BARON, pBarthilas);
+                        pBarthilas->SetWalk(false);
+                        pBarthilas->GetMotionMaster()->MovePoint(0, aStratholmeLocation[0].m_fX, aStratholmeLocation[0].m_fY, aStratholmeLocation[0].m_fZ);
+
+                        m_uiBarthilasRunTimer = 8000;
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_BLACK_GUARDS:
+                // Prevent double action
+                if (m_auiEncounter[uiType] == uiData)
+                {
+                    return;
+                }
+
+                // Restart after failure, close Gauntlet
+                if (uiData == IN_PROGRESS && m_auiEncounter[uiType] == FAIL)
+                {
+                    DoUseDoorOrButton(GO_PORT_GAUNTLET);
+                }
+                // Wipe case - open gauntlet
+                if (uiData == FAIL)
+                {
+                    DoUseDoorOrButton(GO_PORT_GAUNTLET);
+                }
+                if (uiData == DONE)
+                {
+                    if (Creature* pBaron = GetSingleCreatureFromStorage(NPC_BARON))
+                    {
+                        DoScriptText(SAY_UNDEAD_DEFEAT, pBaron);
+                    }
+                    DoUseDoorOrButton(GO_ZIGGURAT_DOOR_5);
+                }
+                m_auiEncounter[uiType] = uiData;
+
+                // No need to save anything here, so return
+                return;
+            case TYPE_POSTMASTER:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                {
+                    ++m_uiPostboxesUsed;
+
+                    // After the second post box prepare to spawn the Post Master
+                    if (m_uiPostboxesUsed == 2)
+                    {
+                        SetData(TYPE_POSTMASTER, SPECIAL);
+                    }
+                }
+                // No need to save anything here, so return
+                return;
+            case TYPE_TRUE_MASTERS:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == SPECIAL)
+                {
+                    ++m_uiSilverHandKilled;
+
+                    // When the 5th paladin is killed set data to DONE in order to give the quest credit for the last paladin
+                    if (m_uiSilverHandKilled == MAX_SILVERHAND)
+                    {
+                        SetData(TYPE_TRUE_MASTERS, DONE);
+                    }
+                }
+                // No need to save anything here, so return
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " " << m_auiEncounter[6];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case TYPE_BARON_RUN:
+            case TYPE_BARONESS:
+            case TYPE_NERUB:
+            case TYPE_PALLID:
+            case TYPE_RAMSTEIN:
+            case TYPE_BARON:
+            case TYPE_BARTHILAS_RUN:
+            case TYPE_POSTMASTER:
+            case TYPE_TRUE_MASTERS:
+                return m_auiEncounter[uiType];
+            default:
+                return 0;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            // Special Treatment for the Ziggurat-Bosses, as otherwise the event couldn't reload
+            if (m_auiEncounter[TYPE_BARONESS] == DONE)
+            {
+                m_auiEncounter[TYPE_BARONESS] = SPECIAL;
+            }
+            if (m_auiEncounter[TYPE_NERUB] == DONE)
+            {
+                m_auiEncounter[TYPE_NERUB] = SPECIAL;
+            }
+            if (m_auiEncounter[TYPE_PALLID] == DONE)
+            {
+                m_auiEncounter[TYPE_PALLID] = SPECIAL;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_BARONESS_ANASTARI:
+                SetData(TYPE_BARONESS, IN_PROGRESS);
+                break;
+            case NPC_MALEKI_THE_PALLID:
+                SetData(TYPE_PALLID, IN_PROGRESS);
+                break;
+            case NPC_NERUBENKAN:
+                SetData(TYPE_NERUB, IN_PROGRESS);
+                break;
+            case NPC_RAMSTEIN:
+                SetData(TYPE_RAMSTEIN, IN_PROGRESS);
+                break;
+                // TODO - uncomment when proper working within core! case NPC_BARON:             SetData(TYPE_BARON, IN_PROGRESS);    break;
+
+            case NPC_ABOM_BILE:
+            case NPC_ABOM_VENOM:
+                // Start Slaughterhouse Event
+                SetData(TYPE_RAMSTEIN, SPECIAL);
+                break;
+
+            case NPC_MINDLESS_UNDEAD:
+            case NPC_BLACK_GUARD:
+                // Aggro in Slaughterhouse after Ramstein
+                SetData(TYPE_BLACK_GUARDS, IN_PROGRESS);
+                break;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_BARONESS_ANASTARI:
+                SetData(TYPE_BARONESS, FAIL);
+                break;
+            case NPC_MALEKI_THE_PALLID:
+                SetData(TYPE_PALLID, FAIL);
+                break;
+            case NPC_NERUBENKAN:
+                SetData(TYPE_NERUB, FAIL);
+                break;
+            case NPC_RAMSTEIN:
+                SetData(TYPE_RAMSTEIN, FAIL);
+                break;
+                // TODO - uncomment when proper working within core! case NPC_BARON:             SetData(TYPE_BARON, FAIL);    break;
+
+            case NPC_ABOM_BILE:
+            case NPC_ABOM_VENOM:
+                // Fail in Slaughterhouse Event before Ramstein
+                SetData(TYPE_RAMSTEIN, FAIL);
+                break;
+            case NPC_MINDLESS_UNDEAD:
+            case NPC_BLACK_GUARD:
+                // Fail in Slaughterhouse after Ramstein
+                SetData(TYPE_BLACK_GUARDS, FAIL);
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_BARONESS_ANASTARI:
+                SetData(TYPE_BARONESS, DONE);
+                break;
+            case NPC_MALEKI_THE_PALLID:
+                SetData(TYPE_PALLID, DONE);
+                break;
+            case NPC_NERUBENKAN:
+                SetData(TYPE_NERUB, DONE);
+                break;
+            case NPC_RAMSTEIN:
+                SetData(TYPE_RAMSTEIN, DONE);
+                break;
+            case NPC_BARON:
+                SetData(TYPE_BARON, DONE);
+                break;
+
+            case NPC_THUZADIN_ACOLYTE:
+                ThazudinAcolyteJustDied(pCreature);
+                break;
+
+            case NPC_ABOM_BILE:
+            case NPC_ABOM_VENOM:
+                // Start Slaughterhouse Event
+                SetData(TYPE_RAMSTEIN, SPECIAL);
+                break;
+
+            case NPC_MINDLESS_UNDEAD:
+                m_luiUndeadGUIDs.remove(pCreature->GetObjectGuid());
+                if (m_luiUndeadGUIDs.empty())
+                {
+                    // Let the black Guards move out of the citadel
+                    for (GuidList::const_iterator itr = m_luiGuardGUIDs.begin(); itr != m_luiGuardGUIDs.end(); ++itr)
+                    {
+                        Creature* pGuard = instance->GetCreature(*itr);
+                        if (pGuard && pGuard->IsAlive() && !pGuard->IsInCombat())
+                        {
+                            float fX, fY, fZ;
+                            pGuard->GetRandomPoint(aStratholmeLocation[5].m_fX, aStratholmeLocation[5].m_fY, aStratholmeLocation[5].m_fZ, 10.0f, fX, fY, fZ);
+                            pGuard->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                        }
+                    }
+                }
+                break;
+            case NPC_BLACK_GUARD:
+                m_luiGuardGUIDs.remove(pCreature->GetObjectGuid());
+                if (m_luiGuardGUIDs.empty())
+                {
+                    SetData(TYPE_BLACK_GUARDS, DONE);
+                }
+
+                break;
+
+                // Timmy spawn support
+            case NPC_CRIMSON_INITIATE:
+            case NPC_CRIMSON_GALLANT:
+            case NPC_CRIMSON_GUARDSMAN:
+            case NPC_CRIMSON_CONJURER:
+                if (m_suiCrimsonLowGuids.find(pCreature->GetGUIDLow()) != m_suiCrimsonLowGuids.end())
+                {
+                    m_suiCrimsonLowGuids.erase(pCreature->GetGUIDLow());
+
+                    // If all courtyard mobs are dead then summon Timmy
+                    if (m_suiCrimsonLowGuids.empty())
+                    {
+                        pCreature->SummonCreature(NPC_TIMMY_THE_CRUEL, aTimmyLocation[0].m_fX, aTimmyLocation[0].m_fY, aTimmyLocation[0].m_fZ, aTimmyLocation[0].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+                    }
+                }
+                break;
+            }
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_uiBarthilasRunTimer)
+            {
+                if (m_uiBarthilasRunTimer <= uiDiff)
+                {
+                    Creature* pBarthilas = GetSingleCreatureFromStorage(NPC_BARTHILAS);
+                    if (pBarthilas && pBarthilas->IsAlive() && !pBarthilas->IsInCombat())
+                    {
+                        pBarthilas->NearTeleportTo(aStratholmeLocation[1].m_fX, aStratholmeLocation[1].m_fY, aStratholmeLocation[1].m_fZ, aStratholmeLocation[1].m_fO);
+                    }
+
+                    SetData(TYPE_BARTHILAS_RUN, DONE);
+                    m_uiBarthilasRunTimer = 0;
+                }
+                else
+                {
+                    m_uiBarthilasRunTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiBaronRunTimer)
+            {
+                if (m_uiYellCounter == 0 && m_uiBaronRunTimer <= 10 * MINUTE * IN_MILLISECONDS)
+                {
+                    DoOrSimulateScriptTextForThisInstance(SAY_ANNOUNCE_RUN_10_MIN, NPC_BARON);
+                    ++m_uiYellCounter;
+                }
+                else if (m_uiYellCounter == 1 && m_uiBaronRunTimer <= 5 * MINUTE * IN_MILLISECONDS)
+                {
+                    DoOrSimulateScriptTextForThisInstance(SAY_ANNOUNCE_RUN_5_MIN, NPC_BARON);
+                    ++m_uiYellCounter;
+                }
+
+                if (m_uiBaronRunTimer <= uiDiff)
+                {
+                    SetData(TYPE_BARON_RUN, FAIL);
+
+                    DoOrSimulateScriptTextForThisInstance(SAY_ANNOUNCE_RUN_FAIL, NPC_BARON);
+
+                    m_uiBaronRunTimer = 0;
+                    debug_log("SD3: Instance Stratholme: Baron run event reached end. Event has state %u.", GetData(TYPE_BARON_RUN));
+                }
+                else
+                {
+                    m_uiBaronRunTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiMindlessSummonTimer)
+            {
+                if (m_uiMindlessCount < 30)
+                {
+                    if (m_uiMindlessSummonTimer <= uiDiff)
+                    {
+                        if (Creature* pBaron = GetSingleCreatureFromStorage(NPC_BARON))
+                        {
+                            // Summon mindless skeletons and move them to random point in the center of the square
+                            if (Creature* pTemp = pBaron->SummonCreature(NPC_MINDLESS_UNDEAD, aStratholmeLocation[4].m_fX, aStratholmeLocation[4].m_fY, aStratholmeLocation[4].m_fZ, aStratholmeLocation[4].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0))
+                            {
+                                float fX, fY, fZ;
+                                pBaron->GetRandomPoint(aStratholmeLocation[5].m_fX, aStratholmeLocation[5].m_fY, aStratholmeLocation[5].m_fZ, 20.0f, fX, fY, fZ);
+                                pTemp->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                                m_luiUndeadGUIDs.push_back(pTemp->GetObjectGuid());
+                                ++m_uiMindlessCount;
+                            }
+                        }
+                        m_uiMindlessSummonTimer = 400;
+                    }
+                    else
+                    {
+                        m_uiMindlessSummonTimer -= uiDiff;
+                    }
+                }
+                else
+                {
+                    m_uiMindlessSummonTimer = 0;
+                }
+            }
+
+            if (m_uiSlaugtherSquareTimer)
+            {
+                if (m_uiSlaugtherSquareTimer <= uiDiff)
+                {
+                    // Call next Abominations
+                    for (GuidSet::const_iterator itr = m_sAbomnationGUID.begin(); itr != m_sAbomnationGUID.end(); ++itr)
+                    {
+                        Creature* pAbom = instance->GetCreature(*itr);
+                        // Skip killed and already walking Abominations
+                        if (!pAbom || !pAbom->IsAlive() || pAbom->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE)
+                        {
+                            continue;
+                        }
+
+                        // Let Move to somewhere in the middle
+                        if (!pAbom->IsInCombat())
+                        {
+                            if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_PORT_SLAUGTHER))
+                            {
+                                float fX, fY, fZ;
+                                pAbom->GetRandomPoint(pDoor->GetPositionX(), pDoor->GetPositionY(), pDoor->GetPositionZ(), 10.0f, fX, fY, fZ);
+                                pAbom->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                            }
+                        }
+                        break;
+                    }
+
+                    // TODO - how fast are they called?
+                    m_uiSlaugtherSquareTimer = urand(15000, 30000);
+                }
+                else
+                {
+                    m_uiSlaugtherSquareTimer -= uiDiff;
+                }
+            }
+
+            // Check to see if the spawning of The Unforgiven and its adds has been triggered by a player (player walking into area)
+            // Once this has occurred, the respawning is dealt with via the creature object's respawn time (The Unforgiven every 30 minutes, Vengeful Phantoms every 15 minutes)
+            if (!m_bTheUnforgivenSpawnHasTriggered)
+            {
+                // Query the players in the instance
+                Map::PlayerList const& players = instance->GetPlayers();
+                for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                {
+                    if (Player* pPlayer = itr->getSource())
+                    {
+                        // Acquire player's coordinates
+                        float fPlayerXposition = pPlayer->GetPositionX();
+                        float fPlayerYposition = pPlayer->GetPositionY();
+                        float fPlayerZposition = pPlayer->GetPositionZ();
+
+                        // Check if player is near The Unforgiven
+                        // If a player is near, then we do not need to check other player locations, therefore stop checking - break out of this
+// TODO: IsNearWaypoint is missing from TWO
+
+                        if (pPlayer->IsNearWaypoint(fPlayerXposition, fPlayerYposition, fPlayerZposition, aStratholmeLocation[8].m_fX, aStratholmeLocation[8].m_fY, aStratholmeLocation[8].m_fZ, 4, 4, 4))
+                        {
+                            Creature* pTheUnforgiven = pPlayer->SummonCreature(NPC_THE_UNFORGIVEN, aStratholmeLocation[8].m_fX, aStratholmeLocation[8].m_fY, aStratholmeLocation[8].m_fZ, aStratholmeLocation[8].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000);
+                            pTheUnforgiven->SetRespawnTime(1800); // 30 minutes
+                            // Now spawn 3 or 4 adds (NPC_VENGEFUL_PHANTOM)
+                            Creature* pVengfulPhantom[4];
+                            uint8 iTotalAddsToSpawn = 3 + rand() % 2;
+                            for (uint8 i = 0; i < iTotalAddsToSpawn; i++)
+                            {
+                                pVengfulPhantom[i] = pPlayer->SummonCreature(NPC_VENGEFUL_PHANTOM, aStratholmeLocation[8].m_fX, aStratholmeLocation[8].m_fY, aStratholmeLocation[8].m_fZ, aStratholmeLocation[8].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000);
+                                pVengfulPhantom[i]->SetRespawnTime(900); // 15 minutes
+                            }
+                            m_bTheUnforgivenSpawnHasTriggered = true;
+                            break;
+                        }
+                    }
+                }
+            }
+
+        }
+
+    private:
+        bool StartSlaugtherSquare()
+        {
+            if (m_auiEncounter[TYPE_BARONESS] == SPECIAL && m_auiEncounter[TYPE_NERUB] == SPECIAL && m_auiEncounter[TYPE_PALLID] == SPECIAL)
+            {
+                DoOrSimulateScriptTextForThisInstance(SAY_ANNOUNCE_RIVENDARE, NPC_BARON);
+
+                DoUseDoorOrButton(GO_PORT_GAUNTLET);
+                DoUseDoorOrButton(GO_PORT_SLAUGTHER);
+
+                debug_log("SD3: Instance Stratholme: Open slaughter square.");
+
+                return true;
+            }
+
+            return false;
+        }
+
+        void DoSortZiggurats()
+        {
+            if (m_luiAcolyteGUIDs.empty())
+            {
+                return;
+            }
+
+            std::list<Creature*> lAcolytes;                         // Valid pointers, only used locally
+            for (GuidList::const_iterator itr = m_luiAcolyteGUIDs.begin(); itr != m_luiAcolyteGUIDs.end(); ++itr)
+            {
+                if (Creature* pAcolyte = instance->GetCreature(*itr))
+                {
+                    lAcolytes.push_back(pAcolyte);
+                }
+            }
+            m_luiAcolyteGUIDs.clear();
+
+            if (lAcolytes.empty())
+            {
+                return;
+            }
+
+            if (!GetSingleCreatureFromStorage(NPC_THUZADIN_ACOLYTE, true))
+            {
+                // Sort the acolytes by height, and the one with the biggest height is the announcer (a bit outside the map)
+                lAcolytes.sort(sortByHeight);
+                m_mNpcEntryGuidStore[NPC_THUZADIN_ACOLYTE] = (*lAcolytes.begin())->GetObjectGuid();
+                lAcolytes.erase(lAcolytes.begin());
+            }
+
+            // Sort Acolytes
+            for (std::list<Creature*>::iterator itr = lAcolytes.begin(); itr != lAcolytes.end();)
+            {
+                bool bAlreadyIterated = false;
+                for (uint8 i = 0; i < MAX_ZIGGURATS; ++i)
+                {
+                    if (GameObject* pZigguratDoor = instance->GetGameObject(m_zigguratStorage[i].m_doorGuid))
+                    {
+                        if ((*itr)->IsAlive() && (*itr)->IsWithinDistInMap(pZigguratDoor, 35.0f, false))
+                        {
+                            m_zigguratStorage[i].m_lZigguratAcolyteGuid.push_back((*itr)->GetObjectGuid());
+                            itr = lAcolytes.erase(itr);
+                            bAlreadyIterated = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (itr != lAcolytes.end() && !bAlreadyIterated)
+                {
+                    ++itr;
+                }
+            }
+
+            // In case some mobs have not been able to be sorted, store their GUIDs again
+            for (std::list<Creature*>::const_iterator itr = lAcolytes.begin(); itr != lAcolytes.end(); ++itr)
+            {
+                m_luiAcolyteGUIDs.push_back((*itr)->GetObjectGuid());
+            }
+
+            // Sort Crystal
+            for (GuidList::iterator itr = m_luiCrystalGUIDs.begin(); itr != m_luiCrystalGUIDs.end();)
+            {
+                Creature* pCrystal = instance->GetCreature(*itr);
+                if (!pCrystal)
+                {
+                    itr = m_luiCrystalGUIDs.erase(itr);
+                    continue;
+                }
+
+                bool bAlreadyIterated = false;
+                for (uint8 i = 0; i < MAX_ZIGGURATS; ++i)
+                {
+                    if (GameObject* pZigguratDoor = instance->GetGameObject(m_zigguratStorage[i].m_doorGuid))
+                    {
+                        if (pCrystal->IsWithinDistInMap(pZigguratDoor, 50.0f, false))
+                        {
+                            m_zigguratStorage[i].m_crystalGuid = pCrystal->GetObjectGuid();
+                            itr = m_luiCrystalGUIDs.erase(itr);
+                            bAlreadyIterated = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (itr != m_luiCrystalGUIDs.end() && !bAlreadyIterated)
+                {
+                    ++itr;
+                }
+            }
+        }
+
+        void ThazudinAcolyteJustDied(Creature* pCreature)
+        {
+            for (uint8 i = 0; i < MAX_ZIGGURATS; ++i)
+            {
+                if (m_zigguratStorage[i].m_lZigguratAcolyteGuid.empty())
+                {
+                    continue;    // nothing to do anymore for this ziggurat
+                }
+
+                m_zigguratStorage[i].m_lZigguratAcolyteGuid.remove(pCreature->GetObjectGuid());
+                if (m_zigguratStorage[i].m_lZigguratAcolyteGuid.empty())
+                {
+                    // A random zone yell after one is cleared
+                    int32 aAnnounceSay[MAX_ZIGGURATS] = { SAY_ANNOUNCE_ZIGGURAT_1, SAY_ANNOUNCE_ZIGGURAT_2, SAY_ANNOUNCE_ZIGGURAT_3 };
+                    DoOrSimulateScriptTextForThisInstance(aAnnounceSay[i], NPC_THUZADIN_ACOLYTE);
+
+                    // Kill Crystal
+                    if (Creature* pCrystal = instance->GetCreature(m_zigguratStorage[i].m_crystalGuid))
+                    {
+                        pCrystal->DealDamage(pCrystal, pCrystal->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                    }
+
+                    switch (i)
+                    {
+                    case 0:
+                        SetData(TYPE_BARONESS, SPECIAL);
+                        break;
+                    case 1:
+                        SetData(TYPE_NERUB, SPECIAL);
+                        break;
+                    case 2:
+                        SetData(TYPE_PALLID, SPECIAL);
+                        break;
+                    }
+                }
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiBaronRunTimer;
+        uint32 m_uiBarthilasRunTimer;
+        uint32 m_uiMindlessSummonTimer;
+        uint32 m_uiSlaugtherSquareTimer;
+
+        uint32 m_uiYellCounter;
+        uint32 m_uiMindlessCount;
+        uint8 m_uiPostboxesUsed;
+        uint8 m_uiSilverHandKilled;
+
+        ZigguratStore m_zigguratStorage[MAX_ZIGGURATS];
+
+        std::set<uint32> m_suiCrimsonLowGuids;
+        GuidList m_luiCrystalGUIDs;
+        GuidSet m_sAbomnationGUID;
+        GuidList m_luiAcolyteGUIDs;
+        GuidList m_luiUndeadGUIDs;
+        GuidList m_luiGuardGUIDs;
+
+        // this ensures that the code that deals with the initial spawning of The Unforgiven and its adds (Vengful Phantoms) is only run once
+        bool m_bTheUnforgivenSpawnHasTriggered;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_stratholme(pMap);
+    }
+};
+
+void AddSC_instance_stratholme()
+{
+    Script* s;
+    s = new is_stratholme();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_stratholme";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_stratholme;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/stratholme/stratholme.cpp b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/stratholme.cpp
new file mode 100644
index 000000000..9a7a1e491
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/stratholme.cpp
@@ -0,0 +1,434 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Stratholme
+ * SD%Complete: 100
+ * SDComment:   Misc mobs for instance. GO-script to apply aura and start event for quest 8945
+ * SDCategory:  Stratholme
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * go_service_gate
+ * go_gauntlet_gate
+ * go_stratholme_postbox
+ * mob_restless_soul
+ * mobs_spectral_ghostly_citizen
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "stratholme.h"
+
+/*######
+## go_service_gate
+######*/
+
+struct go_service_gate : public GameObjectScript
+{
+    go_service_gate() : GameObjectScript("go_service_gate") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+
+        if (!pInstance)
+        {
+            return false;
+        }
+
+        if (pInstance->GetData(TYPE_BARTHILAS_RUN) != NOT_STARTED)
+        {
+            return false;
+        }
+
+        // if the service gate is used make Barthilas flee
+        pInstance->SetData(TYPE_BARTHILAS_RUN, IN_PROGRESS);
+        return false;
+    }
+};
+
+/*######
+## go_gauntlet_gate (this is the _first_ of the gauntlet gates, two exist)
+######*/
+
+struct go_gauntlet_gate : public GameObjectScript
+{
+    go_gauntlet_gate() : GameObjectScript("go_gauntlet_gate") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+
+        if (!pInstance)
+        {
+            return false;
+        }
+
+        if (pInstance->GetData(TYPE_BARON_RUN) != NOT_STARTED)
+        {
+            return false;
+        }
+
+        if (Group* pGroup = pPlayer->GetGroup())
+        {
+            for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+            {
+                Player* pGroupie = itr->getSource();
+                if (!pGroupie)
+                {
+                    continue;
+                }
+
+                if (!pGroupie->HasAura(SPELL_BARON_ULTIMATUM))
+                {
+                    pGroupie->CastSpell(pGroupie, SPELL_BARON_ULTIMATUM, true);
+                }
+            }
+        }
+        else
+        {
+            if (!pPlayer->HasAura(SPELL_BARON_ULTIMATUM))
+            {
+                pPlayer->CastSpell(pPlayer, SPELL_BARON_ULTIMATUM, true);
+            }
+        }
+
+        pInstance->SetData(TYPE_BARON_RUN, IN_PROGRESS);
+        return false;
+    }
+};
+
+/*######
+## go_stratholme_postbox
+######*/
+
+struct go_stratholme_postbox : public GameObjectScript
+{
+    go_stratholme_postbox() : GameObjectScript("go_stratholme_postbox") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+
+        if (!pInstance)
+        {
+            return false;
+        }
+
+        if (pInstance->GetData(TYPE_POSTMASTER) == DONE)
+        {
+            return false;
+        }
+
+        // When the data is Special, spawn the postmaster
+        if (pInstance->GetData(TYPE_POSTMASTER) == SPECIAL)
+        {
+            pPlayer->CastSpell(pPlayer, SPELL_SUMMON_POSTMASTER, true);
+            pInstance->SetData(TYPE_POSTMASTER, DONE);
+        }
+        else
+        {
+            pInstance->SetData(TYPE_POSTMASTER, IN_PROGRESS);
+        }
+
+        // Summon 3 postmen for each postbox
+        float fX, fY, fZ;
+        for (uint8 i = 0; i < 3; ++i)
+        {
+            pPlayer->GetRandomPoint(pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), 3.0f, fX, fY, fZ);
+            pPlayer->SummonCreature(NPC_UNDEAD_POSTMAN, fX, fY, fZ, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        return false;
+    }
+};
+
+/*######
+## mob_restless_soul
+######*/
+
+enum
+{
+    // Possibly more of these quotes around.
+    SAY_ZAPPED0     = -1329000,
+    SAY_ZAPPED1     = -1329001,
+    SAY_ZAPPED2     = -1329002,
+    SAY_ZAPPED3     = -1329003,
+
+    QUEST_RESTLESS_SOUL     = 5282,
+
+    SPELL_EGAN_BLASTER      = 17368,
+    SPELL_SOUL_FREED        = 17370,
+
+    NPC_RESTLESS_SOUL      = 11122,
+    NPC_FREED_SOUL         = 11136,
+};
+
+struct mob_restless_soul : public CreatureScript
+{
+    mob_restless_soul() : CreatureScript("mob_restless_soul") {}
+
+    // TODO - likely entirely not needed workaround
+    struct mob_restless_soulAI : public ScriptedAI
+    {
+        mob_restless_soulAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_taggerGuid;
+        uint32 m_uiDieTimer;
+        bool m_bIsTagged;
+
+        void Reset() override
+        {
+            m_taggerGuid.Clear();
+            m_uiDieTimer = 5000;
+            m_bIsTagged = false;
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pCaster->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (!m_bIsTagged && pSpell->Id == SPELL_EGAN_BLASTER && ((Player*)pCaster)->GetQuestStatus(QUEST_RESTLESS_SOUL) == QUEST_STATUS_INCOMPLETE)
+                {
+                    m_bIsTagged = true;
+                    m_taggerGuid = pCaster->GetObjectGuid();
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_FREED_SOUL)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_SOUL_FREED, false);
+
+                switch (urand(0, 3))
+                {
+                case 0:
+                    DoScriptText(SAY_ZAPPED0, pSummoned);
+                    break;
+                case 1:
+                    DoScriptText(SAY_ZAPPED1, pSummoned);
+                    break;
+                case 2:
+                    DoScriptText(SAY_ZAPPED2, pSummoned);
+                    break;
+                case 3:
+                    DoScriptText(SAY_ZAPPED3, pSummoned);
+                    break;
+                }
+            }
+        }
+
+        void JustDied(Unit* /*Killer*/) override
+        {
+            if (m_bIsTagged)
+            {
+                m_creature->SummonCreature(NPC_FREED_SOUL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 300000);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_bIsTagged)
+            {
+                if (m_uiDieTimer < uiDiff)
+                {
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_taggerGuid))
+                    {
+                        pPlayer->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                    }
+                }
+                else
+                {
+                    m_uiDieTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_restless_soulAI(pCreature);
+    }
+};
+
+/*######
+## mobs_spectral_ghostly_citizen
+######*/
+
+enum
+{
+    SPELL_HAUNTING_PHANTOM  = 16336,
+    SPELL_SLAP              = 6754
+};
+
+struct mobs_spectral_ghostly_citizen : public CreatureScript
+{
+    mobs_spectral_ghostly_citizen() : CreatureScript("mobs_spectral_ghostly_citizen") {}
+
+    struct mobs_spectral_ghostly_citizenAI : public ScriptedAI
+    {
+        mobs_spectral_ghostly_citizenAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiDieTimer;
+        bool m_bIsTagged;
+
+        void Reset() override
+        {
+            m_uiDieTimer = 5000;
+            m_bIsTagged = false;
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (!m_bIsTagged && pSpell->Id == SPELL_EGAN_BLASTER)
+            {
+                m_bIsTagged = true;
+            }
+        }
+
+        void JustDied(Unit* /*Killer*/) override
+        {
+            if (m_bIsTagged)
+            {
+                for (uint32 i = 0; i < 4; ++i)
+                {
+                    float x, y, z;
+                    m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 20.0f, x, y, z);
+
+                    // 100%, 50%, 33%, 25% chance to spawn
+                    uint32 j = urand(0, i);
+                    if (j == 0)
+                    {
+                        m_creature->SummonCreature(NPC_RESTLESS_SOUL, x, y, z, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_bIsTagged)
+            {
+                if (m_uiDieTimer < uiDiff)
+                {
+                    m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                }
+                else
+                {
+                    m_uiDieTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+
+        void ReceiveEmote(Player* pPlayer, uint32 uiEmote) override
+        {
+            switch (uiEmote)
+            {
+            case TEXTEMOTE_DANCE:
+                EnterEvadeMode();
+                break;
+            case TEXTEMOTE_RUDE:
+                if (m_creature->IsWithinDistInMap(pPlayer, INTERACTION_DISTANCE))
+                {
+                    m_creature->CastSpell(pPlayer, SPELL_SLAP, false);
+                }
+                else
+                {
+                    m_creature->HandleEmote(EMOTE_ONESHOT_RUDE);
+                }
+                break;
+            case TEXTEMOTE_WAVE:
+                m_creature->HandleEmote(EMOTE_ONESHOT_WAVE);
+                break;
+            case TEXTEMOTE_BOW:
+                m_creature->HandleEmote(EMOTE_ONESHOT_BOW);
+                break;
+            case TEXTEMOTE_KISS:
+                m_creature->HandleEmote(EMOTE_ONESHOT_FLEX);
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mobs_spectral_ghostly_citizenAI(pCreature);
+    }
+};
+
+void AddSC_stratholme()
+{
+    Script *s;
+    s = new go_service_gate();
+    s->RegisterSelf();
+    s = new go_gauntlet_gate();
+    s->RegisterSelf();
+    s = new go_stratholme_postbox();
+    s->RegisterSelf();
+
+    s = new mob_restless_soul();
+    s->RegisterSelf();
+    s = new mobs_spectral_ghostly_citizen();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_service_gate";
+    //pNewScript->pGOUse = &GOUse_go_service_gate;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_gauntlet_gate";
+    //pNewScript->pGOUse = &GOUse_go_gauntlet_gate;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_stratholme_postbox";
+    //pNewScript->pGOUse = &GOUse_go_stratholme_postbox;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_restless_soul";
+    //pNewScript->GetAI = &GetAI_mob_restless_soul;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mobs_spectral_ghostly_citizen";
+    //pNewScript->GetAI = &GetAI_mobs_spectral_ghostly_citizen;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/stratholme/stratholme.h b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/stratholme.h
new file mode 100644
index 000000000..edfd01cc5
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/stratholme/stratholme.h
@@ -0,0 +1,108 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_STRATHOLME_H
+#define DEF_STRATHOLME_H
+
+enum
+{
+    MAX_ENCOUNTER               = 10,
+    MAX_SILVERHAND              = 5,
+    MAX_ZIGGURATS               = 3,
+
+    TYPE_BARON_RUN              = 0,
+    TYPE_BARONESS               = 1,
+    TYPE_NERUB                  = TYPE_BARONESS + 1,        // Assert that these three TYPEs are in correct order.
+    TYPE_PALLID                 = TYPE_BARONESS + 2,
+    TYPE_RAMSTEIN               = 4,
+    TYPE_BARON                  = 5,
+    TYPE_BARTHILAS_RUN          = 6,
+    TYPE_BLACK_GUARDS           = 7,
+    TYPE_POSTMASTER             = 8,
+    TYPE_TRUE_MASTERS           = 9,
+
+    NPC_TIMMY_THE_CRUEL         = 10808,
+    NPC_BARTHILAS               = 10435,
+    NPC_BARONESS_ANASTARI       = 10436,
+    NPC_NERUBENKAN              = 10437,
+    NPC_MALEKI_THE_PALLID       = 10438,
+    NPC_RAMSTEIN                = 10439,
+    NPC_BARON                   = 10440,
+    NPC_CRYSTAL                 = 10415,                    // Three ziggurat crystals
+    NPC_THUZADIN_ACOLYTE        = 10399,                    // Acolytes in ziggurats
+    NPC_ABOM_BILE               = 10416,
+    NPC_ABOM_VENOM              = 10417,
+    NPC_MINDLESS_UNDEAD         = 11030,                    // Zombies summoned after Ramstein
+    NPC_BLACK_GUARD             = 10394,                    // Zombies summoned after Ramstein
+    NPC_YSIDA                   = 16031,
+    NPC_YSIDA_TRIGGER           = 16100,
+    NPC_CRIMSON_INITIATE        = 10420,                    // A couple of them related to spawn Timmy
+    NPC_CRIMSON_GALLANT         = 10424,
+    NPC_CRIMSON_GUARDSMAN       = 10418,
+    NPC_CRIMSON_CONJURER        = 10419,
+    NPC_UNDEAD_POSTMAN          = 11142,
+    NPC_GREGOR_THE_JUSTICIAR    = 17910,                    // related to quest "True Masters of the Light"
+    NPC_CATHELA_THE_SEEKER      = 17911,
+    NPC_NEMAS_THE_ARBITER       = 17912,
+    NPC_AELMAR_THE_VANQUISHER   = 17913,
+    NPC_VICAR_HYERONIMUS        = 17914,
+    NPC_PALADIN_QUEST_CREDIT    = 17915,
+    NPC_THE_UNFORGIVEN          = 10516,
+    NPC_VENGEFUL_PHANTOM        = 10387,                    // Adds for The Unforgiven
+
+    GO_SERVICE_ENTRANCE         = 175368,
+    GO_GAUNTLET_GATE1           = 175357,
+    GO_PORT_SLAUGHTER_GATE      = 175358,                   // Port used at the undeads event
+    GO_ZIGGURAT_DOOR_1          = 175380,                   // Baroness
+    GO_ZIGGURAT_DOOR_2          = 175379,                   // Nerub'enkan
+    GO_ZIGGURAT_DOOR_3          = 175381,                   // Maleki
+    GO_ZIGGURAT_DOOR_4          = 175405,                   // Ramstein
+    GO_ZIGGURAT_DOOR_5          = 175796,                   // Baron
+    GO_PORT_GAUNTLET            = 175374,                   // Port from gauntlet to slaugther
+    GO_PORT_SLAUGTHER           = 175373,                   // Port at slaugther
+    GO_PORT_ELDERS              = 175377,                   // Port at elders square
+    GO_YSIDA_CAGE               = 181071,                   // Cage to open after baron event is done
+
+    QUEST_DEAD_MAN_PLEA         = 8945,
+    SPELL_BARON_ULTIMATUM       = 27861,
+    SPELL_SUMMON_POSTMASTER     = 24627,
+
+    SAY_ANNOUNCE_ZIGGURAT_1     = -1329004,
+    SAY_ANNOUNCE_ZIGGURAT_2     = -1329005,
+    SAY_ANNOUNCE_ZIGGURAT_3     = -1329006,
+    SAY_ANNOUNCE_RIVENDARE      = -1329007,
+
+    SAY_WARN_BARON              = -1329008,
+    SAY_ANNOUNCE_RUN_START      = -1329009,
+    SAY_ANNOUNCE_RUN_10_MIN     = -1329010,
+    SAY_ANNOUNCE_RUN_5_MIN      = -1329011,
+    SAY_ANNOUNCE_RUN_FAIL       = -1329012,
+    SAY_ANNOUNCE_RAMSTEIN       = -1329013,
+    SAY_UNDEAD_DEFEAT           = -1329014,
+    SAY_EPILOGUE                = -1329015,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp b/src/modules/SD3/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp
new file mode 100644
index 000000000..69b3dccb3
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp
@@ -0,0 +1,573 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      instance_sunken_temple
+ * SD%Complete: 90
+ * SDComment:   Hakkar Summon Event needs more sources to improve
+ * SDCategory:  Sunken Temple
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "sunken_temple.h"
+
+struct is_sunken_temple : public InstanceScript
+{
+    is_sunken_temple() : InstanceScript("instance_sunken_temple") {}
+
+    class instance_sunken_temple : public ScriptedInstance
+    {
+    public:
+        instance_sunken_temple(Map* pMap) : ScriptedInstance(pMap),
+            m_uiProtectorsRemaining(0),
+            m_uiStatueCounter(0),
+            m_uiFlameCounter(0),
+            m_uiAvatarSummonTimer(0),
+            m_uiSupressorTimer(0),
+            m_bIsFirstHakkarWave(false),
+            m_bCanSummonBloodkeeper(false),
+            m_bStatueEventStatus(false)
+        {
+            Initialize();
+        }
+
+        ~instance_sunken_temple() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_JAMMALAN_BARRIER:
+                if (m_auiEncounter[TYPE_PROTECTORS] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_IDOL_OF_HAKKAR:
+            case GO_HAKKAR_DOOR_1:
+            case GO_HAKKAR_DOOR_2:
+                break;
+
+            case GO_ATALAI_LIGHT_BIG:
+                m_luiBigLightGUIDs.push_back(pGo->GetObjectGuid());
+                return;
+            case GO_EVIL_CIRCLE:
+                m_vuiCircleGUIDs.push_back(pGo->GetObjectGuid());
+                return;
+            case GO_ETERNAL_FLAME_1:
+            case GO_ETERNAL_FLAME_2:
+            case GO_ETERNAL_FLAME_3:
+            case GO_ETERNAL_FLAME_4:
+                m_luiFlameGUIDs.push_back(pGo->GetObjectGuid());
+                return;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_ZOLO:
+            case NPC_GASHER:
+            case NPC_LORO:
+            case NPC_HUKKU:
+            case NPC_ZULLOR:
+            case NPC_MIJAN:
+                ++m_uiProtectorsRemaining;
+                break;
+            case NPC_JAMMALAN:
+            case NPC_ATALARION:
+            case NPC_SHADE_OF_HAKKAR:
+            case NPC_AVATAR_OF_HAKKAR:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+                // Hakkar Event Mobs: On Wipe set as failed!
+            case NPC_BLOODKEEPER:
+            case NPC_HAKKARI_MINION:
+            case NPC_SUPPRESSOR:
+            case NPC_AVATAR_OF_HAKKAR:
+                SetData(TYPE_AVATAR, FAIL);
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_ATALARION:
+                SetData(TYPE_ATALARION, DONE);
+                break;
+            case NPC_JAMMALAN:
+                SetData(TYPE_JAMMALAN, DONE);
+                break;
+            case NPC_AVATAR_OF_HAKKAR:
+                SetData(TYPE_AVATAR, DONE);
+                break;
+
+            case NPC_SUPPRESSOR:
+                m_bCanSummonBloodkeeper = true;
+                break;
+
+                // Jammalain mini-bosses
+            case NPC_ZOLO:
+            case NPC_GASHER:
+            case NPC_LORO:
+            case NPC_HUKKU:
+            case NPC_ZULLOR:
+            case NPC_MIJAN:
+                SetData(TYPE_PROTECTORS, DONE);
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_ATALARION:
+                if (uiData == SPECIAL)
+                {
+                    DoSpawnAtalarionIfCan();
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_PROTECTORS:
+                if (uiData == DONE)
+                {
+                    --m_uiProtectorsRemaining;
+                    if (!m_uiProtectorsRemaining)
+                    {
+                        m_auiEncounter[uiType] = uiData;
+                        DoUseDoorOrButton(GO_JAMMALAN_BARRIER);
+                        // Intro yell
+                        DoOrSimulateScriptTextForThisInstance(SAY_JAMMALAN_INTRO, NPC_JAMMALAN);
+                    }
+                }
+                break;
+            case TYPE_JAMMALAN:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_AVATAR:
+                if (uiData == SPECIAL)
+                {
+                    ++m_uiFlameCounter;
+
+                    Creature* pShade = GetSingleCreatureFromStorage(NPC_SHADE_OF_HAKKAR);
+                    if (!pShade)
+                    {
+                        return;
+                    }
+
+                    switch (m_uiFlameCounter)
+                    {
+                        // Yells on each flame
+                        // TODO It might be possible that these yells should be ordered randomly, however this is the seen state
+                    case 1:
+                        DoScriptText(SAY_AVATAR_BRAZIER_1, pShade);
+                        break;
+                    case 2:
+                        DoScriptText(SAY_AVATAR_BRAZIER_2, pShade);
+                        break;
+                    case 3:
+                        DoScriptText(SAY_AVATAR_BRAZIER_3, pShade);
+                        break;
+                        // Summon the avatar of all flames are used
+                    case MAX_FLAMES:
+                        DoScriptText(SAY_AVATAR_BRAZIER_4, pShade);
+                        pShade->CastSpell(pShade, SPELL_SUMMON_AVATAR, true);
+                        m_uiAvatarSummonTimer = 0;
+                        m_uiSupressorTimer = 0;
+                        break;
+                    }
+
+                    // Summon the suppressors only after the flames are doused
+                    // Summon timer is confusing random; timers were: 13, 39 and 52 secs;
+                    if (m_uiFlameCounter != MAX_FLAMES)
+                    {
+                        m_uiSupressorTimer = urand(15000, 45000);
+                    }
+
+                    return;
+                }
+
+                // Prevent double processing
+                if (m_auiEncounter[uiType] == uiData)
+                {
+                    return;
+                }
+
+                if (uiData == IN_PROGRESS)
+                {
+                    m_uiSupressorTimer = 0;
+                    DoUpdateFlamesFlags(false);
+
+                    // Summon timer; use a small delay
+                    m_uiAvatarSummonTimer = 3000;
+                    m_bIsFirstHakkarWave = true;
+
+                    // Summon the shade
+                    Player* pPlayer = GetPlayerInMap();
+                    if (!pPlayer)
+                    {
+                        return;
+                    }
+
+#if defined (CLASSIC) || defined (TBC)
+                    if (Creature* pShade = pPlayer->SummonCreature(NPC_SHADE_OF_HAKKAR, aSunkenTempleLocation[1].m_fX, aSunkenTempleLocation[1].m_fY, aSunkenTempleLocation[1].m_fZ, aSunkenTempleLocation[1].m_fO, TEMPSUMMON_MANUAL_DESPAWN, 0))
+#endif
+#if defined (WOTLK) || defined (CATA)
+                if (Creature* pShade = pPlayer->SummonCreature(NPC_SHADE_OF_HAKKAR, aSunkenTempleLocation[1].m_fX, aSunkenTempleLocation[1].m_fY, aSunkenTempleLocation[1].m_fZ, aSunkenTempleLocation[1].m_Orientation, TEMPSUMMON_MANUAL_DESPAWN, 0))
+#endif
+                    {
+                        //m_mNpcEntryGuidStore[NPC_SHADE_OF_HAKKAR] = pShade->GetObjectGuid();
+                        pShade->SetRespawnDelay(DAY);
+                    }
+
+                    // Respawn circles
+                    for (GuidVector::const_iterator itr = m_vuiCircleGUIDs.begin(); itr != m_vuiCircleGUIDs.end(); ++itr)
+                    {
+                        DoRespawnGameObject(*itr, 30 * MINUTE);
+                    }
+                }
+                else if (uiData == FAIL)
+                {
+                    // In case of wipe during the summoning ritual the shade is despawned
+                    // The trash mobs stay in place, they are not despawned
+
+                    // Despawn the shade and the avatar -- TODO, avatar really?
+                    if (Creature* pShade = GetSingleCreatureFromStorage(NPC_SHADE_OF_HAKKAR))
+                    {
+                        pShade->ForcedDespawn();
+                        //m_mNpcEntryGuidStore.erase(NPC_SHADE_OF_HAKKAR);
+                    }
+                    else if (Creature *pAvatar = GetSingleCreatureFromStorage(NPC_AVATAR_OF_HAKKAR))
+                    {
+                        pAvatar->ForcedDespawn();
+                        //m_mNpcEntryGuidStore.erase(NPC_AVATAR_OF_HAKKAR);
+                    }
+
+                    // Reset flames
+                    DoUpdateFlamesFlags(true);
+                }
+
+                // Use combat doors
+                DoUseDoorOrButton(GO_HAKKAR_DOOR_1);
+                DoUseDoorOrButton(GO_HAKKAR_DOOR_2);
+
+                m_auiEncounter[uiType] = uiData;
+
+                break;
+                case TYPE_SIGNAL:
+                    m_bStatueEventStatus = ProcessStatueEvent(uiData);
+                    return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+            else if (uiType == TYPE_SIGNAL)
+                return uint32(m_bStatueEventStatus);
+
+            return 0;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_auiEncounter[TYPE_AVATAR] != IN_PROGRESS)
+            {
+                return;
+            }
+
+            // Summon random mobs around the circles
+            if (m_uiAvatarSummonTimer)
+            {
+                if (m_uiAvatarSummonTimer <= uiDiff)
+                {
+                    Creature* pShade = GetSingleCreatureFromStorage(NPC_SHADE_OF_HAKKAR);
+                    if (!pShade)
+                    {
+                        return;
+                    }
+
+                    // If no summon circles are spawned then return
+                    if (m_vuiCircleGUIDs.empty())
+                    {
+                        return;
+                    }
+
+                    if (m_bIsFirstHakkarWave)                       // First wave summoned
+                    {
+                        // Summon at all circles
+                        for (GuidVector::const_iterator itr = m_vuiCircleGUIDs.begin(); itr != m_vuiCircleGUIDs.end(); ++itr)
+                        {
+                            if (GameObject* pCircle = instance->GetGameObject(*itr))
+                            {
+                                pShade->SummonCreature(NPC_HAKKARI_MINION, pCircle->GetPositionX(), pCircle->GetPositionY(), pCircle->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                            }
+                        }
+
+                        // Summon Bloodkeeper at random circle
+                        if (GameObject* pCircle = instance->GetGameObject(m_vuiCircleGUIDs[urand(0, m_vuiCircleGUIDs.size() - 1)]))
+                        {
+                            pShade->SummonCreature(NPC_BLOODKEEPER, pCircle->GetPositionX(), pCircle->GetPositionY(), pCircle->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                        }
+
+                        m_bCanSummonBloodkeeper = false;
+                        m_bIsFirstHakkarWave = false;
+                        m_uiAvatarSummonTimer = 50000;
+                    }
+                    else                                            // Later wave
+                    {
+                        uint32 uiRoll = urand(0, 99);
+                        uint8 uiMaxSummons = uiRoll < 75 ? 1 : uiRoll < 95 ? 2 : 3;
+
+                        if (m_bCanSummonBloodkeeper && roll_chance_i(30))
+                        {
+                            // Summon a Bloodkeeper
+                            if (GameObject* pCircle = instance->GetGameObject(m_vuiCircleGUIDs[urand(0, m_vuiCircleGUIDs.size() - 1)]))
+                            {
+                                pShade->SummonCreature(NPC_BLOODKEEPER, pCircle->GetPositionX(), pCircle->GetPositionY(), pCircle->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                            }
+
+                            m_bCanSummonBloodkeeper = false;
+                            --uiMaxSummons;
+                        }
+
+                        for (uint8 i = 0; i < uiMaxSummons; ++i)
+                        {
+                            if (GameObject* pCircle = instance->GetGameObject(m_vuiCircleGUIDs[urand(0, m_vuiCircleGUIDs.size() - 1)]))
+                            {
+                                pShade->SummonCreature(NPC_HAKKARI_MINION, pCircle->GetPositionX(), pCircle->GetPositionY(), pCircle->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                            }
+                        }
+                        m_uiAvatarSummonTimer = urand(3000, 15000);
+                    }
+                }
+                else
+                {
+                    m_uiAvatarSummonTimer -= uiDiff;
+                }
+            }
+
+            // Summon nightmare suppressor after flame used
+            if (m_uiSupressorTimer)
+            {
+                if (m_uiSupressorTimer <= uiDiff)
+                {
+                    Creature* pShade = GetSingleCreatureFromStorage(NPC_SHADE_OF_HAKKAR);
+                    if (!pShade)
+                    {
+                        // Something went very wrong!
+                        return;
+                    }
+
+                    // Summon npc at random door; movement and script handled in DB
+                    uint8 uiSummonLoc = urand(0, 1);
+#if defined (CLASSIC) || defined (TBC)
+                    pShade->SummonCreature(NPC_SUPPRESSOR, aHakkariDoorLocations[uiSummonLoc].m_fX, aHakkariDoorLocations[uiSummonLoc].m_fY, aHakkariDoorLocations[uiSummonLoc].m_fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+#endif
+#if defined (WOTLK) || defined (CATA)
+            pShade->SummonCreature(NPC_SUPPRESSOR, aHakkariDoorLocations[uiSummonLoc].m_fX, aHakkariDoorLocations[uiSummonLoc].m_fY, aHakkariDoorLocations[uiSummonLoc].m_fZ, aHakkariDoorLocations[uiSummonLoc].m_Orientation, TEMPSUMMON_DEAD_DESPAWN, 0);
+#endif
+
+                    // This timer is finished now
+                    m_uiSupressorTimer = 0;
+                }
+                else
+                {
+                    m_uiSupressorTimer -= uiDiff;
+                }
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] >> m_auiEncounter[4];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                // Here a bit custom, to have proper mechanics for the statue events
+                if (m_auiEncounter[i] != DONE)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        void DoSpawnAtalarionIfCan()
+        {
+            // Return if already summoned
+            if (GetSingleCreatureFromStorage(NPC_ATALARION))
+            {
+                return;
+            }
+
+            Player* pPlayer = GetPlayerInMap();
+            if (!pPlayer)
+            {
+                return;
+            }
+
+#if defined(CLASSIC) || defined(TBC)
+            pPlayer->SummonCreature(NPC_ATALARION, aSunkenTempleLocation[0].m_fX, aSunkenTempleLocation[0].m_fY, aSunkenTempleLocation[0].m_fZ, aSunkenTempleLocation[0].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+#endif
+#if defined(WOTLK)
+            pPlayer->SummonCreature(NPC_ATALARION, aSunkenTempleLocation[0].m_fX, aSunkenTempleLocation[0].m_fY, aSunkenTempleLocation[0].m_fZ, aSunkenTempleLocation[0].m_Orientation, TEMPSUMMON_DEAD_DESPAWN, 0);
+#endif
+            // Spawn the idol of Hakkar
+            DoRespawnGameObject(GO_IDOL_OF_HAKKAR, 30 * MINUTE);
+
+            // Spawn the big green lights
+            for (GuidList::const_iterator itr = m_luiBigLightGUIDs.begin(); itr != m_luiBigLightGUIDs.end(); ++itr)
+            {
+                DoRespawnGameObject(*itr, 30 * MINUTE);
+            }
+        }
+
+        void DoUpdateFlamesFlags(bool bRestore)
+        {
+            for (GuidList::const_iterator itr = m_luiFlameGUIDs.begin(); itr != m_luiFlameGUIDs.end(); ++itr)
+            {
+                DoToggleGameObjectFlags(*itr, GO_FLAG_NO_INTERACT, bRestore);
+            }
+        }
+
+        bool ProcessStatueEvent(uint32 uiEventId)
+        {
+            bool bEventStatus = false;
+
+            // Check if the statues are activated correctly
+            // Increase the counter when the correct statue is activated
+            for (uint8 i = 0; i < MAX_STATUES; ++i)
+            {
+                if (uiEventId == m_aAtalaiStatueEvents[i] && m_uiStatueCounter == i)
+                {
+                    // Right Statue activated
+                    ++m_uiStatueCounter;
+                    bEventStatus = true;
+                    break;
+                }
+            }
+
+            if (!bEventStatus)
+            {
+                return false;
+            }
+
+            // Check if all statues are active
+            if (m_uiStatueCounter == MAX_STATUES)
+            {
+                SetData(TYPE_ATALARION, SPECIAL);   //TODO check SetData to be really reenterable!
+            }
+
+            return true;
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint8 m_uiProtectorsRemaining;                      // Jammalan door handling
+        uint8 m_uiStatueCounter;                            // Atalarion Statue Event
+        uint8 m_uiFlameCounter;                             // Avatar of Hakkar Event
+        uint32 m_uiAvatarSummonTimer;
+        uint32 m_uiSupressorTimer;
+        bool m_bIsFirstHakkarWave;
+        bool m_bCanSummonBloodkeeper;
+        bool m_bStatueEventStatus;
+
+        GuidList m_luiFlameGUIDs;
+        GuidList m_luiBigLightGUIDs;
+        GuidVector m_vuiCircleGUIDs;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_sunken_temple(pMap);
+    }
+};
+
+void AddSC_instance_sunken_temple()
+{
+    Script* s;
+    s = new is_sunken_temple();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_sunken_temple";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_sunken_temple;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp b/src/modules/SD3/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp
new file mode 100644
index 000000000..6fc746579
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp
@@ -0,0 +1,368 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Sunken_Temple
+ * SD%Complete: 100
+ * SDComment:   Quest support: 8733.
+ * SDCategory:  Sunken Temple
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * at_shade_of_eranikus
+ * npc_malfurion_stormrage
+ * event_antalarion_statue_activation
+ * event_avatar_of_hakkar
+ * go_eternal_flame
+ * effectDummy_summon_hakkar
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "sunken_temple.h"
+
+enum
+{
+    QUEST_THE_CHARGE_OF_DRAGONFLIGHTS = 8555,
+    QUEST_ERANIKUS_TYRANT_OF_DREAMS   = 8733
+};
+
+struct at_shade_of_eranikus : public AreaTriggerScript
+{
+    at_shade_of_eranikus() : AreaTriggerScript("at_shade_of_eranikus") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*pAt*/) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
+        {
+            // Only do stuff, if the player has finished the PreQuest
+            if (pPlayer->GetQuestRewardStatus(QUEST_THE_CHARGE_OF_DRAGONFLIGHTS) &&
+                !pPlayer->GetQuestRewardStatus(QUEST_ERANIKUS_TYRANT_OF_DREAMS) &&
+                pPlayer->GetQuestStatus(QUEST_ERANIKUS_TYRANT_OF_DREAMS) != QUEST_STATUS_COMPLETE)
+            {
+                if (pInstance->GetData(TYPE_MALFURION) != DONE)
+                {
+#if defined (CLASSIC) || defined (TBC)
+                    pPlayer->SummonCreature(NPC_MALFURION, aSunkenTempleLocation[2].m_fX, aSunkenTempleLocation[2].m_fY, aSunkenTempleLocation[2].m_fZ, aSunkenTempleLocation[2].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+#endif
+#if defined (WOTLK) || defined (CATA)
+                pPlayer->SummonCreature(NPC_MALFURION, aSunkenTempleLocation[2].m_fX, aSunkenTempleLocation[2].m_fY, aSunkenTempleLocation[2].m_fZ, aSunkenTempleLocation[2].m_Orientation, TEMPSUMMON_DEAD_DESPAWN, 0);
+#endif
+                    pInstance->SetData(TYPE_MALFURION, DONE);
+                }
+            }
+        }
+        return false;
+    }
+};
+
+/*######
+## npc_malfurion_stormrage
+######*/
+
+enum
+{
+    EMOTE_MALFURION1              = -1109000,
+    SAY_MALFURION1                = -1109001,
+    SAY_MALFURION2                = -1109002,
+    SAY_MALFURION3                = -1109003,
+    SAY_MALFURION4                = -1109004,
+
+    MAX_MALFURION_TEMPLE_SPEECHES = 6
+};
+
+struct npc_malfurion : public CreatureScript
+{
+    npc_malfurion() : CreatureScript("npc_malfurion_stormrage") {}
+
+    struct npc_malfurionAI : public ScriptedAI
+    {
+        npc_malfurionAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            // Only in Sunken Temple
+            if (m_creature->GetMap()->IsDungeon())
+            {
+                DoScriptText(EMOTE_MALFURION1, m_creature);
+                m_uiSpeech = 0;
+                m_uiSayTimer = 3000;
+            }
+
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+        }
+
+        uint32 m_uiSayTimer;
+        uint32 m_uiSpeech;
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // We are in Sunken Temple
+            if (m_creature->GetMap()->IsDungeon())
+            {
+                if (m_uiSpeech < MAX_MALFURION_TEMPLE_SPEECHES)
+                {
+                    if (m_uiSayTimer <= uiDiff)
+                    {
+                        switch (m_uiSpeech)
+                        {
+                        case 0:
+                            m_creature->HandleEmote(EMOTE_ONESHOT_BOW);
+                            m_uiSayTimer = 2000;
+                            break;
+                        case 1:
+                            DoScriptText(SAY_MALFURION1, m_creature);
+                            m_creature->HandleEmote(EMOTE_STATE_TALK);
+                            m_uiSayTimer = 12000;
+                            break;
+                        case 2:
+                            DoScriptText(SAY_MALFURION2, m_creature);
+                            m_uiSayTimer = 12000;
+                            break;
+                        case 3:
+                            DoScriptText(SAY_MALFURION3, m_creature);
+                            m_uiSayTimer = 11000;
+                            break;
+                        case 4:
+                            DoScriptText(SAY_MALFURION4, m_creature);
+                            m_uiSayTimer = 4000;
+                            break;
+                        case 5:
+                            m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                            m_creature->HandleEmote(EMOTE_STATE_NONE);
+                            break;
+                        }
+
+                        ++m_uiSpeech;
+                    }
+                    else
+                    {
+                        m_uiSayTimer -= uiDiff;
+                    }
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_malfurionAI(pCreature);
+    }
+};
+
+/*######
+## event_antalarion_statues
+######*/
+
+struct event_antalarion_statue_activation : public MapEventScript
+{
+    event_antalarion_statue_activation() : MapEventScript("event_antalarion_statue_activation") {}
+
+    bool OnReceived(uint32 uiEventId, Object* pSource, Object* pTarget, bool /*bIsStart*/) override
+    {
+        if (pSource->GetTypeId() == TYPEID_PLAYER && pTarget->GetTypeId() == TYPEID_GAMEOBJECT)
+        {
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)((Player*)pSource)->GetInstanceData())
+            {
+                // return if event completed
+                if (pInstance->GetData(TYPE_ATALARION) != NOT_STARTED)
+                {
+                    return true;
+                }
+
+                // Send the event id to process
+                pInstance->SetData(TYPE_SIGNAL, uiEventId);
+                if (pInstance->GetData(TYPE_SIGNAL))
+                {
+                    // Activate the green light if the correct statue is activated
+                    if (GameObject* pLight = GetClosestGameObjectWithEntry((GameObject*)pTarget, GO_ATALAI_LIGHT, INTERACTION_DISTANCE))
+                    {
+                        pInstance->DoRespawnGameObject(pLight->GetObjectGuid(), 30 * MINUTE);
+                    }
+                }
+                else
+                {
+                    // If the wrong statue was activated, then trigger trap
+                    // We don't know actually which trap goes to which statue so we need to search for each
+                    if (GameObject* pTrap = GetClosestGameObjectWithEntry((GameObject*)pTarget, GO_ATALAI_TRAP_1, INTERACTION_DISTANCE))
+                    {
+                        pTrap->Use((Unit*)pSource);
+                    }
+                    else if (GameObject* pTrap = GetClosestGameObjectWithEntry((GameObject*)pTarget, GO_ATALAI_TRAP_2, INTERACTION_DISTANCE))
+                    {
+                        pTrap->Use((Unit*)pSource);
+                    }
+                    else if (GameObject* pTrap = GetClosestGameObjectWithEntry((GameObject*)pTarget, GO_ATALAI_TRAP_3, INTERACTION_DISTANCE))
+                    {
+                        pTrap->Use((Unit*)pSource);
+                    }
+                }
+
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+/*######
+## event_avatar_of_hakkar
+######*/
+struct event_avatar_of_hakkar : public MapEventScript
+{
+    event_avatar_of_hakkar() : MapEventScript("event_avatar_of_hakkar") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* /*pTarget*/, bool /*bIsStart*/) override
+    {
+        if (pSource->GetTypeId() == TYPEID_PLAYER)
+        {
+            if (InstanceData* pInstance = ((Player*)pSource)->GetInstanceData())
+            {
+                // return if not NOT_STARTED
+                if (pInstance->GetData(TYPE_AVATAR) == NOT_STARTED)
+                {
+                    pInstance->SetData(TYPE_AVATAR, IN_PROGRESS);
+                }
+
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+/*######
+## go_eternal_flame
+######*/
+struct go_eternal_flame : public GameObjectScript
+{
+    go_eternal_flame() : GameObjectScript("go_eternal_flame") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        InstanceData* pInstance = pGo->GetInstanceData();
+
+        if (!pInstance)
+        {
+            return false;
+        }
+
+        if (pInstance->GetData(TYPE_AVATAR) != IN_PROGRESS)
+        {
+            return false;
+        }
+
+        // Set data to special when flame is used
+        pInstance->SetData(TYPE_AVATAR, SPECIAL);
+        pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+
+        return true;
+    }
+};
+
+/*######
+## effectDummy_summon_hakkar
+######*/
+struct spell_summon_hakkar : public SpellScript
+{
+    spell_summon_hakkar() : SpellScript("spell_summon_hakkar") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* /*pCreatureTarget*/, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // Always check spellid and effectindex
+        if (uiSpellId == SPELL_SUMMON_AVATAR && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (!pCaster || pCaster->GetTypeId() != TYPEID_UNIT)
+            {
+                return true;
+            }
+
+            // Actually summon the avatar of Hakkar and cast some visuals
+            if (Creature *pAvatar = pCaster->SummonCreature(NPC_AVATAR_OF_HAKKAR, pCaster->GetPositionX(), pCaster->GetPositionY(), pCaster->GetPositionZ(), pCaster->GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1 * DAY*IN_MILLISECONDS))
+            {
+                pAvatar->CastSpell(pAvatar, SPELL_AVATAR_SUMMONED, true);
+            }
+            pCaster->ToCreature()->ForcedDespawn(10);
+
+            // Always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_sunken_temple()
+{
+    Script *s;
+    s = new at_shade_of_eranikus();
+    s->RegisterSelf();
+
+    s = new npc_malfurion();
+    s->RegisterSelf();
+
+    s = new event_antalarion_statue_activation();
+    s->RegisterSelf();
+    s = new event_avatar_of_hakkar();
+    s->RegisterSelf();
+
+    s = new go_eternal_flame();
+    s->RegisterSelf();
+
+    s = new spell_summon_hakkar();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_shade_of_eranikus";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_shade_of_eranikus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_malfurion_stormrage";
+    //pNewScript->GetAI = &GetAI_npc_malfurion;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_antalarion_statue_activation";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_antalarion_statue_activation;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_avatar_of_hakkar";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_avatar_of_hakkar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_eternal_flame";
+    //pNewScript->pGOUse = &GOUse_go_eternal_flame;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_shade_of_hakkar";
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_summon_hakkar;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/sunken_temple/sunken_temple.h b/src/modules/SD3/scripts/eastern_kingdoms/sunken_temple/sunken_temple.h
new file mode 100644
index 000000000..0e911351c
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/sunken_temple/sunken_temple.h
@@ -0,0 +1,133 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_SUNKEN_TEMPLE_H
+#define DEF_SUNKEN_TEMPLE_H
+
+enum
+{
+    MAX_ENCOUNTER         = 5,
+    TYPE_SIGNAL = MAX_ENCOUNTER,
+    MAX_STATUES           = 6,
+    MAX_FLAMES            = 4,
+
+    TYPE_ATALARION        = 0,
+    TYPE_PROTECTORS       = 1,
+    TYPE_JAMMALAN         = 2,
+    TYPE_MALFURION        = 3,
+    TYPE_AVATAR           = 4,
+
+    NPC_ATALARION         = 8580,
+    NPC_DREAMSCYTH        = 5721,
+    NPC_WEAVER            = 5720,
+    NPC_JAMMALAN          = 5710,
+    NPC_AVATAR_OF_HAKKAR  = 8443,
+    NPC_SHADE_OF_ERANIKUS = 5709,
+
+    // Jammalain mini-bosses
+    NPC_ZOLO              = 5712,
+    NPC_GASHER            = 5713,
+    NPC_LORO              = 5714,
+    NPC_HUKKU             = 5715,
+    NPC_ZULLOR            = 5716,
+    NPC_MIJAN             = 5717,
+
+    // Avatar of hakkar mobs
+    NPC_SHADE_OF_HAKKAR   = 8440,                           // Shade of Hakkar appears when the event starts; will despawn when avatar of hakkar is summoned
+    NPC_BLOODKEEPER       = 8438,                           // Spawned rarely and contains the hakkari blood -> used to extinguish the flames
+    NPC_HAKKARI_MINION    = 8437,                           // Npc randomly spawned during the event = trash
+    NPC_SUPPRESSOR        = 8497,                           // Npc summoned at one of the two doors and moves to the boss;
+
+    NPC_MALFURION         = 15362,
+
+    GO_ALTAR_OF_HAKKAR    = 148836,                         // Used in order to show the player the order of the statue activation
+    GO_IDOL_OF_HAKKAR     = 148838,                         // Appears when atalarion is summoned; this was removed in 4.0.1
+
+    GO_ATALAI_LIGHT       = 148883,                         // Green light, activates when the correct statue is chosen
+    GO_ATALAI_LIGHT_BIG   = 148937,                         // Big light, used at the altar event
+
+    GO_ATALAI_TRAP_1      = 177484,                         // Trapps triggered if the wrong statue is activated
+    GO_ATALAI_TRAP_2      = 177485,                         // The traps are spawned in DB randomly around the statues (we don't know exactly which statue has which trap)
+    GO_ATALAI_TRAP_3      = 148837,
+
+    GO_ETERNAL_FLAME_1    = 148418,
+    GO_ETERNAL_FLAME_2    = 148419,
+    GO_ETERNAL_FLAME_3    = 148420,
+    GO_ETERNAL_FLAME_4    = 148421,
+
+    GO_EVIL_CIRCLE        = 148998,                         // Objects used at the avatar event. they are spawned when the event starts, and the mobs are summon atop of them
+    GO_HAKKAR_DOOR_1      = 149432,                         // Combat doors
+    GO_HAKKAR_DOOR_2      = 149433,
+
+    GO_JAMMALAN_BARRIER   = 149431,
+
+    // Event ids related to the statue activation
+    EVENT_ID_STATUE_1     = 3094,
+    EVENT_ID_STATUE_2     = 3095,
+    EVENT_ID_STATUE_3     = 3097,
+    EVENT_ID_STATUE_4     = 3098,
+    EVENT_ID_STATUE_5     = 3099,
+    EVENT_ID_STATUE_6     = 3100,
+
+    SPELL_SUMMON_AVATAR   = 12639,                          // Cast by the shade of hakkar, updates entry to avatar
+    SPELL_AVATAR_SUMMONED = 12948,
+
+    SAY_JAMMALAN_INTRO    = -1109005,
+    SAY_AVATAR_BRAZIER_1  = -1109006,
+    SAY_AVATAR_BRAZIER_2  = -1109007,
+    SAY_AVATAR_BRAZIER_3  = -1109008,
+    SAY_AVATAR_BRAZIER_4  = -1109009,
+    SAY_AVATAR_SPAWN      = -1109010,
+};
+
+// This is also the needed order for activation: S, N, SW, SE, NW, NE
+static const uint32 m_aAtalaiStatueEvents[MAX_STATUES] = {EVENT_ID_STATUE_1, EVENT_ID_STATUE_2, EVENT_ID_STATUE_3, EVENT_ID_STATUE_4, EVENT_ID_STATUE_5, EVENT_ID_STATUE_6};
+
+struct SummonLocations
+{
+#if defined (CLASSIC) || defined (TBC)
+    float m_fX, m_fY, m_fZ, m_fO;
+#endif
+#if defined (WOTLK) || defined (CATA)
+    float m_fX, m_fY, m_fZ, m_Orientation;
+#endif
+};
+
+static const SummonLocations aSunkenTempleLocation[] =
+{
+    { -466.5130f, 95.19820f, -189.646f, 0.0349f},           // Atalarion summon loc
+    { -466.8673f, 272.31204f, -90.7441f, 3.5255f},          // Shade of hakkar summon loc
+    { -660.5277f, -16.7117f, -90.8357f, 1.6055f}            // Malfurion summon loc
+};
+
+// Summon location for the suppressors
+static const SummonLocations aHakkariDoorLocations[2] =
+{
+    { -420.629f, 276.682f, -90.827f, 0.0f },
+    { -512.015f, 276.134f, -90.827f, 0.0f }
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp
new file mode 100644
index 000000000..a4b0a24d0
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp
@@ -0,0 +1,643 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Brutallus
+SD%Complete: 90
+SDComment: Intro may need some adjustments
+SDCategory: Sunwell Plateau
+EndScriptData */
+
+#include "precompiled.h"
+#include "sunwell_plateau.h"
+
+enum
+{
+    YELL_INTRO                      = -1580017,
+    YELL_INTRO_BREAK_ICE            = -1580018,
+    YELL_INTRO_CHARGE               = -1580019,
+    YELL_INTRO_KILL_MADRIGOSA       = -1580020,
+    YELL_INTRO_TAUNT                = -1580021,
+
+    YELL_MADR_ICE_BARRIER           = -1580031,
+    YELL_MADR_INTRO                 = -1580032,
+    YELL_MADR_ICE_BLOCK             = -1580033,
+    YELL_MADR_TRAP                  = -1580034,
+    YELL_MADR_DEATH                 = -1580035,
+
+    YELL_AGGRO                      = -1580022,
+    YELL_KILL1                      = -1580023,
+    YELL_KILL2                      = -1580024,
+    YELL_KILL3                      = -1580025,
+    YELL_LOVE1                      = -1580026,
+    YELL_LOVE2                      = -1580027,
+    YELL_LOVE3                      = -1580028,
+    YELL_BERSERK                    = -1580029,
+    YELL_DEATH                      = -1580030,
+
+    SPELL_METEOR_SLASH              = 45150,
+    SPELL_BURN                      = 45141,
+    SPELL_STOMP                     = 45185,
+    SPELL_BERSERK                   = 26662,
+    SPELL_SUMMON_DEATH_CLOUD        = 45884,                // Summoned on death
+
+    // Epilogue spells
+    SPELL_BRUTALLUS_DEATH_CLOUD     = 45212,
+    SPELL_FELBLAZE_PREVIZUAL        = 44885,
+    SPELL_SUMMON_FELBLAZE           = 45069,
+
+    NPC_BRUTALLUS_DEATH_CLOUD       = 25703,
+
+    // spells used during the intro event
+    SPELL_FROST_BLAST               = 45203,                // Madrigosa's spells
+    SPELL_FREEZE                    = 46609,                // Activates the ice barrier - script effect for 46610
+    SPELL_FROSTBOLT                 = 44843,
+    SPELL_FROST_BREATH              = 45065,
+    SPELL_ENCAPSULATE               = 44883,
+    SPELL_FEL_FIREBALL              = 44844,                // Brutallus' spells
+    SPELL_CLEAR_DEBUFFS             = 34098,
+    SPELL_FLAME_RING                = 44874,                // this spell should have a fire explosion when removed
+    SPELL_CHARGE                    = 44884,
+    SPELL_BREAK_ICE                 = 46637,                // Break the ice, open the door - dummy spell for 46638 and 47030
+
+    POINT_MOVE_GROUND               = 1,
+    POINT_MOVE_ICE_BLOCK            = 2,
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {NPC_MADRIGOSA,             0,              6000},
+    {YELL_MADR_ICE_BARRIER,     NPC_MADRIGOSA,  7000},
+    {YELL_MADR_INTRO,           NPC_MADRIGOSA,  7000},
+    {YELL_INTRO,                NPC_BRUTALLUS,  6000},
+    {SPELL_FROST_BREATH,        0,              6000},
+    {POINT_MOVE_ICE_BLOCK,      0,              5000},
+    {YELL_MADR_ICE_BLOCK,       NPC_MADRIGOSA,  5000},
+    {SPELL_FLAME_RING,          0,              7000},
+    {YELL_INTRO_BREAK_ICE,      NPC_BRUTALLUS,  1000},
+    {SPELL_FEL_FIREBALL,        0,              4000},
+    {POINT_MOVE_GROUND,         0,              5000},
+    {YELL_MADR_TRAP,            NPC_MADRIGOSA,  14000},
+    {YELL_INTRO_CHARGE,         NPC_BRUTALLUS,  10000},
+    {YELL_INTRO_KILL_MADRIGOSA, NPC_BRUTALLUS,  8000},
+    {YELL_INTRO_TAUNT,          NPC_BRUTALLUS,  0},
+    {0, 0, 0},
+};
+
+/*######
+## boss_brutallus
+######*/
+
+struct boss_brutallus : public CreatureScript
+{
+    boss_brutallus() : CreatureScript("boss_brutallus") {}
+
+    struct boss_brutallusAI : public ScriptedAI, private DialogueHelper
+    {
+        boss_brutallusAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiSlashTimer;
+        uint32 m_uiBurnTimer;
+        uint32 m_uiStompTimer;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiLoveTimer;
+
+        uint32 m_uiMadrigosaSpellTimer;
+
+        bool m_bCanDoMeleeAttack;
+        bool m_bIsIntroInProgress;
+
+        void Reset() override
+        {
+            m_uiSlashTimer = 11000;
+            m_uiStompTimer = 30000;
+            m_uiBurnTimer = 20000;
+            m_uiBerserkTimer = 6 * MINUTE * IN_MILLISECONDS;
+            m_uiLoveTimer = urand(10000, 17000);
+
+            m_uiMadrigosaSpellTimer = 0;
+
+            m_bCanDoMeleeAttack = true;
+            m_bIsIntroInProgress = false;
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            // Don't aggro when attacking Madrigosa
+            if (pWho->GetEntry() == NPC_MADRIGOSA)
+            {
+                return;
+            }
+
+            DoScriptText(YELL_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BRUTALLUS, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            // Don't yell for Madrigosa
+            if (pVictim->GetEntry() == NPC_MADRIGOSA)
+            {
+                return;
+            }
+
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(YELL_KILL1, m_creature); break;
+            case 1: DoScriptText(YELL_KILL2, m_creature); break;
+            case 2: DoScriptText(YELL_KILL3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(YELL_DEATH, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_DEATH_CLOUD, CAST_TRIGGERED);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BRUTALLUS, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                // When evade from the fight with Madrigosa skip this
+                if (m_pInstance->GetData(TYPE_BRUTALLUS) == SPECIAL)
+                {
+                    return;
+                }
+
+                m_pInstance->SetData(TYPE_BRUTALLUS, FAIL);
+            }
+        }
+
+        void GetAIInformation(ChatHandler& reader) override
+        {
+            if (m_pInstance)
+            {
+                if (m_pInstance->GetData(TYPE_BRUTALLUS) == SPECIAL)
+                {
+                    reader.PSendSysMessage("Brutallus intro event is currently %s", m_bIsIntroInProgress ? "in progress" : "completed");
+                }
+                else
+                {
+                    reader.PSendSysMessage("Brutallus intro event is currently %s", m_pInstance->GetData(TYPE_BRUTALLUS) == NOT_STARTED ? "not started" : "completed");
+                }
+
+                if (m_pInstance->GetData(TYPE_BRUTALLUS) != NOT_STARTED)
+                {
+                    if (Creature* pMadrigosa = m_pInstance->GetSingleCreatureFromStorage(NPC_MADRIGOSA, true))
+                    {
+                        reader.PSendSysMessage("Madrigosa guid is %s and has %u health.", pMadrigosa->GetObjectGuid().GetString().c_str(), pMadrigosa->GetHealth());
+                    }
+                }
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // Error log if Madrigosa dies
+            if (pSummoned->GetEntry() == NPC_MADRIGOSA)
+            {
+                script_error_log("Npc %u, %s, died unexpectedly. Felmyst won't be summoned anymore.", pSummoned->GetEntry(), pSummoned->GetName());
+            }
+        }
+
+        void SummonedCreatureDespawn(Creature* pSummoned) override
+        {
+            // Yell of Madrigosa on death
+            if (pSummoned->GetEntry() == NPC_MADRIGOSA)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_SUMMON_FELBLAZE, true);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_MADRIGOSA)
+            {
+                pSummoned->SetWalk(false);
+                pSummoned->SetLevitate(true);
+                pSummoned->GetMotionMaster()->MovePoint(0, aMadrigosaLoc[1].m_fX, aMadrigosaLoc[1].m_fY, aMadrigosaLoc[1].m_fZ, false);
+            }
+            else if (pSummoned->GetEntry() == NPC_BRUTALLUS_DEATH_CLOUD)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_BRUTALLUS_DEATH_CLOUD, true);
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || pSummoned->GetEntry() != NPC_MADRIGOSA)
+            {
+                return;
+            }
+
+            if (uiPointId == POINT_MOVE_GROUND)
+            {
+                pSummoned->SetLevitate(false);
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            // Fake death Madrigosa when charged
+            if (pTarget->GetEntry() == NPC_MADRIGOSA && pSpell->Id == SPELL_CHARGE)
+            {
+                DoScriptText(YELL_MADR_DEATH, pTarget);
+                pTarget->InterruptNonMeleeSpells(true);
+                pTarget->SetHealth(0);
+                pTarget->StopMoving();
+                pTarget->ClearComboPointHolders();
+                pTarget->RemoveAllAurasOnDeath();
+                pTarget->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+                pTarget->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+                pTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                pTarget->ClearAllReactives();
+                pTarget->GetMotionMaster()->Clear();
+                pTarget->GetMotionMaster()->MoveIdle();
+                pTarget->SetStandState(UNIT_STAND_STATE_DEAD);
+
+                // Brutallus evades
+                EnterEvadeMode();
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            switch (iEntry)
+            {
+            case NPC_MADRIGOSA:
+                if (Creature* pTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_FLIGHT_TRIGGER_LEFT))
+                {
+                    m_creature->SummonCreature(NPC_MADRIGOSA, pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+                m_bIsIntroInProgress = true;
+                break;
+            case YELL_MADR_ICE_BARRIER:
+                if (Creature* pMadrigosa = m_pInstance->GetSingleCreatureFromStorage(NPC_MADRIGOSA))
+#if defined (TBC)
+                {
+                    pMadrigosa->CastSpell(pMadrigosa, SPELL_FREEZE, true);
+                }
+#endif
+#if defined (WOTLK) || defined (CATA)
+                {
+                    pMadrigosa->CastSpell(pMadrigosa, SPELL_FREEZE, false);
+                }
+#endif
+                break;
+            case YELL_MADR_INTRO:
+                if (Creature* pMadrigosa = m_pInstance->GetSingleCreatureFromStorage(NPC_MADRIGOSA))
+                    pMadrigosa->GetMotionMaster()->MovePoint(POINT_MOVE_GROUND, aMadrigosaLoc[0].m_fX, aMadrigosaLoc[0].m_fY, aMadrigosaLoc[0].m_fZ);
+                break;
+            case YELL_INTRO:
+                if (Creature* pMadrigosa = m_pInstance->GetSingleCreatureFromStorage(NPC_MADRIGOSA))
+                {
+                    m_creature->AI()->AttackStart(pMadrigosa);
+                }
+                break;
+            case SPELL_FROST_BREATH:
+                if (Creature* pMadrigosa = m_pInstance->GetSingleCreatureFromStorage(NPC_MADRIGOSA))
+                {
+#if defined (CLASSIC) || defined (TBC)
+                    pMadrigosa->CastSpell(m_creature, SPELL_FROST_BREATH, true);
+#endif
+#if defined (WOTLK) || defined (CATA)
+                    pMadrigosa->CastSpell(m_creature, SPELL_FROST_BREATH, false);
+#endif
+                    pMadrigosa->GetMotionMaster()->MoveIdle();
+                }
+                break;
+            case POINT_MOVE_ICE_BLOCK:
+                m_bCanDoMeleeAttack = false;
+                if (Creature* pMadrigosa = m_pInstance->GetSingleCreatureFromStorage(NPC_MADRIGOSA))
+                {
+                    pMadrigosa->GetMotionMaster()->MovePoint(POINT_MOVE_ICE_BLOCK, aMadrigosaLoc[1].m_fX, aMadrigosaLoc[1].m_fY, aMadrigosaLoc[1].m_fZ);
+                    pMadrigosa->HandleEmote(EMOTE_ONESHOT_LIFTOFF);
+                    pMadrigosa->SetLevitate(true);
+                }
+                // Temporary! This will make Brutallus not follow Madrigosa through the air until mmaps are implemented
+                m_creature->GetMotionMaster()->MoveIdle();
+                break;
+            case YELL_MADR_ICE_BLOCK:
+                if (Creature* pMadrigosa = m_pInstance->GetSingleCreatureFromStorage(NPC_MADRIGOSA))
+                {
+                    pMadrigosa->CastSpell(m_creature, SPELL_FROST_BLAST, true);
+                }
+                m_uiMadrigosaSpellTimer = 2000;
+                break;
+            case SPELL_FLAME_RING:
+                DoCastSpellIfCan(m_creature, SPELL_CLEAR_DEBUFFS, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_FLAME_RING, CAST_TRIGGERED);
+                break;
+            case YELL_INTRO_BREAK_ICE:
+                m_creature->RemoveAurasDueToSpell(SPELL_FLAME_RING);
+                break;
+            case SPELL_FEL_FIREBALL:
+                // Spell has script target Madrigosa
+                DoCastSpellIfCan(m_creature, SPELL_FEL_FIREBALL);
+                break;
+            case POINT_MOVE_GROUND:
+                if (Creature* pMadrigosa = m_pInstance->GetSingleCreatureFromStorage(NPC_MADRIGOSA))
+                    pMadrigosa->GetMotionMaster()->MovePoint(POINT_MOVE_GROUND, aMadrigosaLoc[0].m_fX, aMadrigosaLoc[0].m_fY, aMadrigosaLoc[0].m_fZ);
+                m_uiMadrigosaSpellTimer = 0;
+                break;
+            case YELL_MADR_TRAP:
+                if (Creature* pMadrigosa = m_pInstance->GetSingleCreatureFromStorage(NPC_MADRIGOSA))
+                {
+                    pMadrigosa->CastSpell(m_creature, SPELL_ENCAPSULATE, true);
+                    // Need to remove the fire aura after 4 sec so Madrigosa won't die so soon
+                    pMadrigosa->RemoveAurasDueToSpell(SPELL_FEL_FIREBALL);
+                }
+                break;
+            case YELL_INTRO_CHARGE:
+                m_bCanDoMeleeAttack = true;
+                if (m_creature->getVictim())
+                {
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                }
+                DoCastSpellIfCan(m_creature, SPELL_CHARGE);
+                break;
+            case YELL_INTRO_KILL_MADRIGOSA:
+                // Face the players
+                if (GameObject* pIceWall = m_pInstance->GetSingleGameObjectFromStorage(GO_ICE_BARRIER))
+                {
+                    m_creature->SetFacingToObject(pIceWall);
+                }
+                break;
+            case YELL_INTRO_TAUNT:
+                DoCastSpellIfCan(m_creature, SPELL_BREAK_ICE);
+                m_bIsIntroInProgress = false;
+                break;
+            }
+        }
+
+        // Wrapper to start the dialogue text
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit* /*pInvoker*/, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+                StartNextDialogueText(NPC_MADRIGOSA);
+        }
+
+        // Wrapper to keep all the intro event stuff together
+        void UpdateIntroEvent(const uint32 uiDiff)
+        {
+            // Dialogue updates outside of combat too
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiMadrigosaSpellTimer)
+            {
+                if (m_uiMadrigosaSpellTimer <= uiDiff)
+                {
+                    if (Creature* pMadrigosa = m_pInstance->GetSingleCreatureFromStorage(NPC_MADRIGOSA))
+                    {
+                        pMadrigosa->CastSpell(m_creature, SPELL_FROSTBOLT, true);
+                    }
+                    m_uiMadrigosaSpellTimer = urand(1000, 2000);
+                }
+                else
+                {
+                    m_uiMadrigosaSpellTimer -= uiDiff;
+                }
+            }
+
+            // We need to limit the melee attacks for the intro event
+            if (m_bCanDoMeleeAttack)
+            {
+                DoMeleeAttackIfReady();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Update only the intro related stuff
+            if (m_pInstance && m_pInstance->GetData(TYPE_BRUTALLUS) == SPECIAL)
+            {
+                UpdateIntroEvent(uiDiff);
+                return;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiLoveTimer < uiDiff)
+            {
+                switch (urand(0, 2))
+                {
+                case 0: DoScriptText(YELL_LOVE1, m_creature); break;
+                case 1: DoScriptText(YELL_LOVE2, m_creature); break;
+                case 2: DoScriptText(YELL_LOVE3, m_creature); break;
+                }
+                m_uiLoveTimer = urand(15000, 23000);
+            }
+            else
+            {
+                m_uiLoveTimer -= uiDiff;
+            }
+
+            if (m_uiSlashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_METEOR_SLASH) == CAST_OK)
+                {
+                    m_uiSlashTimer = 11000;
+                }
+            }
+            else
+            {
+                m_uiSlashTimer -= uiDiff;
+            }
+
+            if (m_uiStompTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_STOMP) == CAST_OK)
+                {
+                    m_uiStompTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiStompTimer -= uiDiff;
+            }
+
+            if (m_uiBurnTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_BURN, SELECT_FLAG_PLAYER))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_BURN) == CAST_OK)
+                    {
+                        m_uiBurnTimer = 20000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiBurnTimer -= uiDiff;
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(YELL_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_brutallusAI(pCreature);
+    }
+};
+
+/*######
+## spell_aura_dummy_npc_brutallus_cloud
+######*/
+
+struct aura_dummy_npc_brutallus_cloud : public AuraScript
+{
+    aura_dummy_npc_brutallus_cloud() : AuraScript("aura_dummy_npc_brutallus_cloud") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        // On Aura removal start Felmyst summon visuals
+        if (pAura->GetId() == SPELL_BRUTALLUS_DEATH_CLOUD && pAura->GetEffIndex() == EFFECT_INDEX_0 && !bApply)
+        {
+            if (Creature* pTarget = (Creature*)pAura->GetTarget())
+            {
+                if (ScriptedInstance* pInstance = (ScriptedInstance*)pTarget->GetInstanceData())
+                {
+                    if (Creature* pMadrigosa = pInstance->GetSingleCreatureFromStorage(NPC_MADRIGOSA))
+                    {
+                        // Set respawn pos to current pos
+                        pMadrigosa->SetRespawnCoord(pMadrigosa->GetPositionX(), pMadrigosa->GetPositionY(), pMadrigosa->GetPositionZ(), pMadrigosa->GetOrientation());
+
+                        pMadrigosa->CastSpell(pMadrigosa, SPELL_FELBLAZE_PREVIZUAL, true);
+                        pMadrigosa->ForcedDespawn(10000);
+                    }
+                }
+            }
+        }
+        return true;
+    }
+};
+
+/*######
+## at_madrigosa
+######*/
+
+struct at_madrigosa : public AreaTriggerScript
+{
+    at_madrigosa() : AreaTriggerScript("at_madrigosa") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*pAt*/) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
+        {
+            // this simply set encounter state, and trigger ice barrier become active
+            // bosses can start pre-event based on this new state
+            if (pInstance->GetData(TYPE_BRUTALLUS) == NOT_STARTED)
+            {
+                pInstance->SetData(TYPE_BRUTALLUS, SPECIAL);
+
+                // Start the intro event
+                if (Creature* pBrutallus = pInstance->GetSingleCreatureFromStorage(NPC_BRUTALLUS))
+                {
+                    if (CreatureAI* pBossAI = pBrutallus->AI())
+                    {
+                        pBossAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pBrutallus, pBrutallus, 0);
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_brutallus()
+{
+    Script* s;
+
+    s = new boss_brutallus();
+    s->RegisterSelf();
+    s = new aura_dummy_npc_brutallus_cloud();
+    s->RegisterSelf();
+    s = new at_madrigosa();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_brutallus";
+    //pNewScript->GetAI = &GetAI_boss_brutallus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "spell_dummy_npc_brutallus_cloud";
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_spell_aura_dummy_npc_brutallus_cloud;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_madrigosa";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_madrigosa;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp
new file mode 100644
index 000000000..9fd234801
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp
@@ -0,0 +1,743 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_eredar_twins
+SD%Complete: 75
+SDComment: A few spells are not working proper yet; Shadow image script needs improvement
+SDCategory: Sunwell Plateau
+EndScriptData */
+
+#include "precompiled.h"
+#include "sunwell_plateau.h"
+
+enum
+{
+    SAY_INTRO_1                             = -1580044,
+    SAY_INTRO_2                             = -1580045,
+    SAY_INTRO_3                             = -1580046,
+    SAY_INTRO_4                             = -1580047,
+    SAY_INTRO_5                             = -1580048,
+    SAY_INTRO_6                             = -1580049,
+    SAY_INTRO_7                             = -1580050,
+    SAY_INTRO_8                             = -1580051,
+
+    SAY_SACROLASH_SHADOW_NOVA               = -1580052,
+    SAY_SACROLASH_EMPOWER                   = -1580053,
+    SAY_SACROLASH_KILL_1                    = -1580054,
+    SAY_SACROLASH_KILL_2                    = -1580055,
+    SAY_SACROLASH_DEAD                      = -1580056,
+    SAY_SACROLASH_BERSERK                   = -1580057,
+
+    SAY_ALYTHESS_CANFLAGRATION              = -1580058,
+    SAY_ALYTHESS_EMPOWER                    = -1580059,
+    SAY_ALYTHESS_KILL_1                     = -1580060,
+    SAY_ALYTHESS_KILL_2                     = -1580061,
+    SAY_ALYTHESS_DEAD                       = -1580062,
+    SAY_ALYTHESS_BERSERK                    = -1580063,
+
+    // Shared spells
+    SPELL_TWINS_ENRAGE                      = 46587,
+    SPELL_EMPOWER                           = 45366,        // Cast on self when the twin sister dies
+    SPELL_DARK_FLAME                        = 45345,
+
+    // Sacrolash spells
+    SPELL_DARK_TOUCHED                      = 45347,        // Player debuff; removed by shadow damage
+    SPELL_SHADOW_BLADES                     = 45248,        // 10 secs
+    SPELL_DARK_STRIKE                       = 45271,
+    SPELL_SHADOW_NOVA                       = 45329,        // 30-35 secs
+    SPELL_CONFOUNDING_BLOW                  = 45256,        // Daze; 25 secs
+    SPELL_SHADOW_NOVA_UNK                   = 45332,        // Unknown
+
+    // Shadow Image spells
+    NPC_SHADOW_IMAGE                        = 25214,
+    SPELL_SHADOWFURY                        = 45270,
+    SPELL_IMAGE_VISUAL                      = 45263,
+
+    // Alythess spells
+    SPELL_PYROGENICS                        = 45230,        // Self buff; 15secs
+    SPELL_FLAME_TOUCHED                     = 45348,        // Player debuff; removed by shadow damage
+    SPELL_CONFLAGRATION                     = 45342,        // 30-35 secs
+    SPELL_BLAZE                             = 45235,        // On main target every 3 secs; should trigger 45236 which leaves a fire on the ground
+    SPELL_FLAME_SEAR                        = 46771,        // A few random targets debuff
+    SPELL_CONFLAGRATION_UNK                 = 45333,        // Unknown
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {SAY_INTRO_1, NPC_SACROLASH, 1000},
+    {SAY_INTRO_2, NPC_ALYTHESS,  1500},
+    {SAY_INTRO_3, NPC_SACROLASH, 1500},
+    {SAY_INTRO_4, NPC_ALYTHESS,  1500},
+    {SAY_INTRO_5, NPC_SACROLASH, 1500},
+    {SAY_INTRO_6, NPC_ALYTHESS,  1500},
+    {SAY_INTRO_7, NPC_SACROLASH, 2500},
+    {SAY_INTRO_8, NPC_ALYTHESS,  0},
+    {0, 0, 0},
+};
+
+/*######
+## boss_alythess
+######*/
+
+struct boss_alythess : public CreatureScript
+{
+    boss_alythess() : CreatureScript("boss_alythess") {}
+
+    struct boss_alythessAI : public ScriptedAI
+    {
+        boss_alythessAI(Creature* pCreature) : ScriptedAI(pCreature),
+        m_introDialogue(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_introDialogue.InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+        DialogueHelper m_introDialogue;
+
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiPyrogenicsTimer;
+        uint32 m_uiConflagrationTimer;
+        uint32 m_uiBlazeTimer;
+        uint32 m_uiFlameSearTimer;
+        bool m_bDidIntro;
+
+        void Reset() override
+        {
+            m_uiEnrageTimer = 6 * MINUTE * IN_MILLISECONDS;
+            m_uiPyrogenicsTimer = 20000;
+            m_uiConflagrationTimer = urand(25000, 30000);
+            m_uiBlazeTimer = 1000;
+            m_uiFlameSearTimer = 5000;
+            m_bDidIntro = false;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                if (m_pInstance->GetData(TYPE_EREDAR_TWINS) != FAIL)
+                {
+                    m_pInstance->SetData(TYPE_EREDAR_TWINS, FAIL);
+                }
+
+                // Respawn dead sister
+                if (Creature* pSister = m_pInstance->GetSingleCreatureFromStorage(NPC_SACROLASH))
+                {
+                    if (!pSister->IsAlive())
+                    {
+                        pSister->Respawn();
+                    }
+                }
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                if (m_pInstance->GetData(TYPE_EREDAR_TWINS) != IN_PROGRESS)
+                {
+                    m_pInstance->SetData(TYPE_EREDAR_TWINS, IN_PROGRESS);
+                }
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, false))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+
+                // Only range attack
+                m_creature->GetMotionMaster()->MoveChase(pWho, 10.0f);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_ALYTHESS_KILL_1 : SAY_ALYTHESS_KILL_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                if (Creature* pSacrolash = m_pInstance->GetSingleCreatureFromStorage(NPC_SACROLASH))
+                {
+                    if (!pSacrolash->IsAlive())
+                    {
+                        m_pInstance->SetData(TYPE_EREDAR_TWINS, DONE);
+                        DoScriptText(SAY_ALYTHESS_DEAD, m_creature);
+                    }
+                    else
+                    {
+                        // Remove loot flag and cast empower
+                        m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+                        DoScriptText(SAY_SACROLASH_EMPOWER, pSacrolash);
+                        pSacrolash->InterruptNonMeleeSpells(true);
+                        pSacrolash->CastSpell(pSacrolash, SPELL_EMPOWER, false);
+                    }
+                }
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            if (pTarget->HasAura(SPELL_DARK_FLAME))
+            {
+                return;
+            }
+
+            if (pSpell->SchoolMask == SPELL_SCHOOL_MASK_FIRE)
+            {
+                if (pTarget->HasAura(SPELL_DARK_TOUCHED))
+                {
+                    pTarget->RemoveAurasDueToSpell(SPELL_DARK_TOUCHED);
+                    pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true);
+                }
+                else
+                {
+                    pTarget->CastSpell(pTarget, SPELL_FLAME_TOUCHED, true);
+                }
+            }
+            else if (pSpell->SchoolMask == SPELL_SCHOOL_MASK_SHADOW)
+            {
+                if (pTarget->HasAura(SPELL_FLAME_TOUCHED))
+                {
+                    pTarget->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED);
+                    pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true);
+                }
+                else
+                {
+                    pTarget->CastSpell(pTarget, SPELL_DARK_TOUCHED, true);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_pInstance && m_pInstance->GetData(TYPE_EREDAR_TWINS) == SPECIAL)
+            {
+                if (!m_bDidIntro)
+                {
+                    m_introDialogue.StartNextDialogueText(SAY_INTRO_1);
+                    m_bDidIntro = true;
+                }
+                m_introDialogue.DialogueUpdate(uiDiff);
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TWINS_ENRAGE) == CAST_OK)
+                {
+                    DoScriptText(SAY_ALYTHESS_BERSERK, m_creature);
+                    m_uiEnrageTimer = 6 * MINUTE * IN_MILLISECONDS;
+                }
+            }
+            else
+            {
+                m_uiEnrageTimer -= uiDiff;
+            }
+
+            if (m_uiPyrogenicsTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_PYROGENICS) == CAST_OK)
+                {
+                    m_uiPyrogenicsTimer = urand(25000, 30000);
+                }
+            }
+            else
+            {
+                m_uiPyrogenicsTimer -= uiDiff;
+            }
+
+            if (m_uiConflagrationTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 3);
+                if (!pTarget)
+                {
+                    pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0);
+                }
+
+                // If sister is dead cast shadownova instead of conflagration
+                bool bSwitchSpell = m_creature->HasAura(SPELL_EMPOWER);
+                if (DoCastSpellIfCan(pTarget, bSwitchSpell ? SPELL_SHADOW_NOVA : SPELL_CONFLAGRATION) == CAST_OK)
+                {
+                    if (!bSwitchSpell)
+                    {
+                        DoScriptText(SAY_ALYTHESS_CANFLAGRATION, m_creature);
+                    }
+
+                    m_uiConflagrationTimer = urand(20000, 25000);
+                }
+            }
+            else
+            {
+                m_uiConflagrationTimer -= uiDiff;
+            }
+
+            if (m_uiFlameSearTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FLAME_SEAR) == CAST_OK)
+                {
+                    m_uiFlameSearTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiFlameSearTimer -= uiDiff;
+            }
+
+            if (m_uiBlazeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_BLAZE) == CAST_OK)
+                {
+                    m_uiBlazeTimer = 3000;
+                }
+            }
+            else
+            {
+                m_uiBlazeTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_alythessAI(pCreature);
+    }
+};
+
+/*######
+## boss_sacrolash
+######*/
+
+struct boss_sacrolash : public CreatureScript
+{
+    boss_sacrolash() : CreatureScript("boss_sacrolash") {}
+
+    struct boss_sacrolashAI : public ScriptedAI
+    {
+        boss_sacrolashAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiShadowNovaTimer;
+        uint32 m_uiConfoundingBlowTimer;
+        uint32 m_uiShadowBladesTimer;
+        uint32 m_uiSummonShadowImage;
+
+        void Reset() override
+        {
+            m_uiEnrageTimer = 6 * MINUTE * IN_MILLISECONDS;
+            m_uiShadowNovaTimer = 15000;
+            m_uiConfoundingBlowTimer = 30000;
+            m_uiShadowBladesTimer = 15000;
+            m_uiSummonShadowImage = 10000;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                if (m_pInstance->GetData(TYPE_EREDAR_TWINS) != FAIL)
+                {
+                    m_pInstance->SetData(TYPE_EREDAR_TWINS, FAIL);
+                }
+
+                // Respawn dead sister
+                if (Creature* pSister = m_pInstance->GetSingleCreatureFromStorage(NPC_ALYTHESS))
+                {
+                    if (!pSister->IsAlive())
+                    {
+                        pSister->Respawn();
+                    }
+                }
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                if (m_pInstance->GetData(TYPE_EREDAR_TWINS) != IN_PROGRESS)
+                {
+                    m_pInstance->SetData(TYPE_EREDAR_TWINS, IN_PROGRESS);
+                }
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SACROLASH_KILL_1 : SAY_SACROLASH_KILL_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                if (Creature* pAlythess = m_pInstance->GetSingleCreatureFromStorage(NPC_ALYTHESS))
+                {
+                    if (!pAlythess->IsAlive())
+                    {
+                        m_pInstance->SetData(TYPE_EREDAR_TWINS, DONE);
+                        DoScriptText(SAY_SACROLASH_DEAD, m_creature);
+                    }
+                    else
+                    {
+                        // Remove loot flag and cast empower
+                        m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+                        DoScriptText(SAY_ALYTHESS_EMPOWER, pAlythess);
+                        pAlythess->InterruptNonMeleeSpells(true);
+                        pAlythess->CastSpell(pAlythess, SPELL_EMPOWER, false);
+                    }
+                }
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            if (pTarget->HasAura(SPELL_DARK_FLAME))
+            {
+                return;
+            }
+
+            if (pSpell->SchoolMask == SPELL_SCHOOL_MASK_FIRE)
+            {
+                if (pTarget->HasAura(SPELL_DARK_TOUCHED))
+                {
+                    pTarget->RemoveAurasDueToSpell(SPELL_DARK_TOUCHED);
+                    pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true);
+                }
+                else
+                {
+                    pTarget->CastSpell(pTarget, SPELL_FLAME_TOUCHED, true);
+                }
+            }
+            else if (pSpell->SchoolMask == SPELL_SCHOOL_MASK_SHADOW)
+            {
+                if (pTarget->HasAura(SPELL_FLAME_TOUCHED))
+                {
+                    pTarget->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED);
+                    pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true);
+                }
+                else
+                {
+                    pTarget->CastSpell(pTarget, SPELL_DARK_TOUCHED, true);
+                }
+            }
+        }
+
+        // Return a random target which it's not in range of 10 yards of boss
+        Unit* GetRandomTargetAtDist(float fDist)
+        {
+            std::vector<Unit*> m_vRangeTargets;
+
+            ThreatList const& tList = m_creature->GetThreatManager().getThreatList();
+            for (ThreatList::const_iterator iter = tList.begin(); iter != tList.end(); ++iter)
+            {
+                if (Unit* pTempTarget = m_creature->GetMap()->GetUnit((*iter)->getUnitGuid()))
+                {
+                    if (!pTempTarget->IsWithinDistInMap(m_creature, fDist))
+                    {
+                        m_vRangeTargets.push_back(pTempTarget);
+                    }
+                }
+            }
+
+            if (!m_vRangeTargets.empty())
+            {
+                return m_vRangeTargets[urand(0, m_vRangeTargets.size() - 1)];
+            }
+            else
+            {
+                return m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SHADOW_IMAGE)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_IMAGE_VISUAL, false);
+                // Attack random range target
+                if (Unit* pTarget = GetRandomTargetAtDist(10.0f))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TWINS_ENRAGE) == CAST_OK)
+                {
+                    DoScriptText(SAY_SACROLASH_BERSERK, m_creature);
+                    m_uiEnrageTimer = 6 * MINUTE * IN_MILLISECONDS;
+                }
+            }
+            else
+            {
+                m_uiEnrageTimer -= uiDiff;
+            }
+
+            if (m_uiShadowBladesTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_BLADES) == CAST_OK)
+                {
+                    m_uiShadowBladesTimer = urand(13000, 15000);
+                }
+            }
+            else
+            {
+                m_uiShadowBladesTimer -= uiDiff;
+            }
+
+            if (m_uiShadowNovaTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 2);
+                if (!pTarget)
+                {
+                    pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0);
+                }
+
+                // If sister is dead cast conflagration instead of shadownova
+                bool bSwitchSpell = m_creature->HasAura(SPELL_EMPOWER);
+                if (DoCastSpellIfCan(pTarget, bSwitchSpell ? SPELL_CONFLAGRATION : SPELL_SHADOW_NOVA) == CAST_OK)
+                {
+                    if (!bSwitchSpell)
+                    {
+                        DoScriptText(SAY_SACROLASH_SHADOW_NOVA, m_creature);
+                    }
+
+                    m_uiShadowNovaTimer = urand(30000, 35000);
+                }
+            }
+            else
+            {
+                m_uiShadowNovaTimer -= uiDiff;
+            }
+
+            if (m_uiConfoundingBlowTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CONFOUNDING_BLOW) == CAST_OK)
+                {
+                    // Reset threat
+                    if (m_creature->GetThreatManager().getThreat(m_creature->getVictim()))
+                    {
+                        m_creature->GetThreatManager().modifyThreatPercent(m_creature->getVictim(), -100);
+                    }
+
+                    m_uiConfoundingBlowTimer = urand(25000, 30000);
+                }
+            }
+            else
+            {
+                m_uiConfoundingBlowTimer -= uiDiff;
+            }
+
+            if (m_uiSummonShadowImage < uiDiff)
+            {
+                // Summon 3 shadow images at the boss position
+                for (uint8 i = 0; i < 3; ++i)
+                {
+                    m_creature->SummonCreature(NPC_SHADOW_IMAGE, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000);
+                }
+
+                m_uiSummonShadowImage = urand(10000, 12000);
+            }
+            else
+            {
+                m_uiSummonShadowImage -= uiDiff;
+            }
+
+            // Overwrite the melee attack in order to apply the dark strike
+            if (m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+            {
+                // Make sure our attack is ready and we aren't currently casting
+                if (m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_DARK_STRIKE);
+
+                    m_creature->AttackerStateUpdate(m_creature->getVictim());
+                    m_creature->resetAttackTimer();
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_sacrolashAI(pCreature);
+    }
+};
+
+/*######
+## npc_shadow_image
+######*/
+
+struct npc_shadow_image : public CreatureScript
+{
+    npc_shadow_image() : CreatureScript("npc_shadow_image") {}
+
+    struct npc_shadow_imageAI : public ScriptedAI
+    {
+        npc_shadow_imageAI(Creature* pCreature) : ScriptedAI(pCreature)  { }
+
+        uint32 m_uiChosenAbility;
+        uint32 m_uiSuicideTimer;
+        uint32 m_uiAbilityTimer;
+        uint8 m_uiDarkStrikes;
+
+        void Reset() override
+        {
+            // Choose only one spell for attack
+            m_uiChosenAbility = urand(0, 1) ? SPELL_DARK_STRIKE : SPELL_SHADOWFURY;
+            m_uiAbilityTimer = 500;
+            m_uiDarkStrikes = 0;
+            m_uiSuicideTimer = 0;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Suicide on timer; this is needed because of the cast time
+            if (m_uiSuicideTimer)
+            {
+                if (m_uiSuicideTimer <= uiDiff)
+                {
+                    m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                    return;
+                }
+                else
+                {
+                    m_uiSuicideTimer -= uiDiff;
+                }
+            }
+            else
+            {
+                // Do chosen ability
+                switch (m_uiChosenAbility)
+                {
+                case SPELL_SHADOWFURY:
+                    if (m_uiAbilityTimer < uiDiff)
+                    {
+                        if (m_creature->IsWithinDistInMap(m_creature->getVictim(), INTERACTION_DISTANCE))
+                        {
+                            if (DoCastSpellIfCan(m_creature, SPELL_SHADOWFURY) == CAST_OK)
+                            {
+                                m_uiSuicideTimer = 1000;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiAbilityTimer -= uiDiff;
+                    }
+                    break;
+                case SPELL_DARK_STRIKE:
+                    if (m_uiAbilityTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DARK_STRIKE) == CAST_OK)
+                        {
+                            ++m_uiDarkStrikes;
+                            // kill itself after 2 strikes
+                            if (m_uiDarkStrikes == 2)
+                            {
+                                m_uiSuicideTimer = 1000;
+                            }
+                            else
+                            {
+                                m_uiAbilityTimer = 1000;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiAbilityTimer -= uiDiff;
+                    }
+                    break;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_shadow_imageAI(pCreature);
+    }
+};
+
+void AddSC_boss_eredar_twins()
+{
+    Script* s;
+
+    s = new boss_alythess();
+    s->RegisterSelf();
+    s = new boss_sacrolash();
+    s->RegisterSelf();
+    s = new npc_shadow_image();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_alythess";
+    //pNewScript->GetAI = &GetAI_boss_alythess;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_sacrolash";
+    //pNewScript->GetAI = &GetAI_boss_sacrolash;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_shadow_image";
+    //pNewScript->GetAI = &GetAI_npc_shadow_image;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp
new file mode 100644
index 000000000..fc4006ef8
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp
@@ -0,0 +1,606 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_felmyst
+SD%Complete: 90%
+SDComment: Intro movement NYI; Event cleanup (despawn & resummon) NYI; Breath phase spells could use some improvements.
+SDCategory: Sunwell Plateau
+EndScriptData */
+
+#include "precompiled.h"
+#include "sunwell_plateau.h"
+#include "TemporarySummon.h"
+
+enum
+{
+    SAY_INTRO           = -1580036,
+    SAY_KILL_1          = -1580037,
+    SAY_KILL_2          = -1580038,
+    SAY_DEATH           = -1580042,
+    SAY_TAKEOFF         = -1580040,
+    SAY_BREATH          = -1580039,
+    SAY_BERSERK         = -1580041,
+    EMOTE_DEEP_BREATH   = -1580107,
+
+    SPELL_FELBLAZE_VISUAL       = 45068,        // Visual transform aura
+    SPELL_NOXIOUS_FUMES         = 47002,
+    SPELL_SOUL_SEVER            = 45918,        // kills all charmed targets at wipe - script effect for 45917
+    SPELL_BERSERK               = 26662,
+
+    // ground phase
+    SPELL_CLEAVE                = 19983,
+    SPELL_CORROSION             = 45866,
+    SPELL_GAS_NOVA              = 45855,
+    SPELL_ENCAPSULATE           = 45665,
+    SPELL_ENCAPSULATE_CHANNEL   = 45661,
+
+    // flight phase
+    SPELL_SUMMON_VAPOR          = 45391,
+    SPELL_VAPOR_SPAWN_TRIGGER   = 45388,
+    SPELL_SPEED_BURST           = 45495,        // spell needs to be confirmed
+    SPELL_FOG_CORRUPTION        = 45582,
+
+    // demonic vapor spells
+    SPELL_DEMONIC_VAPOR_PER     = 45411,
+    SPELL_DEMONIC_VAPOR         = 45399,
+    // SPELL_SUMMON_BLAZING_DEAD = 45400,
+
+    // npcs
+    // NPC_UNYELDING_DEAD       = 25268,        // spawned during flight phase
+    NPC_DEMONIC_VAPOR           = 25265,        // npc which follows the player
+    NPC_DEMONIC_VAPOR_TRAIL     = 25267,
+
+    // phases
+    PHASE_GROUND                = 1,
+    PHASE_AIR                   = 2,
+    PHASE_TRANSITION            = 3,
+
+    // subphases for air phase
+    SUBPHASE_VAPOR              = 4,
+    SUBPHASE_BREATH_PREPARE     = 5,
+    SUBPHASE_BREATH_MOVE        = 6,
+};
+
+/*######
+## boss_felmyst
+######*/
+
+struct boss_felmyst : public CreatureScript
+{
+    boss_felmyst() : CreatureScript("boss_felmyst") {}
+
+    struct boss_felmystAI : public ScriptedAI
+    {
+        boss_felmystAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bHasTransformed = false;
+            m_uiMovementTimer = 2000;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bHasTransformed;
+        uint32 m_uiMovementTimer;
+
+        uint8 m_uiPhase;
+        uint32 m_uiBerserkTimer;
+
+        // Ground Phase timers
+        uint32 m_uiFlyPhaseTimer;
+        uint32 m_uiCorrosionTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiEncapsulateTimer;
+        uint32 m_uiGasNovaTimer;
+
+        // Air Phase timers
+        uint8 m_uiSubPhase;
+        bool m_bIsLeftSide;
+
+        uint8 m_uiDemonicVaporCount;
+        uint8 m_uiCorruptionCount;
+        uint8 m_uiCorruptionIndex;
+        uint32 m_uiDemonicVaporTimer;
+        uint32 m_uiCorruptionTimer;
+
+        void Reset() override
+        {
+            // Transform into Felmyst dragon
+            DoCastSpellIfCan(m_creature, SPELL_FELBLAZE_VISUAL);
+
+            m_uiPhase = PHASE_GROUND;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            // Ground Phase
+            m_uiCorrosionTimer = 30000;
+            m_uiCleaveTimer = urand(2000, 5000);
+            m_uiGasNovaTimer = 17000;
+            m_uiEncapsulateTimer = urand(30000, 40000);
+            m_uiFlyPhaseTimer = 60000;        // flight phase after 1 min
+
+            // Air phase
+            m_uiSubPhase = SUBPHASE_VAPOR;
+            m_uiDemonicVaporCount = 0;
+            m_uiDemonicVaporTimer = 1000;
+            m_uiCorruptionTimer = 0;
+
+            SetCombatMovement(false);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasTransformed)
+            {
+                if (pWho->GetTypeId() == TYPEID_PLAYER && pWho->IsWithinLOSInMap(m_creature) && pWho->IsWithinDistInMap(m_creature, 100.0f))
+                {
+                    DoScriptText(SAY_INTRO, m_creature);
+                    m_bHasTransformed = true;
+                }
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+
+            // Add the visual aura back when evading - workaround because there is no way to remove only the negative auras
+            DoCastSpellIfCan(m_creature, SPELL_FELBLAZE_VISUAL, CAST_TRIGGERED);
+
+            // Also make sure that the charmed targets are killed
+            DoCastSpellIfCan(m_creature, SPELL_SOUL_SEVER, CAST_TRIGGERED);
+
+            // Fly back to the home flight location
+            if (m_creature->IsAlive())
+            {
+                float fX, fY, fZ;
+                m_creature->SetLevitate(true);
+                m_creature->GetRespawnCoord(fX, fY, fZ);
+                m_creature->GetMotionMaster()->MovePoint(PHASE_GROUND, fX, fY, 50.083f, false);
+            }
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_NOXIOUS_FUMES);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FELMYST, IN_PROGRESS);
+            }
+
+#if defined (TBC)
+            float fGroundZ = m_creature->GetMap()->GetHeight(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+#endif
+#if defined (WOTLK) || defined (CATA)
+            float fGroundZ = m_creature->GetMap()->GetHeight(m_creature->GetPhaseMask(), m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+#endif
+            m_creature->GetMotionMaster()->MovePoint(PHASE_TRANSITION, pWho->GetPositionX(), pWho->GetPositionY(), fGroundZ, false);
+            m_creature->HandleEmote(EMOTE_ONESHOT_LAND);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL_1 : SAY_KILL_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FELMYST, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FELMYST, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_DEMONIC_VAPOR)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_VAPOR_SPAWN_TRIGGER, true);
+                pSummoned->CastSpell(pSummoned, SPELL_DEMONIC_VAPOR_PER, true);
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case PHASE_GROUND:
+                m_creature->SetWalk(false);
+                // ToDo: start WP movement here. Currently disabled because of some MMaps issues
+                // m_creature->GetMotionMaster()->MoveWaypoint();
+                break;
+            case PHASE_AIR:
+                // switch from ground transition to flight phase
+                m_uiPhase = PHASE_AIR;
+                break;
+            case SUBPHASE_VAPOR:
+                // After the third breath land and resume phase 1
+                if (m_uiCorruptionCount == 3)
+                {
+                    m_uiPhase = PHASE_TRANSITION;
+#if defined (TBC)
+                    float fGroundZ = m_creature->GetMap()->GetHeight(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+#endif
+#if defined (WOTLK) || defined (CATA)
+                    float fGroundZ = m_creature->GetMap()->GetHeight(m_creature->GetPhaseMask(), m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+#endif
+                    m_creature->GetMotionMaster()->MovePoint(PHASE_TRANSITION, m_creature->getVictim()->GetPositionX(), m_creature->getVictim()->GetPositionY(), fGroundZ, false);
+                    return;
+                }
+
+                // prepare to move to flight trigger
+                ++m_uiCorruptionCount;
+                m_uiCorruptionTimer = 5000;
+                m_uiSubPhase = SUBPHASE_BREATH_PREPARE;
+                break;
+            case SUBPHASE_BREATH_PREPARE:
+                {
+                // move across the arena
+                if (!m_pInstance)
+                {
+                    return;
+                }
+
+                // Fly to the other side, casting the breath. Keep the same trigger index
+                m_pInstance->SetData(TYPE_FELMYST_TRIGGER, uint32(m_uiCorruptionIndex));
+                uint64 guid = m_pInstance->GetData64(m_bIsLeftSide ? TYPE_FELMYST_TRIGGER_RIGHT : TYPE_FELMYST_TRIGGER_LEFT);
+                if (Creature* pTrigger = m_pInstance->instance->GetCreature(ObjectGuid(guid)))
+                {
+                    DoScriptText(EMOTE_DEEP_BREATH, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_SPEED_BURST, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_FOG_CORRUPTION, CAST_TRIGGERED);
+                    m_creature->GetMotionMaster()->MovePoint(SUBPHASE_BREATH_MOVE, pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ(), false);
+                }
+                }
+                break;
+            case SUBPHASE_BREATH_MOVE:
+                if (!m_pInstance)
+                {
+                    return;
+                }
+
+                // remove speed aura
+                m_creature->RemoveAurasDueToSpell(SPELL_SPEED_BURST);
+
+                // Get to the flight trigger on the same side of the arena
+                if (Creature* pTrigger = m_pInstance->GetSingleCreatureFromStorage(!m_bIsLeftSide ? NPC_FLIGHT_TRIGGER_LEFT : NPC_FLIGHT_TRIGGER_RIGHT))
+                {
+                    m_creature->GetMotionMaster()->MovePoint(SUBPHASE_VAPOR, pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ(), false);
+                }
+
+                // switch sides
+                m_bIsLeftSide = !m_bIsLeftSide;
+                break;
+            case PHASE_TRANSITION:
+                // switch back to ground combat from flight transition
+                m_uiPhase = PHASE_GROUND;
+                SetCombatMovement(true);
+                m_creature->SetLevitate(false);
+                DoStartMovement(m_creature->getVictim());
+                break;
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            if (pTarget->GetTypeId() == TYPEID_PLAYER && pSpell->Id == SPELL_ENCAPSULATE_CHANNEL)
+            {
+                pTarget->CastSpell(pTarget, SPELL_ENCAPSULATE, true, NULL, NULL, m_creature->GetObjectGuid());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiMovementTimer)
+            {
+                if (m_uiMovementTimer <= uiDiff)
+                {
+                    m_creature->SetLevitate(true);
+                    m_creature->GetMotionMaster()->MovePoint(PHASE_GROUND, m_creature->GetPositionX(), m_creature->GetPositionY(), 50.083f, false);
+                    m_uiMovementTimer = 0;
+                }
+                else
+                {
+                    m_uiMovementTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_GROUND:
+
+                if (m_uiCleaveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                    {
+                        m_uiCleaveTimer = urand(2000, 5000);
+                    }
+                }
+                else
+                {
+                    m_uiCleaveTimer -= uiDiff;
+                }
+
+                if (m_uiCorrosionTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CORROSION) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BREATH, m_creature);
+                        m_uiCorrosionTimer = 30000;
+                    }
+                }
+                else
+                {
+                    m_uiCorrosionTimer -= uiDiff;
+                }
+
+                if (m_uiGasNovaTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_GAS_NOVA) == CAST_OK)
+                    {
+                        m_uiGasNovaTimer = 23000;
+                    }
+                }
+                else
+                {
+                    m_uiGasNovaTimer -= uiDiff;
+                }
+
+                if (m_uiEncapsulateTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_ENCAPSULATE_CHANNEL) == CAST_OK)
+                        {
+                            m_uiEncapsulateTimer = urand(30000, 40000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiEncapsulateTimer -= uiDiff;
+                }
+
+                if (m_uiFlyPhaseTimer < uiDiff)
+                {
+                    DoScriptText(SAY_TAKEOFF, m_creature);
+
+                    SetCombatMovement(false);
+                    m_creature->SetLevitate(true);
+                    m_creature->GetMotionMaster()->MoveIdle();
+                    m_creature->GetMotionMaster()->MovePoint(PHASE_AIR, m_creature->GetPositionX(), m_creature->GetPositionY(), 50.083f, false);
+
+                    m_uiPhase = PHASE_TRANSITION;
+                    m_uiSubPhase = SUBPHASE_VAPOR;
+                    m_uiDemonicVaporTimer = 1000;
+                    m_uiDemonicVaporCount = 0;
+                    m_uiFlyPhaseTimer = 60000;
+                }
+                else
+                {
+                    m_uiFlyPhaseTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+
+                break;
+            case PHASE_AIR:
+
+                switch (m_uiSubPhase)
+                {
+                case SUBPHASE_VAPOR:
+
+                    if (m_uiDemonicVaporTimer < uiDiff)
+                    {
+                        // After the second Demonic Vapor trial, start the breath phase
+                        if (m_uiDemonicVaporCount == 2)
+                        {
+                            if (!m_pInstance)
+                            {
+                                return;
+                            }
+
+                            // select the side on which we want to fly
+                            m_bIsLeftSide = urand(0, 1) ? true : false;
+                            m_uiCorruptionCount = 0;
+                            m_uiSubPhase = SUBPHASE_BREATH_PREPARE;
+                            if (Creature* pTrigger = m_pInstance->GetSingleCreatureFromStorage(m_bIsLeftSide ? NPC_FLIGHT_TRIGGER_LEFT : NPC_FLIGHT_TRIGGER_RIGHT))
+                            {
+                                m_creature->GetMotionMaster()->MovePoint(SUBPHASE_VAPOR, pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ(), false);
+                            }
+                        }
+                        else
+                        {
+                            if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_VAPOR) == CAST_OK)
+                            {
+                                ++m_uiDemonicVaporCount;
+                                m_uiDemonicVaporTimer = 11000;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiDemonicVaporTimer -= uiDiff;
+                    }
+
+                    break;
+                case SUBPHASE_BREATH_PREPARE:
+
+                    if (m_uiCorruptionTimer)
+                    {
+                        if (m_uiCorruptionTimer <= uiDiff)
+                        {
+                            if (!m_pInstance)
+                            {
+                                return;
+                            }
+
+                            // Fly to trigger on the same side - choose a random index for the trigger
+                            m_uiCorruptionIndex = urand(0, 2);
+                            m_pInstance->SetData(TYPE_FELMYST_TRIGGER, uint32(m_uiCorruptionIndex));
+                            uint64 guid = m_pInstance->GetData64(m_bIsLeftSide ? TYPE_FELMYST_TRIGGER_LEFT : TYPE_FELMYST_TRIGGER_RIGHT);
+                            if (Creature* pTrigger = m_pInstance->instance->GetCreature(ObjectGuid(guid)))
+                            {
+                                m_creature->GetMotionMaster()->MovePoint(SUBPHASE_BREATH_PREPARE, pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ(), false);
+                            }
+
+                            m_uiSubPhase = SUBPHASE_BREATH_MOVE;
+                            m_uiCorruptionTimer = 0;
+                        }
+                        else
+                        {
+                            m_uiCorruptionTimer -= uiDiff;
+                        }
+                    }
+
+                    break;
+                case SUBPHASE_BREATH_MOVE:
+                    // nothing here; this is handled in MovementInform
+                    break;
+                }
+                break;
+            case PHASE_TRANSITION:
+                // nothing here; wait for transition to finish
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_felmystAI(pCreature);
+    }
+};
+
+/*######
+## npc_demonic_vapor
+######*/
+
+struct npc_demonic_vapor : public CreatureScript
+{
+    npc_demonic_vapor() : CreatureScript("npc_demonic_vapor") {}
+
+    struct npc_demonic_vaporAI : public ScriptedAI
+    {
+        npc_demonic_vaporAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void Reset() override
+        {
+            // Start following the summoner (player)
+            if (m_creature->IsTemporarySummon())
+            {
+                TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+                if (Player* pSummoner = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                {
+                    m_creature->GetMotionMaster()->MoveFollow(pSummoner, 0, 0);
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_DEMONIC_VAPOR_TRAIL)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_DEMONIC_VAPOR, true);
+            }
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_demonic_vaporAI(pCreature);
+    }
+};
+
+void AddSC_boss_felmyst()
+{
+    Script* s;
+
+    s = new boss_felmyst();
+    s->RegisterSelf();
+    s = new npc_demonic_vapor();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_felmyst";
+    //pNewScript->GetAI = &GetAI_boss_felmyst;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_demonic_vapor";
+    //pNewScript->GetAI = &GetAI_npc_demonic_vapor;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
new file mode 100644
index 000000000..46e8612f2
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
@@ -0,0 +1,750 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Kalecgos
+SD%Complete: 70
+SDComment: Timers;
+SDCategory: Sunwell Plateau
+EndScriptData */
+
+#include "precompiled.h"
+#include "sunwell_plateau.h"
+
+enum
+{
+    // kalecgos dragon form
+    SAY_EVIL_AGGRO                  = -1580000,
+    SAY_EVIL_SPELL_1                = -1580001,
+    SAY_EVIL_SPELL_2                = -1580002,
+    SAY_EVIL_SLAY_1                 = -1580003,
+    SAY_EVIL_SLAY_2                 = -1580004,
+    SAY_EVIL_ENRAGE                 = -1580005,
+
+    // kalecgos humanoid form
+    SAY_GOOD_AGGRO                  = -1580006,
+    SAY_GOOD_NEAR_DEATH_20          = -1580007,
+    SAY_GOOD_NEAR_DEATH_10          = -1580008,
+    SAY_GOOD_PLRWIN                 = -1580009,
+
+    SAY_SATH_AGGRO                  = -1580010,
+    SAY_SATH_DEATH                  = -1580011,
+    SAY_SATH_SPELL_1                = -1580012,
+    SAY_SATH_SPELL_2                = -1580013,
+    SAY_SATH_SLAY_1                 = -1580014,
+    SAY_SATH_SLAY_2                 = -1580015,
+    SAY_SATH_ENRAGE                 = -1580016,
+
+    // Kalecgos
+    SPELL_SPECTRAL_BLAST            = 44869,
+    SPELL_SPECTRAL_REALM_NOTIFY     = 44845,        // cast by the players on teleport to notify boss
+    SPELL_ARCANE_BUFFET             = 45018,
+    SPELL_FROST_BREATH              = 44799,
+    SPELL_TAIL_LASH                 = 45122,
+    SPELL_CRAZED_RAGE               = 44807,
+
+    // Kalecgos human
+    SPELL_HEROIC_STRIKE             = 45026,
+    SPELL_REVITALIZE                = 45027,
+
+    // Sathrovarr
+    SPELL_SPECTRAL_INVISIBILITY     = 44801,
+    SPELL_CORRUPTING_STRIKE         = 45029,
+    SPELL_CURSE_OF_BOUNDLESS_AGONY  = 45032,
+    SPELL_SHADOW_BOLT_VOLLEY        = 45031,
+
+    // Misc
+    SPELL_BANISH                    = 44836
+};
+
+static const uint32 aWildMagicSpells[6] = {44978, 45001, 45002, 45004, 45006, 45010};
+static const float aKalecHumanLoc[4] = {1709.094f, 927.5035f, -74.28364f, 2.932153f};
+
+/*######
+## boss_kalecgos
+######*/
+
+struct boss_kalecgos : public CreatureScript
+{
+    boss_kalecgos() : CreatureScript("boss_kalecgos") {}
+
+    struct boss_kalecgosAI : public ScriptedAI
+    {
+        boss_kalecgosAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiArcaneBuffetTimer;
+        uint32 m_uiFrostBreathTimer;
+        uint32 m_uiWildMagicTimer;
+        uint32 m_uiSpectralBlastTimer;
+        uint32 m_uiTailLashTimer;
+        uint32 m_uiExitTimer;
+
+        bool m_bIsUncorrupted;
+        bool m_bIsBanished;
+        bool m_bIsEnraged;
+
+        void Reset() override
+        {
+            m_uiArcaneBuffetTimer = 8000;
+            m_uiTailLashTimer = 5000;
+            m_uiFrostBreathTimer = 24000;
+            m_uiWildMagicTimer = 18000;
+            m_uiSpectralBlastTimer = 30000;
+            m_uiExitTimer = 0;
+
+            m_bIsUncorrupted = false;
+            m_bIsBanished = false;
+            m_bIsEnraged = false;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KALECGOS_EJECT_SPECTRAL, 0);
+                m_pInstance->SetData(TYPE_KALECGOS, FAIL);
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            // Check if the boss is uncorrupted when evading
+            if (m_bIsUncorrupted)
+            {
+                m_creature->RemoveAllAurasOnEvade();
+                m_creature->DeleteThreatList();
+                m_creature->CombatStop(true);
+                m_creature->LoadCreatureAddon(true);
+
+                m_creature->SetLootRecipient(NULL);
+                m_creature->GetMotionMaster()->MoveIdle();
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                return;
+            }
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_EVIL_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KALECGOS, IN_PROGRESS);
+            }
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (uiDamage > m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                // If Sathrovarr is not banished yet, then banish the boss
+                if (!m_bIsUncorrupted)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BANISH, CAST_TRIGGERED) == CAST_OK)
+                    {
+                        m_bIsBanished = true;
+                    }
+                }
+                else
+                {
+                    DoStartOutro();
+                }
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_EVIL_SLAY_1 : SAY_EVIL_SLAY_2, m_creature);
+        }
+
+        void DoStartOutro()
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // Bring Sathrovarr in the normal realm and kill him
+            if (Creature* pSathrovarr = m_pInstance->GetSingleCreatureFromStorage(NPC_SATHROVARR))
+            {
+                // The teleport spell doesn't work right for this, so we need to teleport him manually
+                pSathrovarr->NearTeleportTo(1704.34f, 928.17f, 53.08f, 0);
+                pSathrovarr->DealDamage(pSathrovarr, pSathrovarr->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+            }
+
+            if (Creature* pKalec = m_pInstance->GetSingleCreatureFromStorage(NPC_KALECGOS_HUMAN))
+            {
+                pKalec->ForcedDespawn();
+            }
+
+            EnterEvadeMode();
+            m_creature->SetFactionTemporary(35, TEMPFACTION_RESTORE_RESPAWN);
+            m_creature->GetMotionMaster()->MoveIdle();
+            DoScriptText(SAY_GOOD_PLRWIN, m_creature);
+            m_uiExitTimer = 10000;
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            if (uiPointId)
+            {
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_KALECGOS, DONE);
+                }
+
+                m_creature->ForcedDespawn(1000);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && m_pInstance)
+                m_pInstance->SetData64(TYPE_KALECGOS, pInvoker->GetObjectGuid().GetRawValue()); //AddToSpectralRealm(pInvoker->GetObjectGuid());
+            else if (eventType == AI_EVENT_CUSTOM_B && pSender == m_creature)
+                m_bIsUncorrupted = true;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiExitTimer)
+            {
+                if (m_uiExitTimer <= uiDiff)
+                {
+                    float fX, fY, fZ;
+                    m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 30.0f, fX, fY, fZ);
+                    fZ = 70.0f;
+
+                    m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+                    m_creature->SetLevitate(true);
+                    m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                    m_uiExitTimer = 0;
+                }
+                else
+                {
+                    m_uiExitTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_bIsBanished)
+            {
+                // When Sathrovarr is banished then start outro
+                if (m_bIsUncorrupted)
+                {
+                    DoStartOutro();
+                }
+
+                // return when banished
+                return;
+            }
+
+            if (!m_bIsEnraged && m_creature->GetHealthPercent() < 10.0f)
+            {
+                // If the boss already has the aura, then mark the enraged as true
+                if (m_creature->HasAura(SPELL_CRAZED_RAGE))
+                {
+                    m_bIsEnraged = true;
+                }
+                else
+                {
+                    // Spell is targeting both bosses
+                    if (DoCastSpellIfCan(m_creature, SPELL_CRAZED_RAGE) == CAST_OK)
+                    {
+                        m_bIsEnraged = true;
+                    }
+                }
+            }
+
+            if (m_uiArcaneBuffetTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ARCANE_BUFFET) == CAST_OK)
+                {
+                    if (!urand(0, 2))
+                    {
+                        DoScriptText(SAY_EVIL_SPELL_1, m_creature);
+                    }
+
+                    m_uiArcaneBuffetTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiArcaneBuffetTimer -= uiDiff;
+            }
+
+            if (m_uiFrostBreathTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROST_BREATH) == CAST_OK)
+                {
+                    if (!urand(0, 1))
+                    {
+                        DoScriptText(SAY_EVIL_SPELL_2, m_creature);
+                    }
+
+                    m_uiFrostBreathTimer = 25000;
+                }
+            }
+            else
+            {
+                m_uiFrostBreathTimer -= uiDiff;
+            }
+
+            if (m_uiTailLashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TAIL_LASH) == CAST_OK)
+                {
+                    m_uiTailLashTimer = urand(10000, 20000);
+                }
+            }
+            else
+            {
+                m_uiTailLashTimer -= uiDiff;
+            }
+
+            if (m_uiWildMagicTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, aWildMagicSpells[urand(0, 5)]) == CAST_OK)
+                    {
+                        m_uiWildMagicTimer = 19000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiWildMagicTimer -= uiDiff;
+            }
+
+            if (m_uiSpectralBlastTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SPECTRAL_BLAST) == CAST_OK)
+                {
+                    m_uiSpectralBlastTimer = 25000;
+                }
+            }
+            else
+            {
+                m_uiSpectralBlastTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_kalecgosAI(pCreature);
+    }
+};
+
+/*######
+## boss_sathrovarr
+######*/
+
+struct boss_sathrovarr : public CreatureScript
+{
+    boss_sathrovarr() : CreatureScript("boss_sathrovarr") {}
+
+    struct boss_sathrovarrAI : public ScriptedAI
+    {
+        boss_sathrovarrAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiCorruptingStrikeTimer;
+        uint32 m_uiCurseOfBoundlessAgonyTimer;
+        uint32 m_uiShadowBoltVolleyTimer;
+        bool m_bIsBanished;
+        bool m_bIsEnraged;
+
+        void Reset() override
+        {
+            // FIXME: Timers
+            m_uiCorruptingStrikeTimer = 5000;
+            m_uiCurseOfBoundlessAgonyTimer = 15000;
+            m_uiShadowBoltVolleyTimer = 10000;
+
+            m_bIsBanished = false;
+            m_bIsEnraged = false;
+
+            DoCastSpellIfCan(m_creature, SPELL_SPECTRAL_INVISIBILITY);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_SATH_AGGRO, m_creature);
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // spawn human Kalec; he starts to attack
+            m_creature->SummonCreature(NPC_KALECGOS_HUMAN, aKalecHumanLoc[0], aKalecHumanLoc[1], aKalecHumanLoc[2], aKalecHumanLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0, true);
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (uiDamage > m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                if (m_bIsBanished)
+                    return;
+
+                // banish Sathrovarr and eject the players
+                if (DoCastSpellIfCan(m_creature, SPELL_BANISH, CAST_TRIGGERED) == CAST_OK)
+                {
+                    m_bIsBanished = true;
+                }
+
+                if (!m_pInstance)
+                {
+                    return;
+                }
+
+                if (Creature* pKalecgos = m_pInstance->GetSingleCreatureFromStorage(NPC_KALECGOS_DRAGON))
+                {
+                    if (CreatureAI* pKalecgosAI = pKalecgos->AI())
+                    {
+                        pKalecgosAI->ReceiveAIEvent(AI_EVENT_CUSTOM_B, pKalecgos, pKalecgos, 0);
+                    }
+                }
+
+                m_pInstance->SetData(TYPE_KALECGOS_EJECT_SPECTRAL, 0);
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SATH_SLAY_1 : SAY_SATH_SLAY_2, m_creature);
+
+            // !!! Workaround which ejects the players from the spectral realm on death !!!
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                pVictim->CastSpell(pVictim, SPELL_TELEPORT_NORMAL_REALM, true);
+                pVictim->CastSpell(pVictim, SPELL_SPECTRAL_EXHAUSTION, true);
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // !!! Workaround which ejects the players from the spectral realm !!!
+            if (pWho->GetTypeId() == TYPEID_PLAYER && pWho->IsWithinLOSInMap(m_creature) && pWho->IsWithinDistInMap(m_creature, 75.0f))
+            {
+                if (!pWho->HasAura(SPELL_SPECTRAL_REALM_AURA))
+                {
+                    pWho->CastSpell(pWho, SPELL_TELEPORT_NORMAL_REALM, true);
+                    pWho->CastSpell(pWho, SPELL_SPECTRAL_EXHAUSTION, true);
+
+                    if (m_pInstance)
+                        m_pInstance->SetData64(TYPE_KALECGOS_EJECT_SPECTRAL, pWho->GetObjectGuid().GetRawValue());  //RemoveFromSpectralRealm(pWho->GetObjectGuid());
+                }
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_SATH_DEATH, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_KALECGOS_HUMAN)
+                pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && m_pInstance)
+                m_pInstance->SetData64(TYPE_KALECGOS, pInvoker->GetObjectGuid().GetRawValue());
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_bIsBanished)
+            {
+                return;
+            }
+
+            if (!m_bIsEnraged && m_creature->GetHealthPercent() < 10.0f)
+            {
+                // If the boss already has the aura, then mark the enraged as true
+                if (m_creature->HasAura(SPELL_CRAZED_RAGE))
+                {
+                    m_bIsEnraged = true;
+                }
+                else
+                {
+                    // Spell is targeting both bosses
+                    if (DoCastSpellIfCan(m_creature, SPELL_CRAZED_RAGE) == CAST_OK)
+                    {
+                        m_bIsEnraged = true;
+                    }
+                }
+            }
+
+            if (m_uiCorruptingStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CORRUPTING_STRIKE) == CAST_OK)
+                {
+                    if (!urand(0, 1))
+                    {
+                        DoScriptText(SAY_SATH_SPELL_2, m_creature);
+                    }
+
+                    m_uiCorruptingStrikeTimer = 13000;
+                }
+            }
+            else
+            {
+                m_uiCorruptingStrikeTimer -= uiDiff;
+            }
+
+            if (m_uiCurseOfBoundlessAgonyTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_CURSE_OF_BOUNDLESS_AGONY) == CAST_OK)
+                    {
+                        m_uiCurseOfBoundlessAgonyTimer = 35000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiCurseOfBoundlessAgonyTimer -= uiDiff;
+            }
+
+            if (m_uiShadowBoltVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHADOW_BOLT_VOLLEY) == CAST_OK)
+                {
+                    if (!urand(0, 1))
+                    {
+                        DoScriptText(SAY_SATH_SPELL_1, m_creature);
+                    }
+
+                    m_uiShadowBoltVolleyTimer = 15000;
+                }
+            }
+            else
+            {
+                m_uiShadowBoltVolleyTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_sathrovarrAI(pCreature);
+    }
+};
+
+/*######
+## boss_kalecgos_humanoid
+######*/
+
+struct boss_kalecgos_humanoid : public CreatureScript
+{
+    boss_kalecgos_humanoid() : CreatureScript("boss_kalecgos_humanoid") {}
+
+    struct boss_kalecgos_humanoidAI : public ScriptedAI
+    {
+        boss_kalecgos_humanoidAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiRevitalizeTimer;
+        uint32 m_uiHeroicStrikeTimer;
+
+        bool m_bHasYelled10Percent;
+        bool m_bHasYelled20Percent;
+
+        void Reset() override
+        {
+            // TODO: Times!
+            m_uiRevitalizeTimer = 30000;
+            m_uiHeroicStrikeTimer = 8000;
+
+            m_bHasYelled10Percent = false;
+            m_bHasYelled20Percent = false;
+
+            DoCastSpellIfCan(m_creature, SPELL_SPECTRAL_INVISIBILITY);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_GOOD_AGGRO, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KALECGOS_EJECT_SPECTRAL, 0);
+                m_pInstance->SetData(TYPE_KALECGOS, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiRevitalizeTimer < uiDiff)
+            {
+                // Cast on self because spell has target "all friendly units around the caster"
+                if (DoCastSpellIfCan(m_creature, SPELL_REVITALIZE) == CAST_OK)
+                {
+                    m_uiRevitalizeTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiRevitalizeTimer -= uiDiff;
+            }
+
+            if (m_uiHeroicStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HEROIC_STRIKE) == CAST_OK)
+                {
+                    m_uiHeroicStrikeTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiHeroicStrikeTimer -= uiDiff;
+            }
+
+            if (m_creature->GetHealthPercent() < 20.0f && !m_bHasYelled20Percent)
+            {
+                DoScriptText(SAY_GOOD_NEAR_DEATH_20, m_creature);
+                m_bHasYelled20Percent = true;
+            }
+
+            if (m_creature->GetHealthPercent() < 10.0f && !m_bHasYelled10Percent)
+            {
+                DoScriptText(SAY_GOOD_NEAR_DEATH_10, m_creature);
+                m_bHasYelled10Percent = true;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_kalecgos_humanoidAI(pCreature);
+    }
+};
+
+struct spell_spectral_realm_notify : public SpellScript
+{
+    spell_spectral_realm_notify() : SpellScript("spell_spectral_realm_notify") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_SPECTRAL_REALM_NOTIFY && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (pCaster->GetTypeId() == TYPEID_PLAYER)
+                pTarget->ToCreature()->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pTarget->ToCreature());
+
+            return true;
+        }
+
+        return true;
+    }
+};
+
+void AddSC_boss_kalecgos()
+{
+    Script* s;
+
+    s = new spell_spectral_realm_notify();
+    s->RegisterSelf();
+    s = new boss_kalecgos();
+    s->RegisterSelf();
+    s = new boss_sathrovarr();
+    s->RegisterSelf();
+    s = new boss_kalecgos_humanoid();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_kalecgos";
+    //pNewScript->GetAI = &GetAI_boss_kalecgos;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_spectral_realm_notify;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_sathrovarr";
+    //pNewScript->GetAI = &GetAI_boss_sathrovarr;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_spectral_realm_notify;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_kalecgos_humanoid";
+    //pNewScript->GetAI = &GetAI_boss_kalecgos_humanoid;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_spectral_realm_notify;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
new file mode 100644
index 000000000..9edb19436
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
@@ -0,0 +1,1018 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_kiljaeden
+SD%Complete: 90
+SDComment: Sinister Reflection needs AI support.
+SDCategory: Sunwell Plateau
+EndScriptData */
+
+#include "precompiled.h"
+#include "sunwell_plateau.h"
+#include "TemporarySummon.h"
+
+enum
+{
+    SAY_EMERGE                  = -1580069,
+    SAY_SLAY_1                  = -1580070,
+    SAY_SLAY_2                  = -1580071,
+    SAY_REFLECTION_1            = -1580072,
+    SAY_REFLECTION_2            = -1580073,
+    SAY_DARKNESS_1              = -1580074,
+    SAY_DARKNESS_2              = -1580075,
+    SAY_DARKNESS_3              = -1580076,
+    SAY_PHASE_3                 = -1580077,
+    SAY_PHASE_4                 = -1580078,
+    SAY_PHASE_5                 = -1580079,
+    SAY_KALECGOS_INTRO          = -1580080,
+    SAY_KALECGOS_AWAKE_1        = -1580081,
+    SAY_ANVEENA_IMPRISONED      = -1580082,
+    SAY_KALECGOS_AWAKE_2        = -1580083,
+    SAY_ANVEENA_LOST            = -1580084,
+    SAY_KALECGOS_AWAKE_4        = -1580085,
+    SAY_ANVEENA_AWAKE           = -1580086,
+    SAY_KALECGOS_AWAKE_5        = -1580087,
+    SAY_ANVEENA_SACRIFICE       = -1580088,
+    SAY_KALECGOS_GOODBYE        = -1580089,
+    SAY_KALECGOS_ENCOURAGE      = -1580090,
+    SAY_KALECGOS_ORB_1          = -1580091,
+    SAY_KALECGOS_ORB_2          = -1580092,
+    SAY_KALECGOS_ORB_3          = -1580093,
+    SAY_KALECGOS_ORB_4          = -1580094,
+
+    // outro
+    SAY_OUTRO_1                 = -1580095,         // Velen
+    SAY_OUTRO_2                 = -1580096,
+    SAY_OUTRO_3                 = -1580097,
+    SAY_OUTRO_4                 = -1580098,
+    SAY_OUTRO_5                 = -1580099,         // Liadrin
+    SAY_OUTRO_6                 = -1580100,         // Velen
+    SAY_OUTRO_7                 = -1580101,         // Liadrin
+    SAY_OUTRO_8                 = -1580102,         // Velen
+    SAY_OUTRO_9                 = -1580103,
+    SAY_OUTRO_10                = -1580104,         // Liadrin
+    SAY_OUTRO_11                = -1580105,         // Velen
+    SAY_OUTRO_12                = -1580106,
+
+    // generic spells
+    SPELL_BIRTH                 = 37745,            // Kiljaeden spawn animation
+
+    // transition spells
+    SPELL_DESTROY_DRAKES        = 46707,
+    SPELL_SINISTER_REFLECTION   = 45892,
+    SPELL_SHADOW_SPIKE          = 46680,
+
+    // phase 1
+    SPELL_SOUL_FLY              = 45442,
+    SPELL_LEGION_LIGHTING       = 45664,
+    SPELL_FIRE_BLOOM            = 45641,
+
+    // phase 2
+    SPELL_FLAME_DART            = 45740,
+    SPELL_DARKNESS_OF_SOULS     = 46605,
+
+    // phase 3
+    SPELL_ARMAGEDDON            = 45921,        // used from 50% hp - summons 25735 on target location
+
+    // Npc spells
+    SPELL_SHADOW_BOLT_AURA      = 45679,        // periodic aura on shield orbs
+    SPELL_RING_BLUE_FLAME       = 45825,        // cast by the orb targets when activated
+    SPELL_ANVEENA_PRISON        = 46367,
+    SPELL_SACRIFICE_ANVEENA     = 46474,
+    SPELL_ARCANE_BOLT           = 45670,        // used by Kalec
+    SPELL_SINISTER_REFL_CLASS   = 45893,        // increase the size of the clones
+    SPELL_SINISTER_REFL_CLONE   = 45785,        // clone the player
+    SPELL_VENGEANCE_BLUE_FLIGHT = 45839,        // possess the dragon
+    SPELL_POSSESS_DRAKE_IMMUNE  = 45838,        // immunity while the player possesses the dragon
+
+    // Npcs
+    NPC_SHIELD_ORB              = 25502,
+    NPC_SINISTER_REFLECTION     = 25708,
+    NPC_ARMAGEDDON              = 25735,        // npc handled by eventAI
+    NPC_BLUE_ORB_TARGET         = 25640,        // dummy npc near gameobjects 187869, 188114, 188115, 188116
+
+    // phases
+    PHASE_INFERNO               = 1,
+    PHASE_DARKNESS              = 2,
+    PHASE_ARMAGEDDON            = 3,
+    PHASE_SACRIFICE             = 4,
+    PHASE_TRANSITION            = 5,
+
+    // dummy members, used in the phase switch event
+    EVENT_SWITCH_PHASE_2        = 6,
+    EVENT_SWITCH_PHASE_3        = 7,
+    EVENT_SWITCH_PHASE_4        = 8,
+    EVENT_DRAGON_ORB            = 9,
+
+    // outro
+    SPELL_TELEPORT_VISUAL       = 12980,
+    SPELL_KALEC_TELEPORT        = 46473,            // teleports and transforms Kalec in human form
+    SPELL_ARCANE_PORTAL         = 42047,
+    SPELL_CALL_ENTROPIUS        = 46818,
+    SPELL_ENTROPIUS_BODY        = 46819,
+    SPELL_BLAZE_TO_LIGHT        = 46821,
+    SPELL_SUNWELL_IGNITION      = 46822,
+
+    NPC_INERT_PORTAL            = 26254,
+    NPC_CORE_ENTROPIUS          = 26262,
+    NPC_SOLDIER                 = 26259,            // summoned in 2 waves before Velen. Should move into 2 circle formations
+    NPC_RIFTWALKER              = 26289,
+
+    POINT_SUMMON_SOLDIERS       = 1,
+    POINT_MOVE_LIADRIN          = 2,
+    POINT_EVENT_EXIT            = 3,
+};
+
+// Encounter phase dialogue
+static const DialogueEntry aPhaseDialogue[] =
+{
+    {PHASE_DARKNESS,            0,              2000},
+    {EVENT_SWITCH_PHASE_2,      0,              17000},
+    {SAY_KALECGOS_AWAKE_1,      NPC_KALECGOS,   6000},
+    {SAY_ANVEENA_IMPRISONED,    NPC_ANVEENA,    5000},
+    {SAY_PHASE_3,               NPC_KILJAEDEN,  6000},
+    {SAY_KALECGOS_ORB_1,        NPC_KALECGOS,   0},         // phase 2 transition end
+    {PHASE_ARMAGEDDON,          0,              2000},
+    {EVENT_SWITCH_PHASE_3,      0,              14000},
+    {SAY_KALECGOS_AWAKE_2,      NPC_KALECGOS,   7000},
+    {SAY_ANVEENA_LOST,          NPC_ANVEENA,    7000},
+    {SAY_PHASE_4,               NPC_KILJAEDEN,  6000},
+    {EVENT_DRAGON_ORB,          0,              0},         // phase 3 transition end
+    {PHASE_SACRIFICE,           0,              2000},
+    {EVENT_SWITCH_PHASE_4,      0,              5000},
+    {SAY_KALECGOS_AWAKE_4,      NPC_KALECGOS,   10000},
+    {SAY_ANVEENA_AWAKE,         NPC_ANVEENA,    2000},
+    {SAY_KALECGOS_AWAKE_5,      NPC_KALECGOS,   6000},
+    {SAY_ANVEENA_SACRIFICE,     NPC_ANVEENA,    5000},
+    {SAY_PHASE_5,               NPC_KILJAEDEN,  13000},
+    {SAY_KALECGOS_ORB_4,        NPC_KALECGOS,   5000},
+    {SAY_KALECGOS_ENCOURAGE,    NPC_KALECGOS,   0},         // phase 4 transition end
+    {0, 0, 0},
+};
+
+// Epilogue dialogue
+static const DialogueEntry aOutroDialogue[] =
+{
+    {NPC_KALECGOS,          0,              15000},
+    {SAY_KALECGOS_GOODBYE,  NPC_KALECGOS,   40000},
+    {NPC_INERT_PORTAL,      0,              10000},
+    {POINT_SUMMON_SOLDIERS, 0,              18000},
+    {NPC_VELEN,             0,              1000},
+    {NPC_LIADRIN,           0,              4000},
+    {SAY_OUTRO_1,           NPC_VELEN,      25000},
+    {SAY_OUTRO_2,           NPC_VELEN,      15000},
+    {SAY_OUTRO_3,           NPC_VELEN,      13000},
+    {SPELL_CALL_ENTROPIUS,  0,              10000},
+    {SAY_OUTRO_4,           NPC_VELEN,      20000},
+    {POINT_MOVE_LIADRIN,    0,              5000},
+    {SAY_OUTRO_5,           NPC_LIADRIN,    10000},
+    {SAY_OUTRO_6,           NPC_VELEN,      15000},
+    {SAY_OUTRO_7,           NPC_LIADRIN,    3000},
+    {SAY_OUTRO_8,           NPC_VELEN,      4000},
+    {SPELL_BLAZE_TO_LIGHT,  0,              13000},
+    {SAY_OUTRO_9,           NPC_VELEN,      14000},
+    {SAY_OUTRO_10,          NPC_LIADRIN,    20000},
+    {SAY_OUTRO_11,          NPC_VELEN,      8000},
+    {SAY_OUTRO_12,          NPC_VELEN,      4000},
+    {POINT_EVENT_EXIT,      0,              0},
+    {0, 0, 0},
+};
+
+static const EventLocations aOutroLocations[] =
+{
+    {1725.469f, 650.939f, 30.314f, 3.78f},      // portal summon loc
+    {1717.776f, 645.178f, 28.223f, 3.83f},      // velen summon loc
+    {1720.024f, 643.233f, 28.133f, 3.76f},      // liadrin summon loc
+#if defined (CLASSIC) || defined (TBC)
+    {1712.110f, 641.044f, 27.80f},              // velen move forward
+    {1711.537f, 637.600f, 27.34f},              // liadrin move forward
+#endif
+#if defined (WOTLK) || defined (CATA)
+    {1712.110f, 641.044f, 27.80f,  0},          // velen move forward
+    {1711.537f, 637.600f, 27.34f,  0},          // liadrin move forward
+#endif
+    {1698.946f, 628.206f, 83.003f, 0.76f},      // entropius core summon loc
+};
+
+// Note: the Z loc should be 143.69 but currently we are not using it because it's too far away
+static const float aKalegSpawnLoc[4] = {1734.431f, 593.1974f, 130.6977f, 4.55f};
+
+/*######
+## npc_kiljaeden_controller
+######*/
+
+struct npc_kiljaeden_controller : public CreatureScript
+{
+    npc_kiljaeden_controller() : CreatureScript("npc_kiljaeden_controller") {}
+
+    struct npc_kiljaeden_controllerAI : public Scripted_NoMovementAI, private DialogueHelper
+    {
+        npc_kiljaeden_controllerAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature),
+        DialogueHelper(aOutroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        ObjectGuid m_EntropiusGuid;
+        ObjectGuid m_PortalGuid;
+
+        void Reset() override
+        {
+            // Visual spell before the encounter starts
+            DoCastSpellIfCan(m_creature, SPELL_ANVEENA_DRAIN);
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            switch (iEntry)
+            {
+            case NPC_KALECGOS:
+                if (Creature* pKalec = m_pInstance->GetSingleCreatureFromStorage(NPC_KALECGOS))
+                {
+                    pKalec->GetMotionMaster()->Clear();
+                    pKalec->GetMotionMaster()->MoveIdle();
+                    pKalec->CastSpell(pKalec, SPELL_KALEC_TELEPORT, true);
+                    pKalec->SetLevitate(false);
+                }
+                m_creature->SummonCreature(NPC_CORE_ENTROPIUS, aOutroLocations[5].m_fX, aOutroLocations[5].m_fY, aOutroLocations[5].m_fZ, aOutroLocations[5].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                break;
+            case NPC_INERT_PORTAL:
+                // ToDo: summon soldiers to the right
+                m_creature->SummonCreature(NPC_INERT_PORTAL, aOutroLocations[0].m_fX, aOutroLocations[0].m_fY, aOutroLocations[0].m_fZ, aOutroLocations[0].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                break;
+            case POINT_SUMMON_SOLDIERS:
+                // ToDo: summon soldiers to the left
+                break;
+            case NPC_VELEN:
+                m_creature->SummonCreature(NPC_VELEN, aOutroLocations[1].m_fX, aOutroLocations[1].m_fY, aOutroLocations[1].m_fZ, aOutroLocations[1].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                break;
+            case NPC_LIADRIN:
+                m_creature->SummonCreature(NPC_LIADRIN, aOutroLocations[2].m_fX, aOutroLocations[2].m_fY, aOutroLocations[2].m_fZ, aOutroLocations[2].m_fO, TEMPSUMMON_TIMED_DESPAWN, 4 * MINUTE * IN_MILLISECONDS);
+                break;
+            case SPELL_CALL_ENTROPIUS:
+                if (Creature* pVelen = m_pInstance->GetSingleCreatureFromStorage(NPC_VELEN))
+                {
+                    pVelen->CastSpell(pVelen, SPELL_CALL_ENTROPIUS, false);
+                }
+                // Set point id = 1 for movement event
+                if (Creature* pEntropius = m_creature->GetMap()->GetCreature(m_EntropiusGuid))
+                {
+                    pEntropius->SetWalk(false);
+                    pEntropius->GetMotionMaster()->MovePoint(1, m_creature->GetPositionX(), m_creature->GetPositionY(), 35.0f);
+                }
+                break;
+            case POINT_MOVE_LIADRIN:
+                if (Creature* pLiadrin = m_pInstance->GetSingleCreatureFromStorage(NPC_LIADRIN))
+                {
+                    pLiadrin->GetMotionMaster()->MovePoint(0, aOutroLocations[4].m_fX, aOutroLocations[4].m_fY, aOutroLocations[4].m_fZ);
+                }
+                break;
+            case SPELL_BLAZE_TO_LIGHT:
+                if (Creature* pEntropius = m_creature->GetMap()->GetCreature(m_EntropiusGuid))
+                {
+                    pEntropius->CastSpell(pEntropius, SPELL_BLAZE_TO_LIGHT, true);
+                    pEntropius->RemoveAurasDueToSpell(SPELL_ENTROPIUS_BODY);
+                    pEntropius->SetWalk(true);
+                    pEntropius->GetMotionMaster()->MovePoint(2, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+                }
+                break;
+            case POINT_EVENT_EXIT:
+                // Set point id = 1 for the despawn event
+                if (Creature* pVelen = m_pInstance->GetSingleCreatureFromStorage(NPC_VELEN))
+                {
+                    pVelen->GetMotionMaster()->MovePoint(1, aOutroLocations[1].m_fX, aOutroLocations[1].m_fY, aOutroLocations[1].m_fZ);
+                }
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_VELEN:
+                pSummoned->GetMotionMaster()->MovePoint(0, aOutroLocations[3].m_fX, aOutroLocations[3].m_fY, aOutroLocations[3].m_fZ);
+                // no break here
+            case NPC_LIADRIN:
+                pSummoned->CastSpell(pSummoned, SPELL_TELEPORT_VISUAL, true);
+                break;
+            case NPC_CORE_ENTROPIUS:
+                pSummoned->CastSpell(pSummoned, SPELL_ENTROPIUS_BODY, true);
+                pSummoned->SetLevitate(true);
+                m_EntropiusGuid = pSummoned->GetObjectGuid();
+                break;
+            case NPC_INERT_PORTAL:
+                m_PortalGuid = pSummoned->GetObjectGuid();
+                pSummoned->CastSpell(pSummoned, SPELL_ARCANE_PORTAL, true);
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // Start outro dialogue when Kil'jaeden is killed
+            if (pSummoned->GetEntry() == NPC_KILJAEDEN)
+            {
+                StartNextDialogueText(NPC_KALECGOS);
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            if (uiPointId == 1)
+            {
+                if (pSummoned->GetEntry() == NPC_CORE_ENTROPIUS)
+                {
+                    // Interrupt Velen's casting when entropius has reached the ground
+                    if (Creature* pVelen = m_pInstance->GetSingleCreatureFromStorage(NPC_VELEN))
+                    {
+                        pVelen->InterruptNonMeleeSpells(false);
+                    }
+                }
+                else if (pSummoned->GetEntry() == NPC_VELEN)
+                {
+                    // Cast teleport and despawn Velen, the portal and Kalec; Liadrin will despawn on timer
+                    pSummoned->CastSpell(pSummoned, SPELL_TELEPORT_VISUAL, true);
+                    pSummoned->ForcedDespawn(1000);
+
+                    // Note: portal should despawn only after all the soldiers have reached this point and "teleported" outside
+                    if (Creature* pPortal = m_creature->GetMap()->GetCreature(m_PortalGuid))
+                    {
+                        pPortal->ForcedDespawn(5000);
+                    }
+
+                    if (Creature* pKalec = m_pInstance->GetSingleCreatureFromStorage(NPC_KALECGOS))
+                    {
+                        pKalec->ForcedDespawn(1000);
+                    }
+                }
+            }
+            else if (uiPointId == 2 && pSummoned->GetEntry() == NPC_CORE_ENTROPIUS)
+            {
+                // When the purified Muru reaches the ground the sunwell ignites and Muru despawns
+                DoCastSpellIfCan(m_creature, SPELL_SUNWELL_IGNITION);
+
+                if (Creature* pLiadrin = m_pInstance->GetSingleCreatureFromStorage(NPC_LIADRIN))
+                {
+                    pLiadrin->SetStandState(UNIT_STAND_STATE_KNEEL);
+                }
+
+                pSummoned->ForcedDespawn();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kiljaeden_controllerAI(pCreature);
+    }
+};
+
+/*######
+## boss_kiljaeden
+######*/
+
+struct boss_kiljaeden : public CreatureScript
+{
+    boss_kiljaeden() : CreatureScript("boss_kiljaeden") {}
+
+    struct boss_kiljaedenAI : public Scripted_NoMovementAI, private DialogueHelper
+    {
+        boss_kiljaedenAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature),
+        DialogueHelper(aPhaseDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+        uint8 m_uiMaxShieldOrbs;
+        uint8 m_uiShieldOrbCount;
+
+        uint32 m_uiKalecSummonTimer;
+
+        uint32 m_uiSoulFlyTimer;
+        uint32 m_uiLegionLightingTimer;
+        uint32 m_uiFireBloomTimer;
+        uint32 m_uiShieldOrbTimer;
+
+        uint32 m_uiFlameDartTimer;
+        uint32 m_uiDarknessOfSoulsTimer;
+
+        uint32 m_uiArmageddonTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_INFERNO;
+            m_uiKalecSummonTimer = 35000;
+            m_uiMaxShieldOrbs = 1;
+            m_uiShieldOrbCount = 0;
+
+            m_uiSoulFlyTimer = 10000;
+            m_uiLegionLightingTimer = urand(10000, 15000);
+            m_uiFireBloomTimer = urand(15000, 20000);
+            m_uiShieldOrbTimer = 30000;
+
+            m_uiFlameDartTimer = urand(20000, 25000);
+            m_uiDarknessOfSoulsTimer = urand(45000, 50000);
+
+            m_uiArmageddonTimer = 20000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KILJAEDEN, IN_PROGRESS);
+            }
+
+            DoScriptText(SAY_EMERGE, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_BIRTH);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KILJAEDEN, FAIL);
+
+                // Reset the corrupt Sunwell aura
+                if (Creature* pKiljaedenController = m_pInstance->GetSingleCreatureFromStorage(NPC_KILJAEDEN_CONTROLLER))
+                {
+                    pKiljaedenController->CastSpell(pKiljaedenController, SPELL_ANVEENA_DRAIN, true);
+                }
+            }
+
+            // Despawn on wipe
+            m_creature->ForcedDespawn();
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KILJAEDEN, DONE);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_KALECGOS)
+            {
+                DoScriptText(SAY_KALECGOS_INTRO, pSummoned);
+                pSummoned->CastSpell(pSummoned, SPELL_ARCANE_BOLT, true);
+                pSummoned->GetMotionMaster()->MoveRandomAroundPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), pSummoned->GetPositionZ(), 30.0f);
+            }
+            else if (pSummoned->GetEntry() == NPC_SHIELD_ORB)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_SHADOW_BOLT_AURA, true);
+
+                // Start the movement of the shadow orb - calculate new position based on the angle between the boss and orb
+                float fX, fY, fAng;
+                fAng = m_creature->GetAngle(pSummoned) + M_PI_F / 8;
+                // Normalize angle
+                if (fAng > 2 * M_PI_F)
+                {
+                    fAng = fAng - 2 * M_PI_F;
+                }
+
+                m_creature->GetNearPoint2D(fX, fY, 25.0f, fAng);
+
+                // Move to new position
+                pSummoned->GetMotionMaster()->Clear();
+                pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, pSummoned->GetPositionZ());
+            }
+            else if (pSummoned->GetEntry() == NPC_SINISTER_REFLECTION)
+            {
+                if (pSummoned->IsTemporarySummon())
+                {
+                    TemporarySummon* pTemporary = (TemporarySummon*)pSummoned;
+
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                    {
+                        pPlayer->CastSpell(pSummoned, SPELL_SINISTER_REFL_CLONE, true);
+                        pSummoned->CastSpell(pSummoned, SPELL_SINISTER_REFL_CLASS, true);
+                        pSummoned->AI()->AttackStart(pPlayer);
+                    }
+                }
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SHIELD_ORB)
+            {
+                --m_uiShieldOrbCount;
+            }
+        }
+
+        void GetAIInformation(ChatHandler& reader) override
+        {
+            reader.PSendSysMessage("Kil'jaeden is currently in phase %u", m_uiPhase);
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            switch (iEntry)
+            {
+            case PHASE_DARKNESS:
+            case PHASE_ARMAGEDDON:
+            case PHASE_SACRIFICE:
+                if (DoCastSpellIfCan(m_creature, SPELL_SINISTER_REFLECTION, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                {
+                    DoScriptText(irand(0, 1) ? SAY_REFLECTION_1 : SAY_REFLECTION_2, m_creature);
+
+                    // In the 2nd and 3rd transition kill all drakes
+                    if (iEntry == PHASE_ARMAGEDDON || iEntry == PHASE_SACRIFICE)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_DESTROY_DRAKES, CAST_TRIGGERED);
+                    }
+
+                    m_uiPhase = PHASE_TRANSITION;
+                    // Darkness of Souls needs the timer reseted
+                    m_uiDarknessOfSoulsTimer = iEntry == PHASE_SACRIFICE ? 30000 : 45000;
+                }
+                break;
+            case EVENT_SWITCH_PHASE_2:
+            case EVENT_SWITCH_PHASE_3:
+            case EVENT_SWITCH_PHASE_4:
+                DoCastSpellIfCan(m_creature, SPELL_SHADOW_SPIKE);
+                break;
+            case EVENT_DRAGON_ORB:
+                // Activate blue orbs
+                if (Creature* pKalec = m_pInstance->GetSingleCreatureFromStorage(NPC_KALECGOS))
+                {
+                    DoScriptText(irand(0, 1) ? SAY_KALECGOS_ORB_2 : SAY_KALECGOS_ORB_3, pKalec);
+                }
+                DoActivateDragonOrb(GO_ORB_BLUE_FLIGHT_2);
+                break;
+            case SAY_KALECGOS_ORB_1:
+                DoActivateDragonOrb(GO_ORB_BLUE_FLIGHT_1);
+                break;
+            case SAY_KALECGOS_ORB_4:
+                DoActivateDragonOrb(GO_ORB_BLUE_FLIGHT_3);
+                DoActivateDragonOrb(GO_ORB_BLUE_FLIGHT_4);
+                break;
+            case SAY_PHASE_3:
+                // Set next phase and increase the max shield orbs
+                m_uiPhase = PHASE_DARKNESS;
+                ++m_uiMaxShieldOrbs;
+                break;
+            case SAY_PHASE_4:
+                // Set next phase and increase the max shield orbs
+                m_uiPhase = PHASE_ARMAGEDDON;
+                ++m_uiMaxShieldOrbs;
+                break;
+            case SAY_PHASE_5:
+                // Set next phase and sacrifice Anveena
+                if (Creature* pAnveena = m_pInstance->GetSingleCreatureFromStorage(NPC_ANVEENA))
+                {
+                    pAnveena->RemoveAurasDueToSpell(SPELL_ANVEENA_PRISON);
+                    pAnveena->CastSpell(pAnveena, SPELL_SACRIFICE_ANVEENA, true);
+                    pAnveena->ForcedDespawn(3000);
+                }
+                m_uiPhase = PHASE_SACRIFICE;
+                break;
+            }
+        }
+
+        // Wrapper to activate dragon orbs
+        void DoActivateDragonOrb(uint32 uiEntry)
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // Set the visual around the Orb
+            if (GameObject* pGo = m_pInstance->GetSingleGameObjectFromStorage(uiEntry))
+            {
+                if (Creature* pTarget = GetClosestCreatureWithEntry(pGo, NPC_BLUE_ORB_TARGET, 5.0f))
+                {
+                    pTarget->CastSpell(pTarget, SPELL_RING_BLUE_FLAME, false);
+                }
+            }
+
+            // Make the orb usable
+            m_pInstance->DoToggleGameObjectFlags(uiEntry, GO_FLAG_NO_INTERACT, false);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DialogueUpdate(uiDiff);
+
+            switch (m_uiPhase)
+            {
+            case PHASE_TRANSITION:
+                // Transition phase is handled in the dialogue helper; however we don't want the spell timers to be decreased so we use a specific phase
+                break;
+            case PHASE_SACRIFICE:
+                // Final phase - use the same spells
+                // no break;
+            case PHASE_ARMAGEDDON:
+
+                // In the last phase he uses Armageddon continuously
+                if (m_uiArmageddonTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ARMAGEDDON) == CAST_OK)
+                    {
+                        m_uiArmageddonTimer = m_uiPhase == PHASE_SACRIFICE ? 20000 : 30000;
+                    }
+                }
+                else
+                {
+                    m_uiArmageddonTimer -= uiDiff;
+                }
+
+                // Go to next phase and start transition dialogue
+                if (m_uiPhase == PHASE_ARMAGEDDON && m_creature->GetHealthPercent() < 25.0f)
+                {
+                    StartNextDialogueText(PHASE_SACRIFICE);
+                }
+
+                // no break - use the spells from the phases below;
+            case PHASE_DARKNESS:
+
+                // In the last phase he uses this spell more often
+                if (m_uiDarknessOfSoulsTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DARKNESS_OF_SOULS) == CAST_OK)
+                    {
+                        m_uiDarknessOfSoulsTimer = m_uiPhase == PHASE_SACRIFICE ? 30000 : 45000;
+                    }
+                }
+                else
+                {
+                    m_uiDarknessOfSoulsTimer -= uiDiff;
+                }
+
+                if (m_uiFlameDartTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FLAME_DART) == CAST_OK)
+                    {
+                        m_uiFlameDartTimer = urand(25000, 30000);
+                    }
+                }
+                else
+                {
+                    m_uiFlameDartTimer -= uiDiff;
+                }
+
+                // Go to next phase and start transition dialogue
+                if (m_uiPhase == PHASE_DARKNESS && m_creature->GetHealthPercent() < 55.0f)
+                {
+                    StartNextDialogueText(PHASE_ARMAGEDDON);
+                }
+
+                // no break - use the spells from the phase below;
+            case PHASE_INFERNO:
+
+                if (m_uiKalecSummonTimer)
+                {
+                    if (m_uiKalecSummonTimer <= uiDiff)
+                    {
+                        m_creature->SummonCreature(NPC_KALECGOS, aKalegSpawnLoc[0], aKalegSpawnLoc[1], aKalegSpawnLoc[2], aKalegSpawnLoc[3], TEMPSUMMON_CORPSE_DESPAWN, 0);
+                        m_uiKalecSummonTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiKalecSummonTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiLegionLightingTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_LEGION_LIGHTING) == CAST_OK)
+                        {
+                            m_uiLegionLightingTimer = urand(10000, 15000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiLegionLightingTimer -= uiDiff;
+                }
+
+                if (m_uiFireBloomTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FIRE_BLOOM) == CAST_OK)
+                    {
+                        m_uiFireBloomTimer = 20000;
+                    }
+                }
+                else
+                {
+                    m_uiFireBloomTimer -= uiDiff;
+                }
+
+                if (m_uiSoulFlyTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SOUL_FLY) == CAST_OK)
+                    {
+                        m_uiSoulFlyTimer = urand(3000, 10000);
+                    }
+                }
+                else
+                {
+                    m_uiSoulFlyTimer -= uiDiff;
+                }
+
+                // Only spawn a Shadow orb when necessary
+                if (m_uiShieldOrbCount < m_uiMaxShieldOrbs)
+                {
+                    if (m_uiShieldOrbTimer < uiDiff)
+                    {
+                        // Get some random coords for the Orb
+                        float fX, fY, fZ;
+                        m_creature->GetNearPoint2D(fX, fY, 25.0f, frand(0, 2 * M_PI_F));
+                        fZ = frand(35.0f, 45.0f);
+
+                        m_creature->SummonCreature(NPC_SHIELD_ORB, fX, fY, fZ, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                        ++m_uiShieldOrbCount;
+                        m_uiShieldOrbTimer = 30000;
+                    }
+                    else
+                    {
+                        m_uiShieldOrbTimer -= uiDiff;
+                    }
+                }
+
+                // Go to next phase and start transition dialogue
+                if (m_uiPhase == PHASE_INFERNO && m_creature->GetHealthPercent() < 85.0f)
+                {
+                    StartNextDialogueText(PHASE_DARKNESS);
+                }
+
+                DoMeleeAttackIfReady();
+
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_kiljaedenAI(pCreature);
+    }
+};
+
+struct aura_dummy_darkness_of_souls : public AuraScript
+{
+    aura_dummy_darkness_of_souls() : AuraScript("aura_dummy_darkness_of_souls") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        // On Aura removal cast the explosion and yell
+        // This is a special case when the dummy effect should be triggered at the end of the channeling
+        if (pAura->GetId() == SPELL_DARKNESS_OF_SOULS && pAura->GetEffIndex() == EFFECT_INDEX_0 && !bApply)
+        {
+            if (Creature* pTarget = (Creature*)pAura->GetTarget())
+            {
+                pTarget->CastSpell(pTarget, pAura->GetSpellProto()->CalculateSimpleValue(EFFECT_INDEX_2), true);
+
+                switch (urand(0, 2))
+                {
+                case 0: DoScriptText(SAY_DARKNESS_1, pTarget); break;
+                case 1: DoScriptText(SAY_DARKNESS_2, pTarget); break;
+                case 2: DoScriptText(SAY_DARKNESS_3, pTarget); break;
+                }
+            }
+        }
+        return true;
+    }
+};
+
+/*######
+## npc_shield_orb
+######*/
+
+struct npc_shield_orb : public CreatureScript
+{
+    npc_shield_orb() : CreatureScript("npc_shield_orb") {}
+
+    struct npc_shield_orbAI : public ScriptedAI
+    {
+        npc_shield_orbAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        // Handle circel movement around the boss
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId || !m_pInstance)
+            {
+                return;
+            }
+
+            if (Creature* pSummoner = m_pInstance->GetSingleCreatureFromStorage(NPC_KILJAEDEN))
+            {
+                // Calculate new position based on the angle between the boss and self
+                float fX, fY, fAng;
+                fAng = pSummoner->GetAngle(m_creature) + M_PI_F / 8;
+                // Normalize angle
+                if (fAng > 2 * M_PI_F)
+                {
+                    fAng = fAng - 2 * M_PI_F;
+                }
+
+                pSummoner->GetNearPoint2D(fX, fY, 25.0f, fAng);
+
+                // Move to new position
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MovePoint(1, fX, fY, m_creature->GetPositionZ());
+            }
+        }
+
+        void AttackStart(Unit* /*pWho*/) override {}
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_shield_orbAI(pCreature);
+    }
+};
+
+/*######
+## npc_power_blue_flight
+######*/
+
+struct npc_power_blue_flight : public CreatureScript
+{
+    npc_power_blue_flight() : CreatureScript("npc_power_blue_flight") {}
+
+    struct npc_power_blue_flightAI : public ScriptedAI
+    {
+        npc_power_blue_flightAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            SetCombatMovement(false);
+            m_bHasPossessed = false;
+        }
+
+        bool m_bHasPossessed;
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_creature->IsTemporarySummon())
+            {
+                TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+                if (Player* pPlayer = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                {
+                    pPlayer->RemoveAurasDueToSpell(SPELL_POSSESS_DRAKE_IMMUNE);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_bHasPossessed)
+            {
+                if (m_creature->IsTemporarySummon())
+                {
+                    TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                    {
+                        pPlayer->CastSpell(m_creature, SPELL_VENGEANCE_BLUE_FLIGHT, true);
+                        pPlayer->CastSpell(pPlayer, SPELL_POSSESS_DRAKE_IMMUNE, true);
+                    }
+                }
+
+                // Reset the No Interact flag of the closest orb
+                GameObject* pOrb = GetClosestGameObjectWithEntry(m_creature, GO_ORB_BLUE_FLIGHT_1, 10.0f);
+                if (!pOrb)
+                {
+                    pOrb = GetClosestGameObjectWithEntry(m_creature, GO_ORB_BLUE_FLIGHT_2, 10.0f);
+                }
+                if (!pOrb)
+                {
+                    pOrb = GetClosestGameObjectWithEntry(m_creature, GO_ORB_BLUE_FLIGHT_3, 10.0f);
+                }
+                if (!pOrb)
+                {
+                    pOrb = GetClosestGameObjectWithEntry(m_creature, GO_ORB_BLUE_FLIGHT_4, 10.0f);
+                }
+
+                if (pOrb)
+                {
+                    pOrb->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                }
+
+                m_bHasPossessed = true;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_power_blue_flightAI(pCreature);
+    }
+};
+
+void AddSC_boss_kiljaeden()
+{
+    Script* s;
+
+    s = new npc_kiljaeden_controller();
+    s->RegisterSelf();
+    s = new aura_dummy_darkness_of_souls();
+    s->RegisterSelf();
+    s = new boss_kiljaeden();
+    s->RegisterSelf();
+    s = new npc_shield_orb();
+    s->RegisterSelf();
+    s = new npc_power_blue_flight();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_kiljaeden";
+    //pNewScript->GetAI = &GetAI_boss_kiljaeden;
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_spell_aura_dummy_darkness_of_souls;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kiljaeden_controller";
+    //pNewScript->GetAI = &GetAI_npc_kiljaeden_controller;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_shield_orb";
+    //pNewScript->GetAI = &GetAI_npc_shield_orb;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_power_blue_flight";
+    //pNewScript->GetAI = &GetAI_npc_power_blue_flight;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp
new file mode 100644
index 000000000..2b87bab6e
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp
@@ -0,0 +1,584 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_muru
+SD%Complete: 80
+SDComment: Spell Negative Energy for Entropius needs core support; Summon humanoids spells have some core issues; Dark Fiend, Singularity and Darkness NPCs need eventAI support
+SDCategory: Sunwell Plateau
+EndScriptData */
+
+#include "precompiled.h"
+#include "sunwell_plateau.h"
+
+enum
+{
+    // muru spells
+    SPELL_NEGATIVE_ENERGY           = 46009,
+    SPELL_DARKNESS                  = 45996,    // big void zone; at 45 sec
+    SPELL_OPEN_PORTAL_PERIODIC      = 45994,    // periodic spell which opens a portal at 30 secs; triggers 45976
+    SPELL_OPEN_PORTAL               = 45976,    // has muru portal as target
+    SPELL_SUMMON_BERSERKER_1        = 46037,    // humanoids summoned at 15 secs (3 on each side) then after 60 secs
+    SPELL_SUMMON_BERSERKER_2        = 46040,    // there are two spells. one for each side
+    SPELL_SUMMON_FURY_MAGE_1        = 46038,
+    SPELL_SUMMON_FURY_MAGE_2        = 46039,
+
+    SPELL_SUMMON_DARK_FIEND_1       = 46000,    // summons 8 dark fiends (25744); ToDo: script npc in eventAI
+    SPELL_SUMMON_DARK_FIEND_2       = 46001,
+    SPELL_SUMMON_DARK_FIEND_3       = 46002,
+    SPELL_SUMMON_DARK_FIEND_4       = 46003,
+    SPELL_SUMMON_DARK_FIEND_5       = 46004,
+    SPELL_SUMMON_DARK_FIEND_6       = 46005,
+    SPELL_SUMMON_DARK_FIEND_7       = 46006,
+    SPELL_SUMMON_DARK_FIEND_8       = 46007,
+
+    // transition
+    SPELL_OPEN_ALL_PORTALS          = 46177,    // dummy spell which opens all the portals to begin the transition phase - has muru portal as target
+    SPELL_SUMMON_ENTROPIUS          = 46217,
+    SPELL_ENTROPIUS_SPAWN           = 46223,    // visual effect after spawn
+
+    // entropius spells
+    SPELL_NEGATIVE_ENERGY_ENT       = 46284,    // periodic aura spell; triggers 46289 which has script effect. Damage spell is 46285 but it needs core support
+    SPELL_SUMMON_BLACK_HOLE         = 46282,    // 15 sec cooldown; summons 25855
+    SPELL_SUMMON_DARKNESS           = 46269,    // summons 25879 by missile
+
+    // portal spells
+    SPELL_SENTINEL_SUMMONER_VISUAL  = 45989,    // hits the summoner, so it will summon the sentinel; triggers 45988
+    SPELL_SUMMON_SENTINEL_SUMMONER  = 45978,
+    SPELL_TRANSFORM_VISUAL_1        = 46178,    // Visual - has Muru as script target
+    SPELL_TRANSFORM_VISUAL_2        = 46208,    // Visual - has Muru as script target
+
+    // Muru npcs
+    NPC_VOID_SENTINEL_SUMMONER      = 25782,
+    NPC_VOID_SENTINEL               = 25772,    // scripted in Acid
+#if defined (WOTLK) || defined (CATA)
+    NPC_DARK_FIEND                  = 25744,
+    
+    // darkness spells
+    SPELL_VOID_ZONE_VISUAL          = 46265,
+    SPELL_VOID_ZONE_PERIODIC        = 46262,
+    SPELL_SUMMON_DARK_FIEND         = 46263,
+    
+    // singularity spells
+    SPELL_BLACK_HOLE_VISUAL         = 46242,
+    SPELL_BLACK_HOLE_VISUAL_2       = 46247,
+    SPELL_BLACK_HOLE_PASSIVE        = 46228,
+#endif
+
+    MAX_TRANSFORM_CASTS             = 10
+};
+
+/*######
+## boss_muru
+######*/
+
+struct boss_muru : public CreatureScript
+{
+    boss_muru() : CreatureScript("boss_muru") {}
+
+    struct boss_muruAI : public Scripted_NoMovementAI
+    {
+        boss_muruAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiDarknessTimer;
+        uint32 m_uiSummonHumanoidsTimer;
+        uint32 m_uiDarkFiendsTimer;
+        bool m_bIsTransition;
+
+        void Reset() override
+        {
+            m_uiDarknessTimer = 45000;
+            m_uiSummonHumanoidsTimer = 15000;
+            m_uiDarkFiendsTimer = 0;
+            m_bIsTransition = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MURU, IN_PROGRESS);
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_NEGATIVE_ENERGY, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_OPEN_PORTAL_PERIODIC, CAST_TRIGGERED);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MURU, FAIL);
+            }
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (uiDamage > m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                if (!m_bIsTransition)
+                {
+                    // Start transition
+                    if (DoCastSpellIfCan(m_creature, SPELL_OPEN_ALL_PORTALS) == CAST_OK)
+                    {
+                        // remove the auras
+                        m_creature->RemoveAurasDueToSpell(SPELL_NEGATIVE_ENERGY);
+                        m_creature->RemoveAurasDueToSpell(SPELL_OPEN_PORTAL_PERIODIC);
+                        m_bIsTransition = true;
+                    }
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_ENTROPIUS:
+                // Cast the Entropius spawn effect and force despawn
+                pSummoned->CastSpell(pSummoned, SPELL_ENTROPIUS_SPAWN, true);
+                m_creature->ForcedDespawn(1000);
+                // no break here; All other summons should behave the same way
+            default:
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+                break;
+            }
+        }
+
+        // Wrapper for summoning the humanoids
+        void DoSummonHumanoids()
+        {
+            // summon 2 berserkers and 1 fury mage on each side
+            for (uint8 i = 0; i < 2; i++)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_BERSERKER_1, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_BERSERKER_2, CAST_TRIGGERED);
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_FURY_MAGE_1, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_FURY_MAGE_2, CAST_TRIGGERED);
+        }
+
+        // Wrapper for summoning the dark fiends
+        void DoSummonDarkFiends()
+        {
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_DARK_FIEND_1, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_DARK_FIEND_2, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_DARK_FIEND_3, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_DARK_FIEND_4, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_DARK_FIEND_5, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_DARK_FIEND_6, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_DARK_FIEND_7, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_DARK_FIEND_8, CAST_TRIGGERED);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Return if already in transition
+            if (m_bIsTransition)
+            {
+                return;
+            }
+
+            if (m_uiDarknessTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DARKNESS) == CAST_OK)
+                {
+                    m_uiDarknessTimer = 45000;
+                    m_uiDarkFiendsTimer = 4000;     // in about 4 secs after darkness
+                }
+            }
+            else
+            {
+                m_uiDarknessTimer -= uiDiff;
+            }
+
+            if (m_uiDarkFiendsTimer)
+            {
+                if (m_uiDarkFiendsTimer <= uiDiff)
+                {
+                    DoSummonDarkFiends();
+                    m_uiDarkFiendsTimer = 0;
+                }
+                else
+                {
+                    m_uiDarkFiendsTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiSummonHumanoidsTimer < uiDiff)
+            {
+                DoSummonHumanoids();
+                m_uiSummonHumanoidsTimer = 1 * MINUTE * IN_MILLISECONDS;
+            }
+            else
+            {
+                m_uiSummonHumanoidsTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_muruAI(pCreature);
+    }
+};
+
+/*######
+## boss_entropius
+######*/
+
+struct boss_entropius : public CreatureScript
+{
+    boss_entropius() : CreatureScript("boss_entropius") {}
+
+    struct boss_entropiusAI : public ScriptedAI
+    {
+        boss_entropiusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiBlackHoleTimer;
+        uint32 m_uiDarknessTimer;
+
+        GuidList m_lSummonedCreaturesList;
+
+        void Reset() override
+        {
+            m_uiBlackHoleTimer = 15000;
+            m_uiDarknessTimer = 20000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_NEGATIVE_ENERGY_ENT);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MURU, DONE);
+            }
+#if defined (TBC)
+            // Despawn summoned creatures
+            DespawnSummonedCreatures();
+#endif
+        }
+
+#if defined (TBC)
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Add the Darkness and Singularity into the list
+            m_lSummonedCreaturesList.push_back(pSummoned->GetObjectGuid());
+        }
+
+        // Wrapper to despawn the Singularities and Darkness on death or on evade
+        void DespawnSummonedCreatures()
+        {
+            for (GuidList::const_iterator itr = m_lSummonedCreaturesList.begin(); itr != m_lSummonedCreaturesList.end(); ++itr)
+            {
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pTemp->ForcedDespawn();
+                }
+            }
+        }
+#endif
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MURU, FAIL);
+
+                // respawn muru
+#if defined (TBC)
+                if (Creature* pMuru = m_pInstance->GetSingleCreatureFromStorage(NPC_MURU))
+                {
+                    pMuru->Respawn();
+                }
+#endif
+#if defined (WOTLK) || defined (CATA)
+            m_creature->SummonCreature(NPC_MURU, afMuruSpawnLoc[0], afMuruSpawnLoc[1], afMuruSpawnLoc[2], afMuruSpawnLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0, true);
+#endif
+            }
+
+            // despawn boss and summons for reset
+#if defined (TBC)
+            DespawnSummonedCreatures();
+#endif
+            m_creature->ForcedDespawn();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiBlackHoleTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SUMMON_BLACK_HOLE) == CAST_OK)
+                    {
+                        m_uiBlackHoleTimer = 15000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiBlackHoleTimer -= uiDiff;
+            }
+
+            if (m_uiDarknessTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SUMMON_DARKNESS) == CAST_OK)
+                    {
+                        m_uiDarknessTimer = urand(15000, 20000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiDarknessTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_entropiusAI(pCreature);
+    }
+};
+
+/*######
+## npc_portal_target
+######*/
+
+struct npc_portal_target : public CreatureScript
+{
+    npc_portal_target() : CreatureScript("npc_portal_target") {}
+
+    struct npc_portal_targetAI : public Scripted_NoMovementAI
+    {
+        npc_portal_targetAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiTransformCount;
+        uint32 m_uiTransformTimer;
+        uint32 m_uiSentinelTimer;
+
+        void Reset() override
+        {
+            m_uiTransformCount = 0;
+            m_uiTransformTimer = 0;
+            m_uiSentinelTimer = 0;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Cast a visual ball on the summoner
+            if (pSummoned->GetEntry() == NPC_VOID_SENTINEL_SUMMONER)
+            {
+                DoCastSpellIfCan(pSummoned, SPELL_SENTINEL_SUMMONER_VISUAL, CAST_TRIGGERED);
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            // These spells are dummies, but are used only to init the timers
+            // They could use the EffectDummyCreature to handle this, but this makes code easier
+            switch (pSpell->Id)
+            {
+                // Init sentinel summon timer
+            case SPELL_OPEN_PORTAL:
+                m_uiSentinelTimer = 5000;
+                break;
+                // Start transition effect
+            case SPELL_OPEN_ALL_PORTALS:
+                m_uiTransformTimer = 2000;
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiSentinelTimer)
+            {
+                // Summon the sentinel on a short timer after the portal opens
+                if (m_uiSentinelTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_SENTINEL_SUMMONER) == CAST_OK)
+                    {
+                        m_uiSentinelTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiSentinelTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiTransformTimer)
+            {
+                if (m_uiTransformTimer <= uiDiff)
+                {
+                    // Alternate the visuals
+                    ++m_uiTransformCount;
+                    DoCastSpellIfCan(m_creature, (m_uiTransformCount % 2) ? SPELL_TRANSFORM_VISUAL_1 : SPELL_TRANSFORM_VISUAL_2, CAST_TRIGGERED);
+
+                    if (m_uiTransformCount < MAX_TRANSFORM_CASTS)
+                    {
+                        m_uiTransformTimer = 1000;
+                    }
+                    else
+                    {
+                        m_uiTransformTimer = 0;
+                        m_uiTransformCount = 0;
+                    }
+
+                    // Summon Entropius when reached half of the transition
+                    if (m_uiTransformCount == MAX_TRANSFORM_CASTS / 2)
+                    {
+                        if (Creature* pMuru = m_pInstance->GetSingleCreatureFromStorage(NPC_MURU))
+                        {
+                            pMuru->CastSpell(pMuru, SPELL_SUMMON_ENTROPIUS, false);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiTransformTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_portal_targetAI(pCreature);
+    }
+};
+
+/*######
+## npc_void_sentinel_summoner
+######*/
+
+struct npc_void_sentinel_summoner : public CreatureScript
+{
+    npc_void_sentinel_summoner() : CreatureScript("npc_void_sentinel_summoner") {}
+
+    struct npc_void_sentinel_summonerAI : public Scripted_NoMovementAI
+    {
+        npc_void_sentinel_summonerAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_VOID_SENTINEL)
+            {
+                // Attack Muru's target
+                if (Creature* pMuru = m_pInstance->GetSingleCreatureFromStorage(NPC_MURU))
+                {
+                    if (Unit* pTarget = pMuru->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        pSummoned->AI()->AttackStart(pTarget);
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_void_sentinel_summonerAI(pCreature);
+    }
+};
+
+void AddSC_boss_muru()
+{
+    Script* s;
+
+    s = new boss_muru();
+    s->RegisterSelf();
+    s = new boss_entropius();
+    s->RegisterSelf();
+    s = new npc_portal_target();
+    s->RegisterSelf();
+    s = new npc_void_sentinel_summoner();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_muru";
+    //pNewScript->GetAI = &GetAI_boss_muru;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_entropius";
+    //pNewScript->GetAI = &GetAI_boss_entropius;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_portal_target";
+    //pNewScript->GetAI = &GetAI_npc_portal_target;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_void_sentinel_summoner";
+    //pNewScript->GetAI = &GetAI_npc_void_sentinel_summoner;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
new file mode 100644
index 000000000..dd2f9935c
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
@@ -0,0 +1,696 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Sunwell_Plateau
+SD%Complete: 70%
+SDComment:
+SDCategory: Sunwell_Plateau
+EndScriptData */
+
+#include "precompiled.h"
+#include "sunwell_plateau.h"
+
+/* Sunwell Plateau:
+0 - Kalecgos and Sathrovarr
+1 - Brutallus
+2 - Felmyst
+3 - Eredar Twins (Alythess and Sacrolash)
+4 - M'uru
+5 - Kil'Jaeden
+*/
+
+static const DialogueEntry aFelmystOutroDialogue[] =
+{
+    {NPC_KALECGOS_MADRIGOSA, 0,                        10000},
+    {SAY_KALECGOS_OUTRO,     NPC_KALECGOS_MADRIGOSA,   5000},
+    {NPC_FELMYST,            0,                        5000},
+    {SPELL_OPEN_BACK_DOOR,   0,                        9000},
+    {NPC_BRUTALLUS,          0,                        0},
+    {0, 0, 0},
+};
+
+static const EventLocations aKalecLoc[] =
+{
+    { 1573.146f, 755.2025f, 99.524f, 3.59f },         // spawn loc
+#if defined (TBC)
+    { 1474.235f, 624.0703f, 29.325f },                // first move
+    { 1511.655f, 550.7028f, 25.510f },                // open door
+    { 1648.255f, 519.377f, 165.848f },                // fly away
+#endif
+#if defined (WOTLK) || defined (CATA)
+    {1474.235f, 624.0703f, 29.325f, 0},             // first move
+    {1511.655f, 550.7028f, 25.510f, 0},             // open door
+    {1648.255f, 519.377f, 165.848f, 0},             // fly away
+#endif
+};
+
+struct is_sunwell_plateau : public InstanceScript
+{
+    is_sunwell_plateau() : InstanceScript("instance_sunwell_plateau") {}
+
+    class instance_sunwell_plateau : public ScriptedInstance, private DialogueHelper
+    {
+    public:
+        instance_sunwell_plateau(Map* pMap) : ScriptedInstance(pMap), DialogueHelper(aFelmystOutroDialogue),
+            m_uiDeceiversKilled(0),
+            m_uiSpectralRealmTimer(5000),
+            m_uiKalecRespawnTimer(0),
+            m_uiMuruBerserkTimer(0),
+            m_uiKiljaedenYellTimer(90000),
+            m_uiFelmystCorruption(0)
+        {
+            Initialize();
+        }
+
+        ~instance_sunwell_plateau() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+            InitializeDialogueHelper(this);
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+#if defined (CLASSIC) || defined (TBC)
+            // Return if Felmyst already dead, or Brutallus alive
+            if (m_auiEncounter[TYPE_BRUTALLUS] != DONE || m_auiEncounter[TYPE_FELMYST] == DONE)
+            {
+                return;
+            }
+
+            // Return if already summoned
+            if (GetSingleCreatureFromStorage(NPC_FELMYST, true))
+            {
+                return;
+            }
+
+            // Summon Felmyst in reload case
+            pPlayer->SummonCreature(NPC_FELMYST, aMadrigosaLoc[0].m_fX, aMadrigosaLoc[0].m_fY, aMadrigosaLoc[0].m_fZ, aMadrigosaLoc[0].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+#endif
+#if defined (WOTLK) || defined (CATA)
+    // Spawn Felmyst if not already dead and Brutallus is complete
+    if (m_auiEncounter[TYPE_BRUTALLUS] == DONE && m_auiEncounter[TYPE_FELMYST] != DONE)
+    {
+        // Summon Felmyst in reload case if not already summoned
+        if (!GetSingleCreatureFromStorage(NPC_FELMYST, true))
+            pPlayer->SummonCreature(NPC_FELMYST, aMadrigosaLoc[0].m_fX, aMadrigosaLoc[0].m_fY, aMadrigosaLoc[0].m_fZ, aMadrigosaLoc[0].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0, true);
+    }
+    
+    // Spawn M'uru after the Eredar Twins
+    if (m_auiEncounter[TYPE_EREDAR_TWINS] == DONE && m_auiEncounter[TYPE_MURU] != DONE)
+    {
+        if (!GetSingleCreatureFromStorage(NPC_MURU, true))
+            pPlayer->SummonCreature(NPC_MURU, afMuruSpawnLoc[0], afMuruSpawnLoc[1], afMuruSpawnLoc[2], afMuruSpawnLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0, true);
+    }
+#endif    
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_FORCEFIELD:
+            case GO_BOSS_COLLISION_1:
+            case GO_BOSS_COLLISION_2:
+            case GO_ICE_BARRIER:
+                break;
+            case GO_FIRE_BARRIER:
+                if (m_auiEncounter[TYPE_KALECGOS] == DONE && m_auiEncounter[TYPE_BRUTALLUS] == DONE && m_auiEncounter[TYPE_FELMYST] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_FIRST_GATE:
+                break;
+            case GO_SECOND_GATE:
+                if (m_auiEncounter[TYPE_EREDAR_TWINS] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_MURU_ENTER_GATE:
+                if (m_auiEncounter[TYPE_EREDAR_TWINS] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_MURU_EXIT_GATE:
+                if (m_auiEncounter[TYPE_MURU] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_THIRD_GATE:
+                if (m_auiEncounter[TYPE_MURU] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_ORB_BLUE_FLIGHT_1:
+            case GO_ORB_BLUE_FLIGHT_2:
+            case GO_ORB_BLUE_FLIGHT_3:
+            case GO_ORB_BLUE_FLIGHT_4:
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_KALECGOS_DRAGON:
+            case NPC_KALECGOS_HUMAN:
+            case NPC_SATHROVARR:
+            case NPC_FLIGHT_TRIGGER_LEFT:
+            case NPC_FLIGHT_TRIGGER_RIGHT:
+            case NPC_MADRIGOSA:
+            case NPC_BRUTALLUS:
+            case NPC_FELMYST:
+            case NPC_KALECGOS_MADRIGOSA:
+            case NPC_ALYTHESS:
+            case NPC_SACROLASH:
+            case NPC_MURU:
+            case NPC_ENTROPIUS:
+            case NPC_KILJAEDEN_CONTROLLER:
+            case NPC_KILJAEDEN:
+            case NPC_KALECGOS:
+            case NPC_ANVEENA:
+            case NPC_VELEN:
+            case NPC_LIADRIN:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_DECEIVER:
+                m_lDeceiversGuidList.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_WORLD_TRIGGER:
+                // sort triggers for flightpath
+                if (pCreature->GetPositionZ() < 51.0f)
+                    m_lAllFlightTriggersList.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_WORLD_TRIGGER_LARGE:
+                if (pCreature->GetPositionY() < 523.0f)
+                    m_lBackdoorTriggersList.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_DECEIVER)
+            {
+                ++m_uiDeceiversKilled;
+                // Spawn Kiljaeden when all deceivers are killed
+                if (m_uiDeceiversKilled == MAX_DECEIVERS)
+                {
+                    if (Creature* pController = GetSingleCreatureFromStorage(NPC_KILJAEDEN_CONTROLLER))
+                    {
+                        if (Creature* pKiljaeden = pController->SummonCreature(NPC_KILJAEDEN, pController->GetPositionX(), pController->GetPositionY(), pController->GetPositionZ(), pController->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 0))
+                        {
+                            pKiljaeden->SetInCombatWithZone();
+                        }
+
+                        pController->RemoveAurasDueToSpell(SPELL_ANVEENA_DRAIN);
+                    }
+                }
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature)
+        {
+            // Reset encounter if raid wipes at deceivers
+            if (pCreature->GetEntry() == NPC_DECEIVER)
+            {
+                SetData(TYPE_KILJAEDEN, FAIL);
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_KALECGOS:
+                m_auiEncounter[uiType] = uiData;
+                // combat doors
+                DoUseDoorOrButton(GO_FORCEFIELD);
+                DoUseDoorOrButton(GO_BOSS_COLLISION_1);
+                DoUseDoorOrButton(GO_BOSS_COLLISION_2);
+                if (uiData == FAIL)
+                {
+                    m_uiKalecRespawnTimer = 20000;
+
+                    if (Creature* pKalecDragon = GetSingleCreatureFromStorage(NPC_KALECGOS_DRAGON))
+                    {
+                        pKalecDragon->ForcedDespawn();
+                    }
+                    if (Creature* pKalecHuman = GetSingleCreatureFromStorage(NPC_KALECGOS_HUMAN))
+                    {
+                        pKalecHuman->ForcedDespawn();
+                    }
+                    if (Creature* pSathrovarr = GetSingleCreatureFromStorage(NPC_SATHROVARR))
+                    {
+                        pSathrovarr->AI()->EnterEvadeMode();
+                    }
+                }
+                break;
+            case TYPE_BRUTALLUS:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_FELMYST:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                    StartNextDialogueText(NPC_KALECGOS_MADRIGOSA);
+                else if (uiData == IN_PROGRESS)
+                {
+                    DoSortFlightTriggers();
+                }
+                break;
+            case TYPE_EREDAR_TWINS:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+#if defined (TBC)
+                    DoUseDoorOrButton(GO_SECOND_GATE);
+                    DoUseDoorOrButton(GO_MURU_ENTER_GATE);
+#endif
+#if defined (WOTLK) || defined (CATA)
+                if (Player* pPlayer = GetPlayerInMap())
+                    pPlayer->SummonCreature(NPC_MURU, afMuruSpawnLoc[0], afMuruSpawnLoc[1], afMuruSpawnLoc[2], afMuruSpawnLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0, true);
+#endif
+                }
+                break;
+            case TYPE_MURU:
+                m_auiEncounter[uiType] = uiData;
+                // combat door
+                DoUseDoorOrButton(GO_MURU_ENTER_GATE);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_MURU_EXIT_GATE);
+#if defined (TBC)
+                    DoUseDoorOrButton(GO_THIRD_GATE);
+#endif
+                }
+                else if (uiData == IN_PROGRESS)
+                {
+                    m_uiMuruBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+                }
+                break;
+            case TYPE_KILJAEDEN:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == FAIL)
+                {
+                    m_uiDeceiversKilled = 0;
+
+                    // Reset Orbs
+                    DoToggleGameObjectFlags(GO_ORB_BLUE_FLIGHT_1, GO_FLAG_NO_INTERACT, true);
+                    DoToggleGameObjectFlags(GO_ORB_BLUE_FLIGHT_2, GO_FLAG_NO_INTERACT, true);
+                    DoToggleGameObjectFlags(GO_ORB_BLUE_FLIGHT_3, GO_FLAG_NO_INTERACT, true);
+                    DoToggleGameObjectFlags(GO_ORB_BLUE_FLIGHT_4, GO_FLAG_NO_INTERACT, true);
+
+                    // Respawn deceivers
+                    for (GuidList::const_iterator itr = m_lDeceiversGuidList.begin(); itr != m_lDeceiversGuidList.end(); ++itr)
+                    {
+                        if (Creature* pDeceiver = instance->GetCreature(*itr))
+                        {
+                            if (!pDeceiver->IsAlive())
+                            {
+                                pDeceiver->Respawn();
+                            }
+                        }
+                    }
+                }
+                break;
+            case TYPE_FELMYST_TRIGGER:
+                m_uiFelmystCorruption = uiData;
+                return;
+            case TYPE_KALECGOS_EJECT_SPECTRAL:
+                DoEjectSpectralPlayers();
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        void SetData64(uint32 type, uint64 data) override
+        {
+            switch (type)
+            {
+            case TYPE_KALECGOS:
+                m_spectralRealmPlayers.insert(ObjectGuid(data));
+                break;
+            case TYPE_KALECGOS_EJECT_SPECTRAL:
+                m_spectralRealmPlayers.erase(ObjectGuid(data));
+                break;
+            default:
+                break;
+            }
+        }
+
+        uint64 GetData64(uint32 type) const override
+        {
+            switch (type)
+            {
+            case TYPE_FELMYST_TRIGGER_RIGHT:
+                return SelectFelmystFlightTrigger(false).GetRawValue();
+            case TYPE_FELMYST_TRIGGER_LEFT:
+                return SelectFelmystFlightTrigger(true).GetRawValue();
+            default:
+                break;
+            }
+            return 0;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (m_uiKalecRespawnTimer)
+            {
+                if (m_uiKalecRespawnTimer <= uiDiff)
+                {
+                    if (Creature* pKalecDragon = GetSingleCreatureFromStorage(NPC_KALECGOS_DRAGON))
+                    {
+                        pKalecDragon->Respawn();
+                    }
+                    if (Creature* pKalecHuman = GetSingleCreatureFromStorage(NPC_KALECGOS_HUMAN))
+                    {
+                        pKalecHuman->Respawn();
+                    }
+                    m_uiKalecRespawnTimer = 0;
+                }
+                else
+                {
+                    m_uiKalecRespawnTimer -= uiDiff;
+                }
+            }
+
+            // Muru berserk timer; needs to be done here because it involves two distinct creatures
+            if (m_auiEncounter[TYPE_MURU] == IN_PROGRESS)
+            {
+                if (m_uiMuruBerserkTimer < uiDiff)
+                {
+                    if (Creature* pEntrpius = GetSingleCreatureFromStorage(NPC_ENTROPIUS, true))
+                    {
+                        pEntrpius->CastSpell(pEntrpius, SPELL_MURU_BERSERK, true);
+                    }
+                    else if (Creature* pMuru = GetSingleCreatureFromStorage(NPC_MURU))
+                    {
+                        pMuru->CastSpell(pMuru, SPELL_MURU_BERSERK, true);
+                    }
+
+                    m_uiMuruBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+                }
+                else
+                {
+                    m_uiMuruBerserkTimer -= uiDiff;
+                }
+            }
+
+            if (m_auiEncounter[TYPE_KILJAEDEN] == NOT_STARTED || m_auiEncounter[TYPE_KILJAEDEN] == FAIL)
+            {
+                if (m_uiKiljaedenYellTimer < uiDiff)
+                {
+                    switch (urand(0, 4))
+                    {
+                    case 0: DoOrSimulateScriptTextForThisInstance(SAY_ORDER_1, NPC_KILJAEDEN_CONTROLLER); break;
+                    case 1: DoOrSimulateScriptTextForThisInstance(SAY_ORDER_2, NPC_KILJAEDEN_CONTROLLER); break;
+                    case 2: DoOrSimulateScriptTextForThisInstance(SAY_ORDER_3, NPC_KILJAEDEN_CONTROLLER); break;
+                    case 3: DoOrSimulateScriptTextForThisInstance(SAY_ORDER_4, NPC_KILJAEDEN_CONTROLLER); break;
+                    case 4: DoOrSimulateScriptTextForThisInstance(SAY_ORDER_5, NPC_KILJAEDEN_CONTROLLER); break;
+                    }
+                    m_uiKiljaedenYellTimer = 90000;
+                }
+                else
+                {
+                    m_uiKiljaedenYellTimer -= uiDiff;
+                }
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* in) override
+        {
+            if (!in)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(in);
+
+            std::istringstream loadStream(in);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >>
+                m_auiEncounter[3] >> m_auiEncounter[4] >> m_auiEncounter[5];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case NPC_KALECGOS_MADRIGOSA:
+                if (Creature* pTrigger = GetSingleCreatureFromStorage(NPC_FLIGHT_TRIGGER_LEFT))
+                {
+                    if (Creature* pKalec = pTrigger->SummonCreature(NPC_KALECGOS_MADRIGOSA, aKalecLoc[0].m_fX, aKalecLoc[0].m_fY, aKalecLoc[0].m_fZ, aKalecLoc[0].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 0))
+                    {
+                        pKalec->SetWalk(false);
+                        pKalec->SetLevitate(true);
+                        pKalec->GetMotionMaster()->MovePoint(0, aKalecLoc[1].m_fX, aKalecLoc[1].m_fY, aKalecLoc[1].m_fZ, false);
+                    }
+                }
+                break;
+            case NPC_FELMYST:
+                if (Creature* pKalec = GetSingleCreatureFromStorage(NPC_KALECGOS_MADRIGOSA))
+                    pKalec->GetMotionMaster()->MovePoint(0, aKalecLoc[2].m_fX, aKalecLoc[2].m_fY, aKalecLoc[2].m_fZ, false);
+                break;
+            case SPELL_OPEN_BACK_DOOR:
+                if (Creature* pKalec = GetSingleCreatureFromStorage(NPC_KALECGOS_MADRIGOSA))
+                {
+                    // ToDo: update this when the AoE spell targeting will support many explicit target. Kalec should target all creatures from the list
+                    if (Creature* pTrigger = instance->GetCreature(m_lBackdoorTriggersList.front()))
+                        pKalec->CastSpell(pTrigger, SPELL_OPEN_BACK_DOOR, true);
+                }
+                break;
+            case NPC_BRUTALLUS:
+                if (Creature* pKalec = GetSingleCreatureFromStorage(NPC_KALECGOS_MADRIGOSA))
+                {
+                    pKalec->ForcedDespawn(10000);
+                    pKalec->GetMotionMaster()->MovePoint(0, aKalecLoc[3].m_fX, aKalecLoc[3].m_fY, aKalecLoc[3].m_fZ, false);
+                }
+                break;
+            }
+        }
+
+    private:
+        void DoSortFlightTriggers()
+        {
+            if (m_lAllFlightTriggersList.empty())
+            {
+                script_error_log("Instance Sunwell Plateau: ERROR Failed to load flight triggers for creature id %u.", NPC_FELMYST);
+                return;
+            }
+
+            std::list<Creature*> lTriggers;                         // Valid pointers, only used locally
+            for (GuidList::const_iterator itr = m_lAllFlightTriggersList.begin(); itr != m_lAllFlightTriggersList.end(); ++itr)
+            {
+                if (Creature* pTrigger = instance->GetCreature(*itr))
+                {
+                    lTriggers.push_back(pTrigger);
+                }
+            }
+
+            if (lTriggers.empty())
+            {
+                return;
+            }
+
+            // sort the flight triggers; first by position X, then group them by Y (left and right)
+            lTriggers.sort(sortByPositionX);
+            for (std::list<Creature*>::iterator itr = lTriggers.begin(); itr != lTriggers.end(); ++itr)
+            {
+                if ((*itr)->GetPositionY() < 600.0f)
+                {
+                    m_vRightFlightTriggersVect.push_back((*itr)->GetObjectGuid());
+                }
+                else
+                {
+                    m_vLeftFlightTriggersVect.push_back((*itr)->GetObjectGuid());
+                }
+            }
+        }
+
+        static bool sortByPositionX(Creature* pFirst, Creature* pSecond)
+        {
+            return pFirst && pSecond && pFirst->GetPositionX() > pSecond->GetPositionX();
+        }
+
+        ObjectGuid SelectFelmystFlightTrigger(bool bLeftSide) const
+        {
+            // Return the flight trigger from the selected index
+            GuidVector vTemp = bLeftSide ? m_vLeftFlightTriggersVect : m_vRightFlightTriggersVect;
+
+            if (m_uiFelmystCorruption >= vTemp.size())
+            {
+                return ObjectGuid();
+            }
+
+            return vTemp[m_uiFelmystCorruption];
+        }
+
+        void DoEjectSpectralPlayers()
+        {
+            for (GuidSet::const_iterator itr = m_spectralRealmPlayers.begin(); itr != m_spectralRealmPlayers.end(); ++itr)
+            {
+                if (Player* pPlayer = instance->GetPlayer(*itr))
+                {
+                    if (!pPlayer->HasAura(SPELL_SPECTRAL_REALM_AURA))
+                        continue;
+
+                    pPlayer->CastSpell(pPlayer, SPELL_TELEPORT_NORMAL_REALM, true);
+                    pPlayer->CastSpell(pPlayer, SPELL_SPECTRAL_EXHAUSTION, true);
+                    pPlayer->RemoveAurasDueToSpell(SPELL_SPECTRAL_REALM_AURA);
+                }
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        // Misc
+        uint8 m_uiDeceiversKilled;
+        uint32 m_uiSpectralRealmTimer;
+        uint32 m_uiKalecRespawnTimer;
+        uint32 m_uiMuruBerserkTimer;
+        uint32 m_uiKiljaedenYellTimer;
+        uint32 m_uiFelmystCorruption;
+
+        GuidSet m_spectralRealmPlayers;
+        GuidVector m_vRightFlightTriggersVect;
+        GuidVector m_vLeftFlightTriggersVect;
+        GuidList m_lAllFlightTriggersList;
+        GuidList m_lBackdoorTriggersList;
+        GuidList m_lDeceiversGuidList;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_sunwell_plateau(pMap);
+    }
+};
+
+struct at_sunwell_plateau : public AreaTriggerScript
+{
+    at_sunwell_plateau() : AreaTriggerScript("at_sunwell_plateau") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (pAt->id == AREATRIGGER_TWINS)
+        {
+            if (pPlayer->isGameMaster() || pPlayer->IsDead())
+            {
+                return false;
+            }
+
+            InstanceData* pInstance = pPlayer->GetInstanceData();
+
+            if (pInstance && pInstance->GetData(TYPE_EREDAR_TWINS) == NOT_STARTED)
+            {
+                pInstance->SetData(TYPE_EREDAR_TWINS, SPECIAL);
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_instance_sunwell_plateau()
+{
+    Script* s;
+
+    s = new is_sunwell_plateau();
+    s->RegisterSelf();
+    s = new at_sunwell_plateau();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_sunwell_plateau";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_sunwell_plateau;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_sunwell_plateau";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_sunwell_plateau;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.h b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.h
new file mode 100644
index 000000000..690c6297b
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.h
@@ -0,0 +1,132 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_SUNWELLPLATEAU_H
+#define DEF_SUNWELLPLATEAU_H
+
+enum
+{
+    MAX_ENCOUNTER               = 6,
+
+    TYPE_KALECGOS               = 0,
+    TYPE_BRUTALLUS              = 1,
+    TYPE_FELMYST                = 2,
+    TYPE_EREDAR_TWINS           = 3,
+    TYPE_MURU                   = 4,
+    TYPE_KILJAEDEN              = 5,
+    TYPE_FELMYST_TRIGGER_RIGHT  = MAX_ENCOUNTER,
+    TYPE_FELMYST_TRIGGER_LEFT   = MAX_ENCOUNTER+1,
+    TYPE_FELMYST_TRIGGER        = MAX_ENCOUNTER+2,
+    TYPE_KALECGOS_EJECT_SPECTRAL= MAX_ENCOUNTER+3,
+
+    NPC_KALECGOS_DRAGON         = 24850,            // kalecgos blue dragon hostile
+    NPC_KALECGOS_HUMAN          = 24891,            // kalecgos human form in spectral realm
+    NPC_SATHROVARR              = 24892,
+    NPC_MADRIGOSA               = 24895,
+    NPC_FLIGHT_TRIGGER_LEFT     = 25357,            // Related to Felmyst flight path. Also the anchor to summon Madrigosa
+    NPC_FLIGHT_TRIGGER_RIGHT    = 25358,            // related to Felmyst flight path
+    NPC_WORLD_TRIGGER           = 22515,
+    NPC_WORLD_TRIGGER_LARGE     = 23472,            // ground triggers spawned in Brutallus / Felmyst arena
+    NPC_BRUTALLUS               = 24882,
+    NPC_FELMYST                 = 25038,
+    NPC_KALECGOS_MADRIGOSA      = 24844,            // kalecgos blue dragon; spawns after Felmyst
+    NPC_ALYTHESS                = 25166,
+    NPC_SACROLASH               = 25165,
+    NPC_MURU                    = 25741,
+    NPC_ENTROPIUS               = 25840,
+    NPC_DECEIVER                = 25588,
+    NPC_KILJAEDEN               = 25315,
+    NPC_KILJAEDEN_CONTROLLER    = 25608,            // kiljaeden event controller
+    NPC_ANVEENA                 = 26046,            // related to kiljaeden event
+    NPC_KALECGOS                = 25319,            // related to kiljaeden event
+    NPC_VELEN                   = 26246,
+    NPC_LIADRIN                 = 26247,
+
+    GO_FORCEFIELD               = 188421,           // kalecgos door + collisions
+    GO_BOSS_COLLISION_1         = 188523,
+    GO_BOSS_COLLISION_2         = 188524,
+    GO_ICE_BARRIER              = 188119,           // used to block the players path during the Brutallus intro event
+    GO_FIRE_BARRIER             = 188075,           // door after felmyst
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+    GO_FIRST_GATE               = 187766,           // door between felmyst and eredar twins
+    GO_SECOND_GATE              = 187764,           // door after eredar twins
+#endif
+    GO_MURU_ENTER_GATE          = 187990,           // muru gates
+    GO_MURU_EXIT_GATE           = 188118,
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+    GO_THIRD_GATE               = 187765,           // door after muru; why another?
+#endif
+
+    GO_ORB_BLUE_FLIGHT_1        = 188115,           // orbs used in the Kil'jaeden fight
+    GO_ORB_BLUE_FLIGHT_2        = 188116,
+    GO_ORB_BLUE_FLIGHT_3        = 187869,
+    GO_ORB_BLUE_FLIGHT_4        = 188114,
+
+    SAY_KALECGOS_OUTRO          = -1580043,
+    SAY_TWINS_INTRO             = -1580044,
+
+    // Kil'jaeden yells
+    SAY_ORDER_1                 = -1580064,
+    SAY_ORDER_2                 = -1580065,
+    SAY_ORDER_3                 = -1580066,
+    SAY_ORDER_4                 = -1580067,
+    SAY_ORDER_5                 = -1580068,
+
+    AREATRIGGER_TWINS           = 4937,
+
+    // Kalec spectral realm spells
+    SPELL_TELEPORT_NORMAL_REALM = 46020,
+    SPELL_SPECTRAL_REALM_AURA   = 46021,
+    SPELL_SPECTRAL_EXHAUSTION   = 44867,
+    // Felmyst ouro spell
+    SPELL_OPEN_BACK_DOOR        = 46650,            // Opens the fire barrier - script effect for 46652
+    // used by both muru and entropius
+    SPELL_MURU_BERSERK          = 26662,
+    // visuals for Kiljaeden encounter
+    SPELL_ANVEENA_DRAIN         = 46410,
+
+    MAX_DECEIVERS               = 3
+};
+
+struct EventLocations
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+static const EventLocations aMadrigosaLoc[] =
+{
+    {1463.82f, 661.212f, 19.79f, 4.88f},            // reload spawn loc - the place where to spawn Felmyst
+#if defined (CLASSIC) || defined (TBC)
+    {1463.82f, 661.212f, 39.234f},                  // fly loc during the cinematig
+#endif
+#if defined (WOTLK) || defined (CATA)
+    {1463.82f, 661.212f, 39.234f, 0}                // fly loc during the cinematig
+#endif
+};
+#if defined (WOTLK) || defined (CATA)
+static const float afMuruSpawnLoc[4] = { 1816.25f, 625.484f, 69.603f, 5.624f };
+#endif
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/swamp_of_sorrows.cpp b/src/modules/SD3/scripts/eastern_kingdoms/swamp_of_sorrows.cpp
new file mode 100644
index 000000000..0b53d0c31
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/swamp_of_sorrows.cpp
@@ -0,0 +1,197 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Swamp_of_Sorrows
+ * SD%Complete: 100
+ * SDComment:   Quest support: 1393.
+ * SDCategory:  Swap of Sorrows
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_galen_goodward
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_galen_goodward
+######*/
+
+enum Galen
+{
+    QUEST_GALENS_ESCAPE     = 1393,
+
+    GO_GALENS_CAGE          = 37118,
+
+    SAY_PERIODIC            = -1000582,
+    SAY_QUEST_ACCEPTED      = -1000583,
+    SAY_ATTACKED_1          = -1000584,
+    SAY_ATTACKED_2          = -1000585,
+    SAY_QUEST_COMPLETE      = -1000586,
+    EMOTE_WHISPER           = -1000587,
+    EMOTE_DISAPPEAR         = -1000588
+};
+
+struct npc_galen_goodward : public CreatureScript
+{
+    npc_galen_goodward() : CreatureScript("npc_galen_goodward") {}
+
+    struct npc_galen_goodwardAI : public npc_escortAI
+    {
+        npc_galen_goodwardAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        ObjectGuid m_galensCageGuid;
+        uint32 m_uiPeriodicSay;
+
+        void Reset() override
+        {
+            m_uiPeriodicSay = 6000;
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                DoScriptText(urand(0, 1) ? SAY_ATTACKED_1 : SAY_ATTACKED_2, m_creature, pWho);
+            }
+        }
+
+        void WaypointStart(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+            {
+                      GameObject* pCage = NULL;
+                      if (m_galensCageGuid)
+                      {
+                          pCage = m_creature->GetMap()->GetGameObject(m_galensCageGuid);
+                      }
+                      else
+                      {
+                          pCage = GetClosestGameObjectWithEntry(m_creature, GO_GALENS_CAGE, INTERACTION_DISTANCE);
+                      }
+
+                      if (pCage)
+                      {
+                          pCage->UseDoorOrButton();
+                          m_galensCageGuid = pCage->GetObjectGuid();
+                      }
+                      break;
+            }
+            case 21:
+                DoScriptText(EMOTE_DISAPPEAR, m_creature);
+                break;
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                if (GameObject* pCage = m_creature->GetMap()->GetGameObject(m_galensCageGuid))
+                {
+                    pCage->ResetDoorOrButton();
+                }
+                break;
+            case 20:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    m_creature->SetFacingToObject(pPlayer);
+                    DoScriptText(SAY_QUEST_COMPLETE, m_creature, pPlayer);
+                    DoScriptText(EMOTE_WHISPER, m_creature, pPlayer);
+                    pPlayer->GroupEventHappens(QUEST_GALENS_ESCAPE, m_creature);
+                }
+                SetRun(true);
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+
+            if (m_uiPeriodicSay < uiDiff)
+            {
+                if (HasEscortState(STATE_ESCORT_NONE))
+                {
+                    DoScriptText(SAY_PERIODIC, m_creature);
+                }
+                m_uiPeriodicSay = 6000;
+            }
+            else
+            {
+                m_uiPeriodicSay -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_GALENS_ESCAPE)
+        {
+
+            if (npc_galen_goodwardAI* pEscortAI = dynamic_cast<npc_galen_goodwardAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+                pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+                DoScriptText(SAY_QUEST_ACCEPTED, pCreature);
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_galen_goodwardAI(pCreature);
+    }
+};
+
+void AddSC_swamp_of_sorrows()
+{
+    Script* s;
+    s = new npc_galen_goodward();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_galen_goodward";
+    //pNewScript->GetAI = &GetAI_npc_galen_goodward;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_galen_goodward;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/tirisfal_glades.cpp b/src/modules/SD3/scripts/eastern_kingdoms/tirisfal_glades.cpp
new file mode 100644
index 000000000..19365a159
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/tirisfal_glades.cpp
@@ -0,0 +1,252 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Tirisfal_Glades
+ * SD%Complete: 100
+ * SDComment:   Quest support: 590, 1819.
+ * SDCategory:  Tirisfal Glades
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * go_mausoleum_door
+ * go_mausoleum_trigger
+ * npc_calvin_montague
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+/*######
+## go_mausoleum_door
+## go_mausoleum_trigger
+######*/
+
+enum
+{
+    QUEST_ULAG      = 1819,
+    NPC_ULAG        = 6390,
+    GO_TRIGGER      = 104593,
+    GO_DOOR         = 176594
+};
+
+struct go_mausoleum_door : public GameObjectScript
+{
+    go_mausoleum_door() : GameObjectScript("go_mausoleum_door") {}
+
+    bool OnUse(Player* pPlayer, GameObject* /*pGo*/) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE)
+        {
+            return false;
+        }
+
+        if (GameObject* pTrigger = GetClosestGameObjectWithEntry(pPlayer, GO_TRIGGER, 30.0f))
+        {
+            pTrigger->SetGoState(GO_STATE_READY);
+            pPlayer->SummonCreature(NPC_ULAG, 2390.26f, 336.47f, 40.01f, 2.26f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 300000);
+            return false;
+        }
+
+        return false;
+    }
+};
+
+struct go_mausoleum_trigger : public GameObjectScript
+{
+    go_mausoleum_trigger() : GameObjectScript("go_mausoleum_trigger") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE)
+        {
+            return false;
+        }
+
+        if (GameObject* pDoor = GetClosestGameObjectWithEntry(pPlayer, GO_DOOR, 30.0f))
+        {
+            pGo->SetGoState(GO_STATE_ACTIVE);
+            pDoor->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND);
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_calvin_montague
+######*/
+
+enum
+{
+    SAY_COMPLETE        = -1000356,
+    SPELL_DRINK         = 2639,                             // possibly not correct spell (but iconId is correct)
+    QUEST_590           = 590,
+    FACTION_HOSTILE     = 168
+};
+
+struct npc_calvin_montague : public CreatureScript
+{
+    npc_calvin_montague() : CreatureScript("npc_calvin_montague") {}
+
+    struct npc_calvin_montagueAI : public ScriptedAI
+    {
+        npc_calvin_montagueAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+        }
+
+        uint32 m_uiPhase;
+        uint32 m_uiPhaseTimer;
+        ObjectGuid m_playerGuid;
+
+        void Reset() override
+        {
+            m_uiPhase = 0;
+            m_uiPhaseTimer = 5000;
+            m_playerGuid.Clear();
+        }
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            if (m_creature->getVictim() || m_creature->IsFriendlyTo(pAttacker))
+            {
+                return;
+            }
+
+            AttackStart(pAttacker);
+        }
+
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+        {
+            if (uiDamage > m_creature->GetHealth() || ((m_creature->GetHealth() - uiDamage) * 100 / m_creature->GetMaxHealth() < 15))
+            {
+                uiDamage = 0;
+
+                m_creature->CombatStop(true);
+
+                m_uiPhase = 1;
+
+                if (pDoneBy->GetTypeId() == TYPEID_PLAYER)
+                {
+                    m_playerGuid = pDoneBy->GetObjectGuid();
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiPhase)
+            {
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    m_uiPhaseTimer = 7500;
+                }
+                else
+                {
+                    m_uiPhaseTimer -= uiDiff;
+                    return;
+                }
+
+                switch (m_uiPhase)
+                {
+                case 1:
+                    DoScriptText(SAY_COMPLETE, m_creature);
+                    ++m_uiPhase;
+                    break;
+                case 2:
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                    {
+                        pPlayer->AreaExploredOrEventHappens(QUEST_590);
+                    }
+
+                    m_creature->CastSpell(m_creature, SPELL_DRINK, true);
+                    ++m_uiPhase;
+                    break;
+                case 3:
+                    m_creature->SetStandState(UNIT_STAND_STATE_STAND); //otherwise he is sitting until server restart
+                    EnterEvadeMode();
+                    break;
+                }
+
+                return;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_calvin_montagueAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_590)
+        {
+            pCreature->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_COMBAT_STOP | TEMPFACTION_RESTORE_RESPAWN);
+            pCreature->AI()->AttackStart(pPlayer);
+            return true;
+        }
+        return false;
+    }
+};
+
+void AddSC_tirisfal_glades()
+{
+    Script* s;
+    s = new go_mausoleum_door();
+    s->RegisterSelf();
+    s = new go_mausoleum_trigger();
+    s->RegisterSelf();
+    s = new npc_calvin_montague();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_mausoleum_door";
+    //pNewScript->pGOUse = &GOUse_go_mausoleum_door;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_mausoleum_trigger";
+    //pNewScript->pGOUse = &GOUse_go_mausoleum_trigger;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_calvin_montague";
+    //pNewScript->GetAI = &GetAI_npc_calvin_montague;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_calvin_montague;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp b/src/modules/SD3/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp
new file mode 100644
index 000000000..f54f5e5e1
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp
@@ -0,0 +1,319 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Archaedas
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Uldaman
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "uldaman.h"
+
+enum
+{
+    SPELL_ARCHAEDAS_AWAKEN_VISUAL   = 10347,
+    SPELL_GROUND_TREMOR             = 6524,
+
+    SPELL_AWAKEN_EARTHEN_GUARDIAN   = 10252,                // awaken all 7076 npcs
+    SPELL_AWAKEN_VAULT_WARDER       = 10258,                // awaken 2 npcs 10120
+    SPELL_AWAKEN_EARTHEN_DWARF      = 10259,                // awaken random npc 7309 or 7077
+
+    SAY_AGGRO                       = -1070001,
+    SAY_AWAKE_GUARDIANS             = -1070002,
+    SAY_AWAKE_WARDERS               = -1070003,
+    SAY_UNIT_SLAIN                  = -1070004,
+    EMOTE_BREAKS_FREE               = -1070005,
+};
+
+struct boss_archaedas : public CreatureScript
+{
+    boss_archaedas() : CreatureScript("boss_archaedas") {}
+
+    struct boss_archaedasAI : public ScriptedAI
+    {
+        boss_archaedasAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiAwakeningTimer;
+        uint32 m_uiAwakeDwarfTimer;
+        uint32 m_uiTremorTimer;
+        uint8 m_uiSubevent;
+        bool m_bDwarvesAwaken;
+
+        uint8 m_uiHpPhaseCheck;
+
+        void Reset() override
+        {
+            m_uiAwakeningTimer = 1000;
+            m_uiSubevent = 0;
+            m_uiAwakeDwarfTimer = 10000;
+            m_uiTremorTimer = urand(7000, 14000);
+            m_bDwarvesAwaken = false;
+            m_uiHpPhaseCheck = 1;
+
+            DoCastSpellIfCan(m_creature, SPELL_FREEZE_ANIM);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ARCHAEDAS, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_UNIT_SLAIN, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            // open door to vault (handled by instance script)
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ARCHAEDAS, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ARCHAEDAS, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // so many things are based in this script on instance data
+            // so if we don't have access to it better do nothing
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // OOC Intro part triggered by Altar activation
+            if (m_pInstance->GetData(TYPE_ARCHAEDAS) == SPECIAL)
+            {
+                if (m_uiAwakeningTimer <= uiDiff)
+                {
+                    switch (m_uiSubevent)
+                    {
+                    case 0:
+                        DoCastSpellIfCan(m_creature, SPELL_ARCHAEDAS_AWAKEN_VISUAL);
+                        m_uiAwakeningTimer = 2000;
+                        break;
+                    case 1:
+                        DoScriptText(EMOTE_BREAKS_FREE, m_creature);
+                        m_uiAwakeningTimer = 3000;
+                        break;
+                    case 2:
+                        DoScriptText(SAY_AGGRO, m_creature);
+                        m_creature->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM);
+                        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                        // Attack player
+                        if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_pInstance->GetGuid(DATA_EVENT_STARTER)))
+                        {
+                            AttackStart(pPlayer);
+                        }
+                        else
+                        {
+                            EnterEvadeMode();
+                        }
+                        break;
+                    default:
+                        break;
+                    }
+
+                    ++m_uiSubevent;
+                }
+                else
+                {
+                    m_uiAwakeningTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Phase switch
+            if (m_creature->GetHealthPercent() < 100.0f - 33.4f * (float)m_uiHpPhaseCheck)
+            {
+                if (DoCastSpellIfCan(m_creature, m_uiHpPhaseCheck == 1 ? SPELL_AWAKEN_EARTHEN_GUARDIAN : SPELL_AWAKEN_VAULT_WARDER) == CAST_OK)
+                {
+                    DoScriptText(m_uiHpPhaseCheck == 1 ? SAY_AWAKE_GUARDIANS : SAY_AWAKE_WARDERS, m_creature);
+                    ++m_uiHpPhaseCheck;
+                }
+            }
+
+            // Awake random Dwarf
+            if (!m_bDwarvesAwaken && m_creature->GetHealthPercent() >= 33.0f)
+            {
+                if (m_uiAwakeDwarfTimer < uiDiff)
+                {
+                    m_pInstance->SetData64(TYPE_SIGNAL, m_creature->GetObjectGuid().GetRawValue());
+                    if (Creature* pEarthen = m_pInstance->instance->GetCreature(ObjectGuid(m_pInstance->GetData64(TYPE_SIGNAL))))
+                    {
+                        if (DoCastSpellIfCan(pEarthen, SPELL_AWAKEN_EARTHEN_DWARF) == CAST_OK)
+                        {
+                            m_uiAwakeDwarfTimer = urand(9000, 12000);
+                        }
+                    }
+                    else
+                    {
+                        m_bDwarvesAwaken = true;
+                    }
+                }
+                else
+                {
+                    m_uiAwakeDwarfTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiTremorTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_GROUND_TREMOR) == CAST_OK)
+                {
+                    m_uiTremorTimer = urand(8000, 17000);
+                }
+            }
+            else
+            {
+                m_uiTremorTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_archaedasAI(pCreature);
+    }
+};
+
+struct spell_npc_vault_warder : public SpellScript
+{
+    spell_npc_vault_warder() : SpellScript("spell_npc_vault_warder") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_AWAKEN_VAULT_WARDER && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (pCreatureTarget->GetEntry() == NPC_VAULT_WARDER)
+            {
+                pCreatureTarget->ToCreature()->RemoveAurasDueToSpell(SPELL_STONED);
+
+                ScriptedInstance* pInstance = (ScriptedInstance*)pCreatureTarget->ToCreature()->GetInstanceData();
+                if (!pInstance)
+                {
+                    return true;
+                }
+
+                if (Creature* pArchaedas = pInstance->GetSingleCreatureFromStorage(NPC_ARCHAEDAS))
+                {
+                    pCreatureTarget->ToCreature()->AI()->AttackStart(pArchaedas->getVictim());
+                }
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+struct spell_aura_awaken_dwarf : public AuraScript
+{
+    spell_aura_awaken_dwarf() : AuraScript("spell_aura_awaken_dwarf") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (bApply)
+        {
+            return true;
+        }
+
+        if ((pAura->GetId() == SPELL_AWAKEN_EARTHEN_DWARF || pAura->GetId() == SPELL_AWAKEN_EARTHEN_GUARDIAN) && pAura->GetEffIndex() == EFFECT_INDEX_0)
+        {
+            if (Creature* pTarget = (Creature*)pAura->GetTarget())
+            {
+                pTarget->RemoveAurasDueToSpell(SPELL_STONED);
+
+                ScriptedInstance* pInstance = (ScriptedInstance*)pTarget->GetInstanceData();
+                if (!pInstance)
+                {
+                    return true;
+                }
+
+                if (Creature* pArchaedas = pInstance->GetSingleCreatureFromStorage(NPC_ARCHAEDAS))
+                {
+                    pTarget->AI()->AttackStart(pArchaedas->getVictim());
+                }
+            }
+        }
+
+        return true;
+    }
+};
+
+void AddSC_boss_archaedas()
+{
+    Script *s;
+    s = new boss_archaedas();
+    s->RegisterSelf();
+    s = new spell_npc_vault_warder();
+    s->RegisterSelf();
+    s = new spell_aura_awaken_dwarf();
+    s->RegisterSelf();
+
+    //Script* pNewScript;
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_archaedas";
+    //pNewScript->GetAI = &GetAI_boss_archaedas;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_archaeras_add";
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_vault_warder;
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_spell_aura_dummy_awaken_dwarf;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp b/src/modules/SD3/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp
new file mode 100644
index 000000000..de6c91ffd
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp
@@ -0,0 +1,416 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Uldaman
+ * SD%Complete: 60
+ * SDComment:   None
+ * SDCategory:  Uldaman
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "uldaman.h"
+
+struct is_uldaman : public InstanceScript
+{
+    is_uldaman() : InstanceScript("instance_uldaman") {}
+
+    class instance_uldaman : public ScriptedInstance
+    {
+    public:
+        instance_uldaman(Map* pMap) : ScriptedInstance(pMap),
+            m_uiKeeperCooldown(0),
+            m_uiStoneKeepersFallen(0)
+        {
+            Initialize();
+        }
+
+        ~instance_uldaman() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_TEMPLE_DOOR_UPPER:
+            case GO_TEMPLE_DOOR_LOWER:
+                if (GetData(TYPE_ALTAR_EVENT) == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_ANCIENT_VAULT:
+                if (GetData(TYPE_ARCHAEDAS) == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_ANCIENT_TREASURE:
+                break;
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_HALLSHAPER:
+            case NPC_CUSTODIAN:
+                m_lWardens.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_STONE_KEEPER:
+                m_lKeepers.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_ARCHAEDAS:
+                m_mNpcEntryGuidStore[NPC_ARCHAEDAS] = pCreature->GetObjectGuid();
+                break;
+            default:
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_STONE_KEEPER)
+            {
+                ++m_uiStoneKeepersFallen;
+
+                if (m_lKeepers.size() == m_uiStoneKeepersFallen)
+                {
+                    SetData(TYPE_ALTAR_EVENT, DONE);
+                }
+                else
+                {
+                    m_uiKeeperCooldown = 5000;
+                }
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            // Reset Altar event
+            if (pCreature->GetEntry() == NPC_STONE_KEEPER)
+            {
+                SetData(TYPE_ALTAR_EVENT, NOT_STARTED);
+            }
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (GetData(TYPE_ALTAR_EVENT) != IN_PROGRESS)
+            {
+                return;
+            }
+
+            if (!m_uiKeeperCooldown)
+            {
+                return;
+            }
+
+            if (m_uiKeeperCooldown <= uiDiff)
+            {
+                for (GuidList::const_iterator itr = m_lKeepers.begin(); itr != m_lKeepers.end(); ++itr)
+                {
+                    // Get Keeper which is alive and out of combat
+                    Creature* pKeeper = instance->GetCreature(*itr);
+                    if (!pKeeper || !pKeeper->IsAlive() || pKeeper->getVictim())
+                    {
+                        continue;
+                    }
+
+                    // Get starter player for attack
+                    Player* pPlayer = pKeeper->GetMap()->GetPlayer(m_playerGuid);
+                    if (!pPlayer || !pPlayer->IsAlive())
+                    {
+                        // If he's not available, then get a random player, within a reasonamble distance in map
+                        pPlayer = GetPlayerInMap(true, false);
+                        if (!pPlayer || !pPlayer->IsWithinDistInMap(pKeeper, 50.0f))
+                        {
+                            SetData(TYPE_ALTAR_EVENT, NOT_STARTED);
+                            return;
+                        }
+                    }
+
+                    // Attack the player
+                    pKeeper->RemoveAurasDueToSpell(SPELL_STONED);
+                    pKeeper->AI()->AttackStart(pPlayer);
+                    break;
+                }
+
+                m_uiKeeperCooldown = 0;
+            }
+            else
+            {
+                m_uiKeeperCooldown -= uiDiff;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_ALTAR_EVENT:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_TEMPLE_DOOR_UPPER);
+                    DoUseDoorOrButton(GO_TEMPLE_DOOR_LOWER);
+                }
+                else if (uiData == IN_PROGRESS)
+                {
+                    // Also do a reset before starting the event - this will respawn dead Keepers
+                    DoResetKeeperEvent();
+                    m_uiKeeperCooldown = 5000;
+                }
+                else if (uiData == NOT_STARTED)
+                {
+                    DoResetKeeperEvent();
+                    m_uiStoneKeepersFallen = 0;
+                }
+                m_auiEncounter[0] = uiData;
+                break;
+
+            case TYPE_ARCHAEDAS:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_ANCIENT_VAULT);
+                    DoRespawnGameObject(GO_ANCIENT_TREASURE, HOUR);
+                }
+                m_auiEncounter[1] = uiData;
+                break;
+            case TYPE_SIGNAL:
+                StartEvent(uiData);
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1];
+
+                m_strInstData = saveStream.str();
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        void SetData64(uint32 uiData, uint64 uiGuid) override
+        {
+            switch (uiData)
+            {
+                // ToDo: check if this one is used in ACID. Otherwise it can be dropped
+            case DATA_EVENT_STARTER:
+                m_playerGuid = ObjectGuid(uiGuid);
+                break;
+            case TYPE_SIGNAL:
+                m_dwarfSearcher = ObjectGuid(uiGuid);
+                break;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case TYPE_ALTAR_EVENT:
+                return m_auiEncounter[0];
+            case TYPE_ARCHAEDAS:
+                return m_auiEncounter[1];
+            }
+            return 0;
+        }
+
+        uint64 GetData64(uint32 uiData) const override
+        {
+            switch (uiData)
+            {
+            case DATA_EVENT_STARTER:
+                return m_playerGuid.GetRawValue();
+            case TYPE_SIGNAL:
+                return GetClosestDwarfNotInCombat() ? GetClosestDwarfNotInCombat()->GetObjectGuid().GetRawValue() : 0;
+            }
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        void DoResetKeeperEvent()
+        {
+            if (m_lKeepers.empty())
+            {
+                script_error_log("Instance Uldaman: ERROR creature %u couldn't be found or something really bad happened.", NPC_STONE_KEEPER);
+                return;
+            }
+
+            // Force reset all keepers to the original state
+            for (GuidList::const_iterator itr = m_lKeepers.begin(); itr != m_lKeepers.end(); ++itr)
+            {
+                if (Creature* pKeeper = instance->GetCreature(*itr))
+                {
+                    if (!pKeeper->IsAlive())
+                    {
+                        pKeeper->Respawn();
+                    }
+                }
+            }
+        }
+
+        void StartEvent(uint32 uiEventId)   //TODO check SetData to be really reenterable!
+        {
+            //m_playerGuid = pPlayer->GetObjectGuid();
+
+            if (uiEventId == EVENT_ID_ALTAR_KEEPER)
+            {
+                if (GetData(TYPE_ALTAR_EVENT) == NOT_STARTED)
+                {
+                    SetData(TYPE_ALTAR_EVENT, IN_PROGRESS);
+                }
+            }
+            else if (uiEventId == EVENT_ID_ALTAR_ARCHAEDAS)
+            {
+                if (GetData(TYPE_ARCHAEDAS) == NOT_STARTED || GetData(TYPE_ARCHAEDAS) == FAIL)
+                {
+                    SetData(TYPE_ARCHAEDAS, SPECIAL);
+                }
+            }
+        }
+
+        Creature* GetClosestDwarfNotInCombat() const
+        {
+            Creature *pSearcher = instance->GetCreature(m_dwarfSearcher);
+            std::list<Creature*> lTemp;
+
+            for (GuidList::const_iterator itr = m_lWardens.begin(); itr != m_lWardens.end(); ++itr)
+            {
+                Creature* pTemp = instance->GetCreature(*itr);
+
+                if (pTemp && pTemp->IsAlive() && !pTemp->getVictim())
+                {
+                    lTemp.push_back(pTemp);
+                }
+            }
+
+            if (lTemp.empty())
+            {
+                return NULL;
+            }
+
+            lTemp.sort(ObjectDistanceOrder(pSearcher));
+            return lTemp.front();
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        ObjectGuid m_playerGuid;
+        ObjectGuid m_dwarfSearcher;
+
+        uint32 m_uiKeeperCooldown;
+        uint32 m_uiStoneKeepersFallen;
+
+        GuidList m_lWardens;
+        GuidList m_lKeepers;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_uldaman(pMap);
+    }
+};
+
+struct event_spell_altar_boss_aggro : public MapEventScript
+{
+    event_spell_altar_boss_aggro() : MapEventScript("event_spell_altar_boss_aggro") {}
+
+    bool OnReceived(uint32 uiEventId, Object* pSource, Object* /*pTarget*/, bool bIsStart) override
+    {
+        if (bIsStart && pSource->GetTypeId() == TYPEID_PLAYER)
+        {
+            if (InstanceData* pInstance = ((Player*)pSource)->GetInstanceData())
+            {
+                pInstance->SetData64(DATA_EVENT_STARTER, pSource->GetObjectGuid().GetRawValue());
+                pInstance->SetData(TYPE_SIGNAL, uiEventId);
+                //pInstance->StartEvent(uiEventId, (Player*)pSource);
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+void AddSC_instance_uldaman()
+{
+    Script* s;
+    s = new is_uldaman();
+    s->RegisterSelf();
+    s = new event_spell_altar_boss_aggro();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_uldaman";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_uldaman;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_spell_altar_boss_aggro";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_spell_altar_boss_aggro;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/uldaman/uldaman.cpp b/src/modules/SD3/scripts/eastern_kingdoms/uldaman/uldaman.cpp
new file mode 100644
index 000000000..4a1072455
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/uldaman/uldaman.cpp
@@ -0,0 +1,41 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Uldaman
+ * SD%Complete: 0
+ * SDComment:   Placeholder
+ * SDCategory:  Uldaman
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "uldaman.h"
+
+void AddSC_uldaman()
+{
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/uldaman/uldaman.h b/src/modules/SD3/scripts/eastern_kingdoms/uldaman/uldaman.h
new file mode 100644
index 000000000..755aa638d
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/uldaman/uldaman.h
@@ -0,0 +1,58 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_ULDAMAN_H
+#define DEF_ULDAMAN_H
+
+enum
+{
+    MAX_ENCOUNTER               = 2,
+
+    TYPE_ALTAR_EVENT            = 1,
+    TYPE_ARCHAEDAS              = 2,
+    DATA_EVENT_STARTER          = 3,
+    TYPE_SIGNAL                 = 4,
+
+    GO_TEMPLE_DOOR_UPPER        = 124367,
+    GO_TEMPLE_DOOR_LOWER        = 141869,
+    GO_ANCIENT_VAULT            = 124369,
+    GO_ANCIENT_TREASURE         = 141979,
+
+    NPC_ARCHAEDAS               = 2748,
+    NPC_CUSTODIAN               = 7309,
+    NPC_HALLSHAPER              = 7077,
+    NPC_GUARDIAN                = 7076,
+    NPC_VAULT_WARDER            = 10120,
+    NPC_STONE_KEEPER            = 4857,
+
+    SPELL_STONED                = 10255,
+    SPELL_FREEZE_ANIM           = 16245,
+
+    EVENT_ID_ALTAR_KEEPER       = 2228,                     // spell 11568
+    EVENT_ID_ALTAR_ARCHAEDAS    = 2268                      // spell 10340
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/undercity.cpp b/src/modules/SD3/scripts/eastern_kingdoms/undercity.cpp
new file mode 100644
index 000000000..2b99041f3
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/undercity.cpp
@@ -0,0 +1,204 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Undercity
+ * SD%Complete: 95
+ * SDComment: Quest support: 9180(post-event).
+ * SDCategory:  Undercity
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+ * npc_lady_sylvanas_windrunner
+#endif
+
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+/*######
+## npc_lady_sylvanas_windrunner
+######*/
+
+enum
+{
+    EMOTE_LAMENT_START          = -1000193,
+    SAY_LAMENT_END              = -1000196,
+    EMOTE_LAMENT_END            = -1000197,
+
+    SPELL_HIGHBORNE_AURA        = 37090,
+    SPELL_SYLVANAS_CAST         = 36568,
+    SPELL_RIBBON_OF_SOULS       = 37099,
+
+    NPC_HIGHBORNE_LAMENTER      = 21628,
+    NPC_HIGHBORNE_BUNNY         = 21641,
+
+    QUEST_ID_JOURNEY_UNDERCITY  = 9180,
+
+    MAX_LAMENTERS               = 4,
+};
+
+static const float aHighborneLoc[MAX_LAMENTERS][4] =
+{
+    {1285.41f, 312.47f, -61.0f, 0.51f},
+    {1286.96f, 310.40f, -61.0f, 1.00f},
+    {1289.66f, 309.66f, -61.0f, 1.52f},
+    {1292.51f, 310.50f, -61.0f, 1.99f},
+};
+
+struct npc_lady_sylvanas_windrunner : public CreatureScript
+{
+    npc_lady_sylvanas_windrunner() : CreatureScript("npc_lady_sylvanas_windrunner") {}
+
+    struct npc_lady_sylvanas_windrunnerAI : public ScriptedAI
+    {
+        npc_lady_sylvanas_windrunnerAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiLamentEventTimer;
+        uint32 m_uiSummonTimer;
+
+        void Reset() override
+        {
+            m_uiLamentEventTimer = 0;
+            m_uiSummonTimer = 0;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_HIGHBORNE_BUNNY)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_RIBBON_OF_SOULS, false);
+            }
+            else if (pSummoned->GetEntry() == NPC_HIGHBORNE_LAMENTER)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_HIGHBORNE_AURA, false);
+
+                pSummoned->SetLevitate(true);
+                pSummoned->GetMotionMaster()->MovePoint(0, pSummoned->GetPositionX(), pSummoned->GetPositionY(), pSummoned->GetPositionZ() + 5.0f);
+            }
+        }
+
+        void DoStartLamentEvent()
+        {
+            DoScriptText(EMOTE_LAMENT_START, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_SYLVANAS_CAST);
+            m_uiSummonTimer = 13000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiLamentEventTimer)
+            {
+                if (m_uiLamentEventTimer <= uiDiff)
+                {
+                    float fX, fY, fZ;
+                    m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 20.0f, fX, fY, fZ);
+                    m_creature->SummonCreature(NPC_HIGHBORNE_BUNNY, fX, fY, fZ + 15.0f, 0, TEMPSUMMON_TIMED_DESPAWN, 3000);
+
+                    m_uiLamentEventTimer = 2000;
+
+                    if (!m_creature->HasAura(SPELL_SYLVANAS_CAST))
+                    {
+                        DoScriptText(SAY_LAMENT_END, m_creature);
+                        DoScriptText(EMOTE_LAMENT_END, m_creature);
+                        m_uiLamentEventTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiLamentEventTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiSummonTimer)
+            {
+                if (m_uiSummonTimer <= uiDiff)
+                {
+                    for (uint8 i = 0; i < MAX_LAMENTERS; ++i)
+                    {
+                        m_creature->SummonCreature(NPC_HIGHBORNE_LAMENTER, aHighborneLoc[i][0], aHighborneLoc[i][1], aHighborneLoc[i][2], aHighborneLoc[i][3], TEMPSUMMON_TIMED_DESPAWN, 160000);
+                    }
+
+                    m_uiLamentEventTimer = 2000;
+                    m_uiSummonTimer = 0;
+                }
+                else
+                {
+                    m_uiSummonTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_lady_sylvanas_windrunnerAI(pCreature);
+    }
+
+    bool OnQuestRewarded(Player* /*pPlayer*/, Creature* pCreature, Quest const* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_JOURNEY_UNDERCITY)
+        {
+            if (npc_lady_sylvanas_windrunnerAI* pSylvanAI = dynamic_cast<npc_lady_sylvanas_windrunnerAI*>(pCreature->AI()))
+            {
+                pSylvanAI->DoStartLamentEvent();
+            }
+        }
+
+        return true;
+    }
+};
+#endif
+
+void AddSC_undercity()
+{
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    Script* s;
+
+    s = new npc_lady_sylvanas_windrunner();
+    s->RegisterSelf();
+#endif
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_lady_sylvanas_windrunner";
+    //pNewScript->GetAI = &GetAI_npc_lady_sylvanas_windrunner;
+    //pNewScript->pQuestRewardedNPC = &QuestRewarded_npc_lady_sylvanas_windrunner;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/western_plaguelands.cpp b/src/modules/SD3/scripts/eastern_kingdoms/western_plaguelands.cpp
new file mode 100644
index 000000000..d5a508925
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/western_plaguelands.cpp
@@ -0,0 +1,1159 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Western_Plaguelands
+ * SD%Complete: 90
+ * SDComment: Quest support: 5216, 5219, 5222, 5225, 5229, 5231, 5233, 5235, 5862, 5944, 9446.
+ * SDCategory:  Western Plaguelands
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_the_scourge_cauldron
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+ * npc_anchorite_truuen
+#endif
+ * npc_taelan_fordring
+ * npc_isillien
+ * npc_tirion_fordring
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_the_scourge_cauldron
+######*/
+
+struct npc_the_scourge_cauldron : public CreatureScript
+{
+    npc_the_scourge_cauldron() : CreatureScript("npc_the_scourge_cauldron") {}
+
+    struct npc_the_scourge_cauldronAI : public ScriptedAI
+    {
+        npc_the_scourge_cauldronAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void DoDie()
+        {
+            // summoner dies here
+            m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+            // override any database `spawntimesecs` to prevent duplicated summons
+            uint32 rTime = m_creature->GetRespawnDelay();
+            if (rTime < 600)
+            {
+                m_creature->SetRespawnDelay(600);
+            }
+        }
+
+        void MoveInLineOfSight(Unit* who) override
+        {
+            if (!who || who->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            if (who->GetTypeId() == TYPEID_PLAYER)
+            {
+                switch (m_creature->GetAreaId())
+                {
+                case 199:                                   // felstone
+                    if (((Player*)who)->GetQuestStatus(5216) == QUEST_STATUS_INCOMPLETE ||
+                        ((Player*)who)->GetQuestStatus(5229) == QUEST_STATUS_INCOMPLETE)
+                    {
+                        m_creature->SummonCreature(11075, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 600000);
+                        DoDie();
+                    }
+                    break;
+                case 200:                                   // dalson
+                    if (((Player*)who)->GetQuestStatus(5219) == QUEST_STATUS_INCOMPLETE ||
+                        ((Player*)who)->GetQuestStatus(5231) == QUEST_STATUS_INCOMPLETE)
+                    {
+                        m_creature->SummonCreature(11077, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 600000);
+                        DoDie();
+                    }
+                    break;
+                case 201:                                   // gahrron
+                    if (((Player*)who)->GetQuestStatus(5225) == QUEST_STATUS_INCOMPLETE ||
+                        ((Player*)who)->GetQuestStatus(5235) == QUEST_STATUS_INCOMPLETE)
+                    {
+                        m_creature->SummonCreature(11078, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 600000);
+                        DoDie();
+                    }
+                    break;
+                case 202:                                   // writhing
+                    if (((Player*)who)->GetQuestStatus(5222) == QUEST_STATUS_INCOMPLETE ||
+                        ((Player*)who)->GetQuestStatus(5233) == QUEST_STATUS_INCOMPLETE)
+                    {
+                        m_creature->SummonCreature(11076, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 600000);
+                        DoDie();
+                    }
+                    break;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_the_scourge_cauldronAI(pCreature);
+    }
+};
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+/*######
+## npc_anchorite_truuen
+######*/
+
+enum
+{
+    SAY_BEGIN                   = -1000910,
+    SAY_FIRST_STOP              = -1000911,
+    SAY_CONTINUE                = -1000912,
+    SAY_FIRST_ATTACK            = -1000913,
+    SAY_PURITY                  = -1000914,
+    SAY_SECOND_ATTACK           = -1000915,
+    SAY_CLEANSE                 = -1000916,
+    SAY_WELCOME                 = -1000917,
+    SAY_EPILOGUE_1              = -1000918,
+    SAY_EPILOGUE_2              = -1000919,
+
+    NPC_PRIEST_THELDANIS        = 1854,
+    NPC_HUNGERING_WRAITH        = 1802,
+    NPC_HAUNDING_VISION         = 4472,
+    NPC_BLIGHTED_ZOMBIE         = 4475,
+    NPC_GHOST_OF_UTHER          = 17233,
+
+    QUEST_ID_TOMB_LIGHTBRINGER  = 9446,
+};
+
+struct npc_anchorite_truuen : public CreatureScript
+{
+    npc_anchorite_truuen() : CreatureScript("npc_anchorite_truuen") {}
+
+    struct npc_anchorite_truuenAI : public npc_escortAI
+    {
+        npc_anchorite_truuenAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        ObjectGuid m_utherGhostGuid;
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoScriptText(SAY_BEGIN, m_creature);
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 4:
+                DoScriptText(SAY_FIRST_STOP, m_creature);
+                break;
+            case 5:
+                DoScriptText(SAY_CONTINUE, m_creature);
+                break;
+            case 10:
+                DoScriptText(SAY_FIRST_ATTACK, m_creature);
+                // spawn first attacker wave
+                m_creature->SummonCreature(NPC_HAUNDING_VISION, 1045.26f, -1576.50f, 62.42f, 2.82f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_HUNGERING_WRAITH, 1021.74f, -1547.49f, 63.44f, 5.24f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                break;
+            case 11:
+                DoScriptText(SAY_PURITY, m_creature);
+                break;
+            case 21:
+                DoScriptText(SAY_SECOND_ATTACK, m_creature);
+                // spawn second attacker wave
+                m_creature->SummonCreature(NPC_BLIGHTED_ZOMBIE, 1123.08f, -1738.70f, 61.65f, 3.63f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_BLIGHTED_ZOMBIE, 1117.07f, -1763.47f, 62.72f, 1.83f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_BLIGHTED_ZOMBIE, 1096.79f, -1719.14f, 62.69f, 4.88f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_BLIGHTED_ZOMBIE, 1068.92f, -1739.68f, 62.23f, 6.21f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                break;
+            case 22:
+                DoScriptText(SAY_CLEANSE, m_creature);
+                break;
+            case 35:
+                if (Creature* pPriest = GetClosestCreatureWithEntry(m_creature, NPC_PRIEST_THELDANIS, 60.0f))
+                    DoScriptText(SAY_WELCOME, pPriest);
+                break;
+            case 38:
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                m_creature->SummonCreature(NPC_GHOST_OF_UTHER, 972.96f, -1824.82f, 82.54f, 0.27f, TEMPSUMMON_TIMED_DESPAWN, 45000);
+                // complete the quest - the event continues with the dialogue
+                if (Player* pPlayer = GetPlayerForEscort())
+                    pPlayer->GroupEventHappens(QUEST_ID_TOMB_LIGHTBRINGER, m_creature);
+                break;
+            case 39:
+                if (Creature* pUther = m_creature->GetMap()->GetCreature(m_utherGhostGuid))
+                {
+                    pUther->SetFacingToObject(m_creature);
+                    DoScriptText(SAY_EPILOGUE_1, pUther);
+                }
+                break;
+            case 40:
+                if (Creature* pUther = m_creature->GetMap()->GetCreature(m_utherGhostGuid))
+                    DoScriptText(SAY_EPILOGUE_2, pUther);
+                break;
+            case 41:
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() != NPC_GHOST_OF_UTHER)
+                pSummoned->AI()->AttackStart(m_creature);
+            else
+                m_utherGhostGuid = pSummoned->GetObjectGuid();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_anchorite_truuenAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_TOMB_LIGHTBRINGER)
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+
+        return true;
+    }
+};
+#endif
+
+/*######
+## npc_taelan_fordring
+######*/
+
+enum
+{
+    // scarlet end quest texts
+    SAY_SCARLET_COMPLETE_1          = -1001076,
+    SAY_SCARLET_COMPLETE_2          = -1001077,
+
+    // escort text
+    SAY_ESCORT_START                = -1001078,
+    SAY_EXIT_KEEP                   = -1001079,
+    EMOTE_MOUNT                     = -1001080,
+    SAY_REACH_TOWER                 = -1001081,
+    SAY_ISILLIEN_1                  = -1001082,
+    SAY_ISILLIEN_2                  = -1001083,
+    SAY_ISILLIEN_3                  = -1001084,
+    SAY_ISILLIEN_4                  = -1001085,
+    SAY_ISILLIEN_5                  = -1001086,
+    SAY_ISILLIEN_6                  = -1001087,
+    EMOTE_ISILLIEN_ATTACK           = -1001088,
+    SAY_ISILLIEN_ATTACK             = -1001089,
+    SAY_KILL_TAELAN_1               = -1001090,
+    EMOTE_ISILLIEN_LAUGH            = -1001091,
+    SAY_KILL_TAELAN_2               = -1001092,
+    EMOTE_ATTACK_PLAYER             = -1001093,
+    SAY_TIRION_1                    = -1001094,
+    SAY_TIRION_2                    = -1001095,
+    SAY_TIRION_3                    = -1001096,
+    SAY_TIRION_4                    = -1001097,
+    SAY_TIRION_5                    = -1001098,
+    SAY_EPILOG_1                    = -1001099,
+    EMOTE_KNEEL                     = -1001100,
+    SAY_EPILOG_2                    = -1001101,
+    EMOTE_HOLD_TAELAN               = -1001102,
+    SAY_EPILOG_3                    = -1001103,
+    SAY_EPILOG_4                    = -1001104,
+    SAY_EPILOG_5                    = -1001105,
+
+    // spells
+    SPELL_DEVOTION_AURA             = 17232,
+    SPELL_CRUSADER_STRIKE           = 14518,
+    SPELL_HOLY_STRIKE               = 17143,
+    SPELL_HOLY_CLEAVE               = 18819,
+    SPELL_HOLY_LIGHT                = 15493,
+    SPELL_LAY_ON_HANDS              = 17233,
+    SPELL_TAELAN_SUFFERING          = 18810,
+
+    // isillen spells
+    SPELL_DOMINATE_MIND             = 14515,
+    SPELL_FLASH_HEAL                = 10917,
+    SPELL_GREATER_HEAL              = 10965,
+    SPELL_MANA_BURN                 = 15800,
+    SPELL_MIND_BLAST                = 17194,
+    SPELL_MIND_FLAY                 = 17165,
+    SPELL_TAELAN_DEATH              = 18969,
+
+    // npcs
+    NPC_TAELAN_FORDRING             = 1842,
+    NPC_SCARLET_CAVALIER            = 1836,
+    NPC_ISILLIEN                    = 1840,
+    NPC_TIRION_FORDRING             = 12126,                    // Todo: add mount
+    NPC_CRIMSON_ELITE               = 12128,
+
+    MODEL_TAELAN_MOUNT              = 2410,                     // ToDo: fix id!
+
+    // quests
+    QUEST_ID_SCARLET_SUBTERFUGE     = 5862,
+    QUEST_ID_IN_DREAMS              = 5944,
+};
+
+static const int32 aCavalierYells[] = { -1001072, -1001073, -1001074, -1001075 };
+
+static const DialogueEntry aScarletDialogue[] =
+{
+    // Scarlet Subterfuge ending dialogue
+    {NPC_SCARLET_CAVALIER,          0,                          3000},
+    {QUEST_ID_SCARLET_SUBTERFUGE,   0,                          7000},
+    {SAY_SCARLET_COMPLETE_1,        NPC_TAELAN_FORDRING,        2000},
+    {QUEST_ID_IN_DREAMS,            0,                          0},
+    {SPELL_DEVOTION_AURA,           0,                          3000},
+    {SAY_SCARLET_COMPLETE_2,        NPC_TAELAN_FORDRING,        0},
+    // In Dreams event dialogue
+    {SAY_EXIT_KEEP,                 NPC_TAELAN_FORDRING,        6000},
+    {EMOTE_MOUNT,                   NPC_TAELAN_FORDRING,        4000},
+    {MODEL_TAELAN_MOUNT,            0,                          0},
+    {SAY_REACH_TOWER,               NPC_TAELAN_FORDRING,        4000},
+    {SAY_ISILLIEN_1,                NPC_ISILLIEN,               2000},
+    {SAY_ISILLIEN_2,                NPC_TAELAN_FORDRING,        3000},
+    {SAY_ISILLIEN_3,                NPC_TAELAN_FORDRING,        10000},
+    {SAY_ISILLIEN_4,                NPC_ISILLIEN,               7000},
+    {SAY_ISILLIEN_5,                NPC_ISILLIEN,               5000},
+    {SAY_ISILLIEN_6,                NPC_ISILLIEN,               6000},
+    {EMOTE_ISILLIEN_ATTACK,         NPC_ISILLIEN,               3000},
+    {SAY_ISILLIEN_ATTACK,           NPC_ISILLIEN,               3000},
+    {SPELL_CRUSADER_STRIKE,         0,                          0},
+    {SAY_KILL_TAELAN_1,             NPC_ISILLIEN,               1000},
+    {EMOTE_ISILLIEN_LAUGH,          NPC_ISILLIEN,               4000},
+    {SAY_KILL_TAELAN_2,             NPC_ISILLIEN,               10000},
+    {EMOTE_ATTACK_PLAYER,           NPC_ISILLIEN,               0},
+    {NPC_TIRION_FORDRING,           0,                          5000},
+    {NPC_ISILLIEN,                  0,                          10000},
+    {SAY_TIRION_1,                  NPC_TIRION_FORDRING,        4000},
+    {SAY_TIRION_2,                  NPC_ISILLIEN,               6000},
+    {SAY_TIRION_3,                  NPC_TIRION_FORDRING,        4000},
+    {SAY_TIRION_4,                  NPC_TIRION_FORDRING,        3000},
+    {SAY_TIRION_5,                  NPC_ISILLIEN,               0},
+    {EMOTE_KNEEL,                   NPC_TIRION_FORDRING,        4000},
+    {SAY_EPILOG_2,                  NPC_TIRION_FORDRING,        5000},
+    {EMOTE_HOLD_TAELAN,             NPC_TIRION_FORDRING,        5000},
+    {SAY_EPILOG_3,                  NPC_TIRION_FORDRING,        6000},
+    {SAY_EPILOG_4,                  NPC_TIRION_FORDRING,        7000},
+    {SAY_EPILOG_5,                  NPC_TIRION_FORDRING,        0},
+    {0, 0, 0},
+};
+
+struct npc_taelan_fordring : public CreatureScript
+{
+    npc_taelan_fordring() : CreatureScript("npc_taelan_fordring") {}
+
+    struct npc_taelan_fordringAI : public npc_escortAI, private DialogueHelper
+    {
+        npc_taelan_fordringAI(Creature* pCreature) : npc_escortAI(pCreature),
+        DialogueHelper(aScarletDialogue)
+        {
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+            m_bScarletComplete = false;
+            m_bFightStarted = false;
+            m_bTaelanDead = false;
+            m_bHasMount = false;
+        }
+
+        bool m_bScarletComplete;
+        bool m_bFightStarted;
+        bool m_bHasMount;
+        bool m_bTaelanDead;
+
+        ObjectGuid m_isillenGuid;
+        ObjectGuid m_tirionGuid;
+        GuidList m_lCavalierGuids;
+
+        uint32 m_uiHolyCleaveTimer;
+        uint32 m_uiHolyStrikeTimer;
+        uint32 m_uiCrusaderStrike;
+        uint32 m_uiHolyLightTimer;
+
+        void Reset() override
+        {
+            m_uiHolyCleaveTimer = urand(11000, 15000);
+            m_uiHolyStrikeTimer = urand(6000, 8000);
+            m_uiCrusaderStrike = urand(1000, 5000);
+            m_uiHolyLightTimer = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_bHasMount)
+                m_creature->Unmount();
+
+            DoCastSpellIfCan(m_creature, SPELL_DEVOTION_AURA);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_bTaelanDead)
+                return;
+
+            npc_escortAI::MoveInLineOfSight(pWho);
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (m_bTaelanDead)
+            {
+                m_creature->RemoveAllAurasOnEvade();
+                m_creature->DeleteThreatList();
+                m_creature->CombatStop(true);
+                m_creature->SetLootRecipient(NULL);
+
+                m_creature->InterruptNonMeleeSpells(true);
+                m_creature->SetHealth(0);
+                m_creature->StopMoving();
+                m_creature->ClearComboPointHolders();
+                m_creature->RemoveAllAurasOnDeath();
+                m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+#endif
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->ClearAllReactives();
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MoveIdle();
+                m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+
+                Reset();
+            }
+            else
+            {
+                if (m_bHasMount)
+                    m_creature->Mount(MODEL_TAELAN_MOUNT);
+
+                npc_escortAI::EnterEvadeMode();
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_bScarletComplete)
+            {
+                StartNextDialogueText(SPELL_DEVOTION_AURA);
+                m_bScarletComplete = false;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+                DoScriptText(SAY_ESCORT_START, m_creature);
+                m_creature->SetFactionTemporary(FACTION_ESCORT_N_FRIEND_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+            }
+            else if (eventType == AI_EVENT_CUSTOM_A && pInvoker->GetTypeId() == TYPEID_PLAYER && uiMiscValue == QUEST_ID_SCARLET_SUBTERFUGE)
+                StartNextDialogueText(NPC_SCARLET_CAVALIER);
+            else if (eventType == AI_EVENT_CUSTOM_B && pInvoker->GetEntry() == NPC_ISILLIEN)
+            {
+                StartNextDialogueText(NPC_TIRION_FORDRING);
+                m_creature->SummonCreature(NPC_TIRION_FORDRING, 2620.273f, -1920.917f, 74.25f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 15 * MINUTE*IN_MILLISECONDS);
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 25:
+                SetEscortPaused(true);
+                StartNextDialogueText(SAY_EXIT_KEEP);
+                break;
+            case 55:
+                SetEscortPaused(true);
+                StartNextDialogueText(SAY_REACH_TOWER);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_ISILLIEN:
+                SendAIEvent(AI_EVENT_START_ESCORT, m_creature, pSummoned);
+                m_isillenGuid = pSummoned->GetObjectGuid();
+
+                // summon additional crimson elites
+                float fX, fY, fZ;
+                pSummoned->GetNearPoint(pSummoned, fX, fY, fZ, 0, 5.0f, M_PI_F * 1.25f);
+                pSummoned->SummonCreature(NPC_CRIMSON_ELITE, fX, fY, fZ, pSummoned->GetOrientation(), TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 15 * MINUTE*IN_MILLISECONDS);
+                pSummoned->GetNearPoint(pSummoned, fX, fY, fZ, 0, 5.0f, 0);
+                pSummoned->SummonCreature(NPC_CRIMSON_ELITE, fX, fY, fZ, pSummoned->GetOrientation(), TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 15 * MINUTE*IN_MILLISECONDS);
+                break;
+            case NPC_TIRION_FORDRING:
+                m_tirionGuid = pSummoned->GetObjectGuid();
+                SendAIEvent(AI_EVENT_START_ESCORT, m_creature, pSummoned);
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_ISILLIEN)
+            {
+                if (Creature* pTirion = m_creature->GetMap()->GetCreature(m_tirionGuid))
+                    DoScriptText(SAY_EPILOG_1, pTirion);
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 /*uiMotionType*/, uint32 uiPointId) override
+        {
+            if (pSummoned->GetEntry() != NPC_TIRION_FORDRING)
+                return;
+
+            if (uiPointId == 100)
+            {
+                StartNextDialogueText(SAY_TIRION_1);
+                if (Creature* pIsillien = m_creature->GetMap()->GetCreature(m_isillenGuid))
+                    pSummoned->SetFacingToObject(pIsillien);
+            }
+            else if (uiPointId == 200)
+                StartNextDialogueText(EMOTE_KNEEL);
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case NPC_SCARLET_CAVALIER:
+            {
+                                         // kneel and make everyone worried
+                                         m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                                         m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+
+                                         std::list<Creature*> lCavaliersInRange;
+                                         GetCreatureListWithEntryInGrid(lCavaliersInRange, m_creature, NPC_SCARLET_CAVALIER, 10.0f);
+
+                                         uint8 uiIndex = 0;
+                                         for (std::list<Creature*>::const_iterator itr = lCavaliersInRange.begin(); itr != lCavaliersInRange.end(); ++itr)
+                                         {
+                                             m_lCavalierGuids.push_back((*itr)->GetObjectGuid());
+                                             (*itr)->SetFacingToObject(m_creature);
+                                             DoScriptText(aCavalierYells[uiIndex], (*itr));
+                                             ++uiIndex;
+                                         }
+                                         break;
+            }
+            case QUEST_ID_SCARLET_SUBTERFUGE:
+            {
+                                                float fX, fY, fZ;
+                                                for (GuidList::const_iterator itr = m_lCavalierGuids.begin(); itr != m_lCavalierGuids.end(); ++itr)
+                                                {
+                                                    if (Creature* pCavalier = m_creature->GetMap()->GetCreature(*itr))
+                                                    {
+                                                        m_creature->GetContactPoint(pCavalier, fX, fY, fZ);
+                                                        pCavalier->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                                                    }
+                                                }
+                                                break;
+            }
+            case SAY_SCARLET_COMPLETE_1:
+                // stand up and knock down effect
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                DoCastSpellIfCan(m_creature, SPELL_TAELAN_SUFFERING);
+                break;
+            case QUEST_ID_IN_DREAMS:
+                // force attack
+                for (GuidList::const_iterator itr = m_lCavalierGuids.begin(); itr != m_lCavalierGuids.end(); ++itr)
+                {
+                    if (Creature* pCavalier = m_creature->GetMap()->GetCreature(*itr))
+                        pCavalier->AI()->AttackStart(m_creature);
+                }
+                m_bScarletComplete = true;
+                break;
+            case SAY_SCARLET_COMPLETE_2:
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                break;
+            case MODEL_TAELAN_MOUNT:
+                // mount when outside
+                m_bHasMount = true;
+                SetEscortPaused(false);
+                m_creature->Mount(MODEL_TAELAN_MOUNT);
+                break;
+            case SAY_REACH_TOWER:
+                // start fight event
+                m_creature->SummonCreature(NPC_ISILLIEN, 2693.12f, -1943.04f, 72.04f, 2.11f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 15 * MINUTE*IN_MILLISECONDS);
+                break;
+            case SAY_ISILLIEN_2:
+                if (Creature* pIsillien = m_creature->GetMap()->GetCreature(m_isillenGuid))
+                    m_creature->SetFacingToObject(pIsillien);
+                break;
+            case SPELL_CRUSADER_STRIKE:
+            {
+                                          // spawn additioinal elites
+                                          m_creature->SummonCreature(NPC_CRIMSON_ELITE, 2711.32f, -1882.67f, 67.89f, 3.2f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 15 * MINUTE*IN_MILLISECONDS);
+                                          m_creature->SummonCreature(NPC_CRIMSON_ELITE, 2710.93f, -1878.90f, 67.97f, 3.2f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 15 * MINUTE*IN_MILLISECONDS);
+                                          m_creature->SummonCreature(NPC_CRIMSON_ELITE, 2710.53f, -1875.28f, 67.90f, 3.2f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 15 * MINUTE*IN_MILLISECONDS);
+
+                                          std::list<Creature*> lElitesInRange;
+                                          Player* pPlayer = GetPlayerForEscort();
+                                          if (!pPlayer)
+                                              return;
+
+                                          GetCreatureListWithEntryInGrid(lElitesInRange, m_creature, NPC_CRIMSON_ELITE, 70.0f);
+
+                                          for (std::list<Creature*>::const_iterator itr = lElitesInRange.begin(); itr != lElitesInRange.end(); ++itr)
+                                              (*itr)->AI()->AttackStart(pPlayer);
+
+                                          // Isillien only attacks Taelan
+                                          if (Creature* pIsillien = m_creature->GetMap()->GetCreature(m_isillenGuid))
+                                          {
+                                              pIsillien->AI()->AttackStart(m_creature);
+                                              AttackStart(pIsillien);
+                                          }
+
+                                          m_bFightStarted = true;
+                                          break;
+            }
+            case SAY_KILL_TAELAN_1:
+                // kill taelan and attack players
+                if (Creature* pIsillien = m_creature->GetMap()->GetCreature(m_isillenGuid))
+                    SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pIsillien);
+                break;
+            case EMOTE_ATTACK_PLAYER:
+                // attack players
+                if (Creature* pIsillien = m_creature->GetMap()->GetCreature(m_isillenGuid))
+                {
+                    if (Player* pPlayer = GetPlayerForEscort())
+                        pIsillien->AI()->AttackStart(pPlayer);
+                }
+                break;
+                // tirion event
+            case SAY_TIRION_5:
+                if (Creature* pIsillien = m_creature->GetMap()->GetCreature(m_isillenGuid))
+                {
+                    if (Creature* pTirion = m_creature->GetMap()->GetCreature(m_tirionGuid))
+                    {
+                        pTirion->AI()->AttackStart(pIsillien);
+                        pIsillien->AI()->AttackStart(pTirion);
+                    }
+                }
+                break;
+                // epilog dialogue
+            case EMOTE_HOLD_TAELAN:
+                if (Creature* pTirion = m_creature->GetMap()->GetCreature(m_tirionGuid))
+                    pTirion->SetStandState(UNIT_STAND_STATE_KNEEL);
+                break;
+            case SAY_EPILOG_4:
+                if (Creature* pTirion = m_creature->GetMap()->GetCreature(m_tirionGuid))
+                    pTirion->SetStandState(UNIT_STAND_STATE_STAND);
+                break;
+            case SAY_EPILOG_5:
+                if (Creature* pTirion = m_creature->GetMap()->GetCreature(m_tirionGuid))
+                {
+                    if (Player* pPlayer = GetPlayerForEscort())
+                    {
+                        pPlayer->GroupEventHappens(QUEST_ID_IN_DREAMS, m_creature);
+                        pTirion->SetFacingToObject(pPlayer);
+                    }
+
+                    pTirion->ForcedDespawn(3 * MINUTE*IN_MILLISECONDS);
+                    pTirion->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                }
+                m_creature->ForcedDespawn(3 * MINUTE*IN_MILLISECONDS);
+                break;
+            }
+        }
+
+        Creature* GetSpeakerByEntry(uint32 uiEntry) override
+        {
+            switch (uiEntry)
+            {
+            case NPC_TAELAN_FORDRING:   return m_creature;
+            case NPC_ISILLIEN:          return m_creature->GetMap()->GetCreature(m_isillenGuid);
+            case NPC_TIRION_FORDRING:   return m_creature->GetMap()->GetCreature(m_tirionGuid);
+
+            default:
+                return NULL;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_bTaelanDead)
+                return;
+
+            if (!m_bTaelanDead && m_creature->GetHealthPercent() < 50.0f)
+            {
+                StartNextDialogueText(SAY_KILL_TAELAN_1);
+                m_bTaelanDead = true;
+            }
+
+            if (m_uiHolyCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HOLY_CLEAVE) == CAST_OK)
+                    m_uiHolyCleaveTimer = urand(11000, 13000);
+            }
+            else
+                m_uiHolyCleaveTimer -= uiDiff;
+
+            if (m_uiHolyStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HOLY_STRIKE) == CAST_OK)
+                    m_uiHolyStrikeTimer = urand(9000, 14000);
+            }
+            else
+                m_uiHolyStrikeTimer -= uiDiff;
+
+            if (m_uiCrusaderStrike < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CRUSADER_STRIKE) == CAST_OK)
+                    m_uiCrusaderStrike = urand(7000, 12000);
+            }
+            else
+                m_uiCrusaderStrike -= uiDiff;
+
+            if (m_creature->GetHealthPercent() < 75.0f)
+            {
+                if (m_uiHolyLightTimer < uiDiff)
+                {
+                    if (Unit* pTarget = DoSelectLowestHpFriendly(50.0f))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_HOLY_LIGHT) == CAST_OK)
+                            m_uiHolyLightTimer = urand(10000, 15000);
+                    }
+                }
+                else
+                    m_uiHolyLightTimer -= uiDiff;
+            }
+
+            if (!m_bFightStarted && m_creature->GetHealthPercent() < 15.0f)
+                DoCastSpellIfCan(m_creature, SPELL_LAY_ON_HANDS);
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_taelan_fordringAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_IN_DREAMS)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+
+    bool OnQuestRewarded(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_SCARLET_SUBTERFUGE)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+struct spell_npc_taelan_fordring : public SpellScript
+{
+    spell_npc_taelan_fordring() : SpellScript("spell_npc_taelan_fordring") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_TAELAN_DEATH && uiEffIndex == EFFECT_INDEX_0 && pCaster->GetEntry() == NPC_ISILLIEN)
+        {
+            pCreatureTarget->ToCreature()->AI()->EnterEvadeMode();
+            pCaster->SetFacingToObject(pCreatureTarget->ToCreature());
+            ((Creature*)pCaster)->AI()->EnterEvadeMode();
+
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_isillien
+######*/
+
+struct npc_isillien : public CreatureScript
+{
+    npc_isillien() : CreatureScript("npc_isillien") {}
+
+    struct npc_isillienAI : public npc_escortAI
+    {
+        npc_isillienAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_bTirionSpawned = false;
+            m_bTaelanDead = false;
+        }
+
+        bool m_bTirionSpawned;
+        bool m_bTaelanDead;
+
+        ObjectGuid m_taelanGuid;
+
+        uint32 m_uiManaBurnTimer;
+        uint32 m_uFlashHealTimer;
+        uint32 m_uiGreaterHealTimer;
+        uint32 m_uiHolyLightTimer;
+        uint32 m_uiDominateTimer;
+        uint32 m_uiMindBlastTimer;
+        uint32 m_uiMindFlayTimer;
+
+        void Reset() override
+        {
+            m_uiManaBurnTimer = urand(7000, 12000);
+            m_uFlashHealTimer = urand(10000, 15000);
+            m_uiDominateTimer = urand(10000, 14000);
+            m_uiMindBlastTimer = urand(0, 1000);
+            m_uiMindFlayTimer = urand(3000, 7000);
+            m_uiGreaterHealTimer = 0;
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override
+        {
+            // attack only on request
+        }
+
+        void EnterEvadeMode() override
+        {
+            // evade and keep the same posiiton
+            if (m_bTaelanDead)
+            {
+                m_creature->RemoveAllAurasOnEvade();
+                m_creature->DeleteThreatList();
+                m_creature->CombatStop(true);
+                m_creature->SetLootRecipient(NULL);
+
+                m_creature->GetMotionMaster()->MoveIdle();
+
+                Reset();
+            }
+            else
+                npc_escortAI::EnterEvadeMode();
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (pSender->GetEntry() != NPC_TAELAN_FORDRING)
+                return;
+
+            // move outside the tower
+            if (eventType == AI_EVENT_START_ESCORT)
+                Start(false);
+            else if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                // kill Taelan
+                DoCastSpellIfCan(pInvoker, SPELL_TAELAN_DEATH, CAST_INTERRUPT_PREVIOUS);
+                m_bTaelanDead = true;
+                m_taelanGuid = pInvoker->GetObjectGuid();
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 2:
+                SetEscortPaused(true);
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // start event epilog
+            if (!m_bTirionSpawned && m_creature->GetHealthPercent() < 20.0f)
+            {
+                if (Creature* pTaelan = m_creature->GetMap()->GetCreature(m_taelanGuid))
+                    SendAIEvent(AI_EVENT_CUSTOM_B, m_creature, pTaelan);
+                m_bTirionSpawned = true;
+            }
+
+            // combat spells
+            if (m_uiMindBlastTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MIND_BLAST) == CAST_OK)
+                    m_uiMindBlastTimer = urand(3000, 5000);
+            }
+            else
+                m_uiMindBlastTimer -= uiDiff;
+
+            if (m_uiMindFlayTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MIND_FLAY) == CAST_OK)
+                    m_uiMindFlayTimer = urand(9000, 15000);
+            }
+            else
+                m_uiMindFlayTimer -= uiDiff;
+
+            if (m_uiManaBurnTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MANA_BURN) == CAST_OK)
+                    m_uiManaBurnTimer = urand(8000, 12000);
+            }
+            else
+                m_uiManaBurnTimer -= uiDiff;
+
+            if (m_uiDominateTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_DOMINATE_MIND, SELECT_FLAG_PLAYER))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_DOMINATE_MIND) == CAST_OK)
+                        m_uiDominateTimer = urand(25000, 30000);
+                }
+            }
+            else
+                m_uiDominateTimer -= uiDiff;
+
+            if (m_uFlashHealTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(50.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_FLASH_HEAL) == CAST_OK)
+                        m_uFlashHealTimer = urand(10000, 15000);
+                }
+            }
+            else
+                m_uFlashHealTimer -= uiDiff;
+
+            if (m_creature->GetHealthPercent() < 50.0f)
+            {
+                if (m_uiGreaterHealTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_GREATER_HEAL) == CAST_OK)
+                        m_uiGreaterHealTimer = urand(15000, 20000);
+                }
+                else
+                    m_uiGreaterHealTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_isillienAI(pCreature);
+    }
+};
+
+/*######
+## npc_tirion_fordring
+######*/
+
+struct npc_tirion_fordring : public CreatureScript
+{
+    npc_tirion_fordring() : CreatureScript("npc_tirion_fordring") {}
+
+    struct npc_tirion_fordringAI : public npc_escortAI
+    {
+        npc_tirion_fordringAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        ObjectGuid m_taelanGuid;
+
+        uint32 m_uiHolyCleaveTimer;
+        uint32 m_uiHolyStrikeTimer;
+        uint32 m_uiCrusaderStrike;
+
+        void Reset() override
+        {
+            m_uiHolyCleaveTimer = urand(11000, 15000);
+            m_uiHolyStrikeTimer = urand(6000, 8000);
+            m_uiCrusaderStrike = urand(1000, 5000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_DEVOTION_AURA);
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override
+        {
+            // attack only on request
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->SetLootRecipient(NULL);
+
+            // on evade go to Taelan
+            if (Creature* pTaelan = m_creature->GetMap()->GetCreature(m_taelanGuid))
+            {
+                float fX, fY, fZ;
+                pTaelan->GetContactPoint(m_creature, fX, fY, fZ);
+                m_creature->GetMotionMaster()->MovePoint(200, fX, fY, fZ);
+            }
+
+            Reset();
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (pSender->GetEntry() != NPC_TAELAN_FORDRING)
+                return;
+
+            if (eventType == AI_EVENT_START_ESCORT)
+            {
+                Start(true);
+                m_taelanGuid = pInvoker->GetObjectGuid();
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 2:
+                SetEscortPaused(true);
+
+                // unmount and go to Taelan
+                m_creature->Unmount();
+                if (Creature* pTaelan = m_creature->GetMap()->GetCreature(m_taelanGuid))
+                {
+                    float fX, fY, fZ;
+                    pTaelan->GetContactPoint(m_creature, fX, fY, fZ);
+                    m_creature->GetMotionMaster()->MovePoint(100, fX, fY, fZ);
+                }
+                break;
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            // custom points; ignore in escort AI
+            if (uiPointId == 100 || uiPointId == 200)
+                return;
+
+            npc_escortAI::MovementInform(uiMoveType, uiPointId);
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // combat spells
+            if (m_uiHolyCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HOLY_CLEAVE) == CAST_OK)
+                    m_uiHolyCleaveTimer = urand(12000, 15000);
+            }
+            else
+                m_uiHolyCleaveTimer -= uiDiff;
+
+            if (m_uiHolyStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HOLY_STRIKE) == CAST_OK)
+                    m_uiHolyStrikeTimer = urand(8000, 11000);
+            }
+            else
+                m_uiHolyStrikeTimer -= uiDiff;
+
+            if (m_uiCrusaderStrike < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CRUSADER_STRIKE) == CAST_OK)
+                    m_uiCrusaderStrike = urand(7000, 9000);
+            }
+            else
+                m_uiCrusaderStrike -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_tirion_fordringAI(pCreature);
+    }
+};
+
+void AddSC_western_plaguelands()
+{
+    Script* s;
+    s = new npc_the_scourge_cauldron();
+    s->RegisterSelf();
+    s = new npc_taelan_fordring();
+    s->RegisterSelf();
+    s = new npc_isillien();
+    s->RegisterSelf();
+    s = new npc_tirion_fordring();
+    s->RegisterSelf();
+    s = new spell_npc_taelan_fordring();
+    s->RegisterSelf();
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    s = new npc_anchorite_truuen();
+    s->RegisterSelf();
+#endif
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_the_scourge_cauldron";
+    //pNewScript->GetAI = &GetAI_npc_the_scourge_cauldron;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_taelan_fordring";
+    //pNewScript->GetAI = &GetAI_npc_taelan_fordring;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_taelan_fordring;
+    //pNewScript->pQuestRewardedNPC = &QuestRewarded_npc_taelan_fordring;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_taelan_fordring;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_isillien";
+    //pNewScript->GetAI = &GetAI_npc_isillien;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_tirion_fordring";
+    //pNewScript->GetAI = &GetAI_npc_tirion_fordring;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/westfall.cpp b/src/modules/SD3/scripts/eastern_kingdoms/westfall.cpp
new file mode 100644
index 000000000..999ddf8f9
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/westfall.cpp
@@ -0,0 +1,314 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Westfall
+ * SD%Complete: 90
+ * SDComment:   Quest support: 155, 1651.
+ * SDCategory:  Westfall
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_daphne_stilwell
+ * npc_defias_traitor
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_daphne_stilwell
+######*/
+
+enum
+{
+    SAY_DS_START        = -1000293,
+    SAY_DS_DOWN_1       = -1000294,
+    SAY_DS_DOWN_2       = -1000295,
+    SAY_DS_DOWN_3       = -1000296,
+    SAY_DS_PROLOGUE     = -1000297,
+
+    SPELL_SHOOT         = 6660,
+    QUEST_TOME_VALOR    = 1651,
+    NPC_DEFIAS_RAIDER   = 6180,
+    EQUIP_ID_RIFLE      = 2511
+};
+
+struct npc_daphne_stilwell : public CreatureScript
+{
+    npc_daphne_stilwell() : CreatureScript("npc_daphne_stilwell") {}
+
+    struct npc_daphne_stilwellAI : public npc_escortAI
+    {
+        npc_daphne_stilwellAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_uiWPHolder = 0;
+        }
+
+        uint32 m_uiWPHolder;
+        uint32 m_uiShootTimer;
+
+        void Reset() override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                switch (m_uiWPHolder)
+                {
+                case 7:
+                    DoScriptText(SAY_DS_DOWN_1, m_creature);
+                    break;
+                case 8:
+                    DoScriptText(SAY_DS_DOWN_2, m_creature);
+                    break;
+                case 9:
+                    DoScriptText(SAY_DS_DOWN_3, m_creature);
+                    break;
+                }
+            }
+            else
+            {
+                m_uiWPHolder = 0;
+            }
+
+            m_uiShootTimer = 0;
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            m_uiWPHolder = uiPointId;
+
+            switch (uiPointId)
+            {
+            case 4:
+                SetEquipmentSlots(false, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE, EQUIP_ID_RIFLE);
+                m_creature->SetSheath(SHEATH_STATE_RANGED);
+                m_creature->HandleEmote(EMOTE_STATE_USESTANDING_NOSHEATHE);
+                break;
+            case 7:
+                m_creature->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836f, 1569.755f, 54.267f, 4.230f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697f, 1569.124f, 54.421f, 4.206f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237f, 1568.307f, 54.620f, 4.206f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                break;
+            case 8:
+                m_creature->SetSheath(SHEATH_STATE_RANGED);
+                m_creature->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836f, 1569.755f, 54.267f, 4.230f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697f, 1569.124f, 54.421f, 4.206f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237f, 1568.307f, 54.620f, 4.206f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_DEFIAS_RAIDER, -11448.037f, 1570.213f, 54.961f, 4.283f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                break;
+            case 9:
+                m_creature->SetSheath(SHEATH_STATE_RANGED);
+                m_creature->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836f, 1569.755f, 54.267f, 4.230f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697f, 1569.124f, 54.421f, 4.206f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237f, 1568.307f, 54.620f, 4.206f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_DEFIAS_RAIDER, -11448.037f, 1570.213f, 54.961f, 4.283f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_DEFIAS_RAIDER, -11449.018f, 1570.738f, 54.828f, 4.220f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                break;
+            case 10:
+                SetRun(false);
+                break;
+            case 11:
+                DoScriptText(SAY_DS_PROLOGUE, m_creature);
+                break;
+            case 13:
+                SetEquipmentSlots(true);
+                m_creature->SetSheath(SHEATH_STATE_UNARMED);
+                m_creature->HandleEmote(EMOTE_STATE_USESTANDING_NOSHEATHE);
+                break;
+            case 17:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_TOME_VALOR, m_creature);
+                }
+                break;
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (!pWho)
+            {
+                return;
+            }
+
+            if (m_creature->Attack(pWho, false))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+
+                m_creature->GetMotionMaster()->MoveChase(pWho, 30.0f);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiShootTimer < uiDiff)
+            {
+                m_uiShootTimer = 1000;
+
+                if (!m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHOOT);
+                }
+            }
+            else
+            {
+                m_uiShootTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_TOME_VALOR)
+        {
+            DoScriptText(SAY_DS_START, pCreature);
+
+            if (npc_daphne_stilwellAI* pEscortAI = dynamic_cast<npc_daphne_stilwellAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(true, pPlayer, pQuest);
+            }
+        }
+
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_daphne_stilwellAI(pCreature);
+    }
+};
+
+/*######
+## npc_defias_traitor
+######*/
+
+enum
+{
+    SAY_START                = -1000101,
+    SAY_PROGRESS             = -1000102,
+    SAY_END                  = -1000103,
+    SAY_AGGRO_1              = -1000104,
+    SAY_AGGRO_2              = -1000105,
+
+    QUEST_DEFIAS_BROTHERHOOD = 155
+};
+
+struct npc_defias_traitor : public CreatureScript
+{
+    npc_defias_traitor() : CreatureScript("npc_defias_traitor") {}
+
+    struct npc_defias_traitorAI : public npc_escortAI
+    {
+        npc_defias_traitorAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 35:
+                SetRun(false);
+                break;
+            case 36:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_PROGRESS, m_creature, pPlayer);
+                }
+                break;
+            case 44:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_END, m_creature, pPlayer);
+                    pPlayer->GroupEventHappens(QUEST_DEFIAS_BROTHERHOOD, m_creature);
+                }
+                break;
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_AGGRO_1 : SAY_AGGRO_2, m_creature, pWho);
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_DEFIAS_BROTHERHOOD)
+        {
+            DoScriptText(SAY_START, pCreature, pPlayer);
+
+            if (npc_defias_traitorAI* pEscortAI = dynamic_cast<npc_defias_traitorAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(true, pPlayer, pQuest);
+            }
+        }
+
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_defias_traitorAI(pCreature);
+    }
+};
+
+void AddSC_westfall()
+{
+    Script* s;
+    s = new npc_daphne_stilwell();
+    s->RegisterSelf();
+    s = new npc_defias_traitor();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_daphne_stilwell";
+    //pNewScript->GetAI = &GetAI_npc_daphne_stilwell;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_daphne_stilwell;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_defias_traitor";
+    //pNewScript->GetAI = &GetAI_npc_defias_traitor;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_defias_traitor;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/wetlands.cpp b/src/modules/SD3/scripts/eastern_kingdoms/wetlands.cpp
new file mode 100644
index 000000000..6e490d7bb
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/wetlands.cpp
@@ -0,0 +1,302 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Wetlands
+ * SD%Complete: 100
+ * SDComment:   Quest support: 1249.
+ * SDCategory:  Wetlands
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_mikhail
+ * npc_tapoke_slim_jahn
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_tapoke_slim_jahn
+######*/
+
+enum
+{
+    SAY_SLIM_AGGRO              = -1000977,
+    SAY_SLIM_DEFEAT             = -1000978,
+    SAY_FRIEND_DEFEAT           = -1000979,
+    SAY_SLIM_NOTES              = -1000980,
+
+    QUEST_MISSING_DIPLO_PT11    = 1249,
+    FACTION_ENEMY               = 168,                      // ToDo: faction needs to be confirmed!
+
+    SPELL_STEALTH               = 1785,
+    SPELL_CALL_FRIENDS          = 16457,                    // summons 1x friend
+    NPC_SLIMS_FRIEND            = 4971,
+    NPC_TAPOKE_SLIM_JAHN        = 4962,
+    WAYPOINT_MAILBOX            = 2,
+    WAYPOINT_GATE                = 6
+};
+
+static const DialogueEntry aDiplomatDialogue[] =
+{
+    {SAY_SLIM_DEFEAT,           NPC_TAPOKE_SLIM_JAHN,   4000},
+    {SAY_SLIM_NOTES,            NPC_TAPOKE_SLIM_JAHN,   7000},
+    {QUEST_MISSING_DIPLO_PT11,  0,                      0},
+    {0, 0, 0},
+};
+
+struct npc_tapoke_slim_jahn : public CreatureScript
+{
+    npc_tapoke_slim_jahn() : CreatureScript("npc_tapoke_slim_jahn") {}
+
+    struct npc_tapoke_slim_jahnAI : public npc_escortAI, private DialogueHelper
+    {
+        npc_tapoke_slim_jahnAI(Creature* pCreature) : m_bFriendSummoned(false), m_bEventComplete(false),
+        friendGUID(ObjectGuid()), npc_escortAI(pCreature), DialogueHelper(aDiplomatDialogue)
+        {
+        }
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                friendGUID.Clear();
+                m_bFriendSummoned = false;
+                m_bEventComplete = false;
+            }
+        }
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            if (m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->IsFriendlyTo(pAttacker))
+            {
+                return;
+            }
+
+            AttackStart(pAttacker);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case WAYPOINT_MAILBOX:
+                SetRun();
+                m_creature->RemoveAurasDueToSpell(SPELL_STEALTH);
+                m_creature->SetFactionTemporary(FACTION_ENEMY, TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_RESTORE_COMBAT_STOP);
+                break;
+
+            case WAYPOINT_GATE:
+                // fail the quest if he escapes
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    JustDied(pPlayer);
+                }
+                m_creature->ForcedDespawn(5000);
+                break;
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING) && !m_bFriendSummoned)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CALL_FRIENDS) == CAST_OK)
+                {
+                    DoScriptText(SAY_SLIM_AGGRO, m_creature);
+                    m_bFriendSummoned = true;
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Note: may not work on guardian pets
+            if (Player* pPlayer = GetPlayerForEscort())
+            {
+                pSummoned->AI()->AttackStart(pPlayer);
+            }
+            friendGUID = pSummoned->GetObjectGuid();
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+                return;
+
+            if (m_creature->HealthBelowPctDamaged(20, uiDamage))
+            {
+                uiDamage = 0;
+
+                 if (Player* pPlayer = GetPlayerForEscort())
+                 {
+                     pPlayer->GroupEventHappens(QUEST_MISSING_DIPLO_PT11, m_creature);
+                     if(Creature* pFriend = m_creature->GetMap()->GetCreature(friendGUID))
+                     {
+                         pFriend->ForcedDespawn(0);
+                     }
+                 }
+                // despawn friend - Note: may not work on guardian pets
+
+                // set escort on pause and evade
+                m_bEventComplete = true;
+                SetEscortPaused(true);
+                EnterEvadeMode();
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !HasEscortState(STATE_ESCORT_ESCORTING))
+                return;
+
+            npc_escortAI::MovementInform(uiMoveType, uiPointId);
+
+            // after the npc is defeated, start the dialog right after it reaches the evade point
+            if (m_bEventComplete)
+            {
+                if (Player* pPlayer = GetPlayerForEscort())
+                    m_creature->SetFacingToObject(pPlayer);
+
+                StartNextDialogueText(SAY_SLIM_DEFEAT);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            // start escort
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue), true);
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            if (iEntry == QUEST_MISSING_DIPLO_PT11)
+            {
+                // complete quest
+                if (Player* pPlayer = GetPlayerForEscort())
+                    pPlayer->GroupEventHappens(QUEST_MISSING_DIPLO_PT11, m_creature);
+
+                // despawn and respawn at inn
+                m_creature->ForcedDespawn(1000);
+                m_creature->SetRespawnDelay(2);
+            }
+        }
+
+        Creature* GetSpeakerByEntry(uint32 uiEntry) override
+        {
+            if (uiEntry == NPC_TAPOKE_SLIM_JAHN)
+                return m_creature;
+
+            return NULL;
+        }
+
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+
+    private:
+        ObjectGuid friendGUID;
+        bool m_bFriendSummoned;
+        bool m_bEventComplete;
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_tapoke_slim_jahnAI(pCreature);
+    }
+};
+
+/*######
+## npc_mikhail
+######*/
+
+struct npc_mikhail : public CreatureScript
+{
+    npc_mikhail() : CreatureScript("npc_mikhail") {}
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT11)
+        {
+            Creature* pSlim = GetClosestCreatureWithEntry(pCreature, NPC_TAPOKE_SLIM_JAHN, 25.0f);
+            if (!pSlim)
+            {
+                return false;
+            }
+
+            if (!pSlim->HasAura(SPELL_STEALTH))
+            {
+                pSlim->CastSpell(pSlim, SPELL_STEALTH, true);
+            }
+
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pSlim, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## AddSC
+######*/
+
+void AddSC_wetlands()
+{
+    Script* s;
+    s = new npc_tapoke_slim_jahn();
+    s->RegisterSelf();
+    s = new npc_mikhail();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_tapoke_slim_jahn";
+    //pNewScript->GetAI = &GetAI_npc_tapoke_slim_jahn;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_mikhail";
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_mikhail;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
new file mode 100644
index 000000000..66baaf16c
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
@@ -0,0 +1,382 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Akilzon
+SD%Complete: 80
+SDComment: Timers; Some details may need adjustments.
+SDCategory: Zul'Aman
+EndScriptData */
+
+#include "precompiled.h"
+#include "zulaman.h"
+
+enum
+{
+    SAY_EVENT1              = -1568024,
+    SAY_EVENT2              = -1568025,
+    SAY_AGGRO               = -1568026,
+    SAY_SUMMON              = -1568027,
+    SAY_SUMMON_ALT          = -1568028,
+    SAY_ENRAGE              = -1568029,
+    SAY_SLAY1               = -1568030,
+    SAY_SLAY2               = -1568031,
+    SAY_DEATH               = -1568032,
+    EMOTE_STORM             = -1568033,
+
+    SPELL_STATIC_DISRUPTION = 43622,
+    SPELL_CALL_LIGHTNING    = 43661,
+    SPELL_GUST_OF_WIND      = 43621,
+    SPELL_ELECTRICAL_STORM  = 43648,
+    SPELL_STORMCLOUD_VISUAL = 45213,
+    SPELL_BERSERK           = 45078,
+
+    // spell used by eagles
+    SPELL_EAGLE_SWOOP       = 44732,
+
+    NPC_SOARING_EAGLE       = 24858,
+    MAX_EAGLE_COUNT         = 6,
+};
+
+struct boss_akilzon : public CreatureScript
+{
+    boss_akilzon() : CreatureScript("boss_akilzon") {}
+
+    struct boss_akilzonAI : public ScriptedAI
+    {
+        boss_akilzonAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiStaticDisruptTimer;
+        uint32 m_uiCallLightTimer;
+        uint32 m_uiGustOfWindTimer;
+        uint32 m_uiStormTimer;
+        uint32 m_uiSummonEagleTimer;
+        uint32 m_uiBerserkTimer;
+
+        void Reset() override
+        {
+            m_uiStaticDisruptTimer = urand(7000, 14000);
+            m_uiCallLightTimer = urand(15000, 25000);
+            m_uiGustOfWindTimer = urand(20000, 30000);
+            m_uiStormTimer = 50000;
+            m_uiSummonEagleTimer = 65000;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_AKILZON, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            m_pInstance->SetData(TYPE_AKILZON, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_AKILZON, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SOARING_EAGLE)
+            {
+                pSummoned->SetLevitate(true);
+                pSummoned->SetInCombatWithZone();
+            }
+        }
+
+        void DoSummonEagles()
+        {
+            for (uint32 i = 0; i < MAX_EAGLE_COUNT; ++i)
+            {
+                float fX, fY, fZ;
+                m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() + 15.0f, 30.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_SOARING_EAGLE, fX, fY, fZ, m_creature->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiCallLightTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CALL_LIGHTNING) == CAST_OK)
+                {
+                    m_uiCallLightTimer = urand(15000, 25000);
+                }
+            }
+            else
+            {
+                m_uiCallLightTimer -= uiDiff;
+            }
+
+            if (m_uiStaticDisruptTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_STATIC_DISRUPTION) == CAST_OK)
+                    {
+                        m_uiStaticDisruptTimer = urand(7000, 14000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiStaticDisruptTimer -= uiDiff;
+            }
+
+            if (m_uiStormTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_ELECTRICAL_STORM) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_STORM, m_creature);
+                        m_uiStormTimer = 55000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiStormTimer -= uiDiff;
+            }
+
+            if (m_uiGustOfWindTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_GUST_OF_WIND) == CAST_OK)
+                    {
+                        m_uiGustOfWindTimer = urand(20000, 30000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiGustOfWindTimer -= uiDiff;
+            }
+
+            if (m_uiSummonEagleTimer < uiDiff)
+            {
+                DoScriptText(urand(0, 1) ? SAY_SUMMON : SAY_SUMMON_ALT, m_creature);
+                DoSummonEagles();
+                m_uiSummonEagleTimer = 60000;
+            }
+            else
+            {
+                m_uiSummonEagleTimer -= uiDiff;
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_ENRAGE, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_akilzonAI(pCreature);
+    }
+};
+
+//** mob_soaring_eagle
+struct mob_soaring_eagle : public CreatureScript
+{
+    mob_soaring_eagle() : CreatureScript("mob_soaring_eagle") {}
+
+    struct mob_soaring_eagleAI : public ScriptedAI
+    {
+        mob_soaring_eagleAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiEagleSwoopTimer;
+        uint32 m_uiReturnTimer;
+        bool m_bCanMoveToRandom;
+
+        void Reset() override
+        {
+            m_uiEagleSwoopTimer = 0;
+            m_uiReturnTimer = 800;
+            m_bCanMoveToRandom = false;
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (!pWho)
+            {
+                return;
+            }
+
+            if (m_creature->Attack(pWho, false))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+            }
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || !uiPointId)
+            {
+                return;
+            }
+
+            m_uiEagleSwoopTimer = urand(2000, 6000);
+        }
+
+        void DoMoveToRandom()
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            if (Creature* pAzkil = m_pInstance->GetSingleCreatureFromStorage(NPC_AKILZON))
+            {
+                float fX, fY, fZ;
+                pAzkil->GetRandomPoint(pAzkil->GetPositionX(), pAzkil->GetPositionY(), pAzkil->GetPositionZ() + 15.0f, 30.0f, fX, fY, fZ);
+
+                m_creature->SetWalk(false);
+                m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiReturnTimer)
+            {
+                if (m_uiReturnTimer <= uiDiff)
+                {
+                    DoMoveToRandom();
+                    m_uiReturnTimer = 0;
+                }
+                else
+                {
+                    m_uiReturnTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiEagleSwoopTimer)
+            {
+                if (m_uiEagleSwoopTimer <= uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_EAGLE_SWOOP) == CAST_OK)
+                        {
+                            m_uiEagleSwoopTimer = 0;
+                            m_uiReturnTimer = 1000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiEagleSwoopTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_soaring_eagleAI(pCreature);
+    }
+};
+
+void AddSC_boss_akilzon()
+{
+    Script* s;
+
+    s = new boss_akilzon();
+    s->RegisterSelf();
+    s = new mob_soaring_eagle();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_akilzon";
+    //pNewScript->GetAI = &GetAI_boss_akilzon;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_soaring_eagle";
+    //pNewScript->GetAI = &GetAI_mob_soaring_eagle;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp
new file mode 100644
index 000000000..24413af2c
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp
@@ -0,0 +1,461 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Halazzi
+SD%Complete: 90
+SDComment: A few details and timers need check.
+SDCategory: Zul'Aman
+EndScriptData */
+
+#include "precompiled.h"
+#include "zulaman.h"
+
+enum
+{
+    SAY_AGGRO                       = -1568034,
+    SAY_SPLIT                       = -1568035,
+    SAY_MERGE                       = -1568036,
+    SAY_SABERLASH1                  = -1568037,
+    SAY_SABERLASH2                  = -1568038,
+    SAY_BERSERK                     = -1568039,
+    SAY_KILL1                       = -1568040,
+    SAY_KILL2                       = -1568041,
+    SAY_DEATH                       = -1568042,
+    SAY_EVENT1                      = -1568043,
+    SAY_EVENT2                      = -1568044,
+
+    // generic spells
+    SPELL_BERSERK                   = 45078,
+    SPELL_TRANSFORM_TO_ORIGINAL     = 43311,
+    // SPELL_DUAL_WIELD              = 42459,            // spell not confirmed
+    // SPELL_TRANSFIGURE             = 44054,            // purpose unk
+
+    // Phase single spells
+    SPELL_SABER_LASH                = 43267,
+    SPELL_FRENZY                    = 43139,
+
+    // Phase switch spells
+    SPELL_HALAZZI_TRANSFORM_SUMMON  = 43143,            // summons 24143
+    SPELL_TRANSFIGURE_TO_TROLL      = 43142,            // triggers 43573
+    SPELL_TRANSFIGURE_TRANSFORM     = 43573,
+
+    SPELL_TRANSFORM_TO_LYNX_75      = 43145,
+    SPELL_TRANSFORM_TO_LYNX_50      = 43271,
+    SPELL_TRANSFORM_TO_LYNX_25      = 43272,
+    SPELL_HALAZZI_TRANSFORM_DUMMY   = 43615,
+    // SPELL_HALAZZI_TRANSFORM_VISUAL= 43293,
+
+    // Phase spirits spells
+    SPELL_FLAMESHOCK                = 43303,
+    SPELL_EARTHSHOCK                = 43305,
+    SPELL_LIGHTNING_TOTEM           = 43302,            // summons 24224
+
+    NPC_HALAZZI_TROLL               = 24144,            // dummy creature - used to update stats
+    NPC_SPIRIT_LYNX                 = 24143,
+};
+
+enum HalazziPhase
+{
+    PHASE_SINGLE        = 0,
+    PHASE_TOTEM         = 1,
+    PHASE_FINAL         = 2
+};
+
+struct boss_halazzi : public CreatureScript
+{
+    boss_halazzi() : CreatureScript("boss_halazzi") {}
+
+    struct boss_halazziAI : public ScriptedAI
+    {
+        boss_halazziAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        HalazziPhase m_uiPhase;
+
+        uint32 m_uiPhaseCounter;
+        uint32 m_uiFrenzyTimer;
+        uint32 m_uiSaberLashTimer;
+        uint32 m_uiShockTimer;
+        uint32 m_uiTotemTimer;
+        uint32 m_uiBerserkTimer;
+
+        bool m_bHasTransformed;
+
+        ObjectGuid m_spiritLynxGuid;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_SINGLE;
+            m_uiPhaseCounter = 3;
+
+            m_uiFrenzyTimer = 16000;
+            m_uiSaberLashTimer = 20000;
+            m_uiShockTimer = 10000;
+            m_uiTotemTimer = 12000;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            m_bHasTransformed = false;
+        }
+
+        void EnterEvadeMode() override
+        {
+            // Transform back on evade
+            if (DoCastSpellIfCan(m_creature, SPELL_TRANSFORM_TO_ORIGINAL) == CAST_OK)
+            {
+                m_creature->UpdateEntry(NPC_HALAZZI);
+            }
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HALAZZI, FAIL);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HALAZZI, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HALAZZI, DONE);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SPIRIT_LYNX)
+            {
+                m_spiritLynxGuid = pSummoned->GetObjectGuid();
+                pSummoned->SetInCombatWithZone();
+                pSummoned->CastSpell(m_creature, SPELL_HALAZZI_TRANSFORM_DUMMY, true);
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_TRANSFIGURE_TRANSFORM)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_HALAZZI_TRANSFORM_SUMMON, CAST_TRIGGERED);
+                m_creature->UpdateEntry(NPC_HALAZZI_TROLL);
+
+                m_uiPhase = PHASE_TOTEM;
+                m_uiShockTimer = 10000;
+                m_uiTotemTimer = 12000;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender->GetEntry() == NPC_SPIRIT_LYNX)
+                DoReuniteSpirits();
+        }
+
+        // Wrapper to handle the phase transform
+        void DoReuniteSpirits()
+        {
+            uint32 uiSpellId = 0;
+
+            // Each health level has it's own spell - but they all do the same thing
+            switch (m_uiPhaseCounter)
+            {
+            case 3: uiSpellId = SPELL_TRANSFORM_TO_LYNX_75; break;
+            case 2: uiSpellId = SPELL_TRANSFORM_TO_LYNX_50; break;
+            case 1: uiSpellId = SPELL_TRANSFORM_TO_LYNX_25; break;
+            }
+
+            if (DoCastSpellIfCan(m_creature, uiSpellId) == CAST_OK)
+            {
+                DoScriptText(SAY_MERGE, m_creature);
+                // Update stats back to the original Halazzi
+                m_creature->UpdateEntry(NPC_HALAZZI);
+
+                // Despawn the Lynx
+                if (Creature* pLynx = m_creature->GetMap()->GetCreature(m_spiritLynxGuid))
+                {
+                    pLynx->ForcedDespawn();
+                }
+
+                // Set the proper health level - workaround for missing server side spell 43538
+                m_creature->SetHealth(m_creature->GetMaxHealth() / 4 * m_uiPhaseCounter);
+                --m_uiPhaseCounter;
+
+                m_uiPhase = m_uiPhaseCounter > 0 ? PHASE_SINGLE : PHASE_FINAL;
+                m_uiFrenzyTimer = 16000;
+                m_uiSaberLashTimer = 20000;
+                m_bHasTransformed = false;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            // Abilities used only in the single or final phase
+            if (m_uiPhase == PHASE_SINGLE || m_uiPhase == PHASE_FINAL)
+            {
+                // Split boss at 75%, 50% and 25%
+                if (!m_bHasTransformed && m_creature->GetHealthPercent() <= float(25 * m_uiPhaseCounter))
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TRANSFIGURE_TO_TROLL) == CAST_OK)
+                    {
+                        DoScriptText(SAY_SPLIT, m_creature);
+                        m_bHasTransformed = true;
+                    }
+                }
+
+                if (m_uiFrenzyTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                    {
+                        m_uiFrenzyTimer = 16000;
+                    }
+                }
+                else
+                {
+                    m_uiFrenzyTimer -= uiDiff;
+                }
+
+                if (m_uiSaberLashTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SABER_LASH) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_SABERLASH1 : SAY_SABERLASH2, m_creature);
+                        m_uiSaberLashTimer = 20000;
+                    }
+                }
+                else
+                {
+                    m_uiSaberLashTimer -= uiDiff;
+                }
+            }
+
+            // Abilities used during the split phase or when the boss is below 25% health
+            if (m_uiPhase == PHASE_TOTEM || m_uiPhase == PHASE_FINAL)
+            {
+                if (m_uiTotemTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_LIGHTNING_TOTEM) == CAST_OK)
+                    {
+                        m_uiTotemTimer = 20000;
+                    }
+                }
+                else
+                {
+                    m_uiTotemTimer -= uiDiff;
+                }
+
+                if (m_uiShockTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, urand(0, 1) ? SPELL_EARTHSHOCK : SPELL_FLAMESHOCK) == CAST_OK)
+                        {
+                            m_uiShockTimer = urand(10000, 14000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiShockTimer -= uiDiff;
+                }
+            }
+
+            // Transform back from Totem phase
+            if (m_uiPhase == PHASE_TOTEM && m_creature->GetHealthPercent() < 20.0f)
+            {
+                DoReuniteSpirits();
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_halazziAI(pCreature);
+    }
+};
+
+enum
+{
+    SPELL_LYNX_FRENZY       = 43290,
+    SPELL_SHRED_ARMOR       = 43243
+};
+
+//* boss_spirit_lynx
+struct boss_spirit_lynx : public CreatureScript
+{
+    boss_spirit_lynx() : CreatureScript("boss_spirit_lynx") {}
+
+    struct boss_spirit_lynxAI : public ScriptedAI
+    {
+        boss_spirit_lynxAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiFrenzyTimer;
+        uint32 m_uiShredArmorTimer;
+        bool m_bHasUnited;
+
+        void Reset() override
+        {
+            m_uiFrenzyTimer = urand(10000, 20000);          // first frenzy after 10-20 seconds
+            m_uiShredArmorTimer = 4000;
+            m_bHasUnited = false;
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            if (Creature* pHalazzi = m_pInstance->GetSingleCreatureFromStorage(NPC_HALAZZI))
+            {
+                pHalazzi->AI()->KilledUnit(pVictim);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiFrenzyTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_LYNX_FRENZY);
+                m_uiFrenzyTimer = urand(20000, 30000);          // subsequent frenzys casted every 20-30 seconds
+            }
+            else
+            {
+                m_uiFrenzyTimer -= uiDiff;
+            }
+
+            if (m_uiShredArmorTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHRED_ARMOR);
+                m_uiShredArmorTimer = 4000;
+            }
+            else
+            {
+                m_uiShredArmorTimer -= uiDiff;
+            }
+
+            // Unite spirits at 10% health
+            // Note: maybe there is some spell related to this - needs research
+            if (!m_bHasUnited && m_creature->GetHealthPercent() < 10.0f && m_pInstance)
+            {
+                if (Creature* pHalazzi = m_pInstance->GetSingleCreatureFromStorage(NPC_HALAZZI))
+                {
+                    SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pHalazzi);
+                }
+                m_bHasUnited = true;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_spirit_lynxAI(pCreature);
+    }
+};
+
+void AddSC_boss_halazzi()
+{
+    Script* s;
+
+    s = new boss_halazzi();
+    s->RegisterSelf();
+    s = new boss_spirit_lynx();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_halazzi";
+    //pNewScript->GetAI = &GetAI_boss_halazzi;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_spirit_lynx";
+    //pNewScript->GetAI = &GetAI_boss_spirit_lynx;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
new file mode 100644
index 000000000..51391adc1
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
@@ -0,0 +1,645 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Janalai
+SD%Complete: 90
+SDComment: The hatchers may need some additional behavior adjustments.
+SDCategory: Zul'Aman
+EndScriptData */
+
+#include "precompiled.h"
+#include "zulaman.h"
+
+enum
+{
+    SAY_AGGRO                       = -1568000,
+    SAY_FIRE_BOMBS                  = -1568001,
+    SAY_SUMMON_HATCHER              = -1568002,
+    SAY_ALL_EGGS                    = -1568003,
+    SAY_BERSERK                     = -1568004,
+    SAY_SLAY_1                      = -1568005,
+    SAY_SLAY_2                      = -1568006,
+    SAY_DEATH                       = -1568007,
+    SAY_EVENT_STRANGERS             = -1568008,
+    SAY_EVENT_FRIENDS               = -1568009,
+
+    // Jan'alai
+    SPELL_FLAME_BREATH              = 43140,
+    SPELL_HATCH_ALL_EGGS            = 43144,                // triggers 42493
+    SPELL_TELEPORT_TO_CENTER        = 43098,
+    SPELL_SUMMON_ALL_PLAYERS        = 43096,                // triggers 43097
+    SPELL_ENRAGE                    = 44779,
+    SPELL_BERSERK                   = 47008,
+    SPELL_SUMMON_HATCHER_1          = 43962,
+    SPELL_SUMMON_HATCHER_2          = 45340,
+
+    // Fire Bob Spells
+    SPELL_FIRE_BOMB_CHANNEL         = 42621,
+    SPELL_FIRE_BOMB_THROW           = 42628,                // triggers 42629
+    SPELL_FIRE_BOMB_EXPLODE         = 42631,                // triggers 42630
+
+    // NPCs
+    NPC_FIRE_BOMB                   = 23920,
+    NPC_AMANI_HATCHER_1             = 23818,
+    NPC_AMANI_HATCHER_2             = 24504,
+    NPC_HATCHLING                   = 23598,
+    NPC_DRAGONHAWK_EGG              = 23817,
+
+    // Hatcher Spells
+    SPELL_HATCH_EGG_1               = 43734,
+    SPELL_HATCH_EGG_2               = 42471,
+
+    // Fire Wall
+    SPELL_FIRE_WALL                 = 43113,
+
+    // Eggs spells
+    SPELL_SUMMON_DRAGONHAWK         = 42493,
+
+    MAX_EGGS_ON_SIDE                = 20,                   // there are 20 eggs spawned on each side
+};
+
+static const float afFireWallCoords[4][4] =
+{
+    { -10.13f, 1149.27f, 19.0f, M_PI_F},
+    { -33.93f, 1123.90f, 19.0f, 0.5f * M_PI_F},
+    { -54.80f, 1150.08f, 19.0f, 0.0f},
+    { -33.93f, 1175.68f, 19.0f, 1.5f * M_PI_F}
+};
+
+struct WaypointDef
+{
+    float m_fX, m_fY, m_fZ;
+};
+
+static const WaypointDef m_aHatcherRight[] =
+{
+    { -74.783f, 1145.827f, 5.420f},
+    { -54.476f, 1146.934f, 18.705f},
+    { -56.957f, 1146.713f, 18.725f},
+    { -45.428f, 1141.697f, 18.709f},
+    { -34.002f, 1124.427f, 18.711f},
+    { -34.085f, 1106.158f, 18.711f}
+};
+
+static const WaypointDef m_aHatcherLeft[] =
+{
+    { -73.569f, 1154.960f, 5.510f},
+    { -54.264f, 1153.968f, 18.705f},
+    { -56.985f, 1153.373f, 18.608f},
+    { -45.515f, 1158.356f, 18.709f},
+    { -33.314f, 1174.816f, 18.709f},
+    { -33.097f, 1195.359f, 18.709f}
+};
+
+struct boss_janalai : public CreatureScript
+{
+    boss_janalai() : CreatureScript("boss_janalai") {}
+
+    struct boss_janalaiAI : public ScriptedAI
+    {
+        boss_janalaiAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiFireBreathTimer;
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiHatcherTimer;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiBombTimer;
+        uint32 m_uiBombAuraTimer;
+        uint32 m_uiExplodeTimer;
+
+        uint8 m_uiEggsHatchedLeft;
+        uint8 m_uiEggsHatchedRight;
+
+        bool m_bIsFlameWall;
+        bool m_bHasHatchedEggs;
+        bool m_bIsEnraged;
+
+        ObjectGuid m_hatcherOneGuid;
+        ObjectGuid m_hatcherTwoGuid;
+
+        void Reset() override
+        {
+            m_uiFireBreathTimer = 8000;
+            m_uiEnrageTimer = 5 * MINUTE * IN_MILLISECONDS;
+            m_uiHatcherTimer = 10000;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+            m_uiBombTimer = 30000;
+            m_uiBombAuraTimer = 0;
+            m_uiExplodeTimer = 0;
+
+            m_uiEggsHatchedLeft = 0;
+            m_uiEggsHatchedRight = 0;
+
+            m_bHasHatchedEggs = false;
+            m_bIsEnraged = false;
+            m_bIsFlameWall = false;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_JANALAI, FAIL);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_JANALAI, DONE);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_JANALAI, IN_PROGRESS);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_AMANI_HATCHER_1:
+                m_hatcherOneGuid = pSummoned->GetObjectGuid();
+                // If all the eggs from one side are hatched, move to the other side
+                if (m_uiEggsHatchedRight == MAX_EGGS_ON_SIDE)
+                {
+                    pSummoned->GetMotionMaster()->MovePoint(1, m_aHatcherLeft[0].m_fX, m_aHatcherLeft[0].m_fY, m_aHatcherLeft[0].m_fZ);
+                }
+                else
+                {
+                    pSummoned->GetMotionMaster()->MovePoint(1, m_aHatcherRight[0].m_fX, m_aHatcherRight[0].m_fY, m_aHatcherRight[0].m_fZ);
+                }
+                break;
+            case NPC_AMANI_HATCHER_2:
+                m_hatcherTwoGuid = pSummoned->GetObjectGuid();
+                // If all the eggs from one side are hatched, move to the other side
+                if (m_uiEggsHatchedLeft == MAX_EGGS_ON_SIDE)
+                {
+                    pSummoned->GetMotionMaster()->MovePoint(1, m_aHatcherRight[0].m_fX, m_aHatcherRight[0].m_fY, m_aHatcherRight[0].m_fZ);
+                }
+                else
+                {
+                    pSummoned->GetMotionMaster()->MovePoint(1, m_aHatcherLeft[0].m_fX, m_aHatcherLeft[0].m_fY, m_aHatcherLeft[0].m_fZ);
+                }
+                break;
+            case NPC_FIRE_BOMB:
+                if (!m_bIsFlameWall)
+                {
+                    DoCastSpellIfCan(pSummoned, SPELL_FIRE_BOMB_THROW, CAST_TRIGGERED);
+                }
+                else
+                {
+                    pSummoned->CastSpell(pSummoned, SPELL_FIRE_WALL, true);
+                }
+                break;
+            case NPC_HATCHLING:
+                pSummoned->SetInCombatWithZone();
+                // Count the Hatched eggs
+                pSummoned->GetPositionY() > 1100.0f ? ++m_uiEggsHatchedLeft : ++m_uiEggsHatchedRight;
+                // Notify the script when all the eggs were hatched
+                if (m_uiEggsHatchedRight == MAX_EGGS_ON_SIDE && m_uiEggsHatchedLeft == MAX_EGGS_ON_SIDE)
+                {
+                    m_bHasHatchedEggs = true;
+                }
+                // Change the side of the hatcher if necessary
+                if (m_uiEggsHatchedRight == MAX_EGGS_ON_SIDE && m_uiEggsHatchedLeft < MAX_EGGS_ON_SIDE)
+                {
+                    if (Creature* pHatcer = m_creature->GetMap()->GetCreature(m_hatcherOneGuid))
+                    {
+                        pHatcer->GetMotionMaster()->MovePoint(1, m_aHatcherLeft[5].m_fX, m_aHatcherLeft[5].m_fY, m_aHatcherLeft[5].m_fZ);
+                    }
+                }
+                if (m_uiEggsHatchedLeft == MAX_EGGS_ON_SIDE && m_uiEggsHatchedRight < MAX_EGGS_ON_SIDE)
+                {
+                    if (Creature* pHatcer = m_creature->GetMap()->GetCreature(m_hatcherTwoGuid))
+                    {
+                        pHatcer->GetMotionMaster()->MovePoint(1, m_aHatcherRight[5].m_fX, m_aHatcherRight[5].m_fY, m_aHatcherRight[5].m_fZ);
+                    }
+                }
+                break;
+            }
+        }
+
+        // Wrapper to create the firewalls during Bomb phase
+        void DoCreateFireWall()
+        {
+            // This function involves a lot of guesswork!!!
+            // The npc entry isn't sure and the locations are guessed
+            m_bIsFlameWall = true;
+            m_creature->SummonCreature(NPC_FIRE_BOMB, afFireWallCoords[0][0], afFireWallCoords[0][1], afFireWallCoords[0][2], afFireWallCoords[0][3], TEMPSUMMON_TIMED_DESPAWN, 12000);
+            m_creature->SummonCreature(NPC_FIRE_BOMB, afFireWallCoords[1][0], afFireWallCoords[1][1], afFireWallCoords[1][2], afFireWallCoords[1][3], TEMPSUMMON_TIMED_DESPAWN, 12000);
+            m_creature->SummonCreature(NPC_FIRE_BOMB, afFireWallCoords[2][0], afFireWallCoords[2][1], afFireWallCoords[2][2], afFireWallCoords[2][3], TEMPSUMMON_TIMED_DESPAWN, 12000);
+            m_creature->SummonCreature(NPC_FIRE_BOMB, afFireWallCoords[3][0], afFireWallCoords[3][1], afFireWallCoords[3][2], afFireWallCoords[3][3], TEMPSUMMON_TIMED_DESPAWN, 12000);
+            m_bIsFlameWall = false;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Start bombing
+            if (m_uiBombTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FIRE_BOMB_CHANNEL) == CAST_OK)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_TELEPORT_TO_CENTER, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_SUMMON_ALL_PLAYERS, CAST_TRIGGERED);
+                    DoScriptText(SAY_FIRE_BOMBS, m_creature);
+                    DoCreateFireWall();
+
+                    m_uiBombAuraTimer = 5000;
+                    m_uiBombTimer = urand(20000, 40000);
+                }
+            }
+            else
+            {
+                m_uiBombTimer -= uiDiff;
+            }
+
+            if (m_uiFireBreathTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_FLAME_BREATH) == CAST_OK)
+                    {
+                        m_uiFireBreathTimer = 8000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiFireBreathTimer -= uiDiff;
+            }
+
+            // Remove bomb aura after five seconds
+            if (m_uiBombAuraTimer)
+            {
+                if (m_uiBombAuraTimer <= uiDiff)
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_FIRE_BOMB_CHANNEL);
+                    m_uiBombAuraTimer = 0;
+                    m_uiExplodeTimer = 5000;
+                }
+                else
+                {
+                    m_uiBombAuraTimer -= uiDiff;
+                }
+            }
+
+            // Explode the summoned bombs on timer
+            if (m_uiExplodeTimer)
+            {
+                if (m_uiExplodeTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FIRE_BOMB_EXPLODE) == CAST_OK)
+                    {
+                        m_uiExplodeTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiExplodeTimer -= uiDiff;
+                }
+            }
+
+            // Hatch all eggs at 35% health
+            if (!m_bHasHatchedEggs && m_creature->GetHealthPercent() < 35.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_HATCH_ALL_EGGS) == CAST_OK)
+                {
+                    DoScriptText(SAY_ALL_EGGS, m_creature);
+                    m_bHasHatchedEggs = true;
+                }
+            }
+
+            // Soft Enrage - after 5 min, or at 20% health
+            if (!m_bIsEnraged)
+            {
+                if (m_uiEnrageTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                    {
+                        m_bIsEnraged = true;
+                    }
+                }
+                else
+                {
+                    m_uiEnrageTimer -= uiDiff;
+                }
+
+                if (m_creature->GetHealthPercent() < 20.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                    {
+                        m_bIsEnraged = true;
+                    }
+                }
+            }
+
+            // Spawn Hatchers - if necessary
+            if (!m_bHasHatchedEggs)
+            {
+                if (m_uiHatcherTimer < uiDiff)
+                {
+                    DoScriptText(SAY_SUMMON_HATCHER, m_creature);
+
+                    Creature* pHatcer1 = m_creature->GetMap()->GetCreature(m_hatcherOneGuid);
+                    Creature* pHatcer2 = m_creature->GetMap()->GetCreature(m_hatcherTwoGuid);
+
+                    if (!pHatcer1 || !pHatcer1->IsAlive())
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_HATCHER_1, CAST_TRIGGERED);
+                    }
+
+                    if (!pHatcer2 || !pHatcer2->IsAlive())
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_HATCHER_2, CAST_TRIGGERED);
+                    }
+
+                    m_uiHatcherTimer = 90000;
+                }
+                else
+                {
+                    m_uiHatcherTimer -= uiDiff;
+                }
+            }
+
+            // Hard enrage
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+
+            // check for reset ... exploit preventing ... pulled from his podest
+            EnterEvadeIfOutOfCombatArea(uiDiff);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_janalaiAI(pCreature);
+    }
+};
+
+//** npc_amanishi_hatcher
+struct npc_amanishi_hatcher : public CreatureScript
+{
+    npc_amanishi_hatcher() : CreatureScript("npc_amanishi_hatcher") {}
+
+    struct npc_amanishi_hatcherAI : public ScriptedAI
+    {
+        npc_amanishi_hatcherAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiWaypoint;
+        uint32 m_uiHatchlingTimer;
+        uint8 m_uiHatchlingCount;
+        uint8 m_uiEggsHatched;
+        bool m_bWaypointEnd;
+
+        void Reset() override
+        {
+            m_uiWaypoint = 0;
+            m_uiHatchlingTimer = 0;
+            m_uiHatchlingCount = 0;
+            m_uiEggsHatched = 0;
+            m_bWaypointEnd = false;
+
+            m_creature->SetWalk(false);
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            // Used when a hatcher is forced to switch sides
+            if (m_bWaypointEnd && uiPointId)
+            {
+                m_creature->GetMotionMaster()->Clear();
+                m_uiHatchlingTimer = 1000;
+                return;
+            }
+
+            uint32 uiCount = m_creature->GetEntry() == NPC_AMANI_HATCHER_1 ? countof(m_aHatcherRight) : countof(m_aHatcherLeft);
+
+            m_uiWaypoint = uiPointId + 1;
+
+            if (uiCount == m_uiWaypoint)
+            {
+                m_creature->GetMotionMaster()->Clear();
+                m_uiHatchlingTimer = 1000;
+                m_bWaypointEnd = true;
+            }
+            else
+            {
+                if (m_creature->GetEntry() == NPC_AMANI_HATCHER_1)
+                {
+                    m_creature->GetMotionMaster()->MovePoint(m_uiWaypoint, m_aHatcherRight[m_uiWaypoint].m_fX, m_aHatcherRight[m_uiWaypoint].m_fY, m_aHatcherRight[m_uiWaypoint].m_fZ);
+                }
+                else
+                {
+                    m_creature->GetMotionMaster()->MovePoint(m_uiWaypoint, m_aHatcherLeft[m_uiWaypoint].m_fX, m_aHatcherLeft[m_uiWaypoint].m_fY, m_aHatcherLeft[m_uiWaypoint].m_fZ);
+                }
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, SpellEntry const* pSpell) override
+        {
+            if ((pSpell->Id != SPELL_HATCH_EGG_1 && pSpell->Id != SPELL_HATCH_EGG_2) || pTarget->GetEntry() != NPC_DRAGONHAWK_EGG)
+            {
+                return;
+            }
+
+            // If we already hatched the number of eggs allowed per hatch phase, stop the hatching
+            if (m_uiEggsHatched >= m_uiHatchlingCount)
+            {
+                return;
+            }
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            if (Creature* pJanalai = m_pInstance->GetSingleCreatureFromStorage(NPC_JANALAI))
+            {
+                pTarget->CastSpell(pTarget, SPELL_SUMMON_DRAGONHAWK, true, NULL, NULL, pJanalai->GetObjectGuid());
+                ++m_uiEggsHatched;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_bWaypointEnd)
+            {
+                return;
+            }
+
+            if (m_uiHatchlingTimer)
+            {
+                if (m_uiHatchlingTimer <= uiDiff)
+                {
+                    // Note: there are 2 Hatch Eggs spells. Not sure which one to use
+                    if (DoCastSpellIfCan(m_creature, SPELL_HATCH_EGG_2) == CAST_OK)
+                    {
+                        m_uiHatchlingTimer = m_uiHatchlingCount < 5 ? 10000 : 0;
+                        m_uiEggsHatched = 0;
+                        ++m_uiHatchlingCount;
+                    }
+                }
+                else
+                {
+                    m_uiHatchlingTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_amanishi_hatcherAI(pCreature);
+    }
+};
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_dragonhawk_egg : public CreatureScript
+{
+    npc_dragonhawk_egg() : CreatureScript("npc_dragonhawk_egg") {}
+
+    struct npc_dragonhawk_eggAI : public Scripted_NoMovementAI
+    {
+        npc_dragonhawk_eggAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { Reset(); }
+
+        void AttackStart(Unit* /*pWho*/) override {}
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+        void UpdateAI(const uint32 /*uiDiff*/) override {}
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_dragonhawk_eggAI(pCreature);
+    }
+};
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_janalai_firebomb : public CreatureScript
+{
+    npc_janalai_firebomb() : CreatureScript("npc_janalai_firebomb") {}
+
+    struct npc_janalai_firebombAI : public Scripted_NoMovementAI
+    {
+        npc_janalai_firebombAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { Reset(); }
+
+        void AttackStart(Unit* /*pWho*/) override {}
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+        void UpdateAI(const uint32 /*uiDiff*/) override {}
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_janalai_firebombAI(pCreature);
+    }
+};
+
+void AddSC_boss_janalai()
+{
+    Script* s;
+
+    s = new boss_janalai();
+    s->RegisterSelf();
+    s = new npc_dragonhawk_egg();
+    s->RegisterSelf();
+    s = new npc_janalai_firebomb();
+    s->RegisterSelf();
+    s = new npc_amanishi_hatcher();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_janalai";
+    //pNewScript->GetAI = &GetAI_boss_janalaiAI;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_dragonhawk_egg";
+    //pNewScript->GetAI = &GetAI_npc_dragonhawk_eggAI;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_janalai_firebomb";
+    //pNewScript->GetAI = &GetAI_npc_janalai_firebombAI;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_amanishi_hatcher";
+    //pNewScript->GetAI = &GetAI_npc_amanishi_hatcherAI;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_malacrass.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_malacrass.cpp
new file mode 100644
index 000000000..f1ffefa57
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_malacrass.cpp
@@ -0,0 +1,501 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Malacrass
+SD%Complete: 80
+SDComment: Contain adds and adds selection; Stolen abilities timers need improvement
+SDCategory: Zul'Aman
+EndScriptData */
+
+#include "precompiled.h"
+#include "zulaman.h"
+
+enum
+{
+    SAY_AGGRO                   = -1568045,
+    SAY_ENRAGE                  = -1568046,
+    SAY_KILL1                   = -1568047,
+    SAY_KILL2                   = -1568048,
+    SAY_SOUL_SIPHON             = -1568049,
+    SAY_DRAIN_POWER             = -1568050,
+    SAY_SPIRIT_BOLTS            = -1568051,
+    SAY_ADD_DIED1               = -1568052,
+    SAY_ADD_DIED2               = -1568053,
+    SAY_ADD_DIED3               = -1568054,
+    SAY_DEATH                   = -1568055,
+
+    /* Notes about the event:
+     * The boss casts siphon soul right after he finishes the spirit bolts channel, which takes 10 sec
+     * The siphon soul is a channeled spell for 30 sec during which the boss uses some class abilities of the target
+     * Basically the boss casts a dummy spell which chooses a random target on which it casts the actuall channel spell
+     * The drain power spell acts as a enrage timer. It's cast each 30 seconds after the boss' health is below 80%
+     */
+    SPELL_SPIRIT_BOLTS          = 43383,
+    SPELL_SIPHON_SOUL_DUMMY     = 43498,
+    SPELL_SIPHON_SOUL           = 43501,
+    SPELL_DRAIN_POWER           = 44131,
+
+    // for various powers he uses after using soul drain
+    // Death Knight
+    SPELL_DK_DEATH_AND_DECAY    = 61603,
+    SPELL_DK_PLAGUE_STRIKE      = 61600,
+    SPELL_DK_MARK_OF_BLOOD      = 61606,
+
+    // Druid
+    SPELL_DR_THORNS             = 43420,
+    SPELL_DR_LIFEBLOOM          = 43421,
+    SPELL_DR_MOONFIRE           = 43545,
+
+    // Hunter
+    SPELL_HU_EXPLOSIVE_TRAP     = 43444,
+    SPELL_HU_FREEZING_TRAP      = 43447,
+    SPELL_HU_SNAKE_TRAP         = 43449,
+
+    // Mage
+    SPELL_MG_FIREBALL           = 41383,
+    SPELL_MG_FROST_NOVA         = 43426,
+    SPELL_MG_ICE_LANCE          = 43427,
+    SPELL_MG_FROSTBOLT          = 43428,
+
+    // Paladin
+    SPELL_PA_CONSECRATION       = 43429,
+    SPELL_PA_AVENGING_WRATH     = 43430,
+    SPELL_PA_HOLY_LIGHT         = 43451,
+
+    // Priest
+    SPELL_PR_HEAL               = 41372,
+    SPELL_PR_MIND_BLAST         = 41374,
+    SPELL_PR_SW_DEATH           = 41375,
+    SPELL_PR_PSYCHIC_SCREAM     = 43432,
+    SPELL_PR_MIND_CONTROL       = 43550,
+    SPELL_PR_PAIN_SUPP          = 44416,
+
+    // Rogue
+    SPELL_RO_WOUND_POISON       = 39665,
+    SPELL_RO_BLIND              = 43433,
+    SPELL_RO_SLICE_DICE         = 43547,
+
+    // Shaman
+    SPELL_SH_CHAIN_LIGHT        = 43435,
+    SPELL_SH_FIRE_NOVA          = 43436,
+    SPELL_SH_HEALING_WAVE       = 43548,
+
+    // Warlock
+    SPELL_WL_CURSE_OF_DOOM      = 43439,
+    SPELL_WL_RAIN_OF_FIRE       = 43440,
+    SPELL_WL_UNSTABLE_AFFL      = 35183,
+
+    // Warrior
+    SPELL_WR_MORTAL_STRIKE      = 43441,
+    SPELL_WR_WHIRLWIND          = 43442,
+    SPELL_WR_SPELL_REFLECT      = 43443,
+
+    // misc
+    TARGET_TYPE_RANDOM          = 0,
+    TARGET_TYPE_VICTIM          = 1,
+    TARGET_TYPE_SELF            = 2,
+    TARGET_TYPE_FRIENDLY        = 3,
+
+    MAX_ACTIVE_ADDS             = 4
+};
+
+// Adds positions
+static const float m_aAddPositions[MAX_ACTIVE_ADDS][4] =
+{
+    {128.279f, 921.279f, 33.889f, 1.527f},
+    {123.261f, 921.279f, 33.889f, 1.527f},
+    {112.084f, 921.279f, 33.889f, 1.527f},
+    {106.473f, 921.279f, 33.889f, 1.527f},
+};
+
+// Each position is a random of two spawns
+static const uint32 aSpawnEntries[MAX_ACTIVE_ADDS][2] =
+{
+    {NPC_ALYSON,    NPC_THURG},
+    {NPC_SLITHER,   NPC_RADAAN},
+    {NPC_GAZAKROTH, NPC_FENSTALKER},
+    {NPC_DARKHEART, NPC_KORAGG},
+};
+
+struct PlayerAbilityStruct
+{
+    uint32 m_uiSpellId;
+    uint8 m_uiTargetType;
+    uint32 m_uiInitialTimer, m_uiCooldown;
+};
+
+// Classes are in the same order as they are in DBC
+static PlayerAbilityStruct m_aMalacrassStolenAbility[][4] =
+{
+    {
+        // 0* shadow priest - exception: it seems that the priest has two specs. We use this slot for the shadow priest
+        {SPELL_PR_MIND_CONTROL,     TARGET_TYPE_RANDOM,   15000, 30000},
+        {SPELL_PR_MIND_BLAST,       TARGET_TYPE_RANDOM,   23000, 30000},
+        {SPELL_PR_SW_DEATH,         TARGET_TYPE_RANDOM,   5000,  16000}
+    },
+    {
+        // 1 warrior
+        {SPELL_WR_SPELL_REFLECT,    TARGET_TYPE_SELF,     2000,  30000},
+        {SPELL_WR_WHIRLWIND,        TARGET_TYPE_SELF,     10000, 30000},
+        {SPELL_WR_MORTAL_STRIKE,    TARGET_TYPE_VICTIM,   6000,  15000}
+    },
+    {
+        // 2 paladin
+        {SPELL_PA_CONSECRATION,     TARGET_TYPE_SELF,     10000, 30000},
+        {SPELL_PA_HOLY_LIGHT,       TARGET_TYPE_FRIENDLY, 17000, 30000},
+        {SPELL_PA_AVENGING_WRATH,   TARGET_TYPE_SELF,     0,     30000}
+    },
+    {
+        // 3 hunter
+        {SPELL_HU_EXPLOSIVE_TRAP,   TARGET_TYPE_SELF,     12000, 30000},
+        {SPELL_HU_FREEZING_TRAP,    TARGET_TYPE_SELF,     3000,  30000},
+        {SPELL_HU_SNAKE_TRAP,       TARGET_TYPE_SELF,     21000, 30000}
+    },
+    {
+        // 4 rogue
+        {SPELL_RO_WOUND_POISON,     TARGET_TYPE_VICTIM,   3000,  17000},
+        {SPELL_RO_SLICE_DICE,       TARGET_TYPE_SELF,     17000, 30000},
+        {SPELL_RO_BLIND,            TARGET_TYPE_RANDOM,   12000, 30000}
+    },
+    {
+        // 5 priest
+        {SPELL_PR_PAIN_SUPP,        TARGET_TYPE_FRIENDLY, 24000, 30000},
+        {SPELL_PR_HEAL,             TARGET_TYPE_FRIENDLY, 16000, 30000},
+        {SPELL_PR_PSYCHIC_SCREAM,   TARGET_TYPE_RANDOM,   8000,  30000}
+    },
+    {
+        // 6 death knight
+        {SPELL_DK_DEATH_AND_DECAY,  TARGET_TYPE_RANDOM,   25000, 30000},
+        {SPELL_DK_PLAGUE_STRIKE,    TARGET_TYPE_VICTIM,   5000,  17000},
+        {SPELL_DK_MARK_OF_BLOOD,    TARGET_TYPE_RANDOM,   14000, 30000}
+    },
+    {
+        // 7 shaman
+        {SPELL_SH_FIRE_NOVA,        TARGET_TYPE_SELF,     25000, 30000},
+        {SPELL_SH_HEALING_WAVE,     TARGET_TYPE_FRIENDLY, 15000, 30000},
+        {SPELL_SH_CHAIN_LIGHT,      TARGET_TYPE_RANDOM,   4000,  16000}
+    },
+    {
+        // 8 mage
+        {SPELL_MG_FIREBALL,         TARGET_TYPE_RANDOM,   8000,  30000},
+        {SPELL_MG_FROSTBOLT,        TARGET_TYPE_RANDOM,   25000, 30000},
+        {SPELL_MG_ICE_LANCE,        TARGET_TYPE_RANDOM,   2000,  18000},
+        {SPELL_MG_FROST_NOVA,       TARGET_TYPE_SELF,     17000, 30000}
+    },
+    {
+        // 9 warlock
+        {SPELL_WL_CURSE_OF_DOOM,    TARGET_TYPE_RANDOM,   0,     30000},
+        {SPELL_WL_RAIN_OF_FIRE,     TARGET_TYPE_RANDOM,   16000, 30000},
+        {SPELL_WL_UNSTABLE_AFFL,    TARGET_TYPE_RANDOM,   8000,  13000}
+    },
+    {
+        // 10 unused - no class in DBC here
+    },
+    {
+        // 11 druid
+        {SPELL_DR_LIFEBLOOM,        TARGET_TYPE_FRIENDLY, 15000, 30000},
+        {SPELL_DR_THORNS,           TARGET_TYPE_SELF,     0,     30000},
+        {SPELL_DR_MOONFIRE,         TARGET_TYPE_RANDOM,   8000,  13000}
+    }
+};
+
+struct boss_malacrass : public CreatureScript
+{
+    boss_malacrass() : CreatureScript("boss_malacrass") {}
+
+    struct boss_malacrassAI : public ScriptedAI
+    {
+        boss_malacrassAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiSpiritBoltsTimer;
+        uint32 m_uiDrainPowerTimer;
+        uint32 m_uiSiphonSoulTimer;
+        uint32 m_uiPlayerAbilityTimer;
+        uint8 m_uiPlayerClass;
+
+        bool m_bCanUsePlayerSpell;
+
+        std::vector<uint32> m_vAddsEntryList;
+        std::vector<uint32> m_vPlayerSpellTimer;
+
+        void Reset() override
+        {
+            m_uiSpiritBoltsTimer = 30000;
+            m_uiDrainPowerTimer = 0;
+            m_uiSiphonSoulTimer = 40000;
+            m_uiPlayerAbilityTimer = 10000;
+            m_uiPlayerClass = 0;
+
+            m_bCanUsePlayerSpell = false;
+
+            DoInitializeAdds();
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MALACRASS, FAIL);
+            }
+        }
+
+        void DoInitializeAdds()
+        {
+            // not if m_creature are dead, so avoid
+            if (!m_creature->IsAlive())
+            {
+                return;
+            }
+
+            // it's empty, so first time
+            if (m_vAddsEntryList.empty())
+            {
+                m_vAddsEntryList.resize(MAX_ACTIVE_ADDS);
+
+                for (uint8 i = 0; i < MAX_ACTIVE_ADDS; ++i)
+                {
+                    uint8 uiAddVersion = urand(0, 1);
+                    m_vAddsEntryList[i] = aSpawnEntries[i][uiAddVersion];
+                    m_creature->SummonCreature(aSpawnEntries[i][uiAddVersion], m_aAddPositions[i][0], m_aAddPositions[i][1], m_aAddPositions[i][2], m_aAddPositions[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
+                }
+            }
+            // Resummon the killed adds
+            else
+            {
+                if (!m_pInstance)
+                {
+                    return;
+                }
+
+                for (uint8 i = 0; i < MAX_ACTIVE_ADDS; ++i)
+                {
+                    // If we already have the creature on the map, then don't summon it
+                    if (m_pInstance->GetSingleCreatureFromStorage(m_vAddsEntryList[i], true))
+                    {
+                        continue;
+                    }
+
+                    m_creature->SummonCreature(m_vAddsEntryList[i], m_aAddPositions[i][0], m_aAddPositions[i][1], m_aAddPositions[i][2], m_aAddPositions[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
+                }
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MALACRASS, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MALACRASS, DONE);
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* /*pSummoned*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_ADD_DIED1, m_creature); break;
+            case 1: DoScriptText(SAY_ADD_DIED2, m_creature); break;
+            case 2: DoScriptText(SAY_ADD_DIED3, m_creature); break;
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            // Set the player's class when hit with soul siphon
+            if (pTarget->GetTypeId() == TYPEID_PLAYER && pSpell->Id == SPELL_SIPHON_SOUL)
+            {
+                m_uiPlayerClass = ((Player*)pTarget)->getClass();
+                m_bCanUsePlayerSpell = true;
+
+                // In case the player it's priest we can choose either a holy priest or a shadow priest
+                if (m_uiPlayerClass == CLASS_PRIEST)
+                {
+                    m_uiPlayerClass = urand(0, 1) ? CLASS_PRIEST : 0;
+                }
+
+                // Init the spell timers
+                uint8 m_uiMaxSpells = m_uiPlayerClass == CLASS_MAGE ? 4 : 3;
+
+                m_vPlayerSpellTimer.clear();
+                m_vPlayerSpellTimer.reserve(m_uiMaxSpells);
+                for (uint8 i = 0; i < m_uiMaxSpells; ++i)
+                {
+                    m_vPlayerSpellTimer.push_back(m_aMalacrassStolenAbility[m_uiPlayerClass][i].m_uiInitialTimer);
+                }
+            }
+        }
+
+        bool CanUseSpecialAbility(uint32 uiSpellIndex)
+        {
+            Unit* pTarget = NULL;
+
+            switch (m_aMalacrassStolenAbility[m_uiPlayerClass][uiSpellIndex].m_uiTargetType)
+            {
+            case TARGET_TYPE_SELF:
+                pTarget = m_creature;
+                break;
+            case TARGET_TYPE_VICTIM:
+                pTarget = m_creature->getVictim();
+                break;
+            case TARGET_TYPE_RANDOM:
+                pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0);
+                break;
+            case TARGET_TYPE_FRIENDLY:
+                pTarget = DoSelectLowestHpFriendly(50.0f);
+                break;
+            }
+
+            if (pTarget)
+            {
+                if (DoCastSpellIfCan(pTarget, m_aMalacrassStolenAbility[m_uiPlayerClass][uiSpellIndex].m_uiSpellId, CAST_TRIGGERED) == CAST_OK)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Acts as an enrage timer
+            if (m_creature->GetHealthPercent() < 80.0f)
+            {
+                if (m_uiDrainPowerTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DRAIN_POWER) == CAST_OK)
+                    {
+                        DoScriptText(SAY_DRAIN_POWER, m_creature);
+                        m_uiDrainPowerTimer = 30000;
+                    }
+                }
+                else
+                {
+                    m_uiDrainPowerTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiSpiritBoltsTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SPIRIT_BOLTS) == CAST_OK)
+                {
+                    DoScriptText(SAY_SPIRIT_BOLTS, m_creature);
+                    m_bCanUsePlayerSpell = false;
+                    m_uiSpiritBoltsTimer = 40000;
+                }
+            }
+            else
+            {
+                m_uiSpiritBoltsTimer -= uiDiff;
+            }
+
+            if (m_uiSiphonSoulTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SIPHON_SOUL_DUMMY) == CAST_OK)
+                {
+                    DoScriptText(SAY_SOUL_SIPHON, m_creature);
+                    m_uiSiphonSoulTimer = 40000;
+                }
+            }
+            else
+            {
+                m_uiSiphonSoulTimer -= uiDiff;
+            }
+
+            // Use abilities only during the siphon soul phases
+            if (m_bCanUsePlayerSpell)
+            {
+                // Loop through all abilities
+                for (uint8 i = 0; i < m_vPlayerSpellTimer.size(); ++i)
+                {
+                    if (m_vPlayerSpellTimer[i] < uiDiff)
+                    {
+                        if (CanUseSpecialAbility(i))
+                        {
+                            m_vPlayerSpellTimer[i] = m_aMalacrassStolenAbility[m_uiPlayerClass][i].m_uiCooldown;
+                        }
+                    }
+                    else
+                    {
+                        m_vPlayerSpellTimer[i] -= uiDiff;
+                    }
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_malacrassAI(pCreature);
+    }
+};
+
+void AddSC_boss_malacrass()
+{
+    Script* s;
+
+    s = new boss_malacrass();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_malacrass";
+    //pNewScript->GetAI = &GetAI_boss_malacrass;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp
new file mode 100644
index 000000000..1abd5e1cf
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp
@@ -0,0 +1,371 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Nalorakk
+SD%Complete: 95
+SDComment: Small adjustments may be required
+SDCategory: Zul'Aman
+EndScriptData */
+
+#include "precompiled.h"
+#include "zulaman.h"
+
+enum
+{
+    SAY_EVENT1_SACRIFICE    = -1568014,
+    SAY_EVENT2_SACRIFICE    = -1568015,
+
+    SAY_AGGRO               = -1568016,
+    SAY_SURGE               = -1568017,
+    SAY_TOBEAR              = -1568018,
+    SAY_TOTROLL             = -1568019,
+    SAY_BERSERK             = -1568020,
+    SAY_SLAY1               = -1568021,
+    SAY_SLAY2               = -1568022,
+    SAY_DEATH               = -1568023,
+
+    SPELL_BERSERK           = 45078,                        // unsure, this increases damage, size and speed
+
+    // Defines for Troll form
+    SPELL_BRUTAL_SWIPE      = 42384,
+    SPELL_MANGLE            = 42389,
+    SPELL_SURGE             = 42402,
+    SPELL_BEAR_SHAPE        = 42377,
+
+    // Defines for Bear form
+    SPELL_LACERATING_SLASH  = 42395,
+    SPELL_REND_FLESH        = 42397,
+    SPELL_DEAFENING_ROAR    = 42398
+};
+
+struct boss_nalorakk : public CreatureScript
+{
+    boss_nalorakk() : CreatureScript("boss_nalorakk") {}
+
+    struct boss_nalorakkAI : public ScriptedAI
+    {
+        boss_nalorakkAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_uiCurrentWave = 0;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiChangeFormTimer;
+        uint32 m_uiBrutalSwipeTimer;
+        uint32 m_uiMangleTimer;
+        uint32 m_uiSurgeTimer;
+        uint32 m_uiLaceratingSlashTimer;
+        uint32 m_uiRendFleshTimer;
+        uint32 m_uiDeafeningRoarTimer;
+        uint32 m_uiBerserkTimer;
+        uint8 m_uiCurrentWave;
+        bool m_bIsInBearForm;
+
+        void Reset() override
+        {
+            m_uiChangeFormTimer = 45000;
+            m_uiBrutalSwipeTimer = 12000;
+            m_uiMangleTimer = 15000;
+            m_uiSurgeTimer = 20000;
+            m_uiLaceratingSlashTimer = 6000;
+            m_uiRendFleshTimer = 6000;
+            m_uiDeafeningRoarTimer = 20000;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+            m_bIsInBearForm = false;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            ScriptedAI::MoveInLineOfSight(pWho);
+
+            if (!m_pInstance || m_pInstance->GetData(TYPE_BEAR_PHASE))
+            {
+                return;
+            }
+
+            if (pWho->GetTypeId() == TYPEID_PLAYER && !((Player*)pWho)->isGameMaster() && m_creature->IsWithinDistInMap(pWho, aBearEventInfo[m_uiCurrentWave].fAggroDist))
+            {
+                DoScriptText(aBearEventInfo[m_uiCurrentWave].iYellId, m_creature);
+                m_pInstance->SetData64(TYPE_BEAR_PHASE, pWho->GetObjectGuid().GetRawValue());
+            }
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            if (uiPointId)
+            {
+                m_creature->SetFacingTo(aBearEventInfo[m_uiCurrentWave].fO);
+
+                if (m_uiCurrentWave < MAX_BEAR_WAVES - 1)
+                {
+                    if (m_pInstance)
+                    {
+                        m_pInstance->SetData(TYPE_BEAR_PHASE, uint32(false));
+                    }
+                    ++m_uiCurrentWave;
+                }
+                else
+                {
+                    // Set the instance data to fail on movement inform because we are not moving the boss to home position
+                    if (m_pInstance)
+                    {
+                        m_pInstance->SetData(TYPE_NALORAKK, FAIL);
+                    }
+                }
+            }
+        }
+
+        // Nalorakk evades only after the trash waves are finished
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            // Boss should evade on the top of the platform
+            if (m_creature->IsAlive())
+            {
+                m_creature->GetMotionMaster()->MovePoint(1, aBearEventInfo[m_uiCurrentWave].fX, aBearEventInfo[m_uiCurrentWave].fY, aBearEventInfo[m_uiCurrentWave].fZ);
+            }
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NALORAKK, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            m_pInstance->SetData(TYPE_NALORAKK, DONE);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Berserking
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            // Spells for Troll Form (only to be casted if we NOT have bear phase aura)
+            if (!m_bIsInBearForm)
+            {
+                // Brutal Swipe (some sources may say otherwise, but I've never seen this in Bear form)
+                if (m_uiBrutalSwipeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_BRUTAL_SWIPE) == CAST_OK)
+                    {
+                        m_uiBrutalSwipeTimer = urand(7000, 15000);
+                    }
+                }
+                else
+                {
+                    m_uiBrutalSwipeTimer -= uiDiff;
+                }
+
+                // Mangle
+                if (m_uiMangleTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MANGLE) == CAST_OK)
+                    {
+                        m_uiMangleTimer = urand(3000, 15000);
+                    }
+                }
+                else
+                {
+                    m_uiMangleTimer -= uiDiff;
+                }
+
+                // Surge
+                if (m_uiSurgeTimer < uiDiff)
+                {
+                    // select a random unit other than the main tank
+                    Unit* pTtarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+
+                    // if there aren't other units, cast on the tank
+                    if (!pTtarget)
+                    {
+                        pTtarget = m_creature->getVictim();
+                    }
+
+                    if (DoCastSpellIfCan(pTtarget, SPELL_SURGE) == CAST_OK)
+                    {
+                        DoScriptText(SAY_SURGE, m_creature);
+                        m_uiSurgeTimer = urand(15000, 32500);
+                    }
+                }
+                else
+                {
+                    m_uiSurgeTimer -= uiDiff;
+                }
+
+                // Change to Bear Form if we're in Troll Form for 45sec
+                if (m_uiChangeFormTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BEAR_SHAPE, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        DoScriptText(SAY_TOBEAR, m_creature);
+                        m_uiChangeFormTimer = 30000;
+                        m_bIsInBearForm = true;
+                        // Reset bear form timers
+                        m_uiLaceratingSlashTimer = urand(6000, 25000);
+                        m_uiRendFleshTimer = urand(6000, 25000);
+                        m_uiDeafeningRoarTimer = urand(15000, 25000);
+                    }
+                }
+                else
+                {
+                    m_uiChangeFormTimer -= uiDiff;
+                }
+            }
+            // Spells for Bear Form (only to be casted if we have bear phase aura)
+            else
+            {
+                // Timer to yell and reset spell timers when bear aura expires
+                if (m_uiChangeFormTimer < uiDiff)
+                {
+                    DoScriptText(SAY_TOTROLL, m_creature);
+                    m_uiChangeFormTimer = 45000;
+                    m_bIsInBearForm = false;
+                    // Reset troll form timers
+                    m_uiSurgeTimer = urand(15000, 32000);
+                    m_uiBrutalSwipeTimer = urand(7000, 20000);
+                    m_uiMangleTimer = urand(3000, 20000);
+                }
+                else
+                {
+                    m_uiChangeFormTimer -= uiDiff;
+                }
+
+                // Lacerating Slash
+                if (m_uiLaceratingSlashTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_LACERATING_SLASH) == CAST_OK)
+                    {
+                        m_uiLaceratingSlashTimer = urand(6000, 20000);
+                    }
+                }
+                else
+                {
+                    m_uiLaceratingSlashTimer -= uiDiff;
+                }
+
+                // Rend Flesh
+                if (m_uiRendFleshTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_REND_FLESH) == CAST_OK)
+                    {
+                        m_uiRendFleshTimer = urand(6000, 20000);
+                    }
+                }
+                else
+                {
+                    m_uiRendFleshTimer -= uiDiff;
+                }
+
+                // Deafening Roar
+                if (m_uiDeafeningRoarTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DEAFENING_ROAR) == CAST_OK)
+                    {
+                        m_uiDeafeningRoarTimer = urand(15000, 25000);
+                    }
+                }
+                else
+                {
+                    m_uiDeafeningRoarTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_nalorakkAI(pCreature);
+    }
+};
+
+void AddSC_boss_nalorakk()
+{
+    Script* s;
+
+    s = new boss_nalorakk();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_nalorakk";
+    //pNewScript->GetAI = &GetAI_boss_nalorakk;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp
new file mode 100644
index 000000000..066f0f8f7
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp
@@ -0,0 +1,618 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Zuljin
+SD%Complete: 90
+SDComment: Timers should be improved.
+SDCategory: Zul'Aman
+EndScriptData */
+
+#include "precompiled.h"
+#include "zulaman.h"
+
+enum
+{
+    SAY_INTRO                       = -1568056,
+    SAY_AGGRO                       = -1568057,
+    SAY_BEAR_TRANSFORM              = -1568058,
+    SAY_EAGLE_TRANSFORM             = -1568059,
+    SAY_LYNX_TRANSFORM              = -1568060,
+    SAY_DRAGONHAWK_TRANSFORM        = -1568061,
+    SAY_FIRE_BREATH                 = -1568062,
+    SAY_BERSERK                     = -1568053,
+    SAY_KILL1                       = -1568064,
+    SAY_KILL2                       = -1568065,
+    SAY_DEATH                       = -1568066,
+
+    EMOTE_BEAR_SPIRIT               = -1568082,
+    EMOTE_EAGLE_SPIRIT              = -1568083,
+    EMOTE_LYNX_SPIRIT               = -1568084,
+    EMOTE_DRAGONHAWK_SPIRIT         = -1568085,
+
+    // Troll Form
+    SPELL_WHIRLWIND                 = 17207,
+    SPELL_GRIEVOUS_THROW            = 43093,                // removes debuff after full healed
+
+    // Bear Form
+    SPELL_CREEPING_PARALYSIS        = 43095,                // should cast on the whole raid
+    SPELL_OVERPOWER                 = 43456,                // use after melee attack dodged
+
+    // Eagle Form
+    SPELL_ENERGY_STORM              = 43983,                // enemy area aura, trigger 42577 on vortexes which cast 43137 on targets
+    SPELL_SUMMON_CYCLONE            = 43112,                // summon four feather vortex
+    NPC_FEATHER_VORTEX              = 24136,                // ToDo: script via ACID
+    SPELL_CYCLONE_VISUAL            = 43119,                // trigger 43147 visual
+    SPELL_CYCLONE_PASSIVE           = 43120,                // trigger 43121 (4y aoe) every second
+    SPELL_CYCLONE                   = 43121,
+
+    // Lynx Form
+    SPELL_CLAW_RAGE                 = 42583,                // Charges a random target and applies dummy effect 43149 on it
+    SPELL_CLAW_RAGE_TRIGGER         = 43149,
+    SPELL_LYNX_RUSH                 = 43152,                // Charges 9 targets in a row - Dummy effect should apply 43153
+    SPELL_LYNX_RUSH_CHARGE          = 43153,
+
+    // Dragonhawk Form
+    SPELL_FLAME_WHIRL               = 43213,                // trigger two spells
+    SPELL_FLAME_BREATH              = 43215,
+    SPELL_SUMMON_PILLAR             = 43216,                // summon 24187
+    NPC_COLUMN_OF_FIRE              = 24187,
+    SPELL_PILLAR_TRIGGER            = 43218,                // trigger 43217
+
+    // Cosmetic
+    SPELL_SPIRIT_DRAINED            = 42520,
+    SPELL_SPIRIT_DRAIN              = 42542,
+
+    // Transforms
+    SPELL_SHAPE_OF_THE_BEAR         = 42594,
+    SPELL_SHAPE_OF_THE_EAGLE        = 42606,
+    SPELL_SHAPE_OF_THE_LYNX         = 42607,
+    SPELL_SHAPE_OF_THE_DRAGONHAWK   = 42608,
+
+    SPELL_BERSERK                   = 45078,                // Berserk timer or existance is unk
+
+    MAX_VORTEXES                    = 4,
+    MAX_LYNX_RUSH                   = 10,
+    POINT_ID_CENTER                 = 0,
+
+    PHASE_BEAR                      = 0,
+    PHASE_EAGLE                     = 1,
+    PHASE_LYNX                      = 2,
+    PHASE_DRAGONHAWK                = 3,
+    PHASE_TROLL                     = 4,
+};
+
+struct BossPhase
+{
+    uint32 uiSpiritSpellId;
+    int32 iYellId, iEmoteId;
+    uint32 uiSpiritId;
+    uint8 uiPhase;
+};
+
+static const BossPhase aZuljinPhases[] =
+{
+    {SPELL_SHAPE_OF_THE_BEAR,       SAY_BEAR_TRANSFORM,       EMOTE_BEAR_SPIRIT,       NPC_BEAR_SPIRIT,       PHASE_BEAR},
+    {SPELL_SHAPE_OF_THE_EAGLE,      SAY_EAGLE_TRANSFORM,      EMOTE_EAGLE_SPIRIT,      NPC_EAGLE_SPIRIT,      PHASE_EAGLE},
+    {SPELL_SHAPE_OF_THE_LYNX,       SAY_LYNX_TRANSFORM,       EMOTE_LYNX_SPIRIT,       NPC_LYNX_SPIRIT,       PHASE_LYNX},
+    {SPELL_SHAPE_OF_THE_DRAGONHAWK, SAY_DRAGONHAWK_TRANSFORM, EMOTE_DRAGONHAWK_SPIRIT, NPC_DRAGONHAWK_SPIRIT, PHASE_DRAGONHAWK}
+};
+
+// coords for going for changing form
+static const float fZuljinMoveLoc[3] = {120.148811f, 703.713684f, 45.111477f};
+
+/*######
+## boss_zuljin
+######*/
+
+struct boss_zuljin : public CreatureScript
+{
+    boss_zuljin() : CreatureScript("boss_zuljin") {}
+
+    struct boss_zuljinAI : public ScriptedAI
+    {
+        boss_zuljinAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bHasTaunted = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+        uint8 m_uiHealthCheck;
+
+        uint32 m_uiWhirlwindTimer;
+        uint32 m_uiGrievousThrowTimer;
+
+        uint32 m_uiParalysisTimer;
+        uint32 m_uiOverpowerTimer;
+
+        uint32 m_uiClawRageTimer;
+        uint32 m_uiLynxRushTimer;
+        uint8 m_uiLynxRushCount;
+
+        uint32 m_uiFlameWhirlTimer;
+        uint32 m_uiFlameBreathTimer;
+        uint32 m_uiPillarOfFireTimer;
+
+        bool m_bHasTaunted;
+        bool m_bIsInTransition;
+        uint32 m_uiTransformTimer;
+
+        GuidList m_lSummonsList;
+
+        void Reset() override
+        {
+            m_uiHealthCheck = 80;
+            m_uiPhase = PHASE_TROLL;
+
+            m_uiWhirlwindTimer = 7000;
+            m_uiGrievousThrowTimer = 8000;
+
+            m_uiParalysisTimer = 7000;
+            m_uiOverpowerTimer = 5000;
+
+            m_uiClawRageTimer = 5000;
+            m_uiLynxRushTimer = 15000;
+            m_uiLynxRushCount = 0;
+
+            m_uiFlameWhirlTimer = 7000;
+            m_uiFlameBreathTimer = 15000;
+            m_uiPillarOfFireTimer = 7000;
+
+            m_bIsInTransition = false;
+
+            SetCombatMovement(true);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ZULJIN, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ZULJIN, FAIL);
+            }
+
+            // Despawn all feather vortexes
+            DoDespawnVortexes();
+
+            // Reset all spirits
+            for (uint8 i = 0; i < MAX_VORTEXES; ++i)
+            {
+                if (Creature* pSpirit = m_pInstance->GetSingleCreatureFromStorage(aZuljinPhases[i].uiSpiritId))
+                {
+                    pSpirit->SetStandState(UNIT_STAND_STATE_STAND);
+                    pSpirit->AI()->EnterEvadeMode();
+                }
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            m_pInstance->SetData(TYPE_ZULJIN, DONE);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasTaunted && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 60.0f))
+            {
+                DoScriptText(SAY_INTRO, m_creature);
+                m_bHasTaunted = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        // Function to handle the Feather Vortexes despawn on phase change
+        void DoDespawnVortexes()
+        {
+            for (GuidList::const_iterator itr = m_lSummonsList.begin(); itr != m_lSummonsList.end(); ++itr)
+            {
+                if (Creature* pVortex = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pVortex->ForcedDespawn();
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_FEATHER_VORTEX:
+                pSummoned->CastSpell(pSummoned, SPELL_CYCLONE_VISUAL, true);
+                pSummoned->CastSpell(pSummoned, SPELL_CYCLONE_PASSIVE, true);
+                m_lSummonsList.push_back(pSummoned->GetObjectGuid());
+
+                // Attack random target
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->GetMotionMaster()->MoveFollow(pTarget, 0, 0);
+                }
+                break;
+            case NPC_COLUMN_OF_FIRE:
+                pSummoned->CastSpell(pSummoned, SPELL_PILLAR_TRIGGER, true);
+                break;
+            }
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || uiPointId != POINT_ID_CENTER)
+            {
+                return;
+            }
+
+            // increment phase
+            if (m_uiPhase == PHASE_TROLL)
+            {
+                m_uiPhase = PHASE_BEAR;
+            }
+            else
+            {
+                ++m_uiPhase;
+            }
+
+            // drain the spirit
+            if (Creature* pSpirit = m_pInstance->GetSingleCreatureFromStorage(aZuljinPhases[m_uiPhase].uiSpiritId))
+            {
+                pSpirit->CastSpell(m_creature, SPELL_SPIRIT_DRAIN, false);
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_SPIRIT_DRAIN)
+            {
+                DoCastSpellIfCan(m_creature, aZuljinPhases[m_uiPhase].uiSpiritSpellId, CAST_INTERRUPT_PREVIOUS);
+                DoScriptText(aZuljinPhases[m_uiPhase].iYellId, m_creature);
+                DoScriptText(aZuljinPhases[m_uiPhase].iEmoteId, m_creature);
+
+                // in eagle phase we don't move
+                if (m_uiPhase != PHASE_EAGLE)
+                {
+                    SetCombatMovement(true);
+                    if (m_creature->getVictim())
+                    {
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    }
+                }
+                // In Eagle phase we just cast Energy storm and summon 4 Feather cyclones; Boss doesn't move in this phase
+                else
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_ENERGY_STORM, CAST_TRIGGERED);
+
+                    // summon 4 vortexes
+                    DoCastSpellIfCan(m_creature, SPELL_SUMMON_CYCLONE, CAST_TRIGGERED);
+                }
+
+                m_bIsInTransition = false;
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, SpellEntry const* pSpellEntry) override
+        {
+            if (pSpellEntry->Id == SPELL_CLAW_RAGE && pTarget->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_CLAW_RAGE_TRIGGER, CAST_TRIGGERED);
+                m_uiLynxRushTimer += 8000;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim() || m_bIsInTransition)
+            {
+                return;
+            }
+
+            if (m_creature->GetHealthPercent() < m_uiHealthCheck)
+            {
+                m_uiHealthCheck -= 20;
+                m_bIsInTransition = true;
+
+                SetCombatMovement(false);
+                m_creature->GetMotionMaster()->MovePoint(POINT_ID_CENTER, fZuljinMoveLoc[0], fZuljinMoveLoc[1], fZuljinMoveLoc[2]);
+
+                // Despawn vortexes and remvoe the energy storm after eagle phase is complete
+                if (m_uiPhase == PHASE_EAGLE)
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_ENERGY_STORM);
+                    DoDespawnVortexes();
+                }
+
+                // Reset threat
+                DoResetThreat();
+
+                // don't do this after troll phase
+                if (m_uiPhase != PHASE_TROLL)
+                {
+                    if (m_creature->HasAura(aZuljinPhases[m_uiPhase].uiSpiritSpellId))
+                    {
+                        m_creature->RemoveAurasDueToSpell(aZuljinPhases[m_uiPhase].uiSpiritSpellId);
+                    }
+
+                    // drain spirit
+                    if (Creature* pSpirit = m_pInstance->GetSingleCreatureFromStorage(aZuljinPhases[m_uiPhase].uiSpiritId))
+                    {
+                        pSpirit->InterruptNonMeleeSpells(false);
+                        pSpirit->CastSpell(m_creature, SPELL_SPIRIT_DRAINED, false);
+                        pSpirit->SetStandState(UNIT_STAND_STATE_DEAD);
+                    }
+                }
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_TROLL:
+
+                if (m_uiWhirlwindTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_WHIRLWIND) == CAST_OK)
+                    {
+                        m_uiWhirlwindTimer = urand(15000, 20000);
+                    }
+                }
+                else
+                {
+                    m_uiWhirlwindTimer -= uiDiff;
+                }
+
+                if (m_uiGrievousThrowTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_GRIEVOUS_THROW) == CAST_OK)
+                        {
+                            m_uiGrievousThrowTimer = 10000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiGrievousThrowTimer -= uiDiff;
+                }
+
+                break;
+            case PHASE_BEAR:
+
+                if (m_uiParalysisTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_CREEPING_PARALYSIS) == CAST_OK)
+                    {
+                        m_uiParalysisTimer = 27000;
+                    }
+                }
+                else
+                {
+                    m_uiParalysisTimer -= uiDiff;
+                }
+
+                if (m_uiOverpowerTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_OVERPOWER) == CAST_OK)
+                    {
+                        m_uiOverpowerTimer = urand(12000, 16000);
+                    }
+                }
+                else
+                {
+                    m_uiOverpowerTimer -= uiDiff;
+                }
+
+                break;
+            case PHASE_EAGLE:
+                // Nothing here; Spells casted just once at the beginning of the phase;
+                break;
+            case PHASE_LYNX:
+
+                // Don't apply Claw Rage during Lynx Rush
+                if (!m_uiLynxRushCount)
+                {
+                    if (m_uiClawRageTimer < uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_CLAW_RAGE, SELECT_FLAG_PLAYER))
+                        {
+                            if (DoCastSpellIfCan(pTarget, SPELL_CLAW_RAGE) == CAST_OK)
+                            {
+                                m_uiClawRageTimer = urand(15000, 20000);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiClawRageTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiLynxRushTimer < uiDiff)
+                {
+                    if (!m_uiLynxRushCount)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_LYNX_RUSH);
+                    }
+                    else
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        {
+                            DoCastSpellIfCan(pTarget, SPELL_LYNX_RUSH_CHARGE);
+                        }
+                    }
+
+                    ++m_uiLynxRushCount;
+
+                    if (m_uiLynxRushCount == MAX_LYNX_RUSH)
+                    {
+                        m_uiLynxRushTimer = urand(20000, 25000);
+                        m_uiLynxRushCount = 0;
+                    }
+                    else
+                    {
+                        m_uiLynxRushTimer = 400;
+                    }
+                }
+                else
+                {
+                    m_uiLynxRushTimer -= uiDiff;
+                }
+
+                break;
+            case PHASE_DRAGONHAWK:
+
+                if (m_uiFlameWhirlTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FLAME_WHIRL) == CAST_OK)
+                    {
+                        m_uiFlameWhirlTimer = 15000;
+                    }
+                }
+                else
+                {
+                    m_uiFlameWhirlTimer -= uiDiff;
+                }
+
+                if (m_uiPillarOfFireTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_PILLAR) == CAST_OK)
+                    {
+                        m_uiPillarOfFireTimer = urand(17000, 22000);
+                    }
+                }
+                else
+                {
+                    m_uiPillarOfFireTimer -= uiDiff;
+                }
+
+                if (m_uiFlameBreathTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FLAME_BREATH) == CAST_OK)
+                    {
+                        m_uiFlameBreathTimer = 15000;
+                    }
+                }
+                else
+                {
+                    m_uiFlameBreathTimer -= uiDiff;
+                }
+
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_zuljinAI(pCreature);
+    }
+};
+
+/*######
+## npc_feather_vortex
+######*/
+
+struct npc_feather_vortex : public CreatureScript
+{
+    npc_feather_vortex() : CreatureScript("npc_feather_vortex") {}
+
+    struct npc_feather_vortexAI : public ScriptedAI
+    {
+        npc_feather_vortexAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void SpellHitTarget(Unit* pTarget, SpellEntry const* pSpellEntry) override
+        {
+            if (pSpellEntry->Id == SPELL_CYCLONE && pTarget->GetTypeId() == TYPEID_PLAYER && m_pInstance)
+            {
+                if (Creature* pZuljin = m_pInstance->GetSingleCreatureFromStorage(NPC_ZULJIN))
+                {
+                    // Change target on player hit
+                    if (Unit* pTarget = pZuljin->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        m_creature->GetMotionMaster()->MoveFollow(pTarget, 0, 0);
+                    }
+                }
+            }
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_feather_vortexAI(pCreature);
+    }
+};
+
+void AddSC_boss_zuljin()
+{
+    Script* s;
+
+    s = new boss_zuljin();
+    s->RegisterSelf();
+    s = new npc_feather_vortex();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_zuljin";
+    //pNewScript->GetAI = &GetAI_boss_zuljin;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_feather_vortex";
+    //pNewScript->GetAI = &GetAI_npc_feather_vortex;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp
new file mode 100644
index 000000000..567a1b6d2
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp
@@ -0,0 +1,665 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Zulaman
+SD%Complete: 50
+SDComment: Support for Quests and Mini-Events still TODO
+SDCategory: Zul'Aman
+EndScriptData */
+
+#include "precompiled.h"
+#include "zulaman.h"
+
+enum BossToChestIndex
+{
+    INDEX_NALORAKK = 0,
+    INDEX_JANALAI = 1,
+    INDEX_HALAZZI = 2,
+    INDEX_AKILZON = 3
+};
+
+enum RunEventSteps
+{
+    RUN_START = 1,
+    RUN_FAIL = 2,
+    RUN_DONE = 3,
+    RUN_PROGRESS = 4,
+    RUN_FAIL_SOON = 5
+};
+
+struct TimeEventNpcInfo
+{
+    TimeEventNpcInfo() : uiSavePosition(0) {}
+
+    uint8 uiSavePosition;                                   // stores in what order this npc was saved (0 means unsaved)
+    ObjectGuid npGuid;
+};
+
+struct NalorakkTrashInfo
+{
+    GuidSet sBearTrashGuidSet;
+    uint8 uiTrashKilled;
+};
+
+struct is_zulaman : public InstanceScript
+{
+    is_zulaman() : InstanceScript("instance_zulaman") {}
+
+    class instance_zulaman : public ScriptedInstance
+    {
+    public:
+        instance_zulaman(Map* pMap) : ScriptedInstance(pMap),
+            m_uiEventTimer(MINUTE* IN_MILLISECONDS),
+            m_uiGongCount(0),
+            m_uiBearEventPhase(0),
+            m_bIsBearPhaseInProgress(false)
+        {
+            Initialize();
+        }
+
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+            memset(&m_auiRandVendor, 0, sizeof(m_auiRandVendor));
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            // Skip Time-Event and Time-Event timer
+            for (uint8 i = 1; i < MAX_ENCOUNTER - 1; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            if (GetData(TYPE_EVENT_RUN) == IN_PROGRESS)
+            {
+                DoUpdateWorldState(WORLD_STATE_ID, 1);
+                DoUpdateWorldState(WORLD_STATE_COUNTER, GetData(TYPE_RUN_EVENT_TIME));
+            }
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_AKILZON:
+            case NPC_HALAZZI:
+            case NPC_NALORAKK:
+            case NPC_JANALAI:
+            case NPC_MALACRASS:
+            case NPC_ZULJIN:
+            case NPC_HARRISON:
+            case NPC_BEAR_SPIRIT:
+            case NPC_EAGLE_SPIRIT:
+            case NPC_LYNX_SPIRIT:
+            case NPC_DRAGONHAWK_SPIRIT:
+                // Insert Malacrass companions here for better handling
+            case NPC_ALYSON:
+            case NPC_THURG:
+            case NPC_SLITHER:
+            case NPC_RADAAN:
+            case NPC_GAZAKROTH:
+            case NPC_FENSTALKER:
+            case NPC_DARKHEART:
+            case NPC_KORAGG:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+
+            case NPC_TANZAR:      m_aEventNpcInfo[INDEX_NALORAKK].npGuid = pCreature->GetObjectGuid(); break;
+            case NPC_KRAZ:        m_aEventNpcInfo[INDEX_JANALAI].npGuid = pCreature->GetObjectGuid(); break;
+            case NPC_ASHLI:       m_aEventNpcInfo[INDEX_HALAZZI].npGuid = pCreature->GetObjectGuid(); break;
+            case NPC_HARKOR:      m_aEventNpcInfo[INDEX_AKILZON].npGuid = pCreature->GetObjectGuid(); break;
+
+            case NPC_MEDICINE_MAN:
+            case NPC_TRIBES_MAN:
+            case NPC_WARBRINGER:
+            case NPC_AXETHROWER:
+                if (pCreature->GetPositionZ() > 10.0f && pCreature->GetPositionZ() < 15.0f)
+                {
+                    m_aNalorakkEvent[0].sBearTrashGuidSet.insert(pCreature->GetObjectGuid());
+                }
+                else if (pCreature->GetPositionZ() > 25.0f && pCreature->GetPositionZ() < 30.0f)
+                {
+                    m_aNalorakkEvent[1].sBearTrashGuidSet.insert(pCreature->GetObjectGuid());
+                }
+                else if (pCreature->GetPositionZ() > 40.0f && pCreature->GetPositionZ() < 41.0f)
+                {
+                    m_aNalorakkEvent[2].sBearTrashGuidSet.insert(pCreature->GetObjectGuid());
+                }
+                else if (pCreature->GetPositionZ() > 41.0f)
+                {
+                    m_aNalorakkEvent[3].sBearTrashGuidSet.insert(pCreature->GetObjectGuid());
+                }
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_STRANGE_GONG:
+                break;
+            case GO_MASSIVE_GATE:
+                // The gate needs to be opened even if the event is still in progress
+                if (m_auiEncounter[TYPE_EVENT_RUN] == DONE || m_auiEncounter[TYPE_EVENT_RUN] == FAIL || m_auiEncounter[TYPE_EVENT_RUN] == IN_PROGRESS)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_WIND_DOOR:
+                break;
+            case GO_LYNX_TEMPLE_ENTRANCE:
+                break;
+            case GO_LYNX_TEMPLE_EXIT:
+                if (m_auiEncounter[TYPE_HALAZZI] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_HEXLORD_ENTRANCE:
+                if (GetKilledPreBosses() == 4)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_WOODEN_DOOR:
+                if (m_auiEncounter[TYPE_MALACRASS] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_FIRE_DOOR:
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_MEDICINE_MAN:
+            case NPC_TRIBES_MAN:
+            case NPC_WARBRINGER:
+            case NPC_AXETHROWER:
+                if (m_aNalorakkEvent[m_uiBearEventPhase].sBearTrashGuidSet.find(pCreature->GetObjectGuid()) != m_aNalorakkEvent[m_uiBearEventPhase].sBearTrashGuidSet.end())
+                {
+                    ++m_aNalorakkEvent[m_uiBearEventPhase].uiTrashKilled;
+                    if (m_aNalorakkEvent[m_uiBearEventPhase].uiTrashKilled == m_aNalorakkEvent[m_uiBearEventPhase].sBearTrashGuidSet.size())
+                    {
+                        if (Creature* pNalorakk = GetSingleCreatureFromStorage(NPC_NALORAKK))
+                        {
+                            ++m_uiBearEventPhase;
+                            if (m_uiBearEventPhase == MAX_BEAR_WAVES)
+                            {
+                                pNalorakk->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                            }
+                            else
+                            {
+                                pNalorakk->SetWalk(false);
+                                pNalorakk->GetMotionMaster()->MovePoint(1, aBearEventInfo[m_uiBearEventPhase].fX, aBearEventInfo[m_uiBearEventPhase].fY, aBearEventInfo[m_uiBearEventPhase].fZ);
+                            }
+                        }
+                    }
+                }
+                break;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature)
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_MEDICINE_MAN:
+            case NPC_TRIBES_MAN:
+            case NPC_WARBRINGER:
+            case NPC_AXETHROWER:
+                for (GuidSet::const_iterator itr = m_aNalorakkEvent[m_uiBearEventPhase].sBearTrashGuidSet.begin(); itr != m_aNalorakkEvent[m_uiBearEventPhase].sBearTrashGuidSet.end(); ++itr)
+                {
+                    Creature* pTemp = instance->GetCreature(*itr);
+                    if (pTemp && !pTemp->IsAlive())
+                    {
+                        pTemp->Respawn();
+                    }
+                }
+                m_aNalorakkEvent[m_uiBearEventPhase].uiTrashKilled = 0;
+                m_bIsBearPhaseInProgress = false;
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            debug_log("SD3: Instance Zulaman: SetData received for type %u with data %u", uiType, uiData);
+
+            switch (uiType)
+            {
+            case TYPE_EVENT_RUN:
+                if (uiData == SPECIAL)
+                {
+                    ++m_uiGongCount;
+                    if (m_uiGongCount == 5)
+                    {
+                        m_auiEncounter[TYPE_EVENT_RUN] = uiData;
+                    }
+                    return;
+                }
+                if (uiData == IN_PROGRESS)
+                {
+                    DoTimeRunSay(RUN_START);
+                    DoUseDoorOrButton(GO_MASSIVE_GATE);
+                    if (m_auiEncounter[TYPE_RUN_EVENT_TIME])
+                    {
+                        SetData(TYPE_RUN_EVENT_TIME, m_auiEncounter[TYPE_RUN_EVENT_TIME]);
+                    }
+                    else
+                    {
+                        SetData(TYPE_RUN_EVENT_TIME, 20);
+                    }   // 20 Minutes as default time
+                    DoUpdateWorldState(WORLD_STATE_ID, 1);
+                }
+                if (uiData == FAIL)
+                {
+                    DoTimeRunSay(RUN_FAIL);
+                    DoUpdateWorldState(WORLD_STATE_ID, 0);
+                    // Kill remaining Event NPCs
+                    for (uint8 i = 0; i < MAX_CHESTS; ++i)
+                    {
+                        // Not yet rescued, so too late
+                        if (!m_aEventNpcInfo[i].uiSavePosition)
+                        {
+                            if (Creature* pCreature = instance->GetCreature(m_aEventNpcInfo[i].npGuid))
+                            {
+                                pCreature->ForcedDespawn();
+                            }
+                        }
+                    }
+                }
+                if (uiData == DONE)
+                {
+                    DoTimeRunSay(RUN_DONE);
+                    DoUpdateWorldState(WORLD_STATE_ID, 0);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_AKILZON:
+                DoUseDoorOrButton(GO_WIND_DOOR);
+                if (uiData == DONE)
+                {
+                    if (m_auiEncounter[TYPE_EVENT_RUN] == IN_PROGRESS)
+                    {
+                        m_auiEncounter[TYPE_RUN_EVENT_TIME] += 10; // Add 10 minutes
+                        SetData(TYPE_RUN_EVENT_TIME, m_auiEncounter[TYPE_RUN_EVENT_TIME]);
+                        DoChestEvent(INDEX_AKILZON);
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_NALORAKK:
+                if (uiData == DONE)
+                {
+                    if (m_auiEncounter[TYPE_EVENT_RUN] == IN_PROGRESS)
+                    {
+                        m_auiEncounter[TYPE_RUN_EVENT_TIME] += 15; // Add 15 minutes
+                        SetData(TYPE_RUN_EVENT_TIME, m_auiEncounter[TYPE_RUN_EVENT_TIME]);
+                        DoChestEvent(INDEX_NALORAKK);
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_JANALAI:
+                if (uiData == DONE)
+                {
+                    if (m_auiEncounter[TYPE_EVENT_RUN] == IN_PROGRESS)
+                    {
+                        DoChestEvent(INDEX_JANALAI);
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_HALAZZI:
+                DoUseDoorOrButton(GO_LYNX_TEMPLE_ENTRANCE);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_LYNX_TEMPLE_EXIT);
+                    if (m_auiEncounter[TYPE_EVENT_RUN] == IN_PROGRESS)
+                    {
+                        DoChestEvent(INDEX_HALAZZI);
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_MALACRASS:
+                DoUseDoorOrButton(GO_HEXLORD_ENTRANCE);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_WOODEN_DOOR);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_ZULJIN:
+                DoUseDoorOrButton(GO_FIRE_DOOR);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_RUN_EVENT_TIME:
+                m_auiEncounter[uiType] = uiData;
+                DoUpdateWorldState(WORLD_STATE_COUNTER, m_auiEncounter[uiType]);
+                break;
+
+            case TYPE_RAND_VENDOR_1:
+                m_auiRandVendor[0] = uiData;
+                break;
+            case TYPE_RAND_VENDOR_2:
+                m_auiRandVendor[1] = uiData;
+                break;
+            case TYPE_BEAR_PHASE:
+                m_bIsBearPhaseInProgress = bool(uiData);
+                return;
+
+            default:
+                script_error_log("Instance Zulaman: ERROR SetData = %u for type %u does not exist/not implemented.", uiType, uiData);
+                return;
+            }
+
+            if (uiData == DONE && GetKilledPreBosses() == 4 && (uiType == TYPE_AKILZON || uiType == TYPE_NALORAKK || uiType == TYPE_JANALAI || uiType == TYPE_HALAZZI))
+            {
+                DoUseDoorOrButton(GO_HEXLORD_ENTRANCE);
+                if (m_auiEncounter[TYPE_EVENT_RUN] == IN_PROGRESS)
+                {
+                    SetData(TYPE_EVENT_RUN, DONE);
+                }
+            }
+
+            if (uiData == DONE || uiType == TYPE_RUN_EVENT_TIME || uiType == TYPE_EVENT_RUN)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6] << " " << m_auiEncounter[7];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case TYPE_EVENT_RUN:
+            case TYPE_AKILZON:
+            case TYPE_NALORAKK:
+            case TYPE_JANALAI:
+            case TYPE_HALAZZI:
+            case TYPE_ZULJIN:
+            case TYPE_MALACRASS:
+            case TYPE_RUN_EVENT_TIME:
+                return m_auiEncounter[uiType];
+            case TYPE_RAND_VENDOR_1: return m_auiRandVendor[0];
+            case TYPE_RAND_VENDOR_2: return m_auiRandVendor[1];
+            case TYPE_BEAR_PHASE: return uint32(m_bIsBearPhaseInProgress);
+            default:
+                return 0;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7];
+
+            // Skip m_auiEncounter[7], to start the time event properly if needed
+            for (uint8 i = 0; i < MAX_ENCOUNTER - 1; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            // Restart TYPE_EVENT_RUN if was already started
+            if (m_auiEncounter[TYPE_RUN_EVENT_TIME] != 0 && m_auiEncounter[TYPE_EVENT_RUN] != DONE && m_auiEncounter[TYPE_EVENT_RUN] != FAIL)
+            {
+                SetData(TYPE_EVENT_RUN, IN_PROGRESS);
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void SetData64(uint32 type, uint64 data) override
+        {
+            if (type != TYPE_BEAR_PHASE)
+                return;
+            Unit *pTarget = instance->GetUnit(ObjectGuid(data));
+            for (GuidSet::const_iterator itr = m_aNalorakkEvent[m_uiBearEventPhase].sBearTrashGuidSet.begin(); itr != m_aNalorakkEvent[m_uiBearEventPhase].sBearTrashGuidSet.end(); ++itr)
+            {
+                Creature* pTemp = instance->GetCreature(*itr);
+                if (pTemp && pTemp->IsAlive())
+                {
+                    pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                    pTemp->AI()->AttackStart(pTarget);
+
+                    // For the first wave we need to make them jump to the ground before attacking
+                    // Jump movement is not working on 2.4.3 yet
+#if defined (WOTLK) || defined (CATA)
+            if (!m_uiBearEventPhase)
+            {
+                float fX, fY, fZ;
+                pTemp->GetRandomPoint(35.31f, 1412.24f, 2.04f, 3.0f, fX, fY, fZ);
+                pTemp->GetMotionMaster()->MoveJump(fX, fY, fZ, pTemp->GetSpeed(MOVE_RUN) * 2, 5.0f);
+            }
+#endif
+                }
+            }
+
+            m_bIsBearPhaseInProgress = true;
+        }
+
+        bool CheckConditionCriteriaMeet(Player const* pPlayer, uint32 uiInstanceConditionId, WorldObject const* pConditionSource, uint32 conditionSourceType) const override
+        {
+            switch (uiInstanceConditionId)
+            {
+            case INSTANCE_CONDITION_ID_NORMAL_MODE:             // Not rescued
+            case INSTANCE_CONDITION_ID_HARD_MODE:               // Rescued as first
+            case INSTANCE_CONDITION_ID_HARD_MODE_2:             // Rescued as first
+            case INSTANCE_CONDITION_ID_HARD_MODE_3:             // Rescued as second
+            case INSTANCE_CONDITION_ID_HARD_MODE_4:             // Rescued as third
+            {
+                                                                    if (!pConditionSource)
+                                                                    {
+                                                                        break;
+                                                                    }
+
+                                                                    int32 index = -1;
+                                                                    switch (pConditionSource->GetEntry())
+                                                                    {
+                                                                    case NPC_TANZAR:
+                                                                    case GO_TANZARS_TRUNK:
+                                                                        index = INDEX_NALORAKK;
+                                                                        break;
+                                                                    case NPC_KRAZ:
+                                                                    case GO_KRAZS_PACKAGE:
+                                                                        index = INDEX_JANALAI;
+                                                                        break;
+                                                                    case NPC_ASHLI:
+                                                                    case GO_ASHLIS_BAG:
+                                                                        index = INDEX_HALAZZI;
+                                                                        break;
+                                                                    case NPC_HARKOR:
+                                                                    case GO_HARKORS_SATCHEL:
+                                                                        index = INDEX_AKILZON;
+                                                                        break;
+                                                                    }
+                                                                    if (index < 0)
+                                                                    {
+                                                                        break;
+                                                                    }
+
+                                                                    return m_aEventNpcInfo[index].uiSavePosition == uiInstanceConditionId;
+            }
+            }
+
+            script_error_log("instance_zulaman::CheckConditionCriteriaMeet called with unsupported Id %u. Called with param plr %s, src %s, condition source type %u",
+                uiInstanceConditionId, pPlayer ? pPlayer->GetGuidStr().c_str() : "NULL", pConditionSource ? pConditionSource->GetGuidStr().c_str() : "NULL", conditionSourceType);
+            return false;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_auiEncounter[TYPE_EVENT_RUN] == IN_PROGRESS)
+            {
+                if (m_uiEventTimer <= uiDiff)
+                {
+                    if (m_auiEncounter[TYPE_RUN_EVENT_TIME] == 5)   // TODO, verify 5min for warning texts
+                    {
+                        DoTimeRunSay(RUN_FAIL_SOON);
+                    }
+
+                    if (m_auiEncounter[TYPE_RUN_EVENT_TIME] == 0)
+                    {
+                        debug_log("SD3: Instance Zulaman: event time reach end, event failed.");
+                        SetData(TYPE_EVENT_RUN, FAIL);
+                        return;
+                    }
+
+                    --m_auiEncounter[TYPE_RUN_EVENT_TIME];
+                    SetData(TYPE_RUN_EVENT_TIME, m_auiEncounter[TYPE_RUN_EVENT_TIME]);
+                    debug_log("SD3: Instance Zulaman: minute decrease to %u.", m_auiEncounter[TYPE_RUN_EVENT_TIME]);
+
+                    m_uiEventTimer = MINUTE * IN_MILLISECONDS;
+                }
+                else
+                {
+                    m_uiEventTimer -= uiDiff;
+                }
+            }
+        }
+
+    private:
+        uint8 GetKilledPreBosses()
+        {
+            return (m_auiEncounter[TYPE_AKILZON] == DONE ? 1 : 0) + (m_auiEncounter[TYPE_NALORAKK] == DONE ? 1 : 0) + (m_auiEncounter[TYPE_JANALAI] == DONE ? 1 : 0) + (m_auiEncounter[TYPE_HALAZZI] == DONE ? 1 : 0);
+        }
+
+        void DoTimeRunSay(RunEventSteps uiData)
+        {
+            switch (uiData)
+            {
+            case RUN_START:     DoOrSimulateScriptTextForThisInstance(SAY_INST_BEGIN, NPC_MALACRASS); break;
+            case RUN_FAIL:      DoOrSimulateScriptTextForThisInstance(urand(0, 1) ? SAY_INST_SACRIF1 : SAY_INST_SACRIF2, NPC_MALACRASS); break;
+            case RUN_DONE:      DoOrSimulateScriptTextForThisInstance(SAY_INST_COMPLETE, NPC_MALACRASS); break;
+            case RUN_PROGRESS:
+                // This function is on progress called before the data is set to the array
+                switch (GetKilledPreBosses() + 1)
+                {
+                case 1:     DoOrSimulateScriptTextForThisInstance(SAY_INST_PROGRESS_1, NPC_MALACRASS); break;
+                case 2:     DoOrSimulateScriptTextForThisInstance(SAY_INST_PROGRESS_2, NPC_MALACRASS); break;
+                case 3:     DoOrSimulateScriptTextForThisInstance(SAY_INST_PROGRESS_3, NPC_MALACRASS); break;
+                }
+                break;
+            case RUN_FAIL_SOON:
+                switch (GetKilledPreBosses())
+                {
+                case 0:     DoOrSimulateScriptTextForThisInstance(SAY_INST_WARN_1, NPC_MALACRASS); break;
+                case 1:     DoOrSimulateScriptTextForThisInstance(SAY_INST_WARN_2, NPC_MALACRASS); break;
+                case 2:     DoOrSimulateScriptTextForThisInstance(SAY_INST_WARN_3, NPC_MALACRASS); break;
+                case 3:     DoOrSimulateScriptTextForThisInstance(SAY_INST_WARN_4, NPC_MALACRASS); break;
+                }
+                break;
+            }
+        }
+
+        void DoChestEvent(BossToChestIndex uiIndex)
+        {
+            // Store Order of this kill
+            m_aEventNpcInfo[uiIndex].uiSavePosition = GetKilledPreBosses() + 1;
+
+            // Do Yell
+            DoTimeRunSay(RUN_PROGRESS);
+
+            // related NPC:     m_aEventNpcInfo[uiIndex].npGuid
+            // related Chest:   m_aEventNpcInfo[uiIndex]        // Not yet stored, because likely unneeded
+        }
+
+        std::string m_strInstData;
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        uint32 m_auiRandVendor[MAX_VENDOR];
+        TimeEventNpcInfo m_aEventNpcInfo[MAX_CHESTS];
+
+        uint32 m_uiEventTimer;
+        uint32 m_uiGongCount;
+
+        NalorakkTrashInfo m_aNalorakkEvent[MAX_BEAR_WAVES];
+        uint8 m_uiBearEventPhase;
+        bool m_bIsBearPhaseInProgress;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_zulaman(pMap);
+    }
+};
+
+void AddSC_instance_zulaman()
+{
+    Script* s;
+
+    s = new is_zulaman();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_zulaman";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_zulaman;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulaman/zulaman.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/zulaman.cpp
new file mode 100644
index 000000000..9ec168f32
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/zulaman.cpp
@@ -0,0 +1,321 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Zulaman
+SD%Complete: 90
+SDComment: Forest Frog will turn into different NPC's. Workaround to prevent new entry from running this script
+SDCategory: Zul'Aman
+EndScriptData */
+
+/* ContentData
+npc_forest_frog
+EndContentData */
+
+#include "precompiled.h"
+#include "zulaman.h"
+#include "escort_ai.h"
+
+/*######
+## npc_forest_frog
+######*/
+
+enum
+{
+    SPELL_REMOVE_AMANI_CURSE = 43732,
+    SPELL_PUSH_MOJO          = 43923,
+    NPC_FOREST_FROG          = 24396
+};
+
+struct npc_forest_frog : public CreatureScript
+{
+    npc_forest_frog() : CreatureScript("npc_forest_frog") {}
+
+    struct npc_forest_frogAI : public ScriptedAI
+    {
+        npc_forest_frogAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void DoSpawnRandom()
+        {
+            if (m_pInstance)
+            {
+                uint32 cEntry = 0;
+                switch (urand(0, 10))
+                {
+                case 0: cEntry = 24024; break;              // Kraz      // wrong here?
+                case 1: cEntry = 24397; break;              // Mannuth
+                case 2: cEntry = 24403; break;              // Deez
+                case 3: cEntry = 24404; break;              // Galathryn
+                case 4: cEntry = 24405; break;              // Adarrah
+                case 5: cEntry = 24406; break;              // Fudgerick
+                case 6: cEntry = 24407; break;              // Darwen
+                case 7: cEntry = 24445; break;              // Mitzi
+                case 8: cEntry = 24448; break;              // Christian
+                case 9: cEntry = 24453; break;              // Brennan
+                case 10: cEntry = 24455; break;             // Hollee
+                }
+
+                if (!m_pInstance->GetData(TYPE_RAND_VENDOR_1))
+                if (!urand(0, 9))
+                {
+                    cEntry = 24408;
+                }                         // Gunter
+
+                if (!m_pInstance->GetData(TYPE_RAND_VENDOR_2))
+                if (!urand(0, 9))
+                {
+                    cEntry = 24409;
+                }                         // Kyren
+
+                if (cEntry)
+                {
+                    m_creature->UpdateEntry(cEntry);
+                }
+
+                if (cEntry == 24408)
+                {
+                    m_pInstance->SetData(TYPE_RAND_VENDOR_1, DONE);
+                }
+
+                if (cEntry == 24409)
+                {
+                    m_pInstance->SetData(TYPE_RAND_VENDOR_2, DONE);
+                }
+            }
+        }
+
+        void SpellHit(Unit* caster, const SpellEntry* spell) override
+        {
+            if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->GetTypeId() == TYPEID_PLAYER && m_creature->GetEntry() == NPC_FOREST_FROG)
+            {
+                // increase or decrease chance of mojo?
+                if (!urand(0, 49))
+                {
+                    DoCastSpellIfCan(caster, SPELL_PUSH_MOJO, CAST_TRIGGERED);
+                }
+                else
+                {
+                    DoSpawnRandom();
+                }
+            }
+        }
+    };
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_forest_frogAI(pCreature);
+    }
+};
+
+/*######
+## npc_harrison_jones_za
+######*/
+
+enum
+{
+    SAY_START               = -1568079,
+    SAY_AT_GONG             = -1568080,
+    SAY_OPEN_ENTRANCE       = -1568081,
+
+    GOSSIP_ITEM_ID_BEGIN    = -3568000,
+
+    SPELL_BANGING_THE_GONG  = 45225
+};
+
+struct npc_harrison_jones_za : public CreatureScript
+{
+    npc_harrison_jones_za() : CreatureScript("npc_harrison_jones_za") {}
+
+    struct npc_harrison_jones_zaAI : public npc_escortAI
+    {
+        npc_harrison_jones_zaAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 1:
+                DoScriptText(SAY_AT_GONG, m_creature);
+
+                m_pInstance->DoToggleGameObjectFlags(GO_STRANGE_GONG, GO_FLAG_NO_INTERACT, false);
+
+                // Start bang gong for 2min
+                DoCastSpellIfCan(m_creature, SPELL_BANGING_THE_GONG);
+                SetEscortPaused(true);
+                break;
+            case 3:
+                DoScriptText(SAY_OPEN_ENTRANCE, m_creature);
+                break;
+            case 4:
+                m_pInstance->SetData(TYPE_EVENT_RUN, IN_PROGRESS);
+                // TODO: Spawn group of Amani'shi Savage and make them run to entrance
+                break;
+            }
+        }
+
+        void StartEvent()
+        {
+            DoScriptText(SAY_START, m_creature);
+            Start();
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit *pInvoker, uint32 data) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+            {
+                SetEscortPaused(bool(data));
+
+                // Stop banging gong if still
+                if (m_pInstance && m_pInstance->GetData(TYPE_EVENT_RUN) == SPECIAL && m_creature->HasAura(SPELL_BANGING_THE_GONG))
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_BANGING_THE_GONG);
+                }
+            }
+        }
+    };
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+
+        if (pInstance && pInstance->GetData(TYPE_EVENT_RUN) == NOT_STARTED)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ID_BEGIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            if (npc_harrison_jones_zaAI* pHarrisonAI = dynamic_cast<npc_harrison_jones_zaAI*>(pCreature->AI()))
+            {
+                pHarrisonAI->StartEvent();
+            }
+
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_harrison_jones_zaAI(pCreature);
+    }
+};
+
+/*######
+## go_strange_gong
+######*/
+
+// Unsure how this Gong must work. Here we always return false to allow Mangos always process further.
+struct go_strange_gong : public GameObjectScript
+{
+    go_strange_gong() : GameObjectScript("go_strange_gong") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+
+        if (!pInstance)
+        {
+            return false;
+        }
+
+        if (pInstance->GetData(TYPE_EVENT_RUN) == SPECIAL)
+        {
+            if (Creature* pCreature = pInstance->GetSingleCreatureFromStorage(NPC_HARRISON))
+            {
+                if (CreatureAI* pHarrisonAI = pCreature->AI())
+                {
+                    pHarrisonAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pCreature, pCreature, uint32(false));
+                }
+            }
+            else
+            {
+                script_error_log("Instance Zulaman: go_strange_gong failed, no NPC %u found.", NPC_HARRISON);
+            }
+
+            pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+            return false;
+        }
+
+        pInstance->SetData(TYPE_EVENT_RUN, SPECIAL);
+        return false;
+    }
+};
+
+void AddSC_zulaman()
+{
+    Script* s;
+
+    s = new npc_forest_frog();
+    s->RegisterSelf();
+    s = new npc_harrison_jones_za();
+    s->RegisterSelf();
+    s = new go_strange_gong();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_forest_frog";
+    //pNewScript->GetAI = &GetAI_npc_forest_frog;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_harrison_jones_za";
+    //pNewScript->GetAI = &GetAI_npc_harrison_jones_za;
+    //pNewScript->pGossipHello =  &GossipHello_npc_harrison_jones_za;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_harrison_jones_za;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_strange_gong";
+    //pNewScript->pGOUse = &GOUse_go_strange_gong;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulaman/zulaman.h b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/zulaman.h
new file mode 100644
index 000000000..93616299b
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulaman/zulaman.h
@@ -0,0 +1,142 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_ZULAMAN_H
+#define DEF_ZULAMAN_H
+
+enum InstanceZA
+{
+    MAX_ENCOUNTER           = 8,
+    MAX_VENDOR              = 2,
+    MAX_CHESTS              = 4,
+    MAX_BEAR_WAVES          = 4,
+
+    SAY_INST_RELEASE        = -1568067,                     // TODO Event NYI
+    SAY_INST_BEGIN          = -1568068,
+    SAY_INST_PROGRESS_1     = -1568069,
+    SAY_INST_PROGRESS_2     = -1568070,
+    SAY_INST_PROGRESS_3     = -1568071,
+    SAY_INST_WARN_1         = -1568072,
+    SAY_INST_WARN_2         = -1568073,
+    SAY_INST_WARN_3         = -1568074,
+    SAY_INST_WARN_4         = -1568075,
+    SAY_INST_SACRIF1        = -1568076,
+    SAY_INST_SACRIF2        = -1568077,
+    SAY_INST_COMPLETE       = -1568078,
+
+    // Bear event yells
+    SAY_WAVE1_AGGRO         = -1568010,
+    SAY_WAVE2_STAIR1        = -1568011,
+    SAY_WAVE3_STAIR2        = -1568012,
+    SAY_WAVE4_PLATFORM      = -1568013,
+
+    WORLD_STATE_ID          = 3104,
+    WORLD_STATE_COUNTER     = 3106,
+
+    TYPE_EVENT_RUN          = 0,
+    TYPE_AKILZON            = 1,
+    TYPE_NALORAKK           = 2,
+    TYPE_JANALAI            = 3,
+    TYPE_HALAZZI            = 4,
+    TYPE_MALACRASS          = 5,
+    TYPE_ZULJIN             = 6,
+    TYPE_RUN_EVENT_TIME     = 7,                            // Must be MAX_ENCOUNTER -1
+
+    TYPE_RAND_VENDOR_1      = 8,
+    TYPE_RAND_VENDOR_2      = 9,
+    TYPE_BEAR_PHASE         = 10,
+
+    NPC_AKILZON             = 23574,
+    NPC_NALORAKK            = 23576,
+    NPC_JANALAI             = 23578,
+    NPC_HALAZZI             = 23577,
+    NPC_MALACRASS           = 24239,
+    NPC_ZULJIN              = 23863,
+
+    // Narolakk event npcs
+    NPC_MEDICINE_MAN        = 23581,
+    NPC_TRIBES_MAN          = 23582,
+    NPC_AXETHROWER          = 23542,
+    NPC_WARBRINGER          = 23580,
+
+    // Malacrass companions
+    NPC_ALYSON              = 24240,
+    NPC_THURG               = 24241,
+    NPC_SLITHER             = 24242,
+    NPC_RADAAN              = 24243,
+    NPC_GAZAKROTH           = 24244,
+    NPC_FENSTALKER          = 24245,
+    NPC_DARKHEART           = 24246,
+    NPC_KORAGG              = 24247,
+
+    NPC_HARRISON            = 24358,
+    // Time Run Event NPCs
+    NPC_TANZAR              = 23790,                        // at bear
+    NPC_KRAZ                = 24024,                        // at phoenix
+    NPC_ASHLI               = 24001,                        // at lynx
+    NPC_HARKOR              = 23999,                        // at eagle
+    // unused (TODO or TODO with DB-tools)
+    NPC_TANZAR_CORPSE       = 24442,
+    NPC_KRAZ_CORPSE         = 24444,
+    NPC_ASHIL_CORPSE        = 24441,
+    NPC_HARKOR_CORPSE       = 24443,
+
+    // Zul'jin event spirits
+    NPC_BEAR_SPIRIT         = 23878,                        // They should all have aura 42466
+    NPC_EAGLE_SPIRIT        = 23880,
+    NPC_LYNX_SPIRIT         = 23877,
+    NPC_DRAGONHAWK_SPIRIT   = 23879,
+
+    GO_STRANGE_GONG         = 187359,
+    GO_MASSIVE_GATE         = 186728,
+    GO_WIND_DOOR            = 186858,
+    GO_LYNX_TEMPLE_ENTRANCE = 186304,
+    GO_LYNX_TEMPLE_EXIT     = 186303,
+    GO_HEXLORD_ENTRANCE     = 186305,
+    GO_WOODEN_DOOR          = 186306,
+    GO_FIRE_DOOR            = 186859,
+
+    GO_TANZARS_TRUNK        = 186648,
+    GO_KRAZS_PACKAGE        = 186667,
+    GO_ASHLIS_BAG           = 186672,
+    GO_HARKORS_SATCHEL      = 187021,
+};
+
+struct NalorakkBearEventInfo
+{
+    int iYellId;
+    float fX, fY, fZ, fO, fAggroDist;
+};
+
+static const NalorakkBearEventInfo aBearEventInfo[MAX_BEAR_WAVES] =
+{
+    {SAY_WAVE1_AGGRO,    0, 0, 0, 0, 45.0f},
+    {SAY_WAVE2_STAIR1,   -54.948f, 1419.772f, 27.303f, 0.03f, 37.0f},
+    {SAY_WAVE3_STAIR2,   -80.303f, 1372.622f, 40.764f, 1.67f, 35.0f},
+    {SAY_WAVE4_PLATFORM, -77.495f, 1294.760f, 48.487f, 1.66f, 60.0f}
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp
new file mode 100644
index 000000000..b6c6f5e37
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp
@@ -0,0 +1,374 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Arlokk
+ * SD%Complete: 80
+ * SDComment:   Vanish spell is replaced by workaround; Timers
+ * SDCategory:  Zul'Gurub
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "zulgurub.h"
+
+enum
+{
+    SAY_AGGRO                   = -1309011,
+    SAY_FEAST_PANTHER           = -1309012,
+    SAY_DEATH                   = -1309013,
+
+    SPELL_SHADOW_WORD_PAIN      = 23952,
+    SPELL_GOUGE                 = 24698,
+    SPELL_MARK_ARLOKK           = 24210,
+    SPELL_RAVAGE                = 24213,
+    SPELL_TRASH                 = 3391,
+    SPELL_WHIRLWIND             = 24236,
+    SPELL_PANTHER_TRANSFORM     = 24190,
+
+    NPC_ZULIAN_PROWLER          = 15101
+};
+
+struct boss_arlokk : public CreatureScript
+{
+    boss_arlokk() : CreatureScript("boss_arlokk") {}
+
+    struct boss_arlokkAI : public ScriptedAI
+    {
+        boss_arlokkAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiShadowWordPainTimer;
+        uint32 m_uiGougeTimer;
+        uint32 m_uiMarkTimer;
+        uint32 m_uiRavageTimer;
+        uint32 m_uiTrashTimer;
+        uint32 m_uiWhirlwindTimer;
+        uint32 m_uiVanishTimer;
+        uint32 m_uiVisibleTimer;
+        uint32 m_uiTransformTimer;
+        uint32 m_uiSummonTimer;
+
+        bool m_bIsPhaseTwo;
+
+        void Reset() override
+        {
+            m_uiShadowWordPainTimer = 8000;
+            m_uiGougeTimer = 14000;
+            m_uiMarkTimer = 5000;
+            m_uiRavageTimer = 12000;
+            m_uiTrashTimer = 20000;
+            m_uiWhirlwindTimer = 15000;
+            m_uiTransformTimer = 30000;
+            m_uiVanishTimer = 5000;
+            m_uiVisibleTimer = 0;
+            m_uiSummonTimer = 5000;
+
+            m_bIsPhaseTwo = false;
+
+            // Restore visibility
+            if (m_creature->GetVisibility() != VISIBILITY_ON)
+            {
+                m_creature->SetVisibility(VISIBILITY_ON);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ARLOKK, FAIL);
+            }
+
+            // we should be summoned, so despawn
+            m_creature->ForcedDespawn();
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+            // Restore visibility in case of killed by dots
+            if (m_creature->GetVisibility() != VISIBILITY_ON)
+            {
+                m_creature->SetVisibility(VISIBILITY_ON);
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ARLOKK, DONE);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Just attack a random target. The Marked player will attract them automatically
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Summon panters every 5 seconds
+            if (m_uiSummonTimer < uiDiff)
+            {
+                if (m_pInstance)
+                {
+                    if (Creature* pTrigger = m_pInstance->instance->GetCreature(ObjectGuid(m_pInstance->GetData64(TYPE_SIGNAL_2))))
+                    {
+                        m_creature->SummonCreature(NPC_ZULIAN_PROWLER, pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ(), 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                    }
+                    if (Creature* pTrigger = m_pInstance->instance->GetCreature(ObjectGuid(m_pInstance->GetData64(TYPE_SIGNAL_3))))
+                    {
+                        m_creature->SummonCreature(NPC_ZULIAN_PROWLER, pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ(), 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                    }
+                }
+
+                m_uiSummonTimer = 5000;
+            }
+            else
+            {
+                m_uiSummonTimer -= uiDiff;
+            }
+
+            if (m_uiVisibleTimer)
+            {
+                if (m_uiVisibleTimer <= uiDiff)
+                {
+                    // Restore visibility
+                    m_creature->SetVisibility(VISIBILITY_ON);
+
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        AttackStart(pTarget);
+                    }
+
+                    m_uiVisibleTimer = 0;
+                }
+                else
+                {
+                    m_uiVisibleTimer -= uiDiff;
+                }
+
+                // Do nothing while vanished
+                return;
+            }
+
+            // Troll phase
+            if (!m_bIsPhaseTwo)
+            {
+                if (m_uiShadowWordPainTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_WORD_PAIN) == CAST_OK)
+                        {
+                            m_uiShadowWordPainTimer = 15000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiShadowWordPainTimer -= uiDiff;
+                }
+
+                if (m_uiMarkTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_MARK_ARLOKK, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_MARK_ARLOKK) == CAST_OK)
+                        {
+                            DoScriptText(SAY_FEAST_PANTHER, m_creature, pTarget);
+                            m_uiMarkTimer = 30000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiMarkTimer -= uiDiff;
+                }
+
+                if (m_uiGougeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_GOUGE) == CAST_OK)
+                    {
+                        if (m_creature->GetThreatManager().getThreat(m_creature->getVictim()))
+                        {
+                            m_creature->GetThreatManager().modifyThreatPercent(m_creature->getVictim(), -80);
+                        }
+
+                        m_uiGougeTimer = urand(17000, 27000);
+                    }
+                }
+                else
+                {
+                    m_uiGougeTimer -= uiDiff;
+                }
+
+                // Transform to Panther
+                if (m_uiTransformTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_PANTHER_TRANSFORM) == CAST_OK)
+                    {
+                        m_uiTransformTimer = 80000;
+                        m_bIsPhaseTwo = true;
+                    }
+                }
+                else
+                {
+                    m_uiTransformTimer -= uiDiff;
+                }
+            }
+            // Panther phase
+            else
+            {
+                if (m_uiRavageTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_RAVAGE) == CAST_OK)
+                    {
+                        m_uiRavageTimer = urand(10000, 15000);
+                    }
+                }
+                else
+                {
+                    m_uiRavageTimer -= uiDiff;
+                }
+
+                if (m_uiTrashTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_TRASH) == CAST_OK)
+                    {
+                        m_uiTrashTimer = urand(13000, 15000);
+                    }
+                }
+                else
+                {
+                    m_uiTrashTimer -= uiDiff;
+                }
+
+                if (m_uiWhirlwindTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_WHIRLWIND) == CAST_OK)
+                    {
+                        m_uiWhirlwindTimer = 15000;
+                    }
+                }
+                else
+                {
+                    m_uiWhirlwindTimer -= uiDiff;
+                }
+
+                if (m_uiVanishTimer < uiDiff)
+                {
+                    // Note: this is a workaround because we do not know the real vanish spell
+                    m_creature->SetVisibility(VISIBILITY_OFF);
+                    DoResetThreat();
+
+                    m_uiVanishTimer = 85000;
+                    m_uiVisibleTimer = 45000;
+                }
+                else
+                {
+                    m_uiVanishTimer -= uiDiff;
+                }
+
+                // Transform back
+                if (m_uiTransformTimer < uiDiff)
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_PANTHER_TRANSFORM);
+                    m_uiTransformTimer = 30000;
+                    m_bIsPhaseTwo = false;
+                }
+                else
+                {
+                    m_uiTransformTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_arlokkAI(pCreature);
+    }
+};
+
+struct go_gong_of_bethekk : public GameObjectScript
+{
+    go_gong_of_bethekk() : GameObjectScript("go_gong_of_bethekk") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_ARLOKK) == DONE || pInstance->GetData(TYPE_ARLOKK) == IN_PROGRESS)
+            {
+                return true;
+            }
+
+            pInstance->SetData(TYPE_ARLOKK, IN_PROGRESS);
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_arlokk()
+{
+    Script* s;
+    s = new boss_arlokk();
+    s->RegisterSelf();
+    s = new go_gong_of_bethekk();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_arlokk";
+    //pNewScript->GetAI = &GetAI_boss_arlokk;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_gong_of_bethekk";
+    //pNewScript->pGOUse = &GOUse_go_gong_of_bethekk;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp
new file mode 100644
index 000000000..d13fdfd51
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp
@@ -0,0 +1,316 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Hakkar
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Zul'Gurub
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "zulgurub.h"
+
+enum
+{
+    SAY_AGGRO                   = -1309020,
+    SAY_FLEEING                 = -1309021,
+
+    SPELL_BLOOD_SIPHON          = 24324,                    // triggers 24322 or 24323 on caster
+    SPELL_CORRUPTED_BLOOD       = 24328,
+    SPELL_CAUSE_INSANITY        = 24327,
+    SPELL_WILL_OF_HAKKAR        = 24178,
+    SPELL_ENRAGE                = 24318,
+
+    // The Aspects of all High Priests
+    SPELL_ASPECT_OF_JEKLIK      = 24687,
+    SPELL_ASPECT_OF_VENOXIS     = 24688,
+    SPELL_ASPECT_OF_MARLI       = 24686,
+    SPELL_ASPECT_OF_THEKAL      = 24689,
+    SPELL_ASPECT_OF_ARLOKK      = 24690
+};
+
+struct boss_hakkar : public CreatureScript
+{
+    boss_hakkar() : CreatureScript("boss_hakkar") {}
+
+    struct boss_hakkarAI : public ScriptedAI
+    {
+        boss_hakkarAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiBloodSiphonTimer;
+        uint32 m_uiCorruptedBloodTimer;
+        uint32 m_uiCauseInsanityTimer;
+        uint32 m_uiWillOfHakkarTimer;
+        uint32 m_uiEnrageTimer;
+
+        uint32 m_uiAspectOfJeklikTimer;
+        uint32 m_uiAspectOfVenoxisTimer;
+        uint32 m_uiAspectOfMarliTimer;
+        uint32 m_uiAspectOfThekalTimer;
+        uint32 m_uiAspectOfArlokkTimer;
+
+        void Reset() override
+        {
+            m_uiBloodSiphonTimer = 90000;
+            m_uiCorruptedBloodTimer = 25000;
+            m_uiCauseInsanityTimer = 17000;
+            m_uiWillOfHakkarTimer = 17000;
+            m_uiEnrageTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            m_uiAspectOfJeklikTimer = 4000;
+            m_uiAspectOfVenoxisTimer = 7000;
+            m_uiAspectOfMarliTimer = 12000;
+            m_uiAspectOfThekalTimer = 8000;
+            m_uiAspectOfArlokkTimer = 18000;
+        }
+
+        void Aggro(Unit* /*who*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            // check if the priest encounters are done
+            if (m_pInstance)
+            {
+                if (m_pInstance->GetData(TYPE_JEKLIK) == DONE)
+                {
+                    m_uiAspectOfJeklikTimer = 0;
+                }
+                if (m_pInstance->GetData(TYPE_VENOXIS) == DONE)
+                {
+                    m_uiAspectOfVenoxisTimer = 0;
+                }
+                if (m_pInstance->GetData(TYPE_MARLI) == DONE)
+                {
+                    m_uiAspectOfMarliTimer = 0;
+                }
+                if (m_pInstance->GetData(TYPE_THEKAL) == DONE)
+                {
+                    m_uiAspectOfThekalTimer = 0;
+                }
+                if (m_pInstance->GetData(TYPE_ARLOKK) == DONE)
+                {
+                    m_uiAspectOfArlokkTimer = 0;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiBloodSiphonTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BLOOD_SIPHON) == CAST_OK)
+                {
+                    m_uiBloodSiphonTimer = 90000;
+                }
+            }
+            else
+            {
+                m_uiBloodSiphonTimer -= uiDiff;
+            }
+
+            // Corrupted Blood Timer
+            if (m_uiCorruptedBloodTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_CORRUPTED_BLOOD) == CAST_OK)
+                    {
+                        m_uiCorruptedBloodTimer = urand(30000, 45000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiCorruptedBloodTimer -= uiDiff;
+            }
+
+            // Cause Insanity Timer
+            if (m_uiCauseInsanityTimer < uiDiff)
+            {
+                if (m_creature->GetThreatManager().getThreatList().size() > 1)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CAUSE_INSANITY) == CAST_OK)
+                    {
+                        m_uiCauseInsanityTimer = urand(10000, 15000);
+                    }
+                }
+                else // Solo case, check again later
+                {
+                    m_uiCauseInsanityTimer = urand(35000, 43000);
+                }
+            }
+            else
+            {
+                m_uiCauseInsanityTimer -= uiDiff;
+            }
+
+            // Will Of Hakkar Timer
+            if (m_uiWillOfHakkarTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_WILL_OF_HAKKAR) == CAST_OK)
+                    {
+                        m_uiWillOfHakkarTimer = urand(25000, 35000);
+                    }
+                }
+                else // solo attempt, try again later
+                {
+                    m_uiWillOfHakkarTimer = 25000;
+                }
+            }
+            else
+            {
+                m_uiWillOfHakkarTimer -= uiDiff;
+            }
+
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                {
+                    m_uiEnrageTimer = 10 * MINUTE * IN_MILLISECONDS;
+                }
+            }
+            else
+            {
+                m_uiEnrageTimer -= uiDiff;
+            }
+
+            // Checking if Jeklik is dead. If not we cast her Aspect
+            if (m_uiAspectOfJeklikTimer)
+            {
+                if (m_uiAspectOfJeklikTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ASPECT_OF_JEKLIK) == CAST_OK)
+                    {
+                        m_uiAspectOfJeklikTimer = urand(10000, 14000);
+                    }
+                }
+                else
+                {
+                    m_uiAspectOfJeklikTimer -= uiDiff;
+                }
+            }
+
+            // Checking if Venoxis is dead. If not we cast his Aspect
+            if (m_uiAspectOfVenoxisTimer)
+            {
+                if (m_uiAspectOfVenoxisTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ASPECT_OF_VENOXIS) == CAST_OK)
+                    {
+                        m_uiAspectOfVenoxisTimer = 8000;
+                    }
+                }
+                else
+                {
+                    m_uiAspectOfVenoxisTimer -= uiDiff;
+                }
+            }
+
+            // Checking if Marli is dead. If not we cast her Aspect
+            if (m_uiAspectOfMarliTimer)
+            {
+                if (m_uiAspectOfMarliTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ASPECT_OF_MARLI) == CAST_OK)
+                    {
+                        m_uiAspectOfMarliTimer = 10000;
+                    }
+                }
+                else
+                {
+                    m_uiAspectOfMarliTimer -= uiDiff;
+                }
+            }
+
+            // Checking if Thekal is dead. If not we cast his Aspect
+            if (m_uiAspectOfThekalTimer)
+            {
+                if (m_uiAspectOfThekalTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ASPECT_OF_THEKAL) == CAST_OK)
+                    {
+                        m_uiAspectOfThekalTimer = 15000;
+                    }
+                }
+                else
+                {
+                    m_uiAspectOfThekalTimer -= uiDiff;
+                }
+            }
+
+            // Checking if Arlokk is dead. If yes we cast her Aspect
+            if (m_uiAspectOfArlokkTimer)
+            {
+                if (m_uiAspectOfArlokkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ASPECT_OF_ARLOKK) == CAST_OK)
+                    {
+                        DoResetThreat();
+                        m_uiAspectOfArlokkTimer = urand(10000, 15000);
+                    }
+                }
+                else
+                {
+                    m_uiAspectOfArlokkTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_hakkarAI(pCreature);
+    }
+};
+
+void AddSC_boss_hakkar()
+{
+    Script* s;
+    s = new boss_hakkar();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_hakkar";
+    //pNewScript->GetAI = &GetAI_boss_hakkar;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp
new file mode 100644
index 000000000..a3c83d5a2
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp
@@ -0,0 +1,163 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Hazzarah
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Zul'Gurub
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_CHAIN_BURN            = 24684,
+    SPELL_SLEEP                 = 24664,
+    SPELL_EARTH_SHOCK           = 24685,
+    SPELL_SUMMON_ILLUSION_1     = 24681,
+    SPELL_SUMMON_ILLUSION_2     = 24728,
+    SPELL_SUMMON_ILLUSION_3     = 24729,
+};
+
+struct boss_hazzara : public CreatureScript
+{
+    boss_hazzara() : CreatureScript("boss_hazzarah") {}
+
+    struct boss_hazzarahAI : public ScriptedAI
+    {
+        boss_hazzarahAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiManaBurnTimer;
+        uint32 m_uiSleepTimer;
+        uint32 m_uiEarthShockTimer;
+        uint32 m_uiIllusionsTimer;
+
+        void Reset() override
+        {
+            m_uiManaBurnTimer = urand(4000, 10000);
+            m_uiSleepTimer = urand(10000, 18000);
+            m_uiEarthShockTimer = urand(7000, 14000);
+            m_uiIllusionsTimer = urand(10000, 18000);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // ManaBurn_Timer
+            if (m_uiManaBurnTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_CHAIN_BURN, SELECT_FLAG_POWER_MANA))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_CHAIN_BURN) == CAST_OK)
+                    {
+                        m_uiManaBurnTimer = urand(8000, 16000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiManaBurnTimer -= uiDiff;
+            }
+
+            // Sleep_Timer
+            if (m_uiSleepTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SLEEP) == CAST_OK)
+                    {
+                        m_uiSleepTimer = urand(12000, 20000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiSleepTimer -= uiDiff;
+            }
+
+            // Earthshock
+            if (m_uiEarthShockTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_EARTH_SHOCK) == CAST_OK)
+                {
+                    m_uiEarthShockTimer = urand(9000, 16000);
+                }
+            }
+            else
+            {
+                m_uiEarthShockTimer -= uiDiff;
+            }
+
+            // Illusions_Timer
+            if (m_uiIllusionsTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_ILLUSION_1, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_ILLUSION_2, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_ILLUSION_3, CAST_TRIGGERED);
+
+                m_uiIllusionsTimer = urand(15000, 25000);
+            }
+            else
+            {
+                m_uiIllusionsTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_hazzarahAI(pCreature);
+    }
+};
+
+void AddSC_boss_hazzarah()
+{
+    Script* s;
+    s = new boss_hazzara();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_hazzarah";
+    //pNewScript->GetAI = &GetAI_boss_hazzarah;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp
new file mode 100644
index 000000000..1a639e3ba
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp
@@ -0,0 +1,501 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Jeklik
+ * SD%Complete: 85
+ * SDComment:   Some minor improvements are required; Bat rider movement not implemented
+ * SDCategory:  Zul'Gurub
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "zulgurub.h"
+
+enum
+{
+    SAY_AGGRO                   = -1309002,
+    SAY_RAIN_FIRE               = -1309003,
+    SAY_SHRIEK                  = -1309026,
+    SAY_HEAL                    = -1309027,
+    SAY_DEATH                   = -1309004,
+
+    // Bat spells
+    SPELL_CHARGE                = 22911,
+    SPELL_SONIC_BURST           = 23918,
+    // SPELL_PSYHIC_SCREAM       = 22884,                   // spell not confirmed - needs research
+    SPELL_SWOOP                 = 23919,
+    SPELL_SUMMON_FRENZIED_BATS  = 23974,
+
+    // Troll form spells
+    SPELL_SHADOW_WORD_PAIN      = 23952,
+    SPELL_MIND_FLAY             = 23953,
+    SPELL_BLOOD_LEECH           = 22644,
+    SPELL_GREATERHEAL           = 23954,
+
+    // Common spells
+    SPELL_GREEN_CHANNELING      = 13540,                    // visual for idle mode
+    SPELL_BAT_FORM              = 23966,
+
+    // Batriders Spell
+    SPELL_LIQUID_FIRE           = 23968,                    // script effect - triggers 23971,
+    SPELL_UNSTABLE_CONCOCTION   = 24024,
+    SPELL_TRASH                 = 8876,
+    SPELL_DEMORALIZING_SHOUT    = 23511,
+    SPELL_BATTLE_COMMAND        = 5115,
+    SPELL_INFECTED_BITE         = 16128,
+
+    // npcs
+    NPC_FRENZIED_BAT            = 14965,
+    NPC_BAT_RIDER               = 14750,
+};
+
+struct boss_jeklik : public CreatureScript
+{
+    boss_jeklik() : CreatureScript("boss_jeklik") {}
+
+    struct boss_jeklikAI : public ScriptedAI
+    {
+        boss_jeklikAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiChargeTimer;
+        uint32 m_uiSwoopTimer;
+        uint32 m_uiSonicBurstTimer;
+        uint32 m_uiSpawnBatsTimer;
+        uint32 m_uiShadowWordPainTimer;
+        uint32 m_uiMindFlayTimer;
+        uint32 m_uiChainMindFlayTimer;
+        uint32 m_uiGreaterHealTimer;
+        uint32 m_uiFlyingBatsTimer;
+
+        bool m_bIsPhaseOne;
+
+        GuidList m_lBombRiderGuidsList;
+
+        void Reset() override
+        {
+            m_uiChargeTimer = 20000;
+            m_uiSwoopTimer = 5000;
+            m_uiSonicBurstTimer = 8000;
+            m_uiSpawnBatsTimer = 50000;
+            m_uiShadowWordPainTimer = 6000;
+            m_uiMindFlayTimer = 11000;
+            m_uiChainMindFlayTimer = 26000;
+            m_uiGreaterHealTimer = 20000;
+            m_uiFlyingBatsTimer = 30000;
+
+            m_bIsPhaseOne = true;
+
+            DoCastSpellIfCan(m_creature, SPELL_GREEN_CHANNELING);
+            SetCombatMovement(false);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            // Note: on aggro the bats from the cave behind the boss should fly outside!
+            if (DoCastSpellIfCan(m_creature, SPELL_BAT_FORM) == CAST_OK)
+            {
+                m_creature->SetLevitate(true);
+                // override MMaps, by allowing the boss to fly up from the ledge
+                m_creature->SetWalk(false);
+                m_creature->GetMotionMaster()->MovePoint(1, -12281.58f, -1392.84f, 146.1f);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+            DoDespawnBombRiders();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_JEKLIK, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            DoDespawnBombRiders();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_JEKLIK, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_FRENZIED_BAT)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+            else if (pSummoned->GetEntry() == NPC_BAT_RIDER)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_LIQUID_FIRE, true);
+                m_lBombRiderGuidsList.push_back(pSummoned->GetObjectGuid());
+            }
+
+            pSummoned->SetLevitate(true);
+        }
+
+        void EnterEvadeMode() override
+        {
+            // Override MMaps, and teleport to original position
+            float fX, fY, fZ, fO;
+            m_creature->GetRespawnCoord(fX, fY, fZ, &fO);
+            m_creature->NearTeleportTo(fX, fY, fZ, fO);
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+            {
+                return;
+            }
+
+            SetCombatMovement(true);
+            DoStartMovement(m_creature->getVictim());
+        }
+
+        // Wrapper to despawn the bomb riders on evade / death
+        void DoDespawnBombRiders()
+        {
+            if (m_lBombRiderGuidsList.empty())
+            {
+                return;
+            }
+
+            for (GuidList::const_iterator itr = m_lBombRiderGuidsList.begin(); itr != m_lBombRiderGuidsList.end(); ++itr)
+            {
+                if (Creature* pRider = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pRider->ForcedDespawn();
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Bat phase
+            if (m_bIsPhaseOne)
+            {
+                // Phase Switch at 50%
+                if (m_creature->GetHealthPercent() < 50.0f)
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_BAT_FORM);
+                    m_creature->SetLevitate(false);
+                    DoResetThreat();
+                    m_bIsPhaseOne = false;
+                    return;
+                }
+
+                if (m_uiChargeTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_CHARGE) == CAST_OK)
+                        {
+                            m_uiChargeTimer = urand(15000, 30000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiChargeTimer -= uiDiff;
+                }
+
+                if (m_uiSwoopTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SWOOP) == CAST_OK)
+                    {
+                        m_uiSwoopTimer = urand(4000, 9000);
+                    }
+                }
+                else
+                {
+                    m_uiSwoopTimer -= uiDiff;
+                }
+
+                if (m_uiSonicBurstTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SONIC_BURST) == CAST_OK)
+                    {
+                        m_uiSonicBurstTimer = urand(8000, 13000);
+                    }
+                }
+                else
+                {
+                    m_uiSonicBurstTimer -= uiDiff;
+                }
+
+                if (m_uiSpawnBatsTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_FRENZIED_BATS) == CAST_OK)
+                    {
+                        DoScriptText(SAY_SHRIEK, m_creature);
+                        m_uiSpawnBatsTimer = 60000;
+                    }
+                }
+                else
+                {
+                    m_uiSpawnBatsTimer -= uiDiff;
+                }
+            }
+            // Troll phase
+            else
+            {
+                if (m_uiShadowWordPainTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_WORD_PAIN) == CAST_OK)
+                        {
+                            m_uiShadowWordPainTimer = urand(12000, 18000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiShadowWordPainTimer -= uiDiff;
+                }
+
+                if (m_uiMindFlayTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MIND_FLAY) == CAST_OK)
+                    {
+                        m_uiMindFlayTimer = 16000;
+                    }
+                }
+                else
+                {
+                    m_uiMindFlayTimer -= uiDiff;
+                }
+
+                if (m_uiChainMindFlayTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BLOOD_LEECH) == CAST_OK)
+                    {
+                        m_uiChainMindFlayTimer = urand(15000, 30000);
+                    }
+                }
+                else
+                {
+                    m_uiChainMindFlayTimer -= uiDiff;
+                }
+
+                if (m_uiGreaterHealTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_GREATERHEAL, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        DoScriptText(SAY_HEAL, m_creature);
+                        m_uiGreaterHealTimer = urand(25000, 35000);
+                    }
+                }
+                else
+                {
+                    m_uiGreaterHealTimer -= uiDiff;
+                }
+
+                if (m_uiFlyingBatsTimer)
+                {
+                    if (m_uiFlyingBatsTimer <= uiDiff)
+                    {
+                        // Note: the bat riders summoning and movement may need additional research
+                        for (uint8 i = 0; i < 3; ++i)
+                        {
+                            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                            {
+                                m_creature->SummonCreature(NPC_BAT_RIDER, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ() + 15.0f, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                            }
+                        }
+                        DoScriptText(SAY_RAIN_FIRE, m_creature);
+
+                        m_uiFlyingBatsTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiFlyingBatsTimer -= uiDiff;
+                    }
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_jeklikAI(pCreature);
+    }
+};
+
+struct npc_gurubashi_bat_rider : public CreatureScript
+{
+    npc_gurubashi_bat_rider() : CreatureScript("npc_gurubashi_bat_rider") {}
+
+    struct npc_gurubashi_bat_riderAI : public ScriptedAI
+    {
+        npc_gurubashi_bat_riderAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsSummon = m_creature->IsTemporarySummon();
+        }
+
+        bool m_bIsSummon;
+        bool m_bHasDoneConcoction;
+
+        uint32 m_uiInfectedBiteTimer;
+        uint32 m_uiBattleCommandTimer;
+
+        void Reset() override
+        {
+            m_uiInfectedBiteTimer = 6500;
+            m_uiBattleCommandTimer = 8000;
+
+            m_bHasDoneConcoction = false;
+
+            DoCastSpellIfCan(m_creature, SPELL_TRASH);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            // Don't attack if is summoned by Jeklik - the npc gets aggro because of the Liquid Fire
+            if (m_bIsSummon)
+            {
+                return;
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_DEMORALIZING_SHOUT);
+            // For normal mobs flag needs to be removed
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            // Don't attack if is summoned by Jeklik
+            if (m_bIsSummon)
+            {
+                return;
+            }
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // Don't attack if is summoned by Jeklik
+            if (m_bIsSummon)
+            {
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (!m_bHasDoneConcoction && m_creature->GetHealthPercent() < 50.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_UNSTABLE_CONCOCTION) == CAST_OK)
+                {
+                    m_bHasDoneConcoction = true;
+                }
+            }
+
+            if (m_uiInfectedBiteTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_INFECTED_BITE) == CAST_OK)
+                {
+                    m_uiInfectedBiteTimer = 6500;
+                }
+            }
+            else
+            {
+                m_uiInfectedBiteTimer -= uiDiff;
+            }
+
+            if (m_uiBattleCommandTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BATTLE_COMMAND) == CAST_OK)
+                {
+                    m_uiBattleCommandTimer = 25000;
+                }
+            }
+            else
+            {
+                m_uiBattleCommandTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_gurubashi_bat_riderAI(pCreature);
+    }
+};
+
+void AddSC_boss_jeklik()
+{
+    Script* s;
+    s = new boss_jeklik();
+    s->RegisterSelf();
+    s = new npc_gurubashi_bat_rider();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_jeklik";
+    //pNewScript->GetAI = &GetAI_boss_jeklik;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_gurubashi_bat_rider";
+    //pNewScript->GetAI = &GetAI_npc_gurubashi_bat_rider;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp
new file mode 100644
index 000000000..4d834cea3
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp
@@ -0,0 +1,282 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Jin'do the Hexxer
+ * SD%Complete: 85
+ * SDComment:   Mind Control not working because of core bug. Shades invisible is removed as of Attacking (core bug) - MANY HACKZ!!
+ * SDCategory:  Zul'Gurub
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "zulgurub.h"
+
+enum
+{
+    SAY_AGGRO                       = -1309014,
+
+    SPELL_BRAINWASH_TOTEM           = 24262,
+    SPELL_POWERFULL_HEALING_WARD    = 24309,
+    SPELL_HEX                       = 24053,
+    SPELL_DELUSIONS_OF_JINDO        = 24306,
+    SPELL_SHADE_OF_JINDO            = 24308,                // Spell was removed  from DBC around TBC; will summon npcs manually!
+
+    SPELL_HEALING_WARD_HEAL         = 24311,
+#if defined (WOTLK) || defined (CATA)
+    SPELL_SHADE_OF_JINDO_PASSIVE    = 24307,
+#endif
+
+    // npcs
+    NPC_SHADE_OF_JINDO              = 14986,
+    NPC_SACRIFICED_TROLL            = 14826,
+    NPC_POWERFULL_HEALING_WARD      = 14987,
+
+    MAX_SKELETONS                   = 9,
+};
+
+static const float aPitTeleportLocs[4] =
+{
+    -11583.7783f, -1249.4278f, 77.5471f, 4.745f
+};
+
+struct boss_jindo : public CreatureScript
+{
+    boss_jindo() : CreatureScript("boss_jindo") {}
+
+    struct boss_jindoAI : public ScriptedAI
+    {
+        boss_jindoAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiBrainWashTotemTimer;
+        uint32 m_uiHealingWardTimer;
+        uint32 m_uiHexTimer;
+        uint32 m_uiDelusionsTimer;
+        uint32 m_uiTeleportTimer;
+
+        void Reset() override
+        {
+            m_uiBrainWashTotemTimer = 20000;
+            m_uiHealingWardTimer = 16000;
+            m_uiHexTimer = 8000;
+            m_uiDelusionsTimer = 10000;
+            m_uiTeleportTimer = 5000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_POWERFULL_HEALING_WARD)
+            {
+                m_uiHealingWardTimer = 15000;    // how long delay?
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Brain Wash Totem Timer
+            if (m_uiBrainWashTotemTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BRAINWASH_TOTEM) == CAST_OK)
+                {
+                    m_uiBrainWashTotemTimer = urand(18000, 26000);
+                }
+            }
+            else
+            {
+                m_uiBrainWashTotemTimer -= uiDiff;
+            }
+
+            // Healing Ward Timer
+            if (m_uiHealingWardTimer)
+            {
+                if (m_uiHealingWardTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_POWERFULL_HEALING_WARD) == CAST_OK)
+                    {
+                        m_uiHealingWardTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiHealingWardTimer -= uiDiff;
+                }
+            }
+
+            // Hex Timer
+            if (m_uiHexTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HEX) == CAST_OK)
+                {
+                    m_uiHexTimer = urand(12000, 20000);
+                }
+            }
+            else
+            {
+                m_uiHexTimer -= uiDiff;
+            }
+
+            // Casting the delusion curse with a shade. So shade will attack the same target with the curse.
+            if (m_uiDelusionsTimer < uiDiff)
+            {
+                // random target except the tank
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+                if (!pTarget)
+                {
+                    pTarget = m_creature->getVictim();
+                }
+
+                if (DoCastSpellIfCan(pTarget, SPELL_DELUSIONS_OF_JINDO) == CAST_OK)
+                {
+                    float fX, fY, fZ;
+                    m_creature->GetRandomPoint(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 5.0f, fX, fY, fZ);
+                    if (Creature* pSummoned = m_creature->SummonCreature(NPC_SHADE_OF_JINDO, fX, fY, fZ, 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 15000))
+                    {
+#if defined (CLASSIC) || defined (TBC)
+                        pSummoned->AI()->AttackStart(pTarget);
+#endif
+#if defined (WOTLK) || defined (CATA)
+                    pSummoned->CastSpell(pSummoned, SPELL_SHADE_OF_JINDO_PASSIVE, true);
+#endif
+                    }
+
+                    m_uiDelusionsTimer = urand(4000, 12000);
+                }
+            }
+            else
+            {
+                m_uiDelusionsTimer -= uiDiff;
+            }
+
+            // Teleporting a random player and spawning 9 skeletons that will attack this player
+            if (m_uiTeleportTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    DoTeleportPlayer(pTarget, aPitTeleportLocs[0], aPitTeleportLocs[1], aPitTeleportLocs[2], aPitTeleportLocs[3]);
+
+                    // summon 9 skeletons in the pit at random points
+                    float fX, fY, fZ;
+                    for (uint8 i = 0; i < MAX_SKELETONS; ++i)
+                    {
+                        m_creature->GetRandomPoint(aPitTeleportLocs[0], aPitTeleportLocs[1], aPitTeleportLocs[2], 4.0f, fX, fY, fZ);
+                        if (Creature* pSummoned = m_creature->SummonCreature(NPC_SACRIFICED_TROLL, fX, fY, fZ, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 15000))
+                        {
+                            pSummoned->AI()->AttackStart(pTarget);
+                        }
+                    }
+
+                    m_uiTeleportTimer = urand(15000, 23000);
+                }
+            }
+            else
+            {
+                m_uiTeleportTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_jindoAI(pCreature);
+    }
+};
+
+// HACK script! Should not need to have totems in SD3
+struct mob_healing_ward : public CreatureScript
+{
+    mob_healing_ward() : CreatureScript("mob_healing_ward") {}
+
+    struct mob_healing_wardAI : public ScriptedAI
+    {
+        mob_healing_wardAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        uint32 m_uiHealTimer;
+
+        void Reset() override
+        {
+            m_uiHealTimer = 3000;                               // Timer unknown, sources go over 1s, per tick to 3s, keep 3s as in original script
+        }
+
+        void AttackStart(Unit* /*pWho*/) override {}
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Heal Timer
+            if (m_uiHealTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_HEALING_WARD_HEAL);
+                m_uiHealTimer = 3000;
+            }
+            else
+            {
+                m_uiHealTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_healing_wardAI(pCreature);
+    }
+};
+
+void AddSC_boss_jindo()
+{
+    Script* s;
+    s = new boss_jindo();
+    s->RegisterSelf();
+    s = new mob_healing_ward();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_jindo";
+    //pNewScript->GetAI = &GetAI_boss_jindo;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_healing_ward";
+    //pNewScript->GetAI = &GetAI_mob_healing_ward;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
new file mode 100644
index 000000000..003a07baa
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
@@ -0,0 +1,484 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Mandokir
+ * SD%Complete: 80
+ * SDComment:   Test Threating Gaze. Script depends on ACID script for Vilebranch Speaker
+ * SDCategory:  Zul'Gurub
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "zulgurub.h"
+
+enum
+{
+    NPC_OHGAN           = 14988,
+    NPC_CHAINED_SPIRIT  = 15117,                            // resing spirits
+
+    SAY_AGGRO           = -1309015,
+    SAY_DING_KILL       = -1309016,
+    SAY_GRATS_JINDO     = -1309017,
+    SAY_WATCH           = -1309018,
+    SAY_WATCH_WHISPER   = -1309019,
+
+    EMOTE_RAGE          = -1309024,
+
+    SPELL_CHARGE        = 24315,
+    SPELL_CLEAVE        = 20691,
+    SPELL_FEAR          = 29321,
+    SPELL_WHIRLWIND     = 24236,
+    SPELL_MORTAL_STRIKE = 24573,
+    SPELL_ENRAGE        = 23537,
+    SPELL_WATCH         = 24314,
+    SPELL_SUMMON_PLAYER = 25104,
+    SPELL_LEVEL_UP      = 24312,
+
+    // Ohgans Spells
+    SPELL_SUNDERARMOR   = 24317,
+
+    // Chained Spirit Spells
+    SPELL_REVIVE        = 24341,
+
+    POINT_DOWNSTAIRS    = 1
+};
+
+struct SpawnLocations
+{
+    float fX, fY, fZ, fAng;
+};
+
+static SpawnLocations aSpirits[] =
+{
+    { -12150.9f, -1956.24f, 133.407f, 2.57835f},
+    { -12157.1f, -1972.78f, 133.947f, 2.64903f},
+    { -12172.3f, -1982.63f, 134.061f, 1.48664f},
+    { -12194.0f, -1979.54f, 132.194f, 1.45916f},
+    { -12211.3f, -1978.49f, 133.580f, 1.35705f},
+    { -12228.4f, -1977.10f, 132.728f, 1.25495f},
+    { -12250.0f, -1964.78f, 135.066f, 0.92901f},
+    { -12264.0f, -1953.08f, 134.072f, 0.62663f},
+    { -12289.0f, -1924.00f, 132.620f, 5.37829f},
+    { -12267.3f, -1902.26f, 131.328f, 5.32724f},
+    { -12255.3f, -1893.53f, 134.026f, 5.06413f},
+    { -12229.9f, -1891.39f, 134.704f, 4.40047f},
+    { -12215.9f, -1889.09f, 137.273f, 4.70285f},
+    { -12200.5f, -1890.69f, 135.777f, 4.84422f},
+    { -12186.0f, -1890.12f, 134.261f, 4.36513f},
+    { -12246.3f, -1890.09f, 135.475f, 4.73427f},
+    { -12170.7f, -1894.85f, 133.852f, 3.51690f},
+    { -12279.0f, -1931.92f, 136.130f, 0.04151f},
+    { -12266.1f, -1940.72f, 132.606f, 0.70910f}
+};
+
+struct boss_mandokir : public CreatureScript
+{
+    boss_mandokir() : CreatureScript("boss_mandokir") {}
+
+    struct boss_mandokirAI : public ScriptedAI
+    {
+        boss_mandokirAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiWatchTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiWhirlwindTimer;
+        uint32 m_uiFearTimer;
+        uint32 m_uiMortalStrikeTimer;
+        uint32 m_uiCheckTimer;
+
+        uint8 m_uiKillCount;
+
+        float m_fTargetThreat;
+        ObjectGuid m_watchTargetGuid;
+
+        void Reset() override
+        {
+            m_uiWatchTimer = 33000;
+            m_uiCleaveTimer = 7000;
+            m_uiWhirlwindTimer = 20000;
+            m_uiFearTimer = 1000;
+            m_uiMortalStrikeTimer = 1000;
+            m_uiCheckTimer = 1000;
+
+            m_uiKillCount = 0;
+
+            m_fTargetThreat = 0.0f;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            for (uint8 i = 0; i < countof(aSpirits); ++i)
+            {
+                m_creature->SummonCreature(NPC_CHAINED_SPIRIT, aSpirits[i].fX, aSpirits[i].fY, aSpirits[i].fZ, aSpirits[i].fAng, TEMPSUMMON_CORPSE_DESPAWN, 0);
+            }
+
+            // At combat start Mandokir is mounted so we must unmount it first
+            m_creature->Unmount();
+
+            // And summon his raptor
+            m_creature->SummonCreature(NPC_OHGAN, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 35000);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OHGAN, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OHGAN, FAIL);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OHGAN, DONE);
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            // should evade to bottom of the stairs when raid fail
+            if (m_creature->IsAlive())
+            {
+                m_creature->GetMotionMaster()->MovePoint(0, aMandokirDownstairsPos[0], aMandokirDownstairsPos[1], aMandokirDownstairsPos[2]);
+            }
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                ++m_uiKillCount;
+
+                if (m_uiKillCount == 3)
+                {
+                    DoScriptText(SAY_DING_KILL, m_creature);
+
+                    if (m_pInstance)
+                    {
+                        if (Creature* pJindo = m_pInstance->GetSingleCreatureFromStorage(NPC_JINDO))
+                        {
+                            if (pJindo->IsAlive())
+                            {
+                                DoScriptText(SAY_GRATS_JINDO, pJindo);
+                            }
+                        }
+                    }
+
+                    DoCastSpellIfCan(m_creature, SPELL_LEVEL_UP, CAST_TRIGGERED);
+                    m_uiKillCount = 0;
+                }
+
+                if (m_creature->IsInCombat())
+                {
+                    if (Creature* pSpirit = GetClosestCreatureWithEntry(pVictim, NPC_CHAINED_SPIRIT, 50.0f))
+                    {
+                        pSpirit->CastSpell(pVictim, SPELL_REVIVE, false);
+                    }
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_OHGAN)
+            {
+                if (m_creature->getVictim())
+                {
+                    pSummoned->AI()->AttackStart(m_creature->getVictim());
+                }
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_OHGAN)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_ENRAGE, CAST_TRIGGERED);
+                DoScriptText(EMOTE_RAGE, m_creature);
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_WATCH)
+            {
+                DoScriptText(SAY_WATCH, m_creature, pTarget);
+                DoScriptText(SAY_WATCH_WHISPER, m_creature, pTarget);
+
+                m_watchTargetGuid = pTarget->GetObjectGuid();
+                m_fTargetThreat = m_creature->GetThreatManager().getThreat(pTarget);
+                m_uiWatchTimer = 6000;
+
+                // Could use this instead of hard coded timer for the above (but no script access),
+                // but would still a hack since we should better use the dummy, at aura removal
+                // SpellDurationEntry* const pDuration = sSpellDurationStore.LookupEntry(pSpell->DurationIndex);
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !m_pInstance)
+            {
+                return;
+            }
+
+            if (uiPointId == POINT_DOWNSTAIRS)
+            {
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                m_creature->SetInCombatWithZone();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiWatchTimer < uiDiff)
+            {
+                // If someone is watched
+                if (m_watchTargetGuid)
+                {
+                    Player* pWatchTarget = m_creature->GetMap()->GetPlayer(m_watchTargetGuid);
+
+                    // If threat is higher that previously saved, mandokir will act
+                    if (pWatchTarget && pWatchTarget->IsAlive() && m_creature->GetThreatManager().getThreat(pWatchTarget) > m_fTargetThreat)
+                    {
+                        if (!m_creature->IsWithinLOSInMap(pWatchTarget))
+                        {
+                            m_creature->CastSpell(pWatchTarget, SPELL_SUMMON_PLAYER, true);
+                        }
+
+                        DoCastSpellIfCan(pWatchTarget, SPELL_CHARGE);
+                    }
+
+                    m_watchTargetGuid.Clear();
+                }
+                else
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (Player* pPlayer = pTarget->GetCharmerOrOwnerPlayerOrPlayerItself())
+                        {
+                            m_creature->CastSpell(pPlayer, SPELL_WATCH, false);
+                        }
+                    }
+                }
+
+                m_uiWatchTimer = 20000;
+            }
+            else
+            {
+                m_uiWatchTimer -= uiDiff;
+            }
+
+            if (!m_watchTargetGuid)
+            {
+                // Cleave
+                if (m_uiCleaveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                    {
+                        m_uiCleaveTimer = 7000;
+                    }
+                }
+                else
+                {
+                    m_uiCleaveTimer -= uiDiff;
+                }
+
+                // Whirlwind
+                if (m_uiWhirlwindTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_WHIRLWIND) == CAST_OK)
+                    {
+                        m_uiWhirlwindTimer = 18000;
+                    }
+                }
+                else
+                {
+                    m_uiWhirlwindTimer -= uiDiff;
+                }
+
+                // If more then 3 targets in melee range mandokir will cast fear
+                if (m_uiFearTimer < uiDiff)
+                {
+                    uint8 uiTargetInRangeCount = 0;
+
+                    ThreatList const& tList = m_creature->GetThreatManager().getThreatList();
+                    for (ThreatList::const_iterator i = tList.begin(); i != tList.end(); ++i)
+                    {
+                        Unit* pTarget = m_creature->GetMap()->GetUnit((*i)->getUnitGuid());
+
+                        if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && m_creature->CanReachWithMeleeAttack(pTarget))
+                        {
+                            ++uiTargetInRangeCount;
+                        }
+                    }
+
+                    if (uiTargetInRangeCount > 3)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_FEAR);
+                    }
+
+                    m_uiFearTimer = 4000;
+                }
+                else
+                {
+                    m_uiFearTimer -= uiDiff;
+                }
+
+                // Mortal Strike if target below 50% hp
+                if (m_creature->getVictim()->GetHealthPercent() < 50.0f)
+                {
+                    if (m_uiMortalStrikeTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MORTAL_STRIKE) == CAST_OK)
+                        {
+                            m_uiMortalStrikeTimer = 15000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiMortalStrikeTimer -= uiDiff;
+                    }
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_mandokirAI(pCreature);
+    }
+};
+
+// Ohgan
+struct mob_ohgan : public CreatureScript
+{
+    mob_ohgan() : CreatureScript("mob_ohgan") {}
+
+    struct mob_ohganAI : public ScriptedAI
+    {
+        mob_ohganAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiSunderArmorTimer;
+
+        void Reset() override
+        {
+            m_uiSunderArmorTimer = 5000;
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (m_creature->IsInCombat())
+                {
+                    if (Creature* pSpirit = GetClosestCreatureWithEntry(pVictim, NPC_CHAINED_SPIRIT, 50.0f))
+                    {
+                        pSpirit->CastSpell(pVictim, SPELL_REVIVE, false);
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // SunderArmor
+            if (m_uiSunderArmorTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SUNDERARMOR) == CAST_OK)
+                {
+                    m_uiSunderArmorTimer = urand(10000, 15000);
+                }
+            }
+            else
+            {
+                m_uiSunderArmorTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_ohganAI(pCreature);
+    }
+};
+
+void AddSC_boss_mandokir()
+{
+    Script* s;
+    s = new boss_mandokir();
+    s->RegisterSelf();
+    s = new mob_ohgan();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_mandokir";
+    //pNewScript->GetAI = &GetAI_boss_mandokir;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_ohgan";
+    //pNewScript->GetAI = &GetAI_mob_ohgan;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp
new file mode 100644
index 000000000..284df6023
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp
@@ -0,0 +1,301 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Marli
+ * SD%Complete: 90
+ * SDComment:   Enlarge for small spiders NYI
+ * SDCategory:  Zul'Gurub
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "zulgurub.h"
+
+enum
+{
+    SAY_AGGRO                   = -1309005,
+    SAY_TRANSFORM               = -1309006,
+    SAY_TRANSFORM_BACK          = -1309025,
+    SAY_SPIDER_SPAWN            = -1309007,
+    SAY_DEATH                   = -1309008,
+
+    // Spider form spells
+    SPELL_CORROSIVE_POISON      = 24111,
+    SPELL_CHARGE                = 22911,
+    SPELL_ENVELOPING_WEBS       = 24110,
+    SPELL_POISON_SHOCK          = 24112,                    // purpose of this spell is unk
+
+    // Troll form spells
+    SPELL_POISON_VOLLEY         = 24099,
+    SPELL_DRAIN_LIFE            = 24300,
+    SPELL_ENLARGE               = 24109,                    // purpose of this spell is unk
+    SPELL_SPIDER_EGG            = 24082,                    // removed from DBC - should trigger 24081 which summons 15041
+
+    // common spells
+    SPELL_SPIDER_FORM           = 24084,
+    SPELL_TRANSFORM_BACK        = 24085,
+    SPELL_TRASH                 = 3391,
+    SPELL_HATCH_EGGS            = 24083,                    // note this should only target 4 eggs!
+};
+
+struct boss_marli : public CreatureScript
+{
+    boss_marli() : CreatureScript("boss_marli") {}
+
+    struct boss_marliAI : public ScriptedAI
+    {
+        boss_marliAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiPoisonVolleyTimer;
+        uint32 m_uiSpawnSpiderTimer;
+        uint32 m_uiChargeTimer;
+        uint32 m_uiTransformTimer;
+        uint32 m_uiDrainLifeTimer;
+        uint32 m_uiCorrosivePoisonTimer;
+        uint32 m_uiWebsTimer;
+        uint32 m_uiTrashTimer;
+
+        bool m_bIsInPhaseTwo;
+
+        void Reset() override
+        {
+            m_uiPoisonVolleyTimer = 15000;
+            m_uiSpawnSpiderTimer = 55000;
+            m_uiTransformTimer = 60000;
+            m_uiDrainLifeTimer = 30000;
+            m_uiCorrosivePoisonTimer = 1000;
+            m_uiWebsTimer = 5000;
+            m_uiTrashTimer = 5000;
+
+            m_bIsInPhaseTwo = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            DoCastSpellIfCan(m_creature, SPELL_HATCH_EGGS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MARLI, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MARLI, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Troll phase
+            if (!m_bIsInPhaseTwo)
+            {
+                if (m_uiPoisonVolleyTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_POISON_VOLLEY) == CAST_OK)
+                    {
+                        m_uiPoisonVolleyTimer = urand(10000, 20000);
+                    }
+                }
+                else
+                {
+                    m_uiPoisonVolleyTimer -= uiDiff;
+                }
+
+                if (m_uiDrainLifeTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_DRAIN_LIFE) == CAST_OK)
+                        {
+                            m_uiDrainLifeTimer = urand(20000, 50000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiDrainLifeTimer -= uiDiff;
+                }
+
+                if (m_uiSpawnSpiderTimer < uiDiff)
+                {
+                    // Workaround for missing spell 24082 - creature always selects the closest egg for hatch
+                    if (m_pInstance)
+                    {
+                        if (GameObject* pEgg = GetClosestGameObjectWithEntry(m_creature, GO_SPIDER_EGG, 30.0f))
+                        {
+                            if (urand(0, 1))
+                            {
+                                DoScriptText(SAY_SPIDER_SPAWN, m_creature);
+                            }
+
+                            pEgg->Use(m_creature);
+                            m_uiSpawnSpiderTimer = 60000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiSpawnSpiderTimer -= uiDiff;
+                }
+            }
+            // Spider phase
+            else
+            {
+                if (m_uiWebsTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ENVELOPING_WEBS) == CAST_OK)
+                    {
+                        m_uiWebsTimer = urand(15000, 20000);
+                        m_uiChargeTimer = 1000;
+                    }
+                }
+                else
+                {
+                    m_uiWebsTimer -= uiDiff;
+                }
+
+                if (m_uiChargeTimer)
+                {
+                    if (m_uiChargeTimer < uiDiff)
+                    {
+                        // ToDo: research if the selected target shouldn't have the enveloping webs aura
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_CHARGE, SELECT_FLAG_NOT_IN_MELEE_RANGE))
+                        {
+                            if (DoCastSpellIfCan(pTarget, SPELL_CHARGE) == CAST_OK)
+                            {
+                                DoResetThreat();
+                                m_uiChargeTimer = 0;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiChargeTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiCorrosivePoisonTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_CORROSIVE_POISON) == CAST_OK)
+                        {
+                            m_uiCorrosivePoisonTimer = urand(25000, 35000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiCorrosivePoisonTimer -= uiDiff;
+                }
+            }
+
+            // Transform from Troll to Spider and back
+            if (m_uiTransformTimer < uiDiff)
+            {
+                if (!m_bIsInPhaseTwo)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SPIDER_FORM) == CAST_OK)
+                    {
+                        DoScriptText(SAY_TRANSFORM, m_creature);
+                        DoResetThreat();
+                        m_uiTransformTimer = 60000;
+                        m_uiWebsTimer = 5000;
+                        m_bIsInPhaseTwo = true;
+                    }
+                }
+                else
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TRANSFORM_BACK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_TRANSFORM_BACK, m_creature);
+                        m_creature->RemoveAurasDueToSpell(SPELL_SPIDER_FORM);
+                        m_bIsInPhaseTwo = false;
+                        m_uiTransformTimer = 60000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiTransformTimer -= uiDiff;
+            }
+
+            if (m_uiTrashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_TRASH) == CAST_OK)
+                {
+                    m_uiTrashTimer = urand(10000, 20000);
+                }
+            }
+            else
+            {
+                m_uiTrashTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_marliAI(pCreature);
+    }
+};
+
+void AddSC_boss_marli()
+{
+    Script* s;
+    s = new boss_marli();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_marli";
+    //pNewScript->GetAI = &GetAI_boss_marli;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp
new file mode 100644
index 000000000..cb704a046
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp
@@ -0,0 +1,169 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Renataki
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Zul'Gurub
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_THOUSAND_BLADES   = 24649,
+    SPELL_VANISH            = 24699,
+    SPELL_GOUGE             = 24698,
+    SPELL_TRASH             = 3391
+};
+
+struct boss_renataki : public CreatureScript
+{
+    boss_renataki() : CreatureScript("boss_renataki") {}
+
+    struct boss_renatakiAI : public ScriptedAI
+    {
+        boss_renatakiAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiVanishTimer;
+        uint32 m_uiAmbushTimer;
+        uint32 m_uiGougeTimer;
+        uint32 m_uiThousandBladesTimer;
+
+        void Reset() override
+        {
+            m_uiVanishTimer = urand(25000, 30000);
+            m_uiAmbushTimer = 0;
+            m_uiGougeTimer = urand(15000, 25000);
+            m_uiThousandBladesTimer = urand(4000, 8000);
+        }
+
+        void EnterEvadeMode() override
+        {
+            // If is vanished, don't evade
+            if (m_uiAmbushTimer)
+            {
+                return;
+            }
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Note: because the Vanish spell adds invisibility effect on the target, the timers won't be decreased during the vanish phase
+            if (m_uiAmbushTimer)
+            {
+                if (m_uiAmbushTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_TRASH) == CAST_OK)
+                    {
+                        m_uiAmbushTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiAmbushTimer -= uiDiff;
+                }
+
+                // don't do anything else while vanished
+                return;
+            }
+
+            // Invisible_Timer
+            if (m_uiVanishTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_VANISH) == CAST_OK)
+                {
+                    m_uiVanishTimer = urand(25000, 40000);
+                    m_uiAmbushTimer = 2000;
+                }
+            }
+            else
+            {
+                m_uiVanishTimer -= uiDiff;
+            }
+
+            // Resetting some aggro so he attacks other gamers
+            if (m_uiGougeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_GOUGE) == CAST_OK)
+                {
+                    if (m_creature->GetThreatManager().getThreat(m_creature->getVictim()))
+                    {
+                        m_creature->GetThreatManager().modifyThreatPercent(m_creature->getVictim(), -50);
+                    }
+
+                    m_uiGougeTimer = urand(7000, 20000);
+                }
+            }
+            else
+            {
+                m_uiGougeTimer -= uiDiff;
+            }
+
+            // Thausand Blades
+            if (m_uiThousandBladesTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_THOUSAND_BLADES) == CAST_OK)
+                {
+                    m_uiThousandBladesTimer = urand(7000, 12000);
+                }
+            }
+            else
+            {
+                m_uiThousandBladesTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_renatakiAI(pCreature);
+    }
+};
+
+void AddSC_boss_renataki()
+{
+    Script* s;
+    s = new boss_renataki();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_renataki";
+    //pNewScript->GetAI = &GetAI_boss_renataki;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp
new file mode 100644
index 000000000..facfaa1d7
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp
@@ -0,0 +1,851 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Thekal
+ * SD%Complete: 95
+ * SDComment:   Almost finished.
+ * SDCategory:  Zul'Gurub
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "zulgurub.h"
+
+enum
+{
+    SAY_AGGRO               = -1309009,
+    SAY_DEATH               = -1309010,
+
+    SPELL_MORTAL_CLEAVE     = 22859,
+    SPELL_SILENCE           = 23207,
+    SPELL_FRENZY            = 23128,
+    SPELL_FORCE_PUNCH       = 24189,
+    SPELL_CHARGE            = 24408,
+    SPELL_ENRAGE            = 23537,
+    SPELL_SUMMON_TIGERS     = 24183,
+    SPELL_TIGER_FORM        = 24169,
+    SPELL_RESURRECT         = 24173,
+
+    // Zealot Lor'Khan Spells
+    SPELL_SHIELD            = 25020,
+    SPELL_BLOODLUST         = 24185,
+    SPELL_GREATER_HEAL      = 24208,
+    SPELL_DISARM            = 22691,
+
+    // Zealot Lor'Khan Spells
+    SPELL_SWEEPING_STRIKES  = 18765,
+    SPELL_SINISTER_STRIKE   = 15667,
+    SPELL_GOUGE             = 24698,
+    SPELL_KICK              = 15614,
+    SPELL_BLIND             = 21060,
+
+    PHASE_NORMAL            = 1,
+    PHASE_FAKE_DEATH        = 2,
+    PHASE_WAITING           = 3,
+    PHASE_TIGER             = 4,
+};
+
+// abstract base class for faking death
+struct boss_thekalBaseAI : public ScriptedAI
+{
+    boss_thekalBaseAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_uiPhase = PHASE_NORMAL;
+    }
+
+    uint8 m_uiPhase;
+
+    virtual void OnFakeingDeath() {}
+    virtual void OnRevive() {}
+
+    void DamageTaken(Unit* /*pKiller*/, uint32& uiDamage) override
+    {
+        if (uiDamage < m_creature->GetHealth())
+        {
+            return;
+        }
+
+        // Prevent glitch if in fake death
+        if (m_uiPhase == PHASE_FAKE_DEATH || m_uiPhase == PHASE_WAITING)
+        {
+            uiDamage = 0;
+            return;
+        }
+
+        // Only init fake in normal phase
+        if (m_uiPhase != PHASE_NORMAL)
+        {
+            return;
+        }
+
+        uiDamage = 0;
+
+        m_creature->InterruptNonMeleeSpells(true);
+        m_creature->SetHealth(0);
+        m_creature->StopMoving();
+        m_creature->ClearComboPointHolders();
+        m_creature->RemoveAllAurasOnDeath();
+        m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+        m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+#endif
+
+        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        m_creature->ClearAllReactives();
+        m_creature->GetMotionMaster()->Clear();
+        m_creature->GetMotionMaster()->MoveIdle();
+        m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+
+        m_uiPhase = PHASE_FAKE_DEATH;
+
+        OnFakeingDeath();
+    }
+
+    void Revive(bool bOnlyFlags = false)
+    {
+        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+
+        if (bOnlyFlags)
+        {
+            return;
+        }
+
+        m_creature->SetHealth(m_creature->GetMaxHealth());
+        m_uiPhase = PHASE_NORMAL;
+
+        DoResetThreat();
+        Reset();
+
+        // Assume Attack
+        if (m_creature->getVictim())
+        {
+            m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+        }
+
+        OnRevive();
+    }
+
+    void PreventRevive()
+    {
+        if (m_creature->IsNonMeleeSpellCasted(true))
+        {
+            m_creature->InterruptNonMeleeSpells(true);
+        }
+
+        m_uiPhase = PHASE_WAITING;
+    }
+};
+
+struct boss_thekal : public CreatureScript
+{
+    boss_thekal() : CreatureScript("boss_thekal") {}
+
+    struct boss_thekalAI : public boss_thekalBaseAI
+    {
+        boss_thekalAI(Creature* pCreature) : boss_thekalBaseAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiMortalCleaveTimer;
+        uint32 m_uiSilenceTimer;
+        uint32 m_uiFrenzyTimer;
+        uint32 m_uiForcePunchTimer;
+        uint32 m_uiChargeTimer;
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiSummonTigersTimer;
+        uint32 m_uiResurrectTimer;
+
+        bool m_bEnraged;
+
+        void Reset() override
+        {
+            m_uiMortalCleaveTimer = 4000;
+            m_uiSilenceTimer = 9000;
+            m_uiFrenzyTimer = 30000;
+            m_uiForcePunchTimer = 4000;
+            m_uiChargeTimer = 12000;
+            m_uiEnrageTimer = 32000;
+            m_uiSummonTigersTimer = 25000;
+            m_uiResurrectTimer = 10000;
+            m_uiPhase = PHASE_NORMAL;
+
+            m_bEnraged = false;
+
+            // remove fake death
+            Revive(true);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            m_pInstance->SetData(TYPE_THEKAL, DONE);
+
+            // remove the two adds
+            if (Creature* pZath = m_pInstance->GetSingleCreatureFromStorage(NPC_ZATH))
+            {
+                pZath->ForcedDespawn();
+            }
+            if (Creature* pLorkhan = m_pInstance->GetSingleCreatureFromStorage(NPC_LORKHAN))
+            {
+                pLorkhan->ForcedDespawn();
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THEKAL, FAIL);
+            }
+        }
+
+        // Only call in context where m_pInstance is valid
+        bool CanPreventAddsResurrect()
+        {
+            // If any add is alive, return false
+            if (m_pInstance->GetData(TYPE_ZATH) != SPECIAL || m_pInstance->GetData(TYPE_LORKHAN) != SPECIAL)
+            {
+                return false;
+            }
+
+            // Else Prevent them Resurrecting
+            if (Creature* pLorkhan = m_pInstance->GetSingleCreatureFromStorage(NPC_LORKHAN))
+            {
+                if (boss_thekalBaseAI* pFakerAI = dynamic_cast<boss_thekalBaseAI*>(pLorkhan->AI()))
+                {
+                    pFakerAI->PreventRevive();
+                }
+            }
+            if (Creature* pZath = m_pInstance->GetSingleCreatureFromStorage(NPC_ZATH))
+            {
+                if (boss_thekalBaseAI* pFakerAI = dynamic_cast<boss_thekalBaseAI*>(pZath->AI()))
+                {
+                    pFakerAI->PreventRevive();
+                }
+            }
+
+            return true;
+        }
+
+        void OnFakeingDeath()
+        {
+            m_uiResurrectTimer = 10000;
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THEKAL, SPECIAL);
+
+                // If both Adds are already dead, don't wait 10 seconds
+                if (CanPreventAddsResurrect())
+                {
+                    m_uiResurrectTimer = 1000;
+                }
+            }
+        }
+
+        void OnRevive()
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // Both Adds are 'dead' enter tiger phase
+            if (CanPreventAddsResurrect())
+            {
+                DoCastSpellIfCan(m_creature, SPELL_TIGER_FORM, CAST_TRIGGERED);
+                m_uiPhase = PHASE_TIGER;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_FAKE_DEATH:
+                if (m_uiResurrectTimer < uiDiff)
+                {
+                    // resurrect him in any case
+                    DoCastSpellIfCan(m_creature, SPELL_RESURRECT);
+
+                    m_uiPhase = PHASE_WAITING;
+                    if (m_pInstance)
+                    {
+                        CanPreventAddsResurrect();
+                        m_pInstance->SetData(TYPE_THEKAL, IN_PROGRESS);
+                    }
+                }
+                else
+                {
+                    m_uiResurrectTimer -= uiDiff;
+                }
+
+                // No break needed here
+            case PHASE_WAITING:
+                return;
+
+            case PHASE_NORMAL:
+                if (m_uiMortalCleaveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MORTAL_CLEAVE) == CAST_OK)
+                    {
+                        m_uiMortalCleaveTimer = urand(15000, 20000);
+                    }
+                }
+                else
+                {
+                    m_uiMortalCleaveTimer -= uiDiff;
+                }
+
+                if (m_uiSilenceTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SILENCE) == CAST_OK)
+                        {
+                            m_uiSilenceTimer = urand(20000, 25000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiSilenceTimer -= uiDiff;
+                }
+
+                break;
+            case PHASE_TIGER:
+                if (m_uiChargeTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_CHARGE) == CAST_OK)
+                        {
+                            DoResetThreat();
+                            AttackStart(pTarget);
+                            m_uiChargeTimer = urand(15000, 22000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiChargeTimer -= uiDiff;
+                }
+
+                if (m_uiFrenzyTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                    {
+                        m_uiFrenzyTimer = 30000;
+                    }
+                }
+                else
+                {
+                    m_uiFrenzyTimer -= uiDiff;
+                }
+
+                if (m_uiForcePunchTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FORCE_PUNCH) == CAST_OK)
+                    {
+                        m_uiForcePunchTimer = urand(16000, 21000);
+                    }
+                }
+                else
+                {
+                    m_uiForcePunchTimer -= uiDiff;
+                }
+
+                if (m_uiSummonTigersTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_TIGERS) == CAST_OK)
+                    {
+
+#if defined (CLASSIC) || defined (WOTLK) 
+                        m_uiSummonTigersTimer = 50000;
+#endif
+#if defined (TBC)
+                        m_uiSummonTigersTimer = urand(10000, 14000);
+#endif
+                    }
+                }
+                else
+                {
+                    m_uiSummonTigersTimer -= uiDiff;
+                }
+
+                if (!m_bEnraged && m_creature->GetHealthPercent() < 11.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                    {
+                        m_bEnraged = true;
+                    }
+                }
+
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_thekalAI(pCreature);
+    }
+};
+
+/*######
+## mob_zealot_lorkhan
+######*/
+
+struct mob_zealot_lorkhan : public CreatureScript
+{
+    mob_zealot_lorkhan() : CreatureScript("mob_zealot_lorkhan") {}
+
+    struct mob_zealot_lorkhanAI : public boss_thekalBaseAI
+    {
+        mob_zealot_lorkhanAI(Creature* pCreature) : boss_thekalBaseAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiShieldTimer;
+        uint32 m_uiBloodLustTimer;
+        uint32 m_uiGreaterHealTimer;
+        uint32 m_uiDisarmTimer;
+        uint32 m_uiResurrectTimer;
+
+        void Reset() override
+        {
+            m_uiShieldTimer = 1000;
+            m_uiBloodLustTimer = 16000;
+            m_uiGreaterHealTimer = 32000;
+            m_uiDisarmTimer = 6000;
+            m_uiPhase = PHASE_NORMAL;
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LORKHAN, NOT_STARTED);
+            }
+
+            Revive(true);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LORKHAN, IN_PROGRESS);
+            }
+        }
+
+        void OnFakeingDeath()
+        {
+            m_uiResurrectTimer = 10000;
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LORKHAN, SPECIAL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_FAKE_DEATH:
+                if (m_uiResurrectTimer < uiDiff)
+                {
+                    if (!m_pInstance)
+                    {
+                        return;
+                    }
+
+                    if (m_pInstance->GetData(TYPE_THEKAL) != SPECIAL || m_pInstance->GetData(TYPE_ZATH) != SPECIAL)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_RESURRECT);
+                        m_pInstance->SetData(TYPE_LORKHAN, IN_PROGRESS);
+                    }
+
+                    m_uiPhase = PHASE_WAITING;
+                }
+                else
+                {
+                    m_uiResurrectTimer -= uiDiff;
+                }
+
+                // no break needed here
+            case PHASE_WAITING:
+                return;
+
+            case PHASE_NORMAL:
+                // Shield_Timer
+                if (m_uiShieldTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SHIELD) == CAST_OK)
+                    {
+                        m_uiShieldTimer = 61000;
+                    }
+                }
+                else
+                {
+                    m_uiShieldTimer -= uiDiff;
+                }
+
+                // BloodLust_Timer
+                if (m_uiBloodLustTimer < uiDiff)
+                {
+                    // ToDo: research if this should be cast on Thekal or Zath
+                    if (DoCastSpellIfCan(m_creature, SPELL_BLOODLUST) == CAST_OK)
+                    {
+                        m_uiBloodLustTimer = urand(20000, 28000);
+                    }
+                }
+                else
+                {
+                    m_uiBloodLustTimer -= uiDiff;
+                }
+
+                // Casting Greaterheal to Thekal or Zath if they are in meele range.
+                // TODO - why this range check?
+                if (m_uiGreaterHealTimer < uiDiff)
+                {
+                    if (m_pInstance)
+                    {
+                        Creature* pThekal = m_pInstance->GetSingleCreatureFromStorage(NPC_THEKAL);
+                        Creature* pZath = m_pInstance->GetSingleCreatureFromStorage(NPC_ZATH);
+
+                        switch (urand(0, 1))
+                        {
+                        case 0:
+                            if (pThekal && m_creature->IsWithinDistInMap(pThekal, 3 * ATTACK_DISTANCE))
+                            {
+                                DoCastSpellIfCan(pThekal, SPELL_GREATER_HEAL);
+                            }
+                            break;
+                        case 1:
+                            if (pZath && m_creature->IsWithinDistInMap(pZath, 3 * ATTACK_DISTANCE))
+                            {
+                                DoCastSpellIfCan(pZath, SPELL_GREATER_HEAL);
+                            }
+                            break;
+                        }
+                    }
+
+                    m_uiGreaterHealTimer = urand(15000, 20000);
+                }
+                else
+                {
+                    m_uiGreaterHealTimer -= uiDiff;
+                }
+
+                // Disarm_Timer
+                if (m_uiDisarmTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DISARM) == CAST_OK)
+                    {
+                        m_uiDisarmTimer = urand(15000, 25000);
+                    }
+                }
+                else
+                {
+                    m_uiDisarmTimer -= uiDiff;
+                }
+
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_zealot_lorkhanAI(pCreature);
+    }
+};
+
+/*######
+## npc_zealot_zath
+######*/
+struct mob_zealot_zath : public CreatureScript
+{
+    mob_zealot_zath() : CreatureScript("mob_zealot_zath") {}
+
+    struct mob_zealot_zathAI : public boss_thekalBaseAI
+    {
+        mob_zealot_zathAI(Creature* pCreature) : boss_thekalBaseAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiSweepingStrikesTimer;
+        uint32 m_uiSinisterStrikeTimer;
+        uint32 m_uiGougeTimer;
+        uint32 m_uiKickTimer;
+        uint32 m_uiBlindTimer;
+        uint32 m_uiResurrectTimer;
+
+        void Reset() override
+        {
+            m_uiSweepingStrikesTimer = 13000;
+            m_uiSinisterStrikeTimer = 8000;
+            m_uiGougeTimer = 25000;
+            m_uiKickTimer = 18000;
+            m_uiBlindTimer = 5000;
+            m_uiPhase = PHASE_NORMAL;
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ZATH, NOT_STARTED);
+            }
+
+            Revive(true);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ZATH, IN_PROGRESS);
+            }
+        }
+
+        void OnFakeingDeath()
+        {
+            m_uiResurrectTimer = 10000;
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ZATH, SPECIAL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_FAKE_DEATH:
+                if (m_uiResurrectTimer < uiDiff)
+                {
+                    if (!m_pInstance)
+                    {
+                        return;
+                    }
+
+                    if (m_pInstance->GetData(TYPE_THEKAL) != SPECIAL || m_pInstance->GetData(TYPE_LORKHAN) != SPECIAL)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_RESURRECT);
+                        m_pInstance->SetData(TYPE_ZATH, IN_PROGRESS);
+                    }
+
+                    m_uiPhase = PHASE_WAITING;
+                }
+                else
+                {
+                    m_uiResurrectTimer -= uiDiff;
+                }
+
+                // no break needed here
+            case PHASE_WAITING:
+                return;
+
+            case PHASE_NORMAL:
+                // SweepingStrikes_Timer
+                if (m_uiSweepingStrikesTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SWEEPING_STRIKES) == CAST_OK)
+                    {
+                        m_uiSweepingStrikesTimer = urand(22000, 26000);
+                    }
+                }
+                else
+                {
+                    m_uiSweepingStrikesTimer -= uiDiff;
+                }
+
+                // SinisterStrike_Timer
+                if (m_uiSinisterStrikeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SINISTER_STRIKE) == CAST_OK)
+                    {
+                        m_uiSinisterStrikeTimer = urand(8000, 16000);
+                    }
+                }
+                else
+                {
+                    m_uiSinisterStrikeTimer -= uiDiff;
+                }
+
+                // Gouge_Timer
+                if (m_uiGougeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_GOUGE) == CAST_OK)
+                    {
+                        if (m_creature->GetThreatManager().getThreat(m_creature->getVictim()))
+                        {
+                            m_creature->GetThreatManager().modifyThreatPercent(m_creature->getVictim(), -100);
+                        }
+
+                        m_uiGougeTimer = urand(17000, 27000);
+                    }
+                }
+                else
+                {
+                    m_uiGougeTimer -= uiDiff;
+                }
+
+                // Kick_Timer
+                if (m_uiKickTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_KICK) == CAST_OK)
+                    {
+                        m_uiKickTimer = urand(15000, 25000);
+                    }
+                }
+                else
+                {
+                    m_uiKickTimer -= uiDiff;
+                }
+
+                // Blind_Timer
+                if (m_uiBlindTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_BLIND) == CAST_OK)
+                    {
+                        m_uiBlindTimer = urand(10000, 20000);
+                    }
+                }
+                else
+                {
+                    m_uiBlindTimer -= uiDiff;
+                }
+
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_zealot_zathAI(pCreature);
+    }
+};
+
+struct spell_thekal_resurrection : public SpellScript
+{
+    spell_thekal_resurrection() : SpellScript("spell_thekal_resurrection") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (Creature* pCreatureTarget = pTarget->ToCreature())
+        {
+            // always check spellid and effectindex
+            if (uiSpellId == SPELL_RESURRECT && uiEffIndex == EFFECT_INDEX_0)
+            {
+                if (boss_thekalBaseAI* pFakerAI = dynamic_cast<boss_thekalBaseAI*>(pCreatureTarget->AI()))
+                {
+                    pFakerAI->Revive();
+                }
+
+                // always return true when we are handling this spell and effect
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_thekal()
+{
+    Script* s;
+    s = new boss_thekal();
+    s->RegisterSelf();
+    s = new mob_zealot_lorkhan();
+    s->RegisterSelf();
+    s = new mob_zealot_zath();
+    s->RegisterSelf();
+    s = new spell_thekal_resurrection();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_thekal";
+    //pNewScript->GetAI = &GetAI_boss_thekal;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_thekal_resurrection;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_zealot_lorkhan";
+    //pNewScript->GetAI = &GetAI_mob_zealot_lorkhan;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_thekal_resurrection;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_zealot_zath";
+    //pNewScript->GetAI = &GetAI_mob_zealot_zath;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_thekal_resurrection;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp
new file mode 100644
index 000000000..5d004baf6
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp
@@ -0,0 +1,285 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Venoxis
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Zul'Gurub
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "zulgurub.h"
+
+enum
+{
+    SAY_TRANSFORM           = -1309000,
+    SAY_DEATH               = -1309001,
+
+    // troll spells
+    SPELL_HOLY_FIRE         = 23860,
+    SPELL_HOLY_WRATH        = 23979,
+    SPELL_HOLY_NOVA         = 23858,
+    SPELL_DISPELL           = 23859,
+    SPELL_RENEW             = 23895,
+
+    // serpent spells
+    SPELL_VENOMSPIT         = 23862,
+    SPELL_POISON_CLOUD      = 23861,
+    SPELL_PARASITIC_SERPENT = 23867,
+
+    // common spells
+    SPELL_SNAKE_FORM        = 23849,
+    SPELL_FRENZY            = 23537,
+    SPELL_TRASH             = 3391
+};
+
+struct boss_venoxis : public CreatureScript
+{
+    boss_venoxis() : CreatureScript("boss_venoxis") {}
+
+    struct boss_venoxisAI : public ScriptedAI
+    {
+        boss_venoxisAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiHolyWrathTimer;
+        uint32 m_uiVenomSpitTimer;
+        uint32 m_uiRenewTimer;
+        uint32 m_uiPoisonCloudTimer;
+        uint32 m_uiHolySpellTimer;
+        uint32 m_uiDispellTimer;
+        uint32 m_uiTrashTimer;
+
+        bool m_bPhaseTwo;
+        bool m_bInBerserk;
+
+        void Reset() override
+        {
+            m_uiHolyWrathTimer = 40000;
+            m_uiVenomSpitTimer = 5500;
+            m_uiRenewTimer = 30000;
+            m_uiPoisonCloudTimer = 2000;
+            m_uiHolySpellTimer = 10000;
+            m_uiDispellTimer = 35000;
+            m_uiTrashTimer = 5000;
+
+            m_bPhaseTwo = false;
+            m_bInBerserk = false;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VENOXIS, FAIL);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VENOXIS, DONE);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Troll phase
+            if (!m_bPhaseTwo)
+            {
+                if (m_uiDispellTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DISPELL) == CAST_OK)
+                    {
+                        m_uiDispellTimer = urand(15000, 30000);
+                    }
+                }
+                else
+                {
+                    m_uiDispellTimer -= uiDiff;
+                }
+
+                if (m_uiRenewTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_RENEW) == CAST_OK)
+                    {
+                        m_uiRenewTimer = urand(20000, 30000);
+                    }
+                }
+                else
+                {
+                    m_uiRenewTimer -= uiDiff;
+                }
+
+                if (m_uiHolyWrathTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HOLY_WRATH) == CAST_OK)
+                    {
+                        m_uiHolyWrathTimer = urand(15000, 25000);
+                    }
+                }
+                else
+                {
+                    m_uiHolyWrathTimer -= uiDiff;
+                }
+
+                if (m_uiHolySpellTimer < uiDiff)
+                {
+                    uint8 uiTargetsInRange = 0;
+
+                    // See how many targets are in melee range
+                    ThreatList const& tList = m_creature->GetThreatManager().getThreatList();
+                    for (ThreatList::const_iterator iter = tList.begin(); iter != tList.end(); ++iter)
+                    {
+                        if (Unit* pTempTarget = m_creature->GetMap()->GetUnit((*iter)->getUnitGuid()))
+                        {
+                            if (pTempTarget->GetTypeId() == TYPEID_PLAYER && m_creature->CanReachWithMeleeAttack(pTempTarget))
+                            {
+                                ++uiTargetsInRange;
+                            }
+                        }
+                    }
+
+                    // If there are more targets in melee range cast holy nova, else holy fire
+                    // not sure which is the minimum targets for holy nova
+                    if (uiTargetsInRange > 3)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_HOLY_NOVA);
+                    }
+                    else
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        {
+                            DoCastSpellIfCan(pTarget, SPELL_HOLY_FIRE);
+                        }
+                    }
+
+                    m_uiHolySpellTimer = urand(4000, 8000);
+                }
+                else
+                {
+                    m_uiHolySpellTimer -= uiDiff;
+                }
+
+                // Transform at 50% hp
+                if (m_creature->GetHealthPercent() < 50.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SNAKE_FORM, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_PARASITIC_SERPENT, CAST_TRIGGERED);
+                        DoScriptText(SAY_TRANSFORM, m_creature);
+                        DoResetThreat();
+                        m_bPhaseTwo = true;
+                    }
+                }
+            }
+            // Snake phase
+            else
+            {
+                if (m_uiPoisonCloudTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_POISON_CLOUD) == CAST_OK)
+                    {
+                        m_uiPoisonCloudTimer = 15000;
+                    }
+                }
+                else
+                {
+                    m_uiPoisonCloudTimer -= uiDiff;
+                }
+
+                if (m_uiVenomSpitTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_VENOMSPIT) == CAST_OK)
+                        {
+                            m_uiVenomSpitTimer = urand(15000, 20000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiVenomSpitTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiTrashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_TRASH) == CAST_OK)
+                {
+                    m_uiTrashTimer = urand(10000, 20000);
+                }
+            }
+            else
+            {
+                m_uiTrashTimer -= uiDiff;
+            }
+
+            if (!m_bInBerserk && m_creature->GetHealthPercent() < 11.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                {
+                    m_bInBerserk = true;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_venoxisAI(pCreature);
+    }
+};
+
+void AddSC_boss_venoxis()
+{
+    Script* s;
+    s = new boss_venoxis();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_venoxis";
+    //pNewScript->GetAI = &GetAI_boss_venoxis;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp
new file mode 100644
index 000000000..2b5a129c9
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp
@@ -0,0 +1,347 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_ZulGurub
+ * SD%Complete: 80
+ * SDComment:   Missing reset function after killing a boss for Ohgan, Thekal.
+ * SDCategory:  Zul'Gurub
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "zulgurub.h"
+
+struct is_zulgurub : public InstanceScript
+{
+    is_zulgurub() : InstanceScript("instance_zulgurub") {}
+
+    class instance_zulgurub : public ScriptedInstance
+    {
+    public:
+        instance_zulgurub(Map* pMap) : ScriptedInstance(pMap),
+            m_bHasIntroYelled(false),
+            m_bHasAltarYelled(false)
+        {
+            Initialize();
+        }
+
+        ~instance_zulgurub() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        // IsEncounterInProgress() const override { return false; }  // not active in Zul'Gurub
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_LORKHAN:
+            case NPC_ZATH:
+            case NPC_THEKAL:
+            case NPC_JINDO:
+            case NPC_HAKKAR:
+            case NPC_BLOODLORD_MANDOKIR:
+            case NPC_MARLI:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_PANTHER_TRIGGER:
+                if (pCreature->GetPositionY() < -1626)
+                {
+                    m_lLeftPantherTriggerGUIDList.push_back(pCreature->GetObjectGuid());
+                }
+                else
+                {
+                    m_lRightPantherTriggerGUIDList.push_back(pCreature->GetObjectGuid());
+                }
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_GONG_OF_BETHEKK:
+            case GO_FORCEFIELD:
+                break;
+            case GO_SPIDER_EGG:
+                m_lSpiderEggGUIDList.push_back(pGo->GetObjectGuid());
+                return;
+            }
+
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_JEKLIK:
+            case TYPE_VENOXIS:
+            case TYPE_THEKAL:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoLowerHakkarHitPoints();
+                }
+                break;
+            case TYPE_MARLI:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoLowerHakkarHitPoints();
+                }
+                if (uiData == FAIL)
+                {
+                    for (GuidList::const_iterator itr = m_lSpiderEggGUIDList.begin(); itr != m_lSpiderEggGUIDList.end(); ++itr)
+                    {
+                        if (GameObject* pEgg = instance->GetGameObject(*itr))
+                        {
+                            // Note: this type of Gameobject needs to be respawned manually
+                            pEgg->SetRespawnTime(2 * DAY);
+                            pEgg->Respawn();
+                        }
+                    }
+                }
+                break;
+            case TYPE_ARLOKK:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_FORCEFIELD);
+                if (uiData == DONE)
+                {
+                    DoLowerHakkarHitPoints();
+                }
+                if (uiData == FAIL)
+                {
+                    // Note: this gameobject should change flags - currently it despawns which isn't correct
+                    if (GameObject* pGong = GetSingleGameObjectFromStorage(GO_GONG_OF_BETHEKK))
+                    {
+                        pGong->SetRespawnTime(2 * DAY);
+                        pGong->Respawn();
+                    }
+                }
+                break;
+            case TYPE_OHGAN:
+                // Note: SPECIAL instance data is set via ACID!
+                if (uiData == SPECIAL)
+                {
+                    if (Creature* pMandokir = GetSingleCreatureFromStorage(NPC_BLOODLORD_MANDOKIR))
+                    {
+                        pMandokir->SetWalk(false);
+                        pMandokir->GetMotionMaster()->MovePoint(1, aMandokirDownstairsPos[0], aMandokirDownstairsPos[1], aMandokirDownstairsPos[2]);
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_LORKHAN:
+            case TYPE_ZATH:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_SIGNAL_1:
+                DoYellAtTriggerIfCan(uiData);
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6] << " " << m_auiEncounter[7];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        uint64 GetData64(uint32 type) const override
+        {
+            switch (type)
+            {
+            case TYPE_SIGNAL_2:
+            case TYPE_SIGNAL_3:
+                if (Creature *p = (const_cast<instance_zulgurub*>(this))->SelectRandomPantherTrigger(type == TYPE_SIGNAL_2))
+                    return p->GetObjectGuid().GetRawValue();
+                break;
+            default:
+                break;
+            }
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        void DoLowerHakkarHitPoints()
+        {
+            if (Creature* pHakkar = GetSingleCreatureFromStorage(NPC_HAKKAR))
+            {
+                if (pHakkar->IsAlive() && pHakkar->GetMaxHealth() > HP_LOSS_PER_PRIEST)
+                {
+                    pHakkar->SetMaxHealth(pHakkar->GetMaxHealth() - HP_LOSS_PER_PRIEST);
+                    pHakkar->SetHealth(pHakkar->GetHealth() - HP_LOSS_PER_PRIEST);
+                }
+            }
+        }
+
+        void DoYellAtTriggerIfCan(uint32 uiTriggerId)
+        {
+            if (uiTriggerId == AREATRIGGER_ENTER && !m_bHasIntroYelled)
+            {
+                DoOrSimulateScriptTextForThisInstance(SAY_HAKKAR_PROTECT, NPC_HAKKAR);
+                m_bHasIntroYelled = true;
+            }
+            else if (uiTriggerId == AREATRIGGER_ALTAR && !m_bHasAltarYelled)
+            {
+                DoOrSimulateScriptTextForThisInstance(SAY_MINION_DESTROY, NPC_HAKKAR);
+                m_bHasAltarYelled = true;
+            }
+        }
+
+        Creature* SelectRandomPantherTrigger(bool bIsLeft)
+        {
+            GuidList* plTempList = bIsLeft ? &m_lLeftPantherTriggerGUIDList : &m_lRightPantherTriggerGUIDList;
+            std::vector<Creature*> vTriggers;
+            vTriggers.reserve(plTempList->size());
+
+            for (GuidList::const_iterator itr = plTempList->begin(); itr != plTempList->end(); ++itr)
+            {
+                if (Creature* pTemp = instance->GetCreature(*itr))
+                {
+                    vTriggers.push_back(pTemp);
+                }
+            }
+
+            if (vTriggers.empty())
+            {
+                return NULL;
+            }
+
+            return vTriggers[urand(0, vTriggers.size() - 1)];
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        GuidList m_lRightPantherTriggerGUIDList;
+        GuidList m_lLeftPantherTriggerGUIDList;
+        GuidList m_lSpiderEggGUIDList;
+
+        bool m_bHasIntroYelled;
+        bool m_bHasAltarYelled;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_zulgurub(pMap);
+    }
+};
+
+struct at_zulgurub : public AreaTriggerScript
+{
+    at_zulgurub() : AreaTriggerScript("at_zulgurub") {}
+
+    bool AreaTrigger_at_zulgurub(Player* pPlayer, AreaTriggerEntry const* pAt)
+    {
+        if (pAt->id == AREATRIGGER_ENTER || pAt->id == AREATRIGGER_ALTAR)
+        {
+            if (pPlayer->isGameMaster() || pPlayer->IsDead())
+            {
+                return false;
+            }
+
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
+            {
+                pInstance->SetData(TYPE_SIGNAL_1, pAt->id);
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_instance_zulgurub()
+{
+    Script* s;
+    s = new is_zulgurub();
+    s->RegisterSelf();
+    s = new at_zulgurub();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_zulgurub";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_zulgurub;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_zulgurub";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_zulgurub;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/zulgurub.h b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/zulgurub.h
new file mode 100644
index 000000000..6a2d56e92
--- /dev/null
+++ b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/zulgurub.h
@@ -0,0 +1,71 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_ZULGURUB_H
+#define DEF_ZULGURUB_H
+
+enum
+{
+    MAX_ENCOUNTER           = 8,
+    MAX_PRIESTS             = 5,
+
+    TYPE_JEKLIK             = 0,
+    TYPE_VENOXIS            = 1,
+    TYPE_MARLI              = 2,
+    TYPE_THEKAL             = 3,
+    TYPE_ARLOKK             = 4,
+    TYPE_OHGAN              = 5,                            // Do not change, used by Acid
+    TYPE_LORKHAN            = 6,
+    TYPE_ZATH               = 7,
+    TYPE_SIGNAL_1           = MAX_ENCOUNTER,
+    TYPE_SIGNAL_2           = MAX_ENCOUNTER + 1,
+    TYPE_SIGNAL_3           = MAX_ENCOUNTER + 2,
+
+    NPC_LORKHAN             = 11347,
+    NPC_ZATH                = 11348,
+    NPC_THEKAL              = 14509,
+    NPC_JINDO               = 11380,
+    NPC_HAKKAR              = 14834,
+    NPC_PANTHER_TRIGGER     = 15091,
+    NPC_BLOODLORD_MANDOKIR  = 11382,
+    NPC_MARLI               = 14510,
+
+    GO_SPIDER_EGG           = 179985,
+    GO_GONG_OF_BETHEKK      = 180526,
+    GO_FORCEFIELD           = 180497,
+
+    SAY_MINION_DESTROY      = -1309022,
+    SAY_HAKKAR_PROTECT      = -1309023,
+
+    HP_LOSS_PER_PRIEST      = 60000,
+
+    AREATRIGGER_ENTER       = 3958,
+    AREATRIGGER_ALTAR       = 3960,
+};
+
+static const float aMandokirDownstairsPos[3] = { -12196.30f, -1948.37f, 130.31f};
+
+#endif
diff --git a/src/modules/SD3/scripts/kalimdor/ashenvale.cpp b/src/modules/SD3/scripts/kalimdor/ashenvale.cpp
new file mode 100644
index 000000000..91a2caacb
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/ashenvale.cpp
@@ -0,0 +1,723 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Ashenvale
+ * SD%Complete: 70
+ * SDComment:   Quest support: 976, 6482, 6544, 6641.
+ * SDCategory:  Ashenvale Forest
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_muglash
+ * npc_ruul_snowhoof
+ * npc_torek
+ * npc_feero_ironhand
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*####
+# npc_muglash
+####*/
+
+enum
+{
+    SAY_MUG_START1          = -1000501,
+    SAY_MUG_START2          = -1000502,
+    SAY_MUG_BRAZIER         = -1000503,
+    SAY_MUG_BRAZIER_WAIT    = -1000504,
+    SAY_MUG_ON_GUARD        = -1000505,
+    SAY_MUG_REST            = -1000506,
+    SAY_MUG_DONE            = -1000507,
+    SAY_MUG_GRATITUDE       = -1000508,
+    SAY_MUG_PATROL          = -1000509,
+    SAY_MUG_RETURN          = -1000510,
+
+    QUEST_VORSHA            = 6641,
+
+    GO_NAGA_BRAZIER         = 178247,
+    NPC_MUGLASH             = 12717,
+
+    NPC_WRATH_RIDER         = 3713,
+    NPC_WRATH_SORCERESS     = 3717,
+    NPC_WRATH_RAZORTAIL     = 3712,
+
+    NPC_WRATH_PRIESTESS     = 3944,
+    NPC_WRATH_MYRMIDON      = 3711,
+    NPC_WRATH_SEAWITCH      = 3715,
+
+    NPC_VORSHA              = 12940
+};
+
+static float m_afFirstNagaCoord[3][3] =
+{
+    {3603.504150f, 1122.631104f, 1.635f},                   // rider
+    {3589.293945f, 1148.664063f, 5.565f},                   // sorceress
+    {3609.925537f, 1168.759521f, -1.168f}                   // razortail
+};
+
+static float m_afSecondNagaCoord[3][3] =
+{
+    {3609.925537f, 1168.759521f, -1.168f},                  // witch
+    {3645.652100f, 1139.425415f, 1.322f},                   // priest
+    {3583.602051f, 1128.405762f, 2.347f}                    // myrmidon
+};
+
+static float m_fVorshaCoord[] = {3633.056885f, 1172.924072f, -5.388f};
+
+struct npc_muglash : public CreatureScript
+{
+    npc_muglash() : CreatureScript("npc_muglash") {}
+
+    struct npc_muglashAI : public npc_escortAI
+    {
+        npc_muglashAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_uiWaveId = 0;
+            m_bIsBrazierExtinguished = false;
+        }
+
+        bool m_bIsBrazierExtinguished;
+
+        uint32 m_uiWaveId;
+        uint32 m_uiEventTimer;
+
+        void Reset() override
+        {
+            m_uiEventTimer = 10000;
+
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiWaveId = 0;
+                m_bIsBrazierExtinguished = false;
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (HasEscortState(STATE_ESCORT_PAUSED))
+            {
+                if (urand(0, 1))
+                {
+                    return;
+                }
+
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_MUG_ON_GUARD, m_creature, pPlayer);
+                }
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_MUG_START2, m_creature, pPlayer);
+                }
+                break;
+            case 24:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_MUG_BRAZIER, m_creature, pPlayer);
+                }
+
+                if (GameObject* pGo = GetClosestGameObjectWithEntry(m_creature, GO_NAGA_BRAZIER, INTERACTION_DISTANCE * 2))
+                {
+                    // some kind of event flag? Update to player/group only?
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                    SetEscortPaused(true);
+                }
+                break;
+            case 25:
+                DoScriptText(SAY_MUG_GRATITUDE, m_creature);
+
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_VORSHA, m_creature);
+                }
+                break;
+            case 26:
+                DoScriptText(SAY_MUG_PATROL, m_creature);
+                break;
+            case 27:
+                DoScriptText(SAY_MUG_RETURN, m_creature);
+                break;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+            {
+                DoScriptText(SAY_MUG_BRAZIER_WAIT, m_creature);
+
+                m_bIsBrazierExtinguished = true;
+            }
+        }
+
+        void DoWaveSummon()
+        {
+            switch (m_uiWaveId)
+            {
+            case 1:
+                m_creature->SummonCreature(NPC_WRATH_RIDER, m_afFirstNagaCoord[0][0], m_afFirstNagaCoord[0][1], m_afFirstNagaCoord[0][2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_WRATH_SORCERESS, m_afFirstNagaCoord[1][0], m_afFirstNagaCoord[1][1], m_afFirstNagaCoord[1][2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_WRATH_RAZORTAIL, m_afFirstNagaCoord[2][0], m_afFirstNagaCoord[2][1], m_afFirstNagaCoord[2][2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 60000);
+                break;
+            case 2:
+                m_creature->SummonCreature(NPC_WRATH_PRIESTESS, m_afSecondNagaCoord[0][0], m_afSecondNagaCoord[0][1], m_afSecondNagaCoord[0][2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_WRATH_MYRMIDON, m_afSecondNagaCoord[1][0], m_afSecondNagaCoord[1][1], m_afSecondNagaCoord[1][2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_WRATH_SEAWITCH, m_afSecondNagaCoord[2][0], m_afSecondNagaCoord[2][1], m_afSecondNagaCoord[2][2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 60000);
+                break;
+            case 3:
+                m_creature->SummonCreature(NPC_VORSHA, m_fVorshaCoord[0], m_fVorshaCoord[1], m_fVorshaCoord[2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 60000);
+                break;
+            case 4:
+                SetEscortPaused(false);
+                DoScriptText(SAY_MUG_DONE, m_creature);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (HasEscortState(STATE_ESCORT_PAUSED) && m_bIsBrazierExtinguished)
+                {
+                    if (m_uiEventTimer < uiDiff)
+                    {
+                        ++m_uiWaveId;
+                        DoWaveSummon();
+                        m_uiEventTimer = 10000;
+                    }
+                    else
+                    {
+                        m_uiEventTimer -= uiDiff;
+                    }
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_VORSHA)
+        {
+            if (npc_muglashAI* pEscortAI = dynamic_cast<npc_muglashAI*>(pCreature->AI()))
+            {
+                DoScriptText(SAY_MUG_START1, pCreature);
+                pCreature->SetFactionTemporary(FACTION_ESCORT_H_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_muglashAI(pCreature);
+    }
+};
+
+struct go_naga_brazier : public GameObjectScript
+{
+    go_naga_brazier() : GameObjectScript("go_naga_brazier") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        if (Creature* pCreature = GetClosestCreatureWithEntry(pGo, NPC_MUGLASH, INTERACTION_DISTANCE * 2))
+        {
+            if (CreatureAI* pEscortAI = pCreature->AI())
+            {
+                pEscortAI->SendAIEvent(AI_EVENT_CUSTOM_A, pCreature, pCreature);
+                return false;
+            }
+        }
+
+        return true;
+    }
+};
+
+/*####
+# npc_ruul_snowhoof
+####*/
+
+enum
+{
+    QUEST_FREEDOM_TO_RUUL   = 6482,
+    NPC_T_URSA              = 3921,
+    NPC_T_TOTEMIC           = 3922,
+    NPC_T_PATHFINDER        = 3926
+};
+
+struct npc_ruul_snowhoof : public CreatureScript
+{
+    npc_ruul_snowhoof() : CreatureScript("npc_ruul_snowhoof") {}
+
+    struct npc_ruul_snowhoofAI : public npc_escortAI
+    {
+        npc_ruul_snowhoofAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 13:
+                m_creature->SummonCreature(NPC_T_TOTEMIC, 3449.218018f, -587.825073f, 174.978867f, 4.714445f, TEMPSUMMON_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_T_URSA, 3446.384521f, -587.830872f, 175.186279f, 4.714445f, TEMPSUMMON_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_T_PATHFINDER, 3444.218994f, -587.835327f, 175.380600f, 4.714445f, TEMPSUMMON_DEAD_DESPAWN, 60000);
+                break;
+            case 19:
+                m_creature->SummonCreature(NPC_T_TOTEMIC, 3508.344482f, -492.024261f, 186.929031f, 4.145029f, TEMPSUMMON_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_T_URSA, 3506.265625f, -490.531006f, 186.740128f, 4.239277f, TEMPSUMMON_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_T_PATHFINDER, 3503.682373f, -489.393799f, 186.629684f, 4.349232f, TEMPSUMMON_DEAD_DESPAWN, 60000);
+                break;
+            case 21:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_FREEDOM_TO_RUUL, m_creature);
+                }
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* summoned) override
+        {
+            summoned->AI()->AttackStart(m_creature);
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_FREEDOM_TO_RUUL)
+        {
+            pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+            pCreature->SetStandState(UNIT_STAND_STATE_STAND);
+
+            if (npc_ruul_snowhoofAI* pEscortAI = dynamic_cast<npc_ruul_snowhoofAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ruul_snowhoofAI(pCreature);
+    }
+};
+
+/*####
+# npc_torek
+####*/
+
+enum
+{
+    SAY_READY                   = -1000106,
+    SAY_MOVE                    = -1000107,
+    SAY_PREPARE                 = -1000108,
+    SAY_WIN                     = -1000109,
+    SAY_END                     = -1000110,
+
+    SPELL_REND                  = 11977,
+    SPELL_THUNDERCLAP           = 8078,
+
+    QUEST_TOREK_ASSULT          = 6544,
+
+    NPC_SPLINTERTREE_RAIDER     = 12859,
+    NPC_DURIEL                  = 12860,
+    NPC_SILVERWING_SENTINEL     = 12896,
+    NPC_SILVERWING_WARRIOR      = 12897
+};
+
+struct npc_torek : public CreatureScript
+{
+    npc_torek() : CreatureScript("npc_torek") {}
+
+    struct npc_torekAI : public npc_escortAI
+    {
+        npc_torekAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        uint32 m_uiRend_Timer;
+        uint32 m_uiThunderclap_Timer;
+
+        void Reset() override
+        {
+            m_uiRend_Timer = 5000;
+            m_uiThunderclap_Timer = 8000;
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 1:
+                DoScriptText(SAY_MOVE, m_creature, pPlayer);
+                break;
+            case 8:
+                DoScriptText(SAY_PREPARE, m_creature, pPlayer);
+                break;
+            case 19:
+                // TODO: verify location and creatures amount.
+                m_creature->SummonCreature(NPC_DURIEL, 1776.73f, -2049.06f, 109.83f, 1.54f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                m_creature->SummonCreature(NPC_SILVERWING_SENTINEL, 1774.64f, -2049.41f, 109.83f, 1.40f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                m_creature->SummonCreature(NPC_SILVERWING_WARRIOR, 1778.73f, -2049.50f, 109.83f, 1.67f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                break;
+            case 20:
+                DoScriptText(SAY_WIN, m_creature, pPlayer);
+                pPlayer->GroupEventHappens(QUEST_TOREK_ASSULT, m_creature);
+                break;
+            case 21:
+                DoScriptText(SAY_END, m_creature, pPlayer);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiRend_Timer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_REND);
+                m_uiRend_Timer = 20000;
+            }
+            else
+            {
+                m_uiRend_Timer -= uiDiff;
+            }
+
+            if (m_uiThunderclap_Timer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_THUNDERCLAP);
+                m_uiThunderclap_Timer = 30000;
+            }
+            else
+            {
+                m_uiThunderclap_Timer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_TOREK_ASSULT)
+        {
+            // TODO: find companions, make them follow Torek, at any time (possibly done by mangos/database in future?)
+            DoScriptText(SAY_READY, pCreature, pPlayer);
+
+            if (npc_torekAI* pEscortAI = dynamic_cast<npc_torekAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(true, pPlayer, pQuest);
+            }
+        }
+
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_torekAI(pCreature);
+    }
+};
+
+/*####
+# npc_feero_ironhand
+####*/
+
+enum
+{
+    SAY_QUEST_START             = -1000771,
+    SAY_FIRST_AMBUSH_START      = -1000772,
+    SAY_FIRST_AMBUSH_END        = -1000773,
+    SAY_SECOND_AMBUSH_START     = -1000774,
+    SAY_SCOUT_SECOND_AMBUSH     = -1000775,
+    SAY_SECOND_AMBUSH_END       = -1000776,
+    SAY_FINAL_AMBUSH_START      = -1000777,
+    SAY_BALIZAR_FINAL_AMBUSH    = -1000778,
+    SAY_FINAL_AMBUSH_ATTACK     = -1000779,
+    SAY_QUEST_END               = -1000780,
+
+    QUEST_SUPPLIES_TO_AUBERDINE = 976,
+
+    NPC_DARK_STRAND_ASSASSIN    = 3879,
+    NPC_FORSAKEN_SCOUT          = 3893,
+
+    NPC_ALIGAR_THE_TORMENTOR    = 3898,
+    NPC_BALIZAR_THE_UMBRAGE     = 3899,
+    NPC_CAEDAKAR_THE_VICIOUS    = 3900,
+};
+
+/*
+ * Notes about the event:
+ * The summon coords and event sequence are guesswork based on the comments from wowhead and wowwiki
+ */
+
+// Distance, Angle or Offset
+static const float aSummonPositions[2][2] =
+{
+    {30.0f, 1.25f},
+    {30.0f, 0.95f}
+};
+
+// Hardcoded positions for the last 3 mobs
+static const float aEliteSummonPositions[3][4] =
+{
+    {4243.12f, 108.22f, 38.12f, 3.62f},
+    {4240.95f, 114.04f, 38.35f, 3.56f},
+    {4235.78f, 118.09f, 38.08f, 4.12f}
+};
+
+struct npc_feero_ironhand : public CreatureScript
+{
+    npc_feero_ironhand() : CreatureScript("npc_feero_ironhand") {}
+
+    struct npc_feero_ironhandAI : public npc_escortAI
+    {
+        npc_feero_ironhandAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+        }
+
+        uint8 m_uiCreaturesCount;
+        bool m_bIsAttacked;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiCreaturesCount = 0;
+                m_bIsAttacked = false;
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 14:
+                // Prepare the first ambush
+                DoScriptText(SAY_FIRST_AMBUSH_START, m_creature);
+                for (uint8 i = 0; i < 4; ++i)
+                {
+                    DoSpawnMob(NPC_DARK_STRAND_ASSASSIN, aSummonPositions[0][0], aSummonPositions[0][1] - M_PI_F / 4 * i);
+                }
+                break;
+            case 20:
+                // Prepare the second ambush
+                DoScriptText(SAY_SECOND_AMBUSH_START, m_creature);
+                for (uint8 i = 0; i < 3; ++i)
+                {
+                    DoSpawnMob(NPC_FORSAKEN_SCOUT, aSummonPositions[1][0], aSummonPositions[1][1] - M_PI_F / 3 * i);
+                }
+                break;
+            case 29:
+                // Final ambush
+                DoScriptText(SAY_FINAL_AMBUSH_START, m_creature);
+                m_creature->SummonCreature(NPC_BALIZAR_THE_UMBRAGE, aEliteSummonPositions[0][0], aEliteSummonPositions[0][1], aEliteSummonPositions[0][2], aEliteSummonPositions[0][3], TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                m_creature->SummonCreature(NPC_ALIGAR_THE_TORMENTOR, aEliteSummonPositions[1][0], aEliteSummonPositions[1][1], aEliteSummonPositions[1][2], aEliteSummonPositions[1][3], TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                m_creature->SummonCreature(NPC_CAEDAKAR_THE_VICIOUS, aEliteSummonPositions[2][0], aEliteSummonPositions[2][1], aEliteSummonPositions[2][2], aEliteSummonPositions[2][3], TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                break;
+            case 30:
+                // Complete the quest
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_SUPPLIES_TO_AUBERDINE, m_creature);
+                }
+                break;
+            }
+        }
+
+        void AttackedBy(Unit* pWho) override
+        {
+            // Yell only at the first attack
+            if (!m_bIsAttacked)
+            {
+                if (((Creature*)pWho)->GetEntry() == NPC_BALIZAR_THE_UMBRAGE)
+                {
+                    DoScriptText(SAY_FINAL_AMBUSH_ATTACK, m_creature);
+                    m_bIsAttacked = true;
+                }
+            }
+        }
+
+        // Summon mobs at calculated points
+        void DoSpawnMob(uint32 uiEntry, float fDistance, float fAngle)
+        {
+            float fX, fY, fZ;
+            m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, fDistance, fAngle);
+
+            m_creature->SummonCreature(uiEntry, fX, fY, fZ, 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            --m_uiCreaturesCount;
+
+            if (!m_uiCreaturesCount)
+            {
+                switch (pSummoned->GetEntry())
+                {
+                case NPC_DARK_STRAND_ASSASSIN:
+                    DoScriptText(SAY_FIRST_AMBUSH_END, m_creature);
+                    break;
+                case NPC_FORSAKEN_SCOUT:
+                    DoScriptText(SAY_SECOND_AMBUSH_END, m_creature);
+                    break;
+                case NPC_ALIGAR_THE_TORMENTOR:
+                case NPC_BALIZAR_THE_UMBRAGE:
+                case NPC_CAEDAKAR_THE_VICIOUS:
+                    DoScriptText(SAY_QUEST_END, m_creature);
+                    break;
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_FORSAKEN_SCOUT)
+            {
+                // Only one of the scouts yells
+                if (m_uiCreaturesCount == 1)
+                {
+                    DoScriptText(SAY_SCOUT_SECOND_AMBUSH, pSummoned, m_creature);
+                }
+            }
+            else if (pSummoned->GetEntry() == NPC_BALIZAR_THE_UMBRAGE)
+            {
+                DoScriptText(SAY_BALIZAR_FINAL_AMBUSH, pSummoned);
+            }
+
+            ++m_uiCreaturesCount;
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_feero_ironhandAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_SUPPLIES_TO_AUBERDINE)
+        {
+            DoScriptText(SAY_QUEST_START, pCreature, pPlayer);
+            pCreature->SetFactionTemporary(FACTION_ESCORT_A_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+
+            if (npc_feero_ironhandAI* pEscortAI = dynamic_cast<npc_feero_ironhandAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(true, pPlayer, pQuest, true);
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_ashenvale()
+{
+    Script* s;
+    s = new npc_muglash();
+    s->RegisterSelf();
+    s = new go_naga_brazier();
+    s->RegisterSelf();
+    s = new npc_ruul_snowhoof();
+    s->RegisterSelf();
+    s = new npc_torek();
+    s->RegisterSelf();
+    s = new npc_feero_ironhand();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_muglash";
+    //pNewScript->GetAI = &GetAI_npc_muglash;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_muglash;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_naga_brazier";
+    //pNewScript->pGOUse = &GOUse_go_naga_brazier;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ruul_snowhoof";
+    //pNewScript->GetAI = &GetAI_npc_ruul_snowhoofAI;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_ruul_snowhoof;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_torek";
+    //pNewScript->GetAI = &GetAI_npc_torek;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_torek;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_feero_ironhand";
+    //pNewScript->GetAI = &GetAI_npc_feero_ironhand;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_feero_ironhand;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/azshara.cpp b/src/modules/SD3/scripts/kalimdor/azshara.cpp
new file mode 100644
index 000000000..3167d06e7
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/azshara.cpp
@@ -0,0 +1,584 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Azshara
+ * SD%Complete: 90
+ * SDComment: Quest support: 2744, 3141, 9364, 10994
+ * SDCategory:  Azshara
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+ * npc_rizzle_sprysprocket
+ * npc_depth_charge
+ * go_southfury_moonstone
+#endif
+ * mobs_spitelashes
+ * npc_loramus_thalipedes
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+#include "escort_ai.h"
+
+/*#####
+## npc_rizzle_sprysprocket
+#####*/
+
+enum
+{
+    SAY_START                   = -1000351,
+    EMOTE_START                 = -1000352,
+    SAY_WHISPER_CHILL           = -1000353,
+    SAY_GRENADE_FAIL            = -1000354,
+    SAY_END                     = -1000355,
+
+    QUEST_MOONSTONE             = 10994,
+    NPC_RIZZLE                  = 23002,
+    NPC_DEPTH_CHARGE            = 23025,
+
+    SPELL_SUMMON_RIZZLE         = 39866,
+    SPELL_BLACKJACK             = 39865,                    // stuns player
+    SPELL_ESCAPE                = 39871,                    // teleports to water
+    SPELL_SWIM_SPEED            = 40596,
+
+    SPELL_FROST_TRAP            = 39902,                    // not used?
+
+    SPELL_PERIODIC_GRENADE      = 40553,                    // cannot tell who are supposed to have this aura
+    SPELL_FROST_GRENADE         = 40525,                    // triggered by periodic grenade
+
+    SPELL_SUMMON_DEPTH_CHARGE   = 39907,                    // summons the bomb creature
+    SPELL_TRAP                  = 39899,                    // knockback
+
+    SPELL_PERIODIC_CHECK        = 39888,
+    SPELL_SURRENDER             = 39889,                    // should be triggered by periodic check, if player comes in certain distance with quest incomplete
+
+    SPELL_GIVE_MOONSTONE        = 39886
+};
+//TODO prepare localisation
+#define GOSSIP_ITEM_MOONSTONE   "Hand over the Southfury moonstone and I'll let you go."
+
+struct npc_rizzle_sprysprocket : public CreatureScript
+{
+    npc_rizzle_sprysprocket() : CreatureScript("npc_rizzle_sprysprocket") {}
+
+    struct npc_rizzle_sprysprocketAI : public npc_escortAI
+    {
+        npc_rizzle_sprysprocketAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            pCreature->SetActiveObjectState(true);
+            m_bIsIntro = true;
+            m_uiIntroPhase = 0;
+            m_uiIntroTimer = 0;
+            m_uiDepthChargeTimer = 10000;
+        }
+
+        bool m_bIsIntro;
+        uint8 m_uiIntroPhase;
+        uint32 m_uiIntroTimer;
+        uint32 m_uiDepthChargeTimer;
+
+        void MoveInLineOfSight(Unit* pUnit) override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING) && pUnit->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (!HasEscortState(STATE_ESCORT_PAUSED) && m_creature->IsWithinDistInMap(pUnit, INTERACTION_DISTANCE) && m_creature->IsWithinLOSInMap(pUnit))
+                {
+                    if (((Player*)pUnit)->GetQuestStatus(QUEST_MOONSTONE) == QUEST_STATUS_INCOMPLETE)
+                    {
+                        m_creature->CastSpell(m_creature, SPELL_SURRENDER, true);
+                    }
+                }
+            }
+
+            npc_escortAI::MoveInLineOfSight(pUnit);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                m_creature->CastSpell(m_creature, SPELL_PERIODIC_CHECK, true);
+                break;
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_SURRENDER)
+            {
+                SetEscortPaused(true);
+                DoScriptText(SAY_END, m_creature);
+                m_creature->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            }
+        }
+
+        // this may be wrong (and doesn't work)
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            if (pTarget->GetTypeId() == TYPEID_PLAYER && pSpell->Id == SPELL_FROST_GRENADE)
+            {
+                DoScriptText(SAY_WHISPER_CHILL, m_creature, pTarget);
+            }
+        }
+
+        // this may be wrong
+        void JustSummoned(Creature* /*pSummoned*/) override
+        {
+            // pSummoned->CastSpell(pSummoned,SPELL_PERIODIC_GRENADE,false,NULL,NULL,m_creature->GetObjectGuid());
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (m_bIsIntro)
+            {
+                if (m_uiIntroTimer < uiDiff)
+                {
+                    m_uiIntroTimer = 1500;
+                }
+                else
+                {
+                    m_uiIntroTimer -= uiDiff;
+                    return;
+                }
+
+                switch (m_uiIntroPhase)
+                {
+                case 0:
+                    DoScriptText(SAY_START, m_creature);
+                    DoScriptText(EMOTE_START, m_creature);
+                    break;
+                case 1:
+                    // teleports to water _before_ we Start()
+                    m_creature->CastSpell(m_creature, SPELL_ESCAPE, false);
+                    break;
+                case 2:
+                    m_creature->CastSpell(m_creature, SPELL_SWIM_SPEED, false);
+                    m_bIsIntro = false;
+                    Start(true);
+                    break;
+                }
+
+                ++m_uiIntroPhase;
+                return;
+            }
+
+            if (m_uiDepthChargeTimer < uiDiff)
+            {
+                if (!HasEscortState(STATE_ESCORT_PAUSED))
+                {
+                    m_creature->CastSpell(m_creature, SPELL_SUMMON_DEPTH_CHARGE, false);
+                }
+
+                m_uiDepthChargeTimer = urand(10000, 15000);
+            }
+            else
+            {
+                m_uiDepthChargeTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_rizzle_sprysprocketAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_MOONSTONE) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MOONSTONE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->CastSpell(pPlayer, SPELL_GIVE_MOONSTONE, false);
+        }
+
+        return true;
+    }
+};
+
+struct npc_depth_charge : public CreatureScript
+{
+    npc_depth_charge() : CreatureScript("npc_depth_charge") {}
+
+    struct npc_depth_chargeAI : public ScriptedAI
+    {
+        npc_depth_chargeAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        void MoveInLineOfSight(Unit* pUnit) override
+        {
+            if (pUnit->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            if (m_creature->IsWithinDistInMap(pUnit, INTERACTION_DISTANCE) && m_creature->IsWithinLOSInMap(pUnit))
+            {
+                m_creature->CastSpell(pUnit, SPELL_TRAP, false);
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_depth_chargeAI(pCreature);
+    }
+};
+
+/*######
+## go_southfury_moonstone
+######*/
+
+struct go_southfury_moonstone : public GameObjectScript
+{
+    go_southfury_moonstone() : GameObjectScript("go_southfury_moonstone") {}
+
+    bool OnUse(Player* pPlayer, GameObject* /*pGo*/) override
+    {
+        // implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose
+        // pPlayer->CastSpell(pPlayer,SPELL_SUMMON_RIZZLE,false);
+
+        if (Creature* pCreature = pPlayer->SummonCreature(NPC_RIZZLE, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0))
+        {
+            pCreature->CastSpell(pPlayer, SPELL_BLACKJACK, false);
+        }
+
+        return false;
+    }
+};
+#endif
+
+/*######
+## mobs_spitelashes
+######*/
+enum
+{
+    // quest related
+    SPELL_POLYMORPH_BACKFIRE    = 28406,        // summons npc 16479
+    QUEST_FRAGMENTED_MAGIC      = 9364,
+
+    // npc spells
+    SPELL_DISARM                = 6713,         // warrior
+    SPELL_SCREECH               = 3589,         // screamer
+    SPELL_FROST_SHOCK           = 12548,        // serpent guard
+    SPELL_RENEW                 = 11640,        // siren
+    SPELL_SHOOT                 = 6660,
+    SPELL_FROST_SHOT            = 12551,
+    SPELL_FROST_NOVA            = 11831,
+    SPELL_STRIKE                = 11976,        // myrmidon
+
+    NPC_SPITELASH_WARRIOR       = 6190,
+    NPC_SPITELASH_SCREAMER      = 6193,
+    NPC_SPITELASH_GUARD         = 6194,
+    NPC_SPITELASH_SIREN         = 6195,
+    NPC_SPITELASH_MYRMIDON      = 6196,
+
+    TARGET_TYPE_RANDOM          = 0,
+    TARGET_TYPE_VICTIM          = 1,
+    TARGET_TYPE_SELF            = 2,
+    TARGET_TYPE_FRIENDLY        = 3,
+};
+
+struct SpitelashAbilityStruct
+{
+    uint32 m_uiCreatureEntry, m_uiSpellId;
+    uint8 m_uiTargetType;
+    uint32 m_uiInitialTimer, m_uiCooldown;
+};
+
+static SpitelashAbilityStruct m_aSpitelashAbility[8] =
+{
+    {NPC_SPITELASH_WARRIOR,     SPELL_DISARM,       TARGET_TYPE_VICTIM,     4000,  10000},
+    {NPC_SPITELASH_SCREAMER,    SPELL_SCREECH,      TARGET_TYPE_SELF,       7000,  15000},
+    {NPC_SPITELASH_GUARD,       SPELL_FROST_SHOCK,  TARGET_TYPE_VICTIM,     7000,  13000},
+    {NPC_SPITELASH_SIREN,       SPELL_RENEW,        TARGET_TYPE_FRIENDLY,   4000,  7000},
+    {NPC_SPITELASH_SIREN,       SPELL_SHOOT,        TARGET_TYPE_RANDOM,     3000,  9000},
+    {NPC_SPITELASH_SIREN,       SPELL_FROST_SHOT,   TARGET_TYPE_RANDOM,     7000,  10000},
+    {NPC_SPITELASH_SIREN,       SPELL_FROST_NOVA,   TARGET_TYPE_SELF,       10000, 15000},
+    {NPC_SPITELASH_MYRMIDON,    SPELL_STRIKE,       TARGET_TYPE_VICTIM,     3000,  7000}
+};
+
+struct mobs_spitelashes : public CreatureScript
+{
+    mobs_spitelashes() : CreatureScript("mobs_spitelashes") {}
+
+    struct mobs_spitelashesAI : public ScriptedAI
+    {
+        mobs_spitelashesAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            for (uint8 i = 0; i < countof(m_aSpitelashAbility); ++i)    //TODO check, to Reset()?
+            {
+                if (m_aSpitelashAbility[i].m_uiCreatureEntry == m_creature->GetEntry())
+                {
+                    m_mSpellTimers[i] = m_aSpitelashAbility[i].m_uiInitialTimer;
+                }
+            }
+
+        }
+
+        uint32 m_uiMorphTimer;
+
+        UNORDERED_MAP<uint8, uint32> m_mSpellTimers;
+
+        void Reset() override
+        {
+            m_uiMorphTimer = 0;
+
+            for (UNORDERED_MAP<uint8, uint32>::iterator itr = m_mSpellTimers.begin(); itr != m_mSpellTimers.end(); ++itr)
+            {
+                itr->second = m_aSpitelashAbility[itr->first].m_uiInitialTimer;
+            }
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            // If already hit by the polymorph return
+            if (m_uiMorphTimer)
+            {
+                return;
+            }
+
+            // Creature get polymorphed into a sheep and after 5 secs despawns
+            if (pCaster->GetTypeId() == TYPEID_PLAYER && ((Player*)pCaster)->GetQuestStatus(QUEST_FRAGMENTED_MAGIC) == QUEST_STATUS_INCOMPLETE &&
+                (pSpell->Id == 118 || pSpell->Id == 12824 || pSpell->Id == 12825 || pSpell->Id == 12826))
+            {
+                m_uiMorphTimer = 5000;
+            }
+        }
+
+        bool CanUseSpecialAbility(uint32 uiIndex)
+        {
+            Unit* pTarget = NULL;
+
+            switch (m_aSpitelashAbility[uiIndex].m_uiTargetType)
+            {
+            case TARGET_TYPE_SELF:
+                pTarget = m_creature;
+                break;
+            case TARGET_TYPE_VICTIM:
+                pTarget = m_creature->getVictim();
+                break;
+            case TARGET_TYPE_RANDOM:
+                pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, m_aSpitelashAbility[uiIndex].m_uiSpellId, SELECT_FLAG_IN_LOS);
+                break;
+            case TARGET_TYPE_FRIENDLY:
+                pTarget = DoSelectLowestHpFriendly(10.0f);
+                break;
+            }
+
+            if (pTarget)
+            {
+                if (DoCastSpellIfCan(pTarget, m_aSpitelashAbility[uiIndex].m_uiSpellId) == CAST_OK)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiMorphTimer)
+            {
+                if (m_uiMorphTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_POLYMORPH_BACKFIRE, CAST_TRIGGERED) == CAST_OK)
+                    {
+                        m_uiMorphTimer = 0;
+                        m_creature->ForcedDespawn();
+                    }
+                }
+                else
+                {
+                    m_uiMorphTimer -= uiDiff;
+                }
+            }
+
+            for (UNORDERED_MAP<uint8, uint32>::iterator itr = m_mSpellTimers.begin(); itr != m_mSpellTimers.end(); ++itr)
+            {
+                if (itr->second < uiDiff)
+                {
+                    if (CanUseSpecialAbility(itr->first))
+                    {
+                        itr->second = m_aSpitelashAbility[itr->first].m_uiCooldown;
+                        break;
+                    }
+                }
+                else
+                {
+                    itr->second -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mobs_spitelashesAI(pCreature);
+    }
+};
+
+/*######
+## npc_loramus_thalipedes
+######*/
+
+struct npc_loramus_thalipedes : public CreatureScript
+{
+    npc_loramus_thalipedes() : CreatureScript("npc_loramus_thalipedes") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+
+        if (pPlayer->GetQuestStatus(2744) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Can you help me?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        if (pPlayer->GetQuestStatus(3141) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Tell me your story", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override    //TODO localisation
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(2744);
+            break;
+
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Please continue", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
+            pPlayer->SEND_GOSSIP_MENU(1813, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 21:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I do not understand", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
+            pPlayer->SEND_GOSSIP_MENU(1814, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 22:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Indeed", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
+            pPlayer->SEND_GOSSIP_MENU(1815, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 23:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will do this with or your help, Loramus", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
+            pPlayer->SEND_GOSSIP_MENU(1816, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 24:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
+            pPlayer->SEND_GOSSIP_MENU(1817, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 25:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(3141);
+            break;
+        }
+        return true;
+    }
+};
+
+void AddSC_azshara()
+{
+    Script* s;
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    s = new npc_rizzle_sprysprocket();
+    s->RegisterSelf();
+    s = new npc_depth_charge();
+    s->RegisterSelf();
+    s = new go_southfury_moonstone();
+    s->RegisterSelf();
+#endif
+    s = new mobs_spitelashes();
+    s->RegisterSelf();
+    s = new npc_loramus_thalipedes();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+//#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    //pNewScript->Name = "npc_rizzle_sprysprocket";
+    //pNewScript->GetAI = &GetAI_npc_rizzle_sprysprocket;
+    //pNewScript->pGossipHello = &GossipHello_npc_rizzle_sprysprocket;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_rizzle_sprysprocket;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_depth_charge";
+    //pNewScript->GetAI = &GetAI_npc_depth_charge;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_southfury_moonstone";
+    //pNewScript->pGOUse = &GOUse_go_southfury_moonstone;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+//#endif
+    //pNewScript->Name = "mobs_spitelashes";
+    //pNewScript->GetAI = &GetAI_mobs_spitelashes;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_loramus_thalipedes";
+    //pNewScript->pGossipHello =  &GossipHello_npc_loramus_thalipedes;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_loramus_thalipedes;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/azuremyst_isle.cpp b/src/modules/SD3/scripts/kalimdor/azuremyst_isle.cpp
new file mode 100644
index 000000000..cb8c5d047
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/azuremyst_isle.cpp
@@ -0,0 +1,474 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Azuremyst_Isle
+SD%Complete: 75
+SDComment: Quest support: 9283, 9528, 9537, Injured Draenei cosmetic only
+SDCategory: Azuremyst Isle
+EndScriptData */
+
+/* ContentData
+npc_draenei_survivor
+npc_engineer_spark_overgrind
+npc_injured_draenei
+npc_magwin
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include <cmath>
+
+/*######
+## npc_draenei_survivor
+######*/
+
+enum
+{
+    SAY_HEAL1           = -1000176,
+    SAY_HEAL2           = -1000177,
+    SAY_HEAL3           = -1000178,
+    SAY_HEAL4           = -1000179,
+    SAY_HELP1           = -1000180,
+    SAY_HELP2           = -1000181,
+    SAY_HELP3           = -1000182,
+    SAY_HELP4           = -1000183,
+
+    SPELL_IRRIDATION    = 35046,
+    SPELL_STUNNED       = 28630
+};
+
+struct npc_draenei_survivor : public CreatureScript
+{
+    npc_draenei_survivor() : CreatureScript("npc_draenei_survivor") {}
+
+    struct npc_draenei_survivorAI : public ScriptedAI
+    {
+        npc_draenei_survivorAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_casterGuid;
+
+        uint32 m_uiSayThanksTimer;
+        uint32 m_uiRunAwayTimer;
+        uint32 m_uiSayHelpTimer;
+
+        bool m_bCanSayHelp;
+
+        void Reset() override
+        {
+            m_casterGuid.Clear();
+
+            m_uiSayThanksTimer = 0;
+            m_uiRunAwayTimer = 0;
+            m_uiSayHelpTimer = 10000;
+
+            m_bCanSayHelp = true;
+
+            m_creature->CastSpell(m_creature, SPELL_IRRIDATION, true);
+
+#if defined (CLASSIC) || defined (TBC)
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP);
+#endif
+#if defined (WOTLK) || defined (CATA)
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
+#endif
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
+            m_creature->SetHealth(int(m_creature->GetMaxHealth()*.1));
+            m_creature->SetStandState(UNIT_STAND_STATE_SLEEP);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_bCanSayHelp && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsFriendlyTo(pWho) &&
+                m_creature->IsWithinDistInMap(pWho, 25.0f))
+            {
+                // Random switch between 4 texts
+                switch (urand(0, 3))
+                {
+                case 0: DoScriptText(SAY_HELP1, m_creature, pWho); break;
+                case 1: DoScriptText(SAY_HELP2, m_creature, pWho); break;
+                case 2: DoScriptText(SAY_HELP3, m_creature, pWho); break;
+                case 3: DoScriptText(SAY_HELP4, m_creature, pWho); break;
+                }
+
+                m_uiSayHelpTimer = 20000;
+                m_bCanSayHelp = false;
+            }
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+#if defined (CLASSIC) || defined (TBC)
+            if (pSpell->Id == 28880)
+#endif
+#if defined (WOTLK) || defined (CATA)
+            if (pSpell->IsFitToFamilyMask(UI64LIT(0x0000000000000000), 0x080000000))
+#endif
+            {
+#if defined (CLASSIC) || defined (TBC)
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP);
+#endif
+#if defined (WOTLK) || defined (CATA)
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
+#endif
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+
+                m_creature->CastSpell(m_creature, SPELL_STUNNED, true);
+
+                m_casterGuid = pCaster->GetObjectGuid();
+
+                m_uiSayThanksTimer = 5000;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiSayThanksTimer)
+            {
+                if (m_uiSayThanksTimer <= uiDiff)
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_IRRIDATION);
+
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_casterGuid))
+                    {
+                        if (pPlayer->GetTypeId() != TYPEID_PLAYER)
+                        {
+                            return;
+                        }
+
+                        switch (urand(0, 3))
+                        {
+                        case 0: DoScriptText(SAY_HEAL1, m_creature, pPlayer); break;
+                        case 1: DoScriptText(SAY_HEAL2, m_creature, pPlayer); break;
+                        case 2: DoScriptText(SAY_HEAL3, m_creature, pPlayer); break;
+                        case 3: DoScriptText(SAY_HEAL4, m_creature, pPlayer); break;
+                        }
+
+                        pPlayer->TalkedToCreature(m_creature->GetEntry(), m_creature->GetObjectGuid());
+                    }
+
+                    m_creature->GetMotionMaster()->Clear();
+                    m_creature->GetMotionMaster()->MovePoint(0, -4115.053711f, -13754.831055f, 73.508949f);
+
+                    m_uiRunAwayTimer = 10000;
+                    m_uiSayThanksTimer = 0;
+                }
+                else { m_uiSayThanksTimer -= uiDiff; }
+
+                return;
+            }
+
+            if (m_uiRunAwayTimer)
+            {
+                if (m_uiRunAwayTimer <= uiDiff)
+                {
+                    m_creature->ForcedDespawn();
+                }
+                else
+                {
+                    m_uiRunAwayTimer -= uiDiff;
+                }
+
+                return;
+            }
+
+            if (m_uiSayHelpTimer < uiDiff)
+            {
+                m_bCanSayHelp = true;
+                m_uiSayHelpTimer = 20000;
+            }
+            else { m_uiSayHelpTimer -= uiDiff; }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_draenei_survivorAI(pCreature);
+    }
+};
+
+/*######
+## npc_engineer_spark_overgrind
+######*/
+
+enum
+{
+    SAY_TEXT                = -1000184,
+    EMOTE_SHELL             = -1000185,
+    SAY_ATTACK              = -1000186,
+
+    AREA_COVE               = 3579,
+    //AREA_ISLE               = 3639,
+    QUEST_GNOMERCY          = 9537,
+    FACTION_HOSTILE         = 14,
+    SPELL_DYNAMITE          = 7978
+};
+//TODO prepare localisation
+#define GOSSIP_FIGHT        "Traitor! You will be brought to justice!"
+
+struct npc_engineer_spark_overgrind : public CreatureScript
+{
+    npc_engineer_spark_overgrind() : CreatureScript("npc_engineer_spark_overgrind") {}
+
+    struct npc_engineer_spark_overgrindAI : public ScriptedAI
+    {
+        npc_engineer_spark_overgrindAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_uiNpcFlags = pCreature->GetUInt32Value(UNIT_NPC_FLAGS);
+        }
+
+        uint32 m_uiNpcFlags;
+
+        uint32 m_uiDynamiteTimer;
+        uint32 m_uiEmoteTimer;
+
+        void Reset() override
+        {
+            m_creature->SetUInt32Value(UNIT_NPC_FLAGS, m_uiNpcFlags);
+
+            m_uiDynamiteTimer = 8000;
+            m_uiEmoteTimer = urand(120000, 150000);
+        }
+
+        void Aggro(Unit* who) override
+        {
+            DoScriptText(SAY_ATTACK, m_creature, who);
+        }
+
+        void UpdateAI(const uint32 diff) override
+        {
+            if (!m_creature->IsInCombat())
+            {
+                if (m_uiEmoteTimer < diff)
+                {
+                    DoScriptText(SAY_TEXT, m_creature);
+                    DoScriptText(EMOTE_SHELL, m_creature);
+                    m_uiEmoteTimer = urand(120000, 150000);
+                }
+                else { m_uiEmoteTimer -= diff; }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiDynamiteTimer < diff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_DYNAMITE);
+                m_uiDynamiteTimer = 8000;
+            }
+            else { m_uiDynamiteTimer -= diff; }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        if (pCreature->GetAreaId() == AREA_COVE)    //temp spawn related to quest 9531, controlled by db script
+        {
+            pCreature->SetDefaultMovementType(IDLE_MOTION_TYPE);
+            pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            pCreature->StopMoving(true);
+            return NULL;
+        }
+        else
+            return new npc_engineer_spark_overgrindAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF)
+        {
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pCreature->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_COMBAT_STOP | TEMPFACTION_RESTORE_RESPAWN);
+            pCreature->AI()->AttackStart(pPlayer);
+        }
+        return true;
+    }
+};
+
+/*######
+## npc_injured_draenei
+######*/
+
+struct npc_injured_draenei : public CreatureScript
+{
+    npc_injured_draenei() : CreatureScript("npc_injured_draenei") {}
+
+    struct npc_injured_draeneiAI : public ScriptedAI
+    {
+        npc_injured_draeneiAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void Reset() override
+        {
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
+            m_creature->SetHealth(int(m_creature->GetMaxHealth()*.15));
+            switch (urand(0, 1))
+            {
+            case 0: m_creature->SetStandState(UNIT_STAND_STATE_SIT); break;
+            case 1: m_creature->SetStandState(UNIT_STAND_STATE_SLEEP); break;
+            }
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}          // ignore everyone around them (won't aggro anything)
+
+        void UpdateAI(const uint32 /*uiDiff*/) override {}
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_injured_draeneiAI(pCreature);
+    }
+};
+
+/*######
+## npc_magwin
+######*/
+
+enum
+{
+    SAY_START               = -1000111,
+    SAY_AGGRO               = -1000112,
+    SAY_PROGRESS            = -1000113,
+    SAY_END1                = -1000114,
+    SAY_END2                = -1000115,
+    EMOTE_HUG               = -1000116,
+
+    QUEST_A_CRY_FOR_HELP    = 9528
+};
+
+struct npc_magwin : public CreatureScript
+{
+    npc_magwin() : CreatureScript("npc_magwin") {}
+
+    struct npc_magwinAI : public npc_escortAI
+    {
+        npc_magwinAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 0:
+                DoScriptText(SAY_START, m_creature, pPlayer);
+                break;
+            case 17:
+                DoScriptText(SAY_PROGRESS, m_creature, pPlayer);
+                break;
+            case 28:
+                DoScriptText(SAY_END1, m_creature, pPlayer);
+                break;
+            case 29:
+                DoScriptText(EMOTE_HUG, m_creature, pPlayer);
+                DoScriptText(SAY_END2, m_creature, pPlayer);
+                pPlayer->GroupEventHappens(QUEST_A_CRY_FOR_HELP, m_creature);
+                break;
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature, pWho);
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_A_CRY_FOR_HELP)
+        {
+            pCreature->SetFactionTemporary(FACTION_ESCORT_A_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+
+            if (npc_magwinAI* pEscortAI = dynamic_cast<npc_magwinAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_magwinAI(pCreature);
+    }
+};
+
+void AddSC_azuremyst_isle()
+{
+    Script* s;
+
+    s = new npc_draenei_survivor();
+    s->RegisterSelf();
+    s = new npc_engineer_spark_overgrind();
+    s->RegisterSelf();
+    s = new npc_injured_draenei();
+    s->RegisterSelf();
+    s = new npc_magwin();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_draenei_survivor";
+    //pNewScript->GetAI = &GetAI_npc_draenei_survivor;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_engineer_spark_overgrind";
+    //pNewScript->GetAI = &GetAI_npc_engineer_spark_overgrind;
+    //pNewScript->pGossipHello =  &GossipHello_npc_engineer_spark_overgrind;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_engineer_spark_overgrind;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_injured_draenei";
+    //pNewScript->GetAI = &GetAI_npc_injured_draenei;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_magwin";
+    //pNewScript->GetAI = &GetAI_npc_magwinAI;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_magwin;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/blackfathom_deeps/blackfathom_deeps.cpp b/src/modules/SD3/scripts/kalimdor/blackfathom_deeps/blackfathom_deeps.cpp
new file mode 100644
index 000000000..176244649
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/blackfathom_deeps/blackfathom_deeps.cpp
@@ -0,0 +1,122 @@
+/**
+ * ScriptDev2 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2015 getMangos <https://www.getmangos.eu/>
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Blackfathom_Deeps
+ * SD%Complete: 50
+ * SDComment:   None
+ * SDCategory:  Blackfathom Deeps
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackfathom_deeps.h"
+
+/*######
+## go_fire_of_akumai
+######*/
+
+struct go_fire_of_akumai : public GameObjectScript
+{
+    go_fire_of_akumai() : GameObjectScript("go_fire_of_akumai") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        InstanceData* pInstance = pGo->GetInstanceData();
+
+        if (!pInstance)
+        {
+            return true;
+        }
+
+        if (pInstance->GetData(TYPE_SHRINE) == DONE)
+        {
+            return true;
+        }
+
+        if (pInstance->GetData(TYPE_KELRIS) == DONE)
+        {
+            pInstance->SetData(TYPE_SHRINE, IN_PROGRESS);
+            return false;
+        }
+
+        return true;
+    }
+};
+
+/*######
+## go_fathom_stone
+######*/
+
+struct go_fathom_stone : public GameObjectScript
+{
+    go_fathom_stone() : GameObjectScript("go_fathom_stone") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+#if defined (CLASSIC) || defined (TBC)
+        if (!pInstance)
+        {
+            return false;
+        }
+
+        if (pInstance->GetData(TYPE_STONE) == DONE)
+        {
+            return false;
+        }
+        else
+        {
+            pPlayer->SummonCreature(NPC_BARON_AQUANIS, -782.21f, -63.26f, -42.43f, 2.36f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000);
+        }
+
+        pInstance->SetData(TYPE_STONE, DONE);
+        return true;
+#endif
+#if defined (WOTLK) || defined (CATA)
+        if (!pInstance)
+        { return true; }
+
+        if (pInstance->GetData(TYPE_AQUANIS) == NOT_STARTED)
+        {
+            pPlayer->SummonCreature(NPC_BARON_AQUANIS, afAquanisPos[0], afAquanisPos[1], afAquanisPos[2], afAquanisPos[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+            pInstance->SetData(TYPE_AQUANIS, IN_PROGRESS);
+        }
+
+        return false;
+#endif
+    }
+};
+
+void AddSC_blackfathom_deeps()
+{
+    Script* s;
+    s = new go_fire_of_akumai();
+    s->RegisterSelf();
+    s = new go_fathom_stone();
+    s->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/blackfathom_deeps/blackfathom_deeps.h b/src/modules/SD3/scripts/kalimdor/blackfathom_deeps/blackfathom_deeps.h
new file mode 100644
index 000000000..4010eed4c
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/blackfathom_deeps/blackfathom_deeps.h
@@ -0,0 +1,85 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_BFD_H
+#define DEF_BFD_H
+
+enum
+{
+    MAX_ENCOUNTER               = 3,
+    MAX_FIRES                   = 4,
+    MAX_COUNT_POS               = 3,
+
+    TYPE_KELRIS                 = 1,
+    TYPE_SHRINE                 = 2,
+#if defined (CLASSIC) || defined (TBC)
+    TYPE_STONE                  = 3,
+#endif
+#if defined (WOTLK) || defined (CATA)
+    TYPE_AQUANIS                = 3,
+#endif
+
+    NPC_KELRIS                  = 4832,
+    NPC_BARON_AQUANIS           = 12876,
+
+    // Shrine event
+    NPC_AKUMAI_SERVANT          = 4978,
+    NPC_AKUMAI_SNAPJAW          = 4825,
+    NPC_BARBED_CRUSTACEAN       = 4823,
+    NPC_MURKSHALLOW_SOFTSHELL   = 4977,
+
+    GO_PORTAL_DOOR              = 21117,
+    GO_SHRINE_1                 = 21118,
+    GO_SHRINE_2                 = 21119,
+    GO_SHRINE_3                 = 21120,
+    GO_SHRINE_4                 = 21121,
+#if defined (WOTLK) || defined (CATA)
+    GO_FATHOM_STONE             = 177964,
+#endif
+};
+
+/* This is the spawn pattern for the event mobs
+*     D
+* 0        3
+* 1   S    4
+* 2        5
+*     E
+
+* This event spawns 4 sets of mobs
+* The order in whitch the fires are lit doesn't matter
+
+* First:    3 Snapjaws:     Positions 0, 1, 5
+* Second:   2 Servants:     Positions 1, 4
+* Third:    4 Crabs:        Positions 0, 2, 3, 4
+* Fourth:  10 Murkshallows: Positions 2*0, 1, 2*2; 3, 2*4, 2*5
+
+* On wipe the mobs don't despawn; they stay there until player returns
+*/
+
+#endif
+#if defined(WOTLK) || defined(CATA)
+static const float afAquanisPos[4] = { -782.21f, -63.26f, -42.43f, 2.36f };
+#endif
\ No newline at end of file
diff --git a/src/modules/SD3/scripts/kalimdor/blackfathom_deeps/instance_blackfathom_deeps.cpp b/src/modules/SD3/scripts/kalimdor/blackfathom_deeps/instance_blackfathom_deeps.cpp
new file mode 100644
index 000000000..aa02036d4
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/blackfathom_deeps/instance_blackfathom_deeps.cpp
@@ -0,0 +1,396 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Blackfathom_Deeps
+ * SD%Complete: 50
+ * SDComment:   Quest support: 6921
+ * SDCategory:  Blackfathom Deeps
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "blackfathom_deeps.h"
+
+/**
+ * Encounter 0 = Twilight Lord Kelris
+ * Encounter 1 = Shrine event
+ * Must kill twilight lord for shrine event to be possible
+ * Encounter 3 = Baron Aquanis
+ */
+
+struct Locations
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+static const Locations aSpawnLocations[6] =                 // Should be near the correct positions
+{
+    { -768.949f, -174.413f, -25.87f, 3.09f },                // Left side
+    { -768.888f, -164.238f, -25.87f, 3.09f },
+    { -768.951f, -153.911f, -25.88f, 3.09f },
+    { -867.782f, -174.352f, -25.87f, 6.27f },                // Right side
+    { -867.875f, -164.089f, -25.87f, 6.27f },
+    { -867.859f, -153.927f, -25.88f, 6.27f }
+};
+
+struct PosCount
+{
+    uint8 m_uiCount, m_uiSummonPosition;
+};
+
+struct SummonInformation
+{
+    uint8 m_uiWaveIndex;
+    uint32 m_uiNpcEntry;
+    PosCount m_aCountAndPos[MAX_COUNT_POS];
+};
+
+// ASSERT m_uiSummonPosition < 6 (see aSpawnLocations)
+static const SummonInformation aWaveSummonInformation[] =
+{
+    { 0, NPC_AKUMAI_SNAPJAW, { { 1, 0 }, { 1, 1 }, { 1, 5 } } },
+    { 1, NPC_AKUMAI_SERVANT, { { 1, 1 }, { 1, 4 }, { 0, 0 } } },
+    { 2, NPC_BARBED_CRUSTACEAN, { { 1, 0 }, { 1, 2 }, { 0, 0 } } },
+    { 2, NPC_BARBED_CRUSTACEAN, { { 1, 3 }, { 1, 4 }, { 0, 0 } } },
+    { 3, NPC_MURKSHALLOW_SOFTSHELL, { { 2, 0 }, { 1, 1 }, { 2, 2 } } },
+    { 3, NPC_MURKSHALLOW_SOFTSHELL, { { 1, 3 }, { 2, 4 }, { 2, 5 } } }
+};
+
+struct is_blackfathom_deeps : public InstanceScript
+{
+    is_blackfathom_deeps() : InstanceScript("instance_blackfathom_deeps") {}
+
+    class instance_blackfathom_deeps : public ScriptedInstance
+    {
+    public:
+        instance_blackfathom_deeps(Map* pMap) : ScriptedInstance(pMap),
+            m_uiWaveCounter(0)
+        {
+            Initialize();
+        }
+
+        ~instance_blackfathom_deeps() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+            memset(&m_uiSpawnMobsTimer, 0, sizeof(m_uiSpawnMobsTimer));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_KELRIS)
+            {
+                m_mNpcEntryGuidStore[NPC_KELRIS] = pCreature->GetObjectGuid();
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_PORTAL_DOOR:
+                if (m_auiEncounter[1] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+
+                m_mGoEntryGuidStore[GO_PORTAL_DOOR] = pGo->GetObjectGuid();
+                break;
+            case GO_SHRINE_1:
+            case GO_SHRINE_2:
+            case GO_SHRINE_3:
+            case GO_SHRINE_4:
+                if (m_auiEncounter[1] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+#if defined (WOTLK) || defined (CATA)
+    if (pCreature->GetEntry() == NPC_BARON_AQUANIS)
+        { SetData(TYPE_AQUANIS, DONE); }
+#endif
+        
+            // Only use this function if shrine event is in progress
+            if (m_auiEncounter[1] != IN_PROGRESS)
+            {
+                return;
+            }
+
+            switch (pCreature->GetEntry())
+            {
+            case NPC_AKUMAI_SERVANT:
+                m_lWaveMobsGuids[1].remove(pCreature->GetGUIDLow());
+                break;
+            case NPC_AKUMAI_SNAPJAW:
+                m_lWaveMobsGuids[0].remove(pCreature->GetGUIDLow());
+                break;
+            case NPC_BARBED_CRUSTACEAN:
+                m_lWaveMobsGuids[2].remove(pCreature->GetGUIDLow());
+                break;
+            case NPC_MURKSHALLOW_SOFTSHELL:
+                m_lWaveMobsGuids[3].remove(pCreature->GetGUIDLow());
+                break;
+            }
+
+            if (IsWaveEventFinished())
+            {
+                SetData(TYPE_SHRINE, DONE);
+            }
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            // Only use this function if shrine event is in progress
+            if (m_auiEncounter[1] != IN_PROGRESS)
+            {
+                return;
+            }
+
+            for (uint8 i = 0; i < MAX_FIRES; ++i)
+            {
+                if (m_uiSpawnMobsTimer[i])
+                {
+                    if (m_uiSpawnMobsTimer[i] <= uiDiff)
+                    {
+                        DoSpawnMobs(i);
+                        m_uiSpawnMobsTimer[i] = 0;
+                    }
+                    else
+                    {
+                        m_uiSpawnMobsTimer[i] -= uiDiff;
+                    }
+                }
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_KELRIS:                                   // EventAI must set instance data (1,3) at his death
+                if (m_auiEncounter[0] != DONE && uiData == DONE)
+                {
+                    m_auiEncounter[0] = uiData;
+                }
+                break;
+            case TYPE_SHRINE:
+                m_auiEncounter[1] = uiData;
+                if (uiData == IN_PROGRESS)
+                {
+                    m_uiSpawnMobsTimer[m_uiWaveCounter] = 3000;
+                    ++m_uiWaveCounter;
+                }
+                else if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_PORTAL_DOOR);
+                }
+                break;
+#if defined (CLASSIC) || defined (TBC)
+            case TYPE_STONE:
+                if (m_auiEncounter[2] != DONE && uiData == DONE)
+                {
+                    m_auiEncounter[2] = uiData;
+                }
+                break;
+#endif
+#if defined (WOTLK) || defined (CATA)
+        case TYPE_AQUANIS:
+            m_auiEncounter[2] = uiData;;
+            break;
+#endif
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2];
+
+                m_strInstData = saveStream.str();
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case TYPE_KELRIS:
+                return m_auiEncounter[0];
+            case TYPE_SHRINE:
+                return m_auiEncounter[1];
+#if defined (CLASSIC) || defined (TBC)
+            case TYPE_STONE:
+                return m_auiEncounter[2];
+#endif
+            default:
+                return 0;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        void DoSpawnMobs(uint8 uiWaveIndex)
+        {
+            Creature* pKelris = GetSingleCreatureFromStorage(NPC_KELRIS);
+            if (!pKelris)
+            {
+                return;
+            }
+
+            float fX_resp, fY_resp, fZ_resp;
+
+            pKelris->GetRespawnCoord(fX_resp, fY_resp, fZ_resp);
+
+            for (uint8 i = 0; i < countof(aWaveSummonInformation); ++i)
+            {
+                if (aWaveSummonInformation[i].m_uiWaveIndex != uiWaveIndex)
+                {
+                    continue;
+                }
+
+                // Summon mobs at positions
+                for (uint8 j = 0; j < MAX_COUNT_POS; ++j)
+                {
+                    for (uint8 k = 0; k < aWaveSummonInformation[i].m_aCountAndPos[j].m_uiCount; ++k)
+                    {
+                        uint8 uiPos = aWaveSummonInformation[i].m_aCountAndPos[j].m_uiSummonPosition;
+                        float fPosX = aSpawnLocations[uiPos].m_fX;
+                        float fPosY = aSpawnLocations[uiPos].m_fY;
+                        float fPosZ = aSpawnLocations[uiPos].m_fZ;
+                        float fPosO = aSpawnLocations[uiPos].m_fO;
+
+                        // Adapt fPosY slightly in case of higher summon-counts
+                        if (aWaveSummonInformation[i].m_aCountAndPos[j].m_uiCount > 1)
+                        {
+                            fPosY = fPosY - INTERACTION_DISTANCE / 2 + k * INTERACTION_DISTANCE / aWaveSummonInformation[i].m_aCountAndPos[j].m_uiCount;
+                        }
+
+                        if (Creature* pSummoned = pKelris->SummonCreature(aWaveSummonInformation[i].m_uiNpcEntry, fPosX, fPosY, fPosZ, fPosO, TEMPSUMMON_DEAD_DESPAWN, 0))
+                        {
+                            pSummoned->GetMotionMaster()->MovePoint(0, fX_resp, fY_resp, fZ_resp);
+                            m_lWaveMobsGuids[uiWaveIndex].push_back(pSummoned->GetGUIDLow());
+                        }
+                    }
+                }
+            }
+        }
+
+// Check if all the summoned event mobs are dead
+        bool IsWaveEventFinished()
+        {
+            // If not all fires are lighted return
+            if (m_uiWaveCounter < MAX_FIRES)
+            {
+                return false;
+            }
+
+            // Check if all mobs are dead
+            for (uint8 i = 0; i < MAX_FIRES; ++i)
+            {
+                if (!m_lWaveMobsGuids[i].empty())
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiSpawnMobsTimer[MAX_FIRES];
+        uint8 m_uiWaveCounter;
+
+        std::list<uint32> m_lWaveMobsGuids[MAX_FIRES];
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_blackfathom_deeps(pMap);
+    }
+};
+
+void AddSC_instance_blackfathom_deeps()
+{
+    Script* s;
+    s = new is_blackfathom_deeps();
+    s->RegisterSelf();
+//    s = new go_fire_of_akumai();
+//    s->RegisterSelf();
+//    s = new go_fathom_stone();
+//    s->RegisterSelf();
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_blackfathom_deeps";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_blackfathom_deeps;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_fire_of_akumai";
+    //pNewScript->pGOUse = &GOUse_go_fire_of_akumai;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_fathom_stone";
+    //pNewScript->pGOUse = &GOUse_go_fathom_stone;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/bloodmyst_isle.cpp b/src/modules/SD3/scripts/kalimdor/bloodmyst_isle.cpp
new file mode 100644
index 000000000..caefee509
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/bloodmyst_isle.cpp
@@ -0,0 +1,106 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Bloodmyst_Isle
+SD%Complete: 80
+SDComment: Quest support: 9670
+SDCategory: Bloodmyst Isle
+EndScriptData */
+
+/* ContentData
+mob_webbed_creature
+EndContentData */
+
+#include "precompiled.h"
+
+/*######
+## mob_webbed_creature
+######*/
+
+enum
+{
+    NPC_EXPEDITION_RESEARCHER       = 17681,
+};
+
+// possible creatures to be spawned (too many to be added to enum)
+const uint32 possibleSpawns[31] = {17322, 17661, 17496, 17522, 17340, 17352, 17333, 17524, 17654, 17348, 17339, 17345, 17359, 17353, 17336, 17550, 17330, 17701, 17321, 17325, 17320, 17683, 17342, 17715, 17334, 17341, 17338, 17337, 17346, 17344, 17327};
+
+struct mob_webbed_creature : public CreatureScript
+{
+    mob_webbed_creature() : CreatureScript("mob_webbed_creature") {}
+
+    struct mob_webbed_creatureAI : public Scripted_NoMovementAI
+    {
+        mob_webbed_creatureAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            uint32 uiSpawnCreatureEntry = 0;
+
+            switch (urand(0, 2))
+            {
+            case 0:
+                uiSpawnCreatureEntry = NPC_EXPEDITION_RESEARCHER;
+                if (pKiller->GetTypeId() == TYPEID_PLAYER)
+                {
+                    ((Player*)pKiller)->KilledMonsterCredit(uiSpawnCreatureEntry, m_creature->GetObjectGuid());
+                }
+                break;
+            case 1:
+            case 2:
+                uiSpawnCreatureEntry = possibleSpawns[urand(0, 30)];
+                break;
+            }
+
+            if (uiSpawnCreatureEntry)
+            {
+                m_creature->SummonCreature(uiSpawnCreatureEntry, 0.0f, 0.0f, 0.0f, m_creature->GetOrientation(), TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_webbed_creatureAI(pCreature);
+    }
+};
+
+void AddSC_bloodmyst_isle()
+{
+    Script* s;
+
+    s = new mob_webbed_creature();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_webbed_creature";
+    //pNewScript->GetAI = &GetAI_mob_webbed_creature;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/boss_azuregos.cpp b/src/modules/SD3/scripts/kalimdor/boss_azuregos.cpp
new file mode 100644
index 000000000..9d93a8879
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/boss_azuregos.cpp
@@ -0,0 +1,213 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Azuregos
+ * SD%Complete: 0
+ * SDComment:   Spell reflect requires core support. Core support is missing.
+ * SDCategory:  Azshara
+ * EndScriptData
+ */
+//TODO join this with the corresponding zone
+#include "precompiled.h"
+
+enum
+{
+    SAY_TELEPORT                = -1000100,
+
+    SPELL_ARCANE_VACUUM         = 21147,
+    SPELL_MARK_OF_FROST_PLAYER  = 23182,
+    SPELL_MARK_OF_FROST_AURA    = 23184,                    // Triggers 23186 on players that have 23182; unfortunatelly 23183 is missing from dbc
+    SPELL_MANA_STORM            = 21097,
+    SPELL_CHILL                 = 21098,
+    SPELL_FROST_BREATH          = 21099,
+    SPELL_REFLECT               = 22067,
+    SPELL_CLEAVE                = 19983,                    // Was 8255; this one is from wowhead and seems to be the correct one
+    SPELL_ENRAGE                = 23537,
+};
+
+struct boss_azuregos : public CreatureScript
+{
+    boss_azuregos() : CreatureScript("boss_azuregos") {}
+
+    struct boss_azuregosAI : public ScriptedAI
+    {
+        boss_azuregosAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiManaStormTimer;
+        uint32 m_uiChillTimer;
+        uint32 m_uiBreathTimer;
+        uint32 m_uiTeleportTimer;
+        uint32 m_uiReflectTimer;
+        uint32 m_uiCleaveTimer;
+        bool m_bEnraged;
+
+        void Reset() override
+        {
+            m_uiManaStormTimer = urand(5000, 17000);
+            m_uiChillTimer = urand(10000, 30000);
+            m_uiBreathTimer = urand(2000, 8000);
+            m_uiTeleportTimer = 30000;
+            m_uiReflectTimer = urand(15000, 30000);
+            m_uiCleaveTimer = 7000;
+            m_bEnraged = false;
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            // Mark killed players with Mark of Frost
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                pVictim->CastSpell(pVictim, SPELL_MARK_OF_FROST_PLAYER, true, NULL, NULL, m_creature->GetObjectGuid());
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            // Boss aura which triggers the stun effect on dead players who resurrect
+            DoCastSpellIfCan(m_creature, SPELL_MARK_OF_FROST_AURA);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiTeleportTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_VACUUM) == CAST_OK)
+                {
+                    DoScriptText(SAY_TELEPORT, m_creature);
+                    m_uiTeleportTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiTeleportTimer -= uiDiff;
+            }
+
+            // Chill Timer
+            if (m_uiChillTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CHILL) == CAST_OK)
+                {
+                    m_uiChillTimer = urand(13000, 25000);
+                }
+            }
+            else
+            {
+                m_uiChillTimer -= uiDiff;
+            }
+
+            // Breath Timer
+            if (m_uiBreathTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FROST_BREATH) == CAST_OK)
+                {
+                    m_uiBreathTimer = urand(10000, 15000);
+                }
+            }
+            else
+            {
+                m_uiBreathTimer -= uiDiff;
+            }
+
+            // Mana Storm Timer
+            if (m_uiManaStormTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_MANA_STORM) == CAST_OK)
+                    {
+                        m_uiManaStormTimer = urand(7500, 12500);
+                    }
+                }
+            }
+            else
+            {
+                m_uiManaStormTimer -= uiDiff;
+            }
+
+            // Reflect Timer
+            if (m_uiReflectTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_REFLECT) == CAST_OK)
+                {
+                    m_uiReflectTimer = urand(20000, 35000);
+                }
+            }
+            else
+            {
+                m_uiReflectTimer -= uiDiff;
+            }
+
+            // Cleave Timer
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                {
+                    m_uiCleaveTimer = 7000;
+                }
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            // EnrageTimer
+            if (!m_bEnraged && m_creature->GetHealthPercent() < 26.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                {
+                    m_bEnraged = true;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_azuregosAI(pCreature);
+    }
+};
+
+void AddSC_boss_azuregos()
+{
+    Script* s;
+    s = new boss_azuregos();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_azuregos";
+    //pNewScript->GetAI = &GetAI_boss_azuregos;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp b/src/modules/SD3/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp
new file mode 100644
index 000000000..8cc84320e
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp
@@ -0,0 +1,957 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: culling_of_stratholme
+SD%Complete: 80%
+SDComment: Zombies spawns partially implemented
+SDCategory: Culling of Stratholme
+EndScriptData */
+
+#include "precompiled.h"
+#include "culling_of_stratholme.h"
+#include "escort_ai.h"
+
+/* *************
+** npc_chromie (gossip, quest-accept)
+************* */
+
+enum
+{
+    QUEST_DISPELLING_ILLUSIONS  = 13149,
+    QUEST_A_ROYAL_ESCORT        = 13151,
+
+    ITEM_ARCANE_DISRUPTOR       = 37888,
+
+    GOSSIP_ITEM_ENTRANCE_1      = -3595000,
+    GOSSIP_ITEM_ENTRANCE_2      = -3595001,
+    GOSSIP_ITEM_ENTRANCE_3      = -3595002,
+
+    TEXT_ID_ENTRANCE_1          = 12992,
+    TEXT_ID_ENTRANCE_2          = 12993,
+    TEXT_ID_ENTRANCE_3          = 12994,
+    TEXT_ID_ENTRANCE_4          = 12995,
+
+    GOSSIP_ITEM_INN_1           = -3595003,
+    GOSSIP_ITEM_INN_2           = -3595004,
+    GOSSIP_ITEM_INN_3           = -3595005,
+    GOSSIP_ITEM_INN_SKIP        = -3595006,                 // used to skip the intro; requires research
+    GOSSIP_ITEM_INN_TELEPORT    = -3595007,                 // teleport to stratholme - used after the main event has started
+
+    TEXT_ID_INN_1               = 12939,
+    TEXT_ID_INN_2               = 12949,
+    TEXT_ID_INN_3               = 12950,
+    TEXT_ID_INN_4               = 12952,
+    TEXT_ID_INN_TELEPORT        = 13470,
+    
+    SPELL_TELEPORT_COT_P4       = 53435,                    // triggers 53436
+};
+
+struct npc_chromie : public CreatureScript
+{
+    npc_chromie() : CreatureScript("npc_chromie") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+
+        if (InstanceData* m_pInstance = pCreature->GetInstanceData())
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_CHROMIE_INN:
+                if (m_pInstance->GetData(TYPE_GRAIN_EVENT) != DONE)
+                {
+                    if (pPlayer->GetQuestRewardStatus(QUEST_DISPELLING_ILLUSIONS) && !pPlayer->HasItemCount(ITEM_ARCANE_DISRUPTOR, 1))
+                        pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_INN_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                }
+                // intro skip option is available since 3.3.x
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_INN_SKIP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_INN_1, pCreature->GetObjectGuid());
+                break;
+            case NPC_CHROMIE_ENTRANCE:
+                if (m_pInstance->GetData(TYPE_GRAIN_EVENT) == DONE && m_pInstance->GetData(TYPE_ARTHAS_INTRO_EVENT) == NOT_STARTED && pPlayer->GetQuestRewardStatus(QUEST_A_ROYAL_ESCORT))
+                    pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ENTRANCE_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_ENTRANCE_1, pCreature->GetObjectGuid());
+                break;
+            }
+        }
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*sender*/, uint32 uiAction) override
+    {
+        switch (pCreature->GetEntry())
+        {
+        case NPC_CHROMIE_INN:
+            switch (uiAction)
+            {
+            case GOSSIP_ACTION_INFO_DEF + 1:
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_INN_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_INN_2, pCreature->GetObjectGuid());
+                break;
+            case GOSSIP_ACTION_INFO_DEF + 2:
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_INN_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_INN_3, pCreature->GetObjectGuid());
+                break;
+            case GOSSIP_ACTION_INFO_DEF + 3:
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_INN_4, pCreature->GetObjectGuid());
+                if (!pPlayer->HasItemCount(ITEM_ARCANE_DISRUPTOR, 1))
+                {
+                    if (Item* pItem = pPlayer->StoreNewItemInInventorySlot(ITEM_ARCANE_DISRUPTOR, 1))
+                    {
+                        pPlayer->SendNewItem(pItem, 1, true, false);
+                        if (InstanceData* pInstance = pCreature->GetInstanceData())
+                        {
+                            if (pInstance->GetData(TYPE_GRAIN_EVENT) == NOT_STARTED)
+                                pInstance->SetData(TYPE_GRAIN_EVENT, SPECIAL);
+                        }
+                    }
+                }
+                break;
+            case GOSSIP_ACTION_INFO_DEF + 4:
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_INN_TELEPORT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_INN_TELEPORT, pCreature->GetObjectGuid());
+                break;
+            case GOSSIP_ACTION_INFO_DEF + 5:
+                pCreature->CastSpell(pPlayer, SPELL_TELEPORT_COT_P4, true);
+                if (InstanceData* pInstance = pCreature->GetInstanceData())
+                {
+                    // only skip intro if not already started;
+                    if (pInstance->GetData(TYPE_ARTHAS_INTRO_EVENT) == NOT_STARTED && pInstance->GetData(TYPE_GRAIN_EVENT) == NOT_STARTED)
+                    {
+                        pInstance->SetData(TYPE_ARTHAS_INTRO_EVENT, DONE);
+                        pInstance->SetData(TYPE_GRAIN_EVENT, DONE);
+
+                        // spawn Arthas and Chromie
+                        pInstance->SetData64(TYPE_DATA64_PLAYER_BOTH, pPlayer->GetObjectGuid().GetRawValue());
+                    }
+                }
+                pPlayer->CLOSE_GOSSIP_MENU();
+                break;
+            }
+            break;
+        case NPC_CHROMIE_ENTRANCE:
+            switch (uiAction)
+            {
+            case GOSSIP_ACTION_INFO_DEF + 1:
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ENTRANCE_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_ENTRANCE_2, pCreature->GetObjectGuid());
+                break;
+            case GOSSIP_ACTION_INFO_DEF + 2:
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ENTRANCE_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_ENTRANCE_3, pCreature->GetObjectGuid());
+                break;
+            case GOSSIP_ACTION_INFO_DEF + 3:
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_ENTRANCE_4, pCreature->GetObjectGuid());
+                if (InstanceData* pInstance = pCreature->GetInstanceData())
+                {
+                    if (pInstance->GetData(TYPE_ARTHAS_INTRO_EVENT) == NOT_STARTED)
+                    {
+                        pInstance->SetData(TYPE_ARTHAS_INTRO_EVENT, IN_PROGRESS);
+                        pInstance->SetData64(TYPE_DATA64_PLAYER_ARTHAS, pPlayer->GetObjectGuid().GetRawValue());
+                    }
+                }
+                break;
+            }
+            break;
+        }
+        return true;
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        switch (pQuest->GetQuestId())
+        {
+        case QUEST_DISPELLING_ILLUSIONS:
+            if (InstanceData* pInstance = pCreature->GetInstanceData())
+            {
+                if (pInstance->GetData(TYPE_GRAIN_EVENT) == NOT_STARTED)
+                    pInstance->SetData(TYPE_GRAIN_EVENT, SPECIAL);
+            }
+            break;
+        case QUEST_A_ROYAL_ESCORT:
+            if (InstanceData* pInstance = pCreature->GetInstanceData())
+            {
+                if (pInstance->GetData(TYPE_ARTHAS_INTRO_EVENT) == NOT_STARTED)
+                {
+                    pInstance->SetData(TYPE_ARTHAS_INTRO_EVENT, IN_PROGRESS);
+                    pInstance->SetData64(TYPE_DATA64_PLAYER_ARTHAS, pPlayer->GetObjectGuid().GetRawValue());
+                }
+            }
+            break;
+        }
+        return true;
+    }
+};
+
+/* *************
+** npc_crates_bunny (spell aura effect dummy)
+************* */
+
+struct aura_cos_arcane_disruption : public AuraScript
+{
+    aura_cos_arcane_disruption() : AuraScript("aura_cos_arcane_disruption") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() == SPELL_ARCANE_DISRUPTION && pAura->GetEffIndex() == EFFECT_INDEX_0 && bApply)
+        {
+            if (Creature* pTarget = (Creature*)pAura->GetTarget())
+            {
+                if (pTarget->GetEntry() != NPC_GRAIN_CRATE_HELPER)
+                    return true;
+
+                if (InstanceData* pInstance = pTarget->GetInstanceData())
+                    pInstance->SetData64(TYPE_DATA64_AD_TARGET, pTarget->GetObjectGuid().GetRawValue());
+            }
+        }
+        return true;
+    }
+};
+
+/* *************
+** npc_arthas
+************* */
+
+enum
+{
+    // texts
+    SAY_ARTHAS_FOLLOW           = -1595009,
+    SAY_CITIZEN_ARRIVED         = -1595010,
+    SAY_ARTHAS_BEFORE_PLAGUE    = -1595011,
+    SAY_ARTHAS_SORCERY          = -1595012,
+    SAY_CITIZEN_NO_UNDERSTAD    = -1595013,
+    SAY_ARTHAS_MORE_SCOURGE     = -1595014,
+    SAY_ARTHAS_MORE_SORCERY     = -1595015,
+    SAY_ARTHAS_MOVE_ON          = -1595016,
+    SAY_ARTHAS_WATCH_BACK       = -1595017,
+    SAY_ARTHAS_NOT_EASY         = -1595018,
+    SAY_ARTHAS_PERSISTENT       = -1595019,
+    SAY_ARTHAS_WHAT_ELSE        = -1595020,
+    SAY_EPOCH_DARKNESS          = -1595021,
+    SAY_ARTHAS_DO_WHAT_MUST     = -1595022,
+
+    SAY_ARTHAS_QUICK_PATH       = -1595023,
+    SAY_ARTHAS_TAKE_A_MOMENT    = -1595024,
+    SAY_ARTHAS_PASSAGE          = -1595025,
+
+    SAY_ARTHAS_MOVE_QUICKLY     = -1595026,
+    SAY_ARTHAS_REST             = -1595027,
+    SAY_ARTHAS_REST_COMPLETE    = -1595028,
+    SAY_ARTHAS_CRUSADER_SQUARE  = -1595029,
+
+    SAY_ARTHAS_JUSTICE_DONE     = -1595030,
+    SAY_ARTHAS_MALGANIS         = -1595031,
+    SAY_MALGANIS_JOURNEY        = -1595032,
+    SAY_ARTHAS_HUNT_MALGANIS    = -1595033,             // play music 14951
+    SAY_ARTHAS_EVENT_COMPLETE   = -1595034,
+
+    SAY_ARTHAS_HALF_HP          = -1595035,
+    SAY_ARTHAS_LOW_HP           = -1595036,
+    SAY_ARTHAS_SLAY_1           = -1595037,
+    SAY_ARTHAS_SLAY_2           = -1595038,
+    SAY_ARTHAS_SLAY_3           = -1595039,
+    SAY_ARTHAS_DEATH            = -1595040,
+
+    MUSIC_ID_EVENT_COMPLETE     = 14951,
+    
+    // gossips
+    GOSSIP_ITEM_CITY_GATES      = -3595008,
+    GOSSIP_ITEM_TOWN_HALL_1     = -3595009,
+    GOSSIP_ITEM_TOWN_HALL_2     = -3595010,
+    GOSSIP_ITEM_EPOCH           = -3595011,
+    GOSSIP_ITEM_ESCORT          = -3595012,
+    GOSSIP_ITEM_DREADLORD       = -3595013,
+
+    TEXT_ID_CITY_GATES          = 13076,
+    TEXT_ID_TOWN_HALL_1         = 13125,
+    TEXT_ID_TOWN_HALL_2         = 13126,
+    TEXT_ID_EPOCH               = 13177,
+    TEXT_ID_ESCORT              = 13179,
+    TEXT_ID_DREADLORD           = 13287,
+
+    // spells
+    SPELL_HOLY_LIGHT            = 52444,
+    SPELL_EXORCISM              = 52445,
+    SPELL_EXORCISM_H            = 58822,
+    SPELL_DEVOTION_AURA         = 52442,
+    SPELL_CRUSADER_STRIKE       = 50773,                // dummy used on citizens
+    
+    SPELL_MALGANIS_KILL_CREDIT  = 58124,
+    SPELL_MALGANIS_ACHIEVEMENT  = 58630,                // server side spell
+
+    SPELL_TRANSFORM             = 33133,
+    SPELL_SHADOWSTEP_COSMETIC   = 51908,
+
+    // FACTION_ARTHAS_1         = 2076,                 // default faction
+    FACTION_ARTHAS_2            = 2077,                 // burning city
+    // FACTION_ARTHAS_3         = 2079,                 // use unk
+
+    POINT_ID_INTRO_COMPLETE     = 31,                   // intro completion WP - handled by dbscript
+    POINT_ID_ESCORT_CITY        = 47,                   // escort point before burning city
+    POINT_ID_MARKET_ROW         = 70,                   // escort point before Malganis
+};
+
+static const DialogueEntry aArthasDialogue[] =
+{
+    {NPC_TOWNHALL_CITIZEN,      0,              2000},
+    {TEXT_ID_TOWN_HALL_1,       0,              0},
+    // transform citizens
+    {SPELL_CRUSADER_STRIKE,     0,              2000},
+    {NPC_TOWNHALL_RESIDENT,     0,              1000},
+    {SAY_ARTHAS_SORCERY,        NPC_ARTHAS,     3000},
+    {TEXT_ID_TOWN_HALL_2,       0,              1000},
+    {NPC_INFINITE_HUNTER,       0,              1000},
+    {NPC_INFINITE_AGENT,        0,              1000},
+    {NPC_INFINITE_ADVERSARY,    0,              0},
+    // start Epoch fight
+    {SAY_ARTHAS_WHAT_ELSE,      NPC_ARTHAS,     5000},
+    {SAY_EPOCH_DARKNESS,        NPC_LORD_EPOCH, 13000},
+    {SAY_ARTHAS_DO_WHAT_MUST,   NPC_ARTHAS,     5000},
+    {NPC_ARTHAS,                0,              2000},
+    {NPC_LORD_EPOCH,            0,              0},
+    // open bookcase door
+    {SAY_ARTHAS_TAKE_A_MOMENT,  NPC_ARTHAS,     2000},
+    {GO_DOOR_BOOKCASE,          0,              0},
+    // reach crusader square
+    {SAY_ARTHAS_CRUSADER_SQUARE, NPC_ARTHAS,    10000},
+    {SPELL_TRANSFORM,           0,              0},
+    // start Malganis fight
+    {SAY_ARTHAS_MALGANIS,       NPC_ARTHAS,     5000},
+    {NPC_MALGANIS,              0,              0},
+    // Malganis epilog
+    {SAY_MALGANIS_JOURNEY,      NPC_MALGANIS,   18000},
+    {SAY_ARTHAS_HUNT_MALGANIS,  NPC_ARTHAS,     5000},
+    {TEXT_ID_DREADLORD,         0,              2000},
+    {SAY_ARTHAS_EVENT_COMPLETE, NPC_ARTHAS,     0},
+    {0, 0, 0},
+};
+
+struct npc_arthas : public CreatureScript
+{
+    npc_arthas() : CreatureScript("npc_arthas") {}
+
+    struct  npc_arthasAI : public npc_escortAI, private DialogueHelper
+    {
+        npc_arthasAI(Creature* pCreature) : npc_escortAI(pCreature),
+        DialogueHelper(aArthasDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bIsRegularMode;
+
+        bool m_bYell50Pct;
+        bool m_bYell20Pct;
+
+        uint32 m_uiHolyLightTimer;
+        uint32 m_uiExorcismTimer;
+
+        ObjectGuid m_firstCitizenGuid;
+        ObjectGuid m_secondCitizenGuid;
+        ObjectGuid m_thirdCitizenGuid;
+
+        GuidList m_lSummonedGuidsList;
+
+        void Reset() override
+        {
+            m_uiExorcismTimer = urand(5000, 10000);
+            m_uiHolyLightTimer = urand(5000, 10000);
+            m_bYell50Pct = false;
+            m_bYell20Pct = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_DEVOTION_AURA);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_ARTHAS_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_ARTHAS_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_ARTHAS_SLAY_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_ARTHAS_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ARTHAS_ESCORT_EVENT, FAIL);
+        }
+
+    void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 uiMiscValue) override
+    {
+        // on Malganis encounter finished -> evade
+        if (pSender->GetEntry() == NPC_MALGANIS && eventType == AI_EVENT_CUSTOM_EVENTAI_B)
+        {
+            EnterEvadeMode();
+            SetEscortPaused(false);
+            return;
+        }
+
+        if (pInvoker->GetTypeId() != TYPEID_PLAYER)
+            return;
+
+        if (eventType == AI_EVENT_START_ESCORT)
+        {
+            DoScriptText(SAY_ARTHAS_FOLLOW, m_creature);
+            Start(true, (Player*)pInvoker);
+        }
+        else if (eventType == AI_EVENT_CUSTOM_A)
+        {
+            DoScriptText(SAY_ARTHAS_QUICK_PATH, m_creature);
+            SetEscortPaused(false);
+        }
+        else if (eventType == AI_EVENT_START_ESCORT_B)
+        {
+            // start and set WP
+            Start(true, (Player*)pInvoker);
+            SetEscortPaused(true);
+            SetCurrentWaypoint(POINT_ID_ESCORT_CITY);
+            SetEscortPaused(false);
+
+            DoScriptText(SAY_ARTHAS_MOVE_QUICKLY, m_creature);
+            m_creature->SetFactionTemporary(FACTION_ARTHAS_2, TEMPFACTION_RESTORE_REACH_HOME);
+
+            if (m_pInstance)
+                {
+                    m_pInstance->SetData64(TYPE_DATA64_SPAWNING, m_creature->GetObjectGuid().GetRawValue());
+                }
+            }
+            else if (eventType == AI_EVENT_CUSTOM_B)
+            {
+                // resume escort or start on point if start from reset
+                if (HasEscortState(STATE_ESCORT_PAUSED))
+                    SetEscortPaused(false);
+                else
+                {
+                    Start(true, (Player*)pInvoker);
+                    SetEscortPaused(true);
+                    SetCurrentWaypoint(POINT_ID_MARKET_ROW);
+                    SetEscortPaused(false);
+                }
+
+                DoScriptText(SAY_ARTHAS_JUSTICE_DONE, m_creature);
+                m_creature->SetFactionTemporary(FACTION_ARTHAS_2, TEMPFACTION_RESTORE_REACH_HOME);
+
+                // spawn Malganis if required
+                if (m_pInstance && !m_pInstance->GetSingleCreatureFromStorage(NPC_MALGANIS, true))
+                    m_creature->SummonCreature(NPC_MALGANIS, 2296.862F, 1501.015F, 128.445F, 5.13f, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+    void MovementInform(uint32 uiType, uint32 uiPointId) override
+    {
+        if (uiType == WAYPOINT_MOTION_TYPE)
+        {
+            // set the intro event as done and start the undead waves
+            if (uiPointId == POINT_ID_INTRO_COMPLETE && m_pInstance)
+                m_pInstance->SetData(TYPE_ARTHAS_INTRO_EVENT, DONE);
+        }
+        else
+            npc_escortAI::MovementInform(uiType, uiPointId);
+    }
+    
+    void JustSummoned(Creature* pSummoned) override
+    {
+        switch (pSummoned->GetEntry())
+        {
+            case NPC_INFINITE_ADVERSARY:
+            case NPC_INFINITE_AGENT:
+            case NPC_INFINITE_HUNTER:
+                pSummoned->AI()->AttackStart(m_creature);
+                // no break;
+            case NPC_TOWNHALL_CITIZEN:
+            case NPC_TOWNHALL_RESIDENT:
+                m_lSummonedGuidsList.push_back(pSummoned->GetObjectGuid());
+                break;
+            case NPC_LORD_EPOCH:
+                pSummoned->GetMotionMaster()->MovePoint(0, 2450.874f, 1113.122f, 149.008f);
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_INFINITE_ADVERSARY:
+            case NPC_INFINITE_AGENT:
+            case NPC_INFINITE_HUNTER:
+                m_lSummonedGuidsList.remove(pSummoned->GetObjectGuid());
+
+                if (m_lSummonedGuidsList.empty())
+                    SetEscortPaused(false);
+                break;
+            case NPC_LORD_EPOCH:
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                break;
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+                // spawn citizens - ground floor
+            case 1:
+                if (Creature* pCitizen = m_creature->SummonCreature(NPC_TOWNHALL_CITIZEN, 2401.265f, 1202.789f, 134.103f, 1.466f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000))
+                    m_firstCitizenGuid = pCitizen->GetObjectGuid();
+                if (Creature* pCitizen = m_creature->SummonCreature(NPC_TOWNHALL_RESIDENT, 2402.654f, 1205.786f, 134.122f, 2.89f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000))
+                    m_secondCitizenGuid = pCitizen->GetObjectGuid();
+                if (Creature* pCitizen = m_creature->SummonCreature(NPC_TOWNHALL_CITIZEN, 2398.715f, 1207.334f, 134.122f, 5.27f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000))
+                    m_thirdCitizenGuid = pCitizen->GetObjectGuid();
+                break;
+            case 3:
+                StartNextDialogueText(NPC_TOWNHALL_CITIZEN);
+                break;
+            case 4:
+                DoScriptText(SAY_ARTHAS_BEFORE_PLAGUE, m_creature);
+                SetRun(false);
+                break;
+            case 5:
+                SetEscortPaused(true);
+                StartNextDialogueText(SPELL_CRUSADER_STRIKE);
+                break;
+            case 6:
+                m_creature->SetFacingTo(0.30f);
+                break;
+            case 7:
+                DoScriptText(SAY_ARTHAS_MORE_SCOURGE, m_creature);
+                SetRun();
+                break;
+
+                // spawn second wave - on the first floor
+            case 13:
+                DoScriptText(SAY_ARTHAS_MORE_SORCERY, m_creature);
+                SetRun(false);
+                m_creature->SummonCreature(NPC_TIME_RIFT, 2433.357f, 1192.168f, 148.159f, 3.00f, TEMPSUMMON_TIMED_DESPAWN, 5000);
+                break;
+            case 14:
+                m_creature->SummonCreature(NPC_INFINITE_AGENT, 2433.041f, 1191.158f, 148.128f, 4.99f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_INFINITE_HUNTER, 2433.176f, 1193.429f, 148.114f, 1.21f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_INFINITE_AGENT, 2433.396f, 1192.912f, 148.123f, 0.04f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_INFINITE_ADVERSARY, 2433.626f, 1192.069f, 148.117f, 5.48f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                SetEscortPaused(true);
+                break;
+            case 15:
+                m_creature->SetFacingTo(2.94f);
+                break;
+            case 16:
+                DoScriptText(SAY_ARTHAS_MOVE_ON, m_creature);
+                SetRun();
+                break;
+
+                // spawn third wave - ambush
+            case 21:
+                DoScriptText(SAY_ARTHAS_WATCH_BACK, m_creature);
+
+                m_creature->SummonCreature(NPC_INFINITE_HUNTER, 2404.375f, 1179.395f, 148.138f, 5.14f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_INFINITE_AGENT, 2403.785f, 1179.004f, 148.138f, 4.58f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_INFINITE_HUNTER, 2413.933f, 1136.93f, 148.111f, 2.40f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_INFINITE_ADVERSARY, 2414.964f, 1136.857f, 148.088f, 0.90f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_TIME_RIFT, 2404.311f, 1178.306f, 148.158f, 1.60f, TEMPSUMMON_TIMED_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_TIME_RIFT, 2414.041f, 1136.068f, 148.159f, 2.23f, TEMPSUMMON_TIMED_DESPAWN, 5000);
+                SetEscortPaused(true);
+                break;
+            case 22:
+                m_creature->SetFacingTo(1.85f);
+                break;
+            case 23:
+                DoScriptText(SAY_ARTHAS_NOT_EASY, m_creature);
+                break;
+
+                // spawn forth wave - main hall
+            case 26:
+                DoScriptText(SAY_ARTHAS_PERSISTENT, m_creature);
+
+                m_creature->SummonCreature(NPC_INFINITE_HUNTER, 2431.417f, 1105.167f, 148.075f, 1.26f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_INFINITE_AGENT, 2438.808f, 1113.769f, 148.075f, 3.11f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_INFINITE_ADVERSARY, 2440.917f, 1116.085f, 148.080f, 2.18f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_INFINITE_ADVERSARY, 2428.905f, 1102.929f, 148.125f, 1.97f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_TIME_RIFT, 2429.296f, 1102.007f, 148.159f, 6.21f, TEMPSUMMON_TIMED_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_TIME_RIFT, 2440.057f, 1114.226f, 148.159f, 6.10f, TEMPSUMMON_TIMED_DESPAWN, 5000);
+                SetEscortPaused(true);
+                break;
+            case 27:
+                m_creature->SetFacingTo(5.98f);
+                break;
+            case 28:
+                StartNextDialogueText(SAY_ARTHAS_WHAT_ELSE);
+                SetEscortPaused(true);
+                break;
+
+                // open passage
+            case 32:
+                StartNextDialogueText(SAY_ARTHAS_TAKE_A_MOMENT);
+                break;
+            case 33:
+                DoScriptText(SAY_ARTHAS_PASSAGE, m_creature);
+                break;
+
+                // townhall escort complete
+            case 46:
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_ARTHAS_TOWNHALL_EVENT, DONE);
+                break;
+
+                // burning stratholme
+            case 57:
+                DoScriptText(SAY_ARTHAS_REST, m_creature);
+                m_creature->SetFacingTo(5.04f);
+                break;
+            case 58:
+                DoScriptText(SAY_ARTHAS_REST_COMPLETE, m_creature);
+                break;
+            case 69:
+                StartNextDialogueText(SAY_ARTHAS_CRUSADER_SQUARE);
+                SetEscortPaused(true);
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_ARTHAS_ESCORT_EVENT, DONE);
+                break;
+
+                // malganis fight
+            case 74:
+                StartNextDialogueText(SAY_ARTHAS_MALGANIS);
+                SetEscortPaused(true);
+                break;
+
+                // event epilog
+            case 75:
+                StartNextDialogueText(SAY_MALGANIS_JOURNEY);
+                break;
+            case 76:
+                SetRun(false);
+                break;
+        }
+    }
+    
+    void JustDidDialogueStep(int32 iEntry) override
+    {
+        switch (iEntry)
+        {
+                // townhall entrance dialogue
+            case NPC_TOWNHALL_CITIZEN:
+                if (Creature* pCitizen = m_creature->GetMap()->GetCreature(m_firstCitizenGuid))
+                    pCitizen->SetFacingToObject(m_creature);
+                if (Creature* pCitizen = m_creature->GetMap()->GetCreature(m_secondCitizenGuid))
+                    pCitizen->SetFacingToObject(m_creature);
+                if (Creature* pCitizen = m_creature->GetMap()->GetCreature(m_thirdCitizenGuid))
+                    pCitizen->SetFacingToObject(m_creature);
+                break;
+            case TEXT_ID_TOWN_HALL_1:
+                if (Creature* pCitizen = m_creature->GetMap()->GetCreature(m_thirdCitizenGuid))
+                    DoScriptText(SAY_CITIZEN_ARRIVED, pCitizen);
+                break;
+            case SPELL_CRUSADER_STRIKE:
+                if (Creature* pCitizen = m_creature->GetMap()->GetCreature(m_thirdCitizenGuid))
+                    DoCastSpellIfCan(pCitizen, SPELL_CRUSADER_STRIKE);
+                break;
+            case NPC_TOWNHALL_RESIDENT:
+                if (Creature* pCitizen = m_creature->GetMap()->GetCreature(m_thirdCitizenGuid))
+                    pCitizen->HandleEmote(EMOTE_ONESHOT_LAUGH);
+                break;
+            case TEXT_ID_TOWN_HALL_2:
+                if (Creature* pCitizen = m_creature->GetMap()->GetCreature(m_thirdCitizenGuid))
+                    DoScriptText(SAY_CITIZEN_NO_UNDERSTAD, pCitizen);
+                break;
+            case NPC_INFINITE_HUNTER:
+                if (Creature* pCitizen = m_creature->GetMap()->GetCreature(m_firstCitizenGuid))
+                {
+                    pCitizen->CastSpell(pCitizen, SPELL_TRANSFORM, true);
+                    pCitizen->UpdateEntry(NPC_INFINITE_HUNTER);
+                }
+                break;
+            case NPC_INFINITE_AGENT:
+                if (Creature* pCitizen = m_creature->GetMap()->GetCreature(m_secondCitizenGuid))
+                {
+                    pCitizen->CastSpell(pCitizen, SPELL_TRANSFORM, true);
+                    pCitizen->UpdateEntry(NPC_INFINITE_AGENT);
+                }
+                break;
+            case NPC_INFINITE_ADVERSARY:
+                if (Creature* pCitizen = m_creature->GetMap()->GetCreature(m_thirdCitizenGuid))
+                {
+                    pCitizen->CastSpell(pCitizen, SPELL_TRANSFORM, true);
+                    pCitizen->UpdateEntry(NPC_INFINITE_ADVERSARY);
+                }
+                break;
+
+                // epoch event dialogue
+            case SAY_ARTHAS_WHAT_ELSE:
+                m_creature->SummonCreature(NPC_LORD_EPOCH, 2456.396f, 1113.969f, 150.032f, 3.15f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_TIME_RIFT_BIG, 2456.058f, 1113.838f, 150.091f, 1.74f, TEMPSUMMON_TIMED_DESPAWN, 5000);
+                break;
+            case NPC_ARTHAS:
+                m_creature->HandleEmote(EMOTE_ONESHOT_POINT_NOSHEATHE);
+                break;
+            case NPC_LORD_EPOCH:
+                if (!m_pInstance)
+                    return;
+
+                if (Creature* pEpoch = m_pInstance->GetSingleCreatureFromStorage(NPC_LORD_EPOCH))
+                {
+                    pEpoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                    pEpoch->AI()->AttackStart(m_creature);
+                }
+                break;
+
+                // bookcase passage delay
+            case GO_DOOR_BOOKCASE:
+                if (m_pInstance)
+                    m_pInstance->DoUseDoorOrButton(GO_DOOR_BOOKCASE);
+                break;
+
+                // burning city complete delay
+            case SPELL_TRANSFORM:
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                break;
+
+                // malganis attack
+            case NPC_MALGANIS:
+                if (!m_pInstance)
+                    return;
+
+                if (Creature* pMalganis = m_pInstance->GetSingleCreatureFromStorage(NPC_MALGANIS))
+                {
+                    pMalganis->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                    pMalganis->AI()->AttackStart(m_creature);
+                }
+                break;
+
+                // malganis event complete
+            case SAY_ARTHAS_HUNT_MALGANIS:
+                m_creature->PlayMusic(MUSIC_ID_EVENT_COMPLETE);
+
+                if (!m_pInstance)
+                    return;
+
+                if (Creature* pMalganis = m_pInstance->GetSingleCreatureFromStorage(NPC_MALGANIS))
+                {
+                    pMalganis->CastSpell(pMalganis, SPELL_SHADOWSTEP_COSMETIC, true);
+                    pMalganis->CastSpell(pMalganis, SPELL_MALGANIS_ACHIEVEMENT, true);
+                    pMalganis->ForcedDespawn(1000);
+                }
+                break;
+            case TEXT_ID_DREADLORD:
+                m_creature->HandleEmote(EMOTE_ONESHOT_EXCLAMATION);
+                break;
+            case SAY_ARTHAS_EVENT_COMPLETE:
+                m_creature->SetFacingTo(5.13f);
+                DoCastSpellIfCan(m_creature, SPELL_MALGANIS_KILL_CREDIT, CAST_TRIGGERED);
+
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_MALGANIS_EVENT, DONE);
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiExorcismTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_EXORCISM : SPELL_EXORCISM_H) == CAST_OK)
+                    m_uiExorcismTimer = urand(9000, 13000);
+            }
+            else
+                m_uiExorcismTimer -= uiDiff;
+
+            if (m_uiHolyLightTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(40.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_HOLY_LIGHT) == CAST_OK)
+                        m_uiHolyLightTimer = urand(18000, 25000);
+                }
+            }
+            else
+                m_uiHolyLightTimer -= uiDiff;
+
+            if (!m_bYell50Pct && m_creature->GetHealthPercent() < 50.0f)
+            {
+                DoScriptText(SAY_ARTHAS_HALF_HP, m_creature);
+                m_bYell50Pct = true;
+            }
+
+            if (!m_bYell20Pct && m_creature->GetHealthPercent() < 20.0f)
+            {
+                DoScriptText(SAY_ARTHAS_LOW_HP, m_creature);
+                m_bYell20Pct = true;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_arthasAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (InstanceData* pInstance = pCreature->GetInstanceData())
+        {
+            // city gate gossip
+            if (pInstance->GetData(TYPE_ARTHAS_INTRO_EVENT) == IN_PROGRESS)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CITY_GATES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_CITY_GATES, pCreature->GetObjectGuid());
+            }
+            // town hall entrance gossip
+            else if (pInstance->GetData(TYPE_SALRAMM_EVENT) == DONE && pInstance->GetData(TYPE_EPOCH_EVENT) != DONE)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TOWN_HALL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_TOWN_HALL_1, pCreature->GetObjectGuid());
+            }
+            // town hall epoch gossip
+            else if (pInstance->GetData(TYPE_EPOCH_EVENT) == DONE && pInstance->GetData(TYPE_ARTHAS_TOWNHALL_EVENT) != DONE)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_EPOCH, pCreature->GetObjectGuid());
+            }
+            // burning city gossip
+            else if (pInstance->GetData(TYPE_ARTHAS_TOWNHALL_EVENT) == DONE && pInstance->GetData(TYPE_ARTHAS_ESCORT_EVENT) != DONE)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ESCORT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_ESCORT, pCreature->GetObjectGuid());
+            }
+            // crusader square gossip
+            else if (pInstance->GetData(TYPE_ARTHAS_ESCORT_EVENT) == DONE && pInstance->GetData(TYPE_MALGANIS_EVENT) != DONE)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DREADLORD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_DREADLORD, pCreature->GetObjectGuid());
+            }
+        }
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*sender*/, uint32 uiAction) override
+    {
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:                      // resume WP movement - rest is handled by DB
+            pCreature->clearUnitState(UNIT_STAT_WAYPOINT_PAUSED);
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TOWN_HALL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_TOWN_HALL_2, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 3:                      // start initial town hall escort event
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature);
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 4:                      // continue escort after Epoch
+            pCreature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pPlayer, pCreature);
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 5:                      // start burning city event
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT_B, pPlayer, pCreature);
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 6:                      // start Malganis event
+            pCreature->AI()->SendAIEvent(AI_EVENT_CUSTOM_B, pPlayer, pCreature);
+            break;
+        }
+
+        if (uiAction != GOSSIP_ACTION_INFO_DEF + 2)
+        {
+            pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+        return true;
+    }
+};
+
+/* *************
+** npc_spell_dummy_crusader_strike
+************* */
+
+struct spell_cos_crusader_strike : public SpellScript
+{
+    spell_cos_crusader_strike() : SpellScript("spell_cos_crusader_strike") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_CRUSADER_STRIKE && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+            // only apply this for certain citizens
+            if (pCreatureTarget->GetEntry() == NPC_STRATHOLME_RESIDENT || pCreatureTarget->GetEntry() == NPC_STRATHOLME_CITIZEN)
+                pCreatureTarget->DealDamage(pCreatureTarget, pCreatureTarget->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_culling_of_stratholme()
+{
+    Script* s;
+
+    s = new npc_chromie();
+    s->RegisterSelf();
+    s = new npc_arthas();
+    s->RegisterSelf();
+
+    s = new aura_cos_arcane_disruption();
+    s->RegisterSelf();
+    s = new spell_cos_crusader_strike();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_chromie";
+    //pNewScript->pGossipHello = &GossipHello_npc_chromie;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_chromie;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_chromie;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "spell_dummy_npc_crates_bunny";
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_spell_aura_dummy_npc_crates_dummy;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_arthas";
+    //pNewScript->GetAI = &GetAI_npc_arthas;
+    //pNewScript->pGossipHello = &GossipHello_npc_arthas;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_arthas;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_spell_dummy_crusader_strike";
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_spell_dummy_crusader_strike;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h b/src/modules/SD3/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h
new file mode 100644
index 000000000..faa30d073
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h
@@ -0,0 +1,157 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_CULLING_OF_STRATHOLME_H
+#define DEF_CULLING_OF_STRATHOLME_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 10,
+    MAX_SCOURGE_WAVES               = 10,
+    MAX_SCOURGE_TYPE_PER_WAVE       = 4,
+
+    TYPE_GRAIN_EVENT                = 0,                    // crates with plagued grain identified
+    TYPE_ARTHAS_INTRO_EVENT         = 1,                    // Arhas Speech and Walk to Gates and short intro with MalGanis
+    TYPE_MEATHOOK_EVENT             = 2,                    // Waves 1-5
+    TYPE_SALRAMM_EVENT              = 3,                    // Waves 6-10
+    TYPE_ARTHAS_TOWNHALL_EVENT      = 4,                    // Townhall escort event
+    TYPE_EPOCH_EVENT                = 5,                    // Townhall Event, Boss Killed
+    TYPE_ARTHAS_ESCORT_EVENT        = 6,                    // Burning city escort event
+    TYPE_MALGANIS_EVENT             = 7,                    // Malganis
+    TYPE_INFINITE_CORRUPTER_TIME    = 8,                    // Time for 25min Timer
+    TYPE_INFINITE_CORRUPTER         = 9,                    // Infinite corruptor event
+    TYPE_DO_AREATRIGGER             = 10,
+    TYPE_DATA64_PLAYER_BOTH         = 11,
+    TYPE_DATA64_PLAYER_ARTHAS       = 12,
+    TYPE_DATA64_AD_TARGET           = 13,
+    TYPE_DATA64_SPAWNING            = 14,
+
+    // Main Encounter NPCs
+    NPC_CHROMIE_INN                 = 26527,
+    NPC_CHROMIE_ENTRANCE            = 27915,
+    NPC_CHROMIE_END                 = 30997,
+    NPC_HOURGLASS                   = 28656,
+    NPC_LORDAERON_CRIER             = 27913,
+    NPC_ARTHAS                      = 26499,
+
+    // Dungeon bosses
+    NPC_MEATHOOK                    = 26529,
+    NPC_SALRAMM_THE_FLESHCRAFTER    = 26530,
+    NPC_LORD_EPOCH                  = 26532,
+    NPC_MALGANIS                    = 26533,
+
+    // Inn Event related NPC
+    NPC_MICHAEL_BELFAST             = 30571,
+    NPC_HEARTHSINGER_FORRESTEN      = 30551,
+    NPC_FRAS_SIABI                  = 30552,
+    NPC_FOOTMAN_JAMES               = 30553,
+    NPC_MAL_CORRICKS                = 31017,
+    NPC_GRYAN_STOUTMANTLE           = 30561,
+
+    // Grain Event NPCs
+    NPC_ROGER_OWENS                 = 27903,
+    NPC_SERGEANT_MORIGAN            = 27877,
+    NPC_JENA_ANDERSON               = 27885,
+    NPC_MALCOM_MOORE                = 27891,                // Not (yet?) spawned
+    NPC_BARTLEBY_BATTSON            = 27907,
+    NPC_GRAIN_CRATE_HELPER          = 27827,
+    // NPC_CRATES_BUNNY             = 30996,
+
+    // Intro Event NPCs
+    NPC_JAINA_PROUDMOORE            = 26497,
+    NPC_UTHER_LIGHTBRINGER          = 26528,
+    NPC_KNIGHT_SILVERHAND           = 28612,
+    NPC_LORDAERON_FOOTMAN           = 27745,
+    NPC_HIGH_ELF_MAGE_PRIEST        = 27747,
+    NPC_STRATHOLME_CITIZEN          = 28167,
+    NPC_STRATHOLME_RESIDENT         = 28169,
+
+    // Mobs in Stratholme (to despawn) -- only here for sake of completeness handling remains open (mangos feature)
+    NPC_MAGISTRATE_BARTHILAS        = 30994,
+    NPC_STEPHANIE_SINDREE           = 31019,
+    NPC_LEEKA_TURNER                = 31027,
+    NPC_SOPHIE_AAREN                = 31021,
+    NPC_ROBERT_PIERCE               = 31025,
+    NPC_GEORGE_GOODMAN              = 31022,
+
+    // Others NPCs in Stratholme
+    NPC_EMERY_NEILL                 = 30570,
+    NPC_EDWARD_ORRICK               = 31018,
+    NPC_OLIVIA_ZENITH               = 31020,
+
+    // Townhall Event NPCs
+    NPC_AGIATED_STRATHOLME_CITIZEN  = 31126,
+    NPC_AGIATED_STRATHOLME_RESIDENT = 31127,
+    NPC_PATRICIA_O_REILLY           = 31028,
+
+    // Scourge waves
+    NPC_ENRAGING_GHOUL              = 27729,
+    NPC_ACOLYTE                     = 27731,
+    NPC_MASTER_NECROMANCER          = 27732,
+    NPC_CRYPT_FIEND                 = 27734,
+    NPC_PATCHWORK_CONSTRUCT         = 27736,
+    NPC_TOMB_STALKER                = 28199,
+    NPC_DARK_NECROMANCER            = 28200,
+    NPC_BILE_GOLEM                  = 28201,
+    NPC_DEVOURING_GHOUL             = 28249,
+    NPC_ZOMBIE                      = 27737,
+    // NPC_INVISIBLE_STALKER        = 20562,
+
+    // Infinite dragons
+    NPC_TOWNHALL_CITIZEN            = 28340,
+    NPC_TOWNHALL_RESIDENT           = 28341,
+    NPC_INFINITE_ADVERSARY          = 27742,
+    NPC_INFINITE_AGENT              = 27744,
+    NPC_INFINITE_HUNTER             = 27743,
+    NPC_TIME_RIFT                   = 28409,
+    NPC_TIME_RIFT_BIG               = 28439,
+
+    // Heroic event npcs
+    NPC_INFINITE_CORRUPTER          = 32273,
+    NPC_GUARDIAN_OF_TIME            = 32281,
+
+    // Gameobjects
+    GO_DOOR_BOOKCASE                = 188686,
+    GO_CITY_ENTRANCE_GATE           = 191788,
+    GO_DARK_RUNED_CHEST             = 190663,
+    GO_DARK_RUNED_CHEST_H           = 193597,
+
+    GO_SUSPICIOUS_GRAIN_CRATE       = 190094,
+    GO_CRATE_HIGHLIGHT              = 190117,
+    GO_PLAGUE_GRAIN_CRATE           = 190095,
+
+    // World States
+    WORLD_STATE_CRATES              = 3479,
+    WORLD_STATE_CRATES_COUNT        = 3480,
+    WORLD_STATE_WAVE                = 3504,
+    WORLD_STATE_TIME                = 3932,
+    WORLD_STATE_TIME_COUNTER        = 3931,
+
+    // Areatrigger
+    AREATRIGGER_INN                 = 5291,
+    /*
+    5085 before bridge - could be Uther SpawnPos
+    5148 ini entrance
+    5181 ini exit
+    5249 fras siabis store
+    5250 leeking shields...(store)
+    5251 bar in stratholme
+    5252 Aaren flowers
+    5253 Angelicas boutique
+    5256 townhall
+    5291 Inn */
+
+    // Achievements
+    ACHIEV_CRIT_ZOMBIEFEST          = 7180,                 // achiev 1872
+};
+
+enum CoSArcaneDisruption
+{
+    SAY_SOLDIERS_REPORT = -1595000,
+
+    SPELL_ARCANE_DISRUPTION = 49590,
+    SPELL_CRATES_KILL_CREDIT = 58109,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp b/src/modules/SD3/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
new file mode 100644
index 000000000..bfc02bd6e
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
@@ -0,0 +1,1163 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_culling_of_stratholme
+SD%Complete: 80%
+SDComment:
+SDCategory: Culling of Stratholme
+EndScriptData */
+
+#include "precompiled.h"
+#include "culling_of_stratholme.h"
+
+enum eScourgeType
+{
+    SCOURGE_TYPE_GHOUL = 1,
+    SCOURGE_TYPE_NECROMANCER = 2,
+    SCOURGE_TYPE_FIEND = 3,
+    SCOURGE_TYPE_GOLEM = 4,
+    SCOURGE_TYPE_ACOLYTES = 5,
+    SCOURGE_TYPE_BOSS = 6,
+};
+
+static const uint32 uiScourgeWaveDef[MAX_SCOURGE_WAVES][MAX_SCOURGE_TYPE_PER_WAVE] =
+{
+    // first half of scourge waves
+    { SCOURGE_TYPE_GHOUL, SCOURGE_TYPE_GHOUL, SCOURGE_TYPE_GHOUL, 0 },
+    { SCOURGE_TYPE_NECROMANCER, SCOURGE_TYPE_GHOUL, SCOURGE_TYPE_GHOUL, 0 },
+    { SCOURGE_TYPE_FIEND, SCOURGE_TYPE_NECROMANCER, SCOURGE_TYPE_GHOUL, SCOURGE_TYPE_GHOUL },
+    { SCOURGE_TYPE_FIEND, SCOURGE_TYPE_NECROMANCER, SCOURGE_TYPE_ACOLYTES, 0 },
+    { SCOURGE_TYPE_BOSS, 0, 0, 0 },
+    // second half of scourge waves
+    { SCOURGE_TYPE_FIEND, SCOURGE_TYPE_FIEND, SCOURGE_TYPE_NECROMANCER, SCOURGE_TYPE_GHOUL },
+    { SCOURGE_TYPE_GOLEM, SCOURGE_TYPE_GHOUL, SCOURGE_TYPE_GHOUL, SCOURGE_TYPE_GHOUL },
+    { SCOURGE_TYPE_GOLEM, SCOURGE_TYPE_NECROMANCER, SCOURGE_TYPE_GHOUL, SCOURGE_TYPE_GHOUL },
+    { SCOURGE_TYPE_GOLEM, SCOURGE_TYPE_FIEND, SCOURGE_TYPE_NECROMANCER, SCOURGE_TYPE_GHOUL },
+    { SCOURGE_TYPE_BOSS, 0, 0, 0 }
+};
+
+enum eInstancePosition
+{
+    POS_ARTHAS_INTRO = 1,
+    POS_ARTHAS_WAVES = 2,
+    POS_ARTHAS_TOWNHALL = 3,
+    POS_ARTHAS_ESCORTING = 4,
+    POS_ARTHAS_MALGANIS = 5,
+    POS_INSTANCE_FINISHED = 6
+};
+
+enum eScourgeLocation
+{
+    POS_FESTIVAL_LANE = 0,
+    POS_KINGS_SQUARE = 1,
+    POS_MARKET_ROW = 2,
+    POS_TOWN_HALL = 3,
+    POS_ELDERS_SQUARE = 4,
+};
+
+enum
+{
+    MAX_ARTHAS_SPAWN_POS        = 5,
+    MAX_GRAIN_CRATES            = 5,
+    MAX_SCOURGE_SPAWN_POS       = 5,
+    MAX_BURNING_SCOURGE_POS     = 15,
+    
+    SAY_SCOURGE_FESTIVAL_LANE   = -1595003,
+    SAY_SCOURGE_KINGS_SQUARE    = -1595004,
+    SAY_SCOURGE_MARKET_ROW      = -1595005,
+    SAY_SCOURGE_TOWN_HALL       = -1595006,
+    SAY_SCOURGE_ELDERS_SQUARE   = -1595007,
+    
+    SAY_MEET_TOWN_HALL          = -1595008,
+    SAY_CORRUPTOR_DESPAWN       = -1595041,
+
+    WHISPER_CHROMIE_CRATES      = -1595001,
+    WHISPER_CHROMIE_GUARDIAN    = -1595002,
+    WHISPER_CHROMIE_HURRY       = -1000000,                         // TODO
+    
+    SPELL_CORRUPTION_OF_TIME    = 60422,                            // triggers 60451
+};
+
+struct sSpawnLocation
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+static sSpawnLocation m_aArthasSpawnLocs[] =                // need tuning
+{
+    {1957.13f, 1287.43f, 145.65f, 2.96f},                   // bridge
+    {2091.99f, 1277.25f, 140.47f, 0.43f},                   // city entrance
+    {2366.24f, 1195.25f, 132.04f, 3.15f},                   // town hall
+    {2534.98f, 1126.16f, 130.86f, 2.84f},                   // burning stratholme
+    {2363.44f, 1404.90f, 128.64f, 2.77f},                   // crusader square gate
+};
+
+static sSpawnLocation m_aIntroActorsSpawnLocs[] =
+{
+    {1876.78f, 1305.72f, 146.24f, 6.07f},                   // Jaina
+    {1786.18f, 1268.63f, 140.02f, 0.42f},                   // Uther
+    {1780.26f, 1261.87f, 139.55f, 0.57f},                   // Silverhand knights
+    {1778.59f, 1265.03f, 139.43f, 0.40f},
+    {1777.04f, 1268.16f, 139.35f, 0.59f},
+    {2091.47f, 1294.28f, 139.82f, 6.27f},                   // High elf priests
+    {2091.26f, 1281.71f, 139.92f, 6.27f},
+    {2096.12f, 1290.53f, 138.81f, 6.27f},                   // Footman
+    {2096.41f, 1284.22f, 138.79f, 6.27f},
+    {2096.93f, 1297.57f, 138.96f, 6.27f},
+    {2096.32f, 1278.98f, 139.43f, 6.27f}
+};
+
+static sSpawnLocation m_aChromieSpawnLocs[] =
+{
+    {1813.298f, 1283.578f, 142.3258f, 3.96f},               // near bridge
+    {2319.562f, 1506.409f, 152.0499f, 3.78f},               // End
+    {1810.875f, 1285.035f, 142.4917f, 4.48f},               // Hourglass, near bridge
+};
+
+static sSpawnLocation m_aHeroicEventSpawnLocs[] =
+{
+    {2331.642f, 1273.273f, 132.954f, 3.71f},                // Infinite corruptor
+    {2334.626f, 1280.450f, 133.006f, 1.72f},                // Time rift
+    {2321.489f, 1268.383f, 132.850f, 0.41f},                // Guardian of time
+};
+
+struct sScourgeSpawnLoc
+{
+    uint8 m_uiId;
+    int32 m_iYellId;
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+static sScourgeSpawnLoc m_aScourgeWavesLocs[] =
+{
+    {POS_FESTIVAL_LANE, SAY_SCOURGE_FESTIVAL_LANE,  2176.517f, 1244.970f, 136.021f, 1.86f},
+    {POS_KINGS_SQUARE,  SAY_SCOURGE_KINGS_SQUARE,   2130.760f, 1353.649f, 131.396f, 6.02f},
+    {POS_MARKET_ROW,    SAY_SCOURGE_MARKET_ROW,     2219.825f, 1331.119f, 127.978f, 3.08f},
+    {POS_TOWN_HALL,     SAY_SCOURGE_TOWN_HALL,      2351.475f, 1211.893f, 130.361f, 4.50f},
+    {POS_ELDERS_SQUARE, SAY_SCOURGE_ELDERS_SQUARE,  2259.153f, 1153.199f, 138.431f, 2.39f},
+};
+
+struct sBurningScourgeSpawnLoc
+{
+    uint8 m_uiType;
+    float m_fX, m_fY, m_fZ;
+};
+
+static sBurningScourgeSpawnLoc m_aBurningScourgeLocs[MAX_BURNING_SCOURGE_POS] =
+{
+    {SCOURGE_TYPE_GHOUL, 2571.570f, 1169.945f, 126.191f},
+    {SCOURGE_TYPE_GOLEM, 2560.524f, 1208.296f, 125.613f},
+    {SCOURGE_TYPE_GHOUL, 2562.075f, 1182.137f, 126.499f},
+    {SCOURGE_TYPE_FIEND, 2552.720f, 1227.233f, 125.620f},
+    {SCOURGE_TYPE_GHOUL, 2545.070f, 1245.650f, 125.991f},
+    {SCOURGE_TYPE_GHOUL, 2534.250f, 1258.379f, 127.030f},
+    {SCOURGE_TYPE_ACOLYTES, 2532.075f, 1271.579f, 127.243f},
+    {SCOURGE_TYPE_GHOUL, 2529.144f, 1281.680f, 128.429f},
+    {SCOURGE_TYPE_GHOUL, 2491.742f, 1365.169f, 130.827f},
+    {SCOURGE_TYPE_FIEND, 2490.869f, 1366.189f, 130.678f},
+    {SCOURGE_TYPE_GHOUL, 2479.944f, 1393.666f, 129.975f},
+    {SCOURGE_TYPE_GOLEM, 2484.858f, 1380.665f, 130.075f},
+    {SCOURGE_TYPE_GHOUL, 2474.965f, 1399.063f, 130.317f},
+    {SCOURGE_TYPE_ACOLYTES, 2461.411f, 1416.090f, 130.663f},
+    {SCOURGE_TYPE_GHOUL, 2448.391f, 1426.428f, 130.853f},
+};
+
+// Sorting function
+static bool sortFromEastToWest(Creature* pFirst, Creature* pSecond)
+{
+    return pFirst && pSecond && pFirst->GetPositionY() < pSecond->GetPositionY();
+}
+
+struct is_culling_of_stratholme : public InstanceScript
+{
+    is_culling_of_stratholme() : InstanceScript("instance_culling_of_stratholme") {}
+
+    class instance_culling_of_stratholme : public ScriptedInstance
+    {
+    public:
+        instance_culling_of_stratholme(Map* pMap) : ScriptedInstance(pMap),
+            m_bStartedInnEvent(false),
+            m_uiGrainCrateCount(0),
+            m_uiRemoveCrateStateTimer(0),
+            m_uiArthasRespawnTimer(0),
+            m_uiScourgeWaveTimer(0),
+            m_uiScourgeWaveCount(0),
+            m_uiCurrentUndeadPos(POS_FESTIVAL_LANE)                 // always the first undead location is Festival Lane
+        {
+            Initialize();
+        }
+
+        ~instance_culling_of_stratholme() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            // spawn Chromie
+            DoSpawnChromieIfNeeded(pPlayer);
+
+            // spawn Arthas if intro is completed / passed
+            if (GetData(TYPE_ARTHAS_INTRO_EVENT) == DONE)
+            {
+                DoSpawnArthasIfNeeded(pPlayer);
+
+                // resume scourge waves if required - this can only happen in case of server reload
+                if (GetData(TYPE_SALRAMM_EVENT) != DONE)
+                {
+                    // this will restart the wave event with a delayed timer
+                    if (GetData(TYPE_MEATHOOK_EVENT) == DONE)
+                    {
+                        if (GetData(TYPE_SALRAMM_EVENT) != IN_PROGRESS)
+                        {
+                            SetData(TYPE_SALRAMM_EVENT, IN_PROGRESS);
+                            m_uiScourgeWaveTimer = 30000;
+                            m_uiScourgeWaveCount = 5;
+                        }
+                    }
+                    else
+                    {
+                        if (GetData(TYPE_MEATHOOK_EVENT) != IN_PROGRESS)
+                        {
+                            SetData(TYPE_MEATHOOK_EVENT, IN_PROGRESS);
+                            m_uiScourgeWaveTimer = 30000;
+                        }
+                    }
+                }
+            }
+
+            // Show World States if needed
+            // Grain event world states
+            if (GetData(TYPE_GRAIN_EVENT) == IN_PROGRESS || GetData(TYPE_GRAIN_EVENT) == SPECIAL)
+                pPlayer->SendUpdateWorldState(WORLD_STATE_CRATES, 1);      // Show Crates Counter
+            else
+                pPlayer->SendUpdateWorldState(WORLD_STATE_CRATES, 0);      // Remove Crates Counter
+
+            // Scourge waves
+            if (GetData(TYPE_MEATHOOK_EVENT) == IN_PROGRESS || GetData(TYPE_SALRAMM_EVENT) == IN_PROGRESS)
+                pPlayer->SendUpdateWorldState(WORLD_STATE_WAVE, m_uiScourgeWaveCount);      // Add WaveCounter
+            else
+                pPlayer->SendUpdateWorldState(WORLD_STATE_WAVE, 0);                         // Remove WaveCounter
+
+            // Infinite corruptor
+            if (GetData(TYPE_INFINITE_CORRUPTER_TIME))
+            {
+                DoSpawnCorruptorIfNeeded(pPlayer);
+
+                pPlayer->SendUpdateWorldState(WORLD_STATE_TIME, 1);        // Show Timer
+                pPlayer->SendUpdateWorldState(WORLD_STATE_TIME_COUNTER, GetData(TYPE_INFINITE_CORRUPTER_TIME) / (MINUTE * IN_MILLISECONDS));
+            }
+            else
+                pPlayer->SendUpdateWorldState(WORLD_STATE_TIME, 0);        // Remove Timer
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_CHROMIE_ENTRANCE:
+            case NPC_CHROMIE_END:
+            case NPC_ARTHAS:
+            case NPC_MICHAEL_BELFAST:
+            case NPC_HEARTHSINGER_FORRESTEN:
+            case NPC_FRAS_SIABI:
+            case NPC_FOOTMAN_JAMES:
+            case NPC_MAL_CORRICKS:
+            case NPC_GRYAN_STOUTMANTLE:
+            case NPC_ROGER_OWENS:
+            case NPC_SERGEANT_MORIGAN:
+            case NPC_JENA_ANDERSON:
+            case NPC_MALCOM_MOORE:
+            case NPC_BARTLEBY_BATTSON:
+            case NPC_PATRICIA_O_REILLY:
+            case NPC_LORDAERON_CRIER:
+            case NPC_INFINITE_CORRUPTER:
+            case NPC_LORD_EPOCH:
+            case NPC_MALGANIS:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+
+            case NPC_GRAIN_CRATE_HELPER:
+                m_luiCratesBunnyGUIDs.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_LORDAERON_FOOTMAN:
+            case NPC_HIGH_ELF_MAGE_PRIEST:
+                if (pCreature->GetPositionX() > 2000.0f)
+                    m_luiGateSoldiersGUIDs.push_back(pCreature->GetObjectGuid());
+                break;
+
+            case NPC_STRATHOLME_CITIZEN:
+            case NPC_STRATHOLME_RESIDENT:
+            case NPC_AGIATED_STRATHOLME_CITIZEN:
+            case NPC_AGIATED_STRATHOLME_RESIDENT:
+                if (m_auiEncounter[TYPE_ARTHAS_INTRO_EVENT] == DONE)
+                    pCreature->UpdateEntry(NPC_ZOMBIE);
+                else
+                    m_luiResidentGUIDs.push_back(pCreature->GetObjectGuid());
+                break;
+
+            case NPC_ENRAGING_GHOUL:
+            case NPC_ACOLYTE:
+            case NPC_MASTER_NECROMANCER:
+            case NPC_CRYPT_FIEND:
+            case NPC_PATCHWORK_CONSTRUCT:
+            case NPC_TOMB_STALKER:
+            case NPC_DARK_NECROMANCER:
+            case NPC_BILE_GOLEM:
+            case NPC_DEVOURING_GHOUL:
+                if (pCreature->IsTemporarySummon() && GetData(TYPE_SALRAMM_EVENT) != DONE)
+                    m_luiCurrentScourgeWaveGUIDs.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_DOOR_BOOKCASE:
+                if (m_auiEncounter[TYPE_EPOCH_EVENT] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_DARK_RUNED_CHEST:
+            case GO_DARK_RUNED_CHEST_H:
+            case GO_CITY_ENTRANCE_GATE:
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_MEATHOOK:                 SetData(TYPE_MEATHOOK_EVENT, DONE); break;
+            case NPC_SALRAMM_THE_FLESHCRAFTER: SetData(TYPE_SALRAMM_EVENT, DONE);  break;
+            case NPC_LORD_EPOCH:               SetData(TYPE_EPOCH_EVENT, DONE);    break;
+            case NPC_INFINITE_CORRUPTER: SetData(TYPE_INFINITE_CORRUPTER, DONE);   break;
+
+            case NPC_ENRAGING_GHOUL:
+            case NPC_ACOLYTE:
+            case NPC_MASTER_NECROMANCER:
+            case NPC_CRYPT_FIEND:
+            case NPC_PATCHWORK_CONSTRUCT:
+            case NPC_TOMB_STALKER:
+            case NPC_DARK_NECROMANCER:
+            case NPC_BILE_GOLEM:
+            case NPC_DEVOURING_GHOUL:
+                if (pCreature->IsTemporarySummon() && GetData(TYPE_SALRAMM_EVENT) != DONE)
+                {
+                    m_luiCurrentScourgeWaveGUIDs.remove(pCreature->GetObjectGuid());
+
+                    // send next scourge wave
+                    if (m_luiCurrentScourgeWaveGUIDs.empty())
+                        m_uiScourgeWaveTimer = 2000;
+                }
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_GRAIN_EVENT:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == SPECIAL)
+                    DoUpdateWorldState(WORLD_STATE_CRATES, 1);
+                else if (uiData == IN_PROGRESS)
+                {
+                    // safety check
+                    if (m_uiGrainCrateCount >= MAX_GRAIN_CRATES)
+                        return;
+
+                    ++m_uiGrainCrateCount;
+                    DoUpdateWorldState(WORLD_STATE_CRATES_COUNT, m_uiGrainCrateCount);
+
+                    if (m_uiGrainCrateCount == MAX_GRAIN_CRATES)
+                    {
+                        m_uiRemoveCrateStateTimer = 20000;
+                        SetData(TYPE_GRAIN_EVENT, DONE);
+                    }
+                }
+                break;
+            case TYPE_ARTHAS_INTRO_EVENT:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    m_uiScourgeWaveCount = 0;
+                    m_uiScourgeWaveTimer = 1000;
+                    DoUpdateZombieResidents();
+
+                    SetData(TYPE_MEATHOOK_EVENT, IN_PROGRESS);
+                }
+                break;
+            case TYPE_MEATHOOK_EVENT:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    m_uiScourgeWaveTimer = 20000;
+                    SetData(TYPE_SALRAMM_EVENT, IN_PROGRESS);
+                }
+                break;
+            case TYPE_SALRAMM_EVENT:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                    m_uiScourgeWaveTimer = 5000;
+                break;
+            case TYPE_ARTHAS_TOWNHALL_EVENT:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    // despawn arthas and spawn him in the next point
+                    if (Creature* pArthas = GetSingleCreatureFromStorage(NPC_ARTHAS))
+                    {
+                        pArthas->ForcedDespawn();
+                    }
+
+                    if (Player* pPlayer = GetPlayerInMap())
+                    {
+                        DoSpawnArthasIfNeeded(pPlayer);
+                    }
+                }
+                break;
+            case TYPE_EPOCH_EVENT:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_ARTHAS_ESCORT_EVENT:
+                // use fail in order to respawn Arthas
+                if (uiData == FAIL)
+                {
+                    m_uiArthasRespawnTimer = 10000;
+
+                    // despawn the bosses if Arthas dies in order to avoid exploits
+                    if (Creature* pEpoch = GetSingleCreatureFromStorage(NPC_LORD_EPOCH, true))
+                    {
+                        pEpoch->ForcedDespawn();
+                    }
+                    if (Creature* pMalganis = GetSingleCreatureFromStorage(NPC_MALGANIS, true))
+                    {
+                        pMalganis->ForcedDespawn();
+                    }
+                }
+                else
+                {
+                    m_auiEncounter[uiType] = uiData;
+                }
+                break;
+            case TYPE_MALGANIS_EVENT:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_CITY_ENTRANCE_GATE);
+                    DoToggleGameObjectFlags(instance->IsRegularDifficulty() ? GO_DARK_RUNED_CHEST : GO_DARK_RUNED_CHEST_H, GO_FLAG_NO_INTERACT, false);
+                    DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_DARK_RUNED_CHEST : GO_DARK_RUNED_CHEST_H, 30 * MINUTE);
+
+                    if (Player* pPlayer = GetPlayerInMap())
+                        DoSpawnChromieIfNeeded(pPlayer);
+                }
+                break;
+            case TYPE_INFINITE_CORRUPTER_TIME:
+                m_auiEncounter[uiType] = uiData;
+                if (!uiData)
+                {
+                    DoUpdateWorldState(WORLD_STATE_TIME, 0);    // Remove Timer
+                    DoUpdateWorldState(WORLD_STATE_TIME_COUNTER, 0);
+                }
+                else
+                    DoUpdateWorldState(WORLD_STATE_TIME_COUNTER, uiData / (MINUTE * IN_MILLISECONDS));
+                break;
+            case TYPE_INFINITE_CORRUPTER:
+                m_auiEncounter[uiType] = uiData;
+                switch (uiData)
+                {
+                case IN_PROGRESS:
+                    if (!GetData(TYPE_INFINITE_CORRUPTER_TIME))
+                    {
+                        SetData(TYPE_INFINITE_CORRUPTER_TIME, MINUTE * 25 * IN_MILLISECONDS);
+                        DoUpdateWorldState(WORLD_STATE_TIME, 1);
+                        DoChromieWhisper(WHISPER_CHROMIE_GUARDIAN);
+
+                        // spawn the corruptor for the first time
+                        if (Creature* pArthas = GetSingleCreatureFromStorage(NPC_ARTHAS))
+                            DoSpawnCorruptorIfNeeded(pArthas);
+                    }
+                    break;
+                case DONE:
+                    // event completed - epilog handled by dbscript
+                    SetData(TYPE_INFINITE_CORRUPTER_TIME, 0);
+                    break;
+                case SPECIAL:
+                    DoChromieWhisper(WHISPER_CHROMIE_HURRY);
+                    break;
+                case FAIL:
+                    // event failed - despawn the corruptor
+                    SetData(TYPE_INFINITE_CORRUPTER_TIME, 0);
+                    if (Creature* pCorrupter = GetSingleCreatureFromStorage(NPC_INFINITE_CORRUPTER))
+                    {
+                        DoOrSimulateScriptTextForThisInstance(SAY_CORRUPTOR_DESPAWN, NPC_INFINITE_CORRUPTER);
+
+                        if (pCorrupter->IsAlive())
+                            pCorrupter->ForcedDespawn();
+                    }
+                    break;
+                }
+                break;
+            case TYPE_DO_AREATRIGGER:
+                DoEventAtTriggerIfCan(uiData);
+                return;
+            }
+
+            if (uiData == DONE || uiType == TYPE_INFINITE_CORRUPTER_TIME)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6] << " " << m_auiEncounter[7] << " " << m_auiEncounter[8] << " "
+                    << m_auiEncounter[9];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            return 0;
+        }
+
+        void SetData64(uint32 uiType, uint64 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_DATA64_PLAYER_BOTH:
+                if (Player *pPlayer = instance->GetPlayer(ObjectGuid(uiData)))
+                    DoSpawnChromieIfNeeded(pPlayer);
+                    // no break intended!
+            case TYPE_DATA64_PLAYER_ARTHAS:
+                if (Player *pPlayer = instance->GetPlayer(ObjectGuid(uiData)))
+                    DoSpawnArthasIfNeeded(pPlayer);
+                break;
+            case TYPE_DATA64_AD_TARGET:
+                if (Creature *pTarget = instance->GetCreature(ObjectGuid(uiData)))
+                {
+                    std::list<Creature*> lCrateBunnyList;
+                    GetCratesBunnyOrderedList(lCrateBunnyList);
+                    uint8 i = 0;
+                    for (std::list<Creature*>::const_iterator itr = lCrateBunnyList.begin(); itr != lCrateBunnyList.end(); ++itr)
+                    {
+                        ++i;
+                        if (*itr == pTarget)
+                        {
+                            // check if the event can proceed
+                            if (!CanGrainEventProgress(pTarget))
+                                return;
+
+                            break;
+                        }
+                    }
+
+                    switch (i)
+                    {
+                    case 1:
+                        // Start NPC_ROGER_OWENS Event
+                        if (Creature* pRoger = GetSingleCreatureFromStorage(NPC_ROGER_OWENS))
+                        {
+                            pRoger->SetStandState(UNIT_STAND_STATE_STAND);
+                            pRoger->GetMotionMaster()->MoveWaypoint();
+                        }
+                        break;
+                    case 2:
+                        // Start NPC_SERGEANT_MORIGAN  Event
+                        if (Creature* pMorigan = GetSingleCreatureFromStorage(NPC_SERGEANT_MORIGAN))
+                            pMorigan->GetMotionMaster()->MoveWaypoint();
+                        break;
+                    case 3:
+                        // Start NPC_JENA_ANDERSON Event
+                        if (Creature* pJena = GetSingleCreatureFromStorage(NPC_JENA_ANDERSON))
+                            pJena->GetMotionMaster()->MoveWaypoint();
+                        break;
+                    case 4:
+                        // Start NPC_MALCOM_MOORE Event
+                        pTarget->SummonCreature(NPC_MALCOM_MOORE, 1605.452f, 804.9279f, 122.961f, 5.19f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                        break;
+                    case 5:
+                        // Start NPC_BARTLEBY_BATTSON Event
+                        if (Creature* pBartleby = GetSingleCreatureFromStorage(NPC_BARTLEBY_BATTSON))
+                            pBartleby->GetMotionMaster()->MoveWaypoint();
+                        break;
+                    }
+
+                    // Finished event, give killcredit
+                    if (GetData(TYPE_GRAIN_EVENT) == DONE)
+                    {
+                        pTarget->CastSpell(pTarget, SPELL_CRATES_KILL_CREDIT, true);
+                        DoOrSimulateScriptTextForThisInstance(SAY_SOLDIERS_REPORT, NPC_LORDAERON_CRIER);
+                    }
+
+                    // despawn the GO visuals and spanw the plague crate
+                    if (GameObject* pCrate = GetClosestGameObjectWithEntry(pTarget, GO_SUSPICIOUS_GRAIN_CRATE, 5.0f))
+                        pCrate->SetLootState(GO_JUST_DEACTIVATED);
+                    if (GameObject* pHighlight = GetClosestGameObjectWithEntry(pTarget, GO_CRATE_HIGHLIGHT, 5.0f))
+                        pHighlight->SetLootState(GO_JUST_DEACTIVATED);
+                    if (GameObject* pCrate = GetClosestGameObjectWithEntry(pTarget, GO_PLAGUE_GRAIN_CRATE, 5.0f))
+                    {
+                        pCrate->SetRespawnTime(6 * HOUR * IN_MILLISECONDS);
+                        pCrate->Refresh();
+                    }
+                }
+                break;
+            case TYPE_DATA64_SPAWNING:
+                DoSpawnBurningCityUndead(instance->GetCreature(ObjectGuid(uiData)));
+                break;
+            default:
+                break;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7]
+                >> m_auiEncounter[8] >> m_auiEncounter[9];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (i != TYPE_INFINITE_CORRUPTER_TIME)
+                {
+                    if (m_auiEncounter[i] == IN_PROGRESS)
+                        m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            // If already started counting down time, the event is "in progress"
+            if (m_auiEncounter[TYPE_INFINITE_CORRUPTER_TIME])
+                m_auiEncounter[TYPE_INFINITE_CORRUPTER] = IN_PROGRESS;
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            // 25min Run - decrease time, update worldstate every ~20s
+            // as the time is always saved by m_auiEncounter[TYPE_INFINITE_CORRUPTER_TIME], there is no need for an extra timer
+            if (m_auiEncounter[TYPE_INFINITE_CORRUPTER_TIME])
+            {
+                if (m_auiEncounter[TYPE_INFINITE_CORRUPTER_TIME] <= uiDiff)
+                    SetData(TYPE_INFINITE_CORRUPTER, FAIL);
+                else
+                {
+                    m_auiEncounter[TYPE_INFINITE_CORRUPTER_TIME] -= uiDiff;
+                    if (m_auiEncounter[TYPE_INFINITE_CORRUPTER_TIME] / IN_MILLISECONDS % 20 == 0)
+                        SetData(TYPE_INFINITE_CORRUPTER_TIME, m_auiEncounter[TYPE_INFINITE_CORRUPTER_TIME]);
+                }
+
+                // This part is needed for a small "hurry up guys" note, TODO, verify 20min
+                if (m_auiEncounter[TYPE_INFINITE_CORRUPTER] == IN_PROGRESS && m_auiEncounter[TYPE_INFINITE_CORRUPTER_TIME] <= 24 * MINUTE * IN_MILLISECONDS)
+                    SetData(TYPE_INFINITE_CORRUPTER, SPECIAL);
+            }
+
+            // Small Timer, to remove Grain-Crate WorldState and Spawn Second Chromie
+            if (m_uiRemoveCrateStateTimer)
+            {
+                if (m_uiRemoveCrateStateTimer <= uiDiff)
+                {
+                    if (Player* pPlayer = GetPlayerInMap())
+                        DoSpawnChromieIfNeeded(pPlayer);
+
+                    DoUpdateWorldState(WORLD_STATE_CRATES, 0);
+                    DoChromieWhisper(WHISPER_CHROMIE_CRATES);
+                    m_uiRemoveCrateStateTimer = 0;
+                }
+                else
+                    m_uiRemoveCrateStateTimer -= uiDiff;
+            }
+
+            // Respawn Arthas after some time
+            if (m_uiArthasRespawnTimer)
+            {
+                if (m_uiArthasRespawnTimer <= uiDiff)
+                {
+                    if (Player* pPlayer = GetPlayerInMap())
+                        DoSpawnArthasIfNeeded(pPlayer);
+
+                    m_uiArthasRespawnTimer = 0;
+                }
+                else
+                    m_uiArthasRespawnTimer -= uiDiff;
+            }
+
+            // Handle undead waves
+            if (m_uiScourgeWaveTimer)
+            {
+                if (m_uiScourgeWaveTimer <= uiDiff)
+                {
+                    if (GetData(TYPE_SALRAMM_EVENT) == DONE)
+                    {
+                        DoOrSimulateScriptTextForThisInstance(SAY_MEET_TOWN_HALL, NPC_ARTHAS);
+                        DoUpdateWorldState(WORLD_STATE_WAVE, 0); // Remove WaveCounter
+
+                        // despawn and respawn Arthas in the new location
+                        if (Creature* pArthas = GetSingleCreatureFromStorage(NPC_ARTHAS))
+                            pArthas->ForcedDespawn();
+                        if (Player* pPlayer = GetPlayerInMap())
+                            DoSpawnArthasIfNeeded(pPlayer);
+                    }
+                    else
+                    {
+                        ++m_uiScourgeWaveCount;
+                        DoUpdateWorldState(WORLD_STATE_WAVE, m_uiScourgeWaveCount);
+                        DoSpawnNextScourgeWave();
+                    }
+
+                    m_uiScourgeWaveTimer = 0;
+                }
+                else
+                    m_uiScourgeWaveTimer -= uiDiff;
+            }
+        }
+
+    protected:
+        // return the ordered list of Grain Crate Helpers
+        void GetCratesBunnyOrderedList(std::list<Creature*>& lList)
+        {
+            std::list<Creature*> lCratesBunnyList;
+            for (GuidList::const_iterator itr = m_luiCratesBunnyGUIDs.begin(); itr != m_luiCratesBunnyGUIDs.end(); ++itr)
+            {
+                if (Creature* pBunny = instance->GetCreature(*itr))
+                    lCratesBunnyList.push_back(pBunny);
+            }
+            if (lCratesBunnyList.empty())
+                return;
+
+            lCratesBunnyList.sort(sortFromEastToWest);
+            lList = lCratesBunnyList;
+        }
+
+        // Atm here only new Chromies are spawned
+        void DoSpawnChromieIfNeeded(Unit* pSummoner)
+        {
+            if (!pSummoner)
+                return;
+
+            if (GetInstancePosition() == POS_INSTANCE_FINISHED)
+            {
+                Creature* pChromie = GetSingleCreatureFromStorage(NPC_CHROMIE_END, true);
+                if (!pChromie)
+                    pSummoner->SummonCreature(NPC_CHROMIE_END, m_aChromieSpawnLocs[1].m_fX, m_aChromieSpawnLocs[1].m_fY, m_aChromieSpawnLocs[1].m_fZ, m_aChromieSpawnLocs[1].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+            }
+            else if (GetInstancePosition() >= POS_ARTHAS_INTRO)
+            {
+                Creature* pChromie = GetSingleCreatureFromStorage(NPC_CHROMIE_ENTRANCE, true);
+                if (!pChromie)
+                {
+                    pSummoner->SummonCreature(NPC_CHROMIE_ENTRANCE, m_aChromieSpawnLocs[0].m_fX, m_aChromieSpawnLocs[0].m_fY, m_aChromieSpawnLocs[0].m_fZ, m_aChromieSpawnLocs[0].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                    pSummoner->SummonCreature(NPC_HOURGLASS, m_aChromieSpawnLocs[2].m_fX, m_aChromieSpawnLocs[2].m_fY, m_aChromieSpawnLocs[2].m_fZ, m_aChromieSpawnLocs[2].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                }
+            }
+        }
+
+        // Function that spawns Arthas on demand
+        void DoSpawnArthasIfNeeded(Unit* pSummoner)
+        {
+            if (!pSummoner)
+                return;
+
+            Creature* pArthas = GetSingleCreatureFromStorage(NPC_ARTHAS, true);
+            if (pArthas && pArthas->IsAlive())
+                return;
+
+            uint8 uiPosition = GetInstancePosition();
+            if (uiPosition && uiPosition <= MAX_ARTHAS_SPAWN_POS)
+                pSummoner->SummonCreature(NPC_ARTHAS, m_aArthasSpawnLocs[uiPosition - 1].m_fX, m_aArthasSpawnLocs[uiPosition - 1].m_fY, m_aArthasSpawnLocs[uiPosition - 1].m_fZ, m_aArthasSpawnLocs[uiPosition - 1].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000, true);
+
+            // no gossip flag in the following positions
+            if (uiPosition == POS_ARTHAS_INTRO || uiPosition == POS_ARTHAS_WAVES)
+            {
+                if (Creature* pArthas = GetSingleCreatureFromStorage(NPC_ARTHAS))
+                    pArthas->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            }
+
+            // summon the other intro actors
+            if (uiPosition == POS_ARTHAS_INTRO)
+            {
+                // start intro event by dbscripts
+                if (Creature* pArthas = GetSingleCreatureFromStorage(NPC_ARTHAS))
+                {
+                    pArthas->SetWalk(false);
+                    pArthas->GetMotionMaster()->MoveWaypoint();
+                }
+
+                // spawn Jaina and Uther
+                if (Creature* pJaina = pSummoner->SummonCreature(NPC_JAINA_PROUDMOORE, m_aIntroActorsSpawnLocs[0].m_fX, m_aIntroActorsSpawnLocs[0].m_fY, m_aIntroActorsSpawnLocs[0].m_fZ, m_aIntroActorsSpawnLocs[0].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000))
+                    pJaina->GetMotionMaster()->MoveWaypoint();
+                if (Creature* pUther = pSummoner->SummonCreature(NPC_UTHER_LIGHTBRINGER, m_aIntroActorsSpawnLocs[1].m_fX, m_aIntroActorsSpawnLocs[1].m_fY, m_aIntroActorsSpawnLocs[1].m_fZ, m_aIntroActorsSpawnLocs[1].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000))
+                {
+                    pUther->SetWalk(false);
+                    pUther->GetMotionMaster()->MoveWaypoint();
+
+                    // spawn the knights
+                    if (Creature* pKnight = pSummoner->SummonCreature(NPC_KNIGHT_SILVERHAND, m_aIntroActorsSpawnLocs[2].m_fX, m_aIntroActorsSpawnLocs[2].m_fY, m_aIntroActorsSpawnLocs[2].m_fZ, m_aIntroActorsSpawnLocs[2].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000))
+                        pKnight->GetMotionMaster()->MoveFollow(pUther, pKnight->GetDistance(pUther), 2 * M_PI_F - pKnight->GetAngle(pUther));
+                    if (Creature* pKnight = pSummoner->SummonCreature(NPC_KNIGHT_SILVERHAND, m_aIntroActorsSpawnLocs[3].m_fX, m_aIntroActorsSpawnLocs[3].m_fY, m_aIntroActorsSpawnLocs[3].m_fZ, m_aIntroActorsSpawnLocs[3].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000))
+                        pKnight->GetMotionMaster()->MoveFollow(pUther, pKnight->GetDistance(pUther), 2 * M_PI_F - pKnight->GetAngle(pUther));
+                    if (Creature* pKnight = pSummoner->SummonCreature(NPC_KNIGHT_SILVERHAND, m_aIntroActorsSpawnLocs[4].m_fX, m_aIntroActorsSpawnLocs[4].m_fY, m_aIntroActorsSpawnLocs[4].m_fZ, m_aIntroActorsSpawnLocs[4].m_fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000))
+                        pKnight->GetMotionMaster()->MoveFollow(pUther, pKnight->GetDistance(pUther), 2 * M_PI_F - pKnight->GetAngle(pUther));
+                }
+            }
+            // setup the entrance soldiers in case of reload or intro skip
+            else if (uiPosition == POS_ARTHAS_WAVES)
+                DoSetupEntranceSoldiers(pSummoner);
+        }
+
+        // Function to check if the grain event can progress
+        bool CanGrainEventProgress(Creature* pCrate)
+        {
+            if (!pCrate)
+                return false;
+
+            if (m_sGrainCratesGuidSet.find(pCrate->GetObjectGuid()) != m_sGrainCratesGuidSet.end())
+                return false;
+
+            if (GetData(TYPE_GRAIN_EVENT) != DONE)
+                SetData(TYPE_GRAIN_EVENT, IN_PROGRESS);
+
+            m_sGrainCratesGuidSet.insert(pCrate->GetObjectGuid());
+            return true;
+        }
+
+        // function that spawns all the scourge elites in burning stratholme
+        void DoSpawnBurningCityUndead(Unit* pSummoner)
+        {
+            for (uint8 i = 0; i < MAX_BURNING_SCOURGE_POS; ++i)
+            {
+                uint32 uiEntry = GetRandomMobOfType(m_aBurningScourgeLocs[i].m_uiType);
+                if (!uiEntry)
+                    continue;
+
+                float fX, fY, fZ;
+
+                // special requirement for acolytes - spawn a pack of 3
+                if (m_aBurningScourgeLocs[i].m_uiType == SCOURGE_TYPE_ACOLYTES)
+                {
+                    for (uint8 j = 0; j < 3; ++j)
+                    {
+                        pSummoner->GetRandomPoint(m_aBurningScourgeLocs[i].m_fX, m_aBurningScourgeLocs[i].m_fY, m_aBurningScourgeLocs[i].m_fZ, 5.0f, fX, fY, fZ);
+
+                        if (Creature* pUndead = pSummoner->SummonCreature(uiEntry, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0))
+                            pUndead->GetMotionMaster()->MoveRandomAroundPoint(pUndead->GetPositionX(), pUndead->GetPositionY(), pUndead->GetPositionZ(), 10.0f);
+                    }
+                }
+                // spawn the selected mob
+                else
+                {
+                    if (Creature* pUndead = pSummoner->SummonCreature(uiEntry, m_aBurningScourgeLocs[i].m_fX, m_aBurningScourgeLocs[i].m_fY, m_aBurningScourgeLocs[i].m_fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0))
+                        pUndead->GetMotionMaster()->MoveRandomAroundPoint(pUndead->GetPositionX(), pUndead->GetPositionY(), pUndead->GetPositionZ(), 10.0f);
+                }
+
+                // spawn a few random zombies
+                for (uint8 j = 0; j < 5; ++j)
+                {
+                    pSummoner->GetRandomPoint(m_aBurningScourgeLocs[i].m_fX, m_aBurningScourgeLocs[i].m_fY, m_aBurningScourgeLocs[i].m_fZ, 20.0f, fX, fY, fZ);
+
+                    if (Creature* pUndead = pSummoner->SummonCreature(NPC_ZOMBIE, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0))
+                        pUndead->GetMotionMaster()->MoveRandomAroundPoint(pUndead->GetPositionX(), pUndead->GetPositionY(), pUndead->GetPositionZ(), 10.0f);
+                }
+            }
+        }
+
+        // Function that handles instance area trigger scripts
+        void DoEventAtTriggerIfCan(uint32 uiTriggerId)
+        {
+            switch (uiTriggerId)
+            {
+            case AREATRIGGER_INN:
+                if (m_bStartedInnEvent)
+                    return;
+
+                // start dialogue
+                if (Creature* pMichael = GetSingleCreatureFromStorage(NPC_MICHAEL_BELFAST))
+                {
+                    pMichael->SetStandState(UNIT_STAND_STATE_STAND);
+                    pMichael->GetMotionMaster()->MoveWaypoint();
+                }
+                m_bStartedInnEvent = true;
+                break;
+            }
+        }
+
+        // Function that sets up the city entrance soldiers in case of reload or if the intro is skipped
+        void DoSetupEntranceSoldiers(Unit* pSummoner)
+        {
+            if (!pSummoner)
+                return;
+
+            // despawn the current set of soldiers
+            for (GuidList::const_iterator itr = m_luiGateSoldiersGUIDs.begin(); itr != m_luiGateSoldiersGUIDs.end(); ++itr)
+            {
+                if (Creature* pSoldier = instance->GetCreature(*itr))
+                    pSoldier->ForcedDespawn();
+            }
+
+            // spawn others in the right spot
+            pSummoner->SummonCreature(NPC_HIGH_ELF_MAGE_PRIEST, m_aIntroActorsSpawnLocs[5].m_fX, m_aIntroActorsSpawnLocs[5].m_fY, m_aIntroActorsSpawnLocs[5].m_fZ, m_aIntroActorsSpawnLocs[5].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 10000);
+            pSummoner->SummonCreature(NPC_HIGH_ELF_MAGE_PRIEST, m_aIntroActorsSpawnLocs[6].m_fX, m_aIntroActorsSpawnLocs[6].m_fY, m_aIntroActorsSpawnLocs[6].m_fZ, m_aIntroActorsSpawnLocs[6].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 10000);
+            pSummoner->SummonCreature(NPC_LORDAERON_FOOTMAN, m_aIntroActorsSpawnLocs[7].m_fX, m_aIntroActorsSpawnLocs[7].m_fY, m_aIntroActorsSpawnLocs[7].m_fZ, m_aIntroActorsSpawnLocs[7].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 10000);
+            pSummoner->SummonCreature(NPC_LORDAERON_FOOTMAN, m_aIntroActorsSpawnLocs[8].m_fX, m_aIntroActorsSpawnLocs[8].m_fY, m_aIntroActorsSpawnLocs[8].m_fZ, m_aIntroActorsSpawnLocs[8].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 10000);
+            pSummoner->SummonCreature(NPC_LORDAERON_FOOTMAN, m_aIntroActorsSpawnLocs[9].m_fX, m_aIntroActorsSpawnLocs[9].m_fY, m_aIntroActorsSpawnLocs[9].m_fZ, m_aIntroActorsSpawnLocs[9].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 10000);
+            pSummoner->SummonCreature(NPC_LORDAERON_FOOTMAN, m_aIntroActorsSpawnLocs[10].m_fX, m_aIntroActorsSpawnLocs[10].m_fY, m_aIntroActorsSpawnLocs[10].m_fZ, m_aIntroActorsSpawnLocs[10].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 10000);
+        }
+
+        // Function that will spawn the infinite corruptor if requires
+        void DoSpawnCorruptorIfNeeded(Unit* pSummoner)
+        {
+            if (!pSummoner)
+                return;
+
+            Creature* pCorruptor = GetSingleCreatureFromStorage(NPC_INFINITE_CORRUPTER, true);
+            if (pCorruptor)
+                return;
+
+            pSummoner->SummonCreature(NPC_TIME_RIFT, m_aHeroicEventSpawnLocs[1].m_fX, m_aHeroicEventSpawnLocs[1].m_fY, m_aHeroicEventSpawnLocs[1].m_fZ, m_aHeroicEventSpawnLocs[1].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+            pSummoner->SummonCreature(NPC_GUARDIAN_OF_TIME, m_aHeroicEventSpawnLocs[2].m_fX, m_aHeroicEventSpawnLocs[2].m_fY, m_aHeroicEventSpawnLocs[2].m_fZ, m_aHeroicEventSpawnLocs[2].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+
+            if (Creature* pCorruptor = pSummoner->SummonCreature(NPC_INFINITE_CORRUPTER, m_aHeroicEventSpawnLocs[0].m_fX, m_aHeroicEventSpawnLocs[0].m_fY, m_aHeroicEventSpawnLocs[0].m_fZ, m_aHeroicEventSpawnLocs[0].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0))
+                pCorruptor->CastSpell(pCorruptor, SPELL_CORRUPTION_OF_TIME, false);
+        }
+
+        // Function that will make Chromie to send a whisper to all players in map
+        void DoChromieWhisper(int32 iEntry)
+        {
+            if (Creature* pChromie = GetSingleCreatureFromStorage(NPC_CHROMIE_ENTRANCE))
+            {
+                Map::PlayerList const& players = instance->GetPlayers();
+                if (!players.isEmpty())
+                {
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    {
+                        if (Player* pPlayer = itr->getSource())
+                            DoScriptText(iEntry, pChromie, pPlayer);
+                    }
+                }
+            }
+        }
+
+        // Function that updates all the stratholme humans to zombies
+        void DoUpdateZombieResidents()
+        {
+            // update all residents
+            for (GuidList::const_iterator itr = m_luiResidentGUIDs.begin(); itr != m_luiResidentGUIDs.end(); ++itr)
+            {
+                if (Creature* pResident = instance->GetCreature(*itr))
+                    pResident->UpdateEntry(NPC_ZOMBIE);
+            }
+        }
+
+        // Function that spawns next scourge wave
+        void DoSpawnNextScourgeWave()
+        {
+            Creature* pSummoner = GetSingleCreatureFromStorage(NPC_ARTHAS);
+            if (!pSummoner)
+                return;
+
+            DoOrSimulateScriptTextForThisInstance(m_aScourgeWavesLocs[m_uiCurrentUndeadPos].m_iYellId, NPC_LORDAERON_CRIER);
+
+            for (uint8 i = 0; i < MAX_SCOURGE_TYPE_PER_WAVE; ++i)
+            {
+                // get the mob entry
+                uint32 uiEntry = GetRandomMobOfType(uiScourgeWaveDef[m_uiScourgeWaveCount - 1][i]);
+                if (!uiEntry)
+                    continue;
+
+                float fX, fY, fZ, fO;
+                fO = m_aScourgeWavesLocs[m_uiCurrentUndeadPos].m_fO;
+
+                // bosses get exact location
+                if (uiScourgeWaveDef[m_uiScourgeWaveCount - 1][i] == SCOURGE_TYPE_BOSS || uiScourgeWaveDef[m_uiScourgeWaveCount - 1][i] == SCOURGE_TYPE_ACOLYTES)
+                {
+                    fX = m_aScourgeWavesLocs[m_uiCurrentUndeadPos].m_fX;
+                    fY = m_aScourgeWavesLocs[m_uiCurrentUndeadPos].m_fY;
+                    fZ = m_aScourgeWavesLocs[m_uiCurrentUndeadPos].m_fZ;
+                }
+                // random position around point
+                else
+                    pSummoner->GetRandomPoint(m_aScourgeWavesLocs[m_uiCurrentUndeadPos].m_fX, m_aScourgeWavesLocs[m_uiCurrentUndeadPos].m_fY, m_aScourgeWavesLocs[m_uiCurrentUndeadPos].m_fZ, 5.0f, fX, fY, fZ);
+
+                // special requirement for acolytes - spawn a pack of 4
+                if (uiScourgeWaveDef[m_uiScourgeWaveCount - 1][i] == SCOURGE_TYPE_ACOLYTES)
+                {
+                    for (uint8 j = 0; j < 4; ++j)
+                    {
+                        pSummoner->GetRandomPoint(m_aScourgeWavesLocs[m_uiCurrentUndeadPos].m_fX, m_aScourgeWavesLocs[m_uiCurrentUndeadPos].m_fY, m_aScourgeWavesLocs[m_uiCurrentUndeadPos].m_fZ, 5.0f, fX, fY, fZ);
+                        pSummoner->SummonCreature(uiEntry, fX, fY, fZ, fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+                    }
+                }
+                // spawn the selected mob
+                else
+                    pSummoner->SummonCreature(uiEntry, fX, fY, fZ, fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+
+            // start infinite curruptor event on the first wave
+            if (m_uiScourgeWaveCount == 1 && !instance->IsRegularDifficulty() && GetData(TYPE_INFINITE_CORRUPTER) != DONE)
+                SetData(TYPE_INFINITE_CORRUPTER, IN_PROGRESS);
+
+            // get a random position that is different from the previous one for the next round
+            uint8 uiCurrentPos = urand(POS_FESTIVAL_LANE, POS_ELDERS_SQUARE);
+
+            while (uiCurrentPos == m_uiCurrentUndeadPos)
+                uiCurrentPos = urand(POS_FESTIVAL_LANE, POS_ELDERS_SQUARE);
+
+            m_uiCurrentUndeadPos = uiCurrentPos;
+        }
+
+        // function that returns a random scourge mob of a specified type
+        uint32 GetRandomMobOfType(uint8 uiType)
+        {
+            switch (uiType)
+            {
+            case SCOURGE_TYPE_ACOLYTES:
+                return NPC_ACOLYTE;
+            case SCOURGE_TYPE_GHOUL:
+                return urand(0, 1) ? NPC_DEVOURING_GHOUL : NPC_ENRAGING_GHOUL;
+            case SCOURGE_TYPE_NECROMANCER:
+                return urand(0, 1) ? NPC_MASTER_NECROMANCER : NPC_DARK_NECROMANCER;
+            case SCOURGE_TYPE_FIEND:
+                return urand(0, 1) ? NPC_CRYPT_FIEND : NPC_TOMB_STALKER;
+            case SCOURGE_TYPE_GOLEM:
+                return urand(0, 1) ? NPC_BILE_GOLEM : NPC_PATCHWORK_CONSTRUCT;
+            case SCOURGE_TYPE_BOSS:
+                if (GetData(TYPE_MEATHOOK_EVENT) == IN_PROGRESS)
+                    return NPC_MEATHOOK;
+                else if (GetData(TYPE_SALRAMM_EVENT) == IN_PROGRESS)
+                    return NPC_SALRAMM_THE_FLESHCRAFTER;
+            }
+
+            return 0;
+        }
+
+        // Function that returns the current position for Arthas event
+        uint8 GetInstancePosition()
+        {
+            if (m_auiEncounter[TYPE_MALGANIS_EVENT] == DONE)
+                return POS_INSTANCE_FINISHED;
+            else if (m_auiEncounter[TYPE_ARTHAS_ESCORT_EVENT] == DONE)
+                return POS_ARTHAS_MALGANIS;
+            else if (m_auiEncounter[TYPE_EPOCH_EVENT] == DONE)
+                return POS_ARTHAS_ESCORTING;
+            else if (m_auiEncounter[TYPE_SALRAMM_EVENT] == DONE)
+                return POS_ARTHAS_TOWNHALL;
+            else if (m_auiEncounter[TYPE_MEATHOOK_EVENT] == DONE)
+                return POS_ARTHAS_WAVES;
+            else if (m_auiEncounter[TYPE_ARTHAS_INTRO_EVENT] == DONE)
+                return POS_ARTHAS_WAVES;
+            else if (m_auiEncounter[TYPE_GRAIN_EVENT] == DONE)
+                return POS_ARTHAS_INTRO;
+            else
+                return 0;
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        bool m_bStartedInnEvent;
+
+        uint8 m_uiGrainCrateCount;
+        uint32 m_uiRemoveCrateStateTimer;
+        uint32 m_uiArthasRespawnTimer;
+
+        uint32 m_uiScourgeWaveTimer;
+        uint32 m_uiScourgeWaveCount;
+        uint8 m_uiCurrentUndeadPos;
+
+        GuidList m_luiCratesBunnyGUIDs;
+        GuidList m_luiResidentGUIDs;
+        GuidList m_luiGateSoldiersGUIDs;
+
+        GuidList m_luiCurrentScourgeWaveGUIDs;
+
+        GuidSet m_sGrainCratesGuidSet;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_culling_of_stratholme(pMap);
+    }
+};
+
+struct at_culling_of_stratholme : public AreaTriggerScript
+{
+    at_culling_of_stratholme() : AreaTriggerScript("at_culling_of_stratholme") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (pAt->id == AREATRIGGER_INN)
+        {
+            if (pPlayer->isGameMaster() || pPlayer->IsDead())
+                return false;
+
+            if (InstanceData* pInstance = pPlayer->GetInstanceData())
+                pInstance->SetData(TYPE_DO_AREATRIGGER, pAt->id);
+        }
+
+        return false;
+    }
+};
+
+void AddSC_instance_culling_of_stratholme()
+{
+    Script* s;
+
+    s = new is_culling_of_stratholme();
+    s->RegisterSelf();
+    s = new at_culling_of_stratholme();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_culling_of_stratholme";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_culling_of_stratholme;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_culling_of_stratholme";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_culling_of_stratholme;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
new file mode 100644
index 000000000..0800c52fd
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
@@ -0,0 +1,195 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Aeonus
+SD%Complete: 90
+SDComment: Small adjustments; Timers
+SDCategory: Caverns of Time, The Dark Portal
+EndScriptData */
+
+#include "precompiled.h"
+#include "dark_portal.h"
+
+enum
+{
+    SAY_AGGRO               = -1269013,
+    SAY_BANISH              = -1269014,
+    SAY_SLAY1               = -1269015,
+    SAY_SLAY2               = -1269016,
+    SAY_DEATH               = -1269017,
+    EMOTE_GENERIC_FRENZY    = -1000002,
+
+    SPELL_CLEAVE            = 40504,
+    SPELL_TIME_STOP         = 31422,
+    SPELL_ENRAGE            = 37605,
+    SPELL_SAND_BREATH       = 31473,
+    SPELL_SAND_BREATH_H     = 39049
+};
+
+struct boss_aeonus : public CreatureScript
+{
+    boss_aeonus() : CreatureScript("boss_aeonus") {}
+
+    struct boss_aeonusAI : public ScriptedAI
+    {
+        boss_aeonusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiSandBreathTimer;
+        uint32 m_uiTimeStopTimer;
+        uint32 m_uiFrenzyTimer;
+        uint32 m_uiCleaveTimer;
+
+        void Reset() override
+        {
+            m_uiSandBreathTimer = urand(15000, 30000);
+            m_uiTimeStopTimer = urand(10000, 15000);
+            m_uiFrenzyTimer = urand(30000, 45000);
+            m_uiCleaveTimer = urand(5000, 9000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // Despawn Time Keeper
+            if (pWho->GetTypeId() == TYPEID_UNIT && pWho->GetEntry() == NPC_TIME_KEEPER)
+            {
+                if (m_creature->IsWithinDistInMap(pWho, 20.0f))
+                {
+                    if (DoCastSpellIfCan(pWho, SPELL_BANISH_HELPER) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BANISH, m_creature);
+                    }
+                }
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Sand Breath
+            if (m_uiSandBreathTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SAND_BREATH : SPELL_SAND_BREATH_H) == CAST_OK)
+                {
+                    m_uiSandBreathTimer = urand(15000, 25000);
+                }
+            }
+            else
+            {
+                m_uiSandBreathTimer -= uiDiff;
+            }
+
+            // Time Stop
+            if (m_uiTimeStopTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TIME_STOP) == CAST_OK)
+                {
+                    m_uiTimeStopTimer = urand(20000, 35000);
+                }
+            }
+            else
+            {
+                m_uiTimeStopTimer -= uiDiff;
+            }
+
+            // Cleave
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                {
+                    m_uiCleaveTimer = urand(7000, 12000);
+                }
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            // Frenzy
+            if (m_uiFrenzyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_GENERIC_FRENZY, m_creature);
+                    m_uiFrenzyTimer = urand(20000, 35000);
+                }
+            }
+            else
+            {
+                m_uiFrenzyTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_aeonusAI(pCreature);
+    }
+};
+
+void AddSC_boss_aeonus()
+{
+    Script* s;
+
+    s = new boss_aeonus();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_aeonus";
+    //pNewScript->GetAI = &GetAI_boss_aeonus;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
new file mode 100644
index 000000000..6a949b7d0
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
@@ -0,0 +1,197 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Chrono_Lord_Deja
+SD%Complete: 90
+SDComment: Small adjustments; Timers
+SDCategory: Caverns of Time, The Dark Portal
+EndScriptData */
+
+#include "precompiled.h"
+#include "dark_portal.h"
+
+enum
+{
+    SAY_AGGRO                   = -1269007,
+    SAY_BANISH                  = -1269008,
+    SAY_SLAY1                   = -1269009,
+    SAY_SLAY2                   = -1269010,
+    SAY_DEATH                   = -1269011,
+
+    SPELL_ARCANE_BLAST          = 31457,
+    SPELL_ARCANE_BLAST_H        = 38538,
+    SPELL_ARCANE_DISCHARGE      = 31472,
+    SPELL_ARCANE_DISCHARGE_H    = 38539,
+    SPELL_TIME_LAPSE            = 31467,
+    SPELL_ATTRACTION            = 38540
+};
+
+struct boss_chrono_lord_deja : public CreatureScript
+{
+    boss_chrono_lord_deja() : CreatureScript("boss_chrono_lord_deja") {}
+
+    struct boss_chrono_lord_dejaAI : public ScriptedAI
+    {
+        boss_chrono_lord_dejaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiArcaneBlastTimer;
+        uint32 m_uiTimeLapseTimer;
+        uint32 m_uiAttractionTimer;
+        uint32 m_uiArcaneDischargeTimer;
+
+        void Reset() override
+        {
+            m_uiArcaneBlastTimer = urand(18000, 23000);
+            m_uiTimeLapseTimer = urand(10000, 15000);
+            m_uiArcaneDischargeTimer = urand(20000, 30000);
+            m_uiAttractionTimer = urand(25000, 35000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // Despawn Time Keeper
+            if (pWho->GetTypeId() == TYPEID_UNIT && pWho->GetEntry() == NPC_TIME_KEEPER)
+            {
+                if (m_creature->IsWithinDistInMap(pWho, 20.0f))
+                {
+                    if (DoCastSpellIfCan(pWho, SPELL_BANISH_HELPER) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BANISH, m_creature);
+                    }
+                }
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Arcane Blast
+            if (m_uiArcaneBlastTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_ARCANE_BLAST : SPELL_ARCANE_BLAST_H) == CAST_OK)
+                {
+                    m_uiArcaneBlastTimer = urand(15000, 25000);
+                }
+            }
+            else
+            {
+                m_uiArcaneBlastTimer -= uiDiff;
+            }
+
+            // Arcane Discharge
+            if (m_uiArcaneDischargeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ARCANE_DISCHARGE : SPELL_ARCANE_DISCHARGE_H) == CAST_OK)
+                {
+                    m_uiArcaneDischargeTimer = urand(20000, 30000);
+                }
+            }
+            else
+            {
+                m_uiArcaneDischargeTimer -= uiDiff;
+            }
+
+            // Time Lapse
+            if (m_uiTimeLapseTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TIME_LAPSE) == CAST_OK)
+                {
+                    m_uiTimeLapseTimer = urand(15000, 25000);
+                }
+            }
+            else
+            {
+                m_uiTimeLapseTimer -= uiDiff;
+            }
+
+            // Attraction
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiAttractionTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ATTRACTION) == CAST_OK)
+                    {
+                        m_uiAttractionTimer = urand(25000, 35000);
+                    }
+                }
+                else
+                {
+                    m_uiAttractionTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_chrono_lord_dejaAI(pCreature);
+    }
+};
+
+void AddSC_boss_chrono_lord_deja()
+{
+    Script* s;
+
+    s = new boss_chrono_lord_deja();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_chrono_lord_deja";
+    //pNewScript->GetAI = &GetAI_boss_chrono_lord_deja;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp b/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
new file mode 100644
index 000000000..e07cecd67
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
@@ -0,0 +1,196 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Temporus
+SD%Complete: 90
+SDComment: Small adjustments; Timers
+SDCategory: Caverns of Time, The Dark Portal
+EndScriptData */
+
+#include "precompiled.h"
+#include "dark_portal.h"
+
+enum
+{
+    SAY_AGGRO               = -1269001,
+    SAY_BANISH              = -1269002,
+    SAY_SLAY1               = -1269003,
+    SAY_SLAY2               = -1269004,
+    SAY_DEATH               = -1269005,
+
+    SPELL_HASTE             = 31458,
+    SPELL_MORTAL_WOUND      = 31464,
+    SPELL_WING_BUFFET       = 31475,
+    SPELL_WING_BUFFET_H     = 38593,
+    SPELL_REFLECT           = 38592
+};
+
+struct boss_temporus : public CreatureScript
+{
+    boss_temporus() : CreatureScript("boss_temporus") {}
+
+    struct boss_temporusAI : public ScriptedAI
+    {
+        boss_temporusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiHasteTimer;
+        uint32 m_uiSpellReflectionTimer;
+        uint32 m_uiMortalWoundTimer;
+        uint32 m_uiWingBuffetTimer;
+
+        void Reset() override
+        {
+            m_uiHasteTimer = urand(15000, 23000);
+            m_uiSpellReflectionTimer = 30000;
+            m_uiMortalWoundTimer = 8000;
+            m_uiWingBuffetTimer = urand(25000, 35000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // Despawn Time Keeper
+            if (pWho->GetTypeId() == TYPEID_UNIT && pWho->GetEntry() == NPC_TIME_KEEPER)
+            {
+                if (m_creature->IsWithinDistInMap(pWho, 20.0f))
+                {
+                    if (DoCastSpellIfCan(pWho, SPELL_BANISH_HELPER) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BANISH, m_creature);
+                    }
+                }
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Attack Haste
+            if (m_uiHasteTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_HASTE) == CAST_OK)
+                {
+                    m_uiHasteTimer = urand(20000, 25000);
+                }
+            }
+            else
+            {
+                m_uiHasteTimer -= uiDiff;
+            }
+
+            // MortalWound_Timer
+            if (m_uiMortalWoundTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MORTAL_WOUND) == CAST_OK)
+                {
+                    m_uiMortalWoundTimer = urand(10000, 20000);
+                }
+            }
+            else
+            {
+                m_uiMortalWoundTimer -= uiDiff;
+            }
+
+            // Wing ruffet
+            if (m_uiWingBuffetTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_WING_BUFFET : SPELL_WING_BUFFET_H) == CAST_OK)
+                {
+                    m_uiWingBuffetTimer = urand(20000, 30000);
+                }
+            }
+            else
+            {
+                m_uiWingBuffetTimer -= uiDiff;
+            }
+
+            // Spell reflection
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiSpellReflectionTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_REFLECT) == CAST_OK)
+                    {
+                        m_uiSpellReflectionTimer = urand(25000, 35000);
+                    }
+                }
+                else
+                {
+                    m_uiSpellReflectionTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_temporusAI(pCreature);
+    }
+};
+
+void AddSC_boss_temporus()
+{
+    Script* s;
+
+    s = new boss_temporus();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_temporus";
+    //pNewScript->GetAI = &GetAI_boss_temporus;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp b/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
new file mode 100644
index 000000000..1d3731522
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
@@ -0,0 +1,439 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Dark_Portal
+SD%Complete: 80
+SDComment: Some things may be still missing from here
+SDCategory: Caverns of Time, The Dark Portal
+EndScriptData */
+
+/* ContentData
+npc_medivh_bm
+npc_time_rift
+EndContentData */
+
+#include "precompiled.h"
+#include "dark_portal.h"
+
+/*######
+## npc_medivh_black_morass
+######*/
+
+enum
+{
+    SAY_DEATH               = -1269025,
+
+    SPELL_CORRUPT           = 31326,
+};
+
+struct npc_medivh_black_morass : public CreatureScript
+{
+    npc_medivh_black_morass() : CreatureScript("npc_medivh_black_morass") {}
+
+    struct npc_medivh_black_morassAI : public ScriptedAI
+    {
+        npc_medivh_black_morassAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // The rift trash mobs are summoned by Medivh, so we can control the movement
+            if (pSummoned->GetEntry() != NPC_TIME_RIFT && pSummoned->GetEntry() != NPC_COUNCIL_ENFORCER)
+            {
+                float fX, fY, fZ;
+                m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 20.0f, m_creature->GetAngle(pSummoned));
+                pSummoned->SetWalk(false);
+                pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId)
+            {
+                return;
+            }
+
+            pSummoned->CastSpell(m_creature, SPELL_CORRUPT, false);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MEDIVH, FAIL);
+            }
+
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_medivh_black_morassAI(pCreature);
+    }
+};
+
+struct spell_medivh_black_morass : public SpellScript
+{
+    spell_medivh_black_morass() : SpellScript("spell_medivh_black_morass") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if ((uiSpellId == SPELL_CORRUPT && uiEffIndex == EFFECT_INDEX_0) || (uiSpellId == SPELL_CORRUPT_AEONUS && uiEffIndex == EFFECT_INDEX_0))
+        {
+            if (InstanceData* pInstance = pTarget->ToCreature()->GetInstanceData())
+            {
+                pInstance->SetData(TYPE_SHIELD, SPECIAL);
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_time_rift
+######*/
+
+enum
+{
+    SPELL_RIFT_PERIODIC     = 31320,            // should trigger 31388
+
+    // Boss spawn yells
+    SAY_CHRONO_LORD_ENTER   = -1269006,
+    SAY_TEMPORUS_ENTER      = -1269000,
+    SAY_AEONUS_ENTER        = -1269012,
+};
+
+struct RiftWaveData
+{
+    uint32 uiPortalMob[4];                      // spawns for portal waves (in order)
+};
+
+static const RiftWaveData aPortalWaves[] =
+{
+    {{NPC_ASSASSIN,    NPC_WHELP,        NPC_CHRONOMANCER, 0}},
+    {{NPC_EXECUTIONER, NPC_CHRONOMANCER, NPC_WHELP,        NPC_ASSASSIN}},
+    {{NPC_EXECUTIONER, NPC_VANQUISHER,   NPC_CHRONOMANCER, NPC_ASSASSIN}}
+};
+
+struct npc_time_rift : public CreatureScript
+{
+    npc_time_rift() : CreatureScript("npc_time_rift") {}
+
+    struct npc_time_riftAI : public ScriptedAI
+    {
+        npc_time_riftAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_bIsFirstSummon = true;
+            m_uiRiftNumber = 0;
+            m_uiRiftWaveId = 0;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bIsRegularMode;
+        bool m_bIsFirstSummon;
+
+        uint8 m_uiRiftWaveCount;
+        uint8 m_uiRiftNumber;
+        uint8 m_uiRiftWaveId;
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_RIFT_PERIODIC);
+
+            m_uiRiftWaveCount = 0;
+            m_uiRiftNumber = 0;
+
+            if (m_pInstance)
+            {
+                m_uiRiftNumber = m_pInstance->GetData(TYPE_RIFT_ID);
+
+                if (m_uiRiftNumber < 6)
+                {
+                    m_uiRiftWaveId = 0;
+                }
+                else if (m_uiRiftNumber > 12)
+                {
+                    m_uiRiftWaveId = 2;
+                }
+                else
+                {
+                    m_uiRiftWaveId = 1;
+                }
+            }
+        }
+
+        void DoSummonCreatureAtRift(uint32 uiCreatureEntry, Creature* pSummoner)
+        {
+            if (!uiCreatureEntry)
+            {
+                return;
+            }
+
+            float fX, fY, fZ;
+            m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 10.0f, fX, fY, fZ);
+            pSummoner->SummonCreature(uiCreatureEntry, fX, fY, fZ, m_creature->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit *pInvoker, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+                DoSummon();
+        }
+
+        void DoSummon()
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            uint32 uiSummonEntry = 0;
+
+            if (m_bIsFirstSummon)
+            {
+                // Select portal keeper / boss to summon
+                // On Heroic Mode if Chrono Lord and Temporus are already killed, we need to summon the replacement
+                switch (m_uiRiftNumber)
+                {
+                case 6:
+                    uiSummonEntry = (m_pInstance->GetData(TYPE_CHRONO_LORD) == DONE && !m_bIsRegularMode) ? NPC_CHRONO_LORD : NPC_CHRONO_LORD_DEJA;
+                    break;
+                case 12:
+                    uiSummonEntry = (m_pInstance->GetData(TYPE_TEMPORUS) == DONE && !m_bIsRegularMode) ? NPC_TIMEREAVER : NPC_TEMPORUS;
+                    break;
+                case 18:
+                    uiSummonEntry = NPC_AEONUS;
+                    break;
+                default:
+                    uiSummonEntry = urand(0, 1) ? NPC_RIFT_KEEPER : NPC_RIFT_LORD;
+                    break;
+                }
+
+                // Set the next rift delay
+                if (uiSummonEntry != NPC_AEONUS)
+                {
+                    m_pInstance->SetData(TYPE_TIME_RIFT, SPECIAL);
+                }
+
+                DoSummonCreatureAtRift(uiSummonEntry, m_creature);
+                m_bIsFirstSummon = false;
+            }
+            else
+            {
+                // Some creatures are summoned by Medivh, because we can better handle the movement this way
+                Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_MEDIVH);
+                if (!pMedivh)
+                {
+                    return;
+                }
+
+                // Reset the RiftWaveCount if we reached the maximum number of the currentRiftWave is 0
+                if ((m_uiRiftWaveCount > 2 && !m_uiRiftWaveId) || m_uiRiftWaveCount > 3)
+                {
+                    m_uiRiftWaveCount = 0;
+                }
+
+                uiSummonEntry = aPortalWaves[m_uiRiftWaveId].uiPortalMob[m_uiRiftWaveCount];
+                ++m_uiRiftWaveCount;
+
+                // Summon the trash waves by Medivh, so we can better handle the movement
+                // For Whelps we need to summon them in packs of 3
+                if (uiSummonEntry == NPC_WHELP)
+                {
+                    for (uint8 i = 0; i < 3; ++i)
+                    {
+                        DoSummonCreatureAtRift(uiSummonEntry, pMedivh);
+                    }
+                }
+                else
+                {
+                    DoSummonCreatureAtRift(uiSummonEntry, pMedivh);
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_CHRONO_LORD_DEJA:
+                DoCastSpellIfCan(pSummoned, SPELL_RIFT_CHANNEL);
+                DoScriptText(SAY_CHRONO_LORD_ENTER, pSummoned);
+                break;
+            case NPC_TEMPORUS:
+                DoCastSpellIfCan(pSummoned, SPELL_RIFT_CHANNEL);
+                DoScriptText(SAY_TEMPORUS_ENTER, pSummoned);
+                break;
+            case NPC_CHRONO_LORD:
+            case NPC_TIMEREAVER:
+            case NPC_RIFT_KEEPER:
+            case NPC_RIFT_LORD:
+                DoCastSpellIfCan(pSummoned, SPELL_RIFT_CHANNEL);
+                break;
+            case NPC_AEONUS:
+                DoScriptText(SAY_AEONUS_ENTER, pSummoned);
+                // Remove Time Rift aura so it won't spawn other mobs
+                m_creature->RemoveAurasDueToSpell(SPELL_RIFT_PERIODIC);
+                // Move to Medivh and cast Corrupt on him
+                pSummoned->SetWalk(false);
+                if (m_pInstance)
+                {
+                    if (Creature* pMedivh = m_pInstance->GetSingleCreatureFromStorage(NPC_MEDIVH))
+                    {
+                        float fX, fY, fZ;
+                        pMedivh->GetNearPoint(pMedivh, fX, fY, fZ, 0, 20.0f, pMedivh->GetAngle(pSummoned));
+                        pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                    }
+                }
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_AEONUS:
+                m_creature->ForcedDespawn();
+                break;
+            case NPC_CHRONO_LORD_DEJA:
+            case NPC_TEMPORUS:
+            case NPC_CHRONO_LORD:
+            case NPC_TIMEREAVER:
+            case NPC_RIFT_KEEPER:
+            case NPC_RIFT_LORD:
+                m_creature->ForcedDespawn(3000);
+                // No need to set the data to DONE if there is a new portal spawned already
+                if (m_pInstance && m_uiRiftNumber == m_pInstance->GetData(TYPE_RIFT_ID))
+                {
+                    m_pInstance->SetData(TYPE_TIME_RIFT, DONE);
+                }
+                break;
+            }
+        }
+
+        void SummonedCreatureDespawn(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_AEONUS:
+            case NPC_CHRONO_LORD_DEJA:
+            case NPC_TEMPORUS:
+            case NPC_CHRONO_LORD:
+            case NPC_TIMEREAVER:
+            case NPC_RIFT_KEEPER:
+            case NPC_RIFT_LORD:
+                // Despawn in case of event reset
+                m_creature->ForcedDespawn();
+                break;
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId || pSummoned->GetEntry() != NPC_AEONUS)
+            {
+                return;
+            }
+
+            pSummoned->CastSpell(pSummoned, SPELL_CORRUPT_AEONUS, false);
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_time_riftAI(pCreature);
+    }
+};
+
+struct spell_npc_time_rift_channel : public SpellScript
+{
+    spell_npc_time_rift_channel() : SpellScript("spell_npc_time_rift_channel") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_RIFT_PERIODIC && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (CreatureAI* pTimeRiftAI = pTarget->ToCreature()->AI())
+            {
+                pTimeRiftAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pTarget->ToCreature(), pTarget->ToCreature(), 0);
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_dark_portal()
+{
+    Script* s;
+
+    s = new npc_medivh_black_morass();
+    s->RegisterSelf();
+    s = new spell_medivh_black_morass();
+    s->RegisterSelf();
+    s = new npc_time_rift();
+    s->RegisterSelf();
+    s = new spell_npc_time_rift_channel();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_medivh_black_morass";
+    //pNewScript->GetAI = &GetAI_npc_medivh_black_morass;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_medivh_black_morass;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_time_rift";
+    //pNewScript->GetAI = &GetAI_npc_time_rift;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_time_rift_channel;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.h b/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.h
new file mode 100644
index 000000000..3ace99a4a
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.h
@@ -0,0 +1,108 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_DARKPORTAL_H
+#define DEF_DARKPORTAL_H
+
+enum
+{
+    MAX_ENCOUNTER           = 6,
+
+    TYPE_MEDIVH             = 0,
+    TYPE_SHIELD             = 1,
+    TYPE_TIME_RIFT          = 2,
+    TYPE_CHRONO_LORD        = 3,
+    TYPE_TEMPORUS           = 4,
+    TYPE_AEONUS             = 5,
+
+    TYPE_HANDLE_AREATRIGGER = MAX_ENCOUNTER,
+    TYPE_RIFT_ID            = MAX_ENCOUNTER+1,
+
+    WORLD_STATE_ID          = 2541,
+    WORLD_STATE_SHIELD      = 2540,
+    WORLD_STATE_RIFT        = 2784,
+
+    QUEST_OPENING_PORTAL    = 10297,
+    QUEST_MASTER_TOUCH      = 9836,
+
+    // event controlers
+    NPC_TIME_RIFT           = 17838,
+    NPC_MEDIVH              = 15608,
+
+    // main bosses
+    NPC_CHRONO_LORD_DEJA    = 17879,
+    NPC_TEMPORUS            = 17880,
+    NPC_AEONUS              = 17881,
+
+    // boss replacements for heroic
+    NPC_CHRONO_LORD         = 21697,
+    NPC_TIMEREAVER          = 21698,
+
+    // portal guardians
+    NPC_RIFT_KEEPER         = 21104,
+    NPC_RIFT_LORD           = 17839,
+
+    // portal summons
+    NPC_ASSASSIN            = 17835,
+    NPC_WHELP               = 21818,
+    NPC_CHRONOMANCER        = 17892,
+    NPC_EXECUTIONER         = 18994,
+    NPC_VANQUISHER          = 18995,
+
+    // additional npcs
+    NPC_COUNCIL_ENFORCER    = 17023,
+    NPC_TIME_KEEPER         = 17918,
+    NPC_SAAT                = 20201,
+    NPC_DARK_PORTAL_DUMMY   = 18625,            // cast spell 32564 on coordinates
+    NPC_DARK_PORTAL_BEAM    = 18555,            // purple beams which travel from Medivh to the Dark Portal
+
+    // event spells
+    SPELL_RIFT_CHANNEL      = 31387,            // Aura channeled by the Time Rifts on the Rift Keepers
+
+    SPELL_BANISH_HELPER     = 31550,            // used by the main bosses to banish the time keeprs
+    SPELL_CORRUPT_AEONUS    = 37853,            // used by Aeonus to corrupt Medivh
+
+    // cosmetic spells
+    SPELL_PORTAL_CRYSTAL    = 32564,            // summons 18553 - Dark Portal Crystal stalker
+    SPELL_BANISH_GREEN      = 32567,
+
+    // yells during the event
+    SAY_SAAT_WELCOME        = -1269019,
+
+    SAY_MEDIVH_INTRO        = -1269021,
+    SAY_MEDIVH_ENTER        = -1269020,
+    SAY_MEDIVH_WIN          = -1269026,
+    SAY_MEDIVH_WEAK75       = -1269022,
+    SAY_MEDIVH_WEAK50       = -1269023,
+    SAY_MEDIVH_WEAK25       = -1269024,
+    SAY_ORCS_ENTER          = -1269027,
+    SAY_ORCS_ANSWER         = -1269028,
+
+    AREATRIGGER_MEDIVH      = 4288,
+    AREATRIGGER_ENTER       = 4485,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
new file mode 100644
index 000000000..43c4a90d5
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
@@ -0,0 +1,515 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Dark_Portal
+SD%Complete: 75
+SDComment: Quest support: 9836, 10297. Some visuals for the event are missing; Event epilogue NYI.
+SDCategory: Caverns of Time, The Dark Portal
+EndScriptData */
+
+#include "precompiled.h"
+#include "dark_portal.h"
+
+struct PortalData
+{
+    float fX, fY, fZ, fOrient;
+};
+
+static const PortalData afPortalLocation[] =
+{
+    { -2030.832f, 7024.944f, 23.07182f, 3.141593f },
+    { -1961.734f, 7029.528f, 21.8114f, 2.129302f },
+    { -1887.695f, 7106.557f, 22.0495f, 4.956735f },
+    { -1930.911f, 7183.597f, 23.00764f, 3.595378f }
+};
+
+// Dark Crystal summon location
+static const float fDarkPortalCrystalLoc[3] = { -2024.31f, 7127.75f, 22.65419f };
+
+static const int32 uiMedivhWeakYell[3] = { SAY_MEDIVH_WEAK75, SAY_MEDIVH_WEAK50, SAY_MEDIVH_WEAK25 };
+
+struct is_dark_portal : public InstanceScript
+{
+    is_dark_portal() : InstanceScript("instance_dark_portal") {}
+
+    class instance_dark_portal : public ScriptedInstance
+    {
+    public:
+        instance_dark_portal(Map* pMap) : ScriptedInstance(pMap),
+            m_uiWorldState(0),
+            m_uiWorldStateRiftCount(0),
+            m_uiWorldStateShieldCount(100),
+
+            m_bHasIntroYelled(false),
+            m_uiMedivhYellCount(1),
+
+            m_uiNextPortalTimer(0),
+            m_uiCurrentRiftId(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            UpdateWorldState(m_auiEncounter[TYPE_MEDIVH] == IN_PROGRESS ? true : false);
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_MEDIVH:
+            case NPC_SAAT:
+            case NPC_DARK_PORTAL_DUMMY:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_CHRONO_LORD_DEJA:
+            case NPC_CHRONO_LORD:
+                SetData(TYPE_CHRONO_LORD, IN_PROGRESS);
+                break;
+            case NPC_TEMPORUS:
+            case NPC_TIMEREAVER:
+                SetData(TYPE_TEMPORUS, IN_PROGRESS);
+                break;
+            case NPC_AEONUS:
+                SetData(TYPE_AEONUS, IN_PROGRESS);
+                // no break
+            case NPC_ASSASSIN:
+            case NPC_WHELP:
+            case NPC_CHRONOMANCER:
+            case NPC_EXECUTIONER:
+            case NPC_VANQUISHER:
+                pCreature->InterruptNonMeleeSpells(false);
+                break;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature)
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_CHRONO_LORD_DEJA:
+            case NPC_CHRONO_LORD:
+                SetData(TYPE_CHRONO_LORD, FAIL);
+                break;
+            case NPC_TEMPORUS:
+            case NPC_TIMEREAVER:
+                SetData(TYPE_TEMPORUS, FAIL);
+                break;
+            case NPC_AEONUS:
+                SetData(TYPE_AEONUS, FAIL);
+                // no break;
+                // Allow these guys to go and finish off Medivh
+            case NPC_ASSASSIN:
+            case NPC_WHELP:
+            case NPC_CHRONOMANCER:
+            case NPC_EXECUTIONER:
+            case NPC_VANQUISHER:
+                if (Creature* pMedivh = GetSingleCreatureFromStorage(NPC_MEDIVH))
+                {
+                    float fX, fY, fZ;
+                    pMedivh->GetNearPoint(pMedivh, fX, fY, fZ, 0, 20.0f, pMedivh->GetAngle(pCreature));
+                    pCreature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                }
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_CHRONO_LORD_DEJA:
+            case NPC_CHRONO_LORD:
+                SetData(TYPE_CHRONO_LORD, DONE);
+                break;
+            case NPC_TEMPORUS:
+            case NPC_TIMEREAVER:
+                SetData(TYPE_TEMPORUS, DONE);
+                break;
+            case NPC_AEONUS:
+                SetData(TYPE_AEONUS, DONE);
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_MEDIVH:
+                if (uiData == IN_PROGRESS)
+                {
+                    if (Creature* pMedivh = GetSingleCreatureFromStorage(NPC_MEDIVH))
+                    {
+                        if (pMedivh->IsAlive())
+                        {
+                            DoScriptText(SAY_MEDIVH_ENTER, pMedivh);
+                        }
+                        // If Medivh is not available then do not store the uiData;
+                        else
+                        {
+                            return;
+                        }
+                    }
+
+                    // TODO:
+                    // Start the Portal Crystal casting - by the Dark Portal Dumm Npc
+                    // Also Start summoning the Dark Portal Beams
+
+                    UpdateWorldState();
+                    m_uiNextPortalTimer = 3000;
+                }
+                else if (uiData == DONE)
+                {
+                    // Yell for event finished
+                    if (Creature* pMedivh = GetSingleCreatureFromStorage(NPC_MEDIVH))
+                    {
+                        DoScriptText(SAY_MEDIVH_WIN, pMedivh);
+                        pMedivh->SetFacingTo(6.15f);
+                        pMedivh->InterruptNonMeleeSpells(false);
+                        pMedivh->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                    }
+
+                    // this may be completed further out in the post-event
+                    Map::PlayerList const& players = instance->GetPlayers();
+
+                    if (!players.isEmpty())
+                    {
+                        for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                        {
+                            if (Player* pPlayer = itr->getSource())
+                            {
+                                if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE)
+                                {
+                                    pPlayer->AreaExploredOrEventHappens(QUEST_OPENING_PORTAL);
+                                }
+
+                                if (pPlayer->GetQuestStatus(QUEST_MASTER_TOUCH) == QUEST_STATUS_INCOMPLETE)
+                                {
+                                    pPlayer->AreaExploredOrEventHappens(QUEST_MASTER_TOUCH);
+                                }
+                            }
+                        }
+                    }
+                }
+                else if (uiData == FAIL)
+                {
+                    DoResetEvent();
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_SHIELD:
+                if (uiData == SPECIAL)
+                {
+                    --m_uiWorldStateShieldCount;
+                    DoUpdateWorldState(WORLD_STATE_SHIELD, m_uiWorldStateShieldCount);
+
+                    // Yell at 75%, 50% and 25% shield
+                    if (m_uiWorldStateShieldCount < 100 - 25 * m_uiMedivhYellCount)
+                    {
+                        if (Creature* pMedivh = GetSingleCreatureFromStorage(NPC_MEDIVH))
+                        {
+                            DoScriptText(uiMedivhWeakYell[m_uiMedivhYellCount - 1], pMedivh);
+                            ++m_uiMedivhYellCount;
+                        }
+                    }
+
+                    // Kill the npc when the shield is broken
+                    if (!m_uiWorldStateShieldCount)
+                    {
+                        if (Creature* pMedivh = GetSingleCreatureFromStorage(NPC_MEDIVH))
+                        {
+                            if (pMedivh->IsAlive())
+                            {
+                                pMedivh->DealDamage(pMedivh, pMedivh->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                            }
+                        }
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                return;
+            case TYPE_TIME_RIFT:
+                // Set the delay to the next time rift from the point the rift despawns
+                if (uiData == DONE)
+                {
+                    m_uiNextPortalTimer = IsBossTimeRift() ? 125000 : 3000;
+                }
+                // Set the delay to the next time rift from the point the rift summons it's guardian
+                // ToDo: research if these timers are correct
+                else if (uiData == SPECIAL)
+                {
+                    m_uiNextPortalTimer = IsBossTimeRift() ? 0 : m_uiWorldStateRiftCount > 12 ? 90000 : 2 * MINUTE * IN_MILLISECONDS;
+                }
+
+                m_auiEncounter[uiType] = uiData;
+                return;
+            case TYPE_CHRONO_LORD:
+            case TYPE_TEMPORUS:
+                if (m_auiEncounter[uiType] != DONE)             // Keep the DONE-information stored
+                {
+                    m_auiEncounter[uiType] = uiData;
+                }
+                break;
+            case TYPE_AEONUS:
+                if (uiData == DONE)
+                {
+                    UpdateWorldState(false);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_HANDLE_AREATRIGGER:
+                DoHandleAreaTrigger(uiData);
+                return;
+            default:
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            if (uiType == TYPE_RIFT_ID)
+                return m_uiWorldStateRiftCount;
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (GetData(TYPE_MEDIVH) != IN_PROGRESS)
+            {
+                return;
+            }
+
+            if (m_uiNextPortalTimer)
+            {
+                if (m_uiNextPortalTimer <= uiDiff)
+                {
+                    DoUpdateWorldState(WORLD_STATE_RIFT, ++m_uiWorldStateRiftCount);
+
+                    DoSpawnNextPortal();
+                    m_uiNextPortalTimer = 0;
+                }
+                else
+                {
+                    m_uiNextPortalTimer -= uiDiff;
+                }
+            }
+        }
+
+    private:
+        bool IsBossTimeRift() { return m_uiWorldStateRiftCount == 6 || m_uiWorldStateRiftCount == 12; }
+        void UpdateWorldState(bool bEnable = true)
+        {
+            m_uiWorldState = bEnable ? 1 : 0;
+
+            DoUpdateWorldState(WORLD_STATE_ID, m_uiWorldState);
+            DoUpdateWorldState(WORLD_STATE_SHIELD, m_uiWorldStateShieldCount);
+            DoUpdateWorldState(WORLD_STATE_RIFT, m_uiWorldStateRiftCount);
+        }
+
+        void DoSpawnNextPortal()
+        {
+            if (Creature* pMedivh = GetSingleCreatureFromStorage(NPC_MEDIVH))
+            {
+                // Randomize portal locations
+                uint8 uiTmp = urand(0, 2);
+
+                if (uiTmp >= m_uiCurrentRiftId)
+                {
+                    ++uiTmp;
+                }
+
+                debug_log("SD3: instance_dark_portal: SetRiftId %u, old was id %u.", uiTmp, m_uiCurrentRiftId);
+
+                m_uiCurrentRiftId = uiTmp;
+
+                // Summon next portal
+                pMedivh->SummonCreature(NPC_TIME_RIFT, afPortalLocation[uiTmp].fX, afPortalLocation[uiTmp].fY, afPortalLocation[uiTmp].fZ, afPortalLocation[uiTmp].fOrient, TEMPSUMMON_CORPSE_DESPAWN, 0);
+            }
+        }
+
+        void DoResetEvent()
+        {
+            UpdateWorldState(false);
+
+            m_uiWorldStateShieldCount = 100;
+            m_uiWorldStateRiftCount = 0;
+
+            m_uiCurrentRiftId = 0;
+            m_uiNextPortalTimer = 0;
+            m_uiMedivhYellCount = 1;
+        }
+
+        void DoHandleAreaTrigger(uint32 uiTriggerId)
+        {
+            if (uiTriggerId == AREATRIGGER_ENTER)
+            {
+                // Yell at instance entrance
+                if (!m_bHasIntroYelled)
+                {
+                    if (Creature* pSaat = GetSingleCreatureFromStorage(NPC_SAAT))
+                    {
+                        DoScriptText(SAY_SAAT_WELCOME, pSaat);
+                    }
+                    m_bHasIntroYelled = true;
+                }
+            }
+            else if (uiTriggerId == AREATRIGGER_MEDIVH)
+            {
+                // Start Dark Portal event
+                if (GetData(TYPE_MEDIVH) == NOT_STARTED || GetData(TYPE_MEDIVH) == FAIL)
+                {
+                    SetData(TYPE_MEDIVH, IN_PROGRESS);
+                }
+                // Start Epilogue
+                else if (GetData(TYPE_AEONUS) == DONE && GetData(TYPE_MEDIVH) != DONE)
+                {
+                    SetData(TYPE_MEDIVH, DONE);
+                }
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiWorldState;
+        uint32 m_uiWorldStateRiftCount;
+        uint32 m_uiWorldStateShieldCount;
+
+        bool m_bHasIntroYelled;
+        uint32 m_uiMedivhYellCount;
+
+        uint32 m_uiNextPortalTimer;
+        uint8 m_uiCurrentRiftId;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_dark_portal(pMap);
+    }
+};
+
+struct at_dark_portal : public AreaTriggerScript
+{
+    at_dark_portal() : AreaTriggerScript("at_dark_portal") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (pAt->id == AREATRIGGER_MEDIVH || pAt->id == AREATRIGGER_ENTER)
+        {
+            if (pPlayer->isGameMaster() || pPlayer->IsDead())
+            {
+                return false;
+            }
+
+            if (InstanceData* pInstance = pPlayer->GetInstanceData())
+            {
+                pInstance->SetData(TYPE_HANDLE_AREATRIGGER, pAt->id);
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_instance_dark_portal()
+{
+    Script* s;
+
+    s = new is_dark_portal();
+    s->RegisterSelf();
+    s = new at_dark_portal();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_dark_portal";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_dark_portal;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_dark_portal";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_dark_portal;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp b/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
new file mode 100644
index 000000000..075a7f1a2
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
@@ -0,0 +1,482 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Archimonde
+SD%Complete: 85
+SDComment: Timers; Some details may need adjustments.
+SDCategory: Caverns of Time, Mount Hyjal
+EndScriptData */
+
+#include "precompiled.h"
+#include "hyjal.h"
+
+enum
+{
+    SAY_INTRO                   = -1534018,
+    SAY_AGGRO                   = -1534019,
+    SAY_DOOMFIRE1               = -1534020,
+    SAY_DOOMFIRE2               = -1534021,
+    SAY_AIR_BURST1              = -1534022,
+    SAY_AIR_BURST2              = -1534023,
+    SAY_SLAY1                   = -1534024,
+    SAY_SLAY2                   = -1534025,
+    SAY_SLAY3                   = -1534026,
+    SAY_ENRAGE                  = -1534027,
+    SAY_EPILOGUE                = -1534028,
+    SAY_SOUL_CHARGE1            = -1534029,
+    SAY_SOUL_CHARGE2            = -1534030,
+
+    // spells
+    SPELL_DRAIN_TREE            = 39140,                    // intro cosmetic spell
+    // SPELL_DRAIN_TREE_DUMMY    = 39141,                   // purpose unk
+
+    SPELL_FINGER_DEATH          = 31984,
+    SPELL_FINGER_DEATH_SCRIPT   = 32111,                    // targets whisps
+    SPELL_FINGER_DEATH_DUMMY    = 39369,                    // epilogue spell
+    SPELL_HAND_OF_DEATH         = 35354,                    // hard enrage spell
+    SPELL_AIR_BURST             = 32014,
+    SPELL_GRIP_OF_THE_LEGION    = 31972,
+    SPELL_DOOMFIRE_STRIKE       = 31903,                    // summons 18095 and 18104
+    SPELL_SOUL_CHARGE_YELLOW    = 32045,                    // procs 32054
+    SPELL_SOUL_CHARGE_GREEN     = 32051,                    // procs 32057
+    SPELL_SOUL_CHARGE_RED       = 32052,                    // procs 32053
+    SPELL_FEAR                  = 31970,
+
+    SPELL_PROTECTION_OF_ELUNE   = 38528,                    // protect the players on epilogue
+
+    // summoned creatures
+    NPC_DOOMFIRE                = 18095,
+    // NPC_DOOMFIRE_SPIRIT       = 18104,
+    NPC_ANCIENT_WISP            = 17946,
+    NPC_CHANNEL_TARGET          = 22418,                    // if he gets in range of 75.0f, then he gets enraged
+
+    // doomfire spells
+    SPELL_DOOMFIRE_SPAWN        = 32074,
+    SPELL_DOOMFIRE              = 31945,                    // fire damage spell
+
+    // wisp spells
+    SPELL_DENOUEMENT_WISP       = 32124,
+    SPELL_ANCIENT_SPARK         = 39349,
+};
+
+/* Finally, Archimonde's script. His script isn't extremely complex, most are simply spells on timers.
+   The only complicated aspect of the battle is Finger of Death and Doomfire, with Doomfire being the
+   hardest bit to code. Finger of Death is simply a distance check - if no one is in melee range, then
+   select a random target and cast the spell on them. However, if someone IS in melee range, and this
+   is NOT the main tank (creature's victim), then we aggro that player and they become the new victim.
+   For Doomfire, we summon a mob (Doomfire Spirit) for the Doomfire mob to follow. It's spirit will
+   randomly select it's target to follow and then we create the random movement making it unpredictable.
+*/
+
+struct boss_archimonde : public CreatureScript
+{
+    boss_archimonde() : CreatureScript("boss_archimonde") {}
+
+    struct boss_archimondeAI : public ScriptedAI
+    {
+        boss_archimondeAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bHasIntro = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiDrainNordrassilTimer;
+        uint32 m_uiFearTimer;
+        uint32 m_uiAirBurstTimer;
+        uint32 m_uiGripOfTheLegionTimer;
+        uint32 m_uiDoomfireTimer;
+        uint32 m_uiFingerOfDeathTimer;
+        uint32 m_uiHandOfDeathTimer;
+        uint32 m_uiSummonWispTimer;
+        uint32 m_uiWispCount;
+        uint32 m_uiEnrageTimer;
+
+        bool m_bHasIntro;
+        bool m_bIsEnraged;
+        bool m_bIsEpilogue;
+        bool m_bStartEpilogue;
+
+        void Reset() override
+        {
+            m_uiDrainNordrassilTimer = 10000;
+            m_uiFearTimer = 40000;
+            m_uiAirBurstTimer = 30000;
+            m_uiGripOfTheLegionTimer = urand(5000, 25000);
+            m_uiDoomfireTimer = 15000;
+            m_uiFingerOfDeathTimer = 15000;
+            m_uiHandOfDeathTimer = 2000;
+            m_uiWispCount = 0;
+            m_uiEnrageTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            m_bIsEnraged = false;
+            m_bIsEpilogue = false;
+            m_bStartEpilogue = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // If the boss reaches the tree during the fight, then he enrages - the distance is not very clear
+            if (!m_bIsEnraged && pWho->GetEntry() == NPC_CHANNEL_TARGET && pWho->IsWithinDistInMap(m_creature, 75.0f))
+            {
+                m_uiEnrageTimer = 1000;
+                m_bIsEnraged = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY3, m_creature); break;
+            }
+
+            switch (pVictim->getClass())
+            {
+            case CLASS_PRIEST:
+            case CLASS_PALADIN:
+            case CLASS_WARLOCK:
+                pVictim->CastSpell(m_creature, SPELL_SOUL_CHARGE_RED, true);
+                break;
+            case CLASS_MAGE:
+            case CLASS_ROGUE:
+            case CLASS_WARRIOR:
+                pVictim->CastSpell(m_creature, SPELL_SOUL_CHARGE_YELLOW, true);
+                break;
+            case CLASS_DRUID:
+            case CLASS_SHAMAN:
+            case CLASS_HUNTER:
+                pVictim->CastSpell(m_creature, SPELL_SOUL_CHARGE_GREEN, true);
+                break;
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            // Start epilogue at 10% hp
+            if (m_bIsEpilogue)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_PROTECTION_OF_ELUNE) == CAST_OK)
+                {
+                    m_uiFingerOfDeathTimer = 5000;
+                    m_bStartEpilogue = true;
+                }
+            }
+            else if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ARCHIMONDE, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_ANCIENT_WISP)
+            {
+                pSummoned->AI()->AttackStart(m_creature);
+                ++m_uiWispCount;
+
+                // When enough wisps have gathered or boss is low hp, then kill him
+                if (m_uiWispCount >= 45 || m_creature->GetHealthPercent() <= 1.0f)
+                {
+                    pSummoned->CastSpell(pSummoned, SPELL_DENOUEMENT_WISP, false);
+                }
+            }
+            else if (pSummoned->GetEntry() == NPC_DOOMFIRE)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_DOOMFIRE_SPAWN, true);
+                pSummoned->CastSpell(pSummoned, SPELL_DOOMFIRE, true, NULL, NULL, m_creature->GetObjectGuid());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Intro timer
+            if (m_uiDrainNordrassilTimer)
+            {
+                if (m_uiDrainNordrassilTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DRAIN_TREE) == CAST_OK)
+                    {
+                        if (!m_bHasIntro)
+                        {
+                            DoScriptText(SAY_INTRO, m_creature);
+                            m_bHasIntro = true;
+                        }
+                        m_uiDrainNordrassilTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiDrainNordrassilTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Start epilogue - fight was won!
+            if (m_creature->GetHealthPercent() < 10.0f)
+            {
+                if (!m_bIsEpilogue)
+                {
+                    DoScriptText(SAY_EPILOGUE, m_creature);
+
+                    // move at home position and start outro
+                    m_creature->GetMotionMaster()->MoveTargetedHome();
+                    SetCombatMovement(false);
+                    m_bIsEpilogue = true;
+                }
+
+                if (m_bStartEpilogue)
+                {
+                    // Spam Finger of Death on players and Wisps
+                    if (m_uiFingerOfDeathTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, urand(0, 1) ? SPELL_FINGER_DEATH_DUMMY : SPELL_FINGER_DEATH_SCRIPT) == CAST_OK)
+                        {
+                            m_uiFingerOfDeathTimer = 1000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiFingerOfDeathTimer -= uiDiff;
+                    }
+
+                    if (m_uiSummonWispTimer < uiDiff)
+                    {
+                        float fX, fY, fZ;
+                        m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 75.0f, urand(0, 1) ? frand(0, 2.8f) : frand(4.3f, M_PI_F * 2));
+                        m_creature->SummonCreature(NPC_ANCIENT_WISP, fX, fY, fZ, 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 15000);
+                        m_uiSummonWispTimer = urand(1000, 1500);
+                    }
+                    else
+                    {
+                        m_uiSummonWispTimer -= uiDiff;
+                    }
+                }
+
+                // Stop using the other spells
+                return;
+            }
+
+            if (m_uiEnrageTimer)
+            {
+                if (m_uiEnrageTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_HAND_OF_DEATH) == CAST_OK)
+                    {
+                        DoScriptText(SAY_ENRAGE, m_creature);
+                        m_uiEnrageTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiEnrageTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiGripOfTheLegionTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_GRIP_OF_THE_LEGION) == CAST_OK)
+                    {
+                        m_uiGripOfTheLegionTimer = urand(5000, 25000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiGripOfTheLegionTimer -= uiDiff;
+            }
+
+            if (m_uiAirBurstTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_AIR_BURST) == CAST_OK)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_AIR_BURST1 : SAY_AIR_BURST2, m_creature);
+                    m_uiAirBurstTimer = urand(25000, 40000);
+                }
+            }
+            else
+            {
+                m_uiAirBurstTimer -= uiDiff;
+            }
+
+            if (m_uiFearTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FEAR) == CAST_OK)
+                {
+                    m_uiFearTimer = 42000;
+                }
+            }
+            else
+            {
+                m_uiFearTimer -= uiDiff;
+            }
+
+            if (m_uiDoomfireTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DOOMFIRE_STRIKE) == CAST_OK)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_DOOMFIRE1 : SAY_DOOMFIRE2, m_creature);
+                    m_uiDoomfireTimer = urand(10000, 15000);
+                }
+            }
+            else
+            {
+                m_uiDoomfireTimer -= uiDiff;
+            }
+
+            // If we are within range melee the target
+            if (m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+            {
+                DoMeleeAttackIfReady();
+            }
+            // Else spam Finger of Death
+            else
+            {
+                if (!m_creature->IsNonMeleeSpellCasted(false))
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        DoCastSpellIfCan(pTarget, SPELL_FINGER_DEATH);
+                    }
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_archimondeAI(pCreature);
+    }
+};
+
+/* This is the script for the Doomfire Spirit Mob. This mob controls the doomfire npc and allows it to move randomly around the map. */
+struct npc_doomfire_spirit : public CreatureScript
+{
+    npc_doomfire_spirit() : CreatureScript("npc_doomfire_spirit") {}
+
+    struct npc_doomfire_spiritAI : public ScriptedAI
+    {
+        npc_doomfire_spiritAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_doomfireGuid;
+
+        uint32 m_uiDoomfireLoadTimer;
+        uint32 m_uiChangeTargetTimer;
+        float m_fAngle;
+
+        void Reset() override
+        {
+            m_uiDoomfireLoadTimer = 1000;
+            m_uiChangeTargetTimer = 1500;
+            m_fAngle = urand(0, M_PI_F * 2);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiDoomfireLoadTimer)
+            {
+                if (m_uiDoomfireLoadTimer <= uiDiff)
+                {
+                    // Get the closest doomfire
+                    if (Creature* pTemp = GetClosestCreatureWithEntry(m_creature, NPC_DOOMFIRE, 5.0f))
+                    {
+                        m_doomfireGuid = pTemp->GetObjectGuid();
+                    }
+
+                    m_uiDoomfireLoadTimer = 0;
+                }
+                else
+                {
+                    m_uiDoomfireLoadTimer -= uiDiff;
+                }
+            }
+
+            // It's not very clear how should this one move. For the moment just move to random points around on timer
+            if (m_uiChangeTargetTimer < uiDiff)
+            {
+                if (Creature* pDoomfire = m_creature->GetMap()->GetCreature(m_doomfireGuid))
+                {
+                    float fX, fY, fZ;
+                    pDoomfire->GetNearPoint(pDoomfire, fX, fY, fZ, 0, 30.0f, m_fAngle + frand(0, M_PI_F * .5));
+                    pDoomfire->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                }
+
+                m_uiChangeTargetTimer = 4000;
+            }
+            else
+            {
+                m_uiChangeTargetTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_doomfire_spiritAI(pCreature);
+    }
+};
+
+void AddSC_boss_archimonde()
+{
+    Script* s;
+
+    s = new boss_archimonde();
+    s->RegisterSelf();
+    s = new npc_doomfire_spirit();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_archimonde";
+    //pNewScript->GetAI = &GetAI_boss_archimonde;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_doomfire_spirit";
+    //pNewScript->GetAI = &GetAI_npc_doomfire_spirit;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp b/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
new file mode 100644
index 000000000..0b1f67de0
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
@@ -0,0 +1,300 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Hyjal
+SD%Complete: 80
+SDComment: gossip text id's unknown
+SDCategory: Caverns of Time, Mount Hyjal
+EndScriptData */
+
+/* ContentData
+npc_jaina_proudmoore
+npc_thrall
+npc_tyrande_whisperwind
+EndContentData */
+
+#include "precompiled.h"
+#include "hyjalAI.h"
+
+enum
+{
+    GOSSIP_ITEM_JAINA_BEGIN         = -3534000,
+    GOSSIP_ITEM_JAINA_ANATHERON     = -3534001,
+    GOSSIP_ITEM_JAINA_SUCCCESS      = -3534002,
+
+    GOSSIP_ITEM_THRALL_BEGIN        = -3534003,
+    GOSSIP_ITEM_THRALL_AZGALOR      = -3534004,
+    GOSSIP_ITEM_THRALL_SUCCESS      = -3534005,
+
+    GOSSIP_ITEM_TYRANDE_AID         = -3534006,
+
+    // Note: additional menu items include 9230 and 9398.
+    GOSSIP_MENU_ID_DEFAULT          = 907,                  // this is wrong, but currently we don't know which are the right ids
+};
+
+struct npc_jaina_proudmoore : public CreatureScript
+{
+    npc_jaina_proudmoore() : CreatureScript("npc_jaina_proudmoore") {}
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        hyjalAI* pTempAI = new hyjalAI(pCreature);
+
+        pTempAI->m_aSpells[0].m_uiSpellId = SPELL_BLIZZARD;
+        pTempAI->m_aSpells[0].m_uiCooldown = urand(15000, 35000);
+        pTempAI->m_aSpells[0].m_pType = TARGETTYPE_RANDOM;
+
+        pTempAI->m_aSpells[1].m_uiSpellId = SPELL_PYROBLAST;
+        pTempAI->m_aSpells[1].m_uiCooldown = urand(2000, 9000);
+        pTempAI->m_aSpells[1].m_pType = TARGETTYPE_RANDOM;
+
+        pTempAI->m_aSpells[2].m_uiSpellId = SPELL_SUMMON_ELEMENTALS;
+        pTempAI->m_aSpells[2].m_uiCooldown = urand(15000, 45000);
+        pTempAI->m_aSpells[2].m_pType = TARGETTYPE_SELF;
+
+        return pTempAI;
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if (hyjalAI* pJainaAI = dynamic_cast<hyjalAI*>(pCreature->AI()))
+            {
+                if (!pJainaAI->IsEventInProgress())
+                {
+                    // Should not happen that jaina is here now, but for safe we check
+                    if (pInstance->GetData(TYPE_KAZROGAL) != DONE)
+                    {
+                        if (pInstance->GetData(TYPE_WINTERCHILL) == NOT_STARTED || pInstance->GetData(TYPE_WINTERCHILL) == FAIL)
+                        {
+                            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_JAINA_BEGIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                        }
+                        else if (pInstance->GetData(TYPE_WINTERCHILL) == DONE && (pInstance->GetData(TYPE_ANETHERON) == NOT_STARTED || pInstance->GetData(TYPE_ANETHERON) == FAIL))
+                        {
+                            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_JAINA_ANATHERON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+                        }
+                        else if (pInstance->GetData(TYPE_ANETHERON) == DONE)
+                        {
+                            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_JAINA_SUCCCESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+                        }
+
+                        if (pPlayer->isGameMaster())
+                        {
+                            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, "[GM] Toggle Debug Timers", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+                        }
+                    }
+                }
+            }
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_DEFAULT, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (hyjalAI* pJainaAI = dynamic_cast<hyjalAI*>(pCreature->AI()))
+        {
+            switch (uiAction)
+            {
+            case GOSSIP_ACTION_INFO_DEF + 1:
+                pJainaAI->StartEvent();
+                break;
+            case GOSSIP_ACTION_INFO_DEF + 2:
+                pJainaAI->m_bIsFirstBossDead = true;
+                pJainaAI->m_uiWaveCount = 9;
+                pJainaAI->StartEvent();
+                break;
+            case GOSSIP_ACTION_INFO_DEF + 3:
+                pJainaAI->Retreat();
+                break;
+            case GOSSIP_ACTION_INFO_DEF:
+                pJainaAI->m_bDebugMode = !pJainaAI->m_bDebugMode;
+                debug_log("SD3: HyjalAI - Debug mode has been toggled %s", pJainaAI->m_bDebugMode ? "on" : "off");
+                break;
+            }
+        }
+
+        pPlayer->CLOSE_GOSSIP_MENU();
+        return true;
+    }
+};
+
+struct npc_thrall : public CreatureScript
+{
+    npc_thrall() : CreatureScript("npc_thrall") {}
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        hyjalAI* pTempAI = new hyjalAI(pCreature);
+
+        pTempAI->m_aSpells[0].m_uiSpellId = SPELL_CHAIN_LIGHTNING;
+        pTempAI->m_aSpells[0].m_uiCooldown = urand(2000, 7000);
+        pTempAI->m_aSpells[0].m_pType = TARGETTYPE_VICTIM;
+
+        pTempAI->m_aSpells[1].m_uiSpellId = SPELL_FERAL_SPIRIT;
+        pTempAI->m_aSpells[1].m_uiCooldown = urand(6000, 41000);
+        pTempAI->m_aSpells[1].m_pType = TARGETTYPE_RANDOM;
+
+        return pTempAI;
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if (hyjalAI* pThrallAI = dynamic_cast<hyjalAI*>(pCreature->AI()))
+            {
+                if (!pThrallAI->IsEventInProgress())
+                {
+                    // Only let them start the Horde phases if Anetheron is dead.
+                    if (pInstance->GetData(TYPE_ANETHERON) == DONE && pInstance->GetData(TYPE_ARCHIMONDE) != DONE)
+                    {
+                        if (pInstance->GetData(TYPE_KAZROGAL) == NOT_STARTED || pInstance->GetData(TYPE_KAZROGAL) == FAIL)
+                        {
+                            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THRALL_BEGIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                        }
+                        else if (pInstance->GetData(TYPE_KAZROGAL) == DONE && (pInstance->GetData(TYPE_AZGALOR) == NOT_STARTED || pInstance->GetData(TYPE_AZGALOR) == FAIL))
+                        {
+                            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THRALL_AZGALOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+                        }
+                        else if (pInstance->GetData(TYPE_AZGALOR) == DONE)
+                        {
+                            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THRALL_SUCCESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+                        }
+
+                        if (pPlayer->isGameMaster())
+                        {
+                            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, "[GM] Toggle Debug Timers", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+                        }
+                    }
+                }
+            }
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_DEFAULT, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (hyjalAI* pThrallAI = dynamic_cast<hyjalAI*>(pCreature->AI()))
+        {
+            switch (uiAction)
+            {
+            case GOSSIP_ACTION_INFO_DEF + 1:
+                pThrallAI->StartEvent();
+                break;
+            case GOSSIP_ACTION_INFO_DEF + 2:
+                pThrallAI->m_bIsFirstBossDead = true;
+                pThrallAI->m_uiWaveCount = 9;
+                pThrallAI->StartEvent();
+                break;
+            case GOSSIP_ACTION_INFO_DEF + 3:
+                pThrallAI->Retreat();
+                break;
+            case GOSSIP_ACTION_INFO_DEF:
+                pThrallAI->m_bDebugMode = !pThrallAI->m_bDebugMode;
+                debug_log("SD3: HyjalAI - Debug mode has been toggled %s", pThrallAI->m_bDebugMode ? "on" : "off");
+                break;
+            }
+        }
+
+        pPlayer->CLOSE_GOSSIP_MENU();
+        return true;
+    }
+};
+
+struct npc_tyrande_whisperwind : public CreatureScript
+{
+    npc_tyrande_whisperwind() : CreatureScript("npc_tyrande_whisperwind") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            // Only let them get item if Azgalor is dead.
+            if (pInstance->GetData(TYPE_AZGALOR) == DONE && !pPlayer->HasItemCount(ITEM_TEAR_OF_GODDESS, 1))
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE_AID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+            }
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_DEFAULT, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF)
+        {
+            if (Item* pItem = pPlayer->StoreNewItemInInventorySlot(ITEM_TEAR_OF_GODDESS, 1))
+            {
+                pPlayer->SendNewItem(pItem, 1, true, false);
+            }
+        }
+
+        pPlayer->CLOSE_GOSSIP_MENU();
+        return true;
+    }
+};
+
+void AddSC_hyjal()
+{
+    Script* s;
+
+    s = new npc_jaina_proudmoore();
+    s->RegisterSelf();
+    s = new npc_thrall();
+    s->RegisterSelf();
+    s = new npc_tyrande_whisperwind();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_jaina_proudmoore";
+    //pNewScript->GetAI = &GetAI_npc_jaina_proudmoore;
+    //pNewScript->pGossipHello = &GossipHello_npc_jaina_proudmoore;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_jaina_proudmoore;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_thrall";
+    //pNewScript->GetAI = &GetAI_npc_thrall;
+    //pNewScript->pGossipHello = &GossipHello_npc_thrall;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_thrall;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_tyrande_whisperwind";
+    //pNewScript->pGossipHello = &GossipHello_npc_tyrande_whisperwind;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_tyrande_whisperwind;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/hyjal.h b/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/hyjal.h
new file mode 100644
index 000000000..5b8926c68
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/hyjal.h
@@ -0,0 +1,75 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_HYJAL_H
+#define DEF_HYJAL_H
+
+enum
+{
+    MAX_ENCOUNTER               = 5,
+
+    TYPE_WINTERCHILL            = 0,
+    TYPE_ANETHERON              = 1,
+    TYPE_KAZROGAL               = 2,
+    TYPE_AZGALOR                = 3,
+    TYPE_ARCHIMONDE             = 4,
+
+    TYPE_TRASH_COUNT            = 5,
+    TYPE_RETREAT                = 6,
+
+    WORLD_STATE_WAVES           = 2842,
+    WORLD_STATE_ENEMY           = 2453,
+    WORLD_STATE_ENEMYCOUNT      = 2454,
+
+    NPC_JAINA                   = 17772,
+    NPC_THRALL                  = 17852,
+    NPC_TYRANDE                 = 17948,
+
+    // Bosses summoned after every 8 waves
+    NPC_WINTERCHILL             = 17767,
+    NPC_ANETHERON               = 17808,
+    NPC_KAZROGAL                = 17888,
+    NPC_AZGALOR                 = 17842,
+    NPC_ARCHIMONDE              = 17968,
+
+    // Trash Mobs summoned in waves
+    NPC_NECRO                   = 17899,
+    NPC_ABOMI                   = 17898,
+    NPC_GHOUL                   = 17895,
+    NPC_BANSH                   = 17905,
+    NPC_CRYPT                   = 17897,
+    NPC_GARGO                   = 17906,
+    NPC_FROST                   = 17907,
+    NPC_GIANT                   = 17908,
+    NPC_STALK                   = 17916,
+
+    NPC_WATER_ELEMENTAL         = 18001,
+    NPC_DIRE_WOLF               = 17854,
+
+    GO_ANCIENT_GEM              = 185557,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp b/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
new file mode 100644
index 000000000..96502d37a
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
@@ -0,0 +1,558 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: HyjalAI
+SD%Complete: 90
+SDComment:
+SDCategory: Caverns of Time, Mount Hyjal
+EndScriptData */
+
+#include "precompiled.h"
+#include "hyjalAI.h"
+
+struct HyjalLocation
+{
+    eBaseArea m_pBaseArea;
+    float m_fX, m_fY, m_fZ;
+};
+
+// Locations for summoning waves
+// Must be even number
+static const HyjalLocation aHyjalSpawnLoc[] =
+{
+    {BASE_ALLY,  4979.010f, -1709.134f, 1339.674f},
+    {BASE_ALLY,  4969.123f, -1705.904f, 1341.363f},
+    {BASE_ALLY,  4970.260f, -1698.546f, 1341.200f},
+    {BASE_ALLY,  4975.262f, -1698.239f, 1341.427f},
+    {BASE_HORDE, 5557.582f, -2587.159f, 1481.644f},
+    {BASE_HORDE, 5545.901f, -2582.246f, 1479.256f},
+    {BASE_HORDE, 5565.642f, -2565.666f, 1481.635f},
+    {BASE_HORDE, 5547.218f, -2574.589f, 1479.194f}
+};
+
+// used to inform the wave where to move
+static const HyjalLocation aHyjalWaveMoveTo[] =
+{
+    {BASE_ALLY,  5018.654f, -1752.074f, 1322.203f},
+    {BASE_HORDE, 5504.569f, -2688.489f, 1479.991f}
+};
+
+struct HyjalYells
+{
+    uint32   uiCreatureEntry;
+    YellType m_pYellType;                                   // Used to determine the type of yell (attack, rally, etc)
+    int32    m_iTextId;                                     // The text id to be yelled
+};
+
+static const HyjalYells aHyjalYell[] =
+{
+    {NPC_JAINA,  ATTACKED, -1534000},
+    {NPC_JAINA,  ATTACKED, -1534001},
+    {NPC_JAINA,  INCOMING, -1534002},
+    {NPC_JAINA,  BEGIN,    -1534003},
+    {NPC_JAINA,  RALLY,    -1534004},
+    {NPC_JAINA,  RALLY,    -1534005},
+    {NPC_JAINA,  FAILURE,  -1534006},
+    {NPC_JAINA,  SUCCESS,  -1534007},
+    {NPC_JAINA,  DEATH,    -1534008},
+
+    {NPC_THRALL, ATTACKED, -1534009},
+    {NPC_THRALL, ATTACKED, -1534010},
+    {NPC_THRALL, INCOMING, -1534011},
+    {NPC_THRALL, BEGIN,    -1534012},
+    {NPC_THRALL, RALLY,    -1534013},
+    {NPC_THRALL, RALLY,    -1534014},
+    {NPC_THRALL, FAILURE,  -1534015},
+    {NPC_THRALL, SUCCESS,  -1534016},
+    {NPC_THRALL, DEATH,    -1534017}
+};
+
+struct HyjalWave
+{
+    uint32 m_auiMobEntry[MAX_WAVE_MOB];                     // Stores Creature Entries to be summoned in Waves
+    uint32 m_uiWaveTimer;                                   // The timer before the next wave is summoned
+    bool   m_bIsBoss;                                       // Simply used to inform the wave summoner that the next wave contains a boss to halt all waves after that
+};
+
+// Waves that will be summoned in the Alliance Base
+static const HyjalWave aHyjalWavesAlliance[] =
+{
+    // Rage Winterchill Wave 1-8
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, 0, 0, 0, 0, 0, 0, 0, 0}, 125000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_CRYPT, NPC_CRYPT, 0, 0, 0, 0, 0, 0}, 125000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, 0, 0, 0, 0, 0, 0}, 125000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_NECRO, NPC_NECRO, 0, 0, 0, 0, 0, 0}, 125000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_NECRO, 0, 0, 0, 0, 0, 0}, 125000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, 0, 0, 0, 0, 0, 0}, 125000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, 0, 0, 0, 0, 0, 0}, 125000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_ABOMI, NPC_ABOMI, NPC_NECRO, NPC_NECRO, 0, 0, 0, 0}, 140000, false},
+    // All 8 Waves are summoned, summon Rage Winterchill, next few waves are for Anetheron
+    {{NPC_WINTERCHILL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, true},
+    // Anetheron Wave 1-8
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, 0, 0, 0, 0, 0, 0, 0, 0}, 125000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, 0, 0, 0, 0, 0, 0}, 125000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_NECRO, 0, 0, 0, 0, 0, 0}, 125000, false},
+    {{NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_BANSH, NPC_BANSH, 0, 0, 0, 0, 0, 0}, 125000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_BANSH, NPC_BANSH, NPC_BANSH, NPC_BANSH, NPC_NECRO, NPC_NECRO, 0, 0, 0, 0, 0, 0}, 125000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_ABOMI, NPC_ABOMI, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_NECRO, 0, 0, 0, 0, 0, 0}, 125000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_BANSH, NPC_BANSH, 0, 0, 0, 0, 0, 0}, 125000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_BANSH, NPC_BANSH, NPC_NECRO, NPC_NECRO, 0, 0, 0, 0}, 140000, false},
+    // All 8 Waves are summoned, summon Anatheron
+    {{NPC_ANETHERON, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, true}
+};
+
+// Waves that are summoned in the Horde base
+static const HyjalWave aHyjalWavesHorde[] =
+{
+    // Kaz'Rogal Wave 1-8
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_BANSH, NPC_BANSH, NPC_NECRO, NPC_NECRO, 0, 0, 0, 0, 0, 0}, 135000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, 0, 0, 0, 0}, 165000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_NECRO, NPC_NECRO, 0, 0, 0, 0}, 160000, false},
+    {{NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_NECRO, NPC_NECRO, 0, 0, 0, 0}, 165000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_NECRO, 0, 0, 0, 0}, 135000, false},
+    {{NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_FROST, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 135000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_FROST, 0, 0, 0, 0, 0, 0, 0}, 195000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_CRYPT, NPC_CRYPT, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_NECRO, NPC_NECRO, NPC_BANSH, NPC_BANSH, 0, 0}, 225000, false},
+    // All 8 Waves are summoned, summon Kaz'Rogal, next few waves are for Azgalor
+    {{NPC_KAZROGAL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, true},
+    // Azgalor Wave 1-8
+    {{NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_NECRO, 0, 0, 0, 0, 0, 0}, 135000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_FROST, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, NPC_GARGO, 0, 0, 0, 0}, 165000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GHOUL, NPC_GIANT, NPC_GIANT, NPC_GIANT, NPC_GIANT, NPC_GIANT, NPC_GIANT, NPC_GIANT, NPC_GIANT, 0, 0, 0, 0, 0, 0}, 160000, false},
+    {{NPC_GIANT, NPC_GIANT, NPC_GIANT, NPC_GIANT, NPC_GIANT, NPC_GIANT, NPC_STALK, NPC_STALK, NPC_STALK, NPC_STALK, NPC_STALK, NPC_STALK, NPC_STALK, NPC_STALK, 0, 0, 0, 0}, 165000, false},
+    {{NPC_STALK, NPC_STALK, NPC_STALK, NPC_STALK, NPC_STALK, NPC_STALK, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_NECRO, 0, 0, 0, 0}, 135000, false},
+    {{NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_NECRO, NPC_BANSH, NPC_BANSH, NPC_BANSH, NPC_BANSH, NPC_BANSH, NPC_BANSH, 0, 0, 0, 0, 0, 0}, 135000, false},
+    {{NPC_GHOUL, NPC_GHOUL, NPC_CRYPT, NPC_CRYPT, NPC_STALK, NPC_STALK, NPC_GIANT, NPC_GIANT, NPC_GIANT, NPC_GIANT, NPC_GIANT, NPC_GIANT, NPC_GIANT, NPC_GIANT, 0, 0, 0, 0}, 195000, false},
+    {{NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_CRYPT, NPC_STALK, NPC_STALK, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_ABOMI, NPC_BANSH, NPC_BANSH, NPC_NECRO, NPC_NECRO, 0, 0, 0, 0}, 225000, false},
+    // All 8 Waves are summoned, summon Azgalor
+    {{NPC_AZGALOR, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, true}
+};
+
+void hyjalAI::Reset()
+{
+    // Timers
+    m_uiNextWaveTimer = 10000;
+    m_uiWaveMoveTimer = 15000;
+    m_uiRetreatTimer = 25000;
+
+    // Misc
+    m_uiWaveCount = 0;
+    m_uiEnemyCount = 0;
+
+    // Set base area based on creature entry
+    switch (m_creature->GetEntry())
+    {
+        case NPC_JAINA:
+            m_uiBase = BASE_ALLY;
+            DoCastSpellIfCan(m_creature, SPELL_BRILLIANCE_AURA, CAST_TRIGGERED);
+            break;
+        case NPC_THRALL:
+            m_uiBase = BASE_HORDE;
+            break;
+    }
+
+    // Bools
+    m_bIsEventInProgress = false;
+    m_bIsSummoningWaves = false;
+
+    m_bIsRetreating = false;
+    m_bDebugMode = false;
+
+    // Flags
+    m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+
+    if (!m_pInstance)
+    { return; }
+
+    // Reset World States
+    m_pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, 0);
+    m_pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0);
+    m_pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0);
+
+    // Reset Instance Data for trash count
+    m_pInstance->SetData(TYPE_TRASH_COUNT, 0);
+
+    m_bIsFirstBossDead  = m_pInstance->GetData(m_uiBase ? TYPE_KAZROGAL : TYPE_WINTERCHILL) == DONE;
+    m_bIsSecondBossDead = m_pInstance->GetData(m_uiBase ? TYPE_AZGALOR  : TYPE_ANETHERON) == DONE;
+}
+
+bool hyjalAI::IsEventInProgress() const
+{
+    if (m_bIsEventInProgress)
+    { return true; }
+
+    // The boss might still be around and alive
+    for (uint8 i = 0; i < 2; ++i)
+    {
+        Creature* pBoss = m_creature->GetMap()->GetCreature(m_aBossGuid[i]);
+        if (pBoss && pBoss->IsAlive())
+        { return true; }
+    }
+
+    return false;
+}
+
+void hyjalAI::EnterEvadeMode()
+{
+    m_creature->RemoveAllAurasOnEvade();
+    m_creature->DeleteThreatList();
+    m_creature->CombatStop(true);
+
+    if (m_creature->IsAlive())
+    { m_creature->GetMotionMaster()->MoveTargetedHome(); }
+
+    m_creature->SetLootRecipient(NULL);
+}
+
+void hyjalAI::JustReachedHome()
+{
+    if (m_uiBase == BASE_ALLY)
+    { DoCastSpellIfCan(m_creature, SPELL_BRILLIANCE_AURA, CAST_TRIGGERED); }
+
+    m_bIsFirstBossDead = m_uiBase ? m_pInstance->GetData(TYPE_KAZROGAL) == DONE : m_pInstance->GetData(TYPE_WINTERCHILL) == DONE;
+    m_bIsSecondBossDead = m_uiBase ? m_pInstance->GetData(TYPE_AZGALOR) == DONE : m_pInstance->GetData(TYPE_ANETHERON) == DONE;
+}
+
+void hyjalAI::Aggro(Unit* /*who*/)
+{
+    for (uint8 i = 0; i < MAX_SPELL; ++i)
+        if (m_aSpells[i].m_uiCooldown)
+        { m_uiSpellTimer[i] = m_aSpells[i].m_uiCooldown; }
+
+    DoTalk(ATTACKED);
+}
+
+void hyjalAI::SpawnCreatureForWave(uint32 uiMobEntry)
+{
+    HyjalLocation const* pSpawn = NULL;
+
+    uint32 uiMaxCount = countof(aHyjalSpawnLoc);
+    uint32 uiRandId = urand(1, uiMaxCount / 2);             // unsafe, if array becomes uneven.
+
+    uint32 uiJ = 0;
+
+    for (uint32 i = 0; i < uiMaxCount; ++i)
+    {
+        if (aHyjalSpawnLoc[i].m_pBaseArea != (eBaseArea)m_uiBase)
+        { continue; }
+
+        ++uiJ;
+
+        if (uiJ == uiRandId)
+        {
+            pSpawn = &aHyjalSpawnLoc[i];
+            break;
+        }
+    }
+
+    if (pSpawn)
+    { m_creature->SummonCreature(uiMobEntry, pSpawn->m_fX, pSpawn->m_fY, pSpawn->m_fZ, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 120000); }
+}
+
+void hyjalAI::JustSummoned(Creature* pSummoned)
+{
+    // not interesting for us
+    if (pSummoned->GetEntry() == NPC_WATER_ELEMENTAL || pSummoned->GetEntry() == NPC_DIRE_WOLF)
+    { return; }
+
+    // Increment Enemy Count to be used in World States and instance script
+    ++m_uiEnemyCount;
+
+    HyjalLocation const* pMove = NULL;
+
+    for (uint32 i = 0; i < countof(aHyjalWaveMoveTo); ++i)
+    {
+        if (aHyjalWaveMoveTo[i].m_pBaseArea != (eBaseArea)m_uiBase)
+        { continue; }
+
+        pMove = &aHyjalWaveMoveTo[i];
+        break;
+    }
+
+    if (pMove)
+    {
+        float fX, fY, fZ;
+        pSummoned->GetRandomPoint(pMove->m_fX, pMove->m_fY, pMove->m_fZ, 10.0f, fX, fY, fZ);
+
+        pSummoned->SetWalk(false);
+        pSummoned->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+    }
+
+    // Check if creature is a boss.
+    if (pSummoned->IsWorldBoss())
+    { m_aBossGuid[!m_bIsFirstBossDead ? 0 : 1] = pSummoned->GetObjectGuid(); }
+    else
+    { lWaveMobGUIDList.push_back(pSummoned->GetObjectGuid()); }
+}
+
+void hyjalAI::SummonedCreatureJustDied(Creature* pSummoned)
+{
+    if (!pSummoned->IsWorldBoss())                          // Only do stuff when bosses die
+    { return; }
+
+    if (m_aBossGuid[0] == pSummoned->GetObjectGuid())
+    {
+        DoTalk(INCOMING);
+        m_bIsFirstBossDead = true;
+    }
+    else if (m_aBossGuid[1] == pSummoned->GetObjectGuid())
+    {
+        DoTalk(SUCCESS);
+        m_bIsSecondBossDead = true;
+    }
+
+    m_bIsEventInProgress = false;
+
+    m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+
+    // Reset world state for enemies to disable it
+    m_pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0);
+
+    m_creature->SetActiveObjectState(false);
+}
+
+void hyjalAI::SummonNextWave()
+{
+    // 1 in 4 chance we give a rally yell. Not sure if the chance is offilike.
+    if (!urand(0, 3))
+    { DoTalk(RALLY); }
+
+    if (!m_pInstance)
+    { return; }
+
+    HyjalWave const* pWaveData = m_uiBase ? &aHyjalWavesHorde[m_uiWaveCount] : &aHyjalWavesAlliance[m_uiWaveCount];
+
+    if (!pWaveData)
+    {
+        script_error_log("hyjalAI not able to obtain wavedata for SummonNextWave.");
+        return;
+    }
+
+    m_uiEnemyCount = m_pInstance->GetData(TYPE_TRASH_COUNT);
+
+    for (uint8 i = 0; i < MAX_WAVE_MOB; ++i)
+    {
+        if (pWaveData->m_auiMobEntry[i])
+        { SpawnCreatureForWave(pWaveData->m_auiMobEntry[i]); }
+    }
+
+    if (!pWaveData->m_bIsBoss)
+    {
+        uint32 stateValue = m_uiWaveCount + 1;
+
+        if (m_bIsFirstBossDead)
+        { stateValue -= MAX_WAVES; }                        // Subtract 9 from it to give the proper wave number if we are greater than 8
+
+        // Set world state to our current wave number
+        m_pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, stateValue);
+        // Enable world state
+        m_pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 1);
+
+        m_pInstance->SetData(TYPE_TRASH_COUNT, m_uiEnemyCount);   // Send data for instance script to update count
+
+        if (!m_bDebugMode)
+        { m_uiNextWaveTimer = pWaveData->m_uiWaveTimer; }
+        else
+        {
+            m_uiNextWaveTimer = 15000;
+            debug_log("SD3: HyjalAI: debug mode is enabled. Next Wave in 15 seconds");
+        }
+    }
+    else
+    {
+        // Set world state for waves to 0 to disable it.
+        m_pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, 0);
+        m_pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 1);
+
+        // Set World State for enemies invading to 1.
+        m_pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 1);
+
+        m_bIsSummoningWaves = false;
+    }
+
+    m_uiWaveMoveTimer = 15000;
+    ++m_uiWaveCount;
+}
+
+void hyjalAI::StartEvent()
+{
+    if (!m_pInstance)
+    { return; }
+
+    if (IsEventInProgress())
+    { return; }
+
+    DoTalk(BEGIN);
+
+    m_bIsEventInProgress = true;
+    m_bIsSummoningWaves = true;
+
+    m_uiNextWaveTimer = 10000;
+
+    m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+
+    m_pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, 0);
+    m_pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0);
+    m_pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0);
+
+    m_creature->SetActiveObjectState(true);
+}
+
+void hyjalAI::DoTalk(YellType pYellType)
+{
+    HyjalYells const* pYell = NULL;
+
+    bool bGetNext = false;
+
+    for (uint32 i = 0; i < countof(aHyjalYell); ++i)
+    {
+        if (aHyjalYell[i].uiCreatureEntry == m_creature->GetEntry() && aHyjalYell[i].m_pYellType == pYellType)
+        {
+            // this would not be safe unless we knew these had two entries in m_aYell
+            if (pYellType == ATTACKED || pYellType == RALLY)
+            {
+                if (!bGetNext && urand(0, 1))
+                {
+                    bGetNext = true;
+                    continue;
+                }
+            }
+
+            pYell = &aHyjalYell[i];
+            break;
+        }
+    }
+
+    if (pYell)
+    { DoScriptText(pYell->m_iTextId, m_creature); }
+}
+
+void hyjalAI::SpellHitTarget(Unit* /*pTarget*/, const SpellEntry* /*pSpell*/)
+{
+    // TODO: this spell should cause misc mobs to despawn
+    // if (pSpell->Id == SPELL_MASS_TELEPORT && pTarget->GetTypeId() != TYPEID_PLAYER)
+    //{
+    // despawn;
+    //}
+}
+
+void hyjalAI::Retreat()
+{
+    // this will trigger ancient gem respawn
+    if (m_pInstance)
+    { m_pInstance->SetData(TYPE_RETREAT, SPECIAL); }
+
+    DoCastSpellIfCan(m_creature, SPELL_MASS_TELEPORT);
+
+    m_bIsRetreating = true;
+}
+
+void hyjalAI::JustDied(Unit* /*pKiller*/)
+{
+    DoTalk(DEATH);
+    m_creature->SetActiveObjectState(false);
+
+    // TODO: in case they die during boss encounter, then what? despawn boss?
+}
+
+void hyjalAI::UpdateAI(const uint32 uiDiff)
+{
+    if (!m_bIsEventInProgress)
+    { return; }
+
+    if (m_bIsSummoningWaves && m_pInstance)
+    {
+        if (m_uiWaveMoveTimer < uiDiff)
+        {
+            // Skip the master timer, and start next wave in 5. Clear the list, it should not be any here now.
+            if (!m_pInstance->GetData(TYPE_TRASH_COUNT))
+            {
+                lWaveMobGUIDList.clear();
+                m_uiNextWaveTimer = std::min(m_uiNextWaveTimer, (uint32)5000);
+            }
+
+            for (GuidList::const_iterator itr = lWaveMobGUIDList.begin(); itr != lWaveMobGUIDList.end(); ++itr)
+            {
+                if (Creature* pTemp = m_pInstance->instance->GetCreature(*itr))
+                {
+                    if (!pTemp->IsAlive() || pTemp->getVictim())
+                    { continue; }
+
+                    pTemp->SetWalk(false);
+                    pTemp->GetMotionMaster()->MovePoint(1, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+                }
+            }
+            m_uiWaveMoveTimer = 10000;
+        }
+        else
+        { m_uiWaveMoveTimer -= uiDiff; }
+
+        if (m_uiNextWaveTimer < uiDiff)
+        { SummonNextWave(); }
+        else
+        { m_uiNextWaveTimer -= uiDiff; }
+    }
+
+    if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+    { return; }
+
+    for (uint8 i = 0; i < MAX_SPELL; ++i)
+    {
+        if (m_aSpells[i].m_uiSpellId)
+        {
+            if (m_uiSpellTimer[i] < uiDiff)
+            {
+                if (m_creature->IsNonMeleeSpellCasted(false))
+                { m_creature->InterruptNonMeleeSpells(false); }
+
+                Unit* pTarget = NULL;
+
+                switch (m_aSpells[i].m_pType)
+                {
+                    case TARGETTYPE_SELF:   pTarget = m_creature; break;
+                    case TARGETTYPE_RANDOM: pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0); break;
+                    case TARGETTYPE_VICTIM: pTarget = m_creature->getVictim(); break;
+                }
+
+                if (pTarget)
+                {
+                    DoCastSpellIfCan(pTarget, m_aSpells[i].m_uiSpellId);
+                    m_uiSpellTimer[i] = m_aSpells[i].m_uiCooldown;
+                }
+            }
+            else
+            { m_uiSpellTimer[i] -= uiDiff; }
+        }
+    }
+
+    DoMeleeAttackIfReady();
+}
+
+void hyjalAI::JustRespawned()
+{
+    Reset();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h b/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h
new file mode 100644
index 000000000..9629be15c
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h
@@ -0,0 +1,164 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef SC_HYJALAI_H
+#define SC_HYJALAI_H
+
+#include "hyjal.h"
+
+enum eBaseArea
+{
+    BASE_ALLY       = 0,
+    BASE_HORDE      = 1
+};
+
+enum eMisc
+{
+    MAX_SPELL               = 3,
+    MAX_WAVES               = 9,
+    MAX_WAVE_MOB            = 18,
+
+    ITEM_TEAR_OF_GODDESS    = 24494
+};
+
+enum eSpell
+{
+    SPELL_MASS_TELEPORT     = 16807,
+
+    // Spells for Jaina
+    SPELL_BRILLIANCE_AURA   = 31260,
+    SPELL_BLIZZARD          = 31266,
+    SPELL_PYROBLAST         = 31263,
+    SPELL_SUMMON_ELEMENTALS = 31264,
+
+    // Thrall spells
+    SPELL_CHAIN_LIGHTNING   = 31330,
+    SPELL_FERAL_SPIRIT      = 31331
+};
+
+enum TargetType                                             // Used in the spell cast system for the AI
+{
+    TARGETTYPE_SELF     = 0,
+    TARGETTYPE_RANDOM   = 1,
+    TARGETTYPE_VICTIM   = 2,
+};
+
+enum YellType
+{
+    ATTACKED     = 0,                                       // Used when attacked and set in combat
+    BEGIN        = 1,                                       // Used when the event is begun
+    INCOMING     = 2,                                       // Used to warn the raid that another wave phase is coming
+    RALLY        = 3,                                       // Used to rally the raid and warn that the next wave has been summoned
+    FAILURE      = 4,                                       // Used when raid has failed (unsure where to place)
+    SUCCESS      = 5,                                       // Used when the raid has sucessfully defeated a wave phase
+    DEATH        = 6,                                       // Used on death
+};
+
+struct hyjalAI : public ScriptedAI
+{
+        hyjalAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            memset(m_aSpells, 0, sizeof(m_aSpells));
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            Reset();
+        }
+
+        // Generically used to reset our variables. Do *not* call in EnterEvadeMode as this may make problems if the raid is still in combat
+        void Reset() override;
+
+        // Send creature back to spawn location and evade.
+        void EnterEvadeMode() override;
+
+        // Called when creature reached home location after evade.
+        void JustReachedHome() override;
+
+        // Used to reset cooldowns for our spells and to inform the raid that we're under attack
+        void Aggro(Unit* pWho) override;
+
+        // Called to summon waves, check for boss deaths and to cast our spells.
+        void UpdateAI(const uint32 uiDiff) override;
+
+        // Called on death, informs the raid that they have failed.
+        void JustDied(Unit* /*pKiller*/) override;
+
+        void JustRespawned() override;
+
+        // "Teleport" all friendly creatures away from the base.
+        void Retreat();
+
+        // Summons a creature for that wave in that base
+        void SpawnCreatureForWave(uint32 uiMobEntry);
+
+        void JustSummoned(Creature*) override;
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override;
+
+        // Summons the next wave, calls SummonCreature
+        void SummonNextWave();
+
+        // Begins the event by gossip click
+        void StartEvent();
+
+        // Searches for the appropriate yell and sound and uses it to inform the raid of various things
+        void DoTalk(YellType pYellType);
+
+        // Used to filter who to despawn after mass teleport
+        void SpellHitTarget(Unit*, const SpellEntry*) override;
+
+        bool IsEventInProgress() const;
+
+    public:
+        ScriptedInstance* m_pInstance;
+
+        ObjectGuid m_aBossGuid[2];
+
+        uint32 m_uiNextWaveTimer;
+        uint32 m_uiWaveCount;
+        uint32 m_uiWaveMoveTimer;
+        uint32 m_uiEnemyCount;
+        uint32 m_uiRetreatTimer;
+        uint32 m_uiBase;
+
+        bool m_bIsEventInProgress;
+        bool m_bIsFirstBossDead;
+        bool m_bIsSecondBossDead;
+        bool m_bIsSummoningWaves;
+        bool m_bIsRetreating;
+        bool m_bDebugMode;
+
+        struct sSpells
+        {
+            uint32 m_uiSpellId;
+            uint32 m_uiCooldown;
+            TargetType m_pType;
+        } m_aSpells[MAX_SPELL];
+
+    private:
+        uint32 m_uiSpellTimer[MAX_SPELL];
+        GuidList lWaveMobGUIDList;
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp b/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
new file mode 100644
index 000000000..2bd13f051
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
@@ -0,0 +1,294 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Mount_Hyjal
+SD%Complete: 100
+SDComment: Instance Data Scripts and functions to acquire mobs and set encounter status for use in various Hyjal Scripts
+SDCategory: Caverns of Time, Mount Hyjal
+EndScriptData */
+
+#include "precompiled.h"
+#include "hyjal.h"
+
+/* Battle of Mount Hyjal encounters:
+0 - Rage Winterchill event
+1 - Anetheron event
+2 - Kaz'rogal event
+3 - Azgalor event
+4 - Archimonde event
+*/
+
+static const float aArchimondeSpawnLoc[4] = { 5581.49f, -3445.63f, 1575.1f, 3.905f };
+
+struct is_mount_hyjal : public InstanceScript
+{
+    is_mount_hyjal() : InstanceScript("instance_hyjal") {}
+
+    class instance_mount_hyjal : public ScriptedInstance
+    {
+    public:
+        instance_mount_hyjal(Map* pMap) : ScriptedInstance(pMap),
+            m_uiTrashCount(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            if (m_auiEncounter[i] == IN_PROGRESS) { return true; }
+
+            return false;
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            if (GetData(TYPE_AZGALOR) == DONE)
+            {
+                DoSpawnArchimonde();
+            }
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_ARCHIMONDE)
+            {
+                m_mNpcEntryGuidStore[NPC_ARCHIMONDE] = pCreature->GetObjectGuid();
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            if (pGo->GetEntry() == GO_ANCIENT_GEM)
+            {
+                lAncientGemGUIDList.push_back(pGo->GetObjectGuid());
+            }
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_WINTERCHILL: SetData(TYPE_WINTERCHILL, IN_PROGRESS); break;
+            case NPC_ANETHERON:   SetData(TYPE_ANETHERON, IN_PROGRESS);   break;
+            case NPC_KAZROGAL:    SetData(TYPE_KAZROGAL, IN_PROGRESS);    break;
+            case NPC_AZGALOR:     SetData(TYPE_AZGALOR, IN_PROGRESS);     break;
+            case NPC_ARCHIMONDE:  SetData(TYPE_ARCHIMONDE, IN_PROGRESS);  break;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_WINTERCHILL: SetData(TYPE_WINTERCHILL, FAIL); break;
+            case NPC_ANETHERON:   SetData(TYPE_ANETHERON, FAIL);   break;
+            case NPC_KAZROGAL:    SetData(TYPE_KAZROGAL, FAIL);    break;
+            case NPC_AZGALOR:     SetData(TYPE_AZGALOR, FAIL);     break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_WINTERCHILL: SetData(TYPE_WINTERCHILL, DONE); break;
+            case NPC_ANETHERON:   SetData(TYPE_ANETHERON, DONE);   break;
+            case NPC_KAZROGAL:    SetData(TYPE_KAZROGAL, DONE);    break;
+            case NPC_AZGALOR:     SetData(TYPE_AZGALOR, DONE);     break;
+            case NPC_ARCHIMONDE:  SetData(TYPE_ARCHIMONDE, DONE);  break;
+
+                // Trash Mobs summoned in waves
+            case NPC_NECRO:
+            case NPC_ABOMI:
+            case NPC_GHOUL:
+            case NPC_BANSH:
+            case NPC_CRYPT:
+            case NPC_GARGO:
+            case NPC_FROST:
+            case NPC_GIANT:
+            case NPC_STALK:
+                // Decrease counter, and update world-state
+                if (m_uiTrashCount)
+                {
+                    --m_uiTrashCount;
+                    DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, m_uiTrashCount);
+                }
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_WINTERCHILL:
+            case TYPE_ANETHERON:
+            case TYPE_KAZROGAL:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_AZGALOR:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoSpawnArchimonde();
+                }
+                break;
+            case TYPE_ARCHIMONDE:
+                m_auiEncounter[uiType] = uiData;
+                break;
+
+            case TYPE_TRASH_COUNT:
+                m_uiTrashCount = uiData;
+                DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, m_uiTrashCount);
+                break;
+
+            case TYPE_RETREAT:
+                if (uiData == SPECIAL)
+                {
+                    if (!lAncientGemGUIDList.empty())
+                    {
+                        for (GuidList::const_iterator itr = lAncientGemGUIDList.begin(); itr != lAncientGemGUIDList.end(); ++itr)
+                        {
+                            // don't know how long it expected
+                            DoRespawnGameObject(*itr, DAY);
+                        }
+                    }
+                }
+                break;
+            }
+
+            debug_log("SD3: Instance Hyjal: Instance data updated for event %u (Data=%u)", uiType, uiData);
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4];
+
+                m_strSaveData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case TYPE_WINTERCHILL:
+            case TYPE_ANETHERON:
+            case TYPE_KAZROGAL:
+            case TYPE_AZGALOR:
+            case TYPE_ARCHIMONDE:
+                return m_auiEncounter[uiType];
+            case TYPE_TRASH_COUNT:
+                return m_uiTrashCount;
+            default:
+                return 0;
+            }
+        }
+
+        const char* Save() const override { return m_strSaveData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] >> m_auiEncounter[4];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            if (m_auiEncounter[i] == IN_PROGRESS)               // Do not load an encounter as IN_PROGRESS - reset it instead.
+            {
+                m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        void DoSpawnArchimonde()
+        {
+            // Don't spawn if already killed
+            if (GetData(TYPE_ARCHIMONDE) == DONE)
+            {
+                return;
+            }
+
+            // Don't spawn him twice
+            if (GetSingleCreatureFromStorage(NPC_ARCHIMONDE, true))
+            {
+                return;
+            }
+
+            // Summon Archimonde
+            if (Player* pPlayer = GetPlayerInMap())
+            {
+                pPlayer->SummonCreature(NPC_ARCHIMONDE, aArchimondeSpawnLoc[0], aArchimondeSpawnLoc[1], aArchimondeSpawnLoc[2], aArchimondeSpawnLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strSaveData;
+
+        GuidList lAncientGemGUIDList;
+
+        uint32 m_uiTrashCount;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_mount_hyjal(pMap);
+    }
+};
+
+void AddSC_instance_mount_hyjal()
+{
+    Script* s;
+
+    s = new is_mount_hyjal();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_hyjal";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_mount_hyjal;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/modules/SD3/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
new file mode 100644
index 000000000..b7dd23d8b
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
@@ -0,0 +1,474 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Old_Hillsbrad
+SD%Complete: 75
+SDComment: Thrall reset on server restart is not supported, because of core limitation.
+SDCategory: Caverns of Time, Old Hillsbrad Foothills
+EndScriptData */
+
+#include "precompiled.h"
+#include "old_hillsbrad.h"
+
+static const float afInstanceLoc[][4] =
+{
+    { 2104.51f, 91.96f, 53.14f, 0 },                  // right orcs outside loc
+    { 2192.58f, 238.44f, 52.44f, 0 },                 // left orcs outside loc
+};
+
+static const float aDrakeSummonLoc[4] = { 2128.43f, 71.01f, 64.42f, 1.74f };
+
+struct is_old_hillsbrad : public InstanceScript
+{
+    is_old_hillsbrad() : InstanceScript("instance_old_hillsbrad") {}
+
+    class instance_old_hillsbrad : public ScriptedInstance
+    {
+    public:
+        instance_old_hillsbrad(Map* pMap) : ScriptedInstance(pMap),
+            m_uiBarrelCount(0),
+            m_uiThrallEventCount(0),
+            m_uiThrallResetTimer(0)
+        {
+            Initialize();
+        }
+
+        ~instance_old_hillsbrad() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            // ToDo: HandleThrallRelocation();
+            // Note: this isn't yet supported because of the grid load / unload
+
+            // Spawn Drake if necessary
+            if (GetData(TYPE_DRAKE) == DONE || GetData(TYPE_BARREL_DIVERSION) != DONE)
+            {
+                return;
+            }
+
+            if (GetSingleCreatureFromStorage(NPC_DRAKE, true))
+            {
+                return;
+            }
+
+            pPlayer->SummonCreature(NPC_DRAKE, aDrakeSummonLoc[0], aDrakeSummonLoc[1], aDrakeSummonLoc[2], aDrakeSummonLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_THRALL:
+            case NPC_TARETHA:
+            case NPC_EROZION:
+            case NPC_ARMORER:
+            case NPC_TARREN_MILL_PROTECTOR:
+            case NPC_TARREN_MILL_LOOKOUT:
+            case NPC_YOUNG_BLANCHY:
+            case NPC_DRAKE:
+            case NPC_SKARLOC:
+            case NPC_EPOCH:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_ORC_PRISONER:
+                // Sort the orcs which are inside the houses
+                if (pCreature->GetPositionZ() > 53.4f)
+                {
+                    if (pCreature->GetPositionY() > 150.0f)
+                    {
+                        m_lLeftPrisonersList.push_back(pCreature->GetObjectGuid());
+                    }
+                    else
+                    {
+                        m_lRightPrisonersList.push_back(pCreature->GetObjectGuid());
+                    }
+                }
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            if (pGo->GetEntry() == GO_ROARING_FLAME)
+            {
+                m_lRoaringFlamesList.push_back(pGo->GetObjectGuid());
+            }
+            else if (pGo->GetEntry() == GO_PRISON_DOOR)
+            {
+                m_mGoEntryGuidStore[GO_PRISON_DOOR] = pGo->GetObjectGuid();
+            }
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_DRAKE:
+                SetData(TYPE_DRAKE, IN_PROGRESS);
+                DoUpdateWorldState(WORLD_STATE_OH, 0);
+                break;
+            case NPC_SKARLOC: SetData(TYPE_SKARLOC, IN_PROGRESS); break;
+            case NPC_EPOCH:   SetData(TYPE_EPOCH, IN_PROGRESS);   break;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_DRAKE:   SetData(TYPE_DRAKE, FAIL);   break;
+            case NPC_SKARLOC: SetData(TYPE_SKARLOC, FAIL); break;
+            case NPC_EPOCH:   SetData(TYPE_EPOCH, FAIL);   break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_DRAKE:   SetData(TYPE_DRAKE, DONE);   break;
+            case NPC_SKARLOC: SetData(TYPE_SKARLOC, DONE); break;
+            case NPC_EPOCH:   SetData(TYPE_EPOCH, DONE);   break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_BARREL_DIVERSION:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                {
+                    if (m_uiBarrelCount >= MAX_BARRELS)
+                    {
+                        return;
+                    }
+
+                    // Update barrels used and world state
+                    ++m_uiBarrelCount;
+                    DoUpdateWorldState(WORLD_STATE_OH, m_uiBarrelCount);
+
+                    debug_log("SD3: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u", m_uiBarrelCount);
+
+                    // Set encounter to done, and spawn Liutenant Drake
+                    if (m_uiBarrelCount == MAX_BARRELS)
+                    {
+                        UpdateLodgeQuestCredit();
+
+                        if (Player* pPlayer = GetPlayerInMap())
+                        {
+                            pPlayer->SummonCreature(NPC_DRAKE, aDrakeSummonLoc[0], aDrakeSummonLoc[1], aDrakeSummonLoc[2], aDrakeSummonLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                            // set the houses on fire
+                            for (GuidList::const_iterator itr = m_lRoaringFlamesList.begin(); itr != m_lRoaringFlamesList.end(); ++itr)
+                            {
+                                DoRespawnGameObject(*itr, 30 * MINUTE);
+                            }
+
+                            // move the orcs outside the houses
+                            float fX, fY, fZ;
+                            for (GuidList::const_iterator itr = m_lRightPrisonersList.begin(); itr != m_lRightPrisonersList.end(); ++itr)
+                            {
+                                if (Creature* pOrc = instance->GetCreature(*itr))
+                                {
+                                    pOrc->GetRandomPoint(afInstanceLoc[0][0], afInstanceLoc[0][1], afInstanceLoc[0][2], 10.0f, fX, fY, fZ);
+                                    pOrc->SetWalk(false);
+                                    pOrc->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                                }
+                            }
+                            for (GuidList::const_iterator itr = m_lLeftPrisonersList.begin(); itr != m_lLeftPrisonersList.end(); ++itr)
+                            {
+                                if (Creature* pOrc = instance->GetCreature(*itr))
+                                {
+                                    pOrc->GetRandomPoint(afInstanceLoc[1][0], afInstanceLoc[1][1], afInstanceLoc[1][2], 10.0f, fX, fY, fZ);
+                                    pOrc->SetWalk(false);
+                                    pOrc->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            debug_log("SD3: Instance Old Hillsbrad: SetData (Type: %u Data %u) cannot find any pPlayer.", uiType, uiData);
+                        }
+
+                        SetData(TYPE_BARREL_DIVERSION, DONE);
+                    }
+                }
+                break;
+            case TYPE_THRALL_EVENT:
+                // nothing to do if already done and thrall respawn
+                if (GetData(TYPE_THRALL_EVENT) == DONE)
+                {
+                    return;
+                }
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == FAIL)
+                {
+                    // despawn the bosses if necessary
+                    if (Creature* pSkarloc = GetSingleCreatureFromStorage(NPC_SKARLOC, true))
+                    {
+                        pSkarloc->ForcedDespawn();
+                    }
+                    if (Creature* pEpoch = GetSingleCreatureFromStorage(NPC_EPOCH, true))
+                    {
+                        pEpoch->ForcedDespawn();
+                    }
+
+                    if (m_uiThrallEventCount <= MAX_WIPE_COUNTER)
+                    {
+                        ++m_uiThrallEventCount;
+                        debug_log("SD3: Instance Old Hillsbrad: Thrall event failed %u times.", m_uiThrallEventCount);
+
+                        // reset Thrall on timer
+                        m_uiThrallResetTimer = 30000;
+                    }
+                    // If we already respawned Thrall too many times, the event is failed for good
+                    else if (m_uiThrallEventCount > MAX_WIPE_COUNTER)
+                    {
+                        debug_log("SD3: Instance Old Hillsbrad: Thrall event failed %u times. Reset instance required.", m_uiThrallEventCount);
+                    }
+                }
+                break;
+            case TYPE_DRAKE:
+            case TYPE_SKARLOC:
+            case TYPE_ESCORT_BARN:
+            case TYPE_ESCORT_INN:
+            case TYPE_EPOCH:
+                m_auiEncounter[uiType] = uiData;
+                debug_log("SD3: Instance Old Hillsbrad: Thrall event type %u adjusted to data %u.", uiType, uiData);
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            if (uiType == TYPE_THRALL_EVENT_COUNT)
+                return m_uiThrallEventCount;
+
+            return 0;
+        }
+
+        uint32 GetThrallEventCount() { return m_uiThrallEventCount; }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            // custom reload - if the escort event or the Epoch event are not done, then reset the escort
+            // this is done, because currently we cannot handle Thrall relocation on server reset
+            if (m_auiEncounter[5] != DONE)
+            {
+                m_auiEncounter[2] = NOT_STARTED;
+                m_auiEncounter[3] = NOT_STARTED;
+                m_auiEncounter[4] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_uiThrallResetTimer)
+            {
+                if (m_uiThrallResetTimer <= uiDiff)
+                {
+                    HandleThrallRelocation();
+                    m_uiThrallResetTimer = 0;
+                }
+                else
+                {
+                    m_uiThrallResetTimer -= uiDiff;
+                }
+            }
+        }
+
+    protected:
+        void HandleThrallRelocation()
+        {
+            // reset instance data
+            SetData(TYPE_THRALL_EVENT, IN_PROGRESS);
+
+            if (Creature* pThrall = GetSingleCreatureFromStorage(NPC_THRALL))
+            {
+                debug_log("SD3: Instance Old Hillsbrad: Thrall relocation");
+
+                if (!pThrall->IsAlive())
+                {
+                    pThrall->Respawn();
+                }
+
+                // epoch failed, reloc to inn
+                if (GetData(TYPE_ESCORT_INN) == DONE)
+                {
+                    pThrall->GetMap()->CreatureRelocation(pThrall, 2660.57f, 659.173f, 61.9370f, 5.76f);
+                }
+                // barn to inn failed, reloc to barn
+                else if (GetData(TYPE_ESCORT_BARN) == DONE)
+                {
+                    pThrall->GetMap()->CreatureRelocation(pThrall, 2486.91f, 626.356f, 58.0761f, 4.66f);
+                }
+                // keep to barn failed, reloc to keep
+                else if (GetData(TYPE_SKARLOC) == DONE)
+                {
+                    pThrall->GetMap()->CreatureRelocation(pThrall, 2063.40f, 229.509f, 64.4883f, 2.23f);
+                }
+                // prison to keep failed, reloc to prison
+                else
+                {
+                    pThrall->GetMap()->CreatureRelocation(pThrall, 2231.89f, 119.95f, 82.2979f, 4.21f);
+                }
+            }
+        }
+
+        void UpdateLodgeQuestCredit()
+        {
+            Map::PlayerList const& players = instance->GetPlayers();
+
+            if (!players.isEmpty())
+            {
+                for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                {
+                    if (Player* pPlayer = itr->getSource())
+                    {
+                        pPlayer->KilledMonsterCredit(NPC_LODGE_QUEST_TRIGGER);
+                    }
+                }
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiBarrelCount;
+        uint32 m_uiThrallEventCount;
+        uint32 m_uiThrallResetTimer;
+
+        GuidList m_lRoaringFlamesList;
+        GuidList m_lLeftPrisonersList;
+        GuidList m_lRightPrisonersList;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_old_hillsbrad(pMap);
+    }
+};
+
+struct event_go_barrel_old_hillsbrad : public MapEventScript
+{
+    event_go_barrel_old_hillsbrad() : MapEventScript("event_go_barrel_old_hillsbrad") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* pTarget, bool bIsStart) override
+    {
+        if (bIsStart && pSource->GetTypeId() == TYPEID_PLAYER)
+        {
+            if (InstanceData* pInstance = ((Player*)pSource)->GetInstanceData())
+            {
+                if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE)
+                {
+                    return true;
+                }
+
+                pInstance->SetData(TYPE_BARREL_DIVERSION, IN_PROGRESS);
+
+                // Don't allow players to use same object twice
+                if (pTarget->GetTypeId() == TYPEID_GAMEOBJECT)
+                {
+                    ((GameObject*)pTarget)->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                }
+
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+void AddSC_instance_old_hillsbrad()
+{
+    Script* s;
+
+    s = new is_old_hillsbrad();
+    s->RegisterSelf();
+    s = new event_go_barrel_old_hillsbrad();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_old_hillsbrad";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_old_hillsbrad;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_go_barrel_old_hillsbrad";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_go_barrel_old_hillsbrad;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/modules/SD3/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
new file mode 100644
index 000000000..ee258dbfe
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
@@ -0,0 +1,1463 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Old_Hillsbrad
+SD%Complete: 90
+SDComment: Quest support: 10283, 10284. All friendly NPC's. Thrall escort event is complete, possible a few details are still missing.
+SDCategory: Caverns of Time, Old Hillsbrad Foothills
+EndScriptData */
+
+/* ContentData
+npc_erozion
+npc_thrall_old_hillsbrad
+npc_taretha
+EndContentData */
+
+#include "precompiled.h"
+#include "old_hillsbrad.h"
+#include "escort_ai.h"
+
+/*######
+## npc_erozion
+######*/
+
+enum
+{
+    GOSSIP_ITEM_NEED_BOMBS          = -3560001,
+    TEXT_ID_DEFAULT                 = 9778,
+    TEXT_ID_GOT_ITEM                = 9515,
+
+    ITEM_ENTRY_BOMBS                = 25853,
+};
+
+struct npc_erozion : public CreatureScript
+{
+    npc_erozion() : CreatureScript("npc_erozion") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+        if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS, 1))
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NEED_BOMBS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        // Need info, should have option to teleport or not
+        /*if (!pPlayer->GetQuestRewardStatus(QUEST_ENTRY_RETURN) && pPlayer->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Teleport please, i'm tired.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);*/
+
+        pPlayer->SEND_GOSSIP_MENU(TEXT_ID_DEFAULT, pCreature->GetObjectGuid());
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            if (Item* pItem = pPlayer->StoreNewItemInInventorySlot(ITEM_ENTRY_BOMBS, 1))
+            {
+                pPlayer->SendNewItem(pItem, 1, true, false);
+            }
+
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_GOT_ITEM, pCreature->GetObjectGuid());
+        }
+
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 2)
+        {
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_thrall_old_hillsbrad
+######*/
+
+enum
+{
+    // Thrall texts - part I
+    SAY_TH_START_EVENT_PART_1       = -1560023,
+    SAY_ARMORER_CALL_GUARDS         = -1560003,
+    SAY_TH_KILL_ARMORER             = -1560050,
+    SAY_TH_ARMORY_1                 = -1560024,
+    SAY_TH_ARMORY_2                 = -1560005,
+    SAY_TH_SKARLOC_MEET             = -1560025,
+    SAY_SKARLOC_ENTER               = -1560000,
+    SAY_TH_SKARLOC_TAUNT            = -1560026,
+
+    // Thrall texts - part II
+    SAY_TH_START_EVENT_PART2        = -1560027,
+    SAY_TH_MOUNTS_UP                = -1560028,
+    EMOTE_TH_STARTLE_HORSE          = -1560006,
+
+    // Thrall texts part III (barn)
+    SAY_LOOKOUT_BARN_1              = -1560007,
+    SAY_PROTECTOR_BARN_2            = -1560008,
+    EMOTE_TH_CALM_HORSE             = -1560009,
+    SAY_PROTECTOR_BARN_3            = -1560010,
+    SAY_TH_HEAD_TOWN                = -1560011,
+
+    // Thrall texts part III (church)
+    SAY_TH_CHURCH_ENTER             = -1560012,
+    SAY_LOOKOUT_CHURCH              = -1560016,
+    SAY_TH_CHURCH_END               = -1560029,
+
+    // Thrall texts part III (inn)
+    SAY_LOOKOUT_INN                 = -1560017,
+    SAY_TA_ESCAPED                  = -1560049,
+    SAY_TH_MEET_TARETHA             = -1560030,
+
+    SAY_EPOCH_ENTER1                = -1560013,
+    SAY_TH_EPOCH_WONDER             = -1560031,
+    SAY_EPOCH_ENTER2                = -1560014,
+    SAY_TH_EPOCH_KILL_TARETHA       = -1560032,
+    SAY_EPOCH_ENTER3                = -1560015,
+
+    // infinite dragons texts
+    SAY_INFINITE_DRAGON_AGGRO_1     = -1560004,
+    SAY_INFINITE_DRAGON_AGGRO_2     = -1560018,
+    SAY_INFINITE_DRAGON_AGGRO_3     = -1560019,
+    SAY_INFINITE_DRAGON_AGGRO_4     = -1560020,
+
+    // Thrall texts - misc
+    SAY_TH_RANDOM_LOW_HP1           = -1560034,
+    SAY_TH_RANDOM_LOW_HP2           = -1560035,
+
+    SAY_TH_RANDOM_DIE1              = -1560036,
+    SAY_TH_RANDOM_DIE2              = -1560037,
+
+    SAY_TH_RANDOM_AGGRO1            = -1560038,
+    SAY_TH_RANDOM_AGGRO2            = -1560039,
+    SAY_TH_RANDOM_AGGRO3            = -1560040,
+    SAY_TH_RANDOM_AGGRO4            = -1560041,
+
+    SAY_TH_RANDOM_KILL1             = -1560042,
+    SAY_TH_RANDOM_KILL2             = -1560043,
+    SAY_TH_RANDOM_KILL3             = -1560044,
+
+    SAY_TH_LEAVE_COMBAT1            = -1560045,
+    SAY_TH_LEAVE_COMBAT2            = -1560046,
+    SAY_TH_LEAVE_COMBAT3            = -1560047,
+
+    // reset texts
+    SAY_ERONZION_RESET_THRALL       = -1560001,
+    SAY_ERONZION_RESET_LAST         = -1560002,
+
+    // gossip - start item
+    GOSSIP_ITEM_START               = -3560000,             // "We are ready to get you out of here, Thrall"
+    TEXT_ID_START                   = 9568,
+
+    // gossip - after Skarloc items
+    GOSSIP_ITEM_SKARLOC_1           = -3560002,             // "Taretha cannot see you, Thrall."
+    TEXT_ID_SKARLOC_1               = 9578,                 // Thank you friends, I owe my freedom to you. Where is Taretha? I hoped to see her
+    GOSSIP_ITEM_SKARLOC_2           = -3560003,             // "The situation is rather complicated, Thrall. It would be best for you..."
+    TEXT_ID_SKARLOC_2               = 9579,                 // What do you mean by this? Is Taretha in danger?
+    GOSSIP_ITEM_SKARLOC_3           = -3560007,
+    TEXT_ID_SKARLOC_3               = 9580,                 // I will do no such thing. I simply cannot leave Taretha...
+
+    // gossip - barn
+    GOSSIP_ITEM_TARREN_1            = -3560004,             // "We're ready, Thrall."
+    TEXT_ID_TARREN                  = 9597,                 // tarren mill is beyond these trees
+
+    TEXT_ID_INN                     = 9614,                 // I'm glad Taretha is alive. We now must find a way to free her...
+
+    // spells used by Thrall
+    SPELL_KNOCKOUT_ARMORER          = 32890,                // cast on the armorer
+    SPELL_STRIKE                    = 14516,
+    SPELL_SHIELD_BLOCK              = 12169,
+    SPELL_SHADOW_SPIKE              = 33125,                // used to kill Taretha
+    SPELL_TRANSFORM                 = 33133,                // transform infinite defilers
+    SPELL_SUMMON_EROZION_IMAGE      = 33954,                // if thrall dies during escort
+    SPELL_SPAWN_EROZION_IMAGE       = 33955,
+
+    // equipment
+    EQUIP_ID_WEAPON                 = 927,
+    EQUIP_ID_SHIELD                 = 1961,
+
+    // display ids
+    MODEL_THRALL_UNEQUIPPED         = 17292,
+    MODEL_THRALL_EQUIPPED           = 18165,
+    MODEL_SKARLOC_MOUNT             = 8469,
+
+    // misc creature entries
+    NPC_IMAGE_OF_ERONZION           = 19438,
+    NPC_SKARLOC_MOUNT               = 18798,
+    NPC_THRALL_QUEST_TRIGGER        = 20156,
+
+    // part I and II ambush npcs
+    NPC_RIFLE                       = 17820,
+    NPC_WARDEN                      = 17833,
+    NPC_VETERAN                     = 17860,
+    NPC_MAGE                        = 18934,
+    NPC_WATCHMAN                    = 17814,
+    NPC_SENTRY                      = 17815,
+
+    // part III ambush npcs
+    NPC_CHURCH_GUARDSMAN            = 23175,
+    NPC_CHURCH_PROTECTOR            = 23179,
+    NPC_CHURCH_LOOKOUT              = 23177,
+
+    NPC_INN_GUARDSMAN               = 23176,
+    NPC_INN_PROTECTOR               = 23180,
+    NPC_INN_LOOKOUT                 = 23178,
+
+    NPC_INFINITE_DEFILER            = 18171,
+    NPC_INFINITE_SABOTEOR           = 18172,
+    NPC_INFINITE_SLAYER             = 18170,
+};
+
+static const DialogueEntry aThrallDialogue[] =
+{
+    {SAY_LOOKOUT_BARN_1,    NPC_TARREN_MILL_LOOKOUT,   5000},
+    {SAY_PROTECTOR_BARN_2,  NPC_TARREN_MILL_PROTECTOR, 3000},
+    {NPC_YOUNG_BLANCHY,     0,                         4000},
+    {EMOTE_TH_CALM_HORSE,   NPC_THRALL,                1000},
+    {SAY_PROTECTOR_BARN_3,  NPC_TARREN_MILL_LOOKOUT,   0},
+    {NPC_EPOCH,             0,                         8000},
+    {SAY_TH_EPOCH_WONDER,   NPC_THRALL,                4000},
+    {SAY_EPOCH_ENTER2,      NPC_EPOCH,                 4000},
+    {SAY_TH_EPOCH_KILL_TARETHA, NPC_THRALL,            2000},
+    {NPC_THRALL,            0,                         0},
+    {0, 0, 0},
+};
+
+struct npc_thrall_old_hillsbrad : public CreatureScript
+{
+    npc_thrall_old_hillsbrad() : CreatureScript("npc_thrall_old_hillsbrad") {}
+
+    struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper
+    {
+        npc_thrall_old_hillsbradAI(Creature* pCreature) : npc_escortAI(pCreature),
+        DialogueHelper(aThrallDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+            pCreature->SetActiveObjectState(true);              // required for proper relocation
+            m_bHadMount = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bIsLowHp;
+        bool m_bHadMount;
+        bool m_bHasChurchYelled;
+        bool m_bHasInnYelled;
+        bool m_bHasEpochYelled;
+
+        uint8 m_uiEpochWaveId;
+
+        uint32 m_uiStrikeTimer;
+        uint32 m_uiShieldBlockTimer;
+        uint32 m_uiEpochAttackTimer;
+
+        ObjectGuid m_skarlocMountGuid;
+
+        GuidList m_lSkarlocAddsGuids;
+        GuidList m_lTarrenMillSoldiersGuids;
+
+        void Reset() override
+        {
+            m_bIsLowHp = false;
+            m_uiStrikeTimer = urand(3000, 7000);
+            m_uiShieldBlockTimer = urand(6000, 11000);
+
+            if (m_bHadMount)
+            {
+                m_creature->Mount(MODEL_SKARLOC_MOUNT);
+            }
+
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_bHadMount = false;
+                m_bHasChurchYelled = false;
+                m_bHasEpochYelled = false;
+
+                m_uiEpochWaveId = 0;
+                m_uiEpochAttackTimer = 0;
+
+                m_creature->Unmount();
+                SetEquipmentSlots(true);
+                m_creature->SetDisplayId(MODEL_THRALL_UNEQUIPPED);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 3))
+            {
+            case 0: DoScriptText(SAY_TH_RANDOM_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_TH_RANDOM_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_TH_RANDOM_AGGRO3, m_creature); break;
+            case 3: DoScriptText(SAY_TH_RANDOM_AGGRO4, m_creature); break;
+            }
+
+            if (m_creature->IsMounted())
+            {
+                m_creature->Unmount();
+                m_bHadMount = true;
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_TH_RANDOM_KILL1, m_creature); break;
+            case 1: DoScriptText(SAY_TH_RANDOM_KILL2, m_creature); break;
+            case 2: DoScriptText(SAY_TH_RANDOM_KILL3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            // fail, and relocation handled in instance script
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THRALL_EVENT, FAIL);
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_TH_RANDOM_DIE1 : SAY_TH_RANDOM_DIE2, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_EROZION_IMAGE, CAST_TRIGGERED);
+
+            // despawn the summons which won't self despawn
+            for (GuidList::const_iterator itr = m_lSkarlocAddsGuids.begin(); itr != m_lSkarlocAddsGuids.end(); ++itr)
+            {
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pTemp->ForcedDespawn();
+                }
+            }
+            for (GuidList::const_iterator itr = m_lTarrenMillSoldiersGuids.begin(); itr != m_lTarrenMillSoldiersGuids.end(); ++itr)
+            {
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pTemp->ForcedDespawn();
+                }
+            }
+        }
+
+        void CorpseRemoved(uint32& uiRespawnDelay) override
+        {
+            uiRespawnDelay = 0;
+
+            // if we're done, just set some high so he never really respawn
+            if (m_pInstance && (m_pInstance->GetData(TYPE_THRALL_EVENT) == DONE || m_pInstance->GetData(TYPE_THRALL_EVENT) == FAIL))
+            {
+                uiRespawnDelay = 12 * HOUR;
+            }
+        }
+
+        void JustRespawned() override
+        {
+            npc_escortAI::JustRespawned();
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            if (m_pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS)
+            {
+                Start(true);
+                SetEscortPaused(true);
+
+                m_bHadMount = false;
+                m_creature->Unmount();
+
+                m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+
+                // check current states before fail and set spesific for the part
+                if (m_pInstance->GetData(TYPE_SKARLOC) != DONE)
+                {
+                    SetCurrentWaypoint(1);                      // basement
+
+                    SetEquipmentSlots(true);
+                    m_creature->SetDisplayId(MODEL_THRALL_UNEQUIPPED);
+                    m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                    m_lSkarlocAddsGuids.clear();
+
+                    // reset prison door
+                    m_pInstance->DoUseDoorOrButton(GO_PRISON_DOOR);
+                    // respawn the Armorer
+                    if (Creature* pArmorer = m_pInstance->GetSingleCreatureFromStorage(NPC_ARMORER))
+                    {
+                        pArmorer->Respawn();
+                    }
+                    // despwn the horse
+                    if (Creature* pHorse = m_creature->GetMap()->GetCreature(m_skarlocMountGuid))
+                    {
+                        pHorse->ForcedDespawn();
+                    }
+                }
+                else if (m_pInstance->GetData(TYPE_ESCORT_BARN) != DONE)
+                {
+                    SetCurrentWaypoint(35);                     // keep
+
+                    m_creature->SetDisplayId(MODEL_THRALL_EQUIPPED);
+                    m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+
+                    // resummon the mount
+                    m_creature->SummonCreature(NPC_SKARLOC_MOUNT, 2047.775f, 253.4088f, 62.91183f, 5.37f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+                else if (m_pInstance->GetData(TYPE_ESCORT_INN) != DONE)
+                {
+                    SetCurrentWaypoint(67);                     // barn
+                    m_lTarrenMillSoldiersGuids.clear();
+
+                    m_creature->SetDisplayId(MODEL_THRALL_EQUIPPED);
+                    m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                }
+                else if (m_pInstance->GetData(TYPE_EPOCH) != DONE)
+                {
+                    SetCurrentWaypoint(108);                    // inn
+                    m_creature->SetDisplayId(MODEL_THRALL_EQUIPPED);
+                    m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                    m_lTarrenMillSoldiersGuids.clear();
+                    m_uiEpochWaveId = 0;
+
+                    // Reset Taretha
+                    if (Creature* pTaretha = m_pInstance->GetSingleCreatureFromStorage(NPC_TARETHA))
+                    {
+                        pTaretha->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                        pTaretha->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                        pTaretha->SetStandState(UNIT_STAND_STATE_STAND);
+                    }
+                }
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                switch (urand(0, 2))
+                {
+                case 0: DoScriptText(SAY_TH_LEAVE_COMBAT1, m_creature); break;
+                case 1: DoScriptText(SAY_TH_LEAVE_COMBAT2, m_creature); break;
+                case 2: DoScriptText(SAY_TH_LEAVE_COMBAT3, m_creature); break;
+                }
+            }
+
+            npc_escortAI::EnterEvadeMode();
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+                // Barn soldiers - also used for the first wave of Epoch adds
+            case NPC_TARREN_MILL_GUARDSMAN:
+            case NPC_TARREN_MILL_PROTECTOR:
+            case NPC_TARREN_MILL_LOOKOUT:
+                m_lTarrenMillSoldiersGuids.push_back(pSummoned->GetObjectGuid());
+                // For the summons corresponding to the Epoch event, handle movement
+                if (m_pInstance && m_pInstance->GetData(TYPE_ESCORT_INN) == DONE)
+                {
+                    pSummoned->GetMotionMaster()->MovePoint(1, pSummoned->GetPositionX(), pSummoned->GetPositionY() - 10.0f, pSummoned->GetPositionZ());
+
+                    // Transform on timer
+                    if (!m_uiEpochAttackTimer)
+                    {
+                        m_uiEpochAttackTimer = 7000;
+                    }
+                }
+                break;
+                // Epoch wave spawns
+            case NPC_INFINITE_DEFILER:
+            case NPC_INFINITE_SABOTEOR:
+            case NPC_INFINITE_SLAYER:
+                m_lTarrenMillSoldiersGuids.push_back(pSummoned->GetObjectGuid());
+                pSummoned->AI()->AttackStart(m_creature);
+                if (!m_bHasEpochYelled)
+                {
+                    switch (urand(0, 3))
+                    {
+                    case 0: DoScriptText(SAY_INFINITE_DRAGON_AGGRO_1, pSummoned); break;
+                    case 1: DoScriptText(SAY_INFINITE_DRAGON_AGGRO_2, pSummoned); break;
+                    case 2: DoScriptText(SAY_INFINITE_DRAGON_AGGRO_3, pSummoned); break;
+                    case 3: DoScriptText(SAY_INFINITE_DRAGON_AGGRO_4, pSummoned); break;
+                    }
+                    m_bHasEpochYelled = true;
+                }
+                break;
+            case NPC_SKARLOC_MOUNT:
+                m_skarlocMountGuid = pSummoned->GetObjectGuid();
+                break;
+                // Church solider - used to yell
+            case NPC_CHURCH_LOOKOUT:
+                if (!m_bHasChurchYelled)
+                {
+                    DoScriptText(SAY_LOOKOUT_CHURCH, pSummoned);
+                    m_bHasChurchYelled = true;
+                }
+                pSummoned->AI()->AttackStart(m_creature);
+                break;
+                // Inn soldier - used to yell
+            case NPC_INN_LOOKOUT:
+                if (!m_bHasInnYelled)
+                {
+                    DoScriptText(SAY_LOOKOUT_INN, pSummoned);
+                    m_bHasInnYelled = true;
+                }
+                pSummoned->AI()->AttackStart(m_creature);
+                break;
+                // Spawned when Thrall is dead
+            case NPC_IMAGE_OF_ERONZION:
+                if (m_pInstance)
+                {
+                    DoScriptText(m_pInstance->GetData(TYPE_THRALL_EVENT_COUNT) < MAX_WIPE_COUNTER ? SAY_ERONZION_RESET_THRALL : SAY_ERONZION_RESET_LAST, pSummoned);
+                }
+                pSummoned->CastSpell(pSummoned, SPELL_SPAWN_EROZION_IMAGE, false);
+                pSummoned->ForcedDespawn(30000);
+                break;
+            case NPC_SKARLOC:
+                pSummoned->SetWalk(false);
+                pSummoned->GetMotionMaster()->MovePoint(1, 2050.029f, 249.9696f, 63.0313f);
+                break;
+            case NPC_EPOCH:
+                pSummoned->SetLevitate(true);
+                DoScriptText(SAY_EPOCH_ENTER1, pSummoned);
+                break;
+                // Skarloc helpers - they have special behavior
+            case NPC_WARDEN:
+            case NPC_VETERAN:
+                if (m_pInstance && m_pInstance->GetData(TYPE_SKARLOC) == IN_PROGRESS)
+                {
+                    // Allow these to follow Skarloc and attack only on command
+                    if (Creature* pSkarloc = m_pInstance->GetSingleCreatureFromStorage(NPC_SKARLOC))
+                    {
+                        pSummoned->GetMotionMaster()->MoveFollow(pSkarloc, 5.0f, pSummoned->GetAngle(pSkarloc) + M_PI_F);
+                    }
+
+                    pSummoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                    m_lSkarlocAddsGuids.push_back(pSummoned->GetObjectGuid());
+                }
+                else
+                {
+                    pSummoned->AI()->AttackStart(m_creature);
+                }
+                break;
+            default:
+                pSummoned->AI()->AttackStart(m_creature);
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_EPOCH:
+                DoHandleQuestCredit();
+                SetEscortPaused(false);
+                break;
+            case NPC_SKARLOC:
+                SetEscortPaused(false);
+                break;
+            case NPC_TARREN_MILL_PROTECTOR:
+            case NPC_TARREN_MILL_LOOKOUT:
+            case NPC_TARREN_MILL_GUARDSMAN:
+                // continue escort when all the barn soldiers are dead
+                m_lTarrenMillSoldiersGuids.remove(pSummoned->GetObjectGuid());
+                if (m_lTarrenMillSoldiersGuids.empty())
+                {
+                    SetRun();
+                    SetEscortPaused(false);
+                }
+                break;
+            case NPC_INFINITE_DEFILER:
+            case NPC_INFINITE_SABOTEOR:
+            case NPC_INFINITE_SLAYER:
+                // Handle Epoch event waves - spawn another when the previous is dead
+                m_lTarrenMillSoldiersGuids.remove(pSummoned->GetObjectGuid());
+                if (m_lTarrenMillSoldiersGuids.empty())
+                {
+                    m_lTarrenMillSoldiersGuids.clear();
+                    m_bHasEpochYelled = false;
+                    switch (m_uiEpochWaveId)
+                    {
+                    case 1:
+                        m_creature->SummonCreature(NPC_INFINITE_DEFILER, 2595.477f, 684.3738f, 55.95534f, 6.05f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                        m_creature->SummonCreature(NPC_INFINITE_SABOTEOR, 2602.208f, 678.2955f, 56.34682f, 6.07f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                        m_creature->SummonCreature(NPC_INFINITE_SLAYER, 2602.8f, 686.2845f, 55.79315f, 5.95f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                        ++m_uiEpochWaveId;
+                        break;
+                    case 2:
+                        m_creature->SummonCreature(NPC_INFINITE_DEFILER, 2646.289f, 718.5257f, 57.90024f, 4.32f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                        m_creature->SummonCreature(NPC_INFINITE_SABOTEOR, 2641.788f, 719.7106f, 57.4023f, 4.46f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                        m_creature->SummonCreature(NPC_INFINITE_SLAYER, 2645.725f, 709.7153f, 56.69411f, 4.38f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                        m_creature->SummonCreature(NPC_INFINITE_SLAYER, 2639.641f, 710.5246f, 56.23582f, 4.60f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                        ++m_uiEpochWaveId;
+                        break;
+                    case 3:
+                        if (m_pInstance)
+                        {
+                            if (Creature* pEpoch = m_pInstance->GetSingleCreatureFromStorage(NPC_EPOCH))
+                            {
+                                pEpoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                                pEpoch->AI()->AttackStart(m_creature);
+                                AttackStart(pEpoch);
+                            }
+                        }
+                        break;
+                    }
+                }
+                break;
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            switch (pSummoned->GetEntry())
+            {
+                // Handle Skarloc movement for the intro part
+            case NPC_SKARLOC:
+                switch (uiPointId)
+                {
+                case 1:
+                    // summon mount
+                    pSummoned->Unmount();
+                    m_creature->SummonCreature(NPC_SKARLOC_MOUNT, 2047.775f, 253.4088f, 62.91183f, 5.37f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                    pSummoned->SetWalk(true);
+                    pSummoned->GetMotionMaster()->MovePoint(2, 2059.899f, 234.2593f, 64.10809f);
+                    break;
+                case 2:
+                    // taunt Thrall
+                    DoScriptText(SAY_SKARLOC_ENTER, pSummoned);
+                    SetEscortPaused(false);
+                    break;
+                }
+                break;
+                // Handle infinite dragons transform on point reaches
+            case NPC_TARREN_MILL_GUARDSMAN:
+                if (uiPointId)
+                {
+                    pSummoned->CastSpell(pSummoned, SPELL_TRANSFORM, false);
+                    pSummoned->UpdateEntry(NPC_INFINITE_SLAYER);
+                }
+                break;
+            case NPC_TARREN_MILL_PROTECTOR:
+                if (uiPointId)
+                {
+                    pSummoned->CastSpell(pSummoned, SPELL_TRANSFORM, false);
+                    pSummoned->UpdateEntry(NPC_INFINITE_SABOTEOR);
+                }
+                break;
+            case NPC_TARREN_MILL_LOOKOUT:
+                if (uiPointId)
+                {
+                    pSummoned->CastSpell(pSummoned, SPELL_TRANSFORM, false);
+                    pSummoned->UpdateEntry(NPC_INFINITE_DEFILER);
+                }
+                break;
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            switch (iEntry)
+            {
+            case NPC_YOUNG_BLANCHY:
+                // ToDo: deal with the horse animation!
+                break;
+            case EMOTE_TH_CALM_HORSE:
+                if (Creature* pHorse = m_pInstance->GetSingleCreatureFromStorage(NPC_YOUNG_BLANCHY))
+                {
+                    m_creature->SetFacingToObject(pHorse);
+                }
+                break;
+            case SAY_PROTECTOR_BARN_3:
+                // Move the soldiers inside
+                float fX, fY, fZ;
+                for (GuidList::const_iterator itr = m_lTarrenMillSoldiersGuids.begin(); itr != m_lTarrenMillSoldiersGuids.end(); ++itr)
+                {
+                    if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                    {
+                        pTemp->SetWalk(false);
+                        pTemp->GetRandomPoint(2480.19f, 696.15f, 55.78f, 5.0f, fX, fY, fZ);
+                        pTemp->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                        pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                    }
+                }
+                break;
+            case SAY_TH_EPOCH_WONDER:
+                m_creature->SetFacingTo(2.69f);
+                break;
+            case SAY_EPOCH_ENTER2:
+                if (Creature* pTaretha = m_pInstance->GetSingleCreatureFromStorage(NPC_TARETHA))
+                {
+                    pTaretha->CastSpell(pTaretha, SPELL_SHADOW_SPIKE, true);
+                    pTaretha->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    pTaretha->SetStandState(UNIT_STAND_STATE_DEAD);
+                }
+                break;
+            case SAY_TH_EPOCH_KILL_TARETHA:
+                if (Creature* pTaretha = m_pInstance->GetSingleCreatureFromStorage(NPC_TARETHA))
+                {
+                    m_creature->SetFacingToObject(pTaretha);
+                }
+                break;
+            case NPC_THRALL:
+                SetRun();
+                SetEscortPaused(false);
+                break;
+            }
+        }
+
+        void WaypointReached(uint32 uiPoint) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            switch (uiPoint)
+            {
+                // *** Escort event - Part I - inside the keep ***
+            case 0:
+                m_pInstance->DoUseDoorOrButton(GO_PRISON_DOOR);
+                break;
+            case 8:
+                if (Creature* pArmorer = m_pInstance->GetSingleCreatureFromStorage(NPC_ARMORER))
+                {
+                    DoScriptText(SAY_ARMORER_CALL_GUARDS, pArmorer);
+                    pArmorer->SetFacingToObject(m_creature);
+                }
+                break;
+            case 9:
+                DoScriptText(SAY_TH_KILL_ARMORER, m_creature);
+                DoCastSpellIfCan(m_creature, SPELL_KNOCKOUT_ARMORER);
+                // also kill the armorer
+                if (Creature* pArmorer = m_pInstance->GetSingleCreatureFromStorage(NPC_ARMORER))
+                {
+                    pArmorer->DealDamage(pArmorer, pArmorer->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                }
+                break;
+            case 10:
+                DoScriptText(SAY_TH_ARMORY_1, m_creature);
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                m_creature->SetDisplayId(MODEL_THRALL_EQUIPPED);
+                SetEquipmentSlots(false, EQUIP_ID_WEAPON, EQUIP_ID_SHIELD, EQUIP_NO_CHANGE);
+                break;
+            case 11:
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                break;
+            case 12:
+                if (Creature* pArmorer = m_pInstance->GetSingleCreatureFromStorage(NPC_ARMORER))
+                {
+                    m_creature->SetFacingToObject(pArmorer);
+                }
+                DoScriptText(SAY_TH_ARMORY_2, m_creature);
+                break;
+                // *** Escort event - Part I - outside the keep ***
+            case 17:
+                m_creature->SummonCreature(NPC_MAGE, 2186.909f, 139.8108f, 88.21628f, 5.75f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_WARDEN, 2187.943f, 141.6124f, 88.21628f, 5.73f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_VETERAN, 2190.508f, 140.4597f, 88.21628f, 6.04f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_VETERAN, 2189.543f, 139.0996f, 88.23965f, 0.21f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                break;
+            case 20:
+                m_creature->SummonCreature(NPC_MAGE, 2149.463f, 104.9756f, 73.63239f, 1.71f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_SENTRY, 2147.642f, 105.0251f, 73.99422f, 1.52f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_VETERAN, 2149.212f, 107.2005f, 74.15676f, 1.71f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_WARDEN, 2147.328f, 106.7235f, 74.34447f, 1.69f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                break;
+            case 23:
+                m_creature->SummonCreature(NPC_MAGE, 2142.363f, 172.4260f, 66.30494f, 2.54f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_SENTRY, 2138.177f, 168.6046f, 66.30494f, 2.47f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_SENTRY, 2142.372f, 174.2907f, 66.30494f, 2.56f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_VETERAN, 2140.146f, 169.2364f, 66.30494f, 2.49f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                break;
+            case 25:
+                m_creature->SummonCreature(NPC_MAGE, 2107.938f, 192.0753f, 66.30494f, 2.54f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_MAGE, 2109.852f, 195.1403f, 66.30493f, 2.42f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_VETERAN, 2108.486f, 189.9346f, 66.30494f, 2.68f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_VETERAN, 2112.387f, 195.4947f, 66.30494f, 2.39f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                break;
+                // *** Escort event - Part I - meet Skarloc ***
+            case 31:
+                m_pInstance->SetData(TYPE_SKARLOC, IN_PROGRESS);
+                m_creature->SummonCreature(NPC_SKARLOC, 2000.201f, 277.9190f, 66.4911f, 6.11f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                m_creature->SummonCreature(NPC_VETERAN, 1997.969f, 274.4247f, 66.6181f, 5.67f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                m_creature->SummonCreature(NPC_WARDEN, 2000.002f, 282.0754f, 66.2986f, 6.02f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                DoScriptText(SAY_TH_SKARLOC_MEET, m_creature);
+                SetEscortPaused(true);
+                break;
+            case 33:
+                // Allow the guards and Skarloc to attack
+                if (Creature* pSkarloc = m_pInstance->GetSingleCreatureFromStorage(NPC_SKARLOC))
+                {
+                    pSkarloc->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                    pSkarloc->AI()->AttackStart(m_creature);
+                    AttackStart(pSkarloc);
+                }
+                for (GuidList::const_iterator itr = m_lSkarlocAddsGuids.begin(); itr != m_lSkarlocAddsGuids.end(); ++itr)
+                {
+                    if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                    {
+                        pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                        pTemp->AI()->AttackStart(m_creature);
+                    }
+                }
+                break;
+            case 34:
+                // wait for player input
+                if (Creature* pMount = m_creature->GetMap()->GetCreature(m_skarlocMountGuid))
+                {
+                    m_creature->SetFacingToObject(pMount);
+                }
+
+                SetEscortPaused(true);
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                break;
+                // *** Escort event - Part II - road ***
+            case 35:
+                if (Creature* pMount = m_creature->GetMap()->GetCreature(m_skarlocMountGuid))
+                {
+                    m_creature->SetFacingToObject(pMount);
+                    pMount->ForcedDespawn(4000);
+                }
+                break;
+            case 36:
+                DoScriptText(SAY_TH_MOUNTS_UP, m_creature);
+                m_creature->SetFacingTo(5.33f);
+                m_creature->Mount(MODEL_SKARLOC_MOUNT);
+                break;
+                // *** Escort event - Part II - reached barn ***
+            case 64:
+                m_creature->SummonCreature(NPC_SKARLOC_MOUNT, 2488.779f, 623.9724f, 58.07383f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 30000);
+                m_creature->Unmount();
+                m_bHadMount = false;
+                break;
+            case 65:
+                if (Creature* pMount = m_creature->GetMap()->GetCreature(m_skarlocMountGuid))
+                {
+                    m_creature->SetFacingToObject(pMount);
+                }
+                DoScriptText(EMOTE_TH_STARTLE_HORSE, m_creature);
+                break;
+            case 66:
+                if (Creature* pMount = m_creature->GetMap()->GetCreature(m_skarlocMountGuid))
+                {
+                    pMount->SetWalk(false);
+                    pMount->GetMotionMaster()->MovePoint(0, 2517.504f, 506.253f, 42.329f);
+                }
+                m_creature->SetFacingTo(4.66f);
+                // wait for player input
+                SetEscortPaused(true);
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                m_pInstance->SetData(TYPE_ESCORT_BARN, DONE);
+                break;
+                // *** Escort event - Part III - barn ***
+            case 70:
+                SetRun(false);
+                break;
+            case 73:
+                m_creature->SummonCreature(NPC_TARREN_MILL_PROTECTOR, 2500.22f, 692.60f, 55.50f, 2.84f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                m_creature->SummonCreature(NPC_TARREN_MILL_LOOKOUT, 2500.13f, 696.55f, 55.51f, 3.38f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                m_creature->SummonCreature(NPC_TARREN_MILL_GUARDSMAN, 2500.55f, 693.64f, 55.50f, 3.14f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                m_creature->SummonCreature(NPC_TARREN_MILL_GUARDSMAN, 2500.94f, 695.81f, 55.50f, 3.14f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                break;
+                // *** Escort event - Part III - start barn dialogue ***
+            case 74:
+                StartNextDialogueText(SAY_LOOKOUT_BARN_1);
+                SetEscortPaused(true);
+                break;
+            case 75:
+                DoScriptText(SAY_TH_HEAD_TOWN, m_creature);
+                break;
+                // *** Escort event - Part III - church ***
+            case 92:
+                DoScriptText(SAY_TH_CHURCH_ENTER, m_creature);
+                m_creature->SetFacingTo(1.0f);
+                break;
+            case 93:
+                m_creature->SummonCreature(NPC_CHURCH_PROTECTOR, 2627.88f, 657.63f, 55.98f, 4.28f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_CHURCH_LOOKOUT, 2627.27f, 655.17f, 56.03f, 4.50f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_CHURCH_LOOKOUT, 2629.21f, 654.81f, 56.04f, 4.38f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_CHURCH_GUARDSMAN, 2629.98f, 656.96f, 55.96f, 4.34f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 5000);
+                break;
+            case 94:
+                DoScriptText(SAY_TH_CHURCH_END, m_creature);
+                break;
+                // *** Escort event - Part III - inside the inn ***
+            case 105:
+                m_creature->SummonCreature(NPC_INN_PROTECTOR, 2652.71f, 660.31f, 61.93f, 1.67f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_INN_LOOKOUT, 2648.96f, 662.59f, 61.93f, 0.79f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_INN_LOOKOUT, 2657.36f, 662.34f, 61.93f, 2.68f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                m_creature->SummonCreature(NPC_INN_GUARDSMAN, 2656.39f, 659.77f, 61.93f, 2.61f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                SetRun(false);
+                break;
+                // *** Escort event - Part III - meet Taretha ***
+            case 106:
+                if (Creature* pTaretha = m_pInstance->GetSingleCreatureFromStorage(NPC_TARETHA))
+                {
+                    DoScriptText(SAY_TA_ESCAPED, pTaretha, m_creature);
+                }
+                break;
+            case 107:
+                // wait for player input
+                DoScriptText(SAY_TH_MEET_TARETHA, m_creature);
+                m_pInstance->SetData(TYPE_ESCORT_INN, DONE);
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                if (Creature* pTaretha = m_pInstance->GetSingleCreatureFromStorage(NPC_TARETHA))
+                {
+                    pTaretha->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                }
+                SetEscortPaused(true);
+                break;
+                // *** Escort event - Part IV - Epoch ***
+            case 108:
+                m_creature->SummonCreature(NPC_EPOCH, 2639.92f, 700.2587f, 65.13583f, 4.74f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                StartNextDialogueText(NPC_EPOCH);
+                SetEscortPaused(true);
+                break;
+                // *** Escort event - Part IV - Epoch - begin fight ***
+            case 116:
+                if (Creature* pEpoch = m_pInstance->GetSingleCreatureFromStorage(NPC_EPOCH))
+                {
+                    DoScriptText(SAY_EPOCH_ENTER3, pEpoch);
+                    m_creature->SetFacingToObject(pEpoch);
+                }
+                break;
+            case 117:
+                // begin fight
+                m_lTarrenMillSoldiersGuids.clear();
+                m_creature->SummonCreature(NPC_TARREN_MILL_GUARDSMAN, 2630.318f, 704.3388f, 56.33701f, 4.73f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                m_creature->SummonCreature(NPC_TARREN_MILL_LOOKOUT, 2639.1f, 707.3839f, 56.14664f, 4.49f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                m_creature->SummonCreature(NPC_TARREN_MILL_PROTECTOR, 2653.135f, 698.6548f, 57.56876f, 3.17f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                ++m_uiEpochWaveId;
+                SetEscortPaused(true);
+                break;
+                // *** Escort event - Epilogue - run off ***
+            case 118:
+                // return to position
+                SetEscortPaused(true);
+                break;
+            case 120:
+                m_creature->SetActiveObjectState(false);
+                break;
+            }
+        }
+
+        // Wrapper to restart escort
+        void DoRestartEscortMovement()
+        {
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            SetEscortPaused(false);
+        }
+
+        // Complete the quest for escorting
+        void DoHandleQuestCredit()
+        {
+            Map::PlayerList const& lPlayerList = m_pInstance->instance->GetPlayers();
+
+            if (!lPlayerList.isEmpty())
+            {
+                for (Map::PlayerList::const_iterator itr = lPlayerList.begin(); itr != lPlayerList.end(); ++itr)
+                {
+                    if (Player* pPlayer = itr->getSource())
+                    {
+                        pPlayer->KilledMonsterCredit(NPC_THRALL_QUEST_TRIGGER, m_creature->GetObjectGuid());
+                    }
+                }
+            }
+        }
+
+        // Wrapper to make the dragons attack
+        void DoStartDragonsAttack()
+        {
+            for (GuidList::const_iterator itr = m_lTarrenMillSoldiersGuids.begin(); itr != m_lTarrenMillSoldiersGuids.end(); ++itr)
+            {
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    // Only one will yell aggro
+                    if (!m_bHasEpochYelled)
+                    {
+                        switch (urand(0, 3))
+                        {
+                        case 0: DoScriptText(SAY_INFINITE_DRAGON_AGGRO_1, pTemp); break;
+                        case 1: DoScriptText(SAY_INFINITE_DRAGON_AGGRO_2, pTemp); break;
+                        case 2: DoScriptText(SAY_INFINITE_DRAGON_AGGRO_3, pTemp); break;
+                        case 3: DoScriptText(SAY_INFINITE_DRAGON_AGGRO_4, pTemp); break;
+                        }
+                        m_bHasEpochYelled = true;
+                    }
+
+                    // Attack Thrall
+                    pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                    pTemp->AI()->AttackStart(m_creature);
+                }
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            // Handle soldiers tranform to Infinite dragons
+            if (m_uiEpochAttackTimer)
+            {
+                if (m_uiEpochAttackTimer <= uiDiff)
+                {
+                    DoStartDragonsAttack();
+                    m_uiEpochAttackTimer = 0;
+                }
+                else
+                {
+                    m_uiEpochAttackTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_STRIKE) == CAST_OK)
+                {
+                    m_uiStrikeTimer = urand(4000, 7000);
+                }
+            }
+            else
+            {
+                m_uiStrikeTimer -= uiDiff;
+            }
+
+            if (m_uiShieldBlockTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHIELD_BLOCK) == CAST_OK)
+                {
+                    m_uiShieldBlockTimer = urand(8000, 15000);
+                }
+            }
+            else
+            {
+                m_uiShieldBlockTimer -= uiDiff;
+            }
+
+            if (!m_bIsLowHp && m_creature->GetHealthPercent() < 20.0f)
+            {
+                DoScriptText(urand(0, 1) ? SAY_TH_RANDOM_LOW_HP1 : SAY_TH_RANDOM_LOW_HP2, m_creature);
+                m_bIsLowHp = true;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_thrall_old_hillsbradAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+            pPlayer->SendPreparedQuest(pCreature->GetObjectGuid());
+        }
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            // If the inn escort has started, skip the gossip
+            if (pInstance->GetData(TYPE_ESCORT_INN) == DONE)
+            {
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_INN, pCreature->GetObjectGuid());
+            }
+            // Escort - barn to inn
+            else if (pInstance->GetData(TYPE_ESCORT_BARN) == DONE)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TARREN_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_TARREN, pCreature->GetObjectGuid());
+            }
+            // Escort - after Skarloc is defeated
+            else if (pInstance->GetData(TYPE_SKARLOC) == DONE)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_SKARLOC_1, pCreature->GetObjectGuid());
+            }
+            // Event start - after Drake is defeated
+            else if (pInstance->GetData(TYPE_DRAKE) == DONE)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_START, pCreature->GetObjectGuid());
+            }
+        }
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+        switch (uiAction)
+        {
+            // Event start
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+            DoScriptText(SAY_TH_START_EVENT_PART_1, pCreature);
+
+            if (pInstance)
+            {
+                pInstance->SetData(TYPE_THRALL_EVENT, IN_PROGRESS);
+            }
+
+            if (npc_thrall_old_hillsbradAI* pThrallAI = dynamic_cast<npc_thrall_old_hillsbradAI*>(pCreature->AI()))
+            {
+                pThrallAI->Start(true, pPlayer);
+            }
+
+            break;
+            // Escort - after Skarloc
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 20);
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_SKARLOC_2, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 20:
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_SKARLOC_3, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 21:
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+            DoScriptText(SAY_TH_START_EVENT_PART2, pCreature);
+
+            if (pInstance)
+            {
+                pInstance->SetData(TYPE_ESCORT_BARN, IN_PROGRESS);
+            }
+
+            if (npc_thrall_old_hillsbradAI* pThrallAI = dynamic_cast<npc_thrall_old_hillsbradAI*>(pCreature->AI()))
+            {
+                pThrallAI->DoRestartEscortMovement();
+            }
+
+            break;
+            // Escort - barn to inn
+        case GOSSIP_ACTION_INFO_DEF + 3:
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+            if (pInstance)
+            {
+                pInstance->SetData(TYPE_ESCORT_INN, IN_PROGRESS);
+            }
+
+            if (npc_thrall_old_hillsbradAI* pThrallAI = dynamic_cast<npc_thrall_old_hillsbradAI*>(pCreature->AI()))
+            {
+                pThrallAI->DoRestartEscortMovement();
+            }
+
+            break;
+        }
+        return true;
+    }
+};
+
+/*######
+## npc_taretha
+######*/
+
+enum
+{
+    // end event texts and spells
+    SAY_TA_FREE                     = -1560048,
+    SAY_TR_GLAD_SAFE                = -1560054,
+    SAY_TA_NEVER_MET                = -1560055,
+    SAY_TR_THEN_WHO                 = -1560056,
+    SAY_PRE_WIPE                    = -1560057,
+    SAY_WIPE_MEMORY                 = -1560051,
+    SAY_ABOUT_TARETHA               = -1560052,
+    SAY_TH_EVENT_COMPLETE           = -1560033,
+    SAY_TA_FAREWELL                 = -1560053,
+    SAY_AFTER_WIPE                  = -1560058,             // not sure when to use this one
+
+    GOSSIP_ITEM_EPOCH_1             = -3560005,             // "Strange wizard?"
+    TEXT_ID_EPOCH_1                 = 9610,                 // Thank you for helping Thrall escape, friends. Now I only hope
+
+    GOSSIP_ITEM_EPOCH_2             = -3560006,             // "We'll get you out. Taretha. Don't worry. I doubt the wizard would wander too far away."
+    TEXT_ID_EPOCH_2                 = 9613,                 // Yes, friends. This man was no wizard of
+
+    SPELL_TELEPORT                  = 7791,
+    SPELL_MEMORY_WIPE               = 33336,                // hits Taretha and Thrall
+    SPELL_MEMORY_WP_RESUME          = 33337,
+    SPELL_SHADOW_PRISON             = 33071,                // in creature_template_addon - remove from Taretha on event complete
+};
+
+static const DialogueEntry aTarethaDialogue[] =
+{
+    {SAY_TA_FREE,           NPC_TARETHA,    4000},
+    {SAY_TR_GLAD_SAFE,      NPC_THRALL,     9000},
+    {SAY_TA_NEVER_MET,      NPC_TARETHA,    3000},
+    {SAY_TR_THEN_WHO,       NPC_THRALL,     6000},
+    {SPELL_MEMORY_WIPE,     0,              3000},
+    {SAY_WIPE_MEMORY,       NPC_EROZION,    12000},
+    {SAY_ABOUT_TARETHA,     NPC_EROZION,    6000},
+    {SAY_TH_EVENT_COMPLETE, NPC_THRALL,     3000},
+    {NPC_THRALL,            0,              2000},
+    {SAY_TA_FAREWELL,       NPC_TARETHA,    3000},
+    {NPC_TARETHA,           0,              0},
+    {0, 0, 0},
+};
+
+struct npc_taretha : public CreatureScript
+{
+    npc_taretha() : CreatureScript("npc_taretha") {}
+
+    struct npc_tarethaAI : public npc_escortAI, private DialogueHelper
+    {
+        npc_tarethaAI(Creature* pCreature) : npc_escortAI(pCreature),
+        DialogueHelper(aTarethaDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bHasStartedEpilogue;
+
+        void Reset() override
+        {
+            m_bHasStartedEpilogue = false;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Remove flags from the npc - the quest will be handled by the entrance version
+            if (pSummoned->GetEntry() == NPC_EROZION)
+            {
+                DoScriptText(SAY_PRE_WIPE, pSummoned);
+                pSummoned->CastSpell(pSummoned, SPELL_TELEPORT, false);
+                pSummoned->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER);
+            }
+        }
+
+        void WaypointReached(uint32 uiPoint) override
+        {
+            if (uiPoint == 7)
+            {
+                StartNextDialogueText(SAY_TA_FREE);
+
+                if (m_pInstance)
+                {
+                    if (Creature* pThrall = m_pInstance->GetSingleCreatureFromStorage(NPC_THRALL))
+                    {
+                        pThrall->SetFacingToObject(m_creature);
+                    }
+                }
+
+                m_creature->HandleEmote(EMOTE_ONESHOT_CHEER);
+                SetEscortPaused(true);
+                SetRun(false);
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            switch (iEntry)
+            {
+            case SAY_TR_THEN_WHO:
+                m_creature->SummonCreature(NPC_EROZION, 2646.47f, 680.416f, 55.38f, 4.16f, TEMPSUMMON_TIMED_DESPAWN, 5 * MINUTE * IN_MILLISECONDS);
+                break;
+            case SPELL_MEMORY_WIPE:
+                if (Creature* pErozion = m_pInstance->GetSingleCreatureFromStorage(NPC_EROZION))
+                {
+                    pErozion->CastSpell(pErozion, SPELL_MEMORY_WIPE, false);
+                }
+                break;
+            case SAY_TH_EVENT_COMPLETE:
+                if (Creature* pErozion = m_pInstance->GetSingleCreatureFromStorage(NPC_EROZION))
+                {
+                    pErozion->CastSpell(pErozion, SPELL_MEMORY_WP_RESUME, false);
+                }
+                if (Creature* pThrall = m_pInstance->GetSingleCreatureFromStorage(NPC_THRALL))
+                {
+                    pThrall->RemoveAurasDueToSpell(SPELL_MEMORY_WIPE);
+                }
+                m_creature->RemoveAurasDueToSpell(SPELL_MEMORY_WIPE);
+                break;
+            case NPC_THRALL:
+                if (Creature* pThrall = m_pInstance->GetSingleCreatureFromStorage(NPC_THRALL))
+                {
+                    if (npc_escortAI* pThrallAI = dynamic_cast<npc_escortAI*>(pThrall->AI()))
+                    {
+                        pThrallAI->SetEscortPaused(false);
+                    }
+                }
+                break;
+            case SAY_TA_FAREWELL:
+                if (Creature* pThrall = m_pInstance->GetSingleCreatureFromStorage(NPC_THRALL))
+                {
+                    m_creature->SetFacingToObject(pThrall);
+                }
+                m_creature->HandleEmote(EMOTE_ONESHOT_WAVE);
+                break;
+            case NPC_TARETHA:
+                if (Creature* pErozion = m_pInstance->GetSingleCreatureFromStorage(NPC_EROZION))
+                {
+                    pErozion->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                }
+                m_pInstance->SetData(TYPE_THRALL_EVENT, DONE);
+                SetEscortPaused(false);
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_bHasStartedEpilogue && m_pInstance)
+            {
+                // Start epilogue
+                if (m_pInstance->GetData(TYPE_EPOCH) == DONE && m_pInstance->GetData(TYPE_THRALL_EVENT) != DONE)
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_SHADOW_PRISON);
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+
+                    Start(true);
+                    m_bHasStartedEpilogue = true;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_tarethaAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        InstanceData* pInstance = pCreature->GetInstanceData();
+
+        if (pInstance && pInstance->GetData(TYPE_ESCORT_INN) == DONE && pInstance->GetData(TYPE_EPOCH) != DONE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_EPOCH_1, pCreature->GetObjectGuid());
+        }
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_EPOCH_2, pCreature->GetObjectGuid());
+        }
+
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 2)
+        {
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+            if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS)
+            {
+                pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+
+                if (Creature* pThrall = pInstance->GetSingleCreatureFromStorage(NPC_THRALL))
+                {
+                    if (npc_escortAI* pThrallAI = dynamic_cast<npc_escortAI*>(pThrall->AI()))
+                    {
+                        pThrall->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                        pThrallAI->SetEscortPaused(false);
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+};
+
+void AddSC_old_hillsbrad()
+{
+    Script* s;
+
+    s = new npc_erozion();
+    s->RegisterSelf();
+    s = new npc_thrall_old_hillsbrad();
+    s->RegisterSelf();
+    s = new npc_taretha();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_erozion";
+    //pNewScript->pGossipHello = &GossipHello_npc_erozion;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_erozion;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_thrall_old_hillsbrad";
+    //pNewScript->GetAI = &GetAI_npc_thrall_old_hillsbrad;
+    //pNewScript->pGossipHello = &GossipHello_npc_thrall_old_hillsbrad;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_thrall_old_hillsbrad;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_taretha";
+    //pNewScript->GetAI = &GetAI_npc_taretha;
+    //pNewScript->pGossipHello = &GossipHello_npc_taretha;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_taretha;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h b/src/modules/SD3/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h
new file mode 100644
index 000000000..8a8874b45
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h
@@ -0,0 +1,74 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_OLD_HILLSBRAD_H
+#define DEF_OLD_HILLSBRAD_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 7,
+    MAX_BARRELS                     = 5,
+    MAX_WIPE_COUNTER                = 20,
+
+    TYPE_BARREL_DIVERSION           = 0,                    // barrel event
+    TYPE_DRAKE                      = 1,                    // first boss
+    TYPE_SKARLOC                    = 2,                    // prison to keep - boss
+    TYPE_ESCORT_BARN                = 3,                    // keep to barn
+    TYPE_ESCORT_INN                 = 4,                    // barn to inn
+    TYPE_EPOCH                      = 5,                    // inn event
+    TYPE_THRALL_EVENT               = 6,                    // global event
+    TYPE_THRALL_EVENT_COUNT         = MAX_ENCOUNTER,
+
+    // event npcs
+    NPC_THRALL                      = 17876,
+    NPC_TARETHA                     = 18887,
+    NPC_EROZION                     = 18723,
+    NPC_LODGE_QUEST_TRIGGER         = 20155,
+    NPC_ARMORER                     = 18764,
+    NPC_ORC_PRISONER                = 18598,
+
+    NPC_TARREN_MILL_GUARDSMAN       = 18092,
+    NPC_TARREN_MILL_PROTECTOR       = 18093,
+    NPC_TARREN_MILL_LOOKOUT         = 18094,
+    NPC_YOUNG_BLANCHY               = 18651,
+
+    // bosses
+    NPC_DRAKE                       = 17848,
+    NPC_SKARLOC                     = 17862,
+    NPC_EPOCH                       = 18096,
+
+    GO_ROARING_FLAME                = 182592,
+    GO_PRISON_DOOR                  = 184393,
+
+    QUEST_ENTRY_HILLSBRAD           = 10282,
+    QUEST_ENTRY_DIVERSION           = 10283,
+    QUEST_ENTRY_ESCAPE              = 10284,
+    QUEST_ENTRY_RETURN              = 10285,
+
+    WORLD_STATE_OH                  = 2436,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/kalimdor/darkshore.cpp b/src/modules/SD3/scripts/kalimdor/darkshore.cpp
new file mode 100644
index 000000000..4ef7c21f5
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/darkshore.cpp
@@ -0,0 +1,897 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Darkshore
+ * SD%Complete: 100
+ * SDComment:   Quest support: 731, 945, 994, 995, 2078, 2118, 5321.
+ * SDCategory:  Darkshore
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_kerlonian
+ * npc_prospector_remtravel
+ * npc_threshwackonator
+ * npc_volcor
+ * npc_therylune
+ * npc_rabidbear
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "follower_ai.h"
+
+/*####
+# npc_kerlonian
+####*/
+
+enum
+{
+    SAY_KER_START               = -1000434,
+
+    EMOTE_KER_SLEEP_1           = -1000435,
+    EMOTE_KER_SLEEP_2           = -1000436,
+    EMOTE_KER_SLEEP_3           = -1000437,
+
+    SAY_KER_SLEEP_1             = -1000438,
+    SAY_KER_SLEEP_2             = -1000439,
+    SAY_KER_SLEEP_3             = -1000440,
+    SAY_KER_SLEEP_4             = -1000441,
+
+    EMOTE_KER_AWAKEN            = -1000445,
+
+    SAY_KER_ALERT_1             = -1000442,
+    SAY_KER_ALERT_2             = -1000443,
+
+    SAY_KER_END                 = -1000444,
+
+    SPELL_SLEEP_VISUAL          = 25148,
+    SPELL_AWAKEN                = 17536,
+    QUEST_SLEEPER_AWAKENED      = 5321,
+    NPC_LILADRIS                = 11219                     // attackers entries unknown
+};
+
+// TODO: make concept similar as "ringo" -escort. Find a way to run the scripted attacks, _if_ player are choosing road.
+struct npc_kerlonian : public CreatureScript
+{
+    npc_kerlonian() : CreatureScript("npc_kerlonian") {}
+
+    struct npc_kerlonianAI : public FollowerAI
+    {
+        npc_kerlonianAI(Creature* pCreature) : FollowerAI(pCreature) { }
+
+        uint32 m_uiFallAsleepTimer;
+
+        void Reset() override
+        {
+            m_uiFallAsleepTimer = urand(10000, 45000);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            FollowerAI::MoveInLineOfSight(pWho);
+
+            if (!m_creature->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && pWho->GetEntry() == NPC_LILADRIS)
+            {
+                if (m_creature->IsWithinDistInMap(pWho, INTERACTION_DISTANCE * 5))
+                {
+                    if (Player* pPlayer = GetLeaderForFollower())
+                    {
+                        if (pPlayer->GetQuestStatus(QUEST_SLEEPER_AWAKENED) == QUEST_STATUS_INCOMPLETE)
+                        {
+                            pPlayer->GroupEventHappens(QUEST_SLEEPER_AWAKENED, m_creature);
+                        }
+
+                        DoScriptText(SAY_KER_END, m_creature);
+                    }
+
+                    SetFollowComplete();
+                }
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (HasFollowState(STATE_FOLLOW_INPROGRESS | STATE_FOLLOW_PAUSED) && pSpell->Id == SPELL_AWAKEN)
+            {
+                ClearSleeping();
+            }
+        }
+
+        void SetSleeping()
+        {
+            SetFollowPaused(true);
+
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(EMOTE_KER_SLEEP_1, m_creature);
+                break;
+            case 1:
+                DoScriptText(EMOTE_KER_SLEEP_2, m_creature);
+                break;
+            case 2:
+                DoScriptText(EMOTE_KER_SLEEP_3, m_creature);
+                break;
+            }
+
+            switch (urand(0, 3))
+            {
+            case 0:
+                DoScriptText(SAY_KER_SLEEP_1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_KER_SLEEP_2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_KER_SLEEP_3, m_creature);
+                break;
+            case 3:
+                DoScriptText(SAY_KER_SLEEP_4, m_creature);
+                break;
+            }
+
+            m_creature->SetStandState(UNIT_STAND_STATE_SLEEP);
+            m_creature->CastSpell(m_creature, SPELL_SLEEP_VISUAL, false);
+        }
+
+        void ClearSleeping()
+        {
+            m_creature->RemoveAurasDueToSpell(SPELL_SLEEP_VISUAL);
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+
+            DoScriptText(EMOTE_KER_AWAKEN, m_creature);
+
+            SetFollowPaused(false);
+        }
+
+        void UpdateFollowerAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (!HasFollowState(STATE_FOLLOW_INPROGRESS))
+                {
+                    return;
+                }
+
+                if (!HasFollowState(STATE_FOLLOW_PAUSED))
+                {
+                    if (m_uiFallAsleepTimer < uiDiff)
+                    {
+                        SetSleeping();
+                        m_uiFallAsleepTimer = urand(25000, 90000);
+                    }
+                    else
+                    {
+                        m_uiFallAsleepTimer -= uiDiff;
+                    }
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kerlonianAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_SLEEPER_AWAKENED)
+        {
+            if (npc_kerlonianAI* pKerlonianAI = dynamic_cast<npc_kerlonianAI*>(pCreature->AI()))
+            {
+                pCreature->SetStandState(UNIT_STAND_STATE_STAND);
+                DoScriptText(SAY_KER_START, pCreature, pPlayer);
+                pKerlonianAI->StartFollow(pPlayer, FACTION_ESCORT_N_FRIEND_PASSIVE, pQuest);
+            }
+        }
+
+        return true;
+    }
+};
+
+/*####
+# npc_prospector_remtravel
+####*/
+
+enum
+{
+    SAY_REM_START               = -1000327,
+    SAY_REM_AGGRO               = -1000339,
+    SAY_REM_RAMP1_1             = -1000328,
+    SAY_REM_RAMP1_2             = -1000329,
+    SAY_REM_BOOK                = -1000330,
+    SAY_REM_TENT1_1             = -1000331,
+    SAY_REM_TENT1_2             = -1000332,
+    SAY_REM_MOSS                = -1000333,
+    EMOTE_REM_MOSS              = -1000334,
+    SAY_REM_MOSS_PROGRESS       = -1000335,
+    SAY_REM_PROGRESS            = -1000336,
+    SAY_REM_REMEMBER            = -1000337,
+    EMOTE_REM_END               = -1000338,
+
+    QUEST_ABSENT_MINDED_PT2     = 731,
+    NPC_GRAVEL_SCOUT            = 2158,
+    NPC_GRAVEL_BONE             = 2159,
+    NPC_GRAVEL_GEO              = 2160
+};
+
+struct npc_prospector_remtravel : public CreatureScript
+{
+    npc_prospector_remtravel() : CreatureScript("npc_prospector_remtravel") {}
+
+    struct npc_prospector_remtravelAI : public npc_escortAI
+    {
+        npc_prospector_remtravelAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 0:
+                DoScriptText(SAY_REM_START, m_creature, pPlayer);
+                break;
+            case 5:
+                DoScriptText(SAY_REM_RAMP1_1, m_creature, pPlayer);
+                break;
+            case 6:
+                DoSpawnCreature(NPC_GRAVEL_SCOUT, -10.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                DoSpawnCreature(NPC_GRAVEL_BONE, -10.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                break;
+            case 9:
+                DoScriptText(SAY_REM_RAMP1_2, m_creature, pPlayer);
+                break;
+            case 14:
+                // depend quest rewarded?
+                DoScriptText(SAY_REM_BOOK, m_creature, pPlayer);
+                break;
+            case 15:
+                DoScriptText(SAY_REM_TENT1_1, m_creature, pPlayer);
+                break;
+            case 16:
+                DoSpawnCreature(NPC_GRAVEL_SCOUT, -10.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                DoSpawnCreature(NPC_GRAVEL_BONE, -10.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                break;
+            case 17:
+                DoScriptText(SAY_REM_TENT1_2, m_creature, pPlayer);
+                break;
+            case 26:
+                DoScriptText(SAY_REM_MOSS, m_creature, pPlayer);
+                break;
+            case 27:
+                DoScriptText(EMOTE_REM_MOSS, m_creature, pPlayer);
+                break;
+            case 28:
+                DoScriptText(SAY_REM_MOSS_PROGRESS, m_creature, pPlayer);
+                break;
+            case 29:
+                DoSpawnCreature(NPC_GRAVEL_SCOUT, -15.0f, 3.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                DoSpawnCreature(NPC_GRAVEL_BONE, -15.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                DoSpawnCreature(NPC_GRAVEL_GEO, -15.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                break;
+            case 31:
+                DoScriptText(SAY_REM_PROGRESS, m_creature, pPlayer);
+                break;
+            case 41:
+                DoScriptText(SAY_REM_REMEMBER, m_creature, pPlayer);
+                break;
+            case 42:
+                DoScriptText(EMOTE_REM_END, m_creature, pPlayer);
+                pPlayer->GroupEventHappens(QUEST_ABSENT_MINDED_PT2, m_creature);
+                break;
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (urand(0, 1))
+            {
+                DoScriptText(SAY_REM_AGGRO, m_creature, pWho);
+            }
+        }
+
+        void JustSummoned(Creature* /*pSummoned*/) override
+        {
+            // unsure if it should be any
+            // pSummoned->AI()->AttackStart(m_creature);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_prospector_remtravelAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ABSENT_MINDED_PT2)
+        {
+            pCreature->SetFactionTemporary(FACTION_ESCORT_A_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+
+            if (npc_prospector_remtravelAI* pEscortAI = dynamic_cast<npc_prospector_remtravelAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest, true);
+            }
+        }
+
+        return true;
+    }
+};
+
+/*####
+# npc_threshwackonator
+####*/
+
+enum
+{
+    EMOTE_START             = -1000325,
+    SAY_AT_CLOSE            = -1000326,
+    QUEST_GYROMAST_REV      = 2078,
+    NPC_GELKAK              = 6667,
+    FACTION_HOSTILE         = 14
+};
+
+#define GOSSIP_ITEM_INSERT_KEY  "[PH] Insert key"
+
+struct npc_threshwackonator : public CreatureScript
+{
+    npc_threshwackonator() : CreatureScript("npc_threshwackonator") {}
+
+    struct npc_threshwackonatorAI : public FollowerAI
+    {
+        npc_threshwackonatorAI(Creature* pCreature) : FollowerAI(pCreature) { }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            FollowerAI::MoveInLineOfSight(pWho);
+
+            if (!m_creature->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && pWho->GetEntry() == NPC_GELKAK)
+            {
+                if (m_creature->IsWithinDistInMap(pWho, 10.0f))
+                {
+                    DoScriptText(SAY_AT_CLOSE, pWho);
+                    DoAtEnd();
+                }
+            }
+        }
+
+        void DoAtEnd()
+        {
+            m_creature->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_RESPAWN);
+
+            if (Player* pHolder = GetLeaderForFollower())
+            {
+                m_creature->AI()->AttackStart(pHolder);
+            }
+
+            SetFollowComplete();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_threshwackonatorAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_GYROMAST_REV) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_INSERT_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+            if (npc_threshwackonatorAI* pThreshAI = dynamic_cast<npc_threshwackonatorAI*>(pCreature->AI()))
+            {
+                DoScriptText(EMOTE_START, pCreature);
+                pThreshAI->StartFollow(pPlayer);
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+/*######
+# npc_volcor
+######*/
+
+enum
+{
+    SAY_START                       = -1000789,
+    SAY_END                         = -1000790,
+    SAY_FIRST_AMBUSH                = -1000791,
+    SAY_AGGRO_1                     = -1000792,
+    SAY_AGGRO_2                     = -1000793,
+    SAY_AGGRO_3                     = -1000794,
+
+    SAY_ESCAPE                      = -1000195,
+
+    NPC_BLACKWOOD_SHAMAN            = 2171,
+    NPC_BLACKWOOD_URSA              = 2170,
+
+    SPELL_MOONSTALKER_FORM          = 10849,
+
+    WAYPOINT_ID_QUEST_STEALTH       = 16,
+    FACTION_FRIENDLY                = 35,
+
+    QUEST_ESCAPE_THROUGH_FORCE      = 994,
+    QUEST_ESCAPE_THROUGH_STEALTH    = 995,
+};
+
+struct SummonLocation
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+// Spawn locations
+static const SummonLocation aVolcorSpawnLocs[] =
+{
+    {4630.2f, 22.6f, 70.1f, 2.4f},
+    {4603.8f, 53.5f, 70.4f, 5.4f},
+    {4627.5f, 100.4f, 62.7f, 5.8f},
+    {4692.8f, 75.8f, 56.7f, 3.1f},
+    {4747.8f, 152.8f, 54.6f, 2.4f},
+    {4711.7f, 109.1f, 53.5f, 2.4f},
+};
+
+struct npc_volcor : public CreatureScript
+{
+    npc_volcor() : CreatureScript("npc_volcor") {}
+
+    struct npc_volcorAI : public npc_escortAI
+    {
+        npc_volcorAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        uint32 m_uiQuestId;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiQuestId = 0;
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            // shouldn't always use text on agro
+            switch (urand(0, 4))
+            {
+            case 0:
+                DoScriptText(SAY_AGGRO_1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_AGGRO_2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_AGGRO_3, m_creature);
+                break;
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // No combat for this quest
+            if (m_uiQuestId == QUEST_ESCAPE_THROUGH_STEALTH)
+            {
+                return;
+            }
+
+            npc_escortAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        // Wrapper to handle start function for both quests
+        void StartEscort(Player* pPlayer, const Quest* pQuest)
+        {
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            m_creature->SetFacingToObject(pPlayer);
+            m_uiQuestId = pQuest->GetQuestId();
+
+            if (pQuest->GetQuestId() == QUEST_ESCAPE_THROUGH_STEALTH)
+            {
+                // Note: faction may not be correct, but only this way works fine
+                m_creature->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN);
+
+                Start(true, pPlayer, pQuest);
+                SetEscortPaused(true);
+                SetCurrentWaypoint(WAYPOINT_ID_QUEST_STEALTH);
+                SetEscortPaused(false);
+            }
+            else
+            {
+                Start(false, pPlayer, pQuest);
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 2:
+                DoScriptText(SAY_START, m_creature);
+                break;
+            case 5:
+                m_creature->SummonCreature(NPC_BLACKWOOD_SHAMAN, aVolcorSpawnLocs[0].m_fX, aVolcorSpawnLocs[0].m_fY, aVolcorSpawnLocs[0].m_fZ, aVolcorSpawnLocs[0].m_fO, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                m_creature->SummonCreature(NPC_BLACKWOOD_URSA, aVolcorSpawnLocs[1].m_fX, aVolcorSpawnLocs[1].m_fY, aVolcorSpawnLocs[1].m_fZ, aVolcorSpawnLocs[1].m_fO, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                break;
+            case 6:
+                DoScriptText(SAY_FIRST_AMBUSH, m_creature);
+                break;
+            case 11:
+                m_creature->SummonCreature(NPC_BLACKWOOD_SHAMAN, aVolcorSpawnLocs[2].m_fX, aVolcorSpawnLocs[2].m_fY, aVolcorSpawnLocs[2].m_fZ, aVolcorSpawnLocs[2].m_fO, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                m_creature->SummonCreature(NPC_BLACKWOOD_URSA, aVolcorSpawnLocs[3].m_fX, aVolcorSpawnLocs[3].m_fY, aVolcorSpawnLocs[3].m_fZ, aVolcorSpawnLocs[3].m_fO, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+            case 13:
+                m_creature->SummonCreature(NPC_BLACKWOOD_URSA, aVolcorSpawnLocs[4].m_fX, aVolcorSpawnLocs[4].m_fY, aVolcorSpawnLocs[4].m_fZ, aVolcorSpawnLocs[4].m_fO, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                m_creature->SummonCreature(NPC_BLACKWOOD_URSA, aVolcorSpawnLocs[5].m_fX, aVolcorSpawnLocs[5].m_fY, aVolcorSpawnLocs[5].m_fZ, aVolcorSpawnLocs[5].m_fO, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+                break;
+            case 15:
+                DoScriptText(SAY_END, m_creature);
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_ESCAPE_THROUGH_FORCE, m_creature);
+                }
+                SetEscortPaused(true);
+                m_creature->ForcedDespawn(10000);
+                break;
+                // Quest 995 waypoints
+            case 16:
+                m_creature->HandleEmote(EMOTE_ONESHOT_BOW);
+                break;
+            case 17:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_ESCAPE, m_creature, pPlayer);
+                }
+                break;
+            case 18:
+                DoCastSpellIfCan(m_creature, SPELL_MOONSTALKER_FORM);
+                break;
+            case 24:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_ESCAPE_THROUGH_STEALTH, m_creature);
+                }
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_volcorAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ESCAPE_THROUGH_FORCE || pQuest->GetQuestId() == QUEST_ESCAPE_THROUGH_STEALTH)
+        {
+            if (npc_volcorAI* pEscortAI = dynamic_cast<npc_volcorAI*>(pCreature->AI()))
+            {
+                pEscortAI->StartEscort(pPlayer, pQuest);
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+/*####
+# npc_therylune
+####*/
+
+enum
+{
+    SAY_THERYLUNE_START              = -1000905,
+    SAY_THERYLUNE_FINISH             = -1000906,
+
+    NPC_THERYSIL                     = 3585,
+
+    QUEST_ID_THERYLUNE_ESCAPE        = 945,
+};
+
+struct npc_therylune : public CreatureScript
+{
+    npc_therylune() : CreatureScript("npc_therylune") {}
+
+    struct npc_theryluneAI : public npc_escortAI
+    {
+        npc_theryluneAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 17:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_ID_THERYLUNE_ESCAPE, m_creature);
+                }
+                break;
+            case 19:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_THERYLUNE_FINISH, m_creature, pPlayer);
+                }
+                SetRun();
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_theryluneAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_THERYLUNE_ESCAPE)
+        {
+            if (npc_theryluneAI* pEscortAI = dynamic_cast<npc_theryluneAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+                DoScriptText(SAY_THERYLUNE_START, pCreature, pPlayer);
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_rabid_bear
+######*/
+
+enum
+{
+    QUEST_PLAGUED_LANDS             = 2118,
+
+    NPC_CAPTURED_RABID_THISTLE_BEAR = 11836,
+    NPC_THARNARIUN_TREETENDER       = 3701,                 // Npc related to quest-outro
+    GO_NIGHT_ELVEN_BEAR_TRAP        = 111148,               // This is actually the (visual) spell-focus GO
+
+    SPELL_RABIES                    = 3150,                 // Spell used in comabt
+};
+
+struct npc_rabid_bear : public CreatureScript
+{
+    npc_rabid_bear() : CreatureScript("npc_rabid_bear") {}
+
+    struct npc_rabid_bearAI : public ScriptedAI
+    {
+        npc_rabid_bearAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            JustRespawned();    //TODO WTF?? check this
+        }
+
+        uint32 m_uiCheckTimer;
+        uint32 m_uiRabiesTimer;
+        uint32 m_uiDespawnTimer;
+
+        void Reset() override
+        {
+            m_uiRabiesTimer = urand(12000, 18000);
+        }
+
+        void JustRespawned() override
+        {
+            m_uiCheckTimer = 1000;
+            m_uiDespawnTimer = 0;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_uiCheckTimer && pWho->GetTypeId() == TYPEID_UNIT && pWho->GetEntry() == NPC_THARNARIUN_TREETENDER &&
+                pWho->IsWithinDist(m_creature, 2 * INTERACTION_DISTANCE, false))
+            {
+                // Possible related spell: 9455 9372
+                m_creature->ForcedDespawn(1000);
+                m_creature->GetMotionMaster()->MoveIdle();
+
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiCheckTimer && m_creature->IsInCombat())
+            {
+                if (m_uiCheckTimer <= uiDiff)
+                {
+                    // Trap nearby?
+                    if (GameObject* pTrap = GetClosestGameObjectWithEntry(m_creature, GO_NIGHT_ELVEN_BEAR_TRAP, 0.5f))
+                    {
+                        // Despawn trap
+                        pTrap->Use(m_creature);
+                        // "Evade"
+                        m_creature->RemoveAllAurasOnEvade();
+                        m_creature->DeleteThreatList();
+                        m_creature->CombatStop(true);
+                        m_creature->SetLootRecipient(NULL);
+                        Reset();
+                        // Update Entry and start following player
+                        m_creature->UpdateEntry(NPC_CAPTURED_RABID_THISTLE_BEAR);
+                        // get player
+                        Unit* pTrapOwner = pTrap->GetOwner();
+                        if (pTrapOwner && pTrapOwner->GetTypeId() == TYPEID_PLAYER &&
+                            ((Player*)pTrapOwner)->GetQuestStatus(QUEST_PLAGUED_LANDS) == QUEST_STATUS_INCOMPLETE)
+                        {
+                            ((Player*)pTrapOwner)->KilledMonsterCredit(m_creature->GetEntry(), m_creature->GetObjectGuid());
+                            m_creature->GetMotionMaster()->MoveFollow(pTrapOwner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
+                        }
+                        else                                // Something unexpected happened
+                        {
+                            m_creature->ForcedDespawn(1000);
+                        }
+
+                        // No need to check any more
+                        m_uiCheckTimer = 0;
+                        // Despawn after a while (delay guesswork)
+                        m_uiDespawnTimer = 3 * MINUTE * IN_MILLISECONDS;
+
+                        return;
+                    }
+                    else
+                    {
+                        m_uiCheckTimer = 1000;
+                    }
+                }
+                else
+                {
+                    m_uiCheckTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiDespawnTimer && !m_creature->IsInCombat())
+            {
+                if (m_uiDespawnTimer <= uiDiff)
+                {
+                    m_creature->ForcedDespawn();
+                    return;
+                }
+                else
+                {
+                    m_uiDespawnTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiRabiesTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0, SPELL_RABIES))
+                {
+                    DoCastSpellIfCan(pTarget, SPELL_RABIES);
+                }
+                m_uiRabiesTimer = urand(12000, 18000);
+            }
+            else
+            {
+                m_uiRabiesTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_rabid_bearAI(pCreature);
+    }
+};
+
+void AddSC_darkshore()
+{
+    Script* s;
+    s = new npc_kerlonian();
+    s->RegisterSelf();
+    s = new npc_prospector_remtravel();
+    s->RegisterSelf();
+    s = new npc_threshwackonator();
+    s->RegisterSelf();
+    s = new npc_volcor();
+    s->RegisterSelf();
+    s = new npc_therylune();
+    s->RegisterSelf();
+    s = new npc_rabid_bear();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kerlonian";
+    //pNewScript->GetAI = &GetAI_npc_kerlonian;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_kerlonian;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_prospector_remtravel";
+    //pNewScript->GetAI = &GetAI_npc_prospector_remtravel;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_prospector_remtravel;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_threshwackonator";
+    //pNewScript->GetAI = &GetAI_npc_threshwackonator;
+    //pNewScript->pGossipHello = &GossipHello_npc_threshwackonator;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_threshwackonator;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_volcor";
+    //pNewScript->GetAI = &GetAI_npc_volcor;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_volcor;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_therylune";
+    //pNewScript->GetAI = &GetAI_npc_therylune;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_therylune;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_rabid_bear";
+    //pNewScript->GetAI = &GetAI_npc_rabid_bear;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/desolace.cpp b/src/modules/SD3/scripts/kalimdor/desolace.cpp
new file mode 100644
index 000000000..baf943f6f
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/desolace.cpp
@@ -0,0 +1,483 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Desolace
+ * SD%Complete: 100
+ * SDComment:   Quest support: 1440, 5561, 6132.
+ * SDCategory:  Desolace
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_aged_dying_ancient_kodo
+ * npc_dalinda_malem
+ * npc_melizza_brimbuzzle
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_aged_dying_ancient_kodo
+######*/
+
+enum
+{
+    SAY_SMEED_HOME_1                = -1000348,
+    SAY_SMEED_HOME_2                = -1000349,
+    SAY_SMEED_HOME_3                = -1000350,
+
+    QUEST_KODO                      = 5561,
+
+    NPC_SMEED                       = 11596,
+    NPC_AGED_KODO                   = 4700,
+    NPC_DYING_KODO                  = 4701,
+    NPC_ANCIENT_KODO                = 4702,
+    NPC_TAMED_KODO                  = 11627,
+
+    SPELL_KODO_KOMBO_ITEM           = 18153,
+    SPELL_KODO_KOMBO_PLAYER_BUFF    = 18172,                // spells here have unclear function, but using them at least for visual parts and checks
+    SPELL_KODO_KOMBO_DESPAWN_BUFF   = 18377,
+    SPELL_KODO_KOMBO_GOSSIP         = 18362
+};
+
+struct npc_aged_dying_ancient_kodo : public CreatureScript
+{
+    npc_aged_dying_ancient_kodo() : CreatureScript("npc_aged_dying_ancient_kodo") {}
+
+    struct npc_aged_dying_ancient_kodoAI : public ScriptedAI
+    {
+        npc_aged_dying_ancient_kodoAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiDespawnTimer;
+
+        void Reset() override
+        {
+            m_uiDespawnTimer = 0;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (pWho->GetEntry() == NPC_SMEED)
+            {
+                if (m_creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP))
+                {
+                    return;
+                }
+
+                if (m_creature->IsWithinDistInMap(pWho, 10.0f))
+                {
+                    switch (urand(0, 2))
+                    {
+                    case 0:
+                        DoScriptText(SAY_SMEED_HOME_1, pWho);
+                        break;
+                    case 1:
+                        DoScriptText(SAY_SMEED_HOME_2, pWho);
+                        break;
+                    case 2:
+                        DoScriptText(SAY_SMEED_HOME_3, pWho);
+                        break;
+                    }
+
+                    // spell have no implemented effect (dummy), so useful to notify spellHit
+                    m_creature->CastSpell(m_creature, SPELL_KODO_KOMBO_GOSSIP, true);
+                }
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, SpellEntry const* pSpell) override
+        {
+            if (pSpell->Id == SPELL_KODO_KOMBO_GOSSIP)
+            {
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                m_uiDespawnTimer = 60000;
+            }
+        }
+
+        void UpdateAI(const uint32 diff) override
+        {
+            // timer should always be == 0 unless we already updated entry of creature. Then not expect this updated to ever be in combat.
+            if (m_uiDespawnTimer && m_uiDespawnTimer <= diff)
+            {
+                if (!m_creature->getVictim() && m_creature->IsAlive())
+                {
+                    Reset();
+                    m_creature->SetDeathState(JUST_DIED);
+                    m_creature->Respawn();
+                    return;
+                }
+            }
+            else { m_uiDespawnTimer -= diff; }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_aged_dying_ancient_kodoAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->HasAura(SPELL_KODO_KOMBO_PLAYER_BUFF) && pCreature->HasAura(SPELL_KODO_KOMBO_DESPAWN_BUFF))
+        {
+            // the expected quest objective
+            pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetObjectGuid());
+
+            pPlayer->RemoveAurasDueToSpell(SPELL_KODO_KOMBO_PLAYER_BUFF);
+            pCreature->GetMotionMaster()->MoveIdle();
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+};
+
+struct spell_npc_aged_dying_ancient_kodo : public SpellScript
+{
+    spell_npc_aged_dying_ancient_kodo() : SpellScript("spell_npc_aged_dying_ancient_kodo") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (spellId == SPELL_KODO_KOMBO_ITEM && effIndex == EFFECT_INDEX_0)
+        {
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            // no effect if player/creature already have aura from spells
+            if (pCaster->HasAura(SPELL_KODO_KOMBO_PLAYER_BUFF) || pCreatureTarget->HasAura(SPELL_KODO_KOMBO_DESPAWN_BUFF))
+            {
+                return true;
+            }
+
+            if (pCreatureTarget->GetEntry() == NPC_AGED_KODO ||
+                pCreatureTarget->GetEntry() == NPC_DYING_KODO ||
+                pCreatureTarget->GetEntry() == NPC_ANCIENT_KODO)
+            {
+                pCaster->CastSpell(pCaster, SPELL_KODO_KOMBO_PLAYER_BUFF, true);
+
+                pCreatureTarget->UpdateEntry(NPC_TAMED_KODO);
+                pCreatureTarget->CastSpell(pCreatureTarget, SPELL_KODO_KOMBO_DESPAWN_BUFF, false);
+
+                if (pCreatureTarget->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
+                {
+                    pCreatureTarget->GetMotionMaster()->MoveIdle();
+                }
+
+                pCreatureTarget->GetMotionMaster()->MoveFollow(pCaster, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+        return false;
+    }
+};
+
+/*######
+## npc_dalinda_malem
+######*/
+
+enum
+{
+    QUEST_RETURN_TO_VAHLARRIEL  = 1440,
+};
+
+struct npc_dalinda_malem : public CreatureScript
+{
+    npc_dalinda_malem() : CreatureScript("npc_dalinda_malem") {}
+
+    struct npc_dalinda_malemAI : public npc_escortAI
+    {
+        npc_dalinda_malemAI(Creature* m_creature) : npc_escortAI(m_creature) { }
+
+        void JustStartedEscort() override
+        {
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            if (uiPointId == 18)
+            {
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_RETURN_TO_VAHLARRIEL, m_creature);
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_dalinda_malemAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_RETURN_TO_VAHLARRIEL)
+        {
+            if (npc_dalinda_malemAI* pEscortAI = dynamic_cast<npc_dalinda_malemAI*>(pCreature->AI()))
+            {
+                // TODO This faction change needs confirmation, also possible that we need to drop her PASSIVE flag
+                pCreature->SetFactionTemporary(FACTION_ESCORT_A_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_TOGGLE_PASSIVE);
+                pEscortAI->Start(false, pPlayer, pQuest);
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+/*######
+## npc_melizza_brimbuzzle
+######*/
+
+enum
+{
+    QUEST_GET_ME_OUT_OF_HERE    = 6132,
+
+    GO_MELIZZAS_CAGE            = 177706,
+
+    SAY_MELIZZA_START           = -1000784,
+    SAY_MELIZZA_FINISH          = -1000785,
+    SAY_MELIZZA_1               = -1000786,
+    SAY_MELIZZA_2               = -1000787,
+    SAY_MELIZZA_3               = -1000788,
+
+    NPC_MARAUDINE_MARAUDER      = 4659,
+    NPC_MARAUDINE_BONEPAW       = 4660,
+    NPC_MARAUDINE_WRANGLER      = 4655,
+
+    NPC_MELIZZA                 = 12277,
+
+    POINT_ID_QUEST_COMPLETE     = 1,
+    POINT_ID_EVENT_COMPLETE     = 2,
+
+    MAX_MARAUDERS               = 2,
+    MAX_WRANGLERS               = 3,
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {POINT_ID_QUEST_COMPLETE,   0,              1000},
+    {QUEST_GET_ME_OUT_OF_HERE,  NPC_MELIZZA,    0},
+    {POINT_ID_EVENT_COMPLETE,   0,              2000},
+    {SAY_MELIZZA_1,             NPC_MELIZZA,    4000},
+    {SAY_MELIZZA_2,             NPC_MELIZZA,    5000},
+    {SAY_MELIZZA_3,             NPC_MELIZZA,    4000},
+    {NPC_MELIZZA,               0,              0},
+    {0, 0, 0},
+};
+
+struct SummonLocation
+{
+    float m_fX, m_fY, m_fZ;
+};
+
+static const SummonLocation aMarauderSpawn[] =
+{
+    { -1291.492f, 2644.650f, 111.556f},
+    { -1306.730f, 2675.163f, 111.561f},
+};
+
+static const SummonLocation wranglerSpawn = { -1393.194f, 2429.465f, 88.689f };
+
+struct npc_melizza_brimbuzzle : public CreatureScript
+{
+    npc_melizza_brimbuzzle() : CreatureScript("npc_melizza_brimbuzzle") {}
+
+    struct npc_melizza_brimbuzzleAI : public npc_escortAI, private DialogueHelper
+    {
+        npc_melizza_brimbuzzleAI(Creature* m_creature) : npc_escortAI(m_creature),
+        DialogueHelper(aIntroDialogue)
+        {
+        }
+
+        void JustStartedEscort() override
+        {
+            if (GameObject* pCage = GetClosestGameObjectWithEntry(m_creature, GO_MELIZZAS_CAGE, INTERACTION_DISTANCE))
+            {
+                pCage->UseDoorOrButton();
+            }
+        }
+
+        Creature* GetSpeakerByEntry(uint32 uiEntry) override
+        {
+            if (uiEntry == NPC_MELIZZA)
+            {
+                return m_creature;
+            }
+
+            return NULL;
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 1:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_MELIZZA_START, m_creature, pPlayer);
+                }
+
+                m_creature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+                break;
+            case 4:
+                for (uint8 i = 0; i < MAX_MARAUDERS; ++i)
+                {
+                    for (uint8 j = 0; j < MAX_MARAUDERS; ++j)
+                    {
+                        // Summon 2 Marauders on each point
+                        float fX, fY, fZ;
+                        m_creature->GetRandomPoint(aMarauderSpawn[i].m_fX, aMarauderSpawn[i].m_fY, aMarauderSpawn[i].m_fZ, 7.0f, fX, fY, fZ);
+                        m_creature->SummonCreature(NPC_MARAUDINE_MARAUDER, fX, fY, fZ, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                    }
+                }
+                break;
+            case 9:
+                for (uint8 i = 0; i < MAX_WRANGLERS; ++i)
+                {
+                    float fX, fY, fZ;
+                    m_creature->GetRandomPoint(wranglerSpawn.m_fX, wranglerSpawn.m_fY, wranglerSpawn.m_fZ, 10.0f, fX, fY, fZ);
+                    m_creature->SummonCreature(NPC_MARAUDINE_BONEPAW, fX, fY, fZ, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                    m_creature->GetRandomPoint(wranglerSpawn.m_fX, wranglerSpawn.m_fY, wranglerSpawn.m_fZ, 10.0f, fX, fY, fZ);
+                    m_creature->SummonCreature(NPC_MARAUDINE_WRANGLER, fX, fY, fZ, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+                break;
+            case 12:
+                StartNextDialogueText(POINT_ID_QUEST_COMPLETE);
+                break;
+            case 19:
+                StartNextDialogueText(POINT_ID_EVENT_COMPLETE);
+                break;
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case POINT_ID_QUEST_COMPLETE:
+                SetEscortPaused(true);
+                break;
+            case QUEST_GET_ME_OUT_OF_HERE:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_MELIZZA_FINISH, m_creature, pPlayer);
+                    pPlayer->GroupEventHappens(QUEST_GET_ME_OUT_OF_HERE, m_creature);
+                }
+
+                m_creature->ClearTemporaryFaction();
+                SetRun(true);
+                SetEscortPaused(false);
+                break;
+            case POINT_ID_EVENT_COMPLETE:
+                SetEscortPaused(true);
+                m_creature->SetFacingTo(4.71f);
+                break;
+            case NPC_MELIZZA:
+                SetEscortPaused(false);
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_melizza_brimbuzzleAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_GET_ME_OUT_OF_HERE)
+        {
+            if (npc_melizza_brimbuzzleAI* pEscortAI = dynamic_cast<npc_melizza_brimbuzzleAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_desolace()
+{
+    Script* s;
+    s = new npc_aged_dying_ancient_kodo();
+    s->RegisterSelf();
+    s = new npc_dalinda_malem();
+    s->RegisterSelf();
+    s = new npc_melizza_brimbuzzle();
+    s->RegisterSelf();
+    s = new spell_npc_aged_dying_ancient_kodo();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_aged_dying_ancient_kodo";
+    //pNewScript->GetAI = &GetAI_npc_aged_dying_ancient_kodo;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_aged_dying_ancient_kodo;
+    //pNewScript->pGossipHello = &GossipHello_npc_aged_dying_ancient_kodo;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_dalinda_malem";
+    //pNewScript->GetAI = &GetAI_npc_dalinda_malem;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_dalinda_malem;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_melizza_brimbuzzle";
+    //pNewScript->GetAI = &GetAI_npc_melizza_brimbuzzle;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_melizza_brimbuzzle;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/dire_maul/dire_maul.cpp b/src/modules/SD3/scripts/kalimdor/dire_maul/dire_maul.cpp
new file mode 100644
index 000000000..fb932fc36
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/dire_maul/dire_maul.cpp
@@ -0,0 +1,40 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      dire_maul
+ * SD%Complete: 0
+ * SDComment:   Placeholder
+ * SDCategory:  Dire Maul
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+void AddSC_dire_maul()
+{
+}
diff --git a/src/modules/SD3/scripts/kalimdor/dire_maul/dire_maul.h b/src/modules/SD3/scripts/kalimdor/dire_maul/dire_maul.h
new file mode 100644
index 000000000..587b64d12
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/dire_maul/dire_maul.h
@@ -0,0 +1,109 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_DM_H
+#define DEF_DM_H
+
+enum
+{
+    MAX_ENCOUNTER               = 16,
+    MAX_GENERATORS              = 5,
+
+    // East
+    TYPE_ALZZIN                 = 0,                        // Do not change - Handled with Acid
+    TYPE_ZEVRIM                 = 1,
+    TYPE_IRONBARK               = 2,
+
+    // West
+    TYPE_WARPWOOD               = 3,
+    TYPE_IMMOLTHAR              = 4,
+    TYPE_PRINCE                 = 5,
+    TYPE_PYLON_1                = 6,
+    TYPE_PYLON_2                = TYPE_PYLON_1 + 1,
+    TYPE_PYLON_3                = TYPE_PYLON_1 + 2,
+    TYPE_PYLON_4                = TYPE_PYLON_1 + 3,
+    TYPE_PYLON_5                = TYPE_PYLON_1 + 4,
+
+    // North
+    TYPE_KING_GORDOK            = 11,
+    TYPE_MOLDAR                 = 12,
+    TYPE_FENGUS                 = 13,
+    TYPE_SLIPKIK                = 14,
+    TYPE_KROMCRUSH              = 15,
+
+    // East
+    GO_CRUMBLE_WALL             = 177220,
+    GO_CORRUPT_VINE             = 179502,
+    GO_FELVINE_SHARD            = 179559,
+    GO_CONSERVATORY_DOOR        = 176907,                   // Opened by Ironbark the redeemed
+
+    NPC_ZEVRIM_THORNHOOF        = 11490,
+    NPC_OLD_IRONBARK            = 11491,
+    NPC_IRONBARK_REDEEMED       = 14241,
+
+    // West
+    NPC_TENDRIS_WARPWOOD        = 11489,
+    NPC_PRINCE_TORTHELDRIN      = 11486,
+    NPC_IMMOLTHAR               = 11496,
+    NPC_ARCANE_ABERRATION       = 11480,
+    NPC_MANA_REMNANT            = 11483,
+    NPC_HIGHBORNE_SUMMONER      = 11466,
+
+    GO_PRINCES_CHEST            = 179545,
+    GO_PRINCES_CHEST_AURA       = 179563,
+    GO_CRYSTAL_GENERATOR_1      = 177259,
+    GO_CRYSTAL_GENERATOR_2      = 177257,
+    GO_CRYSTAL_GENERATOR_3      = 177258,
+    GO_CRYSTAL_GENERATOR_4      = 179504,
+    GO_CRYSTAL_GENERATOR_5      = 179505,
+    GO_FORCEFIELD               = 179503,
+    GO_WARPWOOD_DOOR            = 177221,
+    GO_WEST_LIBRARY_DOOR        = 179550,
+
+    // North
+    NPC_GUARD_MOLDAR            = 14326,
+    NPC_STOMPER_KREEG           = 14322,
+    NPC_GUARD_FENGUS            = 14321,
+    NPC_GUARD_SLIPKIK           = 14323,
+    NPC_CAPTAIN_KROMCRUSH       = 14325,
+    NPC_CHORUSH                 = 14324,
+    NPC_KING_GORDOK             = 11501,
+    NPC_MIZZLE_THE_CRAFTY       = 14353,
+
+    GO_KNOTS_CACHE              = 179501,
+    GO_KNOTS_BALL_AND_CHAIN     = 179511,
+    GO_GORDOK_TRIBUTE           = 179564,
+    GO_NORTH_LIBRARY_DOOR       = 179549,
+
+    SAY_FREE_IMMOLTHAR          = -1429000,
+    SAY_KILL_IMMOLTHAR          = -1429001,
+    SAY_IRONBARK_REDEEM         = -1429002,
+
+    FACTION_HOSTILE             = 14,
+    SPELL_KING_OF_GORDOK        = 22799,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/kalimdor/dire_maul/instance_dire_maul.cpp b/src/modules/SD3/scripts/kalimdor/dire_maul/instance_dire_maul.cpp
new file mode 100644
index 000000000..66acea6d8
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/dire_maul/instance_dire_maul.cpp
@@ -0,0 +1,610 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      instance_dire_maul
+ * SD%Complete: 30
+ * SDComment:   Basic Support - Most events and quest-related stuff missing
+ * SDCategory:  Dire Maul
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "dire_maul.h"
+
+struct is_dire_maul : public InstanceScript
+{
+    is_dire_maul() : InstanceScript("instance_dire_maul") {}
+
+    class instance_dire_maul : public ScriptedInstance
+    {
+    public:
+        instance_dire_maul(Map* pMap) : ScriptedInstance(pMap),
+            m_bWallDestroyed(false),
+            m_bDoNorthBeforeWest(false)
+        {
+            Initialize();
+        }
+
+        ~instance_dire_maul() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            // figure where to enter to set library doors accordingly
+            // Enter DM North first
+            if (pPlayer->IsWithinDist2d(260.0f, -20.0f, 20.0f) && m_auiEncounter[TYPE_WARPWOOD] != DONE)
+            {
+                m_bDoNorthBeforeWest = true;
+            }
+            else
+            {
+                m_bDoNorthBeforeWest = false;
+            }
+
+            DoToggleGameObjectFlags(GO_WEST_LIBRARY_DOOR, GO_FLAG_NO_INTERACT, m_bDoNorthBeforeWest);
+            DoToggleGameObjectFlags(GO_WEST_LIBRARY_DOOR, GO_FLAG_LOCKED, !m_bDoNorthBeforeWest);
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+                // East
+            case NPC_OLD_IRONBARK:
+                break;
+
+                // West
+            case NPC_PRINCE_TORTHELDRIN:
+                if (m_auiEncounter[TYPE_IMMOLTHAR] == DONE)
+                {
+                    pCreature->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_TOGGLE_OOC_NOT_ATTACK);
+                }
+                break;
+            case NPC_ARCANE_ABERRATION:
+            case NPC_MANA_REMNANT:
+                m_lGeneratorGuardGUIDs.push_back(pCreature->GetObjectGuid());
+                return;
+            case NPC_IMMOLTHAR:
+                break;
+            case NPC_HIGHBORNE_SUMMONER:
+                m_luiHighborneSummonerGUIDs.push_back(pCreature->GetObjectGuid());
+                return;
+
+                // North
+            case NPC_CHORUSH:
+            case NPC_KING_GORDOK:
+            case NPC_MIZZLE_THE_CRAFTY:
+                break;
+
+            default:
+                return;
+            }
+            m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+                // East
+            case GO_CONSERVATORY_DOOR:
+                if (m_auiEncounter[TYPE_IRONBARK] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_CRUMBLE_WALL:
+                if (m_bWallDestroyed || m_auiEncounter[TYPE_ALZZIN] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_CORRUPT_VINE:
+                if (m_auiEncounter[TYPE_ALZZIN] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_FELVINE_SHARD:
+                m_lFelvineShardGUIDs.push_back(pGo->GetObjectGuid());
+                break;
+
+                // West
+            case GO_CRYSTAL_GENERATOR_1:
+                m_aCrystalGeneratorGuid[0] = pGo->GetObjectGuid();
+                if (m_auiEncounter[TYPE_PYLON_1] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                return;
+            case GO_CRYSTAL_GENERATOR_2:
+                m_aCrystalGeneratorGuid[1] = pGo->GetObjectGuid();
+                if (m_auiEncounter[TYPE_PYLON_2] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                return;
+            case GO_CRYSTAL_GENERATOR_3:
+                m_aCrystalGeneratorGuid[2] = pGo->GetObjectGuid();
+                if (m_auiEncounter[TYPE_PYLON_3] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                return;
+            case GO_CRYSTAL_GENERATOR_4:
+                m_aCrystalGeneratorGuid[3] = pGo->GetObjectGuid();
+                if (m_auiEncounter[TYPE_PYLON_4] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                return;
+            case GO_CRYSTAL_GENERATOR_5:
+                m_aCrystalGeneratorGuid[4] = pGo->GetObjectGuid();
+                if (m_auiEncounter[TYPE_PYLON_5] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                return;
+            case GO_FORCEFIELD:
+                if (CheckAllGeneratorsDestroyed())
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_PRINCES_CHEST_AURA:
+                break;
+            case GO_WARPWOOD_DOOR:
+                if (m_auiEncounter[TYPE_WARPWOOD] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_WEST_LIBRARY_DOOR:
+                pGo->SetFlag(GAMEOBJECT_FLAGS, m_bDoNorthBeforeWest ? GO_FLAG_NO_INTERACT : GO_FLAG_LOCKED);
+                pGo->RemoveFlag(GAMEOBJECT_FLAGS, m_bDoNorthBeforeWest ? GO_FLAG_LOCKED : GO_FLAG_NO_INTERACT);
+                break;
+
+                // North
+            case GO_NORTH_LIBRARY_DOOR:
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+                // East
+            case TYPE_ZEVRIM:
+                if (uiData == DONE)
+                {
+                    // Update Old Ironbark so he can open the conservatory door
+                    if (Creature* pIronbark = GetSingleCreatureFromStorage(NPC_OLD_IRONBARK))
+                    {
+                        DoScriptText(SAY_IRONBARK_REDEEM, pIronbark);
+                        pIronbark->UpdateEntry(NPC_IRONBARK_REDEEMED);
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_IRONBARK:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_ALZZIN:                                   // This Encounter is expected to be handled within Acid (reason handling at 50% hp)
+                if (uiData == DONE)
+                {
+                    if (!m_bWallDestroyed)
+                    {
+                        DoUseDoorOrButton(GO_CRUMBLE_WALL);
+                        m_bWallDestroyed = true;
+                    }
+
+                    DoUseDoorOrButton(GO_CORRUPT_VINE);
+
+                    if (!m_lFelvineShardGUIDs.empty())
+                    {
+                        for (GuidList::const_iterator itr = m_lFelvineShardGUIDs.begin(); itr != m_lFelvineShardGUIDs.end(); ++itr)
+                        {
+                            DoRespawnGameObject(*itr);
+                        }
+                    }
+                }
+                else if (uiData == SPECIAL && !m_bWallDestroyed)
+                {
+                    DoUseDoorOrButton(GO_CRUMBLE_WALL);
+                    m_bWallDestroyed = true;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+
+                // West
+            case TYPE_WARPWOOD:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_WARPWOOD_DOOR);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_IMMOLTHAR:
+                if (uiData == DONE)
+                {
+                    if (Creature* pPrince = GetSingleCreatureFromStorage(NPC_PRINCE_TORTHELDRIN))
+                    {
+                        DoScriptText(SAY_FREE_IMMOLTHAR, pPrince);
+                        pPrince->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_TOGGLE_OOC_NOT_ATTACK);
+                        // Despawn Chest-Aura
+                        if (GameObject* pChestAura = GetSingleGameObjectFromStorage(GO_PRINCES_CHEST_AURA))
+                        {
+                            pChestAura->Use(pPrince);
+                        }
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_PRINCE:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_PYLON_1:
+            case TYPE_PYLON_2:
+            case TYPE_PYLON_3:
+            case TYPE_PYLON_4:
+            case TYPE_PYLON_5:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(m_aCrystalGeneratorGuid[uiType - TYPE_PYLON_1]);
+                    if (CheckAllGeneratorsDestroyed())
+                    {
+                        ProcessForceFieldOpening();
+                    }
+                }
+                break;
+
+                // North
+            case TYPE_KING_GORDOK:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    // Apply Aura to players in the map
+                    Map::PlayerList const& players = instance->GetPlayers();
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    {
+                        if (Player* pPlayer = itr->getSource())
+                        {
+                            pPlayer->CastSpell(pPlayer, SPELL_KING_OF_GORDOK, true);
+                        }
+                    }
+                }
+                break;
+            case TYPE_MOLDAR:
+            case TYPE_FENGUS:
+            case TYPE_SLIPKIK:
+            case TYPE_KROMCRUSH:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6] << " " << m_auiEncounter[7] << " " << m_auiEncounter[8] << " "
+                    << m_auiEncounter[9] << " " << m_auiEncounter[10] << " " << m_auiEncounter[11] << " "
+                    << m_auiEncounter[12] << " " << m_auiEncounter[13] << " " << m_auiEncounter[14] << " "
+                    << m_auiEncounter[15];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+                // West
+                // - Handling of guards of generators
+            case NPC_ARCANE_ABERRATION:
+            case NPC_MANA_REMNANT:
+                SortPylonGuards();
+                break;
+                // - Set InstData for ImmolThar
+            case NPC_IMMOLTHAR:
+                SetData(TYPE_IMMOLTHAR, IN_PROGRESS);
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+                // East
+                // - Handling Zevrim and Old Ironbark for the door event
+            case NPC_ZEVRIM_THORNHOOF:
+                SetData(TYPE_ZEVRIM, DONE);
+                break;
+            case NPC_IRONBARK_REDEEMED:
+                SetData(TYPE_IRONBARK, DONE);
+                break;
+
+                // West
+                // - Handling of guards of generators
+            case NPC_ARCANE_ABERRATION:
+            case NPC_MANA_REMNANT:
+                PylonGuardJustDied(pCreature);
+                break;
+                // - InstData settings
+            case NPC_TENDRIS_WARPWOOD:
+                SetData(TYPE_WARPWOOD, DONE);
+                break;
+            case NPC_IMMOLTHAR:
+                SetData(TYPE_IMMOLTHAR, DONE);
+                break;
+
+                // North
+                // - Handling of Ogre Boss (Assume boss can be handled in Acid)
+            case NPC_KING_GORDOK:
+                SetData(TYPE_KING_GORDOK, DONE);
+                break;
+                // Handle Ogre guards for Tribute Run chest
+            case NPC_GUARD_MOLDAR:
+                SetData(TYPE_MOLDAR, DONE);
+                break;
+            case NPC_GUARD_FENGUS:
+                SetData(TYPE_FENGUS, DONE);
+                break;
+            case NPC_GUARD_SLIPKIK:
+                SetData(TYPE_SLIPKIK, DONE);
+                break;
+            case NPC_CAPTAIN_KROMCRUSH:
+                SetData(TYPE_KROMCRUSH, DONE);
+                break;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >>
+                m_auiEncounter[3] >> m_auiEncounter[4] >> m_auiEncounter[5] >>
+                m_auiEncounter[6] >> m_auiEncounter[7] >> m_auiEncounter[8] >>
+                m_auiEncounter[9] >> m_auiEncounter[10] >> m_auiEncounter[11] >>
+                m_auiEncounter[12] >> m_auiEncounter[13] >> m_auiEncounter[14] >>
+                m_auiEncounter[15];
+
+            if (m_auiEncounter[TYPE_ALZZIN] >= DONE)
+            {
+                m_bWallDestroyed = true;
+            }
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        bool CheckConditionCriteriaMeet(Player const* pPlayer, uint32 uiInstanceConditionId, WorldObject const* pConditionSource, uint32 conditionSourceType) const override
+        {
+            switch (uiInstanceConditionId)
+            {
+            case INSTANCE_CONDITION_ID_NORMAL_MODE:             // No guards alive
+            case INSTANCE_CONDITION_ID_HARD_MODE:               // One guard alive
+            case INSTANCE_CONDITION_ID_HARD_MODE_2:             // Two guards alive
+            case INSTANCE_CONDITION_ID_HARD_MODE_3:             // Three guards alive
+            case INSTANCE_CONDITION_ID_HARD_MODE_4:             // All guards alive
+            {
+                                                                    uint8 uiTributeRunAliveBosses = (GetData(TYPE_MOLDAR) != DONE ? 1 : 0) + (GetData(TYPE_FENGUS) != DONE ? 1 : 0) + (GetData(TYPE_SLIPKIK) != DONE ? 1 : 0)
+                                                                        + (GetData(TYPE_KROMCRUSH) != DONE ? 1 : 0);
+
+                                                                    return uiInstanceConditionId == uiTributeRunAliveBosses;
+            }
+            }
+
+            script_error_log("instance_dire_maul::CheckConditionCriteriaMeet called with unsupported Id %u. Called with param plr %s, src %s, condition source type %u",
+                uiInstanceConditionId, pPlayer ? pPlayer->GetGuidStr().c_str() : "NULL", pConditionSource ? pConditionSource->GetGuidStr().c_str() : "NULL", conditionSourceType);
+            return false;
+        }
+
+    private:
+        bool CheckAllGeneratorsDestroyed()
+        {
+            if (m_auiEncounter[TYPE_PYLON_1] != DONE || m_auiEncounter[TYPE_PYLON_2] != DONE || m_auiEncounter[TYPE_PYLON_3] != DONE || m_auiEncounter[TYPE_PYLON_4] != DONE || m_auiEncounter[TYPE_PYLON_5] != DONE)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        void ProcessForceFieldOpening()
+        {
+            // 'Open' the force field
+            DoUseDoorOrButton(GO_FORCEFIELD);
+
+            // Let the summoners attack Immol'Thar
+            Creature* pImmolThar = GetSingleCreatureFromStorage(NPC_IMMOLTHAR);
+            if (!pImmolThar || pImmolThar->IsDead())
+            {
+                return;
+            }
+
+            bool bHasYelled = false;
+            for (GuidList::const_iterator itr = m_luiHighborneSummonerGUIDs.begin(); itr != m_luiHighborneSummonerGUIDs.end(); ++itr)
+            {
+                Creature* pSummoner = instance->GetCreature(*itr);
+
+                if (!bHasYelled && pSummoner)
+                {
+                    DoScriptText(SAY_KILL_IMMOLTHAR, pSummoner);
+                    bHasYelled = true;
+                }
+
+                if (!pSummoner || pSummoner->IsDead())
+                {
+                    continue;
+                }
+
+                pSummoner->AI()->AttackStart(pImmolThar);
+            }
+            m_luiHighborneSummonerGUIDs.clear();
+        }
+
+        void SortPylonGuards()
+        {
+            if (!m_lGeneratorGuardGUIDs.empty())
+            {
+                for (uint8 i = 0; i < MAX_GENERATORS; ++i)
+                {
+                    GameObject* pGenerator = instance->GetGameObject(m_aCrystalGeneratorGuid[i]);
+                    // Skip non-existing or finished generators
+                    if (!pGenerator || GetData(TYPE_PYLON_1 + i) == DONE)
+                    {
+                        continue;
+                    }
+
+                    // Sort all remaining (alive) NPCs to unfinished generators
+                    for (GuidList::iterator itr = m_lGeneratorGuardGUIDs.begin(); itr != m_lGeneratorGuardGUIDs.end();)
+                    {
+                        Creature* pGuard = instance->GetCreature(*itr);
+                        if (!pGuard || pGuard->IsDead())    // Remove invalid guids and dead guards
+                        {
+                            m_lGeneratorGuardGUIDs.erase(itr++);
+                            continue;
+                        }
+
+                        if (pGuard->IsWithinDist2d(pGenerator->GetPositionX(), pGenerator->GetPositionY(), 20.0f))
+                        {
+                            m_sSortedGeneratorGuards[i].insert(pGuard->GetGUIDLow());
+                            m_lGeneratorGuardGUIDs.erase(itr++);
+                        }
+                        else
+                        {
+                            ++itr;
+                        }
+                    }
+                }
+            }
+        }
+
+        void PylonGuardJustDied(Creature* pCreature)
+        {
+            for (uint8 i = 0; i < MAX_GENERATORS; ++i)
+            {
+                // Skip already activated generators
+                if (GetData(TYPE_PYLON_1 + i) == DONE)
+                {
+                    continue;
+                }
+
+                // Only process generator where the npc is sorted in
+                if (m_sSortedGeneratorGuards[i].find(pCreature->GetGUIDLow()) != m_sSortedGeneratorGuards[i].end())
+                {
+                    m_sSortedGeneratorGuards[i].erase(pCreature->GetGUIDLow());
+                    if (m_sSortedGeneratorGuards[i].empty())
+                    {
+                        SetData(TYPE_PYLON_1 + i, DONE);
+                    }
+
+                    break;
+                }
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        // East
+        bool m_bWallDestroyed;
+        GuidList m_lFelvineShardGUIDs;
+
+        // West
+        ObjectGuid m_aCrystalGeneratorGuid[MAX_GENERATORS];
+
+        GuidList m_luiHighborneSummonerGUIDs;
+        GuidList m_lGeneratorGuardGUIDs;
+        std::set<uint32> m_sSortedGeneratorGuards[MAX_GENERATORS];
+
+        // North
+        bool m_bDoNorthBeforeWest;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_dire_maul(pMap);
+    }
+};
+
+void AddSC_instance_dire_maul()
+{
+    Script* s;
+    s = new is_dire_maul();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_dire_maul";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_dire_maul;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/durotar.cpp b/src/modules/SD3/scripts/kalimdor/durotar.cpp
new file mode 100644
index 000000000..2af0596b9
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/durotar.cpp
@@ -0,0 +1,205 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Durotar
+ * SD%Complete: 100
+ * SDComment:   Quest support: 5441.
+ * SDCategory:  Durotar
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_lazy_peon
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+/*######
+## npc_lazy_peon
+######*/
+
+enum
+{
+    SAY_PEON_AWAKE_1        = -1000795,
+    SAY_PEON_AWAKE_2        = -1000796,
+
+    SPELL_PEON_SLEEP        = 17743,
+    SPELL_AWAKEN_PEON       = 19938,
+
+    NPC_SLEEPING_PEON       = 10556,
+    GO_LUMBERPILE           = 175784,
+};
+
+struct npc_lazy_peon : public CreatureScript
+{
+    npc_lazy_peon() : CreatureScript("npc_lazy_peon") {}
+
+    struct npc_lazy_peonAI : public ScriptedAI
+    {
+        npc_lazy_peonAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_uiStopSleepingTimer = urand(30000, 120000);       // Set on spawn to a potential small timer, to get nice results for initial case
+        }
+
+        uint32 m_uiResetSleepTimer;                             // Time, until the npc stops harvesting lumber
+        uint32 m_uiStopSleepingTimer;                           // Time, until the npcs (re)starts working on its own
+
+        void Reset() override
+        {
+            m_uiResetSleepTimer = 0;
+            m_uiStopSleepingTimer = urand(90000, 120000);       // Sleeping aura has only 2min duration
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+                StartLumbering(pInvoker);
+        }
+
+        // Can also be self invoked for random working
+        void StartLumbering(Unit* pInvoker)
+        {
+            m_uiStopSleepingTimer = 0;
+            if (GameObject* pLumber = GetClosestGameObjectWithEntry(m_creature, GO_LUMBERPILE, 15.0f))
+            {
+                m_creature->RemoveAurasDueToSpell(SPELL_PEON_SLEEP);
+
+                float fX, fY, fZ;
+                m_creature->SetWalk(false);
+                pLumber->GetContactPoint(m_creature, fX, fY, fZ, CONTACT_DISTANCE);
+
+                if (pInvoker->GetTypeId() == TYPEID_PLAYER)
+                {
+                    DoScriptText(SAY_PEON_AWAKE_1, m_creature);
+                    ((Player*)pInvoker)->KilledMonsterCredit(m_creature->GetEntry(), m_creature->GetObjectGuid());
+                    m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                }
+                else
+                {
+                    m_creature->GetMotionMaster()->MovePoint(2, fX, fY, fZ);
+                }
+            }
+            else
+            {
+                script_error_log("No GameObject of entry %u was found in range or something really bad happened.", GO_LUMBERPILE);
+            }
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId)
+            {
+                return;
+            }
+
+            m_creature->HandleEmote(EMOTE_STATE_WORK_CHOPWOOD);
+            // TODO - random bevahior for self-invoked awakening guesswork
+            m_uiResetSleepTimer = uiPointId == 1 ? 80000 : urand(30000, 60000);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiResetSleepTimer)
+            {
+                if (m_uiResetSleepTimer <= uiDiff)
+                {
+                    DoScriptText(SAY_PEON_AWAKE_2, m_creature);
+                    m_creature->HandleEmote(EMOTE_STATE_NONE);
+                    EnterEvadeMode();
+                    m_uiResetSleepTimer = 0;
+                }
+                else
+                {
+                    m_uiResetSleepTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiStopSleepingTimer)
+            {
+                if (m_uiStopSleepingTimer <= uiDiff)
+                {
+                    StartLumbering(m_creature);
+                }
+                else
+                {
+                    m_uiStopSleepingTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_lazy_peonAI(pCreature);
+    }
+};
+
+struct spell_lazy_peon_awake : public SpellScript
+{
+    spell_lazy_peon_awake() : SpellScript("spell_lazy_peon_awake") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_AWAKEN_PEON && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+            if (!pCreatureTarget->HasAura(SPELL_PEON_SLEEP) || pCaster->GetTypeId() != TYPEID_PLAYER || pCreatureTarget->GetEntry() != NPC_SLEEPING_PEON)
+            {
+                return true;
+            }
+
+            if (CreatureAI* pPeonAI = pCreatureTarget->AI())
+            {
+                pPeonAI->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pCreatureTarget);  //>StartLumbering(pCaster);
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_durotar()
+{
+    Script* s;
+    s = new npc_lazy_peon();
+    s->RegisterSelf();
+    s = new spell_lazy_peon_awake();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_lazy_peon";
+    //pNewScript->GetAI = &GetAI_npc_lazy_peon;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_lazy_peon_awake;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/dustwallow_marsh.cpp b/src/modules/SD3/scripts/kalimdor/dustwallow_marsh.cpp
new file mode 100644
index 000000000..3c0c16869
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/dustwallow_marsh.cpp
@@ -0,0 +1,1276 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Dustwallow_Marsh
+ * SD%Complete: 95
+ * SDComment: Quest support: 1173, 1222, 1270, 1273, 1324, 11180, 11198, 11209.
+ * SDCategory:  Dustwallow Marsh
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * mobs_risen_husk_spirit
+ * npc_restless_apparition
+ * npc_morokk
+ * npc_ogron
+ * npc_private_hendel
+ * npc_stinky_ignatz
+ * at_nats_landing
+ * boss_tethyr
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+#include "TemporarySummon.h"
+
+/*######
+## mobs_risen_husk_spirit
+######*/
+
+enum
+{
+    QUEST_WHATS_HAUNTING_WITCH_HILL  = 11180,
+    SPELL_SUMMON_RESTLESS_APPARITION = 42511,
+    SPELL_CONSUME_FLESH              = 37933,               // Risen Husk
+    SPELL_INTANGIBLE_PRESENCE        = 43127,               // Risen Spirit
+    NPC_RISEN_HUSK                   = 23555,
+    NPC_RISEN_SPIRIT                 = 23554
+};
+
+struct mobs_risen_husk_spirit : public CreatureScript
+{
+    mobs_risen_husk_spirit() : CreatureScript("mobs_risen_husk_spirit") {}
+
+    struct mobs_risen_husk_spiritAI : public ScriptedAI
+    {
+        mobs_risen_husk_spiritAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiConsumeFlesh_Timer;
+        uint32 m_uiIntangiblePresence_Timer;
+
+        Player* m_pCreditPlayer;
+
+        void Reset() override
+        {
+            m_uiConsumeFlesh_Timer = 10000;
+            m_uiIntangiblePresence_Timer = 5000;
+
+            m_pCreditPlayer = NULL;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (m_pCreditPlayer)
+            {
+                m_pCreditPlayer->KilledMonsterCredit(pSummoned->GetEntry(), pSummoned->GetObjectGuid());
+            }
+        }
+
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+        {
+            if (uiDamage < m_creature->GetHealth())
+            {
+                return;
+            }
+
+            if (Player* pPlayer = pDoneBy->GetCharmerOrOwnerPlayerOrPlayerItself())
+            {
+                if (pPlayer->GetQuestStatus(QUEST_WHATS_HAUNTING_WITCH_HILL) == QUEST_STATUS_INCOMPLETE)
+                {
+                    m_pCreditPlayer = pPlayer;
+                    m_creature->CastSpell(pDoneBy, SPELL_SUMMON_RESTLESS_APPARITION, true);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiConsumeFlesh_Timer < uiDiff)
+            {
+                if (m_creature->GetEntry() == NPC_RISEN_HUSK)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_CONSUME_FLESH);
+                }
+
+                m_uiConsumeFlesh_Timer = 15000;
+            }
+            else
+            {
+                m_uiConsumeFlesh_Timer -= uiDiff;
+            }
+
+            if (m_uiIntangiblePresence_Timer < uiDiff)
+            {
+                if (m_creature->GetEntry() == NPC_RISEN_SPIRIT)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_INTANGIBLE_PRESENCE);
+                }
+
+                m_uiIntangiblePresence_Timer = 20000;
+            }
+            else
+            {
+                m_uiIntangiblePresence_Timer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mobs_risen_husk_spiritAI(pCreature);
+    }
+};
+
+/*######
+## npc_restless_apparition
+######*/
+
+enum
+{
+    SAY_RAND_1      = -1000543,
+    SAY_RAND_2      = -1000544,
+    SAY_RAND_3      = -1000545,
+    SAY_RAND_4      = -1000546,
+    SAY_RAND_5      = -1000547,
+    SAY_RAND_6      = -1000548,
+    SAY_RAND_7      = -1000549,
+    SAY_RAND_8      = -1000550
+};
+
+struct npc_restless_apparition : public CreatureScript
+{
+    npc_restless_apparition() : CreatureScript("npc_restless_apparition") {}
+
+    struct npc_restless_apparitionAI : public ScriptedAI
+    {
+        npc_restless_apparitionAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiTalk_Timer;
+
+        void Reset() override
+        {
+            m_uiTalk_Timer = 1000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_uiTalk_Timer)
+            {
+                return;
+            }
+
+            if (m_uiTalk_Timer <= uiDiff)
+            {
+                switch (urand(0, 7))
+                {
+                case 0: DoScriptText(SAY_RAND_1, m_creature); break;
+                case 1: DoScriptText(SAY_RAND_2, m_creature); break;
+                case 2: DoScriptText(SAY_RAND_3, m_creature); break;
+                case 3: DoScriptText(SAY_RAND_4, m_creature); break;
+                case 4: DoScriptText(SAY_RAND_5, m_creature); break;
+                case 5: DoScriptText(SAY_RAND_6, m_creature); break;
+                case 6: DoScriptText(SAY_RAND_7, m_creature); break;
+                case 7: DoScriptText(SAY_RAND_8, m_creature); break;
+                }
+
+                m_uiTalk_Timer = 0;
+            }
+            else
+            {
+                m_uiTalk_Timer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_restless_apparitionAI(pCreature);
+    }
+};
+#endif
+
+/*######
+## npc_morokk
+######*/
+
+enum
+{
+    SAY_MOR_CHALLENGE               = -1000499,
+    SAY_MOR_SCARED                  = -1000500,
+
+    QUEST_CHALLENGE_MOROKK          = 1173,
+
+    FACTION_MOR_HOSTILE             = 168,
+    FACTION_MOR_RUNNING             = 35
+};
+
+struct npc_morokk : public CreatureScript
+{
+    npc_morokk() : CreatureScript("npc_morokk") {}
+
+    struct npc_morokkAI : public npc_escortAI
+    {
+        npc_morokkAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_bIsSuccess = false;   //TODO check this, to Reset()?
+        }
+
+        bool m_bIsSuccess;
+
+        void Reset() override {}
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                SetEscortPaused(true);
+                break;
+            case 1:
+                if (m_bIsSuccess)
+                {
+                    DoScriptText(SAY_MOR_SCARED, m_creature);
+                }
+                else
+                {
+                    m_creature->SetDeathState(JUST_DIED);
+                    m_creature->Respawn();
+                }
+                break;
+            }
+        }
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            if (m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->IsFriendlyTo(pAttacker))
+            {
+                return;
+            }
+
+            AttackStart(pAttacker);
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                if (m_creature->GetHealthPercent() < 30.0f)
+                {
+                    if (Player* pPlayer = GetPlayerForEscort())
+                    {
+                        pPlayer->GroupEventHappens(QUEST_CHALLENGE_MOROKK, m_creature);
+                    }
+
+                    m_creature->setFaction(FACTION_MOR_RUNNING);
+
+                    m_bIsSuccess = true;
+                    EnterEvadeMode();
+
+                    uiDamage = 0;
+                }
+            }
+        }
+
+        void UpdateEscortAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (HasEscortState(STATE_ESCORT_PAUSED))
+                {
+                    if (Player* pPlayer = GetPlayerForEscort())
+                    {
+                        m_bIsSuccess = false;
+                        DoScriptText(SAY_MOR_CHALLENGE, m_creature, pPlayer);
+                        m_creature->setFaction(FACTION_MOR_HOSTILE);
+                        AttackStart(pPlayer);
+                    }
+
+                    SetEscortPaused(false);
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_morokkAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_CHALLENGE_MOROKK)
+        {
+            if (npc_morokkAI* pEscortAI = dynamic_cast<npc_morokkAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(true, pPlayer, pQuest);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_ogron
+######*/
+
+enum
+{
+    SAY_OGR_START                       = -1000452,
+    SAY_OGR_SPOT                        = -1000453,
+    SAY_OGR_RET_WHAT                    = -1000454,
+    SAY_OGR_RET_SWEAR                   = -1000455,
+    SAY_OGR_REPLY_RET                   = -1000456,
+    SAY_OGR_RET_TAKEN                   = -1000457,
+    SAY_OGR_TELL_FIRE                   = -1000458,
+    SAY_OGR_RET_NOCLOSER                = -1000459,
+    SAY_OGR_RET_NOFIRE                  = -1000460,
+    SAY_OGR_RET_HEAR                    = -1000461,
+    SAY_OGR_CAL_FOUND                   = -1000462,
+    SAY_OGR_CAL_MERCY                   = -1000463,
+    SAY_OGR_HALL_GLAD                   = -1000464,
+    EMOTE_OGR_RET_ARROW                 = -1000465,
+    SAY_OGR_RET_ARROW                   = -1000466,
+    SAY_OGR_CAL_CLEANUP                 = -1000467,
+    SAY_OGR_NODIE                       = -1000468,
+    SAY_OGR_SURVIVE                     = -1000469,
+    SAY_OGR_RET_LUCKY                   = -1000470,
+    SAY_OGR_THANKS                      = -1000471,
+
+    QUEST_QUESTIONING                   = 1273,
+
+    FACTION_GENERIC_FRIENDLY            = 35,
+    FACTION_THER_HOSTILE                = 151,
+
+    NPC_REETHE                          = 4980,
+    NPC_CALDWELL                        = 5046,
+    NPC_HALLAN                          = 5045,
+    NPC_SKIRMISHER                      = 5044,
+
+    SPELL_FAKE_SHOT                     = 7105,
+
+    PHASE_INTRO                         = 0,
+    PHASE_GUESTS                        = 1,
+    PHASE_FIGHT                         = 2,
+    PHASE_COMPLETE                      = 3
+};
+
+static float m_afSpawn[] = { -3383.501953f, -3203.383301f, 36.149f};
+static float m_afMoveTo[] = { -3371.414795f, -3212.179932f, 34.210f};
+
+struct npc_ogron : public CreatureScript
+{
+    npc_ogron() : CreatureScript("npc_ogron") {}
+
+    struct npc_ogronAI : public npc_escortAI
+    {
+        npc_ogronAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            lCreatureList.clear();  //TODO check this
+            m_uiPhase = 0;
+            m_uiPhaseCounter = 0;
+        }
+
+        std::list<Creature*> lCreatureList;
+
+        uint32 m_uiPhase;
+        uint32 m_uiPhaseCounter;
+        uint32 m_uiGlobalTimer;
+
+        void Reset() override
+        {
+            m_uiGlobalTimer = 5000;
+
+            if (HasEscortState(STATE_ESCORT_PAUSED) && m_uiPhase == PHASE_FIGHT)
+            {
+                m_uiPhase = PHASE_COMPLETE;
+            }
+
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                lCreatureList.clear();
+                m_uiPhase = 0;
+                m_uiPhaseCounter = 0;
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING) && pWho->GetEntry() == NPC_REETHE && lCreatureList.empty())
+            {
+                lCreatureList.push_back((Creature*)pWho);
+            }
+
+            npc_escortAI::MoveInLineOfSight(pWho);
+        }
+
+        Creature* GetCreature(uint32 uiCreatureEntry)
+        {
+            if (!lCreatureList.empty())
+            {
+                for (std::list<Creature*>::iterator itr = lCreatureList.begin(); itr != lCreatureList.end(); ++itr)
+                {
+                    if ((*itr)->GetEntry() == uiCreatureEntry && (*itr)->IsAlive())
+                    {
+                        return (*itr);
+                    }
+                }
+            }
+
+            return NULL;
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 9:
+                DoScriptText(SAY_OGR_SPOT, m_creature);
+                break;
+            case 10:
+                if (Creature* pReethe = GetCreature(NPC_REETHE))
+                {
+                    DoScriptText(SAY_OGR_RET_WHAT, pReethe);
+                }
+                break;
+            case 11:
+                SetEscortPaused(true);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            lCreatureList.push_back(pSummoned);
+
+            pSummoned->setFaction(FACTION_GENERIC_FRIENDLY);
+
+            if (pSummoned->GetEntry() == NPC_CALDWELL)
+            {
+                pSummoned->GetMotionMaster()->MovePoint(0, m_afMoveTo[0], m_afMoveTo[1], m_afMoveTo[2]);
+            }
+            else
+            {
+                if (Creature* pCaldwell = GetCreature(NPC_CALDWELL))
+                {
+                    // will this conversion work without compile warning/error?
+                    size_t iSize = lCreatureList.size();
+                    pSummoned->GetMotionMaster()->MoveFollow(pCaldwell, 0.5f, (M_PI / 2) * (int)iSize);
+                }
+            }
+        }
+
+        void DoStartAttackMe()
+        {
+            if (!lCreatureList.empty())
+            {
+                for (std::list<Creature*>::iterator itr = lCreatureList.begin(); itr != lCreatureList.end(); ++itr)
+                {
+                    if ((*itr)->GetEntry() == NPC_REETHE)
+                    {
+                        continue;
+                    }
+
+                    if ((*itr)->IsAlive())
+                    {
+                        (*itr)->setFaction(FACTION_THER_HOSTILE);
+                        (*itr)->AI()->AttackStart(m_creature);
+                    }
+                }
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (HasEscortState(STATE_ESCORT_PAUSED))
+                {
+                    if (m_uiGlobalTimer < uiDiff)
+                    {
+                        m_uiGlobalTimer = 5000;
+
+                        switch (m_uiPhase)
+                        {
+                        case PHASE_INTRO:
+                        {
+                                            switch (m_uiPhaseCounter)
+                                            {
+                                            case 0:
+                                                if (Creature* pReethe = GetCreature(NPC_REETHE))
+                                                {
+                                                    DoScriptText(SAY_OGR_RET_SWEAR, pReethe);
+                                                }
+                                                break;
+                                            case 1:
+                                                DoScriptText(SAY_OGR_REPLY_RET, m_creature);
+                                                break;
+                                            case 2:
+                                                if (Creature* pReethe = GetCreature(NPC_REETHE))
+                                                {
+                                                    DoScriptText(SAY_OGR_RET_TAKEN, pReethe);
+                                                }
+                                                break;
+                                            case 3:
+                                                DoScriptText(SAY_OGR_TELL_FIRE, m_creature);
+                                                if (Creature* pReethe = GetCreature(NPC_REETHE))
+                                                {
+                                                    DoScriptText(SAY_OGR_RET_NOCLOSER, pReethe);
+                                                }
+                                                break;
+                                            case 4:
+                                                if (Creature* pReethe = GetCreature(NPC_REETHE))
+                                                {
+                                                    DoScriptText(SAY_OGR_RET_NOFIRE, pReethe);
+                                                }
+                                                break;
+                                            case 5:
+                                                if (Creature* pReethe = GetCreature(NPC_REETHE))
+                                                {
+                                                    DoScriptText(SAY_OGR_RET_HEAR, pReethe);
+                                                }
+
+                                                m_creature->SummonCreature(NPC_CALDWELL, m_afSpawn[0], m_afSpawn[1], m_afSpawn[2], 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 300000);
+                                                m_creature->SummonCreature(NPC_HALLAN, m_afSpawn[0], m_afSpawn[1], m_afSpawn[2], 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 300000);
+                                                m_creature->SummonCreature(NPC_SKIRMISHER, m_afSpawn[0], m_afSpawn[1], m_afSpawn[2], 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 300000);
+                                                m_creature->SummonCreature(NPC_SKIRMISHER, m_afSpawn[0], m_afSpawn[1], m_afSpawn[2], 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 300000);
+
+                                                m_uiPhase = PHASE_GUESTS;
+                                                break;
+                                            }
+                                            break;
+                        }
+                        case PHASE_GUESTS:
+                        {
+                                             switch (m_uiPhaseCounter)
+                                             {
+                                             case 6:
+                                                 if (Creature* pCaldwell = GetCreature(NPC_CALDWELL))
+                                                 {
+                                                     DoScriptText(SAY_OGR_CAL_FOUND, pCaldwell);
+                                                 }
+                                                 break;
+                                             case 7:
+                                                 if (Creature* pCaldwell = GetCreature(NPC_CALDWELL))
+                                                 {
+                                                     DoScriptText(SAY_OGR_CAL_MERCY, pCaldwell);
+                                                 }
+                                                 break;
+                                             case 8:
+                                                 if (Creature* pHallan = GetCreature(NPC_HALLAN))
+                                                 {
+                                                     DoScriptText(SAY_OGR_HALL_GLAD, pHallan);
+
+                                                     if (Creature* pReethe = GetCreature(NPC_REETHE))
+                                                     {
+                                                         pHallan->CastSpell(pReethe, SPELL_FAKE_SHOT, false);
+                                                     }
+                                                 }
+                                                 break;
+                                             case 9:
+                                                 if (Creature* pReethe = GetCreature(NPC_REETHE))
+                                                 {
+                                                     DoScriptText(EMOTE_OGR_RET_ARROW, pReethe);
+                                                     DoScriptText(SAY_OGR_RET_ARROW, pReethe);
+                                                 }
+                                                 break;
+                                             case 10:
+                                                 if (Creature* pCaldwell = GetCreature(NPC_CALDWELL))
+                                                 {
+                                                     DoScriptText(SAY_OGR_CAL_CLEANUP, pCaldwell);
+                                                 }
+
+                                                 DoScriptText(SAY_OGR_NODIE, m_creature);
+                                                 break;
+                                             case 11:
+                                                 DoStartAttackMe();
+                                                 m_uiPhase = PHASE_FIGHT;
+                                                 break;
+                                             }
+                                             break;
+                        }
+                        case PHASE_COMPLETE:
+                        {
+                                               switch (m_uiPhaseCounter)
+                                               {
+                                               case 12:
+                                                   if (Player* pPlayer = GetPlayerForEscort())
+                                                   {
+                                                       pPlayer->GroupEventHappens(QUEST_QUESTIONING, m_creature);
+                                                   }
+
+                                                   DoScriptText(SAY_OGR_SURVIVE, m_creature);
+                                                   break;
+                                               case 13:
+                                                   if (Creature* pReethe = GetCreature(NPC_REETHE))
+                                                   {
+                                                       DoScriptText(SAY_OGR_RET_LUCKY, pReethe);
+                                                   }
+                                                   break;
+                                               case 14:
+                                                   DoScriptText(SAY_OGR_THANKS, m_creature);
+                                                   SetRun();
+                                                   SetEscortPaused(false);
+                                                   break;
+                                               }
+                                               break;
+                        }
+                        }
+
+                        if (m_uiPhase != PHASE_FIGHT)
+                        {
+                            ++m_uiPhaseCounter;
+                        }
+                    }
+                    else
+                    {
+                        m_uiGlobalTimer -= uiDiff;
+                    }
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_QUESTIONING)
+        {
+            if (npc_ogronAI* pEscortAI = dynamic_cast<npc_ogronAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest, true);
+                pCreature->SetFactionTemporary(FACTION_ESCORT_N_FRIEND_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+                DoScriptText(SAY_OGR_START, pCreature, pPlayer);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ogronAI(pCreature);
+    }
+};
+
+/*######
+## npc_private_hendel
+######*/
+
+enum
+{
+    SAY_PROGRESS_1_TER          = -1000411,
+    SAY_PROGRESS_2_HEN          = -1000412,
+    SAY_PROGRESS_3_TER          = -1000413,
+    SAY_PROGRESS_4_TER          = -1000414,
+    EMOTE_SURRENDER             = -1000415,
+
+    QUEST_MISSING_DIPLO_PT16    = 1324,
+    FACTION_HOSTILE             = 168,                      // guessed, may be different
+
+    NPC_SENTRY                  = 5184,                     // helps hendel
+    NPC_JAINA                   = 4968,                     // appears once hendel gives up
+    NPC_TERVOSH                 = 4967,
+};
+
+struct SpawnLocation
+{
+    float x, y, z, o;
+};
+static SpawnLocation posTervos = { -2901.878f, -3356.302f, 31.315f, 0.9035f };
+static SpawnLocation posJaina  = { -2902.956f, -3355.234f, 31.325f, 0.9192f };
+
+// TODO: develop this further, end event not created
+struct npc_private_hendel : public CreatureScript
+{
+    npc_private_hendel() : CreatureScript("npc_private_hendel") {}
+
+    struct npc_private_hendelAI : public ScriptedAI
+    {
+        npc_private_hendelAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void Reset() override {}
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            if (m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->IsFriendlyTo(pAttacker))
+            {
+                return;
+            }
+
+            AttackStart(pAttacker);
+        }
+
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+        {
+            if (m_creature->HealthBelowPctDamaged(20, uiDamage))
+            {
+                uiDamage = 0;
+
+                if (Player* pPlayer = pDoneBy->GetCharmerOrOwnerPlayerOrPlayerItself())
+                {
+                    pPlayer->GroupEventHappens(QUEST_MISSING_DIPLO_PT16, m_creature);
+                }
+                DoScriptText(EMOTE_SURRENDER, m_creature);
+
+                m_creature->SummonCreature(NPC_TERVOSH, posTervos.x, posTervos.y, posTervos.z, posTervos.o,
+                    TEMPSUMMON_TIMED_DESPAWN, 60 * IN_MILLISECONDS);
+                m_creature->SummonCreature(NPC_JAINA, posJaina.x, posJaina.y, posJaina.z, posJaina.o,
+                    TEMPSUMMON_TIMED_DESPAWN, 60 * IN_MILLISECONDS);
+
+                EnterEvadeMode();
+            }
+        }
+    };
+
+    bool OnQuestAccept(Player* /*pPlayer*/, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT16)
+        {
+            pCreature->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_COMBAT_STOP | TEMPFACTION_RESTORE_RESPAWN);
+        }
+
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_private_hendelAI(pCreature);
+    }
+};
+
+/*#####
+## npc_stinky_ignatz
+## TODO Note: Faction change is guessed
+#####*/
+
+enum
+{
+    QUEST_ID_STINKYS_ESCAPE_ALLIANCE    = 1222,
+    QUEST_ID_STINKYS_ESCAPE_HORDE       = 1270,
+
+    SAY_STINKY_BEGIN                    = -1000958,
+    SAY_STINKY_FIRST_STOP               = -1000959,
+    SAY_STINKY_SECOND_STOP              = -1001141,
+    SAY_STINKY_THIRD_STOP_1             = -1001142,
+    SAY_STINKY_THIRD_STOP_2             = -1001143,
+    SAY_STINKY_THIRD_STOP_3             = -1001144,
+    SAY_STINKY_PLANT_GATHERED           = -1001145,
+    SAY_STINKY_END                      = -1000962,
+    SAY_STINKY_AGGRO_1                  = -1000960,
+    SAY_STINKY_AGGRO_2                  = -1000961,
+    SAY_STINKY_AGGRO_3                  = -1001146,
+    SAY_STINKY_AGGRO_4                  = -1001147,
+
+    GO_BOGBEAN_PLANT                    = 20939,
+};
+
+struct npc_stinky_ignatz : public CreatureScript
+{
+    npc_stinky_ignatz() : CreatureScript("npc_stinky_ignatz") {}
+
+    struct npc_stinky_ignatzAI : public npc_escortAI
+    {
+        npc_stinky_ignatzAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+        }
+
+        ObjectGuid m_bogbeanPlantGuid;
+
+        void Reset() override {}
+
+        void Aggro(Unit* pWho) override
+        {
+            switch (urand(0, 3))
+            {
+            case 0: DoScriptText(SAY_STINKY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_STINKY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_STINKY_AGGRO_3, m_creature); break;
+            case 3: DoScriptText(SAY_STINKY_AGGRO_4, m_creature, pWho); break;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoScriptText(SAY_STINKY_BEGIN, m_creature);
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+                m_creature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 5:
+                DoScriptText(SAY_STINKY_FIRST_STOP, m_creature);
+                break;
+            case 10:
+                DoScriptText(SAY_STINKY_SECOND_STOP, m_creature);
+                break;
+            case 24:
+                DoScriptText(SAY_STINKY_THIRD_STOP_1, m_creature);
+                break;
+            case 25:
+                DoScriptText(SAY_STINKY_THIRD_STOP_2, m_creature);
+                if (GameObject* pBogbeanPlant = GetClosestGameObjectWithEntry(m_creature, GO_BOGBEAN_PLANT, DEFAULT_VISIBILITY_DISTANCE))
+                {
+                    m_bogbeanPlantGuid = pBogbeanPlant->GetObjectGuid();
+                    m_creature->SetFacingToObject(pBogbeanPlant);
+                }
+                break;
+            case 26:
+                if (Player* pPlayer = GetPlayerForEscort())
+                    DoScriptText(SAY_STINKY_THIRD_STOP_3, m_creature, pPlayer);
+                break;
+            case 29:
+                m_creature->HandleEmote(EMOTE_STATE_USESTANDING);
+                break;
+            case 30:
+                DoScriptText(SAY_STINKY_PLANT_GATHERED, m_creature);
+                break;
+            case 39:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(pPlayer->GetTeam() == ALLIANCE ? QUEST_ID_STINKYS_ESCAPE_ALLIANCE : QUEST_ID_STINKYS_ESCAPE_HORDE, m_creature);
+                    DoScriptText(SAY_STINKY_END, m_creature, pPlayer);
+                }
+                break;
+            }
+        }
+
+        void WaypointStart(uint32 uiPointId)
+        {
+            if (uiPointId == 30)
+            {
+                if (GameObject* pBogbeanPlant = m_creature->GetMap()->GetGameObject(m_bogbeanPlantGuid))
+                {
+                    pBogbeanPlant->Use(m_creature);
+                }
+                m_bogbeanPlantGuid.Clear();
+                m_creature->HandleEmote(EMOTE_ONESHOT_NONE);
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_stinky_ignatzAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_STINKYS_ESCAPE_ALLIANCE || pQuest->GetQuestId() == QUEST_ID_STINKYS_ESCAPE_HORDE)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+        return false;
+    }
+};
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+/*######
+## at_nats_landing
+######*/
+enum
+{
+    QUEST_NATS_BARGAIN = 11209,
+    SPELL_FISH_PASTE   = 42644,
+    NPC_LURKING_SHARK  = 23928
+};
+
+struct at_nats_landing : public AreaTriggerScript
+{
+    at_nats_landing() : AreaTriggerScript("at_nats_landing") {}
+
+    bool OnTrigger(Player* pPlayer, const AreaTriggerEntry* /*pAt*/) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_NATS_BARGAIN) == QUEST_STATUS_INCOMPLETE && pPlayer->HasAura(SPELL_FISH_PASTE))
+        {
+            Creature* pShark = GetClosestCreatureWithEntry(pPlayer, NPC_LURKING_SHARK, 20.0f);
+
+            if (!pShark)
+            {
+                pShark = pPlayer->SummonCreature(NPC_LURKING_SHARK, -4246.243f, -3922.356f, -7.488f, 5.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 100000);
+            }
+
+            pShark->AI()->AttackStart(pPlayer);
+            return false;
+        }
+        return true;
+    }
+};
+
+/*######
+## boss_tethyr
+######*/
+
+enum
+{
+    SPELL_WATER_BOLT            = 42574,
+    SPELL_SPOUT_LEFT            = 42581,                // triggers 42584
+    SPELL_SPOUT_RIGHT           = 42582,
+    SPELL_CANNON_BLAST          = 42578,                // triggers 42576
+    SPELL_CANNON_BLAST_DMG      = 42576,
+
+    NPC_TETHYR                  = 23899,
+    NPC_THERAMORE_MARKSMAN      = 23900,
+    NPC_THERAMORE_CANNON        = 23907,
+
+    GO_COVE_CANNON              = 186432,               // cast 42578
+    QUEST_ID_TETHYR             = 11198,
+
+    WORLD_STATE_TETHYR_SHOW     = 3083,
+    WORLD_STATE_TETHYR_COUNT    = 3082,
+
+    MAX_MARKSMEN                = 12,
+    PHASE_NORMAL                = 1,
+    PHASE_SPOUT                 = 2,
+};
+
+struct boss_tethyr : public CreatureScript
+{
+    boss_tethyr() : CreatureScript("boss_tethyr") {}
+
+    struct boss_tethyrAI : public Scripted_NoMovementAI
+    {
+        boss_tethyrAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            // send world states to player summoner
+            if (m_creature->IsTemporarySummon())
+                m_summonerGuid = ((TemporarySummon*)m_creature)->GetSummonerGuid();
+
+            if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_summonerGuid))
+            {
+                pPlayer->SendUpdateWorldState(WORLD_STATE_TETHYR_SHOW, 1);
+                pPlayer->SendUpdateWorldState(WORLD_STATE_TETHYR_COUNT, MAX_MARKSMEN);
+            }
+
+            m_creature->SetLevitate(true);
+        }
+
+        ObjectGuid m_summonerGuid;
+
+        uint8 m_uiPhase;
+        uint8 m_uiMarksmenKilled;
+        uint32 m_uiWaterBoltTimer;
+        uint32 m_uiSpoutEndTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_NORMAL;
+            m_uiMarksmenKilled = 0;
+            m_uiWaterBoltTimer = urand(0, 1000);
+            m_uiSpoutEndTimer = 7000;
+        }
+
+        void JustReachedHome() override
+        {
+            // cleanup
+            DoEncounterCleanup();
+            m_creature->ForcedDespawn(5000);
+        }
+
+        void JustDied(Unit* /*pVictim*/) override
+        {
+            // quest complete and cleanup
+            if (Player* pSummoner = m_creature->GetMap()->GetPlayer(m_summonerGuid))
+                pSummoner->GroupEventHappens(QUEST_ID_TETHYR, m_creature);
+
+            // ToDo: trigger some fireworks!
+            DoEncounterCleanup();
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType == WAYPOINT_MOTION_TYPE)
+            {
+                // start attacking
+                if (uiPointId == 12)
+                {
+                    // make cannons usable
+                    std::list<GameObject*> lCannonsInRange;
+                    GetGameObjectListWithEntryInGrid(lCannonsInRange, m_creature, GO_COVE_CANNON, 100.0f);
+
+                    for (std::list<GameObject*>::const_iterator itr = lCannonsInRange.begin(); itr != lCannonsInRange.end(); ++itr)
+                        (*itr)->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+
+                    // attack all marksmen
+                    std::list<Creature*> lMarksmenInRange;
+                    GetCreatureListWithEntryInGrid(lMarksmenInRange, m_creature, NPC_THERAMORE_MARKSMAN, 100.0f);
+
+                    for (std::list<Creature*>::const_iterator itr = lMarksmenInRange.begin(); itr != lMarksmenInRange.end(); ++itr)
+                    {
+                        (*itr)->AI()->AttackStart(m_creature);
+                        AttackStart(*itr);
+                    }
+                }
+            }
+            else if (uiMotionType == POINT_MOTION_TYPE)
+            {
+                // Spout on cannon point reach
+                if (uiPointId)
+                {
+                    if (DoCastSpellIfCan(m_creature, urand(0, 1) ? SPELL_SPOUT_LEFT : SPELL_SPOUT_RIGHT, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        // Remove the target focus
+                        m_creature->SetTargetGuid(ObjectGuid());
+                        m_uiPhase = PHASE_SPOUT;
+                    }
+                }
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            // count the marksmen
+            if (pVictim->GetEntry() != NPC_THERAMORE_MARKSMAN)
+                return;
+
+            ++m_uiMarksmenKilled;
+
+            // update world state
+            if (Player* pSummoner = m_creature->GetMap()->GetPlayer(m_summonerGuid))
+            {
+                pSummoner->SendUpdateWorldState(WORLD_STATE_TETHYR_COUNT, MAX_MARKSMEN - m_uiMarksmenKilled);
+
+                // fail quest if all marksmen are killed
+                if (m_uiMarksmenKilled == MAX_MARKSMEN)
+                {
+                    pSummoner->FailQuest(QUEST_ID_TETHYR);
+                    EnterEvadeMode();
+                }
+            }
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            // spout on cannon
+            if (pCaster->GetEntry() == NPC_THERAMORE_CANNON && pSpell->Id == SPELL_CANNON_BLAST_DMG)
+            {
+                if (m_uiPhase == PHASE_SPOUT)
+                    return;
+
+                // not all cannons have same distance range
+                uint8 uiDistMod = pCaster->GetPositionY() > -4650.0f ? 6 : 5;
+
+                float fX, fY, fZ;
+                pCaster->GetContactPoint(m_creature, fX, fY, fZ, uiDistMod * ATTACK_DISTANCE);
+                m_creature->GetMotionMaster()->MovePoint(1, fX, fY, m_creature->GetPositionZ());
+
+                m_uiWaterBoltTimer = 10000;
+            }
+        }
+
+        // function to cleanup the world states and GO flags
+        void DoEncounterCleanup()
+        {
+            // remove world state
+            if (Player* pSummoner = m_creature->GetMap()->GetPlayer(m_summonerGuid))
+                pSummoner->SendUpdateWorldState(WORLD_STATE_TETHYR_SHOW, 0);
+
+            // reset all cannons
+            std::list<GameObject*> lCannonsInRange;
+            GetGameObjectListWithEntryInGrid(lCannonsInRange, m_creature, GO_COVE_CANNON, 100.0f);
+
+            for (std::list<GameObject*>::const_iterator itr = lCannonsInRange.begin(); itr != lCannonsInRange.end(); ++itr)
+                (*itr)->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+
+            // despawn all marksmen
+            std::list<Creature*> lMarksmenInRange;
+            GetCreatureListWithEntryInGrid(lMarksmenInRange, m_creature, NPC_THERAMORE_MARKSMAN, 100.0f);
+
+            for (std::list<Creature*>::const_iterator itr = lMarksmenInRange.begin(); itr != lMarksmenInRange.end(); ++itr)
+                (*itr)->ForcedDespawn(30000);
+        }
+
+        // Custom threat management
+        bool SelectCustomHostileTarget()
+        {
+            // Not started combat or evading prevented
+            if (!m_creature->IsInCombat() || m_creature->HasAuraType(SPELL_AURA_MOD_TAUNT))
+                return false;
+
+            // Check if there are still enemies (marksmen) in the threatList
+            ThreatList const& threatList = m_creature->GetThreatManager().getThreatList();
+            for (ThreatList::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
+            {
+                if ((*itr)->getUnitGuid().IsCreature())
+                    return true;
+            }
+
+            EnterEvadeMode();
+            return false;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!SelectCustomHostileTarget())
+                return;
+
+            if (m_uiPhase == PHASE_SPOUT)
+            {
+                if (m_uiSpoutEndTimer < uiDiff)
+                {
+                    // Remove rotation auras
+                    m_creature->RemoveAurasDueToSpell(SPELL_SPOUT_LEFT);
+                    m_creature->RemoveAurasDueToSpell(SPELL_SPOUT_RIGHT);
+
+                    m_uiPhase = PHASE_NORMAL;
+                    m_uiSpoutEndTimer = 7000;
+                    m_uiWaterBoltTimer = urand(0, 1000);
+                }
+                else
+                    m_uiSpoutEndTimer -= uiDiff;
+            }
+            else if (m_uiPhase == PHASE_NORMAL)
+            {
+                if (m_uiWaterBoltTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_WATER_BOLT) == CAST_OK)
+                        {
+                            // mimic boss turning because of the missing threat system
+                            m_creature->SetTargetGuid(pTarget->GetObjectGuid());
+                            m_creature->SetInFront(pTarget);
+
+                            m_uiWaterBoltTimer = urand(0, 1000);
+                        }
+                    }
+                }
+                else
+                    m_uiWaterBoltTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_tethyrAI(pCreature);
+    }
+};
+#endif
+void AddSC_dustwallow_marsh()
+{
+    Script* s;
+    s = new npc_morokk();
+    s->RegisterSelf();
+    s = new npc_ogron();
+    s->RegisterSelf();
+    s = new npc_private_hendel();
+    s->RegisterSelf();
+    s = new npc_stinky_ignatz();
+    s->RegisterSelf();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    s = new mobs_risen_husk_spirit();
+    s->RegisterSelf();
+    s = new npc_restless_apparition();
+    s->RegisterSelf();
+
+#endif
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    s = new boss_tethyr();
+    s->RegisterSelf();
+    s = new at_nats_landing();
+    s->RegisterSelf();
+
+#endif
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mobs_risen_husk_spirit";
+    //pNewScript->GetAI = &GetAI_mobs_risen_husk_spirit;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_restless_apparition";
+    //pNewScript->GetAI = &GetAI_npc_restless_apparition;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ogron";
+    //pNewScript->GetAI = &GetAI_npc_ogron;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_ogron;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_private_hendel";
+    //pNewScript->GetAI = &GetAI_npc_private_hendel;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_private_hendel;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_stinky_ignatz";
+    //pNewScript->GetAI = &GetAI_npc_stinky_ignatz;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_stinky_ignatz;
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_nats_landing";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_nats_landing;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_tethyr";
+    //pNewScript->GetAI = &GetAI_boss_tethyr;
+}
diff --git a/src/modules/SD3/scripts/kalimdor/felwood.cpp b/src/modules/SD3/scripts/kalimdor/felwood.cpp
new file mode 100644
index 000000000..ab2fd368d
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/felwood.cpp
@@ -0,0 +1,1126 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Felwood
+ * SD%Complete: 95
+ * SDComment:   Quest support: 4261, 4506, 5203, 7603, 7603 (Summon Pollo Grande).
+ * SDCategory:  Felwood
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_kitten
+ * npc_niby_the_almighty
+ * npc_kroshius
+ * npc_captured_arkonarin
+ * npc_arei
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "follower_ai.h"
+#include "escort_ai.h"
+#include "ObjectMgr.h"
+
+/*####
+# npc_kitten
+####*/
+
+enum
+{
+    EMOTE_SAB_JUMP              = -1000541,
+    EMOTE_SAB_FOLLOW            = -1000542,
+
+    SPELL_CORRUPT_SABER_VISUAL  = 16510,
+
+    QUEST_CORRUPT_SABER         = 4506,
+    NPC_WINNA                   = 9996,
+    NPC_CORRUPT_SABER           = 10042
+};
+//TODO
+#define GOSSIP_ITEM_RELEASE     "I want to release the corrupted saber to Winna."
+
+struct npc_kitten : public CreatureScript
+{
+    npc_kitten() : CreatureScript("npc_kitten") {}
+
+    struct npc_kittenAI : public FollowerAI
+    {
+        npc_kittenAI(Creature* pCreature) : FollowerAI(pCreature)
+        {
+            if (pCreature->GetOwner() && pCreature->GetOwner()->GetTypeId() == TYPEID_PLAYER)
+            {
+                StartFollow((Player*)pCreature->GetOwner());
+                SetFollowPaused(true);
+                DoScriptText(EMOTE_SAB_JUMP, m_creature);
+
+                pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+                // find a decent way to move to center of moonwell
+            }
+
+            m_uiMoonwellCooldown = 7500;
+        }
+
+        uint32 m_uiMoonwellCooldown;
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // should not have npcflag by default, so set when expected
+            if (!m_creature->getVictim() && !m_creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP) && HasFollowState(STATE_FOLLOW_INPROGRESS) && pWho->GetEntry() == NPC_WINNA)
+            {
+                if (m_creature->IsWithinDistInMap(pWho, INTERACTION_DISTANCE))
+                {
+                    m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                }
+            }
+        }
+
+        void UpdateFollowerAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (HasFollowState(STATE_FOLLOW_PAUSED))
+                {
+                    if (m_uiMoonwellCooldown < uiDiff)
+                    {
+                        m_creature->CastSpell(m_creature, SPELL_CORRUPT_SABER_VISUAL, false);
+                        SetFollowPaused(false);
+                    }
+                    else
+                    {
+                        m_uiMoonwellCooldown -= uiDiff;
+                    }
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kittenAI(pCreature);
+    }
+};
+
+struct spell_npc_kitten : public SpellScript
+{
+    spell_npc_kitten() : SpellScript("spell_npc_kitten") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_CORRUPT_SABER_VISUAL && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            // Not nice way, however using UpdateEntry will not be correct.
+            if (const CreatureInfo* pTemp = GetCreatureTemplateStore(NPC_CORRUPT_SABER))
+            {
+                pCreatureTarget->SetEntry(pTemp->Entry);
+                pCreatureTarget->SetDisplayId(Creature::ChooseDisplayId(pTemp));
+                pCreatureTarget->SetName(pTemp->Name);
+                pCreatureTarget->SetFloatValue(OBJECT_FIELD_SCALE_X, pTemp->Scale);
+            }
+
+            if (Unit* pOwner = pCreatureTarget->GetOwner())
+            {
+                DoScriptText(EMOTE_SAB_FOLLOW, pCreatureTarget, pOwner);
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+        return false;
+    }
+};
+
+struct npc_corrupt_saber : public CreatureScript
+{
+    npc_corrupt_saber() : CreatureScript("npc_corrupt_saber") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_CORRUPT_SABER) == QUEST_STATUS_INCOMPLETE)
+        {
+            if (GetClosestCreatureWithEntry(pCreature, NPC_WINNA, INTERACTION_DISTANCE))
+            {
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RELEASE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);    //TODO localisation
+            }
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+            if (FollowerAI* pKittenAI = (FollowerAI*)(pCreature->AI()))
+            {
+                pKittenAI->SetFollowComplete();
+            }
+
+            pPlayer->AreaExploredOrEventHappens(QUEST_CORRUPT_SABER);
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_niby_the_almighty (summons el pollo grande)
+######*/
+
+enum
+{
+    QUEST_KROSHIUS     = 7603,
+
+    NPC_IMPSY          = 14470,
+
+    SPELL_SUMMON_POLLO = 23056,
+
+    SAY_NIBY_1         = -1000566,
+    SAY_NIBY_2         = -1000567,
+    EMOTE_IMPSY_1      = -1000568,
+    SAY_IMPSY_1        = -1000569,
+    SAY_NIBY_3         = -1000570
+};
+
+struct npc_niby_the_almighty : public CreatureScript
+{
+    npc_niby_the_almighty() : CreatureScript("npc_niby_the_almighty") {}
+
+    struct npc_niby_the_almightyAI : public ScriptedAI
+    {
+        npc_niby_the_almightyAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiSummonTimer;
+        uint8  m_uiSpeech;
+
+        bool m_bEventStarted;
+
+        void Reset() override
+        {
+            m_uiSummonTimer = 500;
+            m_uiSpeech = 0;
+
+            m_bEventStarted = false;
+        }
+
+        void StartEvent()
+        {
+            Reset();
+            m_bEventStarted = true;
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_bEventStarted)
+            {
+                if (m_uiSummonTimer <= uiDiff)
+                {
+                    switch (m_uiSpeech)
+                    {
+                    case 1:
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MovePoint(0, 5407.19f, -753.00f, 350.82f);
+                        m_uiSummonTimer = 6200;
+                        break;
+                    case 2:
+                        m_creature->SetFacingTo(1.2f);
+                        DoScriptText(SAY_NIBY_1, m_creature);
+                        m_uiSummonTimer = 3000;
+                        break;
+                    case 3:
+                        DoScriptText(SAY_NIBY_2, m_creature);
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_POLLO);
+                        m_uiSummonTimer = 2000;
+                        break;
+                    case 4:
+                        if (Creature* pImpsy = GetClosestCreatureWithEntry(m_creature, NPC_IMPSY, 20.0))
+                        {
+                            DoScriptText(EMOTE_IMPSY_1, pImpsy);
+                            DoScriptText(SAY_IMPSY_1, pImpsy);
+                            m_uiSummonTimer = 2500;
+                        }
+                        else
+                        {
+                            // Skip Speech 5
+                            m_uiSummonTimer = 40000;
+                            ++m_uiSpeech;
+                        }
+                        break;
+                    case 5:
+                        DoScriptText(SAY_NIBY_3, m_creature);
+                        m_uiSummonTimer = 40000;
+                        break;
+                    case 6:
+                        m_creature->GetMotionMaster()->MoveTargetedHome();
+                        m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                        m_bEventStarted = false;
+                        break;
+                    }
+                    ++m_uiSpeech;
+                }
+                else
+                {
+                    m_uiSummonTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_niby_the_almightyAI(pCreature);
+    }
+
+    bool OnQuestRewarded(Player* /*pPlayer*/, Creature* pCreature, Quest const* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_KROSHIUS)
+        {
+            if (npc_niby_the_almightyAI* pNibyAI = dynamic_cast<npc_niby_the_almightyAI*>(pCreature->AI()))
+            {
+                pNibyAI->StartEvent();
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+/*######
+## npc_kroshius
+######*/
+
+enum
+{
+    NPC_KROSHIUS            = 14467,
+    SPELL_KNOCKBACK         = 10101,
+    SAY_KROSHIUS_REVIVE     = -1000589,
+    EVENT_KROSHIUS_REVIVE   = 8328,
+    FACTION_HOSTILE         = 16,
+};
+
+struct npc_kroshius : public CreatureScript
+{
+    npc_kroshius() : CreatureScript("npc_kroshius") {}
+
+    struct npc_kroshiusAI : public ScriptedAI
+    {
+        npc_kroshiusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_uiPhase = 0;  //TODO check this
+        }
+
+        ObjectGuid m_playerGuid;
+        uint32 m_uiKnockBackTimer;
+        uint32 m_uiPhaseTimer;
+
+        uint8 m_uiPhase;
+
+        void Reset() override
+        {
+            m_uiKnockBackTimer = urand(5000, 8000);
+            m_playerGuid.Clear();
+
+            if (!m_uiPhase)
+            {
+                m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+            }
+        }
+
+        void DoRevive(Player* pSource)
+        {
+            if (m_uiPhase)
+            {
+                return;
+            }
+
+            m_uiPhase = 1;
+            m_uiPhaseTimer = 2500;
+            m_playerGuid = pSource->GetObjectGuid();
+
+            // TODO: A visual Flame Circle around the mob still missing
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            m_uiPhase = 0;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature && pInvoker->GetTypeId() == TYPEID_PLAYER)
+                DoRevive(pInvoker->ToPlayer());
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_uiPhase)
+            {
+                return;
+            }
+
+            if (m_uiPhase < 4)
+            {
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    switch (m_uiPhase)
+                    {
+                    case 1:                                 // Revived
+                        m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                        m_uiPhaseTimer = 1000;
+                        break;
+                    case 2:
+                        DoScriptText(SAY_KROSHIUS_REVIVE, m_creature);
+                        m_uiPhaseTimer = 3500;
+                        break;
+                    case 3:                                 // Attack
+                        m_creature->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_COMBAT_STOP | TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_TOGGLE_OOC_NOT_ATTACK | TEMPFACTION_TOGGLE_PASSIVE);
+                        if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                        {
+                            if (m_creature->IsWithinDistInMap(pPlayer, 30.0f))
+                            {
+                                AttackStart(pPlayer);
+                            }
+                        }
+                        break;
+                    }
+                    ++m_uiPhase;
+                }
+                else
+                {
+                    m_uiPhaseTimer -= uiDiff;
+                }
+            }
+            else
+            {
+                if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                {
+                    return;
+                }
+
+                if (m_uiKnockBackTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_KNOCKBACK);
+                    m_uiKnockBackTimer = urand(9000, 12000);
+                }
+                else
+                {
+                    m_uiKnockBackTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kroshiusAI(pCreature);
+    }
+};
+
+struct event_npc_kroshius : public MapEventScript
+{
+    event_npc_kroshius() : MapEventScript("event_npc_kroshius") {}
+
+    bool ProcessEventId_npc_kroshius(uint32 uiEventId, Object* pSource, Object* /*pTarget*/, bool /*bIsStart*/)
+    {
+        if (uiEventId == EVENT_KROSHIUS_REVIVE)
+        {
+            if (pSource->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (Creature* pKroshius = GetClosestCreatureWithEntry((Player*)pSource, NPC_KROSHIUS, 20.0f))
+                {
+                    if (CreatureAI* pKroshiusAI = pKroshius->AI())
+                    {
+                        pKroshiusAI->SendAIEvent(AI_EVENT_CUSTOM_A, (Player*)pSource, pKroshius); //->DoRevive((Player*)pSource);
+                    }
+                }
+            }
+
+            return true;
+        }
+        return false;
+    }
+};
+
+/*####
+# npc_captured_arkonarin
+####*/
+
+enum
+{
+    SAY_ESCORT_START                = -1001148,
+    SAY_FIRST_STOP                  = -1001149,
+    SAY_SECOND_STOP                 = -1001150,
+    SAY_AGGRO                       = -1001151,
+    SAY_FOUND_EQUIPMENT             = -1001152,
+    SAY_ESCAPE_DEMONS               = -1001153,
+    SAY_FRESH_AIR                   = -1001154,
+    SAY_TREY_BETRAYER               = -1001155,
+    SAY_TREY                        = -1001156,
+    SAY_TREY_ATTACK                 = -1001157,
+    SAY_ESCORT_COMPLETE             = -1001158,
+
+    SPELL_STRENGHT_ARKONARIN        = 18163,
+    SPELL_MORTAL_STRIKE             = 16856,
+    SPELL_CLEAVE                    = 15496,
+
+    QUEST_ID_RESCUE_JAEDENAR        = 5203,
+    NPC_JAEDENAR_LEGIONNAIRE        = 9862,
+    NPC_SPIRT_TREY                  = 11141,
+    GO_ARKONARIN_CHEST              = 176225,
+    GO_ARKONARIN_CAGE               = 176306,
+};
+
+struct npc_captured_arkonarin : public CreatureScript
+{
+    npc_captured_arkonarin() : CreatureScript("npc_captured_arkonarin") {}
+
+    struct npc_captured_arkonarinAI : public npc_escortAI
+    {
+        npc_captured_arkonarinAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        ObjectGuid m_treyGuid;
+
+        bool m_bCanAttack;
+
+        uint32 m_uiMortalStrikeTimer;
+        uint32 m_uiCleaveTimer;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+                m_bCanAttack = false;
+
+            m_uiMortalStrikeTimer = urand(5000, 7000);
+            m_uiCleaveTimer = urand(1000, 4000);
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (pWho->GetEntry() == NPC_SPIRT_TREY)
+                DoScriptText(SAY_TREY_ATTACK, m_creature);
+            else if (roll_chance_i(25))
+                DoScriptText(SAY_AGGRO, m_creature, pWho);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_JAEDENAR_LEGIONNAIRE)
+                pSummoned->AI()->AttackStart(m_creature);
+            else if (pSummoned->GetEntry() == NPC_SPIRT_TREY)
+            {
+#if defined(TBC) || defined(WOTLK)
+                DoScriptText(SAY_TREY_BETRAYER, pSummoned);
+#endif
+                m_treyGuid = pSummoned->GetObjectGuid();
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                m_creature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+
+                if (GameObject* pCage = GetClosestGameObjectWithEntry(m_creature, GO_ARKONARIN_CAGE, 5.0f))
+                    pCage->Use(m_creature);
+#if defined(CLASSIC)
+                m_creature->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                m_creature->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+#endif
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                if (Player* pPlayer = GetPlayerForEscort())
+                    DoScriptText(SAY_ESCORT_START, m_creature, pPlayer);
+                break;
+            case 14:
+                DoScriptText(SAY_FIRST_STOP, m_creature);
+                break;
+#if defined(TBC)
+            case 34:
+#endif
+#if defined(CLASSIC)
+            case 36:
+#endif
+                DoScriptText(SAY_SECOND_STOP, m_creature);
+                SetRun();
+                break;
+            case 38:
+                if (GameObject* pChest = GetClosestGameObjectWithEntry(m_creature, GO_ARKONARIN_CHEST, 5.0f))
+                    pChest->Use(m_creature);
+                m_creature->HandleEmote(EMOTE_ONESHOT_KNEEL);
+                break;
+            case 39:
+                DoCastSpellIfCan(m_creature, SPELL_STRENGHT_ARKONARIN);
+                break;
+            case 40:
+                if (Player* pPlayer = GetPlayerForEscort())
+                    m_creature->SetFacingToObject(pPlayer);
+                m_bCanAttack = true;
+                DoScriptText(SAY_FOUND_EQUIPMENT, m_creature);
+                // ToDo: change equipment!
+#if defined(CLASSIC)
+                m_creature->UpdateEntry(11018);
+#endif
+                break;
+            case 41:
+#if defined(CLASSIC)
+                SetRun(false);
+                break;
+#endif
+#if defined(TBC) || defined(WOTLK)
+                DoScriptText(SAY_ESCAPE_DEMONS, m_creature);
+                m_creature->SummonCreature(NPC_JAEDENAR_LEGIONNAIRE, 5082.068f, -490.084f, 296.856f, 5.15f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_JAEDENAR_LEGIONNAIRE, 5084.135f, -489.187f, 296.832f, 5.15f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_JAEDENAR_LEGIONNAIRE, 5085.676f, -488.518f, 296.824f, 5.15f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+#endif
+                break;
+#if defined(CLASSIC)
+            case 42:
+                DoScriptText(SAY_ESCAPE_DEMONS, m_creature);
+                m_creature->SummonCreature(NPC_JAEDENAR_LEGIONNAIRE, 5083.989f, -495.566f, 296.677f, 5.43f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_JAEDENAR_LEGIONNAIRE, 5087.030f, -492.886f, 296.677f, 5.43f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_JAEDENAR_LEGIONNAIRE, 5082.929f, -492.193f, 296.677f, 5.43f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                break;
+#endif
+#if defined(TBC) || defined(WOTLK)
+            case 43:
+                SetRun(false);
+                break;
+#endif
+#if defined(CLASSIC)
+            case 50:
+                DoScriptText(SAY_ESCAPE_DEMONS, m_creature);
+                m_creature->SummonCreature(NPC_JAEDENAR_LEGIONNAIRE, 5042.718f, -543.696f, 297.801f, 0.84f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_JAEDENAR_LEGIONNAIRE, 5037.962f, -539.510f, 297.801f, 0.84f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_JAEDENAR_LEGIONNAIRE, 5038.018f, -545.729f, 297.801f, 0.84f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                break;
+#endif
+            case 104:
+#if defined(CLASSIC)
+                m_creature->SetFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                m_creature->SetFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                m_creature->SummonCreature(NPC_SPIRT_TREY, 4844.839f, -395.763f, 350.603f, 6.25f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+#endif
+                DoScriptText(SAY_FRESH_AIR, m_creature);
+                break;
+            case 105:
+#if defined(TBC) || defined(WOTLK)
+                m_creature->SummonCreature(NPC_SPIRT_TREY, 4844.839f, -395.763f, 350.603f, 6.25f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+#endif
+#if defined(CLASSIC)
+                DoScriptText(SAY_TREY_BETRAYER, m_creature->GetMap()->GetCreature(m_treyGuid));
+#endif
+                break;
+            case 106:
+                DoScriptText(SAY_TREY, m_creature);
+#if defined(CLASSIC)
+                m_creature->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                m_creature->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+#endif
+                break;
+            case 107:
+                if (Creature* pTrey = m_creature->GetMap()->GetCreature(m_treyGuid))
+                    AttackStart(pTrey);
+                break;
+            case 108:
+                if (Player* pPlayer = GetPlayerForEscort())
+                    m_creature->SetFacingToObject(pPlayer);
+                DoScriptText(SAY_ESCORT_COMPLETE, m_creature);
+                break;
+            case 109:
+                if (Player* pPlayer = GetPlayerForEscort())
+                    pPlayer->GroupEventHappens(QUEST_ID_RESCUE_JAEDENAR, m_creature);
+                SetRun();
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_bCanAttack)
+            {
+                if (m_uiMortalStrikeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MORTAL_STRIKE) == CAST_OK)
+                        m_uiMortalStrikeTimer = urand(7000, 10000);
+                }
+                else
+                    m_uiMortalStrikeTimer -= uiDiff;
+
+                if (m_uiCleaveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                        m_uiCleaveTimer = urand(3000, 6000);
+                }
+                else
+                    m_uiCleaveTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_captured_arkonarinAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_RESCUE_JAEDENAR)
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+
+        return true;
+    }
+};
+
+/*####
+# npc_arei
+####*/
+
+enum
+{
+    SAY_AREI_ESCORT_START           = -1001159,
+    SAY_ATTACK_IRONTREE             = -1001160,
+    SAY_ATTACK_TOXIC_HORROR         = -1001161,
+    SAY_EXIT_WOODS                  = -1001162,
+    SAY_CLEAR_PATH                  = -1001163,
+    SAY_ASHENVALE                   = -1001164,
+    SAY_TRANSFORM                   = -1001165,
+    SAY_LIFT_CURSE                  = -1001166,
+    SAY_AREI_ESCORT_COMPLETE        = -1001167,
+
+    SPELL_WITHER_STRIKE             = 5337,
+    SPELL_AREI_TRANSFORM            = 14888,
+
+    NPC_AREI                        = 9598,
+    NPC_TOXIC_HORROR                = 7132,
+    NPC_IRONTREE_WANDERER           = 7138,
+    NPC_IRONTREE_STOMPER            = 7139,
+    QUEST_ID_ANCIENT_SPIRIT         = 4261,
+};
+
+static const DialogueEntry aEpilogDialogue[] =
+{
+    {SAY_CLEAR_PATH,            NPC_AREI,   4000},
+    {SPELL_WITHER_STRIKE,       0,          5000},
+    {SAY_TRANSFORM,             NPC_AREI,   3000},
+    {SPELL_AREI_TRANSFORM,      0,          7000},
+    {QUEST_ID_ANCIENT_SPIRIT,   0,          0},
+    {0, 0, 0},
+};
+
+struct npc_arei : public CreatureScript
+{
+    npc_arei() : CreatureScript("npc_arei") {}
+
+    struct npc_areiAI : public npc_escortAI, private DialogueHelper
+    {
+        npc_areiAI(Creature* pCreature) : npc_escortAI(pCreature),
+        DialogueHelper(aEpilogDialogue)
+        {
+            m_bAggroIrontree = false;   //TODO check this
+            m_bAggroHorror = false;
+        }
+
+        uint32 m_uiWitherStrikeTimer;
+
+        bool m_bAggroIrontree;
+        bool m_bAggroHorror;
+
+        GuidList m_lSummonsGuids;
+
+        void Reset() override
+        {
+            m_uiWitherStrikeTimer = urand(1000, 4000);
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if ((pWho->GetEntry() == NPC_IRONTREE_WANDERER || pWho->GetEntry() == NPC_IRONTREE_STOMPER) && !m_bAggroIrontree)
+            {
+                DoScriptText(SAY_ATTACK_IRONTREE, m_creature);
+                m_bAggroIrontree = true;
+            }
+            else if (pWho->GetEntry() == NPC_TOXIC_HORROR && !m_bAggroHorror)
+            {
+                if (Player* pPlayer = GetPlayerForEscort())
+                    DoScriptText(SAY_ATTACK_TOXIC_HORROR, m_creature, pPlayer);
+                m_bAggroHorror = true;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_IRONTREE_STOMPER:
+                DoScriptText(SAY_EXIT_WOODS, m_creature, pSummoned);
+                // no break;
+            case NPC_IRONTREE_WANDERER:
+                pSummoned->AI()->AttackStart(m_creature);
+                m_lSummonsGuids.push_back(pSummoned->GetObjectGuid());
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_IRONTREE_STOMPER || pSummoned->GetEntry() == NPC_IRONTREE_WANDERER)
+            {
+                m_lSummonsGuids.remove(pSummoned->GetObjectGuid());
+
+                if (m_lSummonsGuids.empty())
+                    StartNextDialogueText(SAY_CLEAR_PATH);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoScriptText(SAY_AREI_ESCORT_START, m_creature, pInvoker);
+
+                m_creature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+                Start(true, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            if (uiPointId == 36)
+            {
+                SetEscortPaused(true);
+
+                m_creature->SummonCreature(NPC_IRONTREE_STOMPER, 6573.321f, -1195.213f, 442.489f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_IRONTREE_WANDERER, 6573.240f, -1213.475f, 443.643f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_IRONTREE_WANDERER, 6583.354f, -1209.811f, 444.769f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+            }
+        }
+
+        Creature* GetSpeakerByEntry(uint32 uiEntry) override
+        {
+            if (uiEntry == NPC_AREI)
+                return m_creature;
+
+            return NULL;
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case SPELL_WITHER_STRIKE:
+                if (Player* pPlayer = GetPlayerForEscort())
+                    DoScriptText(SAY_ASHENVALE, m_creature, pPlayer);
+                break;
+            case SPELL_AREI_TRANSFORM:
+                DoCastSpellIfCan(m_creature, SPELL_AREI_TRANSFORM);
+                if (Player* pPlayer = GetPlayerForEscort())
+                    DoScriptText(SAY_LIFT_CURSE, m_creature, pPlayer);
+                break;
+            case QUEST_ID_ANCIENT_SPIRIT:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_AREI_ESCORT_COMPLETE, m_creature, pPlayer);
+                    pPlayer->GroupEventHappens(QUEST_ID_ANCIENT_SPIRIT, m_creature);
+                    m_creature->ForcedDespawn(10000);
+                }
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiWitherStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_WITHER_STRIKE) == CAST_OK)
+                    m_uiWitherStrikeTimer = urand(3000, 6000);
+            }
+            else
+                m_uiWitherStrikeTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_areiAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_ANCIENT_SPIRIT)
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+
+        return true;
+    }
+};
+
+/*######
+## go_corrupted_plant
+######*/
+
+enum
+{
+    FAILED_TO_LOCATE_QUEST = 0,
+    QUEST_CORRUPTED_SONGFLOWER = 1,
+    QUEST_CORRUPTED_NIGHT_DRAGON = 2,
+    QUEST_CORRUPTED_WINDBLOSSOM = 3,
+    QUEST_CORRUPTED_WHIPPER_ROOT = 4,
+
+    GO_CLEANSED_SONGFLOWER = 164882,
+    SPELL_SONGFLOWER_SERENADE = 15366,
+
+    GO_CLEANSED_NIGHT_DRAGON = 164881,
+    GO_CLEANSED_WINDBLOSSOM = 164884,
+    GO_CLEANSED_WHIPPER_ROOT = 164883,
+
+    PLANT_SPAWN_DURATION = 60
+};
+
+static const uint32 aCorruptedSongflowerQuestId[] =
+{ 2278, 2523, 3363, 4113, 4116, 4118, 4401, 4464, 4465 };            // Corrupted Songflower
+static const uint32 aCorruptedNightDragonQuestId[] =
+{ 4119, 4447, 4448, 4462 };                                          // Corrupted Night Dragon
+static const uint32 aCorruptedWindblossomQuestId[] =
+{ 996, 998, 1514, 4115, 4221, 4222, 4343, 4403, 4466, 4466, 4467 };  // Corrupted Windblossom
+static const uint32 aCorruptedWhipperRootQuestId[] =
+{ 4117, 4443, 4444, 4445, 4446, 4461 };                              // Corrupted Whipper Root
+
+struct go_corrupted_plant : public GameObjectScript
+{
+    go_corrupted_plant() : GameObjectScript("go_corrupted_plant") {}
+
+    uint32 locateQuestId(uint32 uQuestToSearchFor, uint32 uQuestId) //TODO try to do anything with this
+    {
+        int index = 0;
+        if (uQuestToSearchFor == QUEST_CORRUPTED_SONGFLOWER)
+        {
+            // check Cleansed Songflower Quest IDs
+            for (index = 0; index < 9; index++)
+            {
+                if (uQuestId == aCorruptedSongflowerQuestId[index])
+                    return QUEST_CORRUPTED_SONGFLOWER;
+            }
+        }
+        else if (uQuestToSearchFor == QUEST_CORRUPTED_NIGHT_DRAGON)
+        {
+            // check Cleansed Night Dragon Quest IDs
+            for (int index = 0; index < 4; index++)
+            {
+                if (uQuestId == aCorruptedNightDragonQuestId[index])
+                    return QUEST_CORRUPTED_NIGHT_DRAGON;
+            }
+        }
+        else if (uQuestToSearchFor == QUEST_CORRUPTED_WINDBLOSSOM)
+        {
+            // check Cleansed Windblossom Quest IDs
+            for (int index = 0; index < 10; index++)
+            {
+                if (uQuestId == aCorruptedWindblossomQuestId[index])
+                    return QUEST_CORRUPTED_WINDBLOSSOM;
+            }
+        }
+        else if (uQuestToSearchFor == QUEST_CORRUPTED_WHIPPER_ROOT)
+        {
+            // check Cleansed Whipper Root Quest IDs
+            for (int index = 0; index < 6; index++)
+            {
+                if (uQuestId == aCorruptedWhipperRootQuestId[index])
+                    return QUEST_CORRUPTED_WHIPPER_ROOT;
+            }
+        }
+
+        return FAILED_TO_LOCATE_QUEST; // quest ID not located
+    }
+
+    void DespawnCorruptedPlant(GameObject* pGo)
+    {
+        pGo->SetSpawnedByDefault(false);
+        pGo->SetRespawnTime(1);
+    }
+
+    bool OnQuestRewarded(Player* pPlayer, GameObject* pGo, const Quest* pQuest) override
+    {
+        // acquire plant's coordinates
+        float fX, fY, fZ;
+        pGo->GetPosition(fX, fY, fZ);
+
+        uint32 uQuestId = pQuest->GetQuestId();
+
+        if (locateQuestId(QUEST_CORRUPTED_SONGFLOWER, uQuestId) == QUEST_CORRUPTED_SONGFLOWER)
+        {
+            // despawn corrupted plant
+            DespawnCorruptedPlant(pGo);
+            // spawn cleansed plant
+            pPlayer->SummonGameObject(GO_CLEANSED_SONGFLOWER, fX, fY, fZ, 0.0f, PLANT_SPAWN_DURATION);
+        }
+        else if (locateQuestId(QUEST_CORRUPTED_NIGHT_DRAGON, uQuestId) == QUEST_CORRUPTED_NIGHT_DRAGON)
+        {
+            // despawn corrupted plant
+            DespawnCorruptedPlant(pGo);
+            // spawn cleansed plant
+            pPlayer->SummonGameObject(GO_CLEANSED_NIGHT_DRAGON, fX, fY, fZ, 0.0f, PLANT_SPAWN_DURATION);
+        }
+        else if (locateQuestId(QUEST_CORRUPTED_WINDBLOSSOM, uQuestId) == QUEST_CORRUPTED_WINDBLOSSOM)
+        {
+            // despawn corrupted plant
+            DespawnCorruptedPlant(pGo);
+            // spawn cleansed plant
+            pPlayer->SummonGameObject(GO_CLEANSED_WINDBLOSSOM, fX, fY, fZ, 0.0f, PLANT_SPAWN_DURATION);
+        }
+        else if (locateQuestId(QUEST_CORRUPTED_WHIPPER_ROOT, uQuestId) == QUEST_CORRUPTED_WHIPPER_ROOT)
+        {
+            // despawn corrupted plant
+            DespawnCorruptedPlant(pGo);
+            // spawn cleansed plant
+            pPlayer->SummonGameObject(GO_CLEANSED_WHIPPER_ROOT, fX, fY, fZ, 0.0f, PLANT_SPAWN_DURATION);
+        }
+        else
+            return false;
+
+        return true;
+    }
+};
+
+// This is only used for the Corrupted Songflower quest; actually for when interacting with the cleansed songflower
+struct go_cleansed_plant : public GameObjectScript
+{
+    go_cleansed_plant() : GameObjectScript("go_cleansed_plant") {}
+
+    bool OnUse(Player* pPlayer, GameObject* /*pGo*/) override
+    {
+        // cast spell on player
+        pPlayer->CastSpell(pPlayer, SPELL_SONGFLOWER_SERENADE, true);
+
+        return true;
+    }
+};
+
+void AddSC_felwood()
+{
+    Script* s;
+    s = new npc_kitten();
+    s->RegisterSelf();
+    s = new npc_corrupt_saber();
+    s->RegisterSelf();
+    s = new go_corrupted_plant();
+    s->RegisterSelf();
+    s = new go_cleansed_plant();
+    s->RegisterSelf();
+    s = new npc_niby_the_almighty();
+    s->RegisterSelf();
+    s = new npc_kroshius();
+    s->RegisterSelf();
+    s = new event_npc_kroshius();
+    s->RegisterSelf();
+    s = new npc_captured_arkonarin();
+    s->RegisterSelf();
+    s = new npc_arei();
+    s->RegisterSelf();
+    s = new spell_npc_kitten();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kitten";
+    //pNewScript->GetAI = &GetAI_npc_kitten;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_corrupt_saber";
+    //pNewScript->pGossipHello =  &GossipHello_npc_corrupt_saber;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_corrupt_saber;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_corrupted_plant";
+    //pNewScript->pQuestRewardedGO = &QuestRewarded_go_corrupted_plant;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_cleansed_plant";
+    //pNewScript->pGOUse = &GOUse_go_cleansed_plant;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_niby_the_almighty";
+    //pNewScript->GetAI = &GetAI_npc_niby_the_almighty;
+    //pNewScript->pQuestRewardedNPC = &QuestRewarded_npc_niby_the_almighty;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kroshius";
+    //pNewScript->GetAI = &GetAI_npc_kroshius;
+    //pNewScript->pProcessEventId = &ProcessEventId_npc_kroshius;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_captured_arkonarin";
+    //pNewScript->GetAI = &GetAI_npc_captured_arkonarin;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_captured_arkonarin;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_arei";
+    //pNewScript->GetAI = &GetAI_npc_arei;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_arei;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/feralas.cpp b/src/modules/SD3/scripts/kalimdor/feralas.cpp
new file mode 100644
index 000000000..54f8f72c8
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/feralas.cpp
@@ -0,0 +1,393 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Feralas
+ * SD%Complete: 100
+ * SDComment:   Quest support: 2767, 2845, 2987.
+ * SDCategory:  Feralas
+ * EndScriptData
+ */
+
+/** ContentData
+ * npc_oox22fe
+ * npc_shay_leafrunner
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "follower_ai.h"
+
+/*######
+## npc_oox22fe
+######*/
+
+enum
+{
+    SAY_OOX_START           = -1000287,
+    SAY_OOX_AGGRO1          = -1000288,
+    SAY_OOX_AGGRO2          = -1000289,
+    SAY_OOX_AMBUSH          = -1000290,
+    SAY_OOX_END             = -1000292,
+
+    NPC_YETI                = 7848,
+    NPC_GORILLA             = 5260,
+    NPC_WOODPAW_REAVER      = 5255,
+    NPC_WOODPAW_BRUTE       = 5253,
+    NPC_WOODPAW_ALPHA       = 5258,
+    NPC_WOODPAW_MYSTIC      = 5254,
+
+    QUEST_RESCUE_OOX22FE    = 2767
+};
+
+struct npc_oox22fe : public CreatureScript
+{
+    npc_oox22fe() : CreatureScript("npc_oox22fe") {}
+
+    struct npc_oox22feAI : public npc_escortAI
+    {
+        npc_oox22feAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 i) override
+        {
+            switch (i)
+            {
+                // First Ambush(3 Yetis)
+            case 11:
+                DoScriptText(SAY_OOX_AMBUSH, m_creature);
+                m_creature->SummonCreature(NPC_YETI, -4841.01f, 1593.91f, 73.42f, 3.98f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                m_creature->SummonCreature(NPC_YETI, -4837.61f, 1568.58f, 78.21f, 3.13f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                m_creature->SummonCreature(NPC_YETI, -4841.89f, 1569.95f, 76.53f, 0.68f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                break;
+                // Second Ambush(3 Gorillas)
+            case 21:
+                DoScriptText(SAY_OOX_AMBUSH, m_creature);
+                m_creature->SummonCreature(NPC_GORILLA, -4595.81f, 2005.99f, 53.08f, 3.74f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                m_creature->SummonCreature(NPC_GORILLA, -4597.53f, 2008.31f, 52.70f, 3.78f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                m_creature->SummonCreature(NPC_GORILLA, -4599.37f, 2010.59f, 52.77f, 3.84f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                break;
+                // Third Ambush(4 Gnolls)
+            case 30:
+                DoScriptText(SAY_OOX_AMBUSH, m_creature);
+                m_creature->SummonCreature(NPC_WOODPAW_REAVER, -4425.14f, 2075.87f, 47.77f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                m_creature->SummonCreature(NPC_WOODPAW_BRUTE, -4426.68f, 2077.98f, 47.57f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                m_creature->SummonCreature(NPC_WOODPAW_MYSTIC, -4428.33f, 2080.24f, 47.43f, 3.87f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                m_creature->SummonCreature(NPC_WOODPAW_ALPHA, -4430.04f, 2075.54f, 46.83f, 3.81f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                break;
+            case 37:
+                DoScriptText(SAY_OOX_END, m_creature);
+                // Award quest credit
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_RESCUE_OOX22FE, m_creature);
+                }
+                break;
+            }
+        }
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+            }
+        }
+
+        void Aggro(Unit* /*who*/) override
+        {
+            // For an small probability the npc says something when he get aggro
+            switch (urand(0, 9))
+            {
+            case 0:
+                DoScriptText(SAY_OOX_AGGRO1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_OOX_AGGRO2, m_creature);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* summoned) override
+        {
+            summoned->AI()->AttackStart(m_creature);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_oox22feAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_RESCUE_OOX22FE)
+        {
+            DoScriptText(SAY_OOX_START, pCreature);
+            // change that the npc is not lying dead on the ground
+            pCreature->SetStandState(UNIT_STAND_STATE_STAND);
+
+            if (pPlayer->GetTeam() == ALLIANCE)
+            {
+                pCreature->SetFactionTemporary(FACTION_ESCORT_A_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+            }
+
+            if (pPlayer->GetTeam() == HORDE)
+            {
+                pCreature->SetFactionTemporary(FACTION_ESCORT_H_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+            }
+
+            if (npc_oox22feAI* pEscortAI = dynamic_cast<npc_oox22feAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+            return true;
+        }
+        return false;
+    }
+};
+
+/*######
+## go_gordunni_trap
+######*/
+
+struct go_gordunni_trap : public GameObjectScript
+{
+    go_gordunni_trap() : GameObjectScript("go_gordunni_trap") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        pPlayer->CastSpell(pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), urand(0, 1) ? 19394 : 11756, false);
+        pGo->SetLootState(GO_JUST_DEACTIVATED);
+        return true;
+    }
+};
+
+/*######
+## npc_shay_leafrunner
+######*/
+
+enum
+{
+    SAY_ESCORT_START                    = -1001106,
+    SAY_WANDER_1                        = -1001107,
+    SAY_WANDER_2                        = -1001108,
+    SAY_WANDER_3                        = -1001109,
+    SAY_WANDER_4                        = -1001110,
+    SAY_WANDER_DONE_1                   = -1001111,
+    SAY_WANDER_DONE_2                   = -1001112,
+    SAY_WANDER_DONE_3                   = -1001113,
+    EMOTE_WANDER                        = -1001114,
+    SAY_EVENT_COMPLETE_1                = -1001115,
+    SAY_EVENT_COMPLETE_2                = -1001116,
+
+    SPELL_SHAYS_BELL                    = 11402,
+    NPC_ROCKBITER                       = 7765,
+    QUEST_ID_WANDERING_SHAY             = 2845,
+};
+
+struct npc_shay_leafrunner : public CreatureScript
+{
+    npc_shay_leafrunner() : CreatureScript("npc_shay_leafrunner") {}
+
+    struct npc_shay_leafrunnerAI : public FollowerAI
+    {
+        npc_shay_leafrunnerAI(Creature* pCreature) : FollowerAI(pCreature)
+        {
+            m_uiWanderTimer = 0;    //TODO check this
+        }
+
+        uint32 m_uiWanderTimer;
+        bool m_bIsRecalled;
+        bool m_bIsComplete;
+
+        void Reset() override
+        {
+            m_bIsRecalled = false;
+            m_bIsComplete = false;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            FollowerAI::MoveInLineOfSight(pWho);
+
+            if (!m_bIsComplete && pWho->GetEntry() == NPC_ROCKBITER && m_creature->IsWithinDistInMap(pWho, 20.0f))
+            {
+                Player* pPlayer = GetLeaderForFollower();
+                if (!pPlayer)
+                    return;
+
+                DoScriptText(SAY_EVENT_COMPLETE_1, m_creature);
+                DoScriptText(SAY_EVENT_COMPLETE_2, pWho);
+
+                // complete quest
+                pPlayer->GroupEventHappens(QUEST_ID_WANDERING_SHAY, m_creature);
+                SetFollowComplete(true);
+                m_creature->ForcedDespawn(30000);
+                m_bIsComplete = true;
+                m_uiWanderTimer = 0;
+
+                // move to Rockbiter
+                float fX, fY, fZ;
+                pWho->GetContactPoint(m_creature, fX, fY, fZ, INTERACTION_DISTANCE);
+                m_creature->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+            }
+            else if (m_bIsRecalled && pWho->GetTypeId() == TYPEID_PLAYER && pWho->IsWithinDistInMap(pWho, INTERACTION_DISTANCE))
+            {
+                m_uiWanderTimer = 60000;
+                m_bIsRecalled = false;
+
+                switch (urand(0, 2))
+                {
+                case 0: DoScriptText(SAY_WANDER_DONE_1, m_creature); break;
+                case 1: DoScriptText(SAY_WANDER_DONE_2, m_creature); break;
+                case 2: DoScriptText(SAY_WANDER_DONE_3, m_creature); break;
+                }
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            // start following
+            if (eventType == AI_EVENT_START_EVENT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                StartFollow((Player*)pInvoker, 0, GetQuestTemplateStore(uiMiscValue));
+                m_uiWanderTimer = 30000;
+            }
+            else if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                // resume following
+                m_bIsRecalled = true;
+                SetFollowPaused(false);
+            }
+        }
+
+        void UpdateFollowerAI(const uint32 uiDiff)
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (m_uiWanderTimer)
+                {
+                    if (m_uiWanderTimer <= uiDiff)
+                    {
+                        // set follow paused and wander in a random point
+                        SetFollowPaused(true);
+                        DoScriptText(EMOTE_WANDER, m_creature);
+                        m_uiWanderTimer = 0;
+
+                        switch (urand(0, 3))
+                        {
+                        case 0: DoScriptText(SAY_WANDER_1, m_creature); break;
+                        case 1: DoScriptText(SAY_WANDER_2, m_creature); break;
+                        case 2: DoScriptText(SAY_WANDER_3, m_creature); break;
+                        case 3: DoScriptText(SAY_WANDER_4, m_creature); break;
+                        }
+
+                        float fX, fY, fZ;
+                        m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, frand(25.0f, 40.0f), frand(0, 2 * M_PI_F));
+                        m_creature->GetMotionMaster()->MoveRandomAroundPoint(fX, fY, fZ, 20.0f);
+                    }
+                    else
+                        m_uiWanderTimer -= uiDiff;
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_shay_leafrunnerAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_WANDERING_SHAY)
+        {
+            DoScriptText(SAY_ESCORT_START, pCreature);
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_EVENT, pPlayer, pCreature, pQuest->GetQuestId());
+        }
+        return true;
+    }
+};
+
+struct spell_npc_shay_leafrunner : public SpellScript
+{
+    spell_npc_shay_leafrunner() : SpellScript("spell_npc_shay_leafrunner") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_SHAYS_BELL && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (pCaster->GetTypeId() != TYPEID_PLAYER)
+                return true;
+
+            pCreatureTarget->ToCreature()->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pCreatureTarget->ToCreature());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## AddSC
+######*/
+
+void AddSC_feralas()
+{
+    Script* s;
+    s = new npc_oox22fe();
+    s->RegisterSelf();
+    s = new go_gordunni_trap();
+    s->RegisterSelf();
+    s = new npc_shay_leafrunner();
+    s->RegisterSelf();
+    s = new spell_npc_shay_leafrunner();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_oox22fe";
+    //pNewScript->GetAI = &GetAI_npc_oox22fe;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_oox22fe;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_gordunni_trap";
+    //pNewScript->pGOUse = &GOUse_go_gordunni_trap;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_shay_leafrunner";
+    //pNewScript->GetAI = &GetAI_npc_shay_leafrunner;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_shay_leafrunner;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_shay_leafrunner;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/maraudon/boss_noxxion.cpp b/src/modules/SD3/scripts/kalimdor/maraudon/boss_noxxion.cpp
new file mode 100644
index 000000000..5a2271229
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/maraudon/boss_noxxion.cpp
@@ -0,0 +1,164 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Noxxion
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Maraudon
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_TOXICVOLLEY           = 21687,
+    SPELL_UPPERCUT              = 22916,
+    SPELL_NOXXION_SPAWNS_AURA   = 21708,
+    SPELL_NOXXION_SPAWNS_SUMMON = 21707,
+};
+
+struct boss_noxxion : public CreatureScript
+{
+    boss_noxxion() : CreatureScript("boss_noxxion") {}
+
+    struct boss_noxxionAI : public ScriptedAI
+    {
+        boss_noxxionAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiToxicVolleyTimer;
+        uint32 m_uiUppercutTimer;
+        uint32 m_uiSummonTimer;
+
+        void Reset() override
+        {
+            m_uiToxicVolleyTimer = 7000;
+            m_uiUppercutTimer = 16000;
+            m_uiSummonTimer = 19000;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void UpdateAI(const uint32 diff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiToxicVolleyTimer < diff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TOXICVOLLEY) == CAST_OK)
+                {
+                    m_uiToxicVolleyTimer = 9000;
+                }
+            }
+            else
+            {
+                m_uiToxicVolleyTimer -= diff;
+            }
+
+            if (m_uiUppercutTimer < diff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_UPPERCUT) == CAST_OK)
+                {
+                    m_uiUppercutTimer = 12000;
+                }
+            }
+            else
+            {
+                m_uiUppercutTimer -= diff;
+            }
+
+            if (m_uiSummonTimer < diff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_NOXXION_SPAWNS_AURA) == CAST_OK)
+                {
+                    m_uiSummonTimer = 40000;
+                }
+            }
+            else
+            {
+                m_uiSummonTimer -= diff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_noxxionAI(pCreature);
+    }
+};
+
+struct aura_dummy_noxxion_spawns : public AuraScript
+{
+    aura_dummy_noxxion_spawns() : AuraScript("aura_dummy_noxxion_spawns") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() == SPELL_NOXXION_SPAWNS_AURA && pAura->GetEffIndex() == EFFECT_INDEX_0)
+        {
+            if (Creature* pTarget = (Creature*)pAura->GetTarget())
+            {
+                if (bApply)
+                {
+                    pTarget->CastSpell(pTarget, SPELL_NOXXION_SPAWNS_SUMMON, true);
+                    pTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                }
+                else
+                {
+                    pTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                }
+            }
+        }
+        return true;
+    }
+};
+
+void AddSC_boss_noxxion()
+{
+    Script* s;
+    s = new boss_noxxion();
+    s->RegisterSelf();
+    s = new aura_dummy_noxxion_spawns();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_noxxion";
+    //pNewScript->GetAI = &GetAI_boss_noxxion;
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_spell_aura_dummy_noxxion_spawns;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/maraudon/maraudon.cpp b/src/modules/SD3/scripts/kalimdor/maraudon/maraudon.cpp
new file mode 100644
index 000000000..1ce16094c
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/maraudon/maraudon.cpp
@@ -0,0 +1,40 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      maraudon
+ * SD%Complete: 0
+ * SDComment:   Placeholder
+ * SDCategory:  Maraudon
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+void AddSC_maraudon()
+{
+}
diff --git a/src/modules/SD3/scripts/kalimdor/maraudon/maraudon.h b/src/modules/SD3/scripts/kalimdor/maraudon/maraudon.h
new file mode 100644
index 000000000..62f28dc7b
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/maraudon/maraudon.h
@@ -0,0 +1,30 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_MARA_H
+#define DEF_MARA_H
+
+#endif
diff --git a/src/modules/SD3/scripts/kalimdor/moonglade.cpp b/src/modules/SD3/scripts/kalimdor/moonglade.cpp
new file mode 100644
index 000000000..8ad8f3f4b
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/moonglade.cpp
@@ -0,0 +1,1147 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Moonglade
+ * SD%Complete: 100
+ * SDComment: Quest support: 8736, 10965.
+ * SDCategory:  Moonglade
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_clintar_dw_spirit
+ * npc_keeper_remulos
+ * boss_eranikus
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "ObjectMgr.h"
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+/*######
+# npc_clintar_dw_spirit
+####*/
+
+enum
+{
+    SAY_START               = -1000280,
+    SAY_AGGRO_1             = -1000281,
+    SAY_AGGRO_2             = -1000282,
+    SAY_RELIC1              = -1000283,
+    SAY_RELIC2              = -1000284,
+    SAY_RELIC3              = -1000285,
+    SAY_END                 = -1000286,
+
+    QUEST_MERE_DREAM        = 10965,
+    SPELL_EMERALD_DREAM     = 39601,
+    NPC_CLINTAR_DW_SPIRIT   = 22916,
+    NPC_CLINTAR_SPIRIT      = 22901,
+    NPC_ASPECT_OF_RAVEN     = 22915,
+};
+
+struct npc_clintar_dw_spirit : public CreatureScript
+{
+    npc_clintar_dw_spirit() : CreatureScript("npc_clintar_dw_spirit") {}
+
+    struct npc_clintar_dw_spiritAI : public npc_escortAI
+    {
+        npc_clintar_dw_spiritAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 i) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            // visual details here probably need refinement
+            switch (i)
+            {
+            case 0:
+                DoScriptText(SAY_START, m_creature, pPlayer);
+                break;
+            case 13:
+                m_creature->HandleEmote(EMOTE_STATE_USESTANDING_NOSHEATHE);
+                break;
+            case 14:
+                DoScriptText(SAY_RELIC1, m_creature, pPlayer);
+                break;
+            case 26:
+                m_creature->HandleEmote(EMOTE_STATE_USESTANDING_NOSHEATHE);
+                break;
+            case 27:
+                DoScriptText(SAY_RELIC2, m_creature, pPlayer);
+                break;
+            case 31:
+                m_creature->SummonCreature(NPC_ASPECT_OF_RAVEN, 7465.321f, -3088.515f, 429.006f, 5.550f, TEMPSUMMON_TIMED_OOC_DESPAWN, 10000);
+                break;
+            case 35:
+                m_creature->HandleEmote(EMOTE_STATE_USESTANDING_NOSHEATHE);
+                break;
+            case 36:
+                DoScriptText(SAY_RELIC3, m_creature, pPlayer);
+                break;
+            case 49:
+                DoScriptText(SAY_END, m_creature, pPlayer);
+                pPlayer->TalkedToCreature(m_creature->GetEntry(), m_creature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void Aggro(Unit* /*who*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_AGGRO_1 : SAY_AGGRO_2, m_creature);
+        }
+
+        void Reset() override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                return;
+            }
+
+            // m_creature are expected to always be spawned, but not visible for player
+            // spell casted from quest_template.SrcSpell require this to be this way
+            // we handle the triggered spell to get a "hook" to our guy so he can be escorted on quest accept
+
+            if (CreatureInfo const* pTemp = GetCreatureTemplateStore(m_creature->GetEntry()))
+            {
+                m_creature->SetDisplayId(Creature::ChooseDisplayId(pTemp));
+            }
+
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            m_creature->SetVisibility(VISIBILITY_OFF);
+        }
+
+        void JustSummoned(Creature* summoned) override
+        {
+            summoned->AI()->AttackStart(m_creature);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_clintar_dw_spiritAI(pCreature);
+    }
+};
+
+// we expect this spell to be triggered from spell casted at questAccept
+struct spell_emerald_dream : public SpellScript
+{
+    spell_emerald_dream() : SpellScript("spell_emerald_dream") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (spellId == SPELL_EMERALD_DREAM && effIndex == EFFECT_INDEX_0)
+        {
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            if (pCaster->GetTypeId() != TYPEID_PLAYER || pCaster->HasAura(SPELL_EMERALD_DREAM))
+            {
+                return true;
+            }
+
+            if (pCreatureTarget->GetEntry() != NPC_CLINTAR_DW_SPIRIT)
+            {
+                return true;
+            }
+
+            if (CreatureInfo const* pTemp = GetCreatureTemplateStore(NPC_CLINTAR_SPIRIT))
+            {
+                pCreatureTarget->SetDisplayId(Creature::ChooseDisplayId(pTemp));
+            }
+            else
+            {
+                return true;
+            }
+
+            // done here, escort can start
+            npc_escortAI *pSpiritAI = (npc_escortAI*)pCreatureTarget->AI();
+            if (!pSpiritAI->HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                pCreatureTarget->SetVisibility(VISIBILITY_ON);
+                pCreatureTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                pSpiritAI->Start(false, pCaster && pCaster->GetTypeId() == TYPEID_PLAYER ? (Player*)pCaster : NULL);
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+        return true;
+    }
+};
+#endif
+
+/*######
+## npc_keeper_remulos
+######*/
+
+enum
+{
+    SPELL_CONJURE_RIFT          = 25813,            // summon Eranikus
+    SPELL_HEALING_TOUCH         = 23381,
+    SPELL_REGROWTH              = 20665,
+    SPELL_REJUVENATION          = 20664,
+    SPELL_STARFIRE              = 21668,
+    SPELL_ERANIKUS_REDEEMED     = 25846,            // transform Eranikus
+    // SPELL_MOONGLADE_TRANQUILITY = unk,            // spell which acts as a spotlight over Eranikus after he is redeemed
+
+    NPC_ERANIKUS_TYRANT         = 15491,
+    NPC_NIGHTMARE_PHANTASM      = 15629,            // shadows summoned during the event - should cast 17228 and 21307
+    NPC_REMULOS                 = 11832,
+    NPC_TYRANDE_WHISPERWIND     = 15633,            // appears with the priestess during the event to help the players - should cast healing spells
+    NPC_ELUNE_PRIESTESS         = 15634,
+
+    QUEST_NIGHTMARE_MANIFESTS   = 8736,
+
+    // yells -> in cronological order
+    SAY_REMULOS_INTRO_1         = -1000669,        // remulos intro
+    SAY_REMULOS_INTRO_2         = -1000670,
+    SAY_REMULOS_INTRO_3         = -1000671,
+    SAY_REMULOS_INTRO_4         = -1000672,
+    SAY_REMULOS_INTRO_5         = -1000673,
+
+    EMOTE_SUMMON_ERANIKUS       = -1000674,        // eranikus spawn - world emote
+    SAY_ERANIKUS_SPAWN          = -1000675,
+
+    SAY_REMULOS_TAUNT_1         = -1000676,        // eranikus and remulos chat
+    EMOTE_ERANIKUS_LAUGH        = -1000677,
+    SAY_ERANIKUS_TAUNT_2        = -1000678,
+    SAY_REMULOS_TAUNT_3         = -1000679,
+    SAY_ERANIKUS_TAUNT_4        = -1000680,
+
+    EMOTE_ERANIKUS_ATTACK       = -1000681,        // start attack
+    SAY_REMULOS_DEFEND_1        = -1000682,
+    SAY_REMULOS_DEFEND_2        = -1000683,
+    SAY_ERANIKUS_SHADOWS        = -1000684,
+    SAY_REMULOS_DEFEND_3        = -1000685,
+    SAY_ERANIKUS_ATTACK_1       = -1000686,
+    SAY_ERANIKUS_ATTACK_2       = -1000687,
+    SAY_ERANIKUS_ATTACK_3       = -1000688,
+    SAY_ERANIKUS_KILL           = -1000706,
+
+    SAY_TYRANDE_APPEAR          = -1000689,        // Tyrande appears
+    SAY_TYRANDE_HEAL            = -1000690,        // yelled by tyrande when healing is needed
+    SAY_TYRANDE_FORGIVEN_1      = -1000691,
+    SAY_TYRANDE_FORGIVEN_2      = -1000692,
+    SAY_TYRANDE_FORGIVEN_3      = -1000693,
+    SAY_ERANIKUS_DEFEAT_1       = -1000694,
+    SAY_ERANIKUS_DEFEAT_2       = -1000695,
+    SAY_ERANIKUS_DEFEAT_3       = -1000696,
+    EMOTE_ERANIKUS_REDEEM       = -1000697,        // world emote before WotLK
+
+    EMOTE_TYRANDE_KNEEL         = -1000698,
+    SAY_TYRANDE_REDEEMED        = -1000699,
+
+    SAY_REDEEMED_1              = -1000700,        // eranikus redeemed
+    SAY_REDEEMED_2              = -1000701,
+    SAY_REDEEMED_3              = -1000702,
+    SAY_REDEEMED_4              = -1000703,
+
+    SAY_REMULOS_OUTRO_1         = -1000704,        // remulos outro
+    SAY_REMULOS_OUTRO_2         = -1000705,
+
+    POINT_ID_ERANIKUS_FLIGHT    = 0,
+    POINT_ID_ERANIKUS_COMBAT    = 1,
+    POINT_ID_ERANIKUS_REDEEMED  = 2,
+
+    MAX_SHADOWS                 = 3,                // the max shadows summoned per turn
+    MAX_SUMMON_TURNS            = 10,               // There are about 10 summoned shade waves
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {NPC_REMULOS,           0,                   14000},    // target player
+    {SAY_REMULOS_INTRO_4,   NPC_REMULOS,         12000},
+    {SAY_REMULOS_INTRO_5,   NPC_REMULOS,         5000},
+    {SPELL_CONJURE_RIFT,    0,                   13000},    // conjure rift spell
+    {SAY_ERANIKUS_SPAWN,    NPC_ERANIKUS_TYRANT, 11000},
+    {SAY_REMULOS_TAUNT_1,   NPC_REMULOS,         5000},
+    {EMOTE_ERANIKUS_LAUGH,  NPC_ERANIKUS_TYRANT, 3000},
+    {SAY_ERANIKUS_TAUNT_2,  NPC_ERANIKUS_TYRANT, 10000},
+    {SAY_REMULOS_TAUNT_3,   NPC_REMULOS,         12000},
+    {SAY_ERANIKUS_TAUNT_4,  NPC_ERANIKUS_TYRANT, 6000},
+    {EMOTE_ERANIKUS_ATTACK, NPC_ERANIKUS_TYRANT, 7000},
+    {NPC_ERANIKUS_TYRANT,   0,                   0},        // target player - restart the escort and move Eranikus above the village
+    {SAY_REMULOS_DEFEND_2,  NPC_REMULOS,         6000},     // face Eranikus
+    {SAY_ERANIKUS_SHADOWS,  NPC_ERANIKUS_TYRANT, 4000},
+    {SAY_REMULOS_DEFEND_3,  NPC_REMULOS,         0},
+    {0, 0, 0},
+};
+
+struct EventLocations
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+static EventLocations aEranikusLocations[] =
+{
+    {7881.72f, -2651.23f, 493.29f, 0.40f},          // eranikus spawn loc
+    {7929.86f, -2574.88f, 505.35f, 0.0f},                 // eranikus flight move loc
+    {7912.98f, -2568.99f, 488.71f, 0.0f},                 // eranikus combat move loc
+    {7906.57f, -2565.63f, 488.39f, 0.0f},                 // eranikus redeemed loc
+};
+
+static EventLocations aTyrandeLocations[] =
+{
+    // Tyrande should appear along the pathway, but because of the missing pathfinding we'll summon here closer to Eranikus
+    {7948.89f, -2575.58f, 490.05f, 3.03f},          // tyrande spawn loc
+    {7888.32f, -2566.25f, 487.02f, 0.0f},                 // tyrande heal loc
+    {7901.83f, -2565.24f, 488.04f, 0.0f},                 // tyrande eranikus loc
+};
+
+static EventLocations aShadowsLocations[] =
+{
+    // Inside the house shades - first wave only
+    {7832.78f, -2604.57f, 489.29f, 0.0f},
+    {7826.68f, -2538.46f, 489.30f, 0.0f},
+    {7811.48f, -2573.20f, 488.49f, 0.0f},
+    // Outside shade points - basically only the first set of coords is used for the summoning; there is no solid proof of using the other coords
+    {7888.32f, -2566.25f, 487.02f, 0.0f},
+    {7946.12f, -2577.10f, 489.97f, 0.0f},
+    {7963.00f, -2492.03f, 487.84f, 0.0f}
+};
+
+struct npc_keeper_remulos : public CreatureScript
+{
+    npc_keeper_remulos() : CreatureScript("npc_keeper_remulos") {}
+
+    struct npc_keeper_remulosAI : public npc_escortAI, private DialogueHelper
+    {
+        npc_keeper_remulosAI(Creature* pCreature) : npc_escortAI(pCreature),
+        DialogueHelper(aIntroDialogue)
+        {
+        }
+
+        uint32 m_uiHealTimer;
+        uint32 m_uiStarfireTimer;
+        uint32 m_uiShadesummonTimer;
+        uint32 m_uiOutroTimer;
+
+        ObjectGuid m_eranikusGuid;
+
+        uint8 m_uiOutroPhase;
+        uint8 m_uiSummonCount;
+
+        bool m_bIsFirstWave;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiOutroTimer = 0;
+                m_uiOutroPhase = 0;
+                m_uiSummonCount = 0;
+
+                m_eranikusGuid.Clear();
+
+                m_uiShadesummonTimer = 0;
+                m_uiHealTimer = 10000;
+                m_uiStarfireTimer = 25000;
+
+                m_bIsFirstWave = true;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_ERANIKUS_TYRANT:
+                m_eranikusGuid = pSummoned->GetObjectGuid();
+                // Make Eranikus unattackable first
+                // ToDo: uncomment the fly effect when it will be possible to cancel it properly
+                // pSummoned->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+                pSummoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                pSummoned->SetLevitate(true);
+                break;
+            case NPC_NIGHTMARE_PHANTASM:
+                // ToDo: set faction to DB
+                pSummoned->setFaction(14);
+                pSummoned->AI()->AttackStart(m_creature);
+                break;
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || pSummoned->GetEntry() != NPC_ERANIKUS_TYRANT)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case POINT_ID_ERANIKUS_FLIGHT:
+                // Set Eranikus to face Remulos
+                pSummoned->SetFacingToObject(m_creature);
+                break;
+            case POINT_ID_ERANIKUS_COMBAT:
+                // Start attack
+                pSummoned->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                pSummoned->AI()->AttackStart(m_creature);
+                DoScriptText(SAY_ERANIKUS_ATTACK_2, pSummoned);
+                break;
+            }
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            // Make Eranikus evade in order to despawn all the summons
+            if (Creature* pEranikus = m_creature->GetMap()->GetCreature(m_eranikusGuid))
+            {
+                pEranikus->AI()->EnterEvadeMode();
+            }
+
+            npc_escortAI::JustDied(pKiller);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_REMULOS_INTRO_1, m_creature, pPlayer);
+                }
+                break;
+            case 1:
+                DoScriptText(SAY_REMULOS_INTRO_2, m_creature);
+                break;
+            case 13:
+                StartNextDialogueText(NPC_REMULOS);
+                SetEscortPaused(true);
+                break;
+            case 17:
+                StartNextDialogueText(SAY_REMULOS_DEFEND_2);
+                SetEscortPaused(true);
+                break;
+            case 18:
+                SetEscortPaused(true);
+                break;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+                DoHandleOutro(pInvoker->ToCreature());
+        }
+
+        Creature* GetSpeakerByEntry(uint32 uiEntry) override
+        {
+            switch (uiEntry)
+            {
+            case NPC_REMULOS:
+                return m_creature;
+            case NPC_ERANIKUS_TYRANT:
+                return m_creature->GetMap()->GetCreature(m_eranikusGuid);
+
+            default:
+                return NULL;
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case NPC_REMULOS:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_REMULOS_INTRO_3, m_creature, pPlayer);
+                }
+                break;
+            case SPELL_CONJURE_RIFT:
+                DoCastSpellIfCan(m_creature, SPELL_CONJURE_RIFT);
+                break;
+            case SAY_ERANIKUS_SPAWN:
+                // This big yellow emote was removed at some point in WotLK
+                // DoScriptText(EMOTE_SUMMON_ERANIKUS, pEranikus);
+                break;
+            case NPC_ERANIKUS_TYRANT:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_REMULOS_DEFEND_1, m_creature, pPlayer);
+                }
+                if (Creature* pEranikus = m_creature->GetMap()->GetCreature(m_eranikusGuid))
+                {
+                    pEranikus->GetMotionMaster()->MovePoint(POINT_ID_ERANIKUS_FLIGHT, aEranikusLocations[1].m_fX, aEranikusLocations[1].m_fY, aEranikusLocations[1].m_fZ);
+                }
+                SetEscortPaused(false);
+                break;
+            case SAY_REMULOS_DEFEND_2:
+                if (Creature* pEranikus = m_creature->GetMap()->GetCreature(m_eranikusGuid))
+                {
+                    m_creature->SetFacingToObject(pEranikus);
+                }
+                break;
+            case SAY_REMULOS_DEFEND_3:
+                SetEscortPaused(true);
+                m_uiShadesummonTimer = 5000;
+                break;
+            }
+        }
+
+        void DoHandleOutro(Creature* pTarget)
+        {
+            if (Player* pPlayer = GetPlayerForEscort())
+            {
+                pPlayer->GroupEventHappens(QUEST_NIGHTMARE_MANIFESTS, pTarget);
+            }
+
+            m_uiOutroTimer = 3000;
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (m_uiOutroTimer)
+            {
+                if (m_uiOutroTimer <= uiDiff)
+                {
+                    switch (m_uiOutroPhase)
+                    {
+                    case 0:
+                        DoScriptText(SAY_REMULOS_OUTRO_1, m_creature);
+                        m_uiOutroTimer = 3000;
+                        break;
+                    case 1:
+                        // Despawn Remulos after the outro is finished - he will respawn automatically at his home position after a few min
+                        DoScriptText(SAY_REMULOS_OUTRO_2, m_creature);
+                        m_creature->SetRespawnDelay(1 * MINUTE);
+                        m_creature->ForcedDespawn(3000);
+                        m_uiOutroTimer = 0;
+                        break;
+                    }
+                    ++m_uiOutroPhase;
+                }
+                else
+                {
+                    m_uiOutroTimer -= uiDiff;
+                }
+            }
+
+            // during the battle
+            if (m_uiShadesummonTimer)
+            {
+                if (m_uiShadesummonTimer <= uiDiff)
+                {
+                    // do this yell only first time
+                    if (m_bIsFirstWave)
+                    {
+                        // summon 3 shades inside the house
+                        for (uint8 i = 0; i < MAX_SHADOWS; ++i)
+                        {
+                            m_creature->SummonCreature(NPC_NIGHTMARE_PHANTASM, aShadowsLocations[i].m_fX, aShadowsLocations[i].m_fY, aShadowsLocations[i].m_fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                        }
+
+                        if (Creature* pEranikus = m_creature->GetMap()->GetCreature(m_eranikusGuid))
+                        {
+                            DoScriptText(SAY_ERANIKUS_ATTACK_1, pEranikus);
+                        }
+
+                        ++m_uiSummonCount;
+                        SetEscortPaused(false);
+                        m_bIsFirstWave = false;
+                    }
+
+                    // Summon 3 shades per turn until the maximum summon turns are reached
+                    float fX, fY, fZ;
+                    // Randomize the summon point
+                    uint8 uiSummonPoint = roll_chance_i(70) ? uint32(MAX_SHADOWS) : urand(MAX_SHADOWS + 1, MAX_SHADOWS + 2);
+
+                    if (m_uiSummonCount < MAX_SUMMON_TURNS)
+                    {
+                        for (uint8 i = 0; i < MAX_SHADOWS; ++i)
+                        {
+                            m_creature->GetRandomPoint(aShadowsLocations[uiSummonPoint].m_fX, aShadowsLocations[uiSummonPoint].m_fY, aShadowsLocations[uiSummonPoint].m_fZ, 10.0f, fX, fY, fZ);
+                            m_creature->SummonCreature(NPC_NIGHTMARE_PHANTASM, fX, fY, fZ, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                        }
+
+                        ++m_uiSummonCount;
+                    }
+
+                    // If all the shades were summoned then set Eranikus in combat
+                    // We don't count the dead shades, because the boss is usually set in combat before all shades are dead
+                    if (m_uiSummonCount == MAX_SUMMON_TURNS)
+                    {
+                        m_uiShadesummonTimer = 0;
+
+                        if (Creature* pEranikus = m_creature->GetMap()->GetCreature(m_eranikusGuid))
+                        {
+                            pEranikus->SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0);
+                            pEranikus->SetLevitate(false);
+                            pEranikus->GetMotionMaster()->MovePoint(POINT_ID_ERANIKUS_COMBAT, aEranikusLocations[2].m_fX, aEranikusLocations[2].m_fY, aEranikusLocations[2].m_fZ);
+                        }
+                    }
+                    else
+                    {
+                        m_uiShadesummonTimer = urand(20000, 30000);
+                    }
+                }
+                else
+                {
+                    m_uiShadesummonTimer -= uiDiff;
+                }
+            }
+
+            // Combat spells
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiHealTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(DEFAULT_VISIBILITY_DISTANCE))
+                {
+                    switch (urand(0, 2))
+                    {
+                    case 0:
+                        DoCastSpellIfCan(pTarget, SPELL_HEALING_TOUCH);
+                        break;
+                    case 1:
+                        DoCastSpellIfCan(pTarget, SPELL_REJUVENATION);
+                        break;
+                    case 2:
+                        DoCastSpellIfCan(pTarget, SPELL_REGROWTH);
+                        break;
+                    }
+                }
+                m_uiHealTimer = 10000;
+            }
+            else
+            {
+                m_uiHealTimer -= uiDiff;
+            }
+
+            if (m_uiStarfireTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_STARFIRE) == CAST_OK)
+                    {
+                        m_uiStarfireTimer = 20000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiStarfireTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_keeper_remulosAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_NIGHTMARE_MANIFESTS)
+        {
+            if (npc_keeper_remulosAI* pEscortAI = dynamic_cast<npc_keeper_remulosAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(true, pPlayer, pQuest);
+            }
+
+            return true;
+        }
+
+        // Return false for other quests in order to handle DB scripts. Example: quest 8447
+        return false;
+    }
+};
+
+struct spell_conjure_rift : public SpellScript
+{
+    spell_conjure_rift() : SpellScript("spell_conjure_rift") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* /*pCreatureTarget*/, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_CONJURE_RIFT && uiEffIndex == EFFECT_INDEX_0)
+        {
+            pCaster->SummonCreature(NPC_ERANIKUS_TYRANT, aEranikusLocations[0].m_fX, aEranikusLocations[0].m_fY, aEranikusLocations[0].m_fZ, aEranikusLocations[0].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## boss_eranikus
+######*/
+
+enum
+{
+    NPC_KEEPER_REMULOS          = 11832,
+
+    SPELL_ACID_BREATH           = 24839,
+    SPELL_NOXIOUS_BREATH        = 24818,
+    SPELL_SHADOWBOLT_VOLLEY     = 25586,
+    SPELL_ARCANE_CHANNELING     = 23017,        // used by Tyrande - not sure if it's the right id
+
+    FACTION_FRIENDLY            = 35,
+    MAX_PRIESTESS               = 7,
+
+    POINT_ID_TYRANDE_HEAL       = 0,
+    POINT_ID_TYRANDE_ABSOLUTION = 1,
+};
+
+struct boss_eranikus : public CreatureScript
+{
+    boss_eranikus() : CreatureScript("boss_eranikus") {}
+
+    struct boss_eranikusAI : public ScriptedAI
+    {
+        boss_eranikusAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiAcidBreathTimer;
+        uint32 m_uiNoxiousBreathTimer;
+        uint32 m_uiShadowboltVolleyTimer;
+        uint32 m_uiEventTimer;
+        uint32 m_uiTyrandeMoveTimer;
+
+        uint8 m_uiEventPhase;
+        uint8 m_uiTyrandeMovePoint;
+        uint8 m_uiHealthCheck;
+
+        ObjectGuid m_remulosGuid;
+        ObjectGuid m_tyrandeGuid;
+        GuidList m_lPriestessList;
+
+        void Reset() override
+        {
+            m_uiAcidBreathTimer = 10000;
+            m_uiNoxiousBreathTimer = 3000;
+            m_uiShadowboltVolleyTimer = 5000;
+            m_uiTyrandeMoveTimer = 0;
+
+            m_remulosGuid.Clear();
+            m_tyrandeGuid.Clear();
+
+            m_uiHealthCheck = 85;
+            m_uiEventPhase = 0;
+            m_uiEventTimer = 0;
+
+            // For some reason the boss doesn't move in combat
+            SetCombatMovement(false);
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (m_creature->GetHealthPercent() < 20.0f)
+            {
+                m_creature->RemoveAllAurasOnEvade();
+                m_creature->DeleteThreatList();
+                m_creature->CombatStop(true);
+                m_creature->LoadCreatureAddon(true);
+
+                m_creature->SetLootRecipient(NULL);
+
+                // Get Remulos guid and make him stop summoning shades
+                if (Creature* pRemulos = GetClosestCreatureWithEntry(m_creature, NPC_REMULOS, 50.0f))
+                {
+                    m_remulosGuid = pRemulos->GetObjectGuid();
+                    pRemulos->AI()->EnterEvadeMode();
+                }
+
+                // Despawn the priestess
+                DoDespawnSummoned();
+
+                // redeem eranikus
+                m_uiEventTimer = 5000;
+                m_creature->setFaction(FACTION_FRIENDLY);
+            }
+            else
+            {
+                // There may be a core issue related to the reached home function for summoned creatures so we are cleaning things up here
+                // if the creature evades while the event is in progress then we despawn all the summoned, including himself
+                m_creature->ForcedDespawn();
+                DoDespawnSummoned();
+
+                if (Creature* pTyrande = m_creature->GetMap()->GetCreature(m_tyrandeGuid))
+                {
+                    pTyrande->ForcedDespawn();
+                }
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            DoScriptText(SAY_ERANIKUS_KILL, m_creature);
+        }
+
+        void DoSummonHealers()
+        {
+            float fX, fY, fZ;
+            for (uint8 j = 0; j < MAX_PRIESTESS; ++j)
+            {
+                m_creature->GetRandomPoint(aTyrandeLocations[0].m_fX, aTyrandeLocations[0].m_fY, aTyrandeLocations[0].m_fZ, 10.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_ELUNE_PRIESTESS, fX, fY, fZ, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_TYRANDE_WHISPERWIND:
+                m_tyrandeGuid = pSummoned->GetObjectGuid();
+                pSummoned->SetWalk(false);
+                pSummoned->GetMotionMaster()->MovePoint(POINT_ID_TYRANDE_HEAL, aTyrandeLocations[1].m_fX, aTyrandeLocations[1].m_fY, aTyrandeLocations[1].m_fZ);
+                break;
+            case NPC_ELUNE_PRIESTESS:
+                m_lPriestessList.push_back(pSummoned->GetObjectGuid());
+                float fX, fY, fZ;
+                pSummoned->SetWalk(false);
+                m_creature->GetRandomPoint(aTyrandeLocations[1].m_fX, aTyrandeLocations[1].m_fY, aTyrandeLocations[1].m_fZ, 10.0f, fX, fY, fZ);
+                pSummoned->GetMotionMaster()->MovePoint(POINT_ID_TYRANDE_HEAL, fX, fY, fZ);
+                break;
+            }
+        }
+
+        void DoDespawnSummoned()
+        {
+            for (GuidList::const_iterator itr = m_lPriestessList.begin(); itr != m_lPriestessList.end(); ++itr)
+            {
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pTemp->ForcedDespawn();
+                }
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case POINT_ID_TYRANDE_HEAL:
+                if (pSummoned->GetEntry() == NPC_TYRANDE_WHISPERWIND)
+                {
+                    // Unmont, yell and prepare to channel the spell on Eranikus
+                    DoScriptText(SAY_TYRANDE_HEAL, pSummoned);
+                    pSummoned->Unmount();
+                    m_uiTyrandeMoveTimer = 5000;
+                }
+                // Unmount the priestess - unk what is their exact purpose (maybe healer)
+                else if (pSummoned->GetEntry() == NPC_ELUNE_PRIESTESS)
+                {
+                    pSummoned->Unmount();
+                }
+                break;
+            case POINT_ID_TYRANDE_ABSOLUTION:
+                if (pSummoned->GetEntry() == NPC_TYRANDE_WHISPERWIND)
+                {
+                    pSummoned->CastSpell(pSummoned, SPELL_ARCANE_CHANNELING, false);
+                    DoScriptText(SAY_TYRANDE_FORGIVEN_1, pSummoned);
+                }
+                break;
+            }
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || uiPointId != POINT_ID_ERANIKUS_REDEEMED)
+            {
+                return;
+            }
+
+            DoScriptText(SAY_REDEEMED_1, m_creature);
+            m_uiEventTimer = 11000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiEventTimer)
+            {
+                if (m_uiEventTimer <= uiDiff)
+                {
+                    switch (m_uiEventPhase)
+                    {
+                    case 0:
+                        // Eranikus is redeemed - make Tyrande kneel and stop casting
+                        if (Creature* pTyrande = m_creature->GetMap()->GetCreature(m_tyrandeGuid))
+                        {
+                            pTyrande->InterruptNonMeleeSpells(false);
+                            pTyrande->SetStandState(UNIT_STAND_STATE_KNEEL);
+                            DoScriptText(EMOTE_TYRANDE_KNEEL, pTyrande);
+                        }
+                        if (Creature* pRemulos = m_creature->GetMap()->GetCreature(m_remulosGuid))
+                        {
+                            pRemulos->SetFacingToObject(m_creature);
+                        }
+                        // Note: this emote was a world wide yellow emote before WotLK
+                        DoScriptText(EMOTE_ERANIKUS_REDEEM, m_creature);
+                        // DoCastSpellIfCan(m_creature, SPELL_MOONGLADE_TRANQUILITY);        // spell id unk for the moment
+                        m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+                        m_uiEventTimer = 5000;
+                        break;
+                    case 1:
+                        if (Creature* pTyrande = m_creature->GetMap()->GetCreature(m_tyrandeGuid))
+                        {
+                            DoScriptText(SAY_TYRANDE_REDEEMED, pTyrande);
+                        }
+                        m_uiEventTimer = 6000;
+                        break;
+                    case 2:
+                        // Transform Eranikus into elf
+                        DoCastSpellIfCan(m_creature, SPELL_ERANIKUS_REDEEMED);
+                        m_uiEventTimer = 5000;
+                        break;
+                    case 3:
+                        // Move Eranikus in front of Tyrande
+                        m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                        m_creature->SetWalk(true);
+                        m_creature->GetMotionMaster()->MovePoint(POINT_ID_ERANIKUS_REDEEMED, aEranikusLocations[3].m_fX, aEranikusLocations[3].m_fY, aEranikusLocations[3].m_fZ);
+                        m_uiEventTimer = 0;
+                        break;
+                    case 4:
+                        DoScriptText(SAY_REDEEMED_2, m_creature);
+                        m_uiEventTimer = 11000;
+                        break;
+                    case 5:
+                        DoScriptText(SAY_REDEEMED_3, m_creature);
+                        m_uiEventTimer = 13000;
+                        break;
+                    case 6:
+                        DoScriptText(SAY_REDEEMED_4, m_creature);
+                        m_uiEventTimer = 7000;
+                        break;
+                    case 7:
+                        // Complete Quest and end event
+                        if (Creature* pTyrande = m_creature->GetMap()->GetCreature(m_tyrandeGuid))
+                        {
+                            pTyrande->SetStandState(UNIT_STAND_STATE_STAND);
+                            pTyrande->ForcedDespawn(9000);
+                        }
+                        if (Creature* pRemulos = m_creature->GetMap()->GetCreature(m_remulosGuid))
+                        {
+                            pRemulos->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pRemulos);//->DoHandleOutro(m_creature);
+                        }
+                        m_creature->HandleEmote(EMOTE_ONESHOT_BOW);
+                        m_creature->ForcedDespawn(2000);
+                        break;
+                    }
+                    ++m_uiEventPhase;
+                }
+                else
+                {
+                    m_uiEventTimer -= uiDiff;
+                }
+            }
+
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Move Tyrande after she is summoned
+            if (m_uiTyrandeMoveTimer)
+            {
+                if (m_uiTyrandeMoveTimer <= uiDiff)
+                {
+                    if (Creature* pTyrande = m_creature->GetMap()->GetCreature(m_tyrandeGuid))
+                    {
+                        pTyrande->GetMotionMaster()->MovePoint(POINT_ID_TYRANDE_ABSOLUTION, aTyrandeLocations[2].m_fX, aTyrandeLocations[2].m_fY, aTyrandeLocations[2].m_fZ);
+                    }
+                    m_uiTyrandeMoveTimer = 0;
+                }
+                else
+                {
+                    m_uiTyrandeMoveTimer -= uiDiff;
+                }
+            }
+
+            // Not sure if this should be handled by health percent, but this is the only reasonable way
+            if (m_creature->GetHealthPercent() < m_uiHealthCheck)
+            {
+                switch (m_uiHealthCheck)
+                {
+                case 85:
+                    DoScriptText(SAY_ERANIKUS_ATTACK_3, m_creature);
+                    // Here Tyrande only yells but she doesn't appear anywhere - we summon here for 1 second just to handle the yell
+                    if (Creature* pTyrande = m_creature->SummonCreature(NPC_TYRANDE_WHISPERWIND, aTyrandeLocations[0].m_fX, aTyrandeLocations[0].m_fY, aTyrandeLocations[0].m_fZ, 0, TEMPSUMMON_TIMED_DESPAWN, 1000))
+                    {
+                        DoScriptText(SAY_TYRANDE_APPEAR, pTyrande);
+                    }
+                    m_uiHealthCheck = 75;
+                    break;
+                case 75:
+                    // Eranikus yells again
+                    DoScriptText(SAY_ERANIKUS_ATTACK_3, m_creature);
+                    m_uiHealthCheck = 50;
+                    break;
+                case 50:
+                    // Summon Tyrande - she enters the fight this time
+                    m_creature->SummonCreature(NPC_TYRANDE_WHISPERWIND, aTyrandeLocations[0].m_fX, aTyrandeLocations[0].m_fY, aTyrandeLocations[0].m_fZ, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                    m_uiHealthCheck = 35;
+                    break;
+                case 35:
+                    // Summon the priestess
+                    DoSummonHealers();
+                    DoScriptText(SAY_ERANIKUS_DEFEAT_1, m_creature);
+                    m_uiHealthCheck = 31;
+                    break;
+                case 31:
+                    if (Creature* pTyrande = m_creature->GetMap()->GetCreature(m_tyrandeGuid))
+                    {
+                        DoScriptText(SAY_TYRANDE_FORGIVEN_2, pTyrande);
+                    }
+                    m_uiHealthCheck = 27;
+                    break;
+                case 27:
+                    if (Creature* pTyrande = m_creature->GetMap()->GetCreature(m_tyrandeGuid))
+                    {
+                        DoScriptText(SAY_TYRANDE_FORGIVEN_3, pTyrande);
+                    }
+                    m_uiHealthCheck = 25;
+                    break;
+                case 25:
+                    DoScriptText(SAY_ERANIKUS_DEFEAT_2, m_creature);
+                    m_uiHealthCheck = 20;
+                    break;
+                case 20:
+                    // Eranikus is redeemed - stop the fight
+                    DoScriptText(SAY_ERANIKUS_DEFEAT_3, m_creature);
+                    m_creature->AI()->EnterEvadeMode();
+                    m_uiHealthCheck = 0;
+                    break;
+                }
+            }
+
+            // Combat spells
+            if (m_uiAcidBreathTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ACID_BREATH) == CAST_OK)
+                {
+                    m_uiAcidBreathTimer = 15000;
+                }
+            }
+            else
+            {
+                m_uiAcidBreathTimer -= uiDiff;
+            }
+
+            if (m_uiNoxiousBreathTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_NOXIOUS_BREATH) == CAST_OK)
+                {
+                    m_uiNoxiousBreathTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiNoxiousBreathTimer -= uiDiff;
+            }
+
+            if (m_uiShadowboltVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHADOWBOLT_VOLLEY) == CAST_OK)
+                {
+                    m_uiShadowboltVolleyTimer = 25000;
+                }
+            }
+            else
+            {
+                m_uiShadowboltVolleyTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_eranikusAI(pCreature);
+    }
+};
+
+void AddSC_moonglade()
+{
+    Script* s;
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    s = new npc_clintar_dw_spirit();
+    s->RegisterSelf();
+    s = new spell_emerald_dream();
+    s->RegisterSelf();
+#endif
+    s = new npc_keeper_remulos();
+    s->RegisterSelf();
+    s = new boss_eranikus();
+    s->RegisterSelf();
+    s = new spell_conjure_rift();
+    s->RegisterSelf();
+
+
+//#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_clintar_dw_spirit";
+    //pNewScript->GetAI = &GetAI_npc_clintar_dw_spirit;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_clintar_dw_spirit;
+    //pNewScript->RegisterSelf();
+//#endif
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_keeper_remulos";
+    //pNewScript->GetAI = &GetAI_npc_keeper_remulos;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_keeper_remulos;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_conjure_rift;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_eranikus";
+    //pNewScript->GetAI = &GetAI_boss_eranikus;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/mulgore.cpp b/src/modules/SD3/scripts/kalimdor/mulgore.cpp
new file mode 100644
index 000000000..d8e17e87d
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/mulgore.cpp
@@ -0,0 +1,219 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Mulgore
+ * SD%Complete: 100
+ * SDComment: Quest support: 11129.
+ * SDCategory:  Mulgore
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_kyle_the_frenzied
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+/*######
+# npc_kyle_the_frenzied
+######*/
+
+enum
+{
+    EMOTE_SEE_LUNCH         = -1000340,
+    EMOTE_EAT_LUNCH         = -1000341,
+    EMOTE_DANCE             = -1000342,
+
+    SPELL_LUNCH             = 42222,
+    NPC_KYLE_FRENZIED       = 23616,
+    NPC_KYLE_FRIENDLY       = 23622,
+    POINT_ID                = 1
+};
+
+struct npc_kyle_the_frenzied : public CreatureScript
+{
+    npc_kyle_the_frenzied() : CreatureScript("npc_kyle_the_frenzied") {}
+
+    struct npc_kyle_the_frenziedAI : public ScriptedAI
+    {
+        npc_kyle_the_frenziedAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        bool m_bEvent;
+        bool m_bIsMovingToLunch;
+        ObjectGuid m_playerGuid;
+        uint32 m_uiEventTimer;
+        uint8 m_uiEventPhase;
+
+        void Reset() override
+        {
+            m_bEvent = false;
+            m_bIsMovingToLunch = false;
+            m_playerGuid.Clear();
+            m_uiEventTimer = 5000;
+            m_uiEventPhase = 0;
+
+            if (m_creature->GetEntry() == NPC_KYLE_FRIENDLY)
+            {
+                m_creature->UpdateEntry(NPC_KYLE_FRENZIED);
+            }
+        }
+
+        void SpellHit(Unit* pCaster, SpellEntry const* pSpell) override
+        {
+            if (!m_creature->getVictim() && !m_bEvent && pSpell->Id == SPELL_LUNCH)
+            {
+                if (pCaster->GetTypeId() == TYPEID_PLAYER)
+                {
+                    m_playerGuid = pCaster->GetObjectGuid();
+                }
+
+                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
+                {
+                    m_creature->GetMotionMaster()->MovementExpired();
+                    m_creature->GetMotionMaster()->MoveIdle();
+                    m_creature->StopMoving();
+                }
+
+                m_bEvent = true;
+                DoScriptText(EMOTE_SEE_LUNCH, m_creature);
+                m_creature->HandleEmote(EMOTE_ONESHOT_CREATURE_SPECIAL);
+            }
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || !m_bEvent)
+            {
+                return;
+            }
+
+            if (uiPointId == POINT_ID)
+            {
+                m_bIsMovingToLunch = false;
+            }
+        }
+
+        void UpdateAI(const uint32 diff) override
+        {
+            if (m_bEvent)
+            {
+                if (m_bIsMovingToLunch)
+                {
+                    return;
+                }
+
+                if (m_uiEventTimer < diff)
+                {
+                    m_uiEventTimer = 5000;
+                    ++m_uiEventPhase;
+
+                    switch (m_uiEventPhase)
+                    {
+                    case 1:
+                        if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                        {
+                            GameObject* pGo = pPlayer->GetGameObject(SPELL_LUNCH);
+
+                            // Workaround for broken function GetGameObject
+                            if (!pGo)
+                            {
+                                const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_LUNCH);
+#if defined (CATA)
+                                uint32 uiGameobjectEntry = pSpell->GetEffectMiscValue(EFFECT_INDEX_1);
+#else
+                                uint32 uiGameobjectEntry = pSpell->EffectMiscValue[EFFECT_INDEX_1];
+#endif
+                                pGo = GetClosestGameObjectWithEntry(pPlayer, uiGameobjectEntry, 2 * INTERACTION_DISTANCE);
+                            }
+
+                            if (pGo)
+                            {
+                                m_bIsMovingToLunch = true;
+
+                                float fX, fY, fZ;
+                                pGo->GetContactPoint(m_creature, fX, fY, fZ, CONTACT_DISTANCE);
+
+                                m_creature->GetMotionMaster()->MovePoint(POINT_ID, fX, fY, fZ);
+                            }
+                        }
+                        break;
+                    case 2:
+                        DoScriptText(EMOTE_EAT_LUNCH, m_creature);
+                        m_creature->HandleEmote(EMOTE_STATE_USESTANDING);
+                        break;
+                    case 3:
+                        if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                        {
+                            pPlayer->TalkedToCreature(m_creature->GetEntry(), m_creature->GetObjectGuid());
+                        }
+
+                        m_creature->UpdateEntry(NPC_KYLE_FRIENDLY);
+                        break;
+                    case 4:
+                        m_uiEventTimer = 30000;
+                        DoScriptText(EMOTE_DANCE, m_creature);
+                        m_creature->HandleEmote(EMOTE_STATE_DANCESPECIAL);
+                        break;
+                    case 5:
+                        m_creature->HandleEmote(EMOTE_STATE_NONE);
+                        Reset();
+                        m_creature->GetMotionMaster()->Clear();
+                        break;
+                    }
+                }
+                else
+                {
+                    m_uiEventTimer -= diff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kyle_the_frenziedAI(pCreature);
+    }
+};
+#endif
+void AddSC_mulgore()
+{
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    Script* s;
+
+    s = new npc_kyle_the_frenzied();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kyle_the_frenzied";
+    //pNewScript->GetAI = &GetAI_npc_kyle_the_frenzied;
+    //pNewScript->RegisterSelf();
+#endif
+}
diff --git a/src/modules/SD3/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp b/src/modules/SD3/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
new file mode 100644
index 000000000..49b1cfbb8
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
@@ -0,0 +1,786 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Onyxia
+ * SD%Complete: 85
+ * SDComment:   Phase 3 need additional code. The spawning Whelps need GO-Support.
+ * SDCategory:  Onyxia's Lair
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "onyxias_lair.h"
+
+enum
+{
+    SAY_AGGRO                   = -1249000,
+    SAY_KILL                    = -1249001,
+    SAY_PHASE_2_TRANS           = -1249002,
+    SAY_PHASE_3_TRANS           = -1249003,
+    EMOTE_BREATH                = -1249004,
+
+    SPELL_WINGBUFFET            = 18500,
+#if defined (WOTLK) || defined (CATA)
+    SPELL_WINGBUFFET_H          = 69293,
+#endif
+    SPELL_FLAMEBREATH           = 18435,
+#if defined (WOTLK) || defined (CATA)
+    SPELL_FLAMEBREATH_H         = 68970,
+#endif
+#if defined (CLASSIC) || defined (TBC)
+    SPELL_CLEAVE                = 19983,
+    SPELL_TAILSWEEP             = 15847,
+#endif
+#if defined (WOTLK) || defined (CATA)
+    SPELL_CLEAVE                = 68868,
+    SPELL_TAILSWEEP             = 68867,
+#endif
+#if defined (WOTLK) || defined (CATA)
+    SPELL_TAILSWEEP_H           = 69286,
+#endif
+    SPELL_KNOCK_AWAY            = 19633,
+    SPELL_FIREBALL              = 18392,
+#if defined (WOTLK) || defined (CATA)
+    SPELL_FIREBALL_H            = 68926,
+#endif
+
+    // Not much choise about these. We have to make own defintion on the direction/start-end point
+    SPELL_BREATH_NORTH_TO_SOUTH = 17086,                    // 20x in "array"
+    SPELL_BREATH_SOUTH_TO_NORTH = 18351,                    // 11x in "array"
+
+    SPELL_BREATH_EAST_TO_WEST   = 18576,                    // 7x in "array"
+    SPELL_BREATH_WEST_TO_EAST   = 18609,                    // 7x in "array"
+
+    SPELL_BREATH_SE_TO_NW       = 18564,                    // 12x in "array"
+    SPELL_BREATH_NW_TO_SE       = 18584,                    // 12x in "array"
+    SPELL_BREATH_SW_TO_NE       = 18596,                    // 12x in "array"
+    SPELL_BREATH_NE_TO_SW       = 18617,                    // 12x in "array"
+
+    SPELL_VISUAL_BREATH_A       = 4880,                     // Only and all of the above Breath spells (and their triggered spells) have these visuals
+    SPELL_VISUAL_BREATH_B       = 4919,
+
+    SPELL_BREATH_ENTRANCE       = 21131,                    // 8x in "array", different initial cast than the other arrays
+
+    SPELL_BELLOWINGROAR         = 18431,
+    SPELL_HEATED_GROUND         = 22191,                    // Prevent players from hiding in the tunnels when it is time for Onyxia's breath
+
+    SPELL_SUMMONWHELP           = 17646,                    // TODO this spell is only a summon spell, but would need a spell to activate the eggs
+#if defined (WOTLK) || defined (CATA)
+    SPELL_SUMMON_LAIR_GUARD     = 68968,
+#endif
+
+    MAX_WHELPS_PER_PACK         = 40,
+
+    POINT_ID_NORTH              = 0,
+    POINT_ID_SOUTH              = 4,
+    NUM_MOVE_POINT              = 8,
+    POINT_ID_LIFTOFF            = 1 + NUM_MOVE_POINT,
+    POINT_ID_IN_AIR             = 2 + NUM_MOVE_POINT,
+    POINT_ID_INIT_NORTH         = 3 + NUM_MOVE_POINT,
+    POINT_ID_LAND               = 4 + NUM_MOVE_POINT,
+
+    PHASE_START                 = 1,                        // Health above 65%, normal ground abilities
+    PHASE_BREATH                = 2,                        // Breath phase (while health above 40%)
+    PHASE_END                   = 3,                        // normal ground abilities + some extra abilities
+    PHASE_BREATH_POST           = 4,                        // Landing and initial fearing
+    PHASE_TO_LIFTOFF            = 5,                        // Movement to south-entrance of room and liftoff there
+    PHASE_BREATH_PRE            = 6,                        // lifting off + initial flying to north side (summons also first pack of whelps)
+
+};
+
+struct OnyxiaMove
+{
+    uint32 uiSpellId;
+    float fX, fY, fZ;
+};
+
+static const OnyxiaMove aMoveData[NUM_MOVE_POINT] =
+{
+    {SPELL_BREATH_NORTH_TO_SOUTH,  24.16332f, -216.0808f, -58.98009f},  // north (coords verified in wotlk)
+    {SPELL_BREATH_NE_TO_SW,        10.2191f,  -247.912f,  -60.896f},    // north-east
+    {SPELL_BREATH_EAST_TO_WEST,   -15.00505f, -244.4841f, -60.40087f},  // east (coords verified in wotlk)
+    {SPELL_BREATH_SE_TO_NW,       -63.5156f,  -240.096f,  -60.477f},    // south-east
+    {SPELL_BREATH_SOUTH_TO_NORTH, -66.3589f,  -215.928f,  -64.23904f},  // south (coords verified in wotlk)
+    {SPELL_BREATH_SW_TO_NE,       -58.2509f,  -189.020f,  -60.790f},    // south-west
+    {SPELL_BREATH_WEST_TO_EAST,   -16.70134f, -181.4501f, -61.98513f},  // west (coords verified in wotlk)
+    {SPELL_BREATH_NW_TO_SE,        12.26687f, -181.1084f, -60.23914f},  // north-west (coords verified in wotlk)
+};
+
+static const float afSpawnLocations[3][3] =
+{
+    { -30.127f, -254.463f, -89.440f},                       // whelps
+    { -30.817f, -177.106f, -89.258f},                       // whelps
+#if defined (WOTLK) || defined (CATA)
+    { -126.57f, -214.609f, -71.446f}                        // guardians
+#endif
+};
+
+struct boss_onyxia : public CreatureScript
+{
+    boss_onyxia() : CreatureScript("boss_onyxia") {}
+
+    struct boss_onyxiaAI : public ScriptedAI
+    {
+        boss_onyxiaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+#if defined (WOTLK) || defined (CATA)
+    bool m_bIsRegularMode;
+#endif
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+
+        uint32 m_uiFlameBreathTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiTailSweepTimer;
+        uint32 m_uiWingBuffetTimer;
+        uint32 m_uiCheckInLairTimer;
+
+        uint32 m_uiMovePoint;
+        uint32 m_uiMovementTimer;
+
+        uint32 m_uiFireballTimer;
+        uint32 m_uiSummonWhelpsTimer;
+        uint32 m_uiBellowingRoarTimer;
+        uint32 m_uiWhelpTimer;
+#if defined (WOTLK) || defined (CATA)
+    uint32 m_uiSummonGuardTimer;
+#endif
+
+        uint8 m_uiSummonCount;
+
+        bool m_bIsSummoningWhelps;
+
+        uint32 m_uiPhaseTimer;
+
+        void Reset() override
+        {
+            if (!IsCombatMovement())
+            {
+                SetCombatMovement(true);
+            }
+
+            m_uiPhase = PHASE_START;
+
+            m_uiFlameBreathTimer = urand(10000, 20000);
+            m_uiTailSweepTimer = urand(15000, 20000);
+            m_uiCleaveTimer = urand(2000, 5000);
+            m_uiWingBuffetTimer = urand(10000, 20000);
+            m_uiCheckInLairTimer = 3000;
+
+            m_uiMovePoint = POINT_ID_NORTH;                     // First point reached by the flying Onyxia
+            m_uiMovementTimer = 25000;
+
+            m_uiFireballTimer = 1000;
+            m_uiSummonWhelpsTimer = 60000;
+            m_uiBellowingRoarTimer = 30000;
+            m_uiWhelpTimer = 1000;
+#if defined (WOTLK) || defined (CATA)
+        m_uiSummonGuardTimer = 15000;
+#endif
+
+            m_uiSummonCount = 0;
+
+            m_bIsSummoningWhelps = false;
+
+            m_uiPhaseTimer = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ONYXIA, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            // in case evade in phase 2, see comments for hack where phase 2 is set
+            m_creature->SetLevitate(false);
+            m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ONYXIA, FAIL);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ONYXIA, DONE);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            if (Creature* pTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_ONYXIA_TRIGGER))
+            {
+                // Get some random point near the center
+                float fX, fY, fZ;
+                pSummoned->GetRandomPoint(pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ(), 20.0f, fX, fY, fZ);
+                pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+            }
+            else
+            {
+                pSummoned->SetInCombatWithZone();
+            }
+
+            if (pSummoned->GetEntry() == NPC_ONYXIA_WHELP)
+            {
+                ++m_uiSummonCount;
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || uiPointId != 1 || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            pSummoned->SetInCombatWithZone();
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_KILL, m_creature);
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_BREATH_EAST_TO_WEST ||
+                pSpell->Id == SPELL_BREATH_WEST_TO_EAST ||
+                pSpell->Id == SPELL_BREATH_SE_TO_NW ||
+                pSpell->Id == SPELL_BREATH_NW_TO_SE ||
+                pSpell->Id == SPELL_BREATH_SW_TO_NE ||
+                pSpell->Id == SPELL_BREATH_NE_TO_SW ||
+                pSpell->Id == SPELL_BREATH_SOUTH_TO_NORTH ||
+                pSpell->Id == SPELL_BREATH_NORTH_TO_SOUTH)
+            {
+                // This was sent with SendMonsterMove - which resulted in better speed than now
+                m_creature->GetMotionMaster()->MovePoint(m_uiMovePoint, aMoveData[m_uiMovePoint].fX, aMoveData[m_uiMovePoint].fY, aMoveData[m_uiMovePoint].fZ);
+                DoCastSpellIfCan(m_creature, SPELL_HEATED_GROUND, CAST_TRIGGERED);
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !m_pInstance)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case POINT_ID_IN_AIR:
+                // sort of a hack, it is unclear how this really work but the values are valid
+#if defined (CLASSIC) || defined (TBC)
+                m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND);
+#endif
+#if defined (WOTLK) || defined (CATA)
+                m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+#endif
+                m_creature->SetLevitate(true);
+                m_uiPhaseTimer = 1000;                          // Movement to Initial North Position is delayed
+                return;
+            case POINT_ID_LAND:
+                // undo flying
+                m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, 0);
+                m_creature->SetLevitate(false);
+                m_uiPhaseTimer = 500;                           // Start PHASE_END shortly delayed
+                return;
+            case POINT_ID_LIFTOFF:
+                m_uiPhaseTimer = 500;                           // Start Flying shortly delayed
+                break;
+            case POINT_ID_INIT_NORTH:                           // Start PHASE_BREATH
+                m_uiPhase = PHASE_BREATH;
+                m_uiSummonCount = 0;
+                break;
+            }
+
+            if (Creature* pTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_ONYXIA_TRIGGER))
+            {
+                m_creature->SetFacingToObject(pTrigger);
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_uiPhase == PHASE_START || m_uiPhase == PHASE_END)
+            {
+                ScriptedAI::AttackStart(pWho);
+            }
+        }
+
+        bool DidSummonWhelps(const uint32 uiDiff)
+        {
+            if (m_uiSummonCount >= MAX_WHELPS_PER_PACK)
+            {
+                return true;
+            }
+
+            if (m_uiWhelpTimer < uiDiff)
+            {
+                m_creature->SummonCreature(NPC_ONYXIA_WHELP, afSpawnLocations[0][0], afSpawnLocations[0][1], afSpawnLocations[0][2], 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, MINUTE * IN_MILLISECONDS);
+                m_creature->SummonCreature(NPC_ONYXIA_WHELP, afSpawnLocations[1][0], afSpawnLocations[1][1], afSpawnLocations[1][2], 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, MINUTE * IN_MILLISECONDS);
+                m_uiWhelpTimer = 500;
+            }
+            else
+            {
+                m_uiWhelpTimer -= uiDiff;
+            }
+            return false;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_END:                                 // Here is room for additional summoned whelps and Erruption
+                if (m_uiBellowingRoarTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BELLOWINGROAR) == CAST_OK)
+                    {
+                        m_uiBellowingRoarTimer = 30000;
+                    }
+                }
+                else
+                {
+                    m_uiBellowingRoarTimer -= uiDiff;
+                }
+                // no break, phase 3 will use same abilities as in 1
+            case PHASE_START:
+            {
+                                if (m_uiFlameBreathTimer < uiDiff)
+                                {
+#if defined (CLASSIC) || defined (TBC)
+                                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FLAMEBREATH) == CAST_OK)
+#endif
+#if defined (WOTLK) || defined (CATA)
+                    if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_FLAMEBREATH : SPELL_FLAMEBREATH_H) == CAST_OK)
+#endif
+                                    {
+                                        m_uiFlameBreathTimer = urand(10000, 20000);
+                                    }
+                                }
+                                else
+                                {
+                                    m_uiFlameBreathTimer -= uiDiff;
+                                }
+
+                                if (m_uiTailSweepTimer < uiDiff)
+                                {
+#if defined (CLASSIC) || defined (TBC)
+                                    if (DoCastSpellIfCan(m_creature, SPELL_TAILSWEEP) == CAST_OK)
+#endif
+#if defined (WOTLK) || defined (CATA)
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_TAILSWEEP : SPELL_TAILSWEEP_H) == CAST_OK)
+#endif
+                                    {
+                                        m_uiTailSweepTimer = urand(15000, 20000);
+                                    }
+                                }
+                                else
+                                {
+                                    m_uiTailSweepTimer -= uiDiff;
+                                }
+
+                                if (m_uiCleaveTimer < uiDiff)
+                                {
+                                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                                    {
+                                        m_uiCleaveTimer = urand(2000, 5000);
+                                    }
+                                }
+                                else
+                                {
+                                    m_uiCleaveTimer -= uiDiff;
+                                }
+
+                                if (m_uiWingBuffetTimer < uiDiff)
+                                {
+#if defined (CLASSIC) || defined (TBC)
+                                    if (DoCastSpellIfCan(m_creature, SPELL_WINGBUFFET) == CAST_OK)
+#endif
+#if defined (WOTLK) || defined (CATA)
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_WINGBUFFET : SPELL_WINGBUFFET_H) == CAST_OK)
+#endif
+                                    {
+                                        m_uiWingBuffetTimer = urand(15000, 30000);
+                                    }
+                                }
+                                else
+                                {
+                                    m_uiWingBuffetTimer -= uiDiff;
+                                }
+
+                                if (m_uiCheckInLairTimer < uiDiff)
+                                {
+                                    if (m_pInstance)
+                                    {
+                                        Creature* pOnyTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_ONYXIA_TRIGGER);
+                                        if (pOnyTrigger && !m_creature->IsWithinDistInMap(pOnyTrigger, 90.0f, false))
+                                        {
+                                            DoCastSpellIfCan(m_creature, SPELL_BREATH_ENTRANCE);
+                                        }
+                                    }
+                                    m_uiCheckInLairTimer = 3000;
+                                }
+                                else
+                                {
+                                    m_uiCheckInLairTimer -= uiDiff;
+                                }
+
+                                if (m_uiPhase == PHASE_START && m_creature->GetHealthPercent() < 65.0f)
+                                {
+                                    m_uiPhase = PHASE_TO_LIFTOFF;
+                                    DoScriptText(SAY_PHASE_2_TRANS, m_creature);
+                                    SetCombatMovement(false);
+                                    m_creature->GetMotionMaster()->MoveIdle();
+                                    m_creature->SetTargetGuid(ObjectGuid());
+
+#if defined (CLASSIC) || defined (TBC)
+                                    float fGroundZ = m_creature->GetMap()->GetHeight(aMoveData[POINT_ID_SOUTH].fX, aMoveData[POINT_ID_SOUTH].fY, aMoveData[POINT_ID_SOUTH].fZ);
+#endif
+#if defined (WOTLK) || defined (CATA)
+                    float fGroundZ = m_creature->GetMap()->GetHeight(m_creature->GetPhaseMask(), aMoveData[POINT_ID_SOUTH].fX, aMoveData[POINT_ID_SOUTH].fY, aMoveData[POINT_ID_SOUTH].fZ);
+#endif
+                                    m_creature->GetMotionMaster()->MovePoint(POINT_ID_LIFTOFF, aMoveData[POINT_ID_SOUTH].fX, aMoveData[POINT_ID_SOUTH].fY, fGroundZ);
+                                    return;
+                                }
+
+                                DoMeleeAttackIfReady();
+                                break;
+            }
+            case PHASE_BREATH:
+            {
+                                 if (m_creature->GetHealthPercent() < 40.0f)
+                                 {
+                                     m_uiPhase = PHASE_BREATH_POST;
+                                     DoScriptText(SAY_PHASE_3_TRANS, m_creature);
+
+#if defined (CLASSIC) || defined (TBC)
+                                     float fGroundZ = m_creature->GetMap()->GetHeight(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+#endif
+#if defined (WOTLK) || defined (CATA)
+                    float fGroundZ = m_creature->GetMap()->GetHeight(m_creature->GetPhaseMask(), m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+#endif
+                                     m_creature->GetMotionMaster()->MoveFlyOrLand(POINT_ID_LAND, m_creature->GetPositionX(), m_creature->GetPositionY(), fGroundZ, false);
+                                     return;
+                                 }
+
+                                 if (m_uiMovementTimer < uiDiff)
+                                 {
+                                     // 3 possible actions
+                                     switch (urand(0, 2))
+                                     {
+                                     case 0:                             // breath
+                                         DoScriptText(EMOTE_BREATH, m_creature);
+                                         DoCastSpellIfCan(m_creature, aMoveData[m_uiMovePoint].uiSpellId, CAST_INTERRUPT_PREVIOUS);
+                                         m_uiMovePoint += NUM_MOVE_POINT / 2;
+                                         m_uiMovePoint %= NUM_MOVE_POINT;
+                                         m_uiMovementTimer = 25000;
+                                         return;
+                                     case 1:                             // a point on the left side
+                                     {
+                                                                             // C++ is stupid, so add -1 with +7
+                                                                             m_uiMovePoint += NUM_MOVE_POINT - 1;
+                                                                             m_uiMovePoint %= NUM_MOVE_POINT;
+                                                                             break;
+                                     }
+                                     case 2:                             // a point on the right side
+                                         ++m_uiMovePoint %= NUM_MOVE_POINT;
+                                         break;
+                                     }
+
+                                     m_uiMovementTimer = urand(15000, 25000);
+                                     m_creature->GetMotionMaster()->MovePoint(m_uiMovePoint, aMoveData[m_uiMovePoint].fX, aMoveData[m_uiMovePoint].fY, aMoveData[m_uiMovePoint].fZ);
+                                 }
+                                 else
+                                 {
+                                     m_uiMovementTimer -= uiDiff;
+                                 }
+
+                                 if (m_uiFireballTimer < uiDiff)
+                                 {
+                                     if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                                     {
+#if defined (CLASSIC) || defined (TBC)
+                                         if (DoCastSpellIfCan(pTarget, SPELL_FIREBALL) == CAST_OK)
+#endif
+#if defined (WOTLK) || defined (CATA)
+                        if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_FIREBALL : SPELL_FIREBALL_H) == CAST_OK)
+#endif
+                                         {
+                                             m_uiFireballTimer = urand(3000, 5000);
+                                         }
+                                     }
+                                 }
+                                 else
+                                 {
+                                     m_uiFireballTimer -= uiDiff;    // engulfingflames is supposed to be activated by a fireball but haven't come by
+                                 }
+
+                                 if (m_bIsSummoningWhelps)
+                                 {
+                                     if (DidSummonWhelps(uiDiff))
+                                     {
+                                         m_bIsSummoningWhelps = false;
+                                         m_uiSummonCount = 0;
+                                         m_uiSummonWhelpsTimer = 80000;      // 90s - 10s for summoning
+                                     }
+                                 }
+                                 else
+                                 {
+                                     if (m_uiSummonWhelpsTimer < uiDiff)
+                                     {
+                                         m_bIsSummoningWhelps = true;
+                                     }
+                                     else
+                                     {
+                                         m_uiSummonWhelpsTimer -= uiDiff;
+                                     }
+                                 }
+
+#if defined (WOTLK) || defined (CATA)
+                if (m_uiSummonGuardTimer < uiDiff)
+                {
+                    if (!m_creature->IsNonMeleeSpellCasted(false))
+                    {
+                        m_creature->CastSpell(afSpawnLocations[2][0], afSpawnLocations[2][1], afSpawnLocations[2][2], SPELL_SUMMON_LAIR_GUARD, true);
+                        m_uiSummonGuardTimer = 30000;
+                    }
+                }
+                else
+                    m_uiSummonGuardTimer -= uiDiff;
+#endif
+
+                                 break;
+            }
+            case PHASE_BREATH_PRE:                          // Summon first rounds of whelps
+                DidSummonWhelps(uiDiff);
+                // no break here
+            default:                                        // Phase-switching phases
+                if (!m_uiPhaseTimer)
+                {
+                    break;
+                }
+                if (m_uiPhaseTimer <= uiDiff)
+                {
+                    switch (m_uiPhase)
+                    {
+                    case PHASE_TO_LIFTOFF:
+                        m_uiPhase = PHASE_BREATH_PRE;
+                        if (m_pInstance)
+                        {
+                            m_pInstance->SetData(TYPE_ONYXIA, DATA_LIFTOFF);
+                        }
+                        m_creature->GetMotionMaster()->MoveFlyOrLand(POINT_ID_IN_AIR, aMoveData[POINT_ID_SOUTH].fX, aMoveData[POINT_ID_SOUTH].fY, aMoveData[POINT_ID_SOUTH].fZ, true);
+                        break;
+                    case PHASE_BREATH_PRE:
+                        m_creature->GetMotionMaster()->MovePoint(POINT_ID_INIT_NORTH, aMoveData[POINT_ID_NORTH].fX, aMoveData[POINT_ID_NORTH].fY, aMoveData[POINT_ID_NORTH].fZ);
+                        break;
+                    case PHASE_BREATH_POST:
+                        m_uiPhase = PHASE_END;
+                        m_creature->SetTargetGuid(m_creature->getVictim()->GetObjectGuid());
+                        SetCombatMovement(true, true);
+                        DoCastSpellIfCan(m_creature, SPELL_BELLOWINGROAR);
+                        break;
+                    }
+                    m_uiPhaseTimer = 0;
+                }
+                else
+                {
+                    m_uiPhaseTimer -= uiDiff;
+                }
+                break;
+            }
+        }
+
+#if defined (WOTLK) || defined (CATA)
+    void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+    {
+        // Check if players are hit by Onyxia's Deep Breath
+        if (pTarget->GetTypeId() != TYPEID_PLAYER || !m_pInstance)
+            return;
+
+        // All and only the Onyxia Deep Breath Spells have these visuals
+        if (pSpell->SpellVisual[0] == SPELL_VISUAL_BREATH_A || pSpell->SpellVisual[0] == SPELL_VISUAL_BREATH_B)
+            m_pInstance->SetData(TYPE_ONYXIA, DATA_PLAYER_TOASTED);
+    }
+#endif
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_onyxiaAI(pCreature);
+    }
+};
+
+void AddSC_boss_onyxia()
+{
+    Script* s;
+    s = new boss_onyxia();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_onyxia";
+    //pNewScript->GetAI = &GetAI_boss_onyxia;
+    //pNewScript->RegisterSelf();
+}
+
+/*
+-- SPELL_BREATH_EAST_TO_WEST
+DELETE FROM spell_target_position WHERE id IN (18576, 18578, 18579, 18580, 18581, 18582, 18583);
+INSERT INTO spell_target_position VALUES (18576, 249, -37.743851, -243.667923, -88.217651, 1.416);
+INSERT INTO spell_target_position VALUES (18578, 249, -35.805332, -232.028900, -87.749153, 1.416);
+INSERT INTO spell_target_position VALUES (18579, 249, -34.045738, -224.714661, -85.529465, 1.416);
+INSERT INTO spell_target_position VALUES (18580, 249, -32.081570, -214.916962, -88.327438, 1.416);
+INSERT INTO spell_target_position VALUES (18581, 249, -36.611721, -202.684677, -85.653786, 1.416);
+INSERT INTO spell_target_position VALUES (18582, 249, -37.067261, -195.758652, -87.745834, 1.416);
+INSERT INTO spell_target_position VALUES (18583, 249, -37.728523, -188.616806, -88.074898, 1.416);
+-- SPELL_BREATH_WEST_TO_EAST
+DELETE FROM spell_target_position WHERE id IN (18609, 18611, 18612, 18613, 18614, 18615, 18616);
+INSERT INTO spell_target_position VALUES (18609, 249, -37.728523, -188.616806, -88.074898, 4.526);
+INSERT INTO spell_target_position VALUES (18611, 249, -37.067261, -195.758652, -87.745834, 4.526);
+INSERT INTO spell_target_position VALUES (18612, 249, -36.611721, -202.684677, -85.653786, 4.526);
+INSERT INTO spell_target_position VALUES (18613, 249, -32.081570, -214.916962, -88.327438, 4.526);
+INSERT INTO spell_target_position VALUES (18614, 249, -34.045738, -224.714661, -85.529465, 4.526);
+INSERT INTO spell_target_position VALUES (18615, 249, -35.805332, -232.028900, -87.749153, 4.526);
+INSERT INTO spell_target_position VALUES (18616, 249, -37.743851, -243.667923, -88.217651, 4.526);
+-- SPELL_BREATH_NW_TO_SE
+DELETE FROM spell_target_position WHERE id IN (18584, 18585, 18586, 18587, 18588, 18589, 18590, 18591, 18592, 18593, 18594, 18595);
+INSERT INTO spell_target_position VALUES (18584, 249, 6.016711, -181.305771, -85.654648, 3.776);
+INSERT INTO spell_target_position VALUES (18585, 249, 3.860220, -183.227249, -86.375381, 3.776);
+INSERT INTO spell_target_position VALUES (18586, 249, -2.529650, -188.690491, -87.172859, 3.776);
+INSERT INTO spell_target_position VALUES (18587, 249, -8.449303, -193.957962, -87.564957, 3.776);
+INSERT INTO spell_target_position VALUES (18588, 249, -14.321238, -199.462219, -87.922478, 3.776);
+INSERT INTO spell_target_position VALUES (18589, 249, -15.602085, -216.893936, -88.403183, 3.776);
+INSERT INTO spell_target_position VALUES (18590, 249, -23.650263, -221.969086, -89.172699, 3.776);
+INSERT INTO spell_target_position VALUES (18591, 249, -29.495876, -213.014359, -88.910423, 3.776);
+INSERT INTO spell_target_position VALUES (18592, 249, -35.439922, -217.260284, -87.336311, 3.776);
+INSERT INTO spell_target_position VALUES (18593, 249, -41.762104, -221.896545, -86.114113, 3.776);
+INSERT INTO spell_target_position VALUES (18594, 249, -51.067528, -228.909988, -85.765556, 3.776);
+INSERT INTO spell_target_position VALUES (18595, 249, -56.559654, -241.223923, -85.423607, 3.776);
+-- SPELL_BREATH_SE_TO_NW
+DELETE FROM spell_target_position WHERE id IN (18564, 18565, 18566, 18567, 18568, 18569, 18570, 18571, 18572, 18573, 18574, 18575);
+INSERT INTO spell_target_position VALUES (18564, 249, -56.559654, -241.223923, -85.423607, 0.666);
+INSERT INTO spell_target_position VALUES (18565, 249, -51.067528, -228.909988, -85.765556, 0.666);
+INSERT INTO spell_target_position VALUES (18566, 249, -41.762104, -221.896545, -86.114113, 0.666);
+INSERT INTO spell_target_position VALUES (18567, 249, -35.439922, -217.260284, -87.336311, 0.666);
+INSERT INTO spell_target_position VALUES (18568, 249, -29.495876, -213.014359, -88.910423, 0.666);
+INSERT INTO spell_target_position VALUES (18569, 249, -23.650263, -221.969086, -89.172699, 0.666);
+INSERT INTO spell_target_position VALUES (18570, 249, -15.602085, -216.893936, -88.403183, 0.666);
+INSERT INTO spell_target_position VALUES (18571, 249, -14.321238, -199.462219, -87.922478, 0.666);
+INSERT INTO spell_target_position VALUES (18572, 249, -8.449303, -193.957962, -87.564957, 0.666);
+INSERT INTO spell_target_position VALUES (18573, 249, -2.529650, -188.690491, -87.172859, 0.666);
+INSERT INTO spell_target_position VALUES (18574, 249, 3.860220, -183.227249, -86.375381, 0.666);
+INSERT INTO spell_target_position VALUES (18575, 249, 6.016711, -181.305771, -85.654648, 0.666);
+-- SPELL_BREATH_SW_TO_NE
+DELETE FROM spell_target_position WHERE id IN (18596, 18597, 18598, 18599, 18600, 18601, 18602, 18603, 18604, 18605, 18606, 18607);
+INSERT INTO spell_target_position VALUES (18596, 249, -58.250900, -189.020004, -85.292267, 5.587);
+INSERT INTO spell_target_position VALUES (18597, 249, -52.006271, -193.796570, -85.808769, 5.587);
+INSERT INTO spell_target_position VALUES (18598, 249, -46.135464, -198.548553, -85.901764, 5.587);
+INSERT INTO spell_target_position VALUES (18599, 249, -40.500187, -203.001053, -85.555107, 5.587);
+INSERT INTO spell_target_position VALUES (18600, 249, -30.907579, -211.058197, -88.592125, 5.587);
+INSERT INTO spell_target_position VALUES (18601, 249, -20.098139, -218.681427, -88.937088, 5.587);
+INSERT INTO spell_target_position VALUES (18602, 249, -12.223192, -224.666168, -87.856300, 5.587);
+INSERT INTO spell_target_position VALUES (18603, 249, -6.475297, -229.098724, -87.076401, 5.587);
+INSERT INTO spell_target_position VALUES (18604, 249, -2.010256, -232.541992, -86.995140, 5.587);
+INSERT INTO spell_target_position VALUES (18605, 249, 2.736300, -236.202347, -86.790367, 5.587);
+INSERT INTO spell_target_position VALUES (18606, 249, 7.197779, -239.642868, -86.307297, 5.587);
+INSERT INTO spell_target_position VALUES (18607, 249, 12.120926, -243.439407, -85.874260, 5.587);
+-- SPELL_BREATH_NE_TO_SW
+DELETE FROM spell_target_position WHERE id IN (18617, 18619, 18620, 18621, 18622, 18623, 18624, 18625, 18626, 18627, 18628, 18618);
+INSERT INTO spell_target_position VALUES (18617, 249, 12.120926, -243.439407, -85.874260, 2.428);
+INSERT INTO spell_target_position VALUES (18619, 249, 7.197779, -239.642868, -86.307297, 2.428);
+INSERT INTO spell_target_position VALUES (18620, 249, 2.736300, -236.202347, -86.790367, 2.428);
+INSERT INTO spell_target_position VALUES (18621, 249, -2.010256, -232.541992, -86.995140, 2.428);
+INSERT INTO spell_target_position VALUES (18622, 249, -6.475297, -229.098724, -87.076401, 2.428);
+INSERT INTO spell_target_position VALUES (18623, 249, -12.223192, -224.666168, -87.856300, 2.428);
+INSERT INTO spell_target_position VALUES (18624, 249, -20.098139, -218.681427, -88.937088, 2.428);
+INSERT INTO spell_target_position VALUES (18625, 249, -30.907579, -211.058197, -88.592125, 2.428);
+INSERT INTO spell_target_position VALUES (18626, 249, -40.500187, -203.001053, -85.555107, 2.428);
+INSERT INTO spell_target_position VALUES (18627, 249, -46.135464, -198.548553, -85.901764, 2.428);
+INSERT INTO spell_target_position VALUES (18628, 249, -52.006271, -193.796570, -85.808769, 2.428);
+INSERT INTO spell_target_position VALUES (18618, 249, -58.250900, -189.020004, -85.292267, 2.428);
+
+-- SPELL_BREATH_SOUTH_TO_NORTH
+DELETE FROM spell_target_position WHERE id IN (18351, 18352, 18353, 18354, 18355, 18356, 18357, 18358, 18359, 18360, 18361);
+INSERT INTO spell_target_position VALUES (18351, 249, -68.834236, -215.036163, -84.018875, 6.280);
+INSERT INTO spell_target_position VALUES (18352, 249, -61.834255, -215.051910, -84.673416, 6.280);
+INSERT INTO spell_target_position VALUES (18353, 249, -53.343277, -215.071014, -85.597191, 6.280);
+INSERT INTO spell_target_position VALUES (18354, 249, -42.619305, -215.095139, -86.663605, 6.280);
+INSERT INTO spell_target_position VALUES (18355, 249, -35.899323, -215.110245, -87.196548, 6.280);
+INSERT INTO spell_target_position VALUES (18356, 249, -28.248341, -215.127457, -89.191750, 6.280);
+INSERT INTO spell_target_position VALUES (18357, 249, -20.324360, -215.145279, -88.963997, 6.280);
+INSERT INTO spell_target_position VALUES (18358, 249, -11.189384, -215.165833, -87.817093, 6.280);
+INSERT INTO spell_target_position VALUES (18359, 249, -2.047405, -215.186386, -86.279655, 6.280);
+INSERT INTO spell_target_position VALUES (18360, 249, 7.479571, -215.207809, -86.075531, 6.280);
+INSERT INTO spell_target_position VALUES (18361, 249, 20.730539, -215.237610, -85.254387, 6.280);
+-- SPELL_BREATH_NORTH_TO_SOUTH
+DELETE FROM spell_target_position WHERE id IN (17086, 17087, 17088, 17089, 17090, 17091, 17092, 17093, 17094, 17095, 17097, 22267, 22268, 21132, 21133, 21135, 21136, 21137, 21138, 21139);
+INSERT INTO spell_target_position VALUES (17086, 249, 20.730539, -215.237610, -85.254387, 3.142);
+INSERT INTO spell_target_position VALUES (17087, 249, 7.479571, -215.207809, -86.075531, 3.142);
+INSERT INTO spell_target_position VALUES (17088, 249, -2.047405, -215.186386, -86.279655, 3.142);
+INSERT INTO spell_target_position VALUES (17089, 249, -11.189384, -215.165833, -87.817093, 3.142);
+INSERT INTO spell_target_position VALUES (17090, 249, -20.324360, -215.145279, -88.963997, 3.142);
+INSERT INTO spell_target_position VALUES (17091, 249, -28.248341, -215.127457, -89.191750, 3.142);
+INSERT INTO spell_target_position VALUES (17092, 249, -35.899323, -215.110245, -87.196548, 3.142);
+INSERT INTO spell_target_position VALUES (17093, 249, -42.619305, -215.095139, -86.663605, 3.142);
+INSERT INTO spell_target_position VALUES (17094, 249, -53.343277, -215.071014, -85.597191, 3.142);
+INSERT INTO spell_target_position VALUES (17095, 249, -61.834255, -215.051910, -84.673416, 3.142);
+INSERT INTO spell_target_position VALUES (17097, 249, -68.834236, -215.036163, -84.018875, 3.142);
+INSERT INTO spell_target_position VALUES (22267, 249, -75.736046, -214.984970, -83.394188, 3.142);
+INSERT INTO spell_target_position VALUES (22268, 249, -84.087578, -214.857834, -82.640053, 3.142);
+INSERT INTO spell_target_position VALUES (21132, 249, -90.424416, -214.601974, -82.482697, 3.142);
+INSERT INTO spell_target_position VALUES (21133, 249, -96.572411, -214.353745, -82.239967, 3.142);
+INSERT INTO spell_target_position VALUES (21135, 249, -102.069931, -214.131775, -80.571190, 3.142);
+INSERT INTO spell_target_position VALUES (21136, 249, -107.385597, -213.917145, -77.447037, 3.142);
+INSERT INTO spell_target_position VALUES (21137, 249, -114.281258, -213.866486, -73.851128, 3.142);
+INSERT INTO spell_target_position VALUES (21138, 249, -123.328560, -213.607910, -71.559921, 3.142);
+INSERT INTO spell_target_position VALUES (21139, 249, -130.788300, -213.424026, -70.751007, 3.142);
+*/
diff --git a/src/modules/SD3/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp b/src/modules/SD3/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp
new file mode 100644
index 000000000..2f8bdfd48
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp
@@ -0,0 +1,146 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Onyxias_Lair
+ * SD%Complete: 50
+ * SDComment:   None
+ * SDCategory:  Onyxia's Lair
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "onyxias_lair.h"
+
+struct is_onyxias_lair : public InstanceScript
+{
+    is_onyxias_lair() : InstanceScript("instance_onyxias_lair") {}
+
+    struct instance_onyxias_lair : public ScriptedInstance
+    {
+#if defined (CLASSIC) || defined (TBC)
+        instance_onyxias_lair(Map* pMap) : ScriptedInstance(pMap)
+#endif
+#if defined (WOTLK) || defined (CATA)
+        instance_onyxias_lair(Map* pMap) : ScriptedInstance(pMap),
+        m_uiAchievWhelpsCount(0)
+#endif
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            m_uiEncounter = NOT_STARTED;
+            m_tPhaseTwoStart = time(NULL);
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            return m_uiEncounter == IN_PROGRESS || m_uiEncounter >= DATA_LIFTOFF;
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_ONYXIA_TRIGGER:
+                m_mNpcEntryGuidStore[NPC_ONYXIA_TRIGGER] = pCreature->GetObjectGuid();
+                break;
+#if defined (WOTLK) || defined (CATA)
+            case NPC_ONYXIA_WHELP:
+                if (m_uiEncounter >= DATA_LIFTOFF && time_t(m_tPhaseTwoStart + TIME_LIMIT_MANY_WHELPS) >= time(NULL))
+                    ++m_uiAchievWhelpsCount;
+                break;
+#endif
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            if (uiType != TYPE_ONYXIA)
+            {
+                return;
+            }
+
+            m_uiEncounter = uiData;
+#if defined (WOTLK) || defined (CATA)
+            if (uiData == IN_PROGRESS)
+            {
+                DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_ONYXIA_ID);
+                m_uiAchievWhelpsCount = 0;
+            }
+#endif
+            if (uiData == DATA_LIFTOFF)
+            {
+                m_tPhaseTwoStart = time(NULL);
+            }
+
+            // Currently no reason to save anything
+        }
+
+#if defined (WOTLK) || defined (CATA)
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* /*pSource*/, Unit const* /*pTarget*/, uint32 /*uiMiscValue1 = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+            case ACHIEV_CRIT_MANY_WHELPS_N:
+            case ACHIEV_CRIT_MANY_WHELPS_H:
+                return m_uiAchievWhelpsCount >= ACHIEV_CRIT_REQ_MANY_WHELPS;
+            case ACHIEV_CRIT_NO_BREATH_N:
+            case ACHIEV_CRIT_NO_BREATH_H:
+                return m_uiEncounter != DATA_PLAYER_TOASTED;
+            default:
+                return false;
+            }
+        }
+#endif
+    protected:
+        uint32 m_uiEncounter;
+        uint32 m_uiAchievWhelpsCount;
+
+        time_t m_tPhaseTwoStart;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_onyxias_lair(pMap);
+    }
+};
+
+void AddSC_instance_onyxias_lair()
+{
+    Script* s;
+
+    s = new is_onyxias_lair();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_onyxias_lair";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_onyxias_lair;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/onyxias_lair/npc_onyxian_warder.cpp b/src/modules/SD3/scripts/kalimdor/onyxias_lair/npc_onyxian_warder.cpp
new file mode 100644
index 000000000..012dbd60f
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/onyxias_lair/npc_onyxian_warder.cpp
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2010-2012 Anathema Script Engine project <http://valkyrie-wow.com/>
+ */
+
+/* ScriptData
+SDName: Npc_Onyxian_Warder
+SD%Complete:
+SDComment: 
+SDCategory: Onyxia's Lair
+EndScriptData */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_CLEAVE            = 15284,
+    SPELL_FIRE_NOVA         = 20203,
+    SPELL_FLAME_LASH        = 18958,
+    SPELL_PIERCE_ARMOR      = 12097
+};
+
+struct npc_onyxian_warder : public CreatureScript
+{
+    npc_onyxian_warder() : CreatureScript("npc_onyxian_warder") {}
+
+    struct npc_onyxian_warderAI : public ScriptedAI
+    {
+        npc_onyxian_warderAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 Cleave_Timer;
+        uint32 Fire_Nova_Timer;
+        uint32 Flame_Lash_Timer;
+        uint32 Pierce_Armor_Timer;
+
+        void Reset()
+        {
+            Cleave_Timer = urand(1000, 5000);
+            Fire_Nova_Timer = urand(2500, 7500);
+            Flame_Lash_Timer = urand(5000, 15000);
+            Pierce_Armor_Timer = urand(10000, 20000);
+        }
+
+        void Aggro(Unit* /*pWho*/)
+        {
+            m_creature->SetInCombatWithZone();
+            m_creature->CallForHelp(20.0f);
+        }
+
+        void UpdateAI(const uint32 uiDiff)
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (Cleave_Timer < uiDiff)
+            {
+                Cleave_Timer = urand(6000, 9000);
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE);
+            }
+            else
+                Cleave_Timer -= uiDiff;
+
+            if (Fire_Nova_Timer < uiDiff)
+            {
+                Fire_Nova_Timer = urand(4000, 9000);
+                DoCastSpellIfCan(m_creature, SPELL_FIRE_NOVA);
+            }
+            else
+                Fire_Nova_Timer -= uiDiff;
+
+            if (Flame_Lash_Timer < uiDiff)
+            {
+                Flame_Lash_Timer = urand(9000, 20000);
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_FLAME_LASH);
+            }
+            else
+                Flame_Lash_Timer -= uiDiff;
+
+            if (Pierce_Armor_Timer < uiDiff)
+            {
+                Pierce_Armor_Timer = urand(20000, 35000);
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_PIERCE_ARMOR);
+            }
+            else
+                Pierce_Armor_Timer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_onyxian_warderAI(pCreature);
+    }
+};
+
+void AddSC_npc_onyxian_warder()
+{
+    Script *s;
+    s = new npc_onyxian_warder();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_onyxian_warder";
+    //pNewScript->GetAI = &GetAI_npc_onyxian_warderAI;
+    //pNewScript->RegisterSelf();
+}
\ No newline at end of file
diff --git a/src/modules/SD3/scripts/kalimdor/onyxias_lair/onyxias_lair.h b/src/modules/SD3/scripts/kalimdor/onyxias_lair/onyxias_lair.h
new file mode 100644
index 000000000..df944fbd4
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/onyxias_lair/onyxias_lair.h
@@ -0,0 +1,57 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_ONYXIA_H
+#define DEF_ONYXIA_H
+
+enum
+{
+    TYPE_ONYXIA                 = 0,
+
+    // Special data fields for Onyxia
+    DATA_LIFTOFF                = 4,
+#if defined (WOTLK) || defined (CATA)
+    DATA_PLAYER_TOASTED         = 5,
+#endif
+
+    NPC_ONYXIA_WHELP            = 11262,
+    NPC_ONYXIA_TRIGGER          = 12758,
+
+#if defined (WOTLK) || defined (CATA)
+    // Achievement Related
+    TIME_LIMIT_MANY_WHELPS      = 10,                       // 10s timeframe to kill 50 whelps after liftoff
+    ACHIEV_CRIT_REQ_MANY_WHELPS = 50,
+
+    ACHIEV_CRIT_MANY_WHELPS_N   = 12565,                    // Achievements 4403, 4406
+    ACHIEV_CRIT_MANY_WHELPS_H   = 12568,
+    ACHIEV_CRIT_NO_BREATH_N     = 12566,                    // Acheivements 4404, 4407
+    ACHIEV_CRIT_NO_BREATH_H     = 12569,
+
+    ACHIEV_START_ONYXIA_ID      = 6601,
+#endif
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/kalimdor/orgrimmar.cpp b/src/modules/SD3/scripts/kalimdor/orgrimmar.cpp
new file mode 100644
index 000000000..2b3a5930d
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/orgrimmar.cpp
@@ -0,0 +1,242 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Orgrimmar
+ * SD%Complete: 100
+ * SDComment:   Quest support: 2460, 6566
+ * SDCategory:  Orgrimmar
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_shenthul
+ * npc_thrall_warchief
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+/*######
+## npc_shenthul
+######*/
+
+enum
+{
+    QUEST_SHATTERED_SALUTE  = 2460
+};
+
+struct npc_shenthul : public CreatureScript
+{
+    npc_shenthul() : CreatureScript("npc_shenthul") {}
+
+    struct npc_shenthulAI : public ScriptedAI
+    {
+        npc_shenthulAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiSaluteTimer;
+        uint32 m_uiResetTimer;
+
+        ObjectGuid m_playerGuid;
+
+        void Reset() override
+        {
+            m_uiSaluteTimer = 0;
+            m_uiResetTimer = 0;
+
+            m_playerGuid.Clear();
+        }
+
+        void ReceiveEmote(Player* pPlayer, uint32 uiTextEmote) override
+        {
+            if (m_uiResetTimer && uiTextEmote == TEXTEMOTE_SALUTE && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE)
+            {
+                pPlayer->AreaExploredOrEventHappens(QUEST_SHATTERED_SALUTE);
+                EnterEvadeMode();
+            }
+        }
+
+        void DoStartQuestEvent(Player* pPlayer)
+        {
+            m_playerGuid = pPlayer->GetObjectGuid();
+            m_uiSaluteTimer = 6000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiResetTimer)
+            {
+                if (m_uiResetTimer <= uiDiff)
+                {
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                    {
+                        if (pPlayer->GetTypeId() == TYPEID_PLAYER && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE)
+                        {
+                            pPlayer->FailQuest(QUEST_SHATTERED_SALUTE);
+                        }
+                    }
+
+                    m_uiResetTimer = 0;
+                    EnterEvadeMode();
+                }
+                else
+                {
+                    m_uiResetTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiSaluteTimer)
+            {
+                if (m_uiSaluteTimer <= uiDiff)
+                {
+                    m_creature->HandleEmote(EMOTE_ONESHOT_SALUTE);
+                    m_uiResetTimer = 60000;
+                    m_uiSaluteTimer = 0;
+                }
+                else
+                {
+                    m_uiSaluteTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_shenthulAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_SHATTERED_SALUTE)
+        {
+            if (npc_shenthulAI* pShenAI = dynamic_cast<npc_shenthulAI*>(pCreature->AI()))
+            {
+                pShenAI->DoStartQuestEvent(pPlayer);
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_thrall_warchief
+######*/
+
+enum
+{
+    QUEST_ID_WHAT_THE_WIND_CARRIES      = 6566,
+};
+
+struct npc_thrall_warchief : public CreatureScript  //TODO localise
+{
+    npc_thrall_warchief() : CreatureScript("npc_thrall_warchief") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+
+        if (pPlayer->GetQuestStatus(QUEST_ID_WHAT_THE_WIND_CARRIES) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Please share your wisdom with me, Warchief.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What discoveries?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(5733, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Usurper?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(5734, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 3:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "With all due respect, Warchief - why not allow them to be destroyed? Does this not strengthen our position?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(5735, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 4:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I... I did not think of it that way, Warchief.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(5736, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 5:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I live only to serve, Warchief! My life is empty and meaningless without your guidance.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->SEND_GOSSIP_MENU(5737, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 6:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Of course, Warchief!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->SEND_GOSSIP_MENU(5738, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 7:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(QUEST_ID_WHAT_THE_WIND_CARRIES);
+            break;
+        }
+        return true;
+    }
+};
+
+void AddSC_orgrimmar()
+{
+    Script* s;
+    s = new npc_shenthul();
+    s->RegisterSelf();
+    s = new npc_thrall_warchief();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_shenthul";
+    //pNewScript->GetAI = &GetAI_npc_shenthul;
+    //pNewScript->pQuestAcceptNPC =  &QuestAccept_npc_shenthul;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_thrall_warchief";
+    //pNewScript->pGossipHello =  &GossipHello_npc_thrall_warchief;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_thrall_warchief;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/razorfen_downs/instance_razorfen_downs.cpp b/src/modules/SD3/scripts/kalimdor/razorfen_downs/instance_razorfen_downs.cpp
new file mode 100644
index 000000000..a9fff53e0
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/razorfen_downs/instance_razorfen_downs.cpp
@@ -0,0 +1,184 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance Razorfen_Downs
+ * SD%Complete: 10
+ * SDComment:   TODO encounter trace and other nice things
+ * SDCategory:  Razorfen Downs instancescript
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "razorfen_downs.h"
+
+struct is_razorfen_downs : public InstanceScript
+{
+    is_razorfen_downs() : InstanceScript("instance_razorfen_downs") {}
+
+    class instance_razorfen_downs : public ScriptedInstance
+    {
+    public:
+        instance_razorfen_downs(Map *pMap) : ScriptedInstance(pMap), iWaveNumber(1), bWaveInMotion(false), iTombFiendsAlive(0), iTombReaversAlive(0)
+        {
+            Initialize();
+        }
+
+        ~instance_razorfen_downs() {}
+
+        void Initialize() override
+        {
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_TOMB_FIEND:
+                ++iTombFiendsAlive;
+                break;
+            case NPC_TOMB_REAVER:
+                ++iTombReaversAlive;
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_TOMB_FIEND:
+                if (!--iTombFiendsAlive)
+                {
+                    bWaveInMotion = false;
+                    iWaveNumber = 2; // Reaver time
+                }
+                break;
+            case NPC_TOMB_REAVER:
+                if (!--iTombReaversAlive)
+                {
+                    bWaveInMotion = false;
+                    iWaveNumber = 3; // boss time!!!
+                }
+                break;
+            }
+        }
+
+        void SetData64(uint32 type, uint64 data) override
+        {
+            switch (type)
+            {
+            case TYPE_GONG_USED:
+                if (bWaveInMotion)
+                    return;
+                if (Player *pPlayer = instance->GetPlayer(ObjectGuid(data)))
+                {
+                    bWaveInMotion = true;
+                    switch (iWaveNumber)
+                    {
+                    case 1:
+                        // spawn Tomb Fiends
+                        SummonCreatures(pPlayer, NPC_TOMB_FIEND, TOTAL_FIENDS);
+                        break;
+                    case 2:
+                        // spawn Tomb Reavers
+                        SummonCreatures(pPlayer, NPC_TOMB_REAVER, TOTAL_REAVERS);
+                        break;
+                    default:
+                        // spawn boss (Tuten'kash). Last wave,so will never be set back to false, therefore this event cannot happen again
+                        //TODO anything with this "motion"...
+                        if (Creature* pTutenkash = pPlayer->SummonCreature(NPC_TUTENKASH, aTutenkashLocation[0].fX, aTutenkashLocation[0].fY, aTutenkashLocation[0].fZ, aTutenkashLocation[0].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000))
+                        {
+                            pTutenkash->GetMotionMaster()->MovePoint(0, 2488.502686f, 801.684021f, 42.731823f);
+                            pTutenkash->GetMotionMaster()->MovePoint(0, 2485.428955f, 815.734619f, 43.195621f);
+                            pTutenkash->GetMotionMaster()->MovePoint(0, 2486.951904f, 826.718079f, 43.586765f);
+                            pTutenkash->GetMotionMaster()->MovePoint(0, 2496.677002f, 838.880005f, 45.809792f);
+                            pTutenkash->GetMotionMaster()->MovePoint(0, 2501.559814f, 847.080750f, 47.408485f);
+                            pTutenkash->GetMotionMaster()->MovePoint(0, 2506.661377f, 855.430359f, 47.678036f);
+                            pTutenkash->GetMotionMaster()->MovePoint(0, 2514.890869f, 861.339966f, 47.678036f);
+                            pTutenkash->GetMotionMaster()->MovePoint(0, 2526.009033f, 865.386108f, 47.678036f);
+                            pTutenkash->GetMotionMaster()->MovePoint(0, 2539.416504f, 874.278931f, 47.711197f);
+                            pTutenkash->GetMotionMaster()->MoveIdle();
+                        }
+                        break;
+                    }
+                }
+                break;
+            }
+        }
+
+    private:
+        // used for summoning multiple numbers of creatures
+        void SummonCreatures(Player* pPlayer, int NPC_ID, int iTotalToSpawn)
+        {
+            // used for generating a different path for each creature
+            float fXdifference = 0;
+            float fYdifference = 0;
+
+            Creature* pTombCreature = NULL;
+
+            for (int i = 0; i < iTotalToSpawn; i++)
+            {
+                pTombCreature = pPlayer->SummonCreature(NPC_ID, aCreatureLocation[i].fX, aCreatureLocation[i].fY, aCreatureLocation[i].fZ, aCreatureLocation[i].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000);
+                //TODO "motion"...
+                pTombCreature->GetMotionMaster()->MovePoint(0, 2547.565f, 904.983f, 46.776f);
+                pTombCreature->GetMotionMaster()->MovePoint(0, 2547.496f, 895.083f, 47.736f);
+                pTombCreature->GetMotionMaster()->MovePoint(0, 2543.796f, 884.629f, 47.764f);
+                // randomise coordinates
+                fXdifference = rand() % 3;
+                fYdifference = rand() % 3;
+                pTombCreature->GetMotionMaster()->MovePoint(0, 2532.118f + fXdifference, 866.656f + fYdifference, 47.678146f);
+                // randomise last coordinates
+                fXdifference = rand() % 5;
+                fYdifference = rand() % 5;
+                pTombCreature->GetMotionMaster()->MovePoint(0, 2522.604f + fXdifference, 858.547f + fYdifference, 47.678673f);
+                pTombCreature->GetMotionMaster()->MoveIdle();
+            }
+        }
+
+        // records which round of creatures we are in (Tomb Fiend, Tomb Raider, Boss)
+        int iWaveNumber;
+        // use to kick off each wave of creatures and to prevent the event happening more than once whilst in the same instance of the dungeon
+        bool bWaveInMotion;
+        // keeps track of the number of craetures still alive in the wave
+        int iTombFiendsAlive;
+        int iTombReaversAlive;
+
+    };
+
+    InstanceData* GetInstanceData(Map *pMap) override
+    {
+        return new instance_razorfen_downs(pMap);
+    }
+};
+
+void AddSC_instance_razorfen_downs()
+{
+    Script* s;
+    s = new is_razorfen_downs();
+    s->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp b/src/modules/SD3/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp
new file mode 100644
index 000000000..8dbcc1b5a
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp
@@ -0,0 +1,354 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Razorfen_Downs
+ * SD%Complete: 100
+ * SDComment:   Quest 3525.
+ * SDCategory:  Razorfen Downs
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_belnistrasz
+ * go_tutenkash_gong
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "razorfen_downs.h"
+
+/*###
+# npc_belnistrasz
+####*/
+
+enum
+{
+    QUEST_EXTINGUISHING_THE_IDOL    = 3525,
+
+    SAY_BELNISTRASZ_READY           = -1129005,
+    SAY_BELNISTRASZ_START_RIT       = -1129006,
+    SAY_BELNISTRASZ_AGGRO_1         = -1129007,
+    SAY_BELNISTRASZ_AGGRO_2         = -1129008,
+    SAY_BELNISTRASZ_3_MIN           = -1129009,
+    SAY_BELNISTRASZ_2_MIN           = -1129010,
+    SAY_BELNISTRASZ_1_MIN           = -1129011,
+    SAY_BELNISTRASZ_FINISH          = -1129012,
+
+    NPC_IDOL_ROOM_SPAWNER           = 8611,
+
+    NPC_WITHERED_BATTLE_BOAR        = 7333,
+    NPC_WITHERED_QUILGUARD          = 7329,
+    NPC_DEATHS_HEAD_GEOMANCER       = 7335,
+    NPC_PLAGUEMAW_THE_ROTTING       = 7356,
+
+    GO_BELNISTRASZ_BRAZIER          = 152097,
+
+    SPELL_ARCANE_INTELLECT          = 13326,                // use this somewhere (he has it as default)
+    SPELL_FIREBALL                  = 9053,
+    SPELL_FROST_NOVA                = 11831,
+    SPELL_IDOL_SHUTDOWN             = 12774,
+
+    // summon spells only exist in 1.x TODO so maybe [+ZERO]?
+    // SPELL_SUMMON_1                  = 12694,             // NPC_WITHERED_BATTLE_BOAR
+    // SPELL_SUMMON_2                  = 14802,             // NPC_DEATHS_HEAD_GEOMANCER
+    // SPELL_SUMMON_3                  = 14801,             // NPC_WITHERED_QUILGUARD
+};
+
+static float m_fSpawnerCoord[3][4] =
+{
+    {2582.79f, 954.392f, 52.4821f, 3.78736f},
+    {2569.42f, 956.380f, 52.2732f, 5.42797f},
+    {2570.62f, 942.393f, 53.7433f, 0.71558f}
+};
+
+struct npc_belnistrasz : public CreatureScript
+{
+    npc_belnistrasz() : CreatureScript("npc_belnistrasz") {}
+
+    struct npc_belnistraszAI : public npc_escortAI
+    {
+        npc_belnistraszAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_uiRitualPhase = 0;
+            m_uiRitualTimer = 1000;
+            m_bAggro = false;
+        }
+
+        uint8 m_uiRitualPhase;
+        uint32 m_uiRitualTimer;
+        bool m_bAggro;
+
+        uint32 m_uiFireballTimer;
+        uint32 m_uiFrostNovaTimer;
+
+        void Reset() override
+        {
+            m_uiFireballTimer = 1000;
+            m_uiFrostNovaTimer = 6000;
+        }
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            if (HasEscortState(STATE_ESCORT_PAUSED))
+            {
+                if (!m_bAggro)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_BELNISTRASZ_AGGRO_1 : SAY_BELNISTRASZ_AGGRO_1, m_creature, pAttacker);
+                    m_bAggro = true;
+                }
+
+                return;
+            }
+
+            ScriptedAI::AttackedBy(pAttacker);
+        }
+
+        void SpawnerSummon(Creature* pSummoner)
+        {
+            if (m_uiRitualPhase > 7)
+            {
+                pSummoner->SummonCreature(NPC_PLAGUEMAW_THE_ROTTING, pSummoner->GetPositionX(), pSummoner->GetPositionY(), pSummoner->GetPositionZ(), pSummoner->GetOrientation(), TEMPSUMMON_TIMED_OOC_DESPAWN, 60000);
+                return;
+            }
+
+            for (int i = 0; i < 4; ++i)
+            {
+                uint32 uiEntry = 0;
+
+                // ref TARGET_RANDOM_CIRCUMFERENCE_POINT
+                float angle = 2.0f * M_PI_F * rand_norm_f();
+                float fX, fZ, fY;
+                pSummoner->GetClosePoint(fX, fZ, fY, 0.0f, 2.0f, angle);
+
+                switch (i)
+                {
+                case 0:
+                case 1:
+                    uiEntry = NPC_WITHERED_BATTLE_BOAR;
+                    break;
+                case 2:
+                    uiEntry = NPC_WITHERED_QUILGUARD;
+                    break;
+                case 3:
+                    uiEntry = NPC_DEATHS_HEAD_GEOMANCER;
+                    break;
+                }
+
+                pSummoner->SummonCreature(uiEntry, fX, fZ, fY, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 60000);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            SpawnerSummon(pSummoned);
+        }
+
+        void DoSummonSpawner(int32 iType)
+        {
+            m_creature->SummonCreature(NPC_IDOL_ROOM_SPAWNER, m_fSpawnerCoord[iType][0], m_fSpawnerCoord[iType][1], m_fSpawnerCoord[iType][2], m_fSpawnerCoord[iType][3], TEMPSUMMON_TIMED_DESPAWN, 10000);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            if (uiPointId == 24)
+            {
+                DoScriptText(SAY_BELNISTRASZ_START_RIT, m_creature);
+                SetEscortPaused(true);
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (HasEscortState(STATE_ESCORT_PAUSED))
+            {
+                if (m_uiRitualTimer < uiDiff)
+                {
+                    switch (m_uiRitualPhase)
+                    {
+                    case 0:
+                        DoCastSpellIfCan(m_creature, SPELL_IDOL_SHUTDOWN);
+                        m_uiRitualTimer = 1000;
+                        break;
+                    case 1:
+                        DoSummonSpawner(irand(1, 3));
+                        m_uiRitualTimer = 39000;
+                        break;
+                    case 2:
+                        DoSummonSpawner(irand(1, 3));
+                        m_uiRitualTimer = 20000;
+                        break;
+                    case 3:
+                        DoScriptText(SAY_BELNISTRASZ_3_MIN, m_creature, m_creature);
+                        m_uiRitualTimer = 20000;
+                        break;
+                    case 4:
+                        DoSummonSpawner(irand(1, 3));
+                        m_uiRitualTimer = 40000;
+                        break;
+                    case 5:
+                        DoSummonSpawner(irand(1, 3));
+                        DoScriptText(SAY_BELNISTRASZ_2_MIN, m_creature, m_creature);
+                        m_uiRitualTimer = 40000;
+                        break;
+                    case 6:
+                        DoSummonSpawner(irand(1, 3));
+                        m_uiRitualTimer = 20000;
+                        break;
+                    case 7:
+                        DoScriptText(SAY_BELNISTRASZ_1_MIN, m_creature, m_creature);
+                        m_uiRitualTimer = 40000;
+                        break;
+                    case 8:
+                        DoSummonSpawner(irand(1, 3));
+                        m_uiRitualTimer = 20000;
+                        break;
+                    case 9:
+                        DoScriptText(SAY_BELNISTRASZ_FINISH, m_creature, m_creature);
+                        m_uiRitualTimer = 3000;
+                        break;
+                    case 10:
+                        if (Player* pPlayer = GetPlayerForEscort())
+                        {
+                            pPlayer->GroupEventHappens(QUEST_EXTINGUISHING_THE_IDOL, m_creature);
+
+                            if (GameObject* pGo = GetClosestGameObjectWithEntry(m_creature, GO_BELNISTRASZ_BRAZIER, 10.0f))
+                            {
+                                if (!pGo->isSpawned())
+                                {
+                                    pGo->SetRespawnTime(HOUR * IN_MILLISECONDS);
+                                    pGo->Refresh();
+                                }
+                            }
+                        }
+
+                        m_creature->RemoveAurasDueToSpell(SPELL_IDOL_SHUTDOWN);
+                        SetEscortPaused(false);
+                        break;
+                    }
+
+                    ++m_uiRitualPhase;
+                }
+                else
+                {
+                    m_uiRitualTimer -= uiDiff;
+                }
+
+                return;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiFireballTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_FIREBALL);
+                m_uiFireballTimer = urand(2000, 3000);
+            }
+            else
+            {
+                m_uiFireballTimer -= uiDiff;
+            }
+
+            if (m_uiFrostNovaTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROST_NOVA);
+                m_uiFrostNovaTimer = urand(10000, 15000);
+            }
+            else
+            {
+                m_uiFrostNovaTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_belnistraszAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_EXTINGUISHING_THE_IDOL)
+        {
+            if (npc_belnistraszAI* pEscortAI = dynamic_cast<npc_belnistraszAI*>(pCreature->AI()))
+            {
+                pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+                pEscortAI->Start(true, pPlayer, pQuest);
+                DoScriptText(SAY_BELNISTRASZ_READY, pCreature, pPlayer);
+            }
+        }
+
+        return true;
+    }
+};
+
+/*####
+# go_tutenkash_gong
+####*/
+
+struct go_tutenkash_gong : public GameObjectScript
+{
+    go_tutenkash_gong() : GameObjectScript("go_tutenkash_gong") {}
+
+    bool OnUse(Player* pPlayer, GameObject* /*pGo*/) override
+    {
+        if (ScriptedInstance *m_pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
+        {
+            m_pInstance->SetData64(TYPE_GONG_USED, pPlayer->GetObjectGuid().GetRawValue());
+            //m_pInstance->SetData(TYPE_GONG_USED, 0);  called from SetData64 now
+        }
+
+        return true;
+    }
+};
+
+void AddSC_razorfen_downs()
+{
+    Script* s;
+    s = new npc_belnistrasz();
+    s->RegisterSelf();
+    s = new go_tutenkash_gong();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_tutenkash_gong";
+    //pNewScript->pGOUse = &GOUse_go_tutenkash_gong;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_belnistrasz";
+    //pNewScript->GetAI = &GetAI_npc_belnistrasz;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_belnistrasz;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/razorfen_downs/razorfen_downs.h b/src/modules/SD3/scripts/kalimdor/razorfen_downs/razorfen_downs.h
new file mode 100644
index 000000000..2610da822
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/razorfen_downs/razorfen_downs.h
@@ -0,0 +1,66 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_RFD_H
+#define DEF_RFD_H
+
+enum
+{
+    MAX_ENCOUNTER   = 0,
+    TYPE_GONG_USED  = MAX_ENCOUNTER,
+    //TYPE_PLAYER     = MAX_ENCOUNTER + 1,
+
+    GO_GONG = 148917,
+    NPC_TOMB_FIEND = 7349,
+    TOTAL_FIENDS = 8,
+    NPC_TOMB_REAVER = 7351,
+    TOTAL_REAVERS = 4,
+    NPC_TUTENKASH = 7355,
+};
+
+struct TUTENKASH_CreatureLocation
+{
+    float fX, fY, fZ, fO;
+};
+
+static const TUTENKASH_CreatureLocation aCreatureLocation[] =
+{
+    { 2540.479f, 906.539f, 46.663f, 5.47f },               // Tomb Fiend/Reaver spawn point
+    { 2541.511f, 912.857f, 46.216f, 5.39f },               // Tomb Fiend/Reaver spawn point
+    { 2536.703f, 917.214f, 46.094f, 5.57f },               // Tomb Fiend/Reaver spawn point
+    { 2530.443f, 913.598f, 46.083f, 5.69f },               // Tomb Fiend/Reaver spawn point
+    { 2529.833f, 920.977f, 45.836f, 5.47f },               // Tomb Fiend spawn point
+    { 2524.738f, 915.195f, 46.248f, 5.97f },               // Tomb Fiend spawn point
+    { 2517.829f, 917.746f, 46.073f, 5.83f },               // Tomb Fiend spawn point
+    { 2512.750f, 924.458f, 46.504f, 5.92f }                // Tomb Fiend spawn point
+};
+
+static const TUTENKASH_CreatureLocation aTutenkashLocation[] =
+{
+    { 2493.968f, 790.974f, 39.849f, 5.92f }                // Tuten'kash spawn point
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp b/src/modules/SD3/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
new file mode 100644
index 000000000..0f922359a
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
@@ -0,0 +1,169 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      instance_razorfen_kraul
+ * SD%Complete: 50
+ * SDComment:   None
+ * SDCategory:  Razorfen Kraul
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "razorfen_kraul.h"
+
+struct is_razorfen_kraul : public InstanceScript
+{
+    is_razorfen_kraul() : InstanceScript("instance_razorfen_kraul") {}
+
+    class instance_razorfen_kraul : public ScriptedInstance
+    {
+    public:
+        instance_razorfen_kraul(Map* pMap) : ScriptedInstance(pMap),
+            m_uiWardKeepersRemaining(0)
+        {
+            Initialize();
+        }
+
+        ~instance_razorfen_kraul() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_AGATHELOS_WARD:
+                m_mGoEntryGuidStore[GO_AGATHELOS_WARD] = pGo->GetObjectGuid();
+                if (m_auiEncounter[0] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            }
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_WARD_KEEPER:
+                ++m_uiWardKeepersRemaining;
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_AGATHELOS:
+                --m_uiWardKeepersRemaining;
+                if (!m_uiWardKeepersRemaining)
+                {
+                    m_auiEncounter[0] = uiData;
+                    DoUseDoorOrButton(GO_AGATHELOS_WARD);
+                }
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+
+                saveStream << m_auiEncounter[0];
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case TYPE_AGATHELOS:
+                return m_auiEncounter[0];
+            }
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint8 m_uiWardKeepersRemaining;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_razorfen_kraul(pMap);
+    }
+};
+
+void AddSC_instance_razorfen_kraul()
+{
+    Script* s;
+    s = new is_razorfen_kraul();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_razorfen_kraul";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_razorfen_kraul;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp b/src/modules/SD3/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp
new file mode 100644
index 000000000..baffd3924
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp
@@ -0,0 +1,341 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Razorfen_Kraul
+ * SD%Complete: 100
+ * SDComment:   Quest support: 1144, 1221.
+ * SDCategory:  Razorfen Kraul
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * quest_willix_the_importer
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "pet_ai.h"
+
+/*######
+## npc_willix_the_importer
+######*/
+
+enum
+{
+    QUEST_WILLIX_THE_IMPORTER  = 1144,
+
+    SAY_WILLIX_READY           = -1047000,
+    SAY_WILLIX_1               = -1047001,
+    SAY_WILLIX_2               = -1047002,
+    SAY_WILLIX_3               = -1047003,
+    SAY_WILLIX_4               = -1047004,
+    SAY_WILLIX_5               = -1047005,
+    SAY_WILLIX_6               = -1047006,
+    SAY_WILLIX_7               = -1047007,
+    SAY_WILLIX_END             = -1047008,
+
+    SAY_WILLIX_AGGRO_1         = -1047009,
+    SAY_WILLIX_AGGRO_2         = -1047010,
+    SAY_WILLIX_AGGRO_3         = -1047011,
+    SAY_WILLIX_AGGRO_4         = -1047012,
+
+    NPC_RAGING_AGAMAR          = 4514
+};
+
+static const float aBoarSpawn[4][3] =
+{
+    {2151.420f, 1733.18f, 52.10f},
+    {2144.463f, 1726.89f, 51.93f},
+    {1956.433f, 1597.97f, 81.75f},
+    {1958.971f, 1599.01f, 81.44f}
+};
+
+struct npc_willix_the_importer : public CreatureScript
+{
+    npc_willix_the_importer() : CreatureScript("npc_willix_the_importer") {}
+
+    struct npc_willix_the_importerAI : public npc_escortAI
+    {
+        npc_willix_the_importerAI(Creature* m_creature) : npc_escortAI(m_creature) { }
+
+        // Exact use of these texts remains unknown, it seems that he should only talk when he initiates the attack or he is the first who is attacked by a npc
+        void Aggro(Unit* pWho) override
+        {
+            switch (urand(0, 6))                                // Not always said
+            {
+            case 0:
+                DoScriptText(SAY_WILLIX_AGGRO_1, m_creature, pWho);
+                break;
+            case 1:
+                DoScriptText(SAY_WILLIX_AGGRO_2, m_creature, pWho);
+                break;
+            case 2:
+                DoScriptText(SAY_WILLIX_AGGRO_3, m_creature, pWho);
+                break;
+            case 3:
+                DoScriptText(SAY_WILLIX_AGGRO_4, m_creature, pWho);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 2:
+                DoScriptText(SAY_WILLIX_1, m_creature);
+                break;
+            case 6:
+                DoScriptText(SAY_WILLIX_2, m_creature);
+                break;
+            case 9:
+                DoScriptText(SAY_WILLIX_3, m_creature);
+                break;
+            case 14:
+                DoScriptText(SAY_WILLIX_4, m_creature);
+                // Summon 2 boars on the pathway
+                m_creature->SummonCreature(NPC_RAGING_AGAMAR, aBoarSpawn[0][0], aBoarSpawn[0][1], aBoarSpawn[0][2], 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                m_creature->SummonCreature(NPC_RAGING_AGAMAR, aBoarSpawn[1][0], aBoarSpawn[1][1], aBoarSpawn[1][2], 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                break;
+            case 25:
+                DoScriptText(SAY_WILLIX_5, m_creature);
+                break;
+            case 33:
+                DoScriptText(SAY_WILLIX_6, m_creature);
+                break;
+            case 44:
+                DoScriptText(SAY_WILLIX_7, m_creature);
+                // Summon 2 boars at the end
+                m_creature->SummonCreature(NPC_RAGING_AGAMAR, aBoarSpawn[2][0], aBoarSpawn[2][1], aBoarSpawn[2][2], 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                m_creature->SummonCreature(NPC_RAGING_AGAMAR, aBoarSpawn[3][0], aBoarSpawn[3][1], aBoarSpawn[3][2], 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                break;
+            case 45:
+                DoScriptText(SAY_WILLIX_END, m_creature);
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                // Complete event
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER, m_creature);
+                }
+                SetEscortPaused(true);
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_willix_the_importerAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_WILLIX_THE_IMPORTER)
+        {
+            if (npc_willix_the_importerAI* pEscortAI = dynamic_cast<npc_willix_the_importerAI*>(pCreature->AI()))
+            {
+                // After 4.0.1 set run = true
+                pEscortAI->Start(false, pPlayer, pQuest);
+                DoScriptText(SAY_WILLIX_READY, pCreature, pPlayer);
+                pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_snufflenose_gopher
+######*/
+
+enum
+{
+    SPELL_SNUFFLENOSE_COMMAND   = 8283,
+    NPC_SNUFFLENOSE_GOPHER      = 4781,
+    GO_BLUELEAF_TUBBER          = 20920,
+};
+
+struct npc_snufflenose_gopher : public CreatureScript
+{
+    npc_snufflenose_gopher() : CreatureScript("npc_snufflenose_gopher") {}
+
+    struct npc_snufflenose_gopherAI : public ScriptedPetAI
+    {
+        npc_snufflenose_gopherAI(Creature* pCreature) : ScriptedPetAI(pCreature) { }
+
+        bool m_bIsMovementActive;
+
+        ObjectGuid m_targetTubberGuid;
+
+        void Reset() override
+        {
+            m_bIsMovementActive = false;
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+            {
+                return;
+            }
+
+            if (GameObject* pGo = m_creature->GetMap()->GetGameObject(m_targetTubberGuid))
+            {
+                pGo->SetRespawnTime(5 * MINUTE);
+                pGo->Refresh();
+
+                pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND);
+            }
+
+            m_bIsMovementActive = false;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* /*pInvoker*/, uint32 /*miscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+            {
+                DoFindNewTubber();
+            }
+        }
+
+        // Function to search for new tubber in range
+        void DoFindNewTubber()
+        {
+            std::list<GameObject*> lTubbersInRange;
+            GetGameObjectListWithEntryInGrid(lTubbersInRange, m_creature, GO_BLUELEAF_TUBBER, 40.0f);
+
+            if (lTubbersInRange.empty())
+            {
+                return;
+            }
+
+            lTubbersInRange.sort(ObjectDistanceOrder(m_creature));
+            GameObject* pNearestTubber = NULL;
+
+            // Always need to find new ones
+            for (std::list<GameObject*>::const_iterator itr = lTubbersInRange.begin(); itr != lTubbersInRange.end(); ++itr)
+            {
+#if defined (CLASSIC) || defined (TBC) || defined (WOTLK) || defined (CATA)
+                if (!(*itr)->isSpawned() && (*itr)->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND) && (*itr)->IsWithinLOSInMap(m_creature) && (*itr)->GetDistanceZ(m_creature) <= 6.0f)
+#endif
+#if defined (WOTLK) || defined (CATA)
+            if (!(*itr)->isSpawned() && (*itr)->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND) && (*itr)->IsWithinLOSInMap(m_creature))
+#endif
+                {
+                    pNearestTubber = *itr;
+                    break;
+                }
+            }
+
+            if (!pNearestTubber)
+            {
+                return;
+            }
+            m_targetTubberGuid = pNearestTubber->GetObjectGuid();
+
+            float fX, fY, fZ;
+            pNearestTubber->GetContactPoint(m_creature, fX, fY, fZ);
+            m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+            m_bIsMovementActive = true;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_bIsMovementActive)
+            {
+                ScriptedPetAI::UpdateAI(uiDiff);
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_snufflenose_gopherAI(pCreature);
+    }
+};
+
+struct spell_npc_snufflenose_gopher : public SpellScript
+{
+    spell_npc_snufflenose_gopher() : SpellScript("spell_npc_snufflenose_gopher") {}
+#if defined (CLASSIC) || defined (TBC)
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) override
+#endif
+#if defined (WOTLK) || defined (CATA)
+bool EffectDummyCreature_npc_snufflenose_gopher(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Creature* pCreatureTarget, ObjectGuid /*originalCasterGuid*/)
+#endif
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_SNUFFLENOSE_COMMAND && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (pCreatureTarget->GetEntry() == NPC_SNUFFLENOSE_GOPHER)
+            {
+                if (CreatureAI* pGopherAI = pCreatureTarget->ToCreature()->AI())
+                {
+                    pGopherAI->SendAIEvent(AI_EVENT_CUSTOM_A, pCreatureTarget->ToCreature(), pCreatureTarget->ToCreature());
+                }
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_razorfen_kraul()
+{
+    Script* s;
+    s = new npc_willix_the_importer();
+    s->RegisterSelf();
+    s = new npc_snufflenose_gopher();
+    s->RegisterSelf();
+    s = new spell_npc_snufflenose_gopher();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_willix_the_importer";
+    //pNewScript->GetAI = &GetAI_npc_willix_the_importer;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_willix_the_importer;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_snufflenose_gopher";
+    //pNewScript->GetAI = &GetAI_npc_snufflenose_gopher;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_snufflenose_gopher;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/razorfen_kraul/razorfen_kraul.h b/src/modules/SD3/scripts/kalimdor/razorfen_kraul/razorfen_kraul.h
new file mode 100644
index 000000000..d0796d109
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/razorfen_kraul/razorfen_kraul.h
@@ -0,0 +1,41 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_RFK_H
+#define DEF_RFK_H
+
+enum
+{
+    MAX_ENCOUNTER     = 1,
+
+    TYPE_AGATHELOS    = 1,
+
+    GO_AGATHELOS_WARD = 21099,
+
+    NPC_WARD_KEEPER   = 4625
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
new file mode 100644
index 000000000..ee40b9a10
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
@@ -0,0 +1,397 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Ayamiss
+ * SD%Complete: 80
+ * SDComment:   Timers and summon coords need adjustments
+ * SDCategory:  Ruins of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "ruins_of_ahnqiraj.h"
+
+enum
+{
+    EMOTE_GENERIC_FRENZY    = -1000002,
+
+    SPELL_STINGER_SPRAY     = 25749,
+    SPELL_POISON_STINGER    = 25748,                // only used in phase1
+    // SPELL_SUMMON_SWARMER  = 25844,                // might be 25708    - spells were removed since 2.0.1
+    SPELL_PARALYZE          = 25725,
+    SPELL_LASH              = 25852,
+    SPELL_FRENZY            = 8269,
+    SPELL_TRASH             = 3391,
+
+    SPELL_FEED              = 25721,                // cast by the Larva when reaches the player on the altar
+
+    NPC_LARVA               = 15555,
+    NPC_SWARMER             = 15546,
+    NPC_HORNET              = 15934,
+
+    PHASE_AIR               = 0,
+    PHASE_GROUND            = 1
+};
+
+struct SummonLocation
+{
+    float m_fX, m_fY, m_fZ;
+};
+
+// Spawn locations
+static const SummonLocation aAyamissSpawnLocs[] =
+{
+    { -9674.4707f, 1528.4133f, 22.457f},        // larva
+    { -9701.6005f, 1566.9993f, 24.118f},        // larva
+    { -9647.352f, 1578.062f, 55.32f},           // anchor point for swarmers
+    { -9717.18f, 1517.72f, 27.4677f},           // teleport location - need to be hardcoded because the player is teleported after the larva is summoned
+};
+
+struct boss_ayamiss : public CreatureScript
+{
+    boss_ayamiss() : CreatureScript("boss_ayamiss") {}
+
+    struct boss_ayamissAI : public ScriptedAI
+    {
+        boss_ayamissAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiStingerSprayTimer;
+        uint32 m_uiPoisonStingerTimer;
+        uint32 m_uiSummonSwarmerTimer;
+        uint32 m_uiSwarmerAttackTimer;
+        uint32 m_uiParalyzeTimer;
+        uint32 m_uiLashTimer;
+        uint32 m_uiTrashTimer;
+        uint8 m_uiPhase;
+
+        bool m_bHasFrenzy;
+
+        ObjectGuid m_paralyzeTarget;
+        GuidList m_lSwarmersGuidList;
+
+        void Reset() override
+        {
+            m_uiStingerSprayTimer = urand(20000, 30000);
+            m_uiPoisonStingerTimer = 5000;
+            m_uiSummonSwarmerTimer = 5000;
+            m_uiSwarmerAttackTimer = 60000;
+            m_uiParalyzeTimer = 15000;
+            m_uiLashTimer = urand(5000, 8000);
+            m_uiTrashTimer = urand(3000, 6000);
+
+            m_bHasFrenzy = false;
+
+            m_uiPhase = PHASE_AIR;
+            SetCombatMovement(false);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            m_creature->SetLevitate(true);
+            m_creature->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() + 15.0f);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // store the swarmers for a future attack
+            if (pSummoned->GetEntry() == NPC_SWARMER)
+            {
+                m_lSwarmersGuidList.push_back(pSummoned->GetObjectGuid());
+            }
+            // move the larva to paralyze target position
+            else if (pSummoned->GetEntry() == NPC_LARVA)
+            {
+                pSummoned->SetWalk(false);
+                pSummoned->GetMotionMaster()->MovePoint(1, aAyamissSpawnLocs[3].m_fX, aAyamissSpawnLocs[3].m_fY, aAyamissSpawnLocs[3].m_fZ);
+            }
+            else if (pSummoned->GetEntry() == NPC_HORNET)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 /*uiMotionType*/, uint32 uiPointId) override
+        {
+            if (uiPointId != 1 || pSummoned->GetEntry() != NPC_LARVA)
+            {
+                return;
+            }
+
+            // Cast feed on target
+            if (Unit* pTarget = m_creature->GetMap()->GetUnit(m_paralyzeTarget))
+            {
+                pSummoned->CastSpell(pTarget, SPELL_FEED, true, NULL, NULL, m_creature->GetObjectGuid());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (!m_bHasFrenzy && m_creature->GetHealthPercent() < 20.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_GENERIC_FRENZY, m_creature);
+                    m_bHasFrenzy = true;
+                }
+            }
+
+            // Stinger Spray
+            if (m_uiStingerSprayTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_STINGER_SPRAY) == CAST_OK)
+                {
+                    m_uiStingerSprayTimer = urand(15000, 20000);
+                }
+            }
+            else
+            {
+                m_uiStingerSprayTimer -= uiDiff;
+            }
+
+            // Paralyze
+            if (m_uiParalyzeTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_PARALYZE, SELECT_FLAG_PLAYER);
+                if (!pTarget)
+                {
+                    pTarget = m_creature->getVictim();
+                }
+
+                if (DoCastSpellIfCan(pTarget, SPELL_PARALYZE) == CAST_OK)
+                {
+                    m_paralyzeTarget = pTarget->GetObjectGuid();
+                    m_uiParalyzeTimer = 15000;
+
+                    // Summon a larva
+                    uint8 uiLoc = urand(0, 1);
+                    m_creature->SummonCreature(NPC_LARVA, aAyamissSpawnLocs[uiLoc].m_fX, aAyamissSpawnLocs[uiLoc].m_fY, aAyamissSpawnLocs[uiLoc].m_fZ, 0, TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN, 30000);
+                }
+            }
+            else
+            {
+                m_uiParalyzeTimer -= uiDiff;
+            }
+
+            // Summon Swarmer
+            if (m_uiSummonSwarmerTimer < uiDiff)
+            {
+                // The spell which summons these guys was removed in 2.0.1 -> therefore we need to summon them manually at a random location around the area
+                // The summon locations is guesswork - the real location is supposed to be handled by world triggers
+                // There should be about 24 swarmers per min
+                float fX, fY, fZ;
+                for (uint8 i = 0; i < 2; ++i)
+                {
+                    m_creature->GetRandomPoint(aAyamissSpawnLocs[2].m_fX, aAyamissSpawnLocs[2].m_fY, aAyamissSpawnLocs[2].m_fZ, 80.0f, fX, fY, fZ);
+                    m_creature->SummonCreature(NPC_SWARMER, fX, fY, aAyamissSpawnLocs[2].m_fZ, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                }
+                m_uiSummonSwarmerTimer = 5000;
+            }
+            else
+            {
+                m_uiSummonSwarmerTimer -= uiDiff;
+            }
+
+            // All the swarmers attack at a certain period of time
+            if (m_uiSwarmerAttackTimer < uiDiff)
+            {
+                for (GuidList::const_iterator itr = m_lSwarmersGuidList.begin(); itr != m_lSwarmersGuidList.end(); ++itr)
+                {
+                    if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        {
+                            pTemp->AI()->AttackStart(pTarget);
+                        }
+                    }
+                }
+                m_lSwarmersGuidList.clear();
+                m_uiSwarmerAttackTimer = 60000;
+            }
+            else
+            {
+                m_uiSwarmerAttackTimer -= uiDiff;
+            }
+
+            if (m_uiPhase == PHASE_AIR)
+            {
+                // Start ground phase at 70% of HP
+                if (m_creature->GetHealthPercent() <= 70.0f)
+                {
+                    m_uiPhase = PHASE_GROUND;
+                    SetCombatMovement(true);
+                    m_creature->SetLevitate(false);
+                    DoResetThreat();
+
+                    if (m_creature->getVictim())
+                    {
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    }
+                }
+
+                // Poison Stinger
+                if (m_uiPoisonStingerTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_POISON_STINGER) == CAST_OK)
+                    {
+                        m_uiPoisonStingerTimer = urand(2000, 3000);
+                    }
+                }
+                else
+                {
+                    m_uiPoisonStingerTimer -= uiDiff;
+                }
+            }
+            else
+            {
+                if (m_uiLashTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_LASH) == CAST_OK)
+                    {
+                        m_uiLashTimer = urand(8000, 15000);
+                    }
+                }
+                else
+                {
+                    m_uiLashTimer -= uiDiff;
+                }
+
+                if (m_uiTrashTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_TRASH) == CAST_OK)
+                    {
+                        m_uiTrashTimer = urand(5000, 7000);
+                    }
+                }
+                else
+                {
+                    m_uiTrashTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ayamissAI(pCreature);
+    }
+};
+
+struct npc_hive_zara_larva : public CreatureScript
+{
+    npc_hive_zara_larva() : CreatureScript("npc_hive_zara_larva") {}
+
+    struct npc_hive_zara_larvaAI : public ScriptedAI
+    {
+        npc_hive_zara_larvaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)m_creature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void AttackStart(Unit* pWho) override
+        {
+            // don't attack anything during the Ayamiss encounter
+            if (m_pInstance)
+            {
+                if (m_pInstance->GetData(TYPE_AYAMISS) == IN_PROGRESS)
+                {
+                    return;
+                }
+            }
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // don't attack anything during the Ayamiss encounter
+            if (m_pInstance)
+            {
+                if (m_pInstance->GetData(TYPE_AYAMISS) == IN_PROGRESS)
+                {
+                    return;
+                }
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (m_pInstance)
+            {
+                if (m_pInstance->GetData(TYPE_AYAMISS) == IN_PROGRESS)
+                {
+                    return;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_hive_zara_larvaAI(pCreature);
+    }
+};
+
+void AddSC_boss_ayamiss()
+{
+    Script* s;
+    s = new boss_ayamiss();
+    s->RegisterSelf();
+    s = new npc_hive_zara_larva();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ayamiss";
+    //pNewScript->GetAI = &GetAI_boss_ayamiss;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_hive_zara_larva";
+    //pNewScript->GetAI = &GetAI_npc_hive_zara_larva;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
new file mode 100644
index 000000000..43ecd769c
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
@@ -0,0 +1,302 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Buru
+ * SD%Complete: 70
+ * SDComment:   Timers; Kill eggs on transform NYI; Egg explode damage and Buru stun are missing
+ * SDCategory:  Ruins of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "ruins_of_ahnqiraj.h"
+
+enum
+{
+    EMOTE_TARGET            = -1509002,
+
+    // boss spells
+    SPELL_CREEPING_PLAGUE   = 20512,
+    SPELL_DISMEMBER         = 96,
+    SPELL_GATHERING_SPEED   = 1834,
+    SPELL_FULL_SPEED        = 1557,
+    SPELL_THORNS            = 25640,
+    SPELL_BURU_TRANSFORM    = 24721,
+
+    // egg spells
+    SPELL_SUMMON_HATCHLING  = 1881,
+    SPELL_EXPLODE           = 19593,
+    SPELL_BURU_EGG_TRIGGER  = 26646,
+
+    // npcs
+    NPC_BURU_EGG_TRIGGER    = 15964,
+    NPC_BURU_EGG            = 15514,
+    NPC_HATCHLING           = 15521,
+
+    PHASE_EGG               = 1,
+    PHASE_TRANSFORM         = 2,
+};
+
+struct boss_buru : public CreatureScript
+{
+    boss_buru() : CreatureScript("boss_buru") {}
+
+    struct boss_buruAI : public ScriptedAI
+    {
+        boss_buruAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint8 m_uiPhase;
+        uint32 m_uiDismemberTimer;
+        uint32 m_uiCreepingPlagueTimer;
+        uint32 m_uiGatheringSpeedTimer;
+        uint32 m_uiFullSpeedTimer;
+
+        void Reset() override
+        {
+            m_uiDismemberTimer = 5000;
+            m_uiGatheringSpeedTimer = 9000;
+            m_uiCreepingPlagueTimer = 0;
+            m_uiFullSpeedTimer = 60000;
+            m_uiPhase = PHASE_EGG;
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            DoScriptText(EMOTE_TARGET, m_creature, pWho);
+            DoCastSpellIfCan(m_creature, SPELL_THORNS);
+            m_creature->FixateTarget(pWho);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            // Attack a new random target when a player is killed
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoAttackNewTarget();
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender->GetEntry() == NPC_BURU_EGG)
+                DoAttackNewTarget();
+        }
+
+        // Wrapper to attack a new target and remove the speed gathering buff
+        void DoAttackNewTarget()
+        {
+            if (m_uiPhase == PHASE_TRANSFORM)
+            {
+                return;
+            }
+
+            m_creature->RemoveAurasDueToSpell(SPELL_FULL_SPEED);
+            m_creature->RemoveAurasDueToSpell(SPELL_GATHERING_SPEED);
+
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_PLAYER))
+            {
+                m_creature->FixateTarget(pTarget);
+                DoScriptText(EMOTE_TARGET, m_creature, pTarget);
+            }
+
+            m_uiFullSpeedTimer = 60000;
+            m_uiGatheringSpeedTimer = 9000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_EGG:
+
+                if (m_uiDismemberTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DISMEMBER) == CAST_OK)
+                    {
+                        m_uiDismemberTimer = 5000;
+                    }
+                }
+                else
+                {
+                    m_uiDismemberTimer -= uiDiff;
+                }
+
+                if (m_uiFullSpeedTimer)
+                {
+                    if (m_uiGatheringSpeedTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_GATHERING_SPEED) == CAST_OK)
+                        {
+                            m_uiGatheringSpeedTimer = 9000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiGatheringSpeedTimer -= uiDiff;
+                    }
+
+                    if (m_uiFullSpeedTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_FULL_SPEED) == CAST_OK)
+                        {
+                            m_uiFullSpeedTimer = 0;
+                        }
+                    }
+                    else
+                    {
+                        m_uiFullSpeedTimer -= uiDiff;
+                    }
+                }
+
+                if (m_creature->GetHealthPercent() < 20.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BURU_TRANSFORM) == CAST_OK)
+                    {
+                        // Not sure of this but the boss should gain full speed in phase II
+                        DoCastSpellIfCan(m_creature, SPELL_FULL_SPEED, CAST_TRIGGERED);
+                        m_creature->RemoveAurasDueToSpell(SPELL_THORNS);
+                        m_creature->FixateTarget(NULL);
+                        m_uiPhase = PHASE_TRANSFORM;
+                    }
+                }
+
+                break;
+            case PHASE_TRANSFORM:
+
+                if (m_uiCreepingPlagueTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_CREEPING_PLAGUE) == CAST_OK)
+                    {
+                        m_uiCreepingPlagueTimer = 6000;
+                    }
+                }
+                else
+                {
+                    m_uiCreepingPlagueTimer -= uiDiff;
+                }
+
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_buruAI(pCreature);
+    }
+};
+
+struct npc_buru_egg : public CreatureScript
+{
+    npc_buru_egg() : CreatureScript("npc_buru_egg") {}
+
+    struct npc_buru_eggAI : public Scripted_NoMovementAI
+    {
+        npc_buru_eggAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override
+        { }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // The purpose of this is unk for the moment
+            if (pSummoned->GetEntry() == NPC_BURU_EGG_TRIGGER)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_BURU_EGG_TRIGGER, true);
+            }
+            // The Hatchling should attack a random target
+            else if (pSummoned->GetEntry() == NPC_HATCHLING)
+            {
+                if (m_pInstance)
+                {
+                    if (Creature* pBuru = m_pInstance->GetSingleCreatureFromStorage(NPC_BURU))
+                    {
+                        if (Unit* pTarget = pBuru->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        {
+                            pSummoned->AI()->AttackStart(pTarget);
+                        }
+                    }
+                }
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            // Explode and Summon hatchling
+            DoCastSpellIfCan(m_creature, SPELL_EXPLODE, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_HATCHLING, CAST_TRIGGERED, m_creature->GetObjectGuid());
+
+            // Reset Buru's target - this might have been done by spell, but currently this is unk to us
+            if (m_pInstance)
+            {
+                if (Creature* pBuru = m_pInstance->GetSingleCreatureFromStorage(NPC_BURU))
+                {
+                    SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pBuru);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_buru_eggAI(pCreature);
+    }
+};
+
+void AddSC_boss_buru()
+{
+    Script* s;
+    s = new boss_buru();
+    s->RegisterSelf();
+    s = new npc_buru_egg();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_buru";
+    //pNewScript->GetAI = &GetAI_boss_buru;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_buru_egg";
+    //pNewScript->GetAI = &GetAI_npc_buru_egg;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
new file mode 100644
index 000000000..bb4758147
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
@@ -0,0 +1,196 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Kurinnaxx
+ * SD%Complete: 90
+ * SDComment:   Summon Player ability NYI
+ * SDCategory:  Ruins of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_TRASH             = 3391,
+    SPELL_WIDE_SLASH        = 25814,
+    SPELL_MORTAL_WOUND      = 25646,
+    SPELL_SANDTRAP          = 25648,        // summons gameobject 180647
+    SPELL_ENRAGE            = 26527,
+    SPELL_SUMMON_PLAYER     = 26446,
+
+    GO_SAND_TRAP            = 180647,
+};
+
+struct boss_kurinnaxx : public CreatureScript
+{
+    boss_kurinnaxx() : CreatureScript("boss_kurinnaxx") {}
+
+    struct boss_kurinnaxxAI : public ScriptedAI
+    {
+        boss_kurinnaxxAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiMortalWoundTimer;
+        uint32 m_uiSandTrapTimer;
+        uint32 m_uiTrashTimer;
+        uint32 m_uiWideSlashTimer;
+        uint32 m_uiTrapTriggerTimer;
+        bool m_bEnraged;
+
+        ObjectGuid m_sandtrapGuid;
+
+        void Reset() override
+        {
+            m_bEnraged = false;
+
+            m_uiMortalWoundTimer = urand(8000, 10000);
+            m_uiSandTrapTimer = urand(5000, 10000);
+            m_uiTrashTimer = urand(1000, 5000);
+            m_uiWideSlashTimer = urand(10000, 15000);
+            m_uiTrapTriggerTimer = 0;
+        }
+
+        void JustSummoned(GameObject* pGo) override
+        {
+            if (pGo->GetEntry() == GO_SAND_TRAP)
+            {
+                m_uiTrapTriggerTimer = 3000;
+                m_sandtrapGuid = pGo->GetObjectGuid();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // If we are belowe 30% HP cast enrage
+            if (!m_bEnraged && m_creature->GetHealthPercent() <= 30.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                {
+                    m_bEnraged = true;
+                }
+            }
+
+            // Mortal Wound
+            if (m_uiMortalWoundTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MORTAL_WOUND) == CAST_OK)
+                {
+                    m_uiMortalWoundTimer = urand(8000, 10000);
+                }
+            }
+            else
+            {
+                m_uiMortalWoundTimer -= uiDiff;
+            }
+
+            // Sand Trap
+            if (m_uiSandTrapTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+                if (!pTarget)
+                {
+                    pTarget = m_creature->getVictim();
+                }
+
+                pTarget->CastSpell(pTarget, SPELL_SANDTRAP, true, NULL, NULL, m_creature->GetObjectGuid());
+                m_uiSandTrapTimer = urand(10000, 15000);
+            }
+            else
+            {
+                m_uiSandTrapTimer -= uiDiff;
+            }
+
+            // Trigger the sand trap in 3 secs after spawn
+            if (m_uiTrapTriggerTimer)
+            {
+                if (m_uiTrapTriggerTimer <= uiDiff)
+                {
+                    if (GameObject* pTrap = m_creature->GetMap()->GetGameObject(m_sandtrapGuid))
+                    {
+                        pTrap->Use(m_creature);
+                    }
+                    m_uiTrapTriggerTimer = 0;
+                }
+                else
+                {
+                    m_uiTrapTriggerTimer -= uiDiff;
+                }
+            }
+
+            // Wide Slash
+            if (m_uiWideSlashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_WIDE_SLASH) == CAST_OK)
+                {
+                    m_uiWideSlashTimer = urand(12000, 15000);
+                }
+            }
+            else
+            {
+                m_uiWideSlashTimer -= uiDiff;
+            }
+
+            // Trash
+            if (m_uiTrashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_TRASH) == CAST_OK)
+                {
+                    m_uiTrashTimer = urand(12000, 17000);
+                }
+            }
+            else
+            {
+                m_uiTrashTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_kurinnaxxAI(pCreature);
+    }
+};
+
+void AddSC_boss_kurinnaxx()
+{
+    Script* s;
+    s = new boss_kurinnaxx();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_kurinnaxx";
+    //pNewScript->GetAI = &GetAI_boss_kurinnaxx;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
new file mode 100644
index 000000000..d619816e9
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
@@ -0,0 +1,196 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Moam
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Ruins of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    EMOTE_AGGRO              = -1509000,
+    EMOTE_MANA_FULL          = -1509001,
+    EMOTE_ENERGIZING         = -1509028,
+
+    SPELL_TRAMPLE            = 15550,
+    SPELL_DRAIN_MANA         = 25671,
+    SPELL_ARCANE_ERUPTION    = 25672,
+    SPELL_SUMMON_MANAFIEND_1 = 25681,
+    SPELL_SUMMON_MANAFIEND_2 = 25682,
+    SPELL_SUMMON_MANAFIEND_3 = 25683,
+    SPELL_ENERGIZE           = 25685,
+
+    PHASE_ATTACKING          = 0,
+    PHASE_ENERGIZING         = 1
+};
+
+struct boss_moam : public CreatureScript
+{
+    boss_moam() : CreatureScript("boss_moam") {}
+
+    struct boss_moamAI : public ScriptedAI
+    {
+        boss_moamAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint8 m_uiPhase;
+
+        uint32 m_uiTrampleTimer;
+        uint32 m_uiManaDrainTimer;
+        uint32 m_uiCheckoutManaTimer;
+        uint32 m_uiSummonManaFiendsTimer;
+
+        void Reset() override
+        {
+            m_uiTrampleTimer = 9000;
+            m_uiManaDrainTimer = 3000;
+            m_uiSummonManaFiendsTimer = 90000;
+            m_uiCheckoutManaTimer = 1500;
+            m_uiPhase = PHASE_ATTACKING;
+            m_creature->SetPower(POWER_MANA, 0);
+            m_creature->SetMaxPower(POWER_MANA, 0);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(EMOTE_AGGRO, m_creature);
+#if defined (CLASSIC) || defined (TBC) || defined (WOTLK)
+            m_creature->SetMaxPower(POWER_MANA, m_creature->GetCreatureInfo()->MaxLevelMana);
+#endif
+#if defined (CATA)
+            m_creature->SetMaxPower(POWER_MANA, m_creature->GetCreatureInfo()->maxmana);// TODO MaxLevelHealth);
+#endif
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_ATTACKING:
+                if (m_uiCheckoutManaTimer <= uiDiff)
+                {
+                    m_uiCheckoutManaTimer = 1500;
+                    if (m_creature->GetPower(POWER_MANA) * 100 / m_creature->GetMaxPower(POWER_MANA) > 75.0f)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_ENERGIZE);
+                        DoScriptText(EMOTE_ENERGIZING, m_creature);
+                        m_uiPhase = PHASE_ENERGIZING;
+                        return;
+                    }
+                }
+                else
+                {
+                    m_uiCheckoutManaTimer -= uiDiff;
+                }
+
+                if (m_uiSummonManaFiendsTimer <= uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_SUMMON_MANAFIEND_1, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_SUMMON_MANAFIEND_2, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_SUMMON_MANAFIEND_3, CAST_TRIGGERED);
+                    m_uiSummonManaFiendsTimer = 90000;
+                }
+                else
+                {
+                    m_uiSummonManaFiendsTimer -= uiDiff;
+                }
+
+                if (m_uiManaDrainTimer <= uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_DRAIN_MANA, SELECT_FLAG_POWER_MANA))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_DRAIN_MANA) == CAST_OK)
+                        {
+                            m_uiManaDrainTimer = urand(2000, 6000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiManaDrainTimer -= uiDiff;
+                }
+
+                if (m_uiTrampleTimer <= uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_TRAMPLE);
+                    m_uiTrampleTimer = 15000;
+                }
+                else
+                {
+                    m_uiTrampleTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+                break;
+            case PHASE_ENERGIZING:
+                if (m_uiCheckoutManaTimer <= uiDiff)
+                {
+                    m_uiCheckoutManaTimer = 1500;
+                    if (m_creature->GetPower(POWER_MANA) == m_creature->GetMaxPower(POWER_MANA))
+                    {
+                        m_creature->RemoveAurasDueToSpell(SPELL_ENERGIZE);
+                        DoCastSpellIfCan(m_creature, SPELL_ARCANE_ERUPTION);
+                        DoScriptText(EMOTE_MANA_FULL, m_creature);
+                        m_uiPhase = PHASE_ATTACKING;
+                        return;
+                    }
+                }
+                else
+                {
+                    m_uiCheckoutManaTimer -= uiDiff;
+                }
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_moamAI(pCreature);
+    }
+};
+
+void AddSC_boss_moam()
+{
+    Script* s;
+    s = new boss_moam();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_moam";
+    //pNewScript->GetAI = &GetAI_boss_moam;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
new file mode 100644
index 000000000..6057463b2
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
@@ -0,0 +1,353 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Ossirian
+ * SD%Complete: 80
+ * SDComment:   Weather missing
+ * SDCategory:  Ruins of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "ruins_of_ahnqiraj.h"
+
+enum
+{
+    SAY_SUPREME_1           = -1509018,
+    SAY_SUPREME_2           = -1509019,
+    SAY_SUPREME_3           = -1509020,
+    SAY_RAND_INTRO_1        = -1509021,
+    SAY_RAND_INTRO_2        = -1509023,
+    SAY_RAND_INTRO_3        = -1509024,
+    SAY_AGGRO               = -1509025,
+    SAY_SLAY                = -1509026,
+    SAY_DEATH               = -1509027,
+
+    SPELL_SILENCE           = 25195,
+    SPELL_CYCLONE           = 25189,
+    SPELL_STOMP             = 25188,
+    SPELL_SUPREME           = 25176,
+    SPELL_SUMMON_CRYSTAL    = 25192,
+    SPELL_SAND_STORM        = 25160,                        // tornado spell
+    SPELL_SUMMON            = 20477,                        // TODO NYI
+
+    MAX_CRYSTAL_POSITIONS   = 1,                            // TODO
+
+    SPELL_WEAKNESS_FIRE     = 25177,
+    SPELL_WEAKNESS_FROST    = 25178,
+    SPELL_WEAKNESS_NATURE   = 25180,
+    SPELL_WEAKNESS_ARCANE   = 25181,
+    SPELL_WEAKNESS_SHADOW   = 25183,
+
+    NPC_SAND_VORTEX         = 15428,                        // tornado npc
+};
+
+static const float aSandVortexSpawnPos[2][4] =
+{
+    { -9523.482f, 1880.435f, 85.645f, 5.08f},
+    { -9321.39f,  1822.968f, 84.266f, 3.16f},
+};
+
+static const float aCrystalSpawnPos[3] = { -9355.75f, 1905.43f, 85.55f};
+static const uint32 aWeaknessSpell[] = {SPELL_WEAKNESS_FIRE, SPELL_WEAKNESS_FROST, SPELL_WEAKNESS_NATURE, SPELL_WEAKNESS_ARCANE, SPELL_WEAKNESS_SHADOW};
+
+struct boss_ossirian : public CreatureScript
+{
+    boss_ossirian() : CreatureScript("boss_ossirian") {}
+
+    struct boss_ossirianAI : public ScriptedAI
+    {
+
+        boss_ossirianAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)m_creature->GetInstanceData();
+            m_bSaidIntro = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiSupremeTimer;
+        uint32 m_uiCycloneTimer;
+        uint32 m_uiStompTimer;
+        uint32 m_uiSilenceTimer;
+        uint8 m_uiCrystalPosition;
+
+        bool m_bSaidIntro;
+
+        void Reset() override
+        {
+            m_uiCrystalPosition = 0;
+            m_uiCycloneTimer = 20000;
+            m_uiStompTimer = 30000;
+            m_uiSilenceTimer = 30000;
+            m_uiSupremeTimer = 45000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_SUPREME, CAST_TRIGGERED);
+            DoScriptText(SAY_AGGRO, m_creature);
+            DoSpawnNextCrystal();
+
+            for (uint8 i = 0; i < countof(aSandVortexSpawnPos); ++i)
+            {
+                m_creature->SummonCreature(NPC_SAND_VORTEX, aSandVortexSpawnPos[i][0], aSandVortexSpawnPos[i][1], aSandVortexSpawnPos[i][2], aSandVortexSpawnPos[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void DoSpawnNextCrystal()
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            Creature* pOssirianTrigger = NULL;
+            if (m_uiCrystalPosition == 0)
+            {
+                // Respawn static spawned crystal trigger
+                pOssirianTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_OSSIRIAN_TRIGGER);
+                if (pOssirianTrigger && !pOssirianTrigger->IsAlive())
+                {
+                    pOssirianTrigger->Respawn();
+                }
+            }
+            else
+            {
+                // Summon a new crystal trigger at some position depending on m_uiCrystalPosition
+                // Note: the summon points seem to be very random; requires additional research
+                float fX, fY, fZ;
+                m_creature->GetRandomPoint(aCrystalSpawnPos[0], aCrystalSpawnPos[1], aCrystalSpawnPos[2], 100.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_OSSIRIAN_TRIGGER, fX, fY, fZ, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+            }
+            if (!pOssirianTrigger)
+            {
+                return;
+            }
+
+            // Respawn GO near crystal trigger
+            if (GameObject* pCrystal = GetClosestGameObjectWithEntry(pOssirianTrigger, GO_OSSIRIAN_CRYSTAL, 10.0f))
+            {
+                m_pInstance->DoRespawnGameObject(pCrystal->GetObjectGuid(), 5 * MINUTE);
+            }
+
+            // Increase position
+            ++m_uiCrystalPosition %= MAX_CRYSTAL_POSITIONS;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_OSSIRIAN_TRIGGER)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_SUMMON_CRYSTAL, true);
+            }
+            else if (pSummoned->GetEntry() == NPC_SAND_VORTEX)
+            {
+                // The movement of this isn't very clear - may require additional research
+                pSummoned->CastSpell(pSummoned, SPELL_SAND_STORM, true);
+                pSummoned->GetMotionMaster()->MoveRandomAroundPoint(aCrystalSpawnPos[0], aCrystalSpawnPos[1], aCrystalSpawnPos[2], 100.0f);
+            }
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pCaster->GetTypeId() == TYPEID_UNIT && pCaster->GetEntry() == NPC_OSSIRIAN_TRIGGER)
+            {
+                // Check for proper spell id
+                bool bIsWeaknessSpell = false;
+                for (uint8 i = 0; i < countof(aWeaknessSpell); ++i)
+                {
+                    if (pSpell->Id == aWeaknessSpell[i])
+                    {
+                        bIsWeaknessSpell = true;
+                        break;
+                    }
+                }
+                if (!bIsWeaknessSpell)
+                {
+                    return;
+                }
+
+                m_creature->RemoveAurasDueToSpell(SPELL_SUPREME);
+                m_uiSupremeTimer = 45000;
+
+                ((Creature*)pCaster)->ForcedDespawn();
+                DoSpawnNextCrystal();
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // TODO: Range guesswork
+            if (!m_bSaidIntro && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 75.0f, false))
+            {
+                switch (urand(0, 2))
+                {
+                case 0:
+                    DoScriptText(SAY_RAND_INTRO_1, m_creature);
+                    break;
+                case 1:
+                    DoScriptText(SAY_RAND_INTRO_2, m_creature);
+                    break;
+                case 2:
+                    DoScriptText(SAY_RAND_INTRO_3, m_creature);
+                    break;
+                }
+                m_bSaidIntro = true;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Supreme
+            if (m_uiSupremeTimer <= uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUPREME, CAST_AURA_NOT_PRESENT) == CAST_OK)
+                {
+                    switch (urand(0, 2))
+                    {
+                    case 0:
+                        DoScriptText(SAY_SUPREME_1, m_creature);
+                        break;
+                    case 1:
+                        DoScriptText(SAY_SUPREME_2, m_creature);
+                        break;
+                    case 2:
+                        DoScriptText(SAY_SUPREME_3, m_creature);
+                        break;
+                    }
+                    m_uiSupremeTimer = 45000;
+                }
+                else
+                {
+                    m_uiSupremeTimer = 5000;
+                }
+            }
+            else
+            {
+                m_uiSupremeTimer -= uiDiff;
+            }
+
+            // Stomp
+            if (m_uiStompTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_STOMP) == CAST_OK)
+                {
+                    m_uiStompTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiStompTimer -= uiDiff;
+            }
+
+            // Cyclone
+            if (m_uiCycloneTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CYCLONE) == CAST_OK)
+                {
+                    m_uiCycloneTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiCycloneTimer -= uiDiff;
+            }
+
+            // Silence
+            if (m_uiSilenceTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SILENCE) == CAST_OK)
+                {
+                    m_uiSilenceTimer = urand(20000, 30000);
+                }
+            }
+            else
+            {
+                m_uiSilenceTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ossirianAI(pCreature);
+    }
+};
+
+// This is actually a hack for a server-side spell
+struct go_ossirian_crystal : public GameObjectScript
+{
+    go_ossirian_crystal() : GameObjectScript("go_ossirian_crystal") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        if (Creature* pOssirianTrigger = GetClosestCreatureWithEntry(pGo, NPC_OSSIRIAN_TRIGGER, 10.0f))
+        {
+            pOssirianTrigger->CastSpell(pOssirianTrigger, aWeaknessSpell[urand(0, 4)], false);
+        }
+
+        return true;
+    }
+};
+
+void AddSC_boss_ossirian()
+{
+    Script* s;
+    s = new boss_ossirian();
+    s->RegisterSelf();
+    s = new go_ossirian_crystal();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ossirian";
+    //pNewScript->GetAI = &GetAI_boss_ossirian;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_ossirian_crystal";
+    //pNewScript->pGOUse = &GOUse_go_ossirian_crystal;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
new file mode 100644
index 000000000..bc892fac0
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
@@ -0,0 +1,457 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Rajaxx
+ * SD%Complete: 100
+ * SDComment:   General Andorov script
+ * SDCategory:  Ruins of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "ruins_of_ahnqiraj.h"
+
+enum
+{
+    // Event yells
+    SAY_ANDOROV_INTRO_1         = -1509004,
+    SAY_ANDOROV_INTRO_2         = -1509031,
+    SAY_ANDOROV_INTRO_3         = -1509003,
+    SAY_ANDOROV_INTRO_4         = -1509029,
+    SAY_ANDOROV_ATTACK_START    = -1509030,
+
+    // Rajaxx kills Andorov
+    SAY_KILLS_ANDOROV           = -1509016,
+
+    // probably related to the opening of AQ event
+    SAY_UNK1                    = -1509011,
+    SAY_UNK2                    = -1509012,
+    SAY_UNK3                    = -1509013,
+    SAY_UNK4                    = -1509014,
+
+    // gossip items
+    GOSSIP_TEXT_ID_INTRO        = 7883,
+    GOSSIP_TEXT_ID_TRADE        = 8305,
+
+    GOSSIP_ITEM_START           = -3509000,
+    GOSSIP_ITEM_TRADE           = -3509001,
+
+    // Andorov spells
+    SPELL_AURA_OF_COMMAND       = 25516,
+    SPELL_BASH                  = 25515,
+    SPELL_STRIKE                = 22591,
+
+    // Kaldorei spell
+    SPELL_CLEAVE                = 26350,
+    SPELL_MORTAL_STRIKE         = 16856,
+
+    POINT_ID_MOVE_INTRO         = 2,
+    POINT_ID_MOVE_ATTACK        = 4,
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {SAY_ANDOROV_INTRO_1,       NPC_GENERAL_ANDOROV,    7000},
+    {SAY_ANDOROV_INTRO_2,       NPC_GENERAL_ANDOROV,    0},
+    {SAY_ANDOROV_INTRO_3,       NPC_GENERAL_ANDOROV,    4000},
+    {SAY_ANDOROV_INTRO_4,       NPC_GENERAL_ANDOROV,    6000},
+    {SAY_ANDOROV_ATTACK_START,  NPC_GENERAL_ANDOROV,    0},
+    {0, 0, 0},
+};
+
+struct npc_general_andorov : public CreatureScript
+{
+    npc_general_andorov() : CreatureScript("npc_general_andorov") {}
+
+    struct npc_general_andorovAI : public ScriptedAI, private DialogueHelper
+    {
+        npc_general_andorovAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+            m_uiMoveTimer = 5000;
+            m_uiPointId = 0;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiCommandAuraTimer;
+        uint32 m_uiBashTimer;
+        uint32 m_uiStrikeTimer;
+        uint32 m_uiMoveTimer;
+
+        uint8 m_uiPointId;
+
+        void Reset() override
+        {
+            m_uiCommandAuraTimer = urand(1000, 3000);
+            m_uiBashTimer = urand(8000, 11000);
+            m_uiStrikeTimer = urand(2000, 5000);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // If Rajaxx is in range attack him
+            if (pWho->GetEntry() == NPC_RAJAXX && m_creature->IsWithinDistInMap(pWho, 50.0f))
+            {
+                AttackStart(pWho);
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            if (pKiller->GetEntry() != NPC_RAJAXX)
+            {
+                return;
+            }
+
+            // Yell when killed by Rajaxx
+            if (m_pInstance)
+            {
+                if (Creature* pRajaxx = m_pInstance->GetSingleCreatureFromStorage(NPC_RAJAXX))
+                {
+                    DoScriptText(SAY_KILLS_ANDOROV, pRajaxx);
+                }
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            // Start the event when the dialogue is finished
+            if (iEntry == SAY_ANDOROV_ATTACK_START)
+            {
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_RAJAXX, IN_PROGRESS);
+                }
+            }
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 0:
+            case 1:
+            case 3:
+                ++m_uiPointId;
+                m_creature->GetMotionMaster()->MovePoint(m_uiPointId, aAndorovMoveLocs[m_uiPointId].m_fX, aAndorovMoveLocs[m_uiPointId].m_fY, aAndorovMoveLocs[m_uiPointId].m_fZ);
+                break;
+            case POINT_ID_MOVE_INTRO:
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                m_creature->SetFacingTo(aAndorovMoveLocs[3].m_fO);
+                ++m_uiPointId;
+                break;
+            case POINT_ID_MOVE_ATTACK:
+                // Start dialogue only the first time it reaches the point
+                if (m_uiPointId == 4)
+                {
+                    StartNextDialogueText(SAY_ANDOROV_INTRO_3);
+                    ++m_uiPointId;
+                }
+                break;
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+
+            if (m_creature->IsAlive())
+            {
+                // reset to combat position
+                if (m_uiPointId >= 4)
+                {
+                    m_creature->GetMotionMaster()->MovePoint(POINT_ID_MOVE_ATTACK, aAndorovMoveLocs[4].m_fX, aAndorovMoveLocs[4].m_fY, aAndorovMoveLocs[4].m_fZ);
+                }
+                // reset to intro position
+                else
+                {
+                    m_creature->GetMotionMaster()->MovePoint(POINT_ID_MOVE_INTRO, aAndorovMoveLocs[2].m_fX, aAndorovMoveLocs[2].m_fY, aAndorovMoveLocs[2].m_fZ);
+                }
+            }
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        // Wrapper to start initialize Kaldorei followers
+        void DoInitializeFollowers()
+        {
+            if (m_pInstance)
+                m_pInstance->SetData64(TYPE_SIGNAL, m_creature->GetObjectGuid().GetRawValue());   //implemented in the instance script
+        }
+
+        // Wrapper to start the event
+        void DoMoveToEventLocation()
+        {
+            m_creature->GetMotionMaster()->MovePoint(m_uiPointId, aAndorovMoveLocs[m_uiPointId].m_fX, aAndorovMoveLocs[m_uiPointId].m_fY, aAndorovMoveLocs[m_uiPointId].m_fZ);
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            StartNextDialogueText(SAY_ANDOROV_INTRO_1);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (m_uiMoveTimer)
+            {
+                if (m_uiMoveTimer <= uiDiff)
+                {
+                    m_creature->SetWalk(false);
+                    m_creature->GetMotionMaster()->MovePoint(m_uiPointId, aAndorovMoveLocs[m_uiPointId].m_fX, aAndorovMoveLocs[m_uiPointId].m_fY, aAndorovMoveLocs[m_uiPointId].m_fZ);
+
+                    DoInitializeFollowers();
+                    m_uiMoveTimer = 0;
+                }
+                else
+                {
+                    m_uiMoveTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiBashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_BASH) == CAST_OK)
+                {
+                    m_uiBashTimer = urand(12000, 15000);
+                }
+            }
+            else
+            {
+                m_uiBashTimer -= uiDiff;
+            }
+
+            if (m_uiStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_STRIKE) == CAST_OK)
+                {
+                    m_uiStrikeTimer = urand(4000, 6000);
+                }
+            }
+            else
+            {
+                m_uiStrikeTimer -= uiDiff;
+            }
+
+            if (m_uiCommandAuraTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_AURA_OF_COMMAND) == CAST_OK)
+                {
+                    m_uiCommandAuraTimer = urand(30000, 45000);
+                }
+            }
+            else
+            {
+                m_uiCommandAuraTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_general_andorovAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_RAJAXX) == IN_PROGRESS)
+            {
+                return true;
+            }
+
+            if (pInstance->GetData(TYPE_RAJAXX) == NOT_STARTED || pInstance->GetData(TYPE_RAJAXX) == FAIL)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            }
+
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_VENDOR, GOSSIP_ITEM_TRADE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_INTRO, pCreature->GetObjectGuid());
+        }
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            if (npc_general_andorovAI* pAndorovAI = dynamic_cast<npc_general_andorovAI*>(pCreature->AI()))
+            {
+                pAndorovAI->DoMoveToEventLocation();
+            }
+
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        if (uiAction == GOSSIP_ACTION_TRADE)
+        {
+            pPlayer->SEND_VENDORLIST(pCreature->GetObjectGuid());
+        }
+
+        return true;
+    }
+};
+
+struct npc_kaldorei_elite : public CreatureScript
+{
+    npc_kaldorei_elite() : CreatureScript("npc_kaldorei_elite") {}
+
+    struct npc_kaldorei_eliteAI : public ScriptedAI
+    {
+        npc_kaldorei_eliteAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiStrikeTimer;
+
+        void Reset() override
+        {
+            m_uiCleaveTimer = urand(2000, 4000);
+            m_uiStrikeTimer = urand(8000, 11000);
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+
+            // reset only to the last position
+            if (m_creature->IsAlive())
+            {
+                if (Creature* pAndorov = m_pInstance->GetSingleCreatureFromStorage(NPC_GENERAL_ANDOROV))
+                {
+                    if (pAndorov->IsAlive())
+                    {
+                        m_creature->GetMotionMaster()->MoveFollow(pAndorov, m_creature->GetDistance(pAndorov), m_creature->GetAngle(pAndorov));
+                    }
+                }
+            }
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                {
+                    m_uiCleaveTimer = urand(5000, 7000);
+                }
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            if (m_uiStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MORTAL_STRIKE) == CAST_OK)
+                {
+                    m_uiStrikeTimer = urand(9000, 13000);
+                }
+            }
+            else
+            {
+                m_uiStrikeTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kaldorei_eliteAI(pCreature);
+    }
+};
+
+void AddSC_boss_rajaxx()
+{
+    Script* s;
+    s = new npc_general_andorov();
+    s->RegisterSelf();
+    s = new npc_kaldorei_elite();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_general_andorov";
+    //pNewScript->GetAI = &GetAI_npc_general_andorov;
+    //pNewScript->pGossipHello = &GossipHello_npc_general_andorov;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_general_andorov;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kaldorei_elite";
+    //pNewScript->GetAI = &GetAI_npc_kaldorei_elite;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
new file mode 100644
index 000000000..3f5a3419f
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
@@ -0,0 +1,501 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Ruins_of_Ahnqiraj
+ * SD%Complete: 80
+ * SDComment:   It's not clear if the Rajaxx event should reset if Andorov dies, or party wipes.
+ * SDCategory:  Ruins of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "ruins_of_ahnqiraj.h"
+
+struct SortingParameters
+{
+    uint32 m_uiEntry;
+    int32 m_uiYellEntry;
+    float m_fSearchDist;
+};
+
+static const SortingParameters aArmySortingParameters[MAX_ARMY_WAVES] =
+{
+    { NPC_CAPTAIN_QEEZ, 0, 20.0f },
+    { NPC_CAPTAIN_TUUBID, 0, 22.0f },
+    { NPC_CAPTAIN_DRENN, SAY_WAVE3, 22.0f },
+    { NPC_CAPTAIN_XURREM, SAY_WAVE4, 22.0f },
+    { NPC_MAJOR_YEGGETH, SAY_WAVE5, 20.0f },
+    { NPC_MAJOR_PAKKON, SAY_WAVE6, 21.0f },
+    { NPC_COLONEL_ZERRAN, SAY_WAVE7, 17.0f },
+};
+
+// Spawn coords for Andorov and his team
+static const SpawnLocation aAndorovSpawnLocs[MAX_HELPERS] =
+{
+    { NPC_GENERAL_ANDOROV, -8660.4f, 1510.29f, 32.449f, 2.2184f },
+    { NPC_KALDOREI_ELITE, -8655.84f, 1509.78f, 32.462f, 2.33341f },
+    { NPC_KALDOREI_ELITE, -8657.39f, 1506.28f, 32.418f, 2.33346f },
+    { NPC_KALDOREI_ELITE, -8660.96f, 1504.9f, 32.1567f, 2.33306f },
+    { NPC_KALDOREI_ELITE, -8664.45f, 1506.44f, 32.0944f, 2.33302f }
+};
+
+struct is_ruins_of_ahnqiraj : public InstanceScript
+{
+    is_ruins_of_ahnqiraj() : InstanceScript("instance_ruins_of_ahnqiraj") {}
+
+    class instance_ruins_of_ahnqiraj : public ScriptedInstance
+    {
+    public:
+        instance_ruins_of_ahnqiraj(Map* pMap) : ScriptedInstance(pMap),
+            m_uiArmyDelayTimer(0),
+            m_uiCurrentArmyWave(0)
+        {
+            Initialize();
+        }
+
+        ~instance_ruins_of_ahnqiraj() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        // bool IsEncounterInProgress() const override;              // not active in AQ20
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_OSSIRIAN_TRIGGER:
+                // Only store static spawned
+                if (pCreature->IsTemporarySummon())
+                {
+                    break;
+                }
+            case NPC_BURU:
+            case NPC_OSSIRIAN:
+            case NPC_RAJAXX:
+            case NPC_GENERAL_ANDOROV:
+            case NPC_COLONEL_ZERRAN:
+            case NPC_MAJOR_PAKKON:
+            case NPC_MAJOR_YEGGETH:
+            case NPC_CAPTAIN_XURREM:
+            case NPC_CAPTAIN_DRENN:
+            case NPC_CAPTAIN_TUUBID:
+            case NPC_CAPTAIN_QEEZ:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_KALDOREI_ELITE:
+                m_lKaldoreiGuidList.push_back(pCreature->GetObjectGuid());
+                return;
+            }
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            // Spawn andorov if necessary
+            if (m_auiEncounter[TYPE_KURINNAXX] == DONE)
+            {
+                DoSpawnAndorovIfCan();
+            }
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_KURINNAXX:
+                SetData(TYPE_KURINNAXX, IN_PROGRESS);
+                break;
+            case NPC_MOAM:
+                SetData(TYPE_MOAM, IN_PROGRESS);
+                break;
+            case NPC_BURU:
+                SetData(TYPE_BURU, IN_PROGRESS);
+                break;
+            case NPC_AYAMISS:
+                SetData(TYPE_AYAMISS, IN_PROGRESS);
+                break;
+            case NPC_OSSIRIAN:
+                SetData(TYPE_OSSIRIAN, IN_PROGRESS);
+                break;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature)
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_KURINNAXX:
+                SetData(TYPE_KURINNAXX, FAIL);
+                break;
+            case NPC_MOAM:
+                SetData(TYPE_MOAM, FAIL);
+                break;
+            case NPC_BURU:
+                SetData(TYPE_BURU, FAIL);
+                break;
+            case NPC_AYAMISS:
+                SetData(TYPE_AYAMISS, FAIL);
+                break;
+            case NPC_OSSIRIAN:
+                SetData(TYPE_OSSIRIAN, FAIL);
+                break;
+            case NPC_RAJAXX:
+                // Rajaxx yells on evade
+                DoScriptText(SAY_DEAGGRO, pCreature);
+                // no break;
+            case NPC_COLONEL_ZERRAN:
+            case NPC_MAJOR_PAKKON:
+            case NPC_MAJOR_YEGGETH:
+            case NPC_CAPTAIN_XURREM:
+            case NPC_CAPTAIN_DRENN:
+            case NPC_CAPTAIN_TUUBID:
+            case NPC_CAPTAIN_QEEZ:
+                SetData(TYPE_RAJAXX, FAIL);
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_KURINNAXX:
+                SetData(TYPE_KURINNAXX, DONE);
+                break;
+            case NPC_RAJAXX:
+                SetData(TYPE_RAJAXX, DONE);
+                break;
+            case NPC_MOAM:
+                SetData(TYPE_MOAM, DONE);
+                break;
+            case NPC_BURU:
+                SetData(TYPE_BURU, DONE);
+                break;
+            case NPC_AYAMISS:
+                SetData(TYPE_AYAMISS, DONE);
+                break;
+            case NPC_OSSIRIAN:
+                SetData(TYPE_OSSIRIAN, DONE);
+                break;
+            case NPC_COLONEL_ZERRAN:
+            case NPC_MAJOR_PAKKON:
+            case NPC_MAJOR_YEGGETH:
+            case NPC_CAPTAIN_XURREM:
+            case NPC_CAPTAIN_DRENN:
+            case NPC_CAPTAIN_TUUBID:
+            case NPC_CAPTAIN_QEEZ:
+            case NPC_QIRAJI_WARRIOR:
+            case NPC_SWARMGUARD_NEEDLER:
+                // If event isn't started by Andorov, return
+                if (GetData(TYPE_RAJAXX) != IN_PROGRESS)
+                {
+                    return;
+                }
+
+                // Check if the dead creature belongs to the current wave
+                if (m_sArmyWavesGuids[m_uiCurrentArmyWave - 1].find(pCreature->GetObjectGuid()) != m_sArmyWavesGuids[m_uiCurrentArmyWave - 1].end())
+                {
+                    m_sArmyWavesGuids[m_uiCurrentArmyWave - 1].erase(pCreature->GetObjectGuid());
+
+                    // If all the soldiers from the current wave are dead, then send the next one
+                    if (m_sArmyWavesGuids[m_uiCurrentArmyWave - 1].empty())
+                    {
+                        DoSendNextArmyWave();
+                    }
+                }
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_KURINNAXX:
+                if (uiData == DONE)
+                {
+                    DoSpawnAndorovIfCan();
+
+                    // Yell after kurinnaxx
+                    DoOrSimulateScriptTextForThisInstance(SAY_OSSIRIAN_INTRO, NPC_OSSIRIAN);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_RAJAXX:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                {
+                    DoSortArmyWaves();
+                }
+                if (uiData == DONE)
+                {
+                    if (Creature* pAndorov = GetSingleCreatureFromStorage(NPC_GENERAL_ANDOROV))
+                    {
+                        if (pAndorov->IsAlive())
+                        {
+                            pAndorov->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                        }
+                    }
+                }
+                break;
+            case TYPE_MOAM:
+            case TYPE_BURU:
+            case TYPE_AYAMISS:
+            case TYPE_OSSIRIAN:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2]
+                    << " " << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        void SetData64(uint32 type, uint64 data) override
+        {
+            if (type == TYPE_SIGNAL)
+            {
+                Creature *general = instance->GetCreature(ObjectGuid(data));
+                for (GuidList::const_iterator itr = m_lKaldoreiGuidList.begin(); itr != m_lKaldoreiGuidList.end(); ++itr)
+                {
+                    if (Creature* pKaldorei = instance->GetCreature(*itr))
+                    {
+                        pKaldorei->GetMotionMaster()->MoveFollow(general, pKaldorei->GetDistance(general), pKaldorei->GetAngle(general));
+                    }
+                }
+            }
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (GetData(TYPE_RAJAXX) == IN_PROGRESS)
+            {
+                if (m_uiArmyDelayTimer)
+                {
+                    if (m_uiArmyDelayTimer <= uiDiff)
+                    {
+                        DoSendNextArmyWave();
+                        m_uiArmyDelayTimer = 2 * MINUTE * IN_MILLISECONDS;
+                    }
+                    else
+                    {
+                        m_uiArmyDelayTimer -= uiDiff;
+                    }
+                }
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2]
+                >> m_auiEncounter[3] >> m_auiEncounter[4] >> m_auiEncounter[5];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        void DoSpawnAndorovIfCan()
+        {
+            if (GetSingleCreatureFromStorage(NPC_GENERAL_ANDOROV))
+            {
+                return;
+            }
+
+            Player* pPlayer = GetPlayerInMap();
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            for (uint8 i = 0; i < MAX_HELPERS; ++i)
+            {
+                pPlayer->SummonCreature(aAndorovSpawnLocs[i].m_uiEntry, aAndorovSpawnLocs[i].m_fX, aAndorovSpawnLocs[i].m_fY, aAndorovSpawnLocs[i].m_fZ, aAndorovSpawnLocs[i].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        void DoSortArmyWaves()
+        {
+            std::list<Creature*> lCreatureList;
+
+            // Sort the 7 army waves
+            // We need to use gridsearcher for this, because coords search is too complicated here
+            for (uint8 i = 0; i < MAX_ARMY_WAVES; ++i)
+            {
+                // Clear all the army waves
+                m_sArmyWavesGuids[i].clear();
+                lCreatureList.clear();
+
+                if (Creature* pTemp = GetSingleCreatureFromStorage(aArmySortingParameters[i].m_uiEntry))
+                {
+                    GetCreatureListWithEntryInGrid(lCreatureList, pTemp, NPC_QIRAJI_WARRIOR, aArmySortingParameters[i].m_fSearchDist);
+                    GetCreatureListWithEntryInGrid(lCreatureList, pTemp, NPC_SWARMGUARD_NEEDLER, aArmySortingParameters[i].m_fSearchDist);
+
+                    for (std::list<Creature*>::const_iterator itr = lCreatureList.begin(); itr != lCreatureList.end(); ++itr)
+                    {
+                        if ((*itr)->IsAlive())
+                        {
+                            m_sArmyWavesGuids[i].insert((*itr)->GetObjectGuid());
+                        }
+                    }
+
+                    if (pTemp->IsAlive())
+                    {
+                        m_sArmyWavesGuids[i].insert(pTemp->GetObjectGuid());
+                    }
+                }
+            }
+
+            // send the first wave
+            m_uiCurrentArmyWave = 0;
+            DoSendNextArmyWave();
+        }
+
+        void DoSendNextArmyWave()
+        {
+            // The next army wave is sent into battle after 2 min or after the previous wave is finished
+            if (GetData(TYPE_RAJAXX) != IN_PROGRESS)
+            {
+                return;
+            }
+
+            // The last wave is General Rajaxx itself
+            if (m_uiCurrentArmyWave == MAX_ARMY_WAVES)
+            {
+                if (Creature* pRajaxx = GetSingleCreatureFromStorage(NPC_RAJAXX))
+                {
+                    DoScriptText(SAY_INTRO, pRajaxx);
+                    pRajaxx->SetInCombatWithZone();
+                }
+            }
+            else
+            {
+                // Increase the wave id if some are already dead
+                while (m_sArmyWavesGuids[m_uiCurrentArmyWave].empty())
+                {
+                    ++m_uiCurrentArmyWave;
+                }
+
+                float fX, fY, fZ;
+                for (GuidSet::const_iterator itr = m_sArmyWavesGuids[m_uiCurrentArmyWave].begin(); itr != m_sArmyWavesGuids[m_uiCurrentArmyWave].end(); ++itr)
+                {
+                    if (Creature* pTemp = instance->GetCreature(*itr))
+                    {
+                        if (!pTemp->IsAlive())
+                        {
+                            continue;
+                        }
+
+                        pTemp->SetWalk(false);
+                        pTemp->GetRandomPoint(aAndorovMoveLocs[4].m_fX, aAndorovMoveLocs[4].m_fY, aAndorovMoveLocs[4].m_fZ, 10.0f, fX, fY, fZ);
+                        pTemp->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                    }
+                }
+
+                // Yell on each wave (except the first 2)
+                if (aArmySortingParameters[m_uiCurrentArmyWave].m_uiYellEntry)
+                {
+                    if (Creature* pRajaxx = GetSingleCreatureFromStorage(NPC_RAJAXX))
+                    {
+                        DoScriptText(aArmySortingParameters[m_uiCurrentArmyWave].m_uiYellEntry, pRajaxx);
+                    }
+                }
+            }
+
+            // on wowwiki it states that there were 3 min between the waves, but this was reduced in later patches
+            m_uiArmyDelayTimer = 2 * MINUTE * IN_MILLISECONDS;
+            ++m_uiCurrentArmyWave;
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        GuidList m_lKaldoreiGuidList;
+        GuidSet m_sArmyWavesGuids[MAX_ARMY_WAVES];
+
+        uint32 m_uiArmyDelayTimer;
+        uint8 m_uiCurrentArmyWave;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_ruins_of_ahnqiraj(pMap);
+    }
+};
+
+void AddSC_instance_ruins_of_ahnqiraj()
+{
+    Script* s;
+    s = new is_ruins_of_ahnqiraj();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_ruins_of_ahnqiraj";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_ruins_of_ahnqiraj;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.cpp b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.cpp
new file mode 100644
index 000000000..2eb5f9f9c
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.cpp
@@ -0,0 +1,204 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Ruins of Ahn'Qiraj
+ * SD%Complete: 40
+ * SDComment:   None
+ * SDCategory:  Ruins of Ahn'Qiraj
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * mob_anubisath_guardian
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+/*######
+## mob_anubisath_guardian
+######*/
+enum
+{
+    SPELL_METEOR                 = 24340,
+    SPELL_PLAGUE                 = 22997,
+    SPELL_SHADOW_STORM           = 26546,
+    SPELL_THUNDER_CLAP           = 26554,
+    SPELL_REFLECT_ARFR           = 13022,
+    SPELL_REFLECT_FSSH           = 19595,
+    SPELL_ENRAGE                 = 8599,
+    SPELL_EXPLODE                = 25698,
+
+    SPELL_SUMMON_ANUB_SWARMGUARD = 17430,
+    SPELL_SUMMON_ANUB_WARRIOR    = 17431,
+
+    EMOTE_FRENZY                 = -1000002,
+
+    NPC_ANUB_WARRIOR             = 15537,
+    NPC_ANUB_SWARM               = 15538
+};
+
+struct mob_anubisath_guardian : public CreatureScript
+{
+    mob_anubisath_guardian() : CreatureScript("mob_anubisath_guardian") {}
+
+    struct mob_anubisath_guardianAI : public ScriptedAI
+    {
+        mob_anubisath_guardianAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiSpell1;
+        uint32 m_uiSpell2;
+        uint32 m_uiSpell3;
+        uint32 m_uiSpell4;
+        uint32 m_uiSpell5;
+
+        uint32 m_uiSpell1Timer;
+        uint32 m_uiSpell2Timer;
+        uint32 m_uiSpell5Timer;
+
+        uint8 m_uiSummonCount;
+
+        bool m_bIsEnraged;
+
+        void Reset() override
+        {
+            m_uiSpell1 = urand(0, 1) ? SPELL_METEOR : SPELL_PLAGUE;
+            m_uiSpell2 = urand(0, 1) ? SPELL_SHADOW_STORM : SPELL_THUNDER_CLAP;
+            m_uiSpell3 = urand(0, 1) ? SPELL_REFLECT_ARFR : SPELL_REFLECT_FSSH;
+            m_uiSpell4 = urand(0, 1) ? SPELL_ENRAGE : SPELL_EXPLODE;
+            m_uiSpell5 = urand(0, 1) ? SPELL_SUMMON_ANUB_SWARMGUARD : SPELL_SUMMON_ANUB_WARRIOR;
+
+            m_uiSpell1Timer = 10000;
+            m_uiSpell2Timer = 20000;
+            m_uiSpell5Timer = 10000;
+            m_uiSummonCount = 0;
+            m_bIsEnraged = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            // spell reflection
+            DoCastSpellIfCan(m_creature, m_uiSpell3);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature->getVictim());
+            ++m_uiSummonCount;
+        }
+
+        void SummonedCreatureDespawn(Creature* /*pDespawned*/) override
+        {
+            --m_uiSummonCount;
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& /*uiDamage*/) override
+        {
+            // when we reach 10% of HP explode or enrage
+            if (!m_bIsEnraged && m_creature->GetHealthPercent() < 10.0f)
+            {
+                if (m_uiSpell4 == SPELL_ENRAGE)
+                {
+                    DoScriptText(EMOTE_FRENZY, m_creature);
+                    DoCastSpellIfCan(m_creature, m_uiSpell4);
+                    m_bIsEnraged = true;
+                }
+                else
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), m_uiSpell4);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Meteor or Plague
+            if (m_uiSpell1Timer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), m_uiSpell1);
+                m_uiSpell1Timer = 15000;
+            }
+            else
+            {
+                m_uiSpell1Timer -= uiDiff;
+            }
+
+            // Shadow Storm or Thunder Clap
+            if (m_uiSpell2Timer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), m_uiSpell2);
+                m_uiSpell2Timer = 15000;
+            }
+            else
+            {
+                m_uiSpell2Timer -= uiDiff;
+            }
+
+            // summon Anubisath Swarmguard or Anubisath Warrior
+            if (m_uiSpell5Timer < uiDiff)
+            {
+                // change for summon spell
+                if (m_uiSummonCount < 4)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), m_uiSpell5);
+                }
+
+                m_uiSpell5Timer = 15000;
+            }
+            else
+            {
+                m_uiSpell5Timer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_anubisath_guardianAI(pCreature);
+    }
+};
+
+void AddSC_ruins_of_ahnqiraj()
+{
+    Script* s;
+    s = new mob_anubisath_guardian();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_anubisath_guardian";
+    //pNewScript->GetAI = &GetAI_mob_anubisath_guardian;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h
new file mode 100644
index 000000000..8d853802f
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h
@@ -0,0 +1,95 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_RUINS_OF_AHNQIRAJ_H
+#define DEF_RUINS_OF_AHNQIRAJ_H
+
+enum
+{
+    MAX_ENCOUNTER               = 6,
+    MAX_HELPERS                 = 5,
+    TYPE_SIGNAL                 = MAX_ENCOUNTER,
+
+    TYPE_KURINNAXX              = 0,
+    TYPE_RAJAXX                 = 1,
+    TYPE_MOAM                   = 2,
+    TYPE_BURU                   = 3,
+    TYPE_AYAMISS                = 4,
+    TYPE_OSSIRIAN               = 5,
+
+    NPC_KURINNAXX               = 15348,
+    NPC_MOAM                    = 15340,
+    NPC_BURU                    = 15370,
+    NPC_AYAMISS                 = 15369,
+    NPC_OSSIRIAN                = 15339,
+    NPC_GENERAL_ANDOROV         = 15471,                    // The general and the kaldorei are escorted for the rajaxx encounter
+    NPC_KALDOREI_ELITE          = 15473,
+    NPC_RAJAXX                  = 15341,                    // All of the following are used in the rajaxx encounter
+    NPC_COLONEL_ZERRAN          = 15385,
+    NPC_MAJOR_PAKKON            = 15388,
+    NPC_MAJOR_YEGGETH           = 15386,
+    NPC_CAPTAIN_XURREM          = 15390,
+    NPC_CAPTAIN_DRENN           = 15389,
+    NPC_CAPTAIN_TUUBID          = 15392,
+    NPC_CAPTAIN_QEEZ            = 15391,
+    NPC_QIRAJI_WARRIOR          = 15387,
+    NPC_SWARMGUARD_NEEDLER      = 15344,
+
+    MAX_ARMY_WAVES              = 7,
+
+    GO_OSSIRIAN_CRYSTAL         = 180619,                   // Used in the ossirian encounter
+    NPC_OSSIRIAN_TRIGGER        = 15590,                    // Triggers ossirian weakness
+
+    SAY_OSSIRIAN_INTRO          = -1509022,                 // Yelled after Kurinnax dies
+
+    // Rajaxx yells
+    SAY_WAVE3                   = -1509005,
+    SAY_WAVE4                   = -1509006,
+    SAY_WAVE5                   = -1509007,
+    SAY_WAVE6                   = -1509008,
+    SAY_WAVE7                   = -1509009,
+    SAY_INTRO                   = -1509010,
+    SAY_DEAGGRO                 = -1509015,                 // on Rajaxx evade
+    SAY_COMPLETE_QUEST          = -1509017,                 // Yell when realm complete quest 8743 for world event
+};
+
+struct SpawnLocation
+{
+    uint32 m_uiEntry;
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+// Movement locations for Andorov
+static const SpawnLocation aAndorovMoveLocs[] =
+{
+    {0, -8701.51f, 1561.80f, 32.092f, 0.0f},
+    {0, -8718.66f, 1577.69f, 21.612f, 0.0f},
+    {0, -8876.97f, 1651.96f, 21.57f, 5.52f},
+    {0, -8882.15f, 1602.77f, 21.386f, 0.0f},
+    {0, -8940.45f, 1550.69f, 21.616f, 0.0f},
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/kalimdor/silithus.cpp b/src/modules/SD3/scripts/kalimdor/silithus.cpp
new file mode 100644
index 000000000..9bf32684b
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/silithus.cpp
@@ -0,0 +1,791 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Silithus
+ * SD%Complete: 100
+ * SDComment:   Quest support: 8519.
+ * SDCategory:  Silithus
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_anachronos_the_ancient
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+/*###
+## npc_anachronos_the_ancient
+###*/
+
+enum
+{
+    // Dragons
+    NPC_MERITHRA_OF_THE_DREAM           = 15378,
+    NPC_CAELESTRASZ                     = 15379,
+    NPC_ARYGOS                          = 15380,
+    NPC_ANACHRONOS_THE_ANCIENT          = 15381,
+    NPC_ANACHRONOS_QUEST_TRIGGER        = 15454,            // marks some movement for the dragons
+
+    // Elfs
+    NPC_FANDRAL_STAGHELM                = 15382,
+    NPC_KALDOREI_INFANTRY               = 15423,
+
+    // Qiraji warriors
+    NPC_QIRAJI_WASP                     = 15414,
+    NPC_QIRAJI_DRONE                    = 15421,
+    NPC_QIRAJI_TANK                     = 15422,
+    NPC_ANUBISATH_CONQUEROR             = 15424,
+
+    QUEST_A_PAWN_ON_THE_ETERNAL_BOARD   = 8519,
+
+    // Yells -> in chronological order
+    SAY_ANACHRONOS_INTRO_1              = -1000740,
+    SAY_FANDRAL_INTRO_2                 = -1000741,
+    SAY_MERITHRA_INTRO_3                = -1000742,
+    EMOTE_ARYGOS_NOD                    = -1000743,
+    SAY_CAELESTRASZ_INTRO_4             = -1000744,
+    EMOTE_MERITHRA_GLANCE               = -1000745,
+    SAY_MERITHRA_INTRO_5                = -1000746,
+
+    SAY_MERITHRA_ATTACK_1               = -1000747,
+    SAY_ARYGOS_ATTACK_2                 = -1000748,
+    SAY_ARYGOS_ATTACK_3                 = -1000749,
+    SAY_CAELESTRASZ_ATTACK_4            = -1000750,
+    SAY_CAELESTRASZ_ATTACK_5            = -1000751,
+
+    SAY_ANACHRONOS_SEAL_1               = -1000752,
+    SAY_FANDRAL_SEAL_2                  = -1000753,
+    SAY_ANACHRONOS_SEAL_3               = -1000754,
+    SAY_ANACHRONOS_SEAL_4               = -1000755,
+    SAY_ANACHRONOS_SEAL_5               = -1000756,
+    SAY_FANDRAL_SEAL_6                  = -1000757,
+
+    EMOTE_FANDRAL_EXHAUSTED             = -1000758,
+    SAY_ANACHRONOS_EPILOGUE_1           = -1000759,
+    SAY_ANACHRONOS_EPILOGUE_2           = -1000760,
+    SAY_ANACHRONOS_EPILOGUE_3           = -1000761,
+    EMOTE_ANACHRONOS_SCEPTER            = -1000762,
+    SAY_FANDRAL_EPILOGUE_4              = -1000763,
+    SAY_FANDRAL_EPILOGUE_5              = -1000764,
+    EMOTE_FANDRAL_SHATTER               = -1000765,
+    SAY_ANACHRONOS_EPILOGUE_6           = -1000766,
+    SAY_FANDRAL_EPILOGUE_7              = -1000767,
+    EMOTE_ANACHRONOS_DISPPOINTED        = -1000768,
+    EMOTE_ANACHRONOS_PICKUP             = -1000769,
+    SAY_ANACHRONOS_EPILOGUE_8           = -1000770,
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    // The transform spell for Anachronos was removed from DBC
+    DISPLAY_ID_BRONZE_DRAGON            = 15500,
+#endif
+    // Spells
+    SPELL_GREEN_DRAGON_TRANSFORM        = 25105,
+    SPELL_RED_DRAGON_TRANSFORM          = 25106,
+    SPELL_BLUE_DRAGON_TRANSFORM         = 25107,
+#if defined (CLASSIC)  
+    SPELL_BRONZE_DRAGON_TRANSFORM       = 25108,
+#endif
+
+    SPELL_MERITHRA_WAKE                 = 25145,            // should trigger 25172 on targets
+    SPELL_ARYGOS_VENGEANCE              = 25149,
+    SPELL_CAELESTRASZ_MOLTEN_RAIN       = 25150,
+
+    SPELL_TIME_STOP                     = 25158,            // Anachronos stops the battle - should trigger 25171
+    SPELL_GLYPH_OF_WARDING              = 25166,            // Sends event 9427 - should activate Go 176148
+    SPELL_PRISMATIC_BARRIER             = 25159,            // Sends event 9425 - should activate Go 176146
+    SPELL_CALL_ANCIENTS                 = 25167,            // Sends event 9426 - should activate Go 176147
+    SPELL_SHATTER_HAMMER                = 25182,            // Breakes the scepter - needs DB coords
+
+    POINT_ID_DRAGON_ATTACK              = 1,
+    POINT_ID_EXIT                       = 2,
+    POINT_ID_GATE                       = 3,
+    POINT_ID_SCEPTER_1                  = 4,
+    POINT_ID_SCEPTER_2                  = 5,
+    POINT_ID_EPILOGUE                   = 6,
+    DATA_HANDLE_SCEPTER                 = 7,        // dummy members - used in dialogue helper
+    DATA_MERITHRA_ATTACK                = 8,
+    DATA_CAELASTRASZ_ATTACK             = 9,
+
+    MAX_DRAGONS                         = 4,
+    MAX_CONQUERORS                      = 3,
+    MAX_QIRAJI                          = 6,
+    MAX_KALDOREI                        = 20,
+};
+
+/* Known event issues:
+ * The Kaldorei and Qiraji soldiers don't have the correct flags and factions in DB
+ * The Ahn'Qiraj gate gameobjects are missing from DB
+ * The spells used by the dragons upon the Qiraji need core support
+ * The script events sent by the spells which close the AQ gate needs DB support
+ * Can't make Fandral equip the Scepter when Anachronos handles it to him
+ */
+
+static const DialogueEntry aEventDialogue[] =
+{
+    {NPC_ANACHRONOS_THE_ANCIENT,    0,                          2000},  // summon the dragons
+    {SAY_ANACHRONOS_INTRO_1,        NPC_ANACHRONOS_THE_ANCIENT, 3000},
+    {EMOTE_ONESHOT_SHOUT,           NPC_ANACHRONOS_THE_ANCIENT, 3000},  // make Anachronos shout and summon the warriors
+    {SAY_FANDRAL_INTRO_2,           NPC_FANDRAL_STAGHELM,       6000},
+    {EMOTE_MERITHRA_GLANCE,         NPC_MERITHRA_OF_THE_DREAM,  2000},
+    {SAY_MERITHRA_INTRO_3,          NPC_MERITHRA_OF_THE_DREAM,  3000},
+    {EMOTE_ARYGOS_NOD,              NPC_ARYGOS,                 4000},
+    {SAY_CAELESTRASZ_INTRO_4,       NPC_CAELESTRASZ,            9000},
+    {SAY_MERITHRA_INTRO_5,          NPC_MERITHRA_OF_THE_DREAM,  5000},
+    {NPC_ANACHRONOS_QUEST_TRIGGER,  0,                          0},     // send Merithra to fight
+    {DATA_MERITHRA_ATTACK,          0,                          5000},  // make Merithra wait
+    {SAY_MERITHRA_ATTACK_1,         NPC_MERITHRA_OF_THE_DREAM,  1000},
+    {SPELL_GREEN_DRAGON_TRANSFORM,  0,                          6000},
+    {SAY_ARYGOS_ATTACK_2,           NPC_ARYGOS,                 5000},
+    {NPC_ARYGOS,                    0,                          1000},  // send Arygos to fight
+    {POINT_ID_EXIT,                 0,                          4000},  // make Merithra exit
+    {SAY_ARYGOS_ATTACK_3,           NPC_ARYGOS,                 4000},
+    {SPELL_BLUE_DRAGON_TRANSFORM,   0,                          5000},
+    {SPELL_ARYGOS_VENGEANCE,        0,                          7000},
+    {POINT_ID_DRAGON_ATTACK,        0,                          1000},  // make Arygos exit
+    {SAY_CAELESTRASZ_ATTACK_4,      NPC_CAELESTRASZ,            5000},
+    {NPC_CAELESTRASZ,               0,                          0},     // send Caelestrasz to fight
+    {DATA_CAELASTRASZ_ATTACK,       0,                          3000},  // make Caelestrasz wait
+    {SAY_CAELESTRASZ_ATTACK_5,      NPC_CAELESTRASZ,            5000},
+    {SPELL_RED_DRAGON_TRANSFORM,    0,                          4000},  // transform Caelestrasz
+    {SPELL_CAELESTRASZ_MOLTEN_RAIN, 0,                          6000},  // Caelestrasz casts molten rain
+    {SAY_ANACHRONOS_SEAL_1,         NPC_ANACHRONOS_THE_ANCIENT, 5000},
+    {SAY_FANDRAL_SEAL_2,            NPC_FANDRAL_STAGHELM,       3000},
+    {SAY_ANACHRONOS_SEAL_3,         NPC_ANACHRONOS_THE_ANCIENT, 1000},
+    {POINT_ID_GATE,                 0,                          1000},  // send Anachronos to the gate
+    {NPC_FANDRAL_STAGHELM,          0,                          0},     // send Fandral to the gate
+    {SPELL_TIME_STOP,               0,                          7000},  // Anachronos casts Time Stop
+    {SPELL_PRISMATIC_BARRIER,       0,                          15000},
+    {SPELL_GLYPH_OF_WARDING,        0,                          4000},
+    {SAY_ANACHRONOS_SEAL_5,         NPC_ANACHRONOS_THE_ANCIENT, 3000},
+    {SAY_FANDRAL_SEAL_6,            NPC_FANDRAL_STAGHELM,       9000},
+    {EMOTE_FANDRAL_EXHAUSTED,       NPC_FANDRAL_STAGHELM,       1000},
+    {SAY_ANACHRONOS_EPILOGUE_1,     NPC_ANACHRONOS_THE_ANCIENT, 6000},
+    {SAY_ANACHRONOS_EPILOGUE_2,     NPC_ANACHRONOS_THE_ANCIENT, 5000},
+    {SAY_ANACHRONOS_EPILOGUE_3,     NPC_ANACHRONOS_THE_ANCIENT, 15000},
+    {DATA_HANDLE_SCEPTER,           NPC_ANACHRONOS_THE_ANCIENT, 3000},  // handle the scepter
+    {SAY_FANDRAL_EPILOGUE_4,        NPC_FANDRAL_STAGHELM,       3000},
+    {POINT_ID_SCEPTER_2,            0,                          4000},  // make Anachronos stand
+    {SAY_FANDRAL_EPILOGUE_5,        NPC_FANDRAL_STAGHELM,       12000},
+    {EMOTE_FANDRAL_SHATTER,         NPC_FANDRAL_STAGHELM,       3000},
+    {SAY_ANACHRONOS_EPILOGUE_6,     NPC_ANACHRONOS_THE_ANCIENT, 0},
+    {SAY_FANDRAL_EPILOGUE_7,        NPC_FANDRAL_STAGHELM,       8000},
+    {POINT_ID_EPILOGUE,             0,                          4000}, // move Fandral to Anachronos
+    {EMOTE_ANACHRONOS_DISPPOINTED,  NPC_ANACHRONOS_THE_ANCIENT, 1000},
+    {POINT_ID_SCEPTER_1,            0,                          0},    // make Anachronos pick the pieces
+    {0, 0, 0},
+};
+
+struct EventLocations
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+    uint32 m_uiEntry;
+};
+
+static EventLocations aEternalBoardNPCs[MAX_DRAGONS] =
+{
+    { -8029.301f, 1534.612f, 2.609f, 3.121f, NPC_FANDRAL_STAGHELM},
+    { -8034.227f, 1536.580f, 2.609f, 6.161f, NPC_ARYGOS},
+    { -8031.935f, 1532.658f, 2.609f, 1.012f, NPC_CAELESTRASZ},
+    { -8034.106f, 1534.224f, 2.609f, 0.290f, NPC_MERITHRA_OF_THE_DREAM},
+};
+
+static EventLocations aEternalBoardMovement[] =
+{
+    { -8159.951f, 1525.241f, 74.994f, 0.0f, 0 },          // 0 Flight position for dragons
+    { -8106.238f, 1525.948f, 2.639f, 0.0f, 0 },           // 1 Anachronos gate location
+    { -8103.861f, 1525.923f, 2.677f, 0.0f, 0 },           // 2 Fandral gate location
+    { -8107.387f, 1523.641f, 2.609f, 0.0f, 0 },           // 3 Shattered scepter
+    { -8100.921f, 1527.740f, 2.871f, 0.0f, 0 },           // 4 Fandral epilogue location
+    { -8115.270f, 1515.926f, 3.305f, 0.0f, 0 },           // 5 Anachronos gather broken scepter 1
+    { -8116.879f, 1530.615f, 3.762f, 0.0f, 0 },           // 6 Anachronos gather broken scepter 2
+    { -7997.790f, 1548.664f, 3.738f, 0.0f, 0 },           // 7 Fandral exit location
+    { -8061.933f, 1496.196f, 2.556f, 0.0f, 0 },           // 8 Anachronos launch location
+    { -8008.705f, 1446.063f, 44.104f, 0.0f, 0 },          // 9 Anachronos flight location
+    { -8085.748f, 1521.484f, 2.624f, 0.0f, 0 }            // 10 Anchor point for the army summoning
+};
+
+struct npc_anachronos_the_ancient : public CreatureScript
+{
+    npc_anachronos_the_ancient() : CreatureScript("npc_anachronos_the_ancient") {}
+
+    struct npc_anachronos_the_ancientAI : public ScriptedAI, private DialogueHelper
+    {
+        npc_anachronos_the_ancientAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aEventDialogue)
+        {
+        }
+
+        uint32 m_uiEventTimer;
+
+        uint8 m_uiEventStage;
+
+        ObjectGuid m_fandralGuid;
+        ObjectGuid m_merithraGuid;
+        ObjectGuid m_CaelestraszGuid;
+        ObjectGuid m_arygosGuid;
+        ObjectGuid m_playerGuid;
+        ObjectGuid m_triggerGuid;
+
+        GuidList m_lQirajiWarriorsList;
+
+        void Reset() override
+        {
+            // We summon the rest of the dragons on timer
+            m_uiEventTimer = 100;
+            m_uiEventStage = 0;
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case NPC_ANACHRONOS_THE_ANCIENT:
+                // Call the other dragons
+                DoSummonDragons();
+                break;
+            case EMOTE_ONESHOT_SHOUT:
+                // Summon warriors
+                DoSummonWarriors();
+                m_creature->HandleEmote(EMOTE_ONESHOT_SHOUT);
+                break;
+            case SAY_FANDRAL_INTRO_2:
+                if (Creature* pFandral = m_creature->GetMap()->GetCreature(m_fandralGuid))
+                {
+                    pFandral->SetFacingToObject(m_creature);
+                }
+                break;
+            case EMOTE_MERITHRA_GLANCE:
+                if (Creature* pMerithra = m_creature->GetMap()->GetCreature(m_merithraGuid))
+                {
+                    if (Creature* pFandral = m_creature->GetMap()->GetCreature(m_fandralGuid))
+                    {
+                        pFandral->SetFacingToObject(pMerithra);
+                    }
+                }
+                break;
+            case NPC_ANACHRONOS_QUEST_TRIGGER:
+                // Move Merithra to attack
+                if (Creature* pTrigger = GetClosestCreatureWithEntry(m_creature, NPC_ANACHRONOS_QUEST_TRIGGER, 35.0f))
+                {
+                    m_triggerGuid = pTrigger->GetObjectGuid();
+                    if (Creature* pMerithra = m_creature->GetMap()->GetCreature(m_merithraGuid))
+                    {
+                        pMerithra->SetWalk(false);
+                        pMerithra->GetMotionMaster()->MovePoint(POINT_ID_DRAGON_ATTACK, pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ());
+                    }
+                }
+                break;
+            case SPELL_GREEN_DRAGON_TRANSFORM:
+                if (Creature* pMerithra = m_creature->GetMap()->GetCreature(m_merithraGuid))
+                {
+                    pMerithra->CastSpell(pMerithra, SPELL_GREEN_DRAGON_TRANSFORM, false);
+                }
+                break;
+            case SAY_ARYGOS_ATTACK_2:
+                if (Creature* pMerithra = m_creature->GetMap()->GetCreature(m_merithraGuid))
+                {
+                    pMerithra->CastSpell(pMerithra, SPELL_MERITHRA_WAKE, false);
+                }
+                break;
+            case NPC_ARYGOS:
+                // Move Arygos to attack
+                if (Creature* pTrigger = m_creature->GetMap()->GetCreature(m_triggerGuid))
+                {
+                    if (Creature* pArygos = m_creature->GetMap()->GetCreature(m_arygosGuid))
+                    {
+                        pArygos->SetWalk(false);
+                        pArygos->GetMotionMaster()->MovePoint(POINT_ID_DRAGON_ATTACK, pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ());
+                    }
+                }
+                break;
+            case POINT_ID_EXIT:
+                // Move Merithra to the exit point
+                if (Creature* pMerithra = m_creature->GetMap()->GetCreature(m_merithraGuid))
+                {
+#if defined (CLASSIC)  
+                    pMerithra->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND);
+#else
+                    pMerithra->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+#endif
+                    pMerithra->SetLevitate(true);
+                    pMerithra->GetMotionMaster()->MovePoint(POINT_ID_EXIT, aEternalBoardMovement[0].m_fX, aEternalBoardMovement[0].m_fY, aEternalBoardMovement[0].m_fZ);
+                    pMerithra->ForcedDespawn(9000);
+                }
+                break;
+            case SPELL_BLUE_DRAGON_TRANSFORM:
+                if (Creature* pArygos = m_creature->GetMap()->GetCreature(m_arygosGuid))
+                {
+                    pArygos->CastSpell(pArygos, SPELL_BLUE_DRAGON_TRANSFORM, false);
+                }
+                break;
+            case SPELL_ARYGOS_VENGEANCE:
+                if (Creature* pArygos = m_creature->GetMap()->GetCreature(m_arygosGuid))
+                {
+                    pArygos->CastSpell(pArygos, SPELL_ARYGOS_VENGEANCE, false);
+                }
+                break;
+            case POINT_ID_DRAGON_ATTACK:
+                // Move Arygos to the exit point
+                if (Creature* pArygos = m_creature->GetMap()->GetCreature(m_arygosGuid))
+                {
+#if defined (CLASSIC)  
+                    pArygos->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND);
+#else
+                    pArygos->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+#endif
+                    pArygos->SetLevitate(true);
+                    pArygos->GetMotionMaster()->MovePoint(POINT_ID_EXIT, aEternalBoardMovement[0].m_fX, aEternalBoardMovement[0].m_fY, aEternalBoardMovement[0].m_fZ);
+                    pArygos->ForcedDespawn(9000);
+                }
+                break;
+            case NPC_CAELESTRASZ:
+                // Move Caelestrasz to attack
+                if (Creature* pTrigger = m_creature->GetMap()->GetCreature(m_triggerGuid))
+                {
+                    if (Creature* pCaelestrasz = m_creature->GetMap()->GetCreature(m_CaelestraszGuid))
+                    {
+                        pCaelestrasz->SetWalk(false);
+                        pCaelestrasz->GetMotionMaster()->MovePoint(POINT_ID_DRAGON_ATTACK, pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ());
+                    }
+                }
+                break;
+            case SPELL_RED_DRAGON_TRANSFORM:
+                if (Creature* pCaelestrasz = m_creature->GetMap()->GetCreature(m_CaelestraszGuid))
+                {
+                    pCaelestrasz->CastSpell(pCaelestrasz, SPELL_RED_DRAGON_TRANSFORM, false);
+                }
+                break;
+            case SPELL_CAELESTRASZ_MOLTEN_RAIN:
+                if (Creature* pCaelestrasz = m_creature->GetMap()->GetCreature(m_CaelestraszGuid))
+                {
+                    pCaelestrasz->CastSpell(pCaelestrasz, SPELL_CAELESTRASZ_MOLTEN_RAIN, false);
+                }
+                break;
+            case SAY_ANACHRONOS_SEAL_1:
+                // Send Caelestrasz on flight
+                if (Creature* pCaelestrasz = m_creature->GetMap()->GetCreature(m_CaelestraszGuid))
+                {
+#if defined (CLASSIC)  
+                    pCaelestrasz->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND);
+#else
+                    pCaelestrasz->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+#endif
+                    pCaelestrasz->SetLevitate(true);
+                    pCaelestrasz->GetMotionMaster()->MovePoint(POINT_ID_EXIT, aEternalBoardMovement[0].m_fX, aEternalBoardMovement[0].m_fY, aEternalBoardMovement[0].m_fZ);
+                    pCaelestrasz->ForcedDespawn(9000);
+                }
+                if (Creature* pFandral = m_creature->GetMap()->GetCreature(m_fandralGuid))
+                {
+                    m_creature->SetFacingToObject(pFandral);
+                }
+                break;
+            case SAY_FANDRAL_SEAL_2:
+                if (Creature* pFandral = m_creature->GetMap()->GetCreature(m_fandralGuid))
+                {
+                    pFandral->SetFacingToObject(m_creature);
+                }
+                break;
+            case POINT_ID_GATE:
+                // Send Anachronos to the gate
+                m_creature->SetWalk(false);
+                m_creature->GetMotionMaster()->MovePoint(POINT_ID_GATE, aEternalBoardMovement[1].m_fX, aEternalBoardMovement[1].m_fY, aEternalBoardMovement[1].m_fZ);
+                break;
+            case NPC_FANDRAL_STAGHELM:
+                // Send Fandral to the gate
+                if (Creature* pFandral = m_creature->GetMap()->GetCreature(m_fandralGuid))
+                {
+                    pFandral->SetWalk(false);
+                    pFandral->GetMotionMaster()->MovePoint(POINT_ID_GATE, aEternalBoardMovement[2].m_fX, aEternalBoardMovement[2].m_fY, aEternalBoardMovement[2].m_fZ);
+                }
+                break;
+            case SPELL_PRISMATIC_BARRIER:
+                DoCastSpellIfCan(m_creature, SPELL_PRISMATIC_BARRIER);
+                break;
+            case SPELL_GLYPH_OF_WARDING:
+                DoCastSpellIfCan(m_creature, SPELL_GLYPH_OF_WARDING);
+                break;
+            case SAY_FANDRAL_SEAL_6:
+                // Here Anachronos should continue to cast something
+                if (Creature* pFandral = m_creature->GetMap()->GetCreature(m_fandralGuid))
+                {
+                    pFandral->CastSpell(pFandral, SPELL_CALL_ANCIENTS, false);
+                }
+                break;
+            case EMOTE_FANDRAL_EXHAUSTED:
+                if (Creature* pFandral = m_creature->GetMap()->GetCreature(m_fandralGuid))
+                {
+                    pFandral->SetStandState(UNIT_STAND_STATE_KNEEL);
+                    m_creature->SetFacingToObject(pFandral);
+                }
+                break;
+            case DATA_HANDLE_SCEPTER:
+                // Give the scepter to Fandral (it should equip it somehow)
+                if (Creature* pFandral = m_creature->GetMap()->GetCreature(m_fandralGuid))
+                {
+                    DoScriptText(EMOTE_ANACHRONOS_SCEPTER, m_creature, pFandral);
+                }
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                break;
+            case SAY_FANDRAL_EPILOGUE_4:
+                if (Creature* pFandral = m_creature->GetMap()->GetCreature(m_fandralGuid))
+                {
+                    pFandral->SetStandState(UNIT_STAND_STATE_STAND);
+                }
+                break;
+            case POINT_ID_SCEPTER_2:
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                break;
+            case EMOTE_FANDRAL_SHATTER:
+                // Shatter the scepter
+                if (Creature* pFandral = m_creature->GetMap()->GetCreature(m_fandralGuid))
+                {
+                    pFandral->CastSpell(pFandral, SPELL_SHATTER_HAMMER, false);
+                }
+                break;
+            case SAY_ANACHRONOS_EPILOGUE_6:
+                if (Creature* pFandral = m_creature->GetMap()->GetCreature(m_fandralGuid))
+                {
+                    pFandral->SetWalk(true);
+                    pFandral->GetMotionMaster()->MovePoint(POINT_ID_SCEPTER_1, aEternalBoardMovement[3].m_fX, aEternalBoardMovement[3].m_fY, aEternalBoardMovement[3].m_fZ);
+                }
+                break;
+            case POINT_ID_EPILOGUE:
+                // Make Fandral leave
+                if (Creature* pFandral = m_creature->GetMap()->GetCreature(m_fandralGuid))
+                {
+                    pFandral->GetMotionMaster()->MovePoint(POINT_ID_EXIT, aEternalBoardMovement[7].m_fX, aEternalBoardMovement[7].m_fY, aEternalBoardMovement[7].m_fZ);
+                }
+                break;
+            case POINT_ID_SCEPTER_1:
+                // Anachronos collects the pieces
+                m_creature->SetWalk(true);
+                m_creature->GetMotionMaster()->MovePoint(POINT_ID_SCEPTER_1, aEternalBoardMovement[5].m_fX, aEternalBoardMovement[5].m_fY, aEternalBoardMovement[5].m_fZ);
+                break;
+            }
+        }
+
+        Creature* GetSpeakerByEntry(uint32 uiEntry) override
+        {
+            switch (uiEntry)
+            {
+            case NPC_ANACHRONOS_THE_ANCIENT:
+                return m_creature;
+            case NPC_ARYGOS:
+                return m_creature->GetMap()->GetCreature(m_arygosGuid);
+            case NPC_CAELESTRASZ:
+                return m_creature->GetMap()->GetCreature(m_CaelestraszGuid);
+            case NPC_MERITHRA_OF_THE_DREAM:
+                return m_creature->GetMap()->GetCreature(m_merithraGuid);
+            case NPC_FANDRAL_STAGHELM:
+                return m_creature->GetMap()->GetCreature(m_fandralGuid);
+
+            default:
+                return NULL;
+            }
+        }
+
+        void DoSummonDragons()
+        {
+            for (uint8 i = 0; i < MAX_DRAGONS; ++i)
+            {
+                m_creature->SummonCreature(aEternalBoardNPCs[i].m_uiEntry, aEternalBoardNPCs[i].m_fX, aEternalBoardNPCs[i].m_fY, aEternalBoardNPCs[i].m_fZ, aEternalBoardNPCs[i].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 0);
+            }
+
+            // Also summon the 3 anubisath conquerors
+            float fX, fY, fZ;
+            for (uint8 i = 0; i < MAX_CONQUERORS; ++i)
+            {
+                m_creature->GetRandomPoint(aEternalBoardMovement[10].m_fX, aEternalBoardMovement[10].m_fY, aEternalBoardMovement[10].m_fZ, 20.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_ANUBISATH_CONQUEROR, fX, fY, fZ, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+            }
+        }
+
+        void DoSummonWarriors()
+        {
+            float fX, fY, fZ;
+            // Summon kaldorei warriors
+            for (uint8 i = 0; i < MAX_KALDOREI; ++i)
+            {
+                m_creature->GetRandomPoint(aEternalBoardMovement[10].m_fX, aEternalBoardMovement[10].m_fY, aEternalBoardMovement[10].m_fZ, 10.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_KALDOREI_INFANTRY, fX, fY, fZ, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+            }
+
+            // Summon Qiraji warriors
+            for (uint8 i = 0; i < MAX_QIRAJI; ++i)
+            {
+                m_creature->GetRandomPoint(aEternalBoardMovement[10].m_fX, aEternalBoardMovement[10].m_fY, aEternalBoardMovement[10].m_fZ, 15.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_QIRAJI_WASP, fX, fY, fZ, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+
+                m_creature->GetRandomPoint(aEternalBoardMovement[10].m_fX, aEternalBoardMovement[10].m_fY, aEternalBoardMovement[10].m_fZ, 15.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_QIRAJI_DRONE, fX, fY, fZ, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+
+                m_creature->GetRandomPoint(aEternalBoardMovement[10].m_fX, aEternalBoardMovement[10].m_fY, aEternalBoardMovement[10].m_fZ, 15.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_QIRAJI_TANK, fX, fY, fZ, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+            }
+        }
+
+        void DoUnsummonArmy()
+        {
+            for (GuidList::const_iterator itr = m_lQirajiWarriorsList.begin(); itr != m_lQirajiWarriorsList.end(); ++itr)
+            {
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pTemp->ForcedDespawn();
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Also remove npc flags where needed
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_FANDRAL_STAGHELM:
+                m_fandralGuid = pSummoned->GetObjectGuid();
+                break;
+            case NPC_MERITHRA_OF_THE_DREAM:
+                m_merithraGuid = pSummoned->GetObjectGuid();
+                pSummoned->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+                break;
+            case NPC_CAELESTRASZ:
+                m_CaelestraszGuid = pSummoned->GetObjectGuid();
+                pSummoned->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+                break;
+            case NPC_ARYGOS:
+                m_arygosGuid = pSummoned->GetObjectGuid();
+                pSummoned->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+                break;
+            case NPC_ANUBISATH_CONQUEROR:
+            case NPC_QIRAJI_WASP:
+            case NPC_QIRAJI_DRONE:
+            case NPC_QIRAJI_TANK:
+            case NPC_KALDOREI_INFANTRY:
+                m_lQirajiWarriorsList.push_back(pSummoned->GetObjectGuid());
+                break;
+            }
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case POINT_ID_GATE:
+                // Cast time stop when he reaches the gate
+                DoCastSpellIfCan(m_creature, SPELL_TIME_STOP);
+                StartNextDialogueText(SPELL_TIME_STOP);
+                break;
+            case POINT_ID_SCEPTER_1:
+                // Pickup the pieces
+                DoScriptText(EMOTE_ANACHRONOS_PICKUP, m_creature);
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                m_uiEventTimer = 2000;
+                break;
+            case POINT_ID_SCEPTER_2:
+                // Pickup the pieces
+                DoScriptText(SAY_ANACHRONOS_EPILOGUE_8, m_creature);
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                m_uiEventTimer = 4000;
+                break;
+            case POINT_ID_EXIT:
+#if defined (CLASSIC)  
+                DoCastSpellIfCan(m_creature, SPELL_BRONZE_DRAGON_TRANSFORM);
+#else
+                // Spell was removed, manually change the display
+                m_creature->SetDisplayId(DISPLAY_ID_BRONZE_DRAGON);
+#endif
+                m_uiEventTimer = 4000;
+                break;
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            if (pSummoned->GetEntry() == NPC_FANDRAL_STAGHELM)
+            {
+                switch (uiPointId)
+                {
+                case POINT_ID_EPILOGUE:
+                    // Face Anachronos and restart the dialogue
+                    pSummoned->SetFacingToObject(m_creature);
+                    StartNextDialogueText(SAY_FANDRAL_EPILOGUE_7);
+                    DoUnsummonArmy();
+                    break;
+                case POINT_ID_SCEPTER_1:
+                    pSummoned->GetMotionMaster()->MovePoint(POINT_ID_EPILOGUE, aEternalBoardMovement[4].m_fX, aEternalBoardMovement[4].m_fY, aEternalBoardMovement[4].m_fZ);
+                    break;
+                case POINT_ID_EXIT:
+                    pSummoned->ForcedDespawn();
+                    break;
+                }
+            }
+            else if (uiPointId == POINT_ID_DRAGON_ATTACK)
+            {
+                switch (pSummoned->GetEntry())
+                {
+                case NPC_MERITHRA_OF_THE_DREAM:
+                    StartNextDialogueText(DATA_MERITHRA_ATTACK);
+                    break;
+                case NPC_CAELESTRASZ:
+                    StartNextDialogueText(DATA_CAELASTRASZ_ATTACK);
+                    break;
+                }
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature && pInvoker->GetTypeId() == TYPEID_PLAYER)
+                m_playerGuid = pInvoker->GetObjectGuid();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (m_uiEventTimer)
+            {
+                if (m_uiEventTimer <= uiDiff)
+                {
+                    switch (m_uiEventStage)
+                    {
+                    case 0:
+                        // Start the dialogue
+                        StartNextDialogueText(NPC_ANACHRONOS_THE_ANCIENT);
+                        m_uiEventTimer = 0;
+                        break;
+                    case 1:
+                        // Do the epilogue movement
+                        m_creature->GetMotionMaster()->MovePoint(POINT_ID_SCEPTER_2, aEternalBoardMovement[6].m_fX, aEternalBoardMovement[6].m_fY, aEternalBoardMovement[6].m_fZ);
+                        m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                        m_uiEventTimer = 0;
+                        break;
+                    case 2:
+                        // Complete quest and despawn gate
+                        if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                        {
+                            pPlayer->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD, m_creature);
+                        }
+                        m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                        m_uiEventTimer = 4000;
+                        break;
+                    case 3:
+                        // Move to exit
+                        m_creature->SetWalk(false);
+                        m_creature->GetMotionMaster()->MovePoint(POINT_ID_EXIT, aEternalBoardMovement[8].m_fX, aEternalBoardMovement[8].m_fY, aEternalBoardMovement[8].m_fZ);
+                        m_uiEventTimer = 0;
+                        break;
+                    case 4:
+                        // Take off and fly
+#if defined (CLASSIC)  
+                        m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND);
+#else
+                        m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+#endif
+                        m_creature->SetLevitate(true);
+                        m_creature->GetMotionMaster()->MovePoint(0, aEternalBoardMovement[9].m_fX, aEternalBoardMovement[9].m_fY, aEternalBoardMovement[9].m_fZ);
+                        m_creature->ForcedDespawn(10000);
+                        m_uiEventTimer = 0;
+                        break;
+                    }
+                    ++m_uiEventStage;
+                }
+                else
+                {
+                    m_uiEventTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_anachronos_the_ancientAI(pCreature);
+    }
+};
+
+struct go_crystalline_tear : public GameObjectScript
+{
+    go_crystalline_tear() : GameObjectScript("go_crystalline_tear") {}
+
+    bool OnQuestAccept(Player* pPlayer, GameObject* pGo, const Quest* pQuest) override
+    {
+        // Summon the controller dragon at GO position (orientation is wrong - hardcoded)
+        if (pQuest->GetQuestId() == QUEST_A_PAWN_ON_THE_ETERNAL_BOARD)
+        {
+            // Check if event is already in progress first
+            if (GetClosestCreatureWithEntry(pGo, NPC_ANACHRONOS_THE_ANCIENT, 90.0f))
+            {
+                return true;
+            }
+
+            if (Creature* pAnachronos = pPlayer->SummonCreature(NPC_ANACHRONOS_THE_ANCIENT, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 3.75f, TEMPSUMMON_CORPSE_DESPAWN, 0))
+            {
+                // Send the player's guid in order to handle the quest complete
+                if (CreatureAI* pAnachronosAI = pAnachronos->AI())
+                {
+                    pAnachronosAI->SendAIEvent(AI_EVENT_CUSTOM_A, pPlayer, pAnachronos);
+                    //pAnachronosAI->m_playerGuid = pPlayer->GetObjectGuid();
+                }
+            }
+        }
+
+        return true;
+    }
+};
+
+void AddSC_silithus()
+{
+    Script* s;
+    s = new npc_anachronos_the_ancient();
+    s->RegisterSelf();
+    s = new go_crystalline_tear();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_anachronos_the_ancient";
+    //pNewScript->GetAI = &GetAI_npc_anachronos_the_ancient;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_crystalline_tear";
+    //pNewScript->pQuestAcceptGO = &QuestAcceptGO_crystalline_tear;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/stonetalon_mountains.cpp b/src/modules/SD3/scripts/kalimdor/stonetalon_mountains.cpp
new file mode 100644
index 000000000..37d3d0cbd
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/stonetalon_mountains.cpp
@@ -0,0 +1,369 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Stonetalon_Mountains
+ * SD%Complete: 100
+ * SDComment:   Quest support: 1090, 6523.
+ * SDCategory:  Stonetalon Mountains
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_kaya
+ * npc_piznik
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_kaya
+######*/
+
+enum
+{
+    NPC_GRIMTOTEM_RUFFIAN       = 11910,
+    NPC_GRIMTOTEM_BRUTE         = 11912,
+    NPC_GRIMTOTEM_SORCERER      = 11913,
+
+    SAY_START                   = -1000357,
+    SAY_AMBUSH                  = -1000358,
+    SAY_END                     = -1000359,
+
+    QUEST_PROTECT_KAYA          = 6523
+};
+
+struct npc_kaya : public CreatureScript
+{
+    npc_kaya() : CreatureScript("npc_kaya") {}
+
+    struct npc_kayaAI : public npc_escortAI
+    {
+        npc_kayaAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+                // Ambush
+            case 16:
+                // note about event here:
+                // apparently NPC say _after_ the ambush is over, and is most likely a bug at you-know-where.
+                // we simplify this, and make say when the ambush actually start.
+                DoScriptText(SAY_AMBUSH, m_creature);
+                m_creature->SummonCreature(NPC_GRIMTOTEM_RUFFIAN, -50.75f, -500.77f, -46.13f, 0.4f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_GRIMTOTEM_BRUTE, -40.05f, -510.89f, -46.05f, 1.7f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_GRIMTOTEM_SORCERER, -32.21f, -499.20f, -45.35f, 2.8f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000);
+                break;
+                // Award quest credit
+            case 18:
+                DoScriptText(SAY_END, m_creature);
+
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_PROTECT_KAYA, m_creature);
+                }
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kayaAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* pQuest) override
+    {
+        // Casting Spell and Starting the Escort quest is buggy, so this is a hack. Use the spell when it is possible.
+
+        if (pQuest->GetQuestId() == QUEST_PROTECT_KAYA)
+        {
+            pCreature->SetFactionTemporary(FACTION_ESCORT_H_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+            DoScriptText(SAY_START, pCreature);
+
+            if (npc_kayaAI* pEscortAI = dynamic_cast<npc_kayaAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+            return true;
+        }
+        return false;
+    }
+};
+
+/*#####
+## npc_piznik
+#####*/
+
+enum
+{
+    QUEST_GERENZOS_ORDERS      = 1090,
+
+    NPC_WINDSHEAR_VERMIN       = 3998,
+    NPC_WINDSHEAR_TUNNEL_RAT   = 4001,
+    NPC_WINDSHEAR_STONECUTTER  = 4002,
+    NPC_WINDSHEAR_GEOMANCER    = 4003,
+    NPC_WINDSHEAR_OVERLORD     = 4004,
+    FACTION_QUEST              = 495
+};
+
+struct SpawnPointstone
+{
+    float fX;
+    float fY;
+    float fZ;
+    float fO;
+};
+
+SpawnPointstone SpawnPointsst[] =  // Set Spawnpoints for Waves
+{
+    { 938.30f, -257.35f, -2.22f, 6.2f},
+    { 942.28f, -254.49f, -2.38f, 6.2f},
+    { 938.52f, -253.20f, -2.08f, 6.2f},
+    { 939.51f, -253.11f, -2.02f, 6.2f}
+};
+
+struct MovePointStone
+{
+    float fX;
+    float fY;
+    float fZ;
+};
+
+MovePointStone MovePointsst[] =   // // Set Movementpoints for Waves
+{
+    { 957.69f, -256.17f, -3.61f},
+    { 957.12f, -260.06f, -4.68f},
+    { 958.76f, -257.87f, -4.28f},
+    { 953.72f, -257.25f, -3.38f}
+};
+
+
+struct npc_piznik : public CreatureScript
+{
+    npc_piznik() : CreatureScript("npc_piznik") {}
+
+    struct npc_piznikAI : public ScriptedAI
+    {
+        npc_piznikAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_uiPlayerGUID = 0;    //TODO check this - to Reset()?
+            m_bEventStarted = false;
+            m_uiWaveTimer = 60000;  // One minute until first Wave
+            m_uiEventTimer = 420000; // 7 minutes Event time
+            m_uiSummonCount = 0;
+            m_uiNormFaction = pCreature->getFaction();
+            m_uiWaveCount = 0;
+            m_uiMoveCount = 0;
+        }
+
+        void Reset()
+        {
+        }
+
+        uint64 m_uiPlayerGUID;
+        uint32 m_uiWaveTimer;
+        uint32 m_uiEventTimer;
+        uint32 m_uiSummonCount;
+        uint32 m_uiNormFaction;
+        uint8  m_uiWaveCount;
+        uint8  m_uiMoveCount;
+        bool   m_bEventStarted;
+
+        void StartEvent(uint64 uiPlayerGUID)
+        {
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+            m_creature->setFaction(FACTION_QUEST);
+
+            m_uiPlayerGUID = uiPlayerGUID;
+            m_bEventStarted = true;
+            m_uiWaveTimer = 60000;  // One minute until first Wave
+            m_uiEventTimer = 420000; // 7 minutes Event time
+            m_uiSummonCount = 0;
+            m_uiWaveCount = 0;
+            m_uiMoveCount = 0;
+        }
+
+        void FinishEvent()
+        {
+            m_uiPlayerGUID = 0;
+            m_bEventStarted = false;
+            m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+            m_creature->setFaction(m_uiNormFaction);
+        }
+
+        void JustDied(Unit* /*pKiller*/)
+        {
+#if defined (CLASSIC) || defined (TBC)
+            if (Player* pPlayer = (m_creature->GetMap()->GetPlayer(m_uiPlayerGUID)))
+#endif
+#if defined (WOTLK) || defined (CATA)
+            if (Player* pPlayer = (m_creature->GetMap()->GetPlayer(ObjectGuid(m_uiPlayerGUID))))
+#endif
+            {
+                pPlayer->SendQuestFailed(QUEST_GERENZOS_ORDERS);
+            }
+
+            FinishEvent();
+        }
+
+        void JustSummoned(Creature* pSummoned)
+        {
+            ++m_uiSummonCount;
+
+            // Get waypoint for each creature
+            pSummoned->GetMotionMaster()->MovePoint(0, MovePointsst[m_uiMoveCount].fX, MovePointsst[m_uiMoveCount].fY, MovePointsst[m_uiMoveCount].fZ);
+
+            ++m_uiMoveCount;
+        }
+
+        void SummonedCreatureJustDied(Creature* /*pKilled*/)
+        {
+            --m_uiSummonCount;
+        }
+
+        void UpdateAI(const uint32 uiDiff)
+        {
+
+            if (m_uiEventTimer < uiDiff)  //Event should be completed after 7 minutes even if waves are alive
+            {
+#if defined (CLASSIC) || defined (TBC)
+                if (Player* pPlayer = (m_creature->GetMap()->GetPlayer(m_uiPlayerGUID)))
+#endif
+#if defined (WOTLK) || defined (CATA)
+                if (Player* pPlayer = (m_creature->GetMap()->GetPlayer(ObjectGuid(m_uiPlayerGUID))))
+#endif
+                {
+                    pPlayer->GroupEventHappens(QUEST_GERENZOS_ORDERS, m_creature);
+                }
+
+                FinishEvent();
+            }
+
+
+            if (m_bEventStarted && !m_uiSummonCount)
+            {
+
+                if (m_uiWaveTimer < uiDiff && m_uiWaveCount <= 2)
+                {
+                    switch (m_uiWaveCount)
+                    {
+
+                    case 0:
+                        m_creature->SummonCreature(NPC_WINDSHEAR_VERMIN, SpawnPointsst[2].fX, SpawnPointsst[2].fY, SpawnPointsst[2].fZ, SpawnPointsst[2].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_creature->SummonCreature(NPC_WINDSHEAR_TUNNEL_RAT, SpawnPointsst[0].fX, SpawnPointsst[0].fY, SpawnPointsst[0].fZ, SpawnPointsst[0].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_creature->SummonCreature(NPC_WINDSHEAR_VERMIN, SpawnPointsst[1].fX, SpawnPointsst[1].fY, SpawnPointsst[1].fZ, SpawnPointsst[1].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_uiWaveTimer = 45000;
+                        m_uiMoveCount = 0;
+                        break;
+                    case 1:
+                        m_creature->SummonCreature(NPC_WINDSHEAR_GEOMANCER, SpawnPointsst[2].fX, SpawnPointsst[2].fY, SpawnPointsst[2].fZ, SpawnPointsst[2].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_creature->SummonCreature(NPC_WINDSHEAR_STONECUTTER, SpawnPointsst[0].fX, SpawnPointsst[0].fY, SpawnPointsst[0].fZ, SpawnPointsst[0].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_creature->SummonCreature(NPC_WINDSHEAR_GEOMANCER, SpawnPointsst[1].fX, SpawnPointsst[1].fY, SpawnPointsst[1].fZ, SpawnPointsst[1].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_creature->SummonCreature(NPC_WINDSHEAR_STONECUTTER, SpawnPointsst[3].fX, SpawnPointsst[3].fY, SpawnPointsst[3].fZ, SpawnPointsst[3].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_uiWaveTimer = 45000;
+                        m_uiMoveCount = 0;
+                        break;
+                    case 2:
+                        m_creature->SummonCreature(NPC_WINDSHEAR_TUNNEL_RAT, SpawnPointsst[2].fX, SpawnPointsst[2].fY, SpawnPointsst[2].fZ, SpawnPointsst[2].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_creature->SummonCreature(NPC_WINDSHEAR_OVERLORD, SpawnPointsst[0].fX, SpawnPointsst[0].fY, SpawnPointsst[0].fZ, SpawnPointsst[0].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_creature->SummonCreature(NPC_WINDSHEAR_TUNNEL_RAT, SpawnPointsst[1].fX, SpawnPointsst[1].fY, SpawnPointsst[1].fZ, SpawnPointsst[1].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_creature->SummonCreature(NPC_WINDSHEAR_TUNNEL_RAT, SpawnPointsst[3].fX, SpawnPointsst[3].fY, SpawnPointsst[3].fZ, SpawnPointsst[3].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
+                        m_uiMoveCount = 0;
+                        break;
+                    }
+
+                    ++m_uiWaveCount;
+                }
+                else
+                {
+                    m_uiWaveTimer -= uiDiff;
+                }
+                m_uiEventTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_GERENZOS_ORDERS)
+        {
+            if (npc_piznikAI* ppiznikAI = dynamic_cast<npc_piznikAI*>(pCreature->AI()))
+            {
+                ppiznikAI->StartEvent(pPlayer->GetObjectGuid().GetRawValue());
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_piznikAI(pCreature);
+    }
+};
+
+/*######
+## AddSC
+######*/
+
+void AddSC_stonetalon_mountains()
+{
+    Script* s;
+    s = new npc_kaya();
+    s->RegisterSelf();
+    s = new npc_piznik();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kaya";
+    //pNewScript->GetAI = &GetAI_npc_kaya;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_kaya;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_piznik";
+    //pNewScript->GetAI = &GetAI_npc_piznik;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_piznik;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/tanaris.cpp b/src/modules/SD3/scripts/kalimdor/tanaris.cpp
new file mode 100644
index 000000000..05bd2b914
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/tanaris.cpp
@@ -0,0 +1,764 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Tanaris
+ * SD%Complete: 80
+ * SDComment:   Quest support: 648, 1560, 2954, 4005, 10277.
+ * SDCategory:  Tanaris
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * mob_aquementas
+ * npc_custodian_of_time
+ * npc_oox17tn
+ * npc_stone_watcher_of_norgannon
+ * npc_tooga
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "follower_ai.h"
+
+/*######
+## mob_aquementas
+######*/
+
+enum
+{
+    AGGRO_YELL_AQUE         = -1000168,
+
+    SPELL_AQUA_JET          = 13586,
+    SPELL_FROST_SHOCK       = 15089,
+
+    ITEM_SILVER_TOTEM       = 11522,
+    ITEM_BOOK_AQUOR         = 11169,
+    ITEM_SILVERY_CLAWS      = 11172,
+    ITEM_IRONTREE_HEART     = 11173,
+
+    FACTION_FRIENDLY        = 35,
+    FACTION_ELEMENTAL       = 91,
+};
+
+struct mob_aquementas : public CreatureScript
+{
+    mob_aquementas() : CreatureScript("mob_aquementas") {}
+
+    struct mob_aquementasAI : public ScriptedAI
+    {
+        mob_aquementasAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiSwitchFactionTimer;
+        uint32 m_uiFrostShockTimer;
+        uint32 m_uiAquaJetTimer;
+
+        void Reset() override
+        {
+            m_uiSwitchFactionTimer = 10000;
+            m_uiAquaJetTimer = 5000;
+            m_uiFrostShockTimer = 1000;
+
+            m_creature->setFaction(FACTION_FRIENDLY);           // TODO: Either do this way, or might require a DB change
+        }
+
+        void SendItem(Player* pReceiver)
+        {
+            if (pReceiver->HasItemCount(ITEM_BOOK_AQUOR, 1) &&
+                pReceiver->HasItemCount(ITEM_SILVERY_CLAWS, 11) &&
+                pReceiver->HasItemCount(ITEM_IRONTREE_HEART, 1) &&
+                !pReceiver->HasItemCount(ITEM_SILVER_TOTEM, 1))
+            {
+                if (Item* pItem = pReceiver->StoreNewItemInInventorySlot(ITEM_SILVER_TOTEM, 1))
+                {
+                    pReceiver->SendNewItem(pItem, 1, true, false);
+                }
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            DoScriptText(AGGRO_YELL_AQUE, m_creature, pWho);
+
+            Player* pInvokedPlayer = pWho->GetCharmerOrOwnerPlayerOrPlayerItself();
+            if (pInvokedPlayer)
+            {
+                SendItem(pInvokedPlayer);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiSwitchFactionTimer)
+            {
+                if (m_uiSwitchFactionTimer <= uiDiff)
+                {
+                    m_creature->setFaction(FACTION_ELEMENTAL);
+                    m_uiSwitchFactionTimer = 0;
+                }
+                else
+                {
+                    m_uiSwitchFactionTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiFrostShockTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROST_SHOCK);
+                m_uiFrostShockTimer = 15000;
+            }
+            else
+            {
+                m_uiFrostShockTimer -= uiDiff;
+            }
+
+            if (m_uiAquaJetTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_AQUA_JET);
+                m_uiAquaJetTimer = 15000;
+            }
+            else
+            {
+                m_uiAquaJetTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_aquementasAI(pCreature);
+    }
+};
+
+
+#if defined(TBC) || defined (WOTLK) || defined (CATA)
+
+/*######
+## npc_custodian_of_time
+######*/
+
+enum
+{
+    WHISPER_CUSTODIAN_1         = -1000217,
+    WHISPER_CUSTODIAN_2         = -1000218,
+    WHISPER_CUSTODIAN_3         = -1000219,
+    WHISPER_CUSTODIAN_4         = -1000220,
+    WHISPER_CUSTODIAN_5         = -1000221,
+    WHISPER_CUSTODIAN_6         = -1000222,
+    WHISPER_CUSTODIAN_7         = -1000223,
+    WHISPER_CUSTODIAN_8         = -1000224,
+    WHISPER_CUSTODIAN_9         = -1000225,
+    WHISPER_CUSTODIAN_10        = -1000226,
+    WHISPER_CUSTODIAN_11        = -1000227,
+    WHISPER_CUSTODIAN_12        = -1000228,
+    WHISPER_CUSTODIAN_13        = -1000229,
+    WHISPER_CUSTODIAN_14        = -1000230,
+
+    SPELL_CUSTODIAN_OF_TIME     = 34877,
+    SPELL_QID_10277             = 34883,
+
+    QUEST_ID_CAVERNS_OF_TIME    = 10277,
+};
+
+struct npc_custodian_of_time : public CreatureScript
+{
+    npc_custodian_of_time() : CreatureScript("npc_custodian_of_time") {}
+
+    struct npc_custodian_of_timeAI : public npc_escortAI
+    {
+        npc_custodian_of_timeAI(Creature* pCreature) : npc_escortAI(pCreature) { Reset(); }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 0: DoScriptText(WHISPER_CUSTODIAN_1, m_creature, pPlayer); break;
+            case 1: DoScriptText(WHISPER_CUSTODIAN_2, m_creature, pPlayer); break;
+            case 2: DoScriptText(WHISPER_CUSTODIAN_3, m_creature, pPlayer); break;
+            case 3: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pPlayer); break;
+            case 5: DoScriptText(WHISPER_CUSTODIAN_5, m_creature, pPlayer); break;
+            case 6: DoScriptText(WHISPER_CUSTODIAN_6, m_creature, pPlayer); break;
+            case 7: DoScriptText(WHISPER_CUSTODIAN_7, m_creature, pPlayer); break;
+            case 8: DoScriptText(WHISPER_CUSTODIAN_8, m_creature, pPlayer); break;
+            case 9: DoScriptText(WHISPER_CUSTODIAN_9, m_creature, pPlayer); break;
+            case 10: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pPlayer); break;
+            case 13: DoScriptText(WHISPER_CUSTODIAN_10, m_creature, pPlayer); break;
+            case 14: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pPlayer); break;
+            case 16: DoScriptText(WHISPER_CUSTODIAN_11, m_creature, pPlayer); break;
+            case 17: DoScriptText(WHISPER_CUSTODIAN_12, m_creature, pPlayer); break;
+            case 18: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pPlayer); break;
+            case 22: DoScriptText(WHISPER_CUSTODIAN_13, m_creature, pPlayer); break;
+            case 23: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pPlayer); break;
+            case 24:
+                DoScriptText(WHISPER_CUSTODIAN_14, m_creature, pPlayer);
+                DoCastSpellIfCan(pPlayer, SPELL_QID_10277);
+                break;
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                return;
+            }
+
+            if (pWho->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (pWho->HasAura(SPELL_CUSTODIAN_OF_TIME) && ((Player*)pWho)->GetQuestStatus(QUEST_ID_CAVERNS_OF_TIME) == QUEST_STATUS_INCOMPLETE)
+                {
+                    float fRadius = 10.0f;
+
+                    if (m_creature->IsWithinDistInMap(pWho, fRadius))
+                    {
+                        Start(false, (Player*)pWho);
+                    }
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_custodian_of_timeAI(pCreature);
+    }
+};
+#endif
+
+/*######
+## npc_oox17tn
+######*/
+
+enum
+{
+    SAY_OOX_START           = -1000287,
+    SAY_OOX_AGGRO1          = -1000288,
+    SAY_OOX_AGGRO2          = -1000289,
+    SAY_OOX_AMBUSH          = -1000290,
+    SAY_OOX17_AMBUSH_REPLY  = -1000291,
+    SAY_OOX_END             = -1000292,
+
+    QUEST_RESCUE_OOX_17TN   = 648,
+
+    NPC_SCORPION            = 7803,
+    NPC_SCOFFLAW            = 7805,
+    NPC_SHADOW_MAGE         = 5617
+};
+
+struct npc_oox17tn : public CreatureScript
+{
+    npc_oox17tn() : CreatureScript("npc_oox17tn") {}
+
+    struct npc_oox17tnAI : public npc_escortAI
+    {
+        npc_oox17tnAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 i) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            switch (i)
+            {
+                // 1. Ambush: 3 scorpions
+            case 22:
+                DoScriptText(SAY_OOX_AMBUSH, m_creature);
+                m_creature->SummonCreature(NPC_SCORPION, -8340.70f, -4448.17f, 9.17f, 3.10f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_SCORPION, -8343.18f, -4444.35f, 9.44f, 2.35f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000);
+                m_creature->SummonCreature(NPC_SCORPION, -8348.70f, -4457.80f, 9.58f, 2.02f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000);
+                break;
+                // 2. Ambush: 2 Rogues & 1 Shadow Mage
+            case 28:
+                DoScriptText(SAY_OOX_AMBUSH, m_creature);
+
+                m_creature->SummonCreature(NPC_SCOFFLAW, -7488.02f, -4786.56f, 10.67f, 3.74f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
+                m_creature->SummonCreature(NPC_SHADOW_MAGE, -7486.41f, -4791.55f, 10.54f, 3.26f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000);
+
+                if (Creature* pCreature = m_creature->SummonCreature(NPC_SCOFFLAW, -7488.47f, -4800.77f, 9.77f, 2.50f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000))
+                {
+                    DoScriptText(SAY_OOX17_AMBUSH_REPLY, pCreature);
+                }
+
+                break;
+            case 34:
+                DoScriptText(SAY_OOX_END, m_creature);
+                // Award quest credit
+                pPlayer->GroupEventHappens(QUEST_RESCUE_OOX_17TN, m_creature);
+                break;
+            }
+        }
+
+        void Aggro(Unit* /*who*/) override
+        {
+            // For an small probability he say something when it aggros
+            switch (urand(0, 9))
+            {
+            case 0:
+                DoScriptText(SAY_OOX_AGGRO1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_OOX_AGGRO2, m_creature);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* summoned) override
+        {
+            summoned->AI()->AttackStart(m_creature);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_oox17tnAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_RESCUE_OOX_17TN)
+        {
+            DoScriptText(SAY_OOX_START, pCreature);
+
+            pCreature->SetStandState(UNIT_STAND_STATE_STAND);
+
+            if (pPlayer->GetTeam() == ALLIANCE)
+            {
+                pCreature->SetFactionTemporary(FACTION_ESCORT_A_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+            }
+
+            if (pPlayer->GetTeam() == HORDE)
+            {
+                pCreature->SetFactionTemporary(FACTION_ESCORT_H_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+            }
+
+            if (npc_oox17tnAI* pEscortAI = dynamic_cast<npc_oox17tnAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+};
+
+/*######
+## npc_stone_watcher_of_norgannon
+######*/
+//TODO localise
+#define GOSSIP_ITEM_NORGANNON_1     "What function do you serve?"
+#define GOSSIP_ITEM_NORGANNON_2     "What are the Plates of Uldum?"
+#define GOSSIP_ITEM_NORGANNON_3     "Where are the Plates of Uldum?"
+#define GOSSIP_ITEM_NORGANNON_4     "Excuse me? We've been \"reschedueled for visitations\"? What does that mean?!"
+#define GOSSIP_ITEM_NORGANNON_5     "So, what's inside Uldum?"
+#define GOSSIP_ITEM_NORGANNON_6     "I will return when i have the Plates of Uldum."
+
+struct npc_stone_watcher_of_norgannon : public CreatureScript
+{
+    npc_stone_watcher_of_norgannon() : CreatureScript("npc_stone_watcher_of_norgannon") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+
+        if (pPlayer->GetQuestStatus(2954) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(1674, pCreature->GetObjectGuid());
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(1675, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(1676, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(1677, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 3:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(1678, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 4:
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(1679, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 5:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(2954);
+            break;
+        }
+        return true;
+    }
+};
+
+/*####
+# npc_tooga
+####*/
+
+enum
+{
+    SAY_TOOG_THIRST             = -1000391,
+    SAY_TOOG_WORRIED            = -1000392,
+    SAY_TOOG_POST_1             = -1000393,
+    SAY_TORT_POST_2             = -1000394,
+    SAY_TOOG_POST_3             = -1000395,
+    SAY_TORT_POST_4             = -1000396,
+    SAY_TOOG_POST_5             = -1000397,
+    SAY_TORT_POST_6             = -1000398,
+
+    QUEST_TOOGA                 = 1560,
+    NPC_TORTA                   = 6015,
+
+    POINT_ID_TO_WATER           = 1
+};
+
+const float m_afToWaterLoc[] = { -7032.664551f, -4906.199219f, -1.606446f};
+
+struct npc_tooga : public CreatureScript
+{
+    npc_tooga() : CreatureScript("npc_tooga") {}
+
+    struct npc_toogaAI : public FollowerAI
+    {
+        npc_toogaAI(Creature* pCreature) : FollowerAI(pCreature) { }
+
+        uint32 m_uiCheckSpeechTimer;
+        uint32 m_uiPostEventTimer;
+        uint32 m_uiPhasePostEvent;
+
+        Unit* pTorta;
+
+        void Reset() override
+        {
+            m_uiCheckSpeechTimer = 2500;
+            m_uiPostEventTimer = 1000;
+            m_uiPhasePostEvent = 0;
+
+            pTorta = NULL;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            FollowerAI::MoveInLineOfSight(pWho);
+
+            if (!m_creature->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE | STATE_FOLLOW_POSTEVENT) && pWho->GetEntry() == NPC_TORTA)
+            {
+                if (m_creature->IsWithinDistInMap(pWho, INTERACTION_DISTANCE))
+                {
+                    if (Player* pPlayer = GetLeaderForFollower())
+                    {
+                        if (pPlayer->GetQuestStatus(QUEST_TOOGA) == QUEST_STATUS_INCOMPLETE)
+                        {
+                            pPlayer->GroupEventHappens(QUEST_TOOGA, m_creature);
+                        }
+                    }
+
+                    pTorta = pWho;
+                    SetFollowComplete(true);
+                }
+            }
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            FollowerAI::MovementInform(uiMotionType, uiPointId);
+
+            if (uiMotionType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            if (uiPointId == POINT_ID_TO_WATER)
+            {
+                SetFollowComplete();
+            }
+        }
+
+        void UpdateFollowerAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                // we are doing the post-event, or...
+                if (HasFollowState(STATE_FOLLOW_POSTEVENT))
+                {
+                    if (m_uiPostEventTimer < uiDiff)
+                    {
+                        m_uiPostEventTimer = 5000;
+
+                        if (!pTorta || !pTorta->IsAlive())
+                        {
+                            // something happened, so just complete
+                            SetFollowComplete();
+                            return;
+                        }
+
+                        switch (m_uiPhasePostEvent)
+                        {
+                        case 1:
+                            DoScriptText(SAY_TOOG_POST_1, m_creature);
+                            break;
+                        case 2:
+                            DoScriptText(SAY_TORT_POST_2, pTorta);
+                            break;
+                        case 3:
+                            DoScriptText(SAY_TOOG_POST_3, m_creature);
+                            break;
+                        case 4:
+                            DoScriptText(SAY_TORT_POST_4, pTorta);
+                            break;
+                        case 5:
+                            DoScriptText(SAY_TOOG_POST_5, m_creature);
+                            break;
+                        case 6:
+                            DoScriptText(SAY_TORT_POST_6, pTorta);
+                            m_creature->GetMotionMaster()->MovePoint(POINT_ID_TO_WATER, m_afToWaterLoc[0], m_afToWaterLoc[1], m_afToWaterLoc[2]);
+                            break;
+                        }
+
+                        ++m_uiPhasePostEvent;
+                    }
+                    else
+                    {
+                        m_uiPostEventTimer -= uiDiff;
+                    }
+                }
+                //...we are doing regular speech check
+                else if (HasFollowState(STATE_FOLLOW_INPROGRESS))
+                {
+                    if (m_uiCheckSpeechTimer < uiDiff)
+                    {
+                        m_uiCheckSpeechTimer = 5000;
+
+                        switch (urand(0, 50))
+                        {
+                        case 10:
+                            DoScriptText(SAY_TOOG_THIRST, m_creature);
+                            break;
+                        case 25:
+                            DoScriptText(SAY_TOOG_WORRIED, m_creature);
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        m_uiCheckSpeechTimer -= uiDiff;
+                    }
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_toogaAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_TOOGA)
+        {
+            if (npc_toogaAI* pToogaAI = dynamic_cast<npc_toogaAI*>(pCreature->AI()))
+            {
+                pToogaAI->StartFollow(pPlayer, FACTION_ESCORT_N_FRIEND_PASSIVE, pQuest);
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+/*######
+## go_inconspicuous_landmark
+## This is for Cuergo's Gold quest
+######*/
+
+enum
+{
+    NPC_TREASURE_HUNTING_PIRATE = 7899,
+    NPC_TREASURE_HUNTING_SWASHBUCKLER = 7901,
+    NPC_TREASURE_HUNTING_BUCCANEER = 7902,
+    GO_PIRATE_TREASURE = 142194,
+    SPAWN_DURATION = 300000 // pirates will exist in world for 3 minutes
+};
+
+struct go_pirate_treasure : public GameObjectScript
+{
+    go_pirate_treasure() : GameObjectScript("go_pirate_treasure") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo)
+    {
+        // despawn chest
+        pGo->SetSpawnedByDefault(false);
+        pGo->SetRespawnTime(10);
+
+        return true;
+    }
+};
+
+struct go_inconspicuous_landmark : public GameObjectScript
+{
+    go_inconspicuous_landmark() : GameObjectScript("go_inconspicuous_landmark") {}
+
+    void SpawnPirates(Player* pPlayer, int iTotalPirates)
+    {
+        Creature * pCreature;
+        for (int i = 0; i < iTotalPirates; i++)
+        {
+            float fPlayerX = pPlayer->GetPositionX();
+            float fPlayerY = pPlayer->GetPositionY();
+            float fPlayerZ = pPlayer->GetPositionZ();
+            // Pirate's spawn location
+            float fX = fPlayerX + rand() % 30 + 8;
+            float fY = fPlayerY + rand() % 30 + 8;
+            // spawn 4 or 5 sailor boys
+            switch (rand() % 3)
+            {
+            case 0: // spawn treasure hunting pirate
+                pCreature = pPlayer->SummonCreature(NPC_TREASURE_HUNTING_PIRATE, fX, fY, fPlayerZ, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, SPAWN_DURATION);
+                break;
+            case 1: // spawn treasure hunting swashbuckler
+                pCreature = pPlayer->SummonCreature(NPC_TREASURE_HUNTING_SWASHBUCKLER, fX, fY, fPlayerZ, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, SPAWN_DURATION);
+                break;
+            default: // spawn treasure hunting buccaneer
+                pCreature = pPlayer->SummonCreature(NPC_TREASURE_HUNTING_BUCCANEER, fX, fY, fPlayerZ, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, SPAWN_DURATION);
+                break;
+            }
+            pCreature->SetWalk(false, true); // run, fat boy, RUN!!!!
+            pCreature->GetMotionMaster()->MovePoint(0, fPlayerX, fPlayerY, fPlayerZ);
+        }
+    }
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        // spawn 4 or 5 sailor boys
+        int iTotalPirates = rand() % 2 + 4;
+        SpawnPirates(pPlayer, iTotalPirates);
+
+        // spawn chest
+        pGo->SummonGameObject(GO_PIRATE_TREASURE, -10117.715f, -4051.644f, 5.407f, 0.0f, 60);
+        return true;
+    }
+};
+
+void AddSC_tanaris()
+{
+    Script* s;
+    s = new go_pirate_treasure();
+    s->RegisterSelf();
+    s = new go_inconspicuous_landmark();
+    s->RegisterSelf();
+    s = new mob_aquementas();
+    s->RegisterSelf();
+    s = new npc_oox17tn();
+    s->RegisterSelf();
+    s = new npc_stone_watcher_of_norgannon();
+    s->RegisterSelf();
+    s = new npc_tooga();
+    s->RegisterSelf();
+
+#if defined(TBC) || defined (WOTLK) || defined (CATA)
+    s = new npc_custodian_of_time();
+    s->RegisterSelf();
+#endif
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_pirate_treasure";
+    //pNewScript->pGOUse = &GOUse_go_pirate_treasure;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_inconspicuous_landmark";
+    //pNewScript->pGOUse = &GOUse_go_inconspicuous_landmark;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_aquementas";
+    //pNewScript->GetAI = &GetAI_mob_aquementas;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_custodian_of_time";
+    //pNewScript->GetAI = &GetAI_npc_custodian_of_time;
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_oox17tn";
+    //pNewScript->GetAI = &GetAI_npc_oox17tn;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_oox17tn;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_stone_watcher_of_norgannon";
+    //pNewScript->pGossipHello =  &GossipHello_npc_stone_watcher_of_norgannon;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_stone_watcher_of_norgannon;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_tooga";
+    //pNewScript->GetAI = &GetAI_npc_tooga;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_tooga;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/teldrassil.cpp b/src/modules/SD3/scripts/kalimdor/teldrassil.cpp
new file mode 100644
index 000000000..a3a4b205b
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/teldrassil.cpp
@@ -0,0 +1,137 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Teldrassil
+ * SD%Complete: 100
+ * SDComment:   Quest support: 938
+ * SDCategory:  Teldrassil
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_mist
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "follower_ai.h"
+
+/*####
+# npc_mist
+####*/
+
+enum
+{
+    SAY_AT_HOME             = -1000323,
+    EMOTE_AT_HOME           = -1000324,
+    QUEST_MIST              = 938,
+    NPC_ARYNIA              = 3519,
+    FACTION_DARNASSUS       = 79
+};
+
+struct npc_mist : public CreatureScript
+{
+    npc_mist() : CreatureScript("npc_mist") {}
+
+    struct npc_mistAI : public FollowerAI
+    {
+        npc_mistAI(Creature* pCreature) : FollowerAI(pCreature) { }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            FollowerAI::MoveInLineOfSight(pWho);
+
+            if (!m_creature->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && pWho->GetEntry() == NPC_ARYNIA)
+            {
+                if (m_creature->IsWithinDistInMap(pWho, 10.0f))
+                {
+                    DoScriptText(SAY_AT_HOME, pWho);
+                    DoComplete();
+                }
+            }
+        }
+
+        void DoComplete()
+        {
+            DoScriptText(EMOTE_AT_HOME, m_creature);
+
+            if (Player* pPlayer = GetLeaderForFollower())
+            {
+                if (pPlayer->GetQuestStatus(QUEST_MIST) == QUEST_STATUS_INCOMPLETE)
+                {
+                    pPlayer->GroupEventHappens(QUEST_MIST, m_creature);
+                }
+            }
+
+            // The follow is over (and for later development, run off to the woods before really end)
+            SetFollowComplete();
+        }
+
+        // call not needed here, no known abilities
+        /*void UpdateFollowerAI(const uint32 uiDiff) override
+        {
+        if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+        return;
+
+        DoMeleeAttackIfReady();
+        }*/
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_mistAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_MIST)
+        {
+            if (npc_mistAI* pMistAI = dynamic_cast<npc_mistAI*>(pCreature->AI()))
+            {
+                pMistAI->StartFollow(pPlayer, FACTION_DARNASSUS, pQuest);
+            }
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_teldrassil()
+{
+    Script* s;
+    s = new npc_mist();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_mist";
+    //pNewScript->GetAI = &GetAI_npc_mist;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_mist;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
new file mode 100644
index 000000000..f00171bd8
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
@@ -0,0 +1,467 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      bug_trio
+ * SD%Complete: 75
+ * SDComment:   Summon Player spell NYI; Poison Cloud damage spell NYI; Timers need adjustments
+ * SDCategory:  Temple of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "temple_of_ahnqiraj.h"
+
+enum
+{
+    // kri
+    SPELL_THRASH            = 8876,
+    SPELL_CLEAVE            = 26350,
+    SPELL_TOXIC_VOLLEY      = 25812,
+    SPELL_TOXIC_VAPORS      = 25786,
+
+    // vem
+    SPELL_CHARGE            = 26561,
+    SPELL_VENGEANCE         = 25790,
+    SPELL_KNOCKBACK         = 18670,
+    SPELL_KNOCKDOWN         = 19128,
+
+    // yauj
+    SPELL_HEAL              = 25807,
+    SPELL_FEAR              = 26580,
+    SPELL_RAVAGE            = 3242,
+
+    NPC_YAUJ_BROOD          = 15621
+};
+
+struct boss_kri : public CreatureScript
+{
+    boss_kri() : CreatureScript("boss_kri") {}
+
+    struct boss_kriAI : public ScriptedAI
+    {
+        boss_kriAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+            // Thrash
+            DoCastSpellIfCan(m_creature, SPELL_THRASH, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiToxicVolleyTimer;
+
+        void Reset() override
+        {
+            m_uiCleaveTimer = urand(4000, 8000);
+            m_uiToxicVolleyTimer = urand(6000, 12000);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            // poison cloud on death
+            DoCastSpellIfCan(m_creature, SPELL_TOXIC_VAPORS, CAST_TRIGGERED);
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // If the other 2 bugs are still alive, make unlootable
+            if (m_pInstance->GetData(TYPE_BUG_TRIO) != DONE)
+            {
+                m_creature->SetLootRecipient(NULL);
+                m_pInstance->SetData(TYPE_BUG_TRIO, SPECIAL);
+
+                if (Creature* pVem = m_pInstance->GetSingleCreatureFromStorage(NPC_VEM))
+                {
+                    m_creature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pVem);
+                }
+                if (Creature* pYauj = m_pInstance->GetSingleCreatureFromStorage(NPC_YAUJ))
+                {
+                    m_creature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pYauj);
+                }
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BUG_TRIO, FAIL);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (!(pSender->GetEntry() == NPC_VEM || pSender->GetEntry() == NPC_YAUJ))
+                return;
+
+            if (m_creature->IsInCombat())
+            {
+                m_creature->SetHealth(m_creature->GetMaxHealth());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Cleave_Timer
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                {
+                    m_uiCleaveTimer = urand(5000, 12000);
+                }
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            // ToxicVolley_Timer
+            if (m_uiToxicVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TOXIC_VOLLEY) == CAST_OK)
+                {
+                    m_uiToxicVolleyTimer = urand(10000, 15000);
+                }
+            }
+            else
+            {
+                m_uiToxicVolleyTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_kriAI(pCreature);
+    }
+};
+
+struct boss_vem : public CreatureScript
+{
+    boss_vem() : CreatureScript("boss_vem") {}
+
+    struct boss_vemAI : public ScriptedAI
+    {
+        boss_vemAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiChargeTimer;
+        uint32 m_uiKnockBackTimer;
+        uint32 m_uiKnockDownTimer;
+
+        void Reset() override
+        {
+            m_uiChargeTimer = urand(15000, 27000);
+            m_uiKnockBackTimer = urand(8000, 20000);
+            m_uiKnockDownTimer = urand(10000, 23000);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            // Enrage the other bugs
+            DoCastSpellIfCan(m_creature, SPELL_VENGEANCE, CAST_TRIGGERED);
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // If the other 2 bugs are still alive, make unlootable
+            if (m_pInstance->GetData(TYPE_BUG_TRIO) != DONE)
+            {
+                m_creature->SetLootRecipient(NULL);
+                m_pInstance->SetData(TYPE_BUG_TRIO, SPECIAL);
+
+                if (Creature* pKri = m_pInstance->GetSingleCreatureFromStorage(NPC_KRI))
+                {
+                    m_creature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pKri);
+                }
+                if (Creature* pYauj = m_pInstance->GetSingleCreatureFromStorage(NPC_YAUJ))
+                {
+                    m_creature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pYauj);
+                }
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BUG_TRIO, FAIL);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (!(pSender->GetEntry() == NPC_KRI || pSender->GetEntry() == NPC_YAUJ))
+                return;
+
+            if (m_creature->IsInCombat())
+            {
+                m_creature->SetHealth(m_creature->GetMaxHealth());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Charge_Timer
+            if (m_uiChargeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_CHARGE) == CAST_OK)
+                    {
+                        m_uiChargeTimer = urand(8000, 16000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiChargeTimer -= uiDiff;
+            }
+
+            // KnockBack_Timer
+            if (m_uiKnockBackTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_KNOCKBACK) == CAST_OK)
+                {
+                    if (m_creature->GetThreatManager().getThreat(m_creature->getVictim()))
+                    {
+                        m_creature->GetThreatManager().modifyThreatPercent(m_creature->getVictim(), -80);
+                    }
+
+                    m_uiKnockBackTimer = urand(15000, 25000);
+                }
+            }
+            else
+            {
+                m_uiKnockBackTimer -= uiDiff;
+            }
+
+            // KnockDown_Timer
+            if (m_uiKnockDownTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_KNOCKDOWN) == CAST_OK)
+                {
+                    m_uiKnockDownTimer = urand(15000, 25000);
+                }
+            }
+            else
+                m_uiKnockDownTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_vemAI(pCreature);
+    }
+};
+
+struct boss_yauj : public CreatureScript
+{
+    boss_yauj() : CreatureScript("boss_yauj") {}
+
+    struct boss_yaujAI : public ScriptedAI
+    {
+        boss_yaujAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiHealTimer;
+        uint32 m_uiFearTimer;
+        uint32 m_uiRavageTimer;
+
+        void Reset() override
+        {
+            m_uiHealTimer = urand(25000, 40000);
+            m_uiFearTimer = urand(12000, 24000);
+            m_uiRavageTimer = urand(18000, 20000);
+        }
+
+        void JustDied(Unit* /*Killer*/) override
+        {
+            // Spawn 10 yauj brood on death
+            float fX, fY, fZ;
+            for (int i = 0; i < 10; ++i)
+            {
+                m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 10.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_YAUJ_BROOD, fX, fY, fZ, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+            }
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // If the other 2 bugs are still alive, make unlootable
+            if (m_pInstance->GetData(TYPE_BUG_TRIO) != DONE)
+            {
+                m_creature->SetLootRecipient(NULL);
+                m_pInstance->SetData(TYPE_BUG_TRIO, SPECIAL);
+
+                if (Creature* pKri = m_pInstance->GetSingleCreatureFromStorage(NPC_KRI))
+                {
+                    m_creature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pKri);
+                }
+                if (Creature* pVem = m_pInstance->GetSingleCreatureFromStorage(NPC_VEM))
+                {
+                    m_creature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pVem);
+                }
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BUG_TRIO, FAIL);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (!(pSender->GetEntry() == NPC_KRI || pSender->GetEntry() == NPC_VEM))
+                return;
+
+            if (m_creature->IsInCombat())
+            {
+                m_creature->SetHealth(m_creature->GetMaxHealth());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Fear_Timer
+            if (m_uiFearTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FEAR) == CAST_OK)
+                {
+                    DoResetThreat();
+                    m_uiFearTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiFearTimer -= uiDiff;
+            }
+
+            // Heal
+            if (m_uiHealTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(100.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_HEAL) == CAST_OK)
+                    {
+                        m_uiHealTimer = urand(15000, 30000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiHealTimer -= uiDiff;
+            }
+
+            // Ravage_Timer
+            if (m_uiRavageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_RAVAGE) == CAST_OK)
+                {
+                    m_uiRavageTimer = 16000;
+                }
+            }
+            else
+                m_uiRavageTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_yaujAI(pCreature);
+    }
+};
+
+void AddSC_bug_trio()
+{
+    Script* s;
+    s = new boss_kri();
+    s->RegisterSelf();
+    s = new boss_vem();
+    s->RegisterSelf();
+    s = new boss_yauj();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_kri";
+    //pNewScript->GetAI = &GetAI_boss_kri;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_vem";
+    //pNewScript->GetAI = &GetAI_boss_vem;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_yauj";
+    //pNewScript->GetAI = &GetAI_boss_yauj;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
new file mode 100644
index 000000000..423c86b55
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
@@ -0,0 +1,1003 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Cthun
+ * SD%Complete: 95
+ * SDComment:   Transform spell has some minor core issues. Eject from stomach event contains workarounds because of the missing spells. Digestive Acid should be handled in core.
+ * SDCategory:  Temple of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "temple_of_ahnqiraj.h"
+
+enum
+{
+    EMOTE_WEAKENED                  = -1531011,
+
+    // ***** Phase 1 ********
+    SPELL_EYE_BEAM                  = 26134,
+    // SPELL_DARK_GLARE              = 26029,
+    SPELL_ROTATE_TRIGGER            = 26137,                // phase switch spell - triggers 26009 or 26136. These trigger the Dark Glare spell - 26029
+    SPELL_ROTATE_360_LEFT           = 26009,
+    SPELL_ROTATE_360_RIGHT          = 26136,
+
+    // ***** Phase 2 ******
+    // SPELL_CARAPACE_CTHUN         = 26156,                // Was removed from client dbcs
+    SPELL_TRANSFORM                 = 26232,
+    SPELL_CTHUN_VULNERABLE          = 26235,
+    SPELL_MOUTH_TENTACLE            = 26332,                // prepare target to teleport to stomach
+
+#if defined (CLASSIC)  
+    SPELL_DIGESTIVE_ACID_TELEPORT   = 26220,                // stomach teleport spell
+#endif
+
+    SPELL_EXIT_STOMACH_KNOCKBACK    = 25383,                // spell id is wrong
+#if defined (CLASSIC)  
+    SPELL_EXIT_STOMACH_JUMP         = 26224,                // should make the player jump to the ceiling - not used yet
+    SPELL_EXIT_STOMACH_EFFECT       = 26230,                // used to complete the eject effect from the stomach - not used yet
+    SPELL_PORT_OUT_STOMACH_EFFECT   = 26648,                // used to kill players inside the stomach on evade
+#endif
+    SPELL_DIGESTIVE_ACID            = 26476,                // damage spell - should be handled by the map
+    // SPELL_EXIT_STOMACH            = 26221,               // summons 15800
+
+    // ***** Summoned spells *****
+    // Giant Claw tentacles
+    SPELL_GIANT_GROUND_RUPTURE      = 26478,
+    // SPELL_MASSIVE_GROUND_RUPTURE  = 26100,               // spell not confirmed
+    SPELL_GROUND_TREMOR             = 6524,
+    SPELL_HAMSTRING                 = 26211,
+    SPELL_THRASH                    = 3391,
+
+    // Npcs
+    // Phase 1 npcs
+    NPC_CLAW_TENTACLE               = 15725,                // summoned by missing spell 26140
+    NPC_EYE_TENTACLE                = 15726,                // summoned by spells 26144 - 26151; script effect of 26152 - triggered every 45 secs
+    NPC_TENTACLE_PORTAL             = 15904,                // summoned by missing spell 26396
+
+    // Phase 2 npcs
+    NPC_GIANT_CLAW_TENTACLE         = 15728,                // summoned by missing spell 26216 every 60 secs - also teleported by spell 26191
+    NPC_GIANT_EYE_TENTACLE          = 15334,                // summoned by missing spell 26768 every 60 secs
+    NPC_FLESH_TENTACLE              = 15802,                // summoned by missing spell 26237 every 10 secs
+    NPC_GIANT_TENTACLE_PORTAL       = 15910,                // summoned by missing spell 26477
+    NPC_EXIT_TRIGGER                = 15800,
+
+    DISPLAY_ID_CTHUN_BODY           = 15786,                // Helper display id; This is needed in order to have the proper transform animation. ToDo: remove this when auras are fixed in core.
+
+    AREATRIGGER_STOMACH_1           = 4033,
+    AREATRIGGER_STOMACH_2           = 4034,
+
+    MAX_FLESH_TENTACLES             = 2,
+    MAX_EYE_TENTACLES               = 8,
+};
+
+static const float afCthunLocations[4][4] =
+{
+    { -8571.0f, 1990.0f, -98.0f, 1.22f},        // flesh tentacles locations
+    { -8525.0f, 1994.0f, -98.0f, 2.12f},
+    { -8562.0f, 2037.0f, -70.0f, 5.05f},        // stomach teleport location
+    { -8545.6f, 1987.7f, -32.9f, 0.0f},         // stomach eject location
+};
+
+enum CThunPhase
+{
+    PHASE_EYE_NORMAL            = 0,
+    PHASE_EYE_DARK_GLARE        = 1,
+    PHASE_TRANSITION            = 2,
+    PHASE_CTHUN                 = 3,
+    PHASE_CTHUN_WEAKENED        = 4,
+};
+
+/*######
+## boss_eye_of_cthun
+######*/
+
+struct boss_eye_of_cthun : public CreatureScript
+{
+    boss_eye_of_cthun() : CreatureScript("boss_eye_of_cthun") {}
+
+    struct boss_eye_of_cthunAI : public Scripted_NoMovementAI
+    {
+        boss_eye_of_cthunAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        CThunPhase m_Phase;
+
+        uint32 m_uiClawTentacleTimer;
+        uint32 m_uiEyeTentacleTimer;
+        uint32 m_uiBeamTimer;
+        uint32 m_uiDarkGlareTimer;
+        uint32 m_uiDarkGlareEndTimer;
+
+        GuidList m_lEyeTentaclesList;
+
+        void Reset() override
+        {
+            m_Phase = PHASE_EYE_NORMAL;
+
+            m_uiDarkGlareTimer = 45000;
+            m_uiDarkGlareEndTimer = 40000;
+            m_uiClawTentacleTimer = urand(10000, 15000);
+            m_uiBeamTimer = 0;
+            m_uiEyeTentacleTimer = 45000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_CTHUN, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            // Allow the body to begin the transition
+            if (m_pInstance)
+            {
+                if (Creature* pCthun = m_pInstance->GetSingleCreatureFromStorage(NPC_CTHUN))
+                {
+                    pCthun->AI()->AttackStart(pKiller);
+                }
+                else
+                {
+                    script_error_log("C'thun could not be found. Please check your database!");
+                }
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            // Despawn Eye tentacles on evade
+            DoDespawnEyeTentacles();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_CTHUN, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_EYE_TENTACLE:
+                m_lEyeTentaclesList.push_back(pSummoned->GetObjectGuid());
+                // no break;
+            case NPC_CLAW_TENTACLE:
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+
+                pSummoned->SummonCreature(NPC_TENTACLE_PORTAL, pSummoned->GetPositionX(), pSummoned->GetPositionY(), pSummoned->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // Despawn the tentacle portal - this applies to all the summoned tentacles
+            if (Creature* pPortal = GetClosestCreatureWithEntry(pSummoned, NPC_TENTACLE_PORTAL, 5.0f))
+            {
+                pPortal->ForcedDespawn();
+            }
+        }
+
+        void SummonedCreatureDespawn(Creature* pSummoned) override
+        {
+            // Used only after evade
+            if (SelectHostileTarget())
+            {
+                return;
+            }
+
+            // Despawn the tentacle portal - this applies to all the summoned tentacles for evade case (which is handled by creature linking)
+            if (Creature* pPortal = GetClosestCreatureWithEntry(pSummoned, NPC_TENTACLE_PORTAL, 5.0f))
+            {
+                pPortal->ForcedDespawn();
+            }
+        }
+
+        // Wrapper to kill the eye tentacles before summoning new ones
+        void DoDespawnEyeTentacles()
+        {
+            for (GuidList::const_iterator itr = m_lEyeTentaclesList.begin(); itr != m_lEyeTentaclesList.end(); ++itr)
+            {
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pTemp->DealDamage(pTemp, pTemp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                }
+            }
+
+            m_lEyeTentaclesList.clear();
+        }
+
+        // Custom threat management
+        bool SelectHostileTarget()
+        {
+            Unit* pTarget = NULL;
+            Unit* pOldTarget = m_creature->getVictim();
+
+            if (!m_creature->GetThreatManager().isThreatListEmpty())
+            {
+                pTarget = m_creature->GetThreatManager().getHostileTarget();
+            }
+
+            if (pTarget)
+            {
+                if (pOldTarget != pTarget && m_Phase == PHASE_EYE_NORMAL)
+                {
+                    AttackStart(pTarget);
+                }
+
+                // Set victim to old target (if not while Dark Glare)
+                if (pOldTarget && pOldTarget->IsAlive() && m_Phase == PHASE_EYE_NORMAL)
+                {
+                    m_creature->SetTargetGuid(pOldTarget->GetObjectGuid());
+                    m_creature->SetInFront(pOldTarget);
+                }
+
+                return true;
+            }
+
+            // Will call EnterEvadeMode if fit
+            return m_creature->SelectHostileTarget();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!SelectHostileTarget())
+            {
+                return;
+            }
+
+            switch (m_Phase)
+            {
+            case PHASE_EYE_NORMAL:
+
+                if (m_uiBeamTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_EYE_BEAM) == CAST_OK)
+                        {
+                            m_creature->SetTargetGuid(pTarget->GetObjectGuid());
+                            m_uiBeamTimer = 3000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiBeamTimer -= uiDiff;
+                }
+
+                if (m_uiDarkGlareTimer < uiDiff)
+                {
+                    // Cast the rotation spell
+                    if (DoCastSpellIfCan(m_creature, SPELL_ROTATE_TRIGGER) == CAST_OK)
+                    {
+                        // Remove the target focus but allow the boss to face the current victim
+                        m_creature->SetTargetGuid(ObjectGuid());
+                        m_creature->SetFacingToObject(m_creature->getVictim());
+
+                        // Switch to Dark Glare phase
+                        m_uiDarkGlareTimer = 45000;
+                        m_Phase = PHASE_EYE_DARK_GLARE;
+                    }
+                }
+                else
+                {
+                    m_uiDarkGlareTimer -= uiDiff;
+                }
+
+                break;
+            case PHASE_EYE_DARK_GLARE:
+
+                if (m_uiDarkGlareEndTimer < uiDiff)
+                {
+                    // Remove rotation auras
+                    m_creature->RemoveAurasDueToSpell(SPELL_ROTATE_360_LEFT);
+                    m_creature->RemoveAurasDueToSpell(SPELL_ROTATE_360_RIGHT);
+
+                    // Switch to Eye Beam
+                    m_uiDarkGlareEndTimer = 40000;
+                    m_uiBeamTimer = 1000;
+                    m_Phase = PHASE_EYE_NORMAL;
+                }
+                else
+                {
+                    m_uiDarkGlareEndTimer -= uiDiff;
+                }
+                break;
+            default:    // should here an error to be roported? or just no special for other phases?
+                break;
+            }
+
+            if (m_uiClawTentacleTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    // Spawn claw tentacle on the random target on both phases
+                    m_creature->SummonCreature(NPC_CLAW_TENTACLE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                    m_uiClawTentacleTimer = urand(7000, 13000);
+                }
+            }
+            else
+            {
+                m_uiClawTentacleTimer -= uiDiff;
+            }
+
+            if (m_uiEyeTentacleTimer <= uiDiff)
+            {
+                // Despawn the eye tentacles if necessary
+                DoDespawnEyeTentacles();
+
+                // Spawn 8 Eye Tentacles
+                float fX, fY, fZ;
+                for (uint8 i = 0; i < MAX_EYE_TENTACLES; ++i)
+                {
+                    m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 30.0f, M_PI_F / 4 * i);
+                    m_creature->SummonCreature(NPC_EYE_TENTACLE, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+
+                m_uiEyeTentacleTimer = 45000;
+            }
+            else
+            {
+                m_uiEyeTentacleTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_eye_of_cthunAI(pCreature);
+    }
+};
+
+/*######
+## boss_cthun
+######*/
+
+struct boss_cthun : public CreatureScript
+{
+    boss_cthun() : CreatureScript("boss_cthun") {}
+
+    struct boss_cthunAI : public Scripted_NoMovementAI
+    {
+        boss_cthunAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            // Set active in order to be used during the instance progress
+            m_creature->SetActiveObjectState(true);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        CThunPhase m_Phase;
+
+        // Global variables
+        uint32 m_uiPhaseTimer;
+        uint8 m_uiFleshTentaclesKilled;
+        uint32 m_uiEyeTentacleTimer;
+        uint32 m_uiGiantClawTentacleTimer;
+        uint32 m_uiGiantEyeTentacleTimer;
+        uint32 m_uiDigestiveAcidTimer;
+
+        // Body Phase
+        uint32 m_uiMouthTentacleTimer;
+        uint32 m_uiStomachEnterTimer;
+
+        GuidList m_lEyeTentaclesList;
+        GuidList m_lPlayersInStomachList;
+
+        ObjectGuid m_stomachEnterTargetGuid;
+
+        void Reset() override
+        {
+            // Phase information
+            m_Phase = PHASE_TRANSITION;
+
+            m_uiPhaseTimer = 5000;
+            m_uiFleshTentaclesKilled = 0;
+            m_uiEyeTentacleTimer = 35000;
+            m_uiGiantClawTentacleTimer = 20000;
+            m_uiGiantEyeTentacleTimer = 50000;
+            m_uiDigestiveAcidTimer = 4000;
+
+            // Body Phase
+            m_uiMouthTentacleTimer = 15000;
+            m_uiStomachEnterTimer = 0;
+
+            // Clear players in stomach
+            m_lPlayersInStomachList.clear();
+
+            // Reset flags
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override
+        {
+            // Ignore damage reduction when vulnerable
+            if (m_Phase == PHASE_CTHUN_WEAKENED)
+            {
+                return;
+            }
+
+            // Not weakened so reduce damage by 99% - workaround for missing spell 26156
+            if (uiDamage / 99 > 0)
+            {
+                uiDamage /= 99;
+            }
+            else
+            {
+                uiDamage = 1;
+            }
+
+            // Prevent death in non-weakened state
+            if (uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            // Kill any player from the stomach on evade - this is because C'thun can not be soloed.
+            for (GuidList::const_iterator itr = m_lPlayersInStomachList.begin(); itr != m_lPlayersInStomachList.end(); ++itr)
+            {
+            // Workaround for missing spell 26648
+                if (Player* pPlayer = m_creature->GetMap()->GetPlayer(*itr))
+                {
+#if defined (CLASSIC)
+                    pPlayer->CastSpell(pPlayer, SPELL_PORT_OUT_STOMACH_EFFECT, true);
+#else
+                    m_creature->DealDamage(pPlayer, pPlayer->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+#endif
+                }
+            }
+
+            Scripted_NoMovementAI::EnterEvadeMode();
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_CTHUN, FAIL);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            m_creature->SetActiveObjectState(false);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_CTHUN, DONE);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_EYE_TENTACLE:
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+
+                m_lEyeTentaclesList.push_back(pSummoned->GetObjectGuid());
+                pSummoned->SummonCreature(NPC_TENTACLE_PORTAL, pSummoned->GetPositionX(), pSummoned->GetPositionY(), pSummoned->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                break;
+            case NPC_GIANT_EYE_TENTACLE:
+            case NPC_GIANT_CLAW_TENTACLE:
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+
+                pSummoned->SummonCreature(NPC_GIANT_TENTACLE_PORTAL, pSummoned->GetPositionX(), pSummoned->GetPositionY(), pSummoned->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+                // Handle portal despawn on tentacle kill
+            case NPC_EYE_TENTACLE:
+                if (Creature* pPortal = GetClosestCreatureWithEntry(pSummoned, NPC_TENTACLE_PORTAL, 5.0f))
+                {
+                    pPortal->ForcedDespawn();
+                }
+                break;
+            case NPC_GIANT_EYE_TENTACLE:
+            case NPC_GIANT_CLAW_TENTACLE:
+                if (Creature* pPortal = GetClosestCreatureWithEntry(pSummoned, NPC_GIANT_TENTACLE_PORTAL, 5.0f))
+                {
+                    pPortal->ForcedDespawn();
+                }
+                break;
+                // Handle the stomach tentacles kill
+            case NPC_FLESH_TENTACLE:
+                ++m_uiFleshTentaclesKilled;
+                if (m_uiFleshTentaclesKilled == MAX_FLESH_TENTACLES)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_CTHUN_VULNERABLE, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_WEAKENED, m_creature);
+                        m_uiPhaseTimer = 45000;
+                        m_Phase = PHASE_CTHUN_WEAKENED;
+                    }
+                }
+                break;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+            {
+                DoRemovePlayerFromStomach(pInvoker->ToPlayer());
+            }
+        }
+
+        // Wrapper to handle the Flesh Tentacles spawn
+        void DoSpawnFleshTentacles()
+        {
+            m_uiFleshTentaclesKilled = 0;
+
+            // Spawn 2 flesh tentacles
+            for (uint8 i = 0; i < MAX_FLESH_TENTACLES; ++i)
+            {
+                m_creature->SummonCreature(NPC_FLESH_TENTACLE, afCthunLocations[i][0], afCthunLocations[i][1], afCthunLocations[i][2], afCthunLocations[i][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        // Wrapper to kill the eye tentacles before summoning new ones
+        void DoDespawnEyeTentacles()
+        {
+            for (GuidList::const_iterator itr = m_lEyeTentaclesList.begin(); itr != m_lEyeTentaclesList.end(); ++itr)
+            {
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pTemp->DealDamage(pTemp, pTemp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                }
+            }
+
+            m_lEyeTentaclesList.clear();
+        }
+
+        // Wrapper to remove a stored player from the stomach
+        void DoRemovePlayerFromStomach(Player* pPlayer)
+        {
+            if (pPlayer)
+            {
+                m_lPlayersInStomachList.remove(pPlayer->GetObjectGuid());
+            }
+        }
+
+        // Custom threat management
+        bool SelectHostileTarget()
+        {
+            Unit* pTarget = NULL;
+            Unit* pOldTarget = m_creature->getVictim();
+
+            if (!m_creature->GetThreatManager().isThreatListEmpty())
+            {
+                pTarget = m_creature->GetThreatManager().getHostileTarget();
+            }
+
+            if (pTarget)
+            {
+                if (pOldTarget != pTarget)
+                {
+                    AttackStart(pTarget);
+                }
+
+                // Set victim to old target
+                if (pOldTarget && pOldTarget->IsAlive())
+                {
+                    m_creature->SetTargetGuid(pOldTarget->GetObjectGuid());
+                    m_creature->SetInFront(pOldTarget);
+                }
+
+                return true;
+            }
+
+            // Will call EnterEvadeMode if fit
+            return m_creature->SelectHostileTarget();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!SelectHostileTarget())
+            {
+                return;
+            }
+
+            switch (m_Phase)
+            {
+            case PHASE_TRANSITION:
+
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    // Note: we need to set the display id before casting the transform spell, in order to get the proper animation
+                    m_creature->SetDisplayId(DISPLAY_ID_CTHUN_BODY);
+
+                    // Transform and start C'thun phase
+                    if (DoCastSpellIfCan(m_creature, SPELL_TRANSFORM) == CAST_OK)
+                    {
+                        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                        DoSpawnFleshTentacles();
+
+                        m_Phase = PHASE_CTHUN;
+                        m_uiPhaseTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiPhaseTimer -= uiDiff;
+                }
+
+                break;
+            case PHASE_CTHUN:
+
+                if (m_uiMouthTentacleTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_IN_LOS))
+                    {
+                        // Cast the spell using the target as source
+                        pTarget->InterruptNonMeleeSpells(false);
+                        pTarget->CastSpell(pTarget, SPELL_MOUTH_TENTACLE, true, NULL, NULL, m_creature->GetObjectGuid());
+                        m_stomachEnterTargetGuid = pTarget->GetObjectGuid();
+
+                        m_uiStomachEnterTimer = 3800;
+                        m_uiMouthTentacleTimer = urand(13000, 15000);
+                    }
+                }
+                else
+                {
+                    m_uiMouthTentacleTimer -= uiDiff;
+                }
+
+                // Teleport the target to the stomach after a few seconds
+                if (m_uiStomachEnterTimer)
+                {
+                    if (m_uiStomachEnterTimer <= uiDiff)
+                    {
+                        // Check for valid player
+                        if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_stomachEnterTargetGuid))
+                        {
+
+#if defined (CLASSIC)  
+                            pPlayer->CastSpell(pPlayer, SPELL_DIGESTIVE_ACID_TELEPORT, true);
+#else
+                            DoTeleportPlayer(pPlayer, afCthunLocations[2][0], afCthunLocations[2][1], afCthunLocations[2][2], afCthunLocations[2][3]);
+#endif
+
+                            m_lPlayersInStomachList.push_back(pPlayer->GetObjectGuid());
+                        }
+
+                        m_stomachEnterTargetGuid.Clear();
+                        m_uiStomachEnterTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiStomachEnterTimer -= uiDiff;
+                    }
+                }
+
+                break;
+            case PHASE_CTHUN_WEAKENED:
+
+                // Handle Flesh Tentacles respawn when the vulnerability spell expires
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    DoSpawnFleshTentacles();
+
+                    m_uiPhaseTimer = 0;
+                    m_Phase = PHASE_CTHUN;
+                }
+                else
+                {
+                    m_uiPhaseTimer -= uiDiff;
+                }
+
+                break;
+            default:
+                break;
+            }
+
+            if (m_uiGiantClawTentacleTimer < uiDiff)
+            {
+                // Summon 1 Giant Claw Tentacle every 60 seconds
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_IN_LOS))
+                {
+                    m_creature->SummonCreature(NPC_GIANT_CLAW_TENTACLE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+
+                m_uiGiantClawTentacleTimer = 60000;
+            }
+            else
+            {
+                m_uiGiantClawTentacleTimer -= uiDiff;
+            }
+
+            if (m_uiGiantEyeTentacleTimer < uiDiff)
+            {
+                // Summon 1 Giant Eye Tentacle every 60 seconds
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_IN_LOS))
+                {
+                    m_creature->SummonCreature(NPC_GIANT_EYE_TENTACLE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+
+                m_uiGiantEyeTentacleTimer = 60000;
+            }
+            else
+            {
+                m_uiGiantEyeTentacleTimer -= uiDiff;
+            }
+
+            if (m_uiEyeTentacleTimer < uiDiff)
+            {
+                DoDespawnEyeTentacles();
+
+                // Spawn 8 Eye Tentacles every 30 seconds
+                float fX, fY, fZ;
+                for (uint8 i = 0; i < MAX_EYE_TENTACLES; ++i)
+                {
+                    m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 30.0f, M_PI_F / 4 * i);
+                    m_creature->SummonCreature(NPC_EYE_TENTACLE, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+
+                m_uiEyeTentacleTimer = 30000;
+            }
+            else
+            {
+                m_uiEyeTentacleTimer -= uiDiff;
+            }
+
+            // Note: this should be applied by the teleport spell
+            if (m_uiDigestiveAcidTimer < uiDiff)
+            {
+                // Iterate the Stomach players list and apply the Digesti acid debuff on them every 4 sec
+                for (GuidList::const_iterator itr = m_lPlayersInStomachList.begin(); itr != m_lPlayersInStomachList.end(); ++itr)
+                {
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(*itr))
+                    {
+                        pPlayer->CastSpell(pPlayer, SPELL_DIGESTIVE_ACID, true, NULL, NULL, m_creature->GetObjectGuid());
+                    }
+                }
+                m_uiDigestiveAcidTimer = 4000;
+            }
+            else
+            {
+                m_uiDigestiveAcidTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_cthunAI(pCreature);
+    }
+};
+
+/*######
+## npc_giant_claw_tentacle
+######*/
+
+struct npc_giant_claw_tentacle : public CreatureScript
+{
+    npc_giant_claw_tentacle() : CreatureScript("npc_giant_claw_tentacle") {}
+
+    struct npc_giant_claw_tentacleAI : public Scripted_NoMovementAI
+    {
+        npc_giant_claw_tentacleAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiThrashTimer;
+        uint32 m_uiHamstringTimer;
+        uint32 m_uiDistCheckTimer;
+
+        void Reset() override
+        {
+            m_uiHamstringTimer = 2000;
+            m_uiThrashTimer = 5000;
+            m_uiDistCheckTimer = 5000;
+
+            DoCastSpellIfCan(m_creature, SPELL_GIANT_GROUND_RUPTURE);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Check if we have a target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiDistCheckTimer < uiDiff)
+            {
+                // If there is nobody in range, spawn a new tentacle at a new target location
+                if (!m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0, uint32(0), SELECT_FLAG_IN_MELEE_RANGE) && m_pInstance)
+                {
+                    if (Creature* pCthun = m_pInstance->GetSingleCreatureFromStorage(NPC_CTHUN))
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_NOT_IN_MELEE_RANGE))
+                        {
+                            pCthun->SummonCreature(NPC_GIANT_CLAW_TENTACLE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                            // Self kill when a new tentacle is spawned
+                            m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                            return;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiDistCheckTimer = 5000;
+                }
+            }
+            else
+            {
+                m_uiDistCheckTimer -= uiDiff;
+            }
+
+            if (m_uiThrashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_THRASH) == CAST_OK)
+                {
+                    m_uiThrashTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiThrashTimer -= uiDiff;
+            }
+
+            if (m_uiHamstringTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HAMSTRING) == CAST_OK)
+                {
+                    m_uiHamstringTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiHamstringTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_giant_claw_tentacleAI(pCreature);
+    }
+};
+
+/*######
+## at_stomach_cthun
+######*/
+
+struct at_stomach_cthun : public AreaTriggerScript
+{
+    at_stomach_cthun() : AreaTriggerScript("at_stomach_cthun") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (pAt->id == AREATRIGGER_STOMACH_1)
+        {
+            if (pPlayer->isGameMaster() || !pPlayer->IsAlive())
+            {
+                return false;
+            }
+
+            // Summon the exit trigger which should push the player outside the stomach - not used because missing eject spells
+            // if (!GetClosestCreatureWithEntry(pPlayer, NPC_EXIT_TRIGGER, 10.0f))
+            //    pPlayer->CastSpell(pPlayer, SPELL_EXIT_STOMACH, true);
+
+            // Note: because of the missing spell id 26224, we will use basic jump movement
+            // Disabled because of the missing jump effect
+#if defined (WOTLK) || defined (CATA)
+            pPlayer->GetMotionMaster()->MoveJump(afCthunLocations[3][0], afCthunLocations[3][1], afCthunLocations[3][2], pPlayer->GetSpeed(MOVE_RUN) * 5, 0);
+        }
+        else if (pAt->id == AREATRIGGER_STOMACH_2)
+        {
+#endif
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
+            {
+                if (Creature* pCthun = pInstance->GetSingleCreatureFromStorage(NPC_CTHUN))
+                {
+                    // Remove player from the Stomach
+                    if (CreatureAI* pBossAI = pCthun->AI())
+                    {
+                        pBossAI->SendAIEvent(AI_EVENT_CUSTOM_A, pPlayer, pCthun);
+                    }
+
+                    // Teleport back to C'thun and remove the Digestive Acid
+                    pPlayer->RemoveAurasDueToSpell(SPELL_DIGESTIVE_ACID);
+                    pPlayer->NearTeleportTo(pCthun->GetPositionX(), pCthun->GetPositionY(), pCthun->GetPositionZ() + 15.0f, frand(0, 2 * M_PI_F));
+
+                    // Note: the real knockback spell id should be 26230
+                    pPlayer->CastSpell(pPlayer, SPELL_EXIT_STOMACH_KNOCKBACK, true, NULL, NULL, pCthun->GetObjectGuid());
+                }
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_cthun()
+{
+    Script* s;
+    s = new boss_eye_of_cthun();
+    s->RegisterSelf();
+    s = new boss_cthun();
+    s->RegisterSelf();
+    s = new npc_giant_claw_tentacle();
+    s->RegisterSelf();
+    s = new at_stomach_cthun();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_eye_of_cthun";
+    //pNewScript->GetAI = &GetAI_boss_eye_of_cthun;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_cthun";
+    //pNewScript->GetAI = &GetAI_boss_cthun;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_giant_claw_tentacle";
+    //pNewScript->GetAI = &GetAI_npc_giant_claw_tentacle;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_stomach_cthun";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_stomach_cthun;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp
new file mode 100644
index 000000000..bf39aade2
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp
@@ -0,0 +1,225 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Fankriss
+ * SD%Complete: 90
+ * SDComment:   Sound not implemented
+ * SDCategory:  Temple of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "temple_of_ahnqiraj.h"
+
+enum
+{
+    SOUND_SENTENCE_YOU      = 8588,
+    SOUND_SERVE_TO          = 8589,
+    SOUND_LAWS              = 8590,
+    SOUND_TRESPASS          = 8591,
+    SOUND_WILL_BE           = 8592,
+
+    SPELL_MORTAL_WOUND      = 25646,
+    SPELL_ENTANGLE_1        = 720,
+    SPELL_ENTANGLE_2        = 731,
+    SPELL_ENTANGLE_3        = 1121,
+    SPELL_SUMMON_WORM_1     = 518,
+    SPELL_SUMMON_WORM_2     = 25831,
+    SPELL_SUMMON_WORM_3     = 25832,
+
+    NPC_SPAWN_FANKRISS      = 15630,
+    NPC_VEKNISS_HATCHLING   = 15962,
+};
+
+static const uint32 aSummonWormSpells[3] = {SPELL_SUMMON_WORM_1, SPELL_SUMMON_WORM_2, SPELL_SUMMON_WORM_3};
+static const uint32 aEntangleSpells[3] = {SPELL_ENTANGLE_1, SPELL_ENTANGLE_2, SPELL_ENTANGLE_3};
+
+struct boss_fankriss : public CreatureScript
+{
+    boss_fankriss() : CreatureScript("boss_fankriss") {}
+
+    struct boss_fankrissAI : public ScriptedAI
+    {
+        boss_fankrissAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiMortalWoundTimer;
+        uint32 m_uiSummonWormTimer;
+        uint32 m_uiEntangleTimer;
+        uint32 m_uiEntangleSummonTimer;
+
+        ObjectGuid m_EntangleTargetGuid;
+
+        void Reset() override
+        {
+            m_uiMortalWoundTimer = urand(10000, 15000);
+            m_uiSummonWormTimer = urand(30000, 50000);
+            m_uiEntangleTimer = urand(25000, 40000);
+            m_uiEntangleSummonTimer = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FANKRISS, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FANKRISS, FAIL);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FANKRISS, DONE);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SPAWN_FANKRISS)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+            else if (pSummoned->GetEntry() == NPC_VEKNISS_HATCHLING)
+            {
+                if (Player* pTarget = m_creature->GetMap()->GetPlayer(m_EntangleTargetGuid))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiMortalWoundTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MORTAL_WOUND) == CAST_OK)
+                {
+                    m_uiMortalWoundTimer = urand(7000, 14000);
+                }
+            }
+            else
+            {
+                m_uiMortalWoundTimer -= uiDiff;
+            }
+
+            if (m_uiSummonWormTimer < uiDiff)
+            {
+                uint8 uiSpawnIndex = urand(0, 2);
+                if (DoCastSpellIfCan(m_creature, aSummonWormSpells[uiSpawnIndex]) == CAST_OK)
+                {
+                    m_uiSummonWormTimer = urand(15000, 40000);
+                }
+            }
+            else
+            {
+                m_uiSummonWormTimer -= uiDiff;
+            }
+
+            // Teleporting Random Target to one of the three tunnels and spawn 4 hatchlings near the gamer.
+            if (m_uiEntangleTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_PLAYER))
+                {
+                    uint8 uiEntangleIndex = urand(0, 2);
+                    if (DoCastSpellIfCan(pTarget, aEntangleSpells[uiEntangleIndex]) == CAST_OK)
+                    {
+                        m_EntangleTargetGuid = pTarget->GetObjectGuid();
+                        m_uiEntangleSummonTimer = 1000;
+                        m_uiEntangleTimer = urand(40000, 70000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiEntangleTimer -= uiDiff;
+            }
+
+            // Summon 4 Hatchlings around the target
+            if (m_uiEntangleSummonTimer)
+            {
+                if (m_uiEntangleSummonTimer <= uiDiff)
+                {
+                    if (Player* pTarget = m_creature->GetMap()->GetPlayer(m_EntangleTargetGuid))
+                    {
+                        float fX, fY, fZ;
+                        for (uint8 i = 0; i < 4; ++i)
+                        {
+                            m_creature->GetRandomPoint(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 3.0f, fX, fY, fZ);
+                            m_creature->SummonCreature(NPC_VEKNISS_HATCHLING, fX, fY, fZ, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 10000);
+                        }
+                        m_uiEntangleSummonTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiEntangleSummonTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_fankrissAI(pCreature);
+    }
+};
+
+void AddSC_boss_fankriss()
+{
+    Script* s;
+    s = new boss_fankriss();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_fankriss";
+    //pNewScript->GetAI = &GetAI_boss_fankriss;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp
new file mode 100644
index 000000000..36d03ce13
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp
@@ -0,0 +1,201 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Huhuran
+ * SD%Complete: 90
+ * SDComment:   Timed enrage NYI; Timers
+ * SDCategory:  Temple of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "temple_of_ahnqiraj.h"
+
+enum
+{
+    EMOTE_GENERIC_FRENZY_KILL   = -1000001,
+    EMOTE_GENERIC_BERSERK       = -1000004,
+
+    SPELL_ENRAGE                = 26051,        // triggers 26052
+    SPELL_BERSERK               = 26068,        // triggers 26052
+    SPELL_NOXIOUS_POISON        = 26053,
+    SPELL_WYVERN_STING          = 26180,
+    SPELL_ACID_SPIT             = 26050
+};
+
+struct boss_huhuran : public CreatureScript
+{
+    boss_huhuran() : CreatureScript("boss_huhuran") {}
+
+    struct boss_huhuranAI : public ScriptedAI
+    {
+        boss_huhuranAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiFrenzyTimer;
+        uint32 m_uiWyvernTimer;
+        uint32 m_uiSpitTimer;
+        uint32 m_uiNoxiousPoisonTimer;
+
+        bool m_bIsBerserk;
+
+        void Reset() override
+        {
+            m_uiFrenzyTimer = urand(25000, 35000);
+            m_uiWyvernTimer = urand(18000, 28000);
+            m_uiSpitTimer = 8000;
+            m_uiNoxiousPoisonTimer = urand(10000, 20000);
+            m_bIsBerserk = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HUHURAN, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HUHURAN, FAIL);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HUHURAN, DONE);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Frenzy_Timer
+            if (!m_bIsBerserk)
+            {
+                if (m_uiFrenzyTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_GENERIC_FRENZY_KILL, m_creature);
+                        m_uiFrenzyTimer = urand(25000, 35000);
+                    }
+                }
+                else
+                {
+                    m_uiFrenzyTimer -= uiDiff;
+                }
+            }
+
+            // Wyvern Timer
+            if (m_uiWyvernTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_WYVERN_STING) == CAST_OK)
+                    {
+                        m_uiWyvernTimer = urand(15000, 32000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiWyvernTimer -= uiDiff;
+            }
+
+            // Spit Timer
+            if (m_uiSpitTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ACID_SPIT) == CAST_OK)
+                {
+                    m_uiSpitTimer = urand(5000, 10000);
+                }
+            }
+            else
+            {
+                m_uiSpitTimer -= uiDiff;
+            }
+
+            // NoxiousPoison_Timer
+            if (m_uiNoxiousPoisonTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_NOXIOUS_POISON) == CAST_OK)
+                {
+                    m_uiNoxiousPoisonTimer = urand(12000, 24000);
+                }
+            }
+            else
+            {
+                m_uiNoxiousPoisonTimer -= uiDiff;
+            }
+
+            // Berserk
+            if (!m_bIsBerserk && m_creature->GetHealthPercent() < 30.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_GENERIC_BERSERK, m_creature);
+                    m_bIsBerserk = true;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_huhuranAI(pCreature);
+    }
+};
+
+void AddSC_boss_huhuran()
+{
+    Script* s;
+    s = new boss_huhuran();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_huhuran";
+    //pNewScript->GetAI = &GetAI_boss_huhuran;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
new file mode 100644
index 000000000..8c0edb039
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
@@ -0,0 +1,420 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Ouro
+ * SD%Complete: 90
+ * SDComment:   Some minor adjustments may be required
+ * SDCategory:  Temple of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "temple_of_ahnqiraj.h"
+
+enum
+{
+    // ground spells
+    SPELL_SWEEP             = 26103,
+    SPELL_SANDBLAST         = 26102,
+    SPELL_BOULDER           = 26616,
+    SPELL_BERSERK           = 26615,
+
+    // emerge spells
+    SPELL_BIRTH             = 26262,                        // The Birth Animation
+    SPELL_GROUND_RUPTURE    = 26100,                        // spell not confirmed
+    SPELL_SUMMON_BASE       = 26133,                        // summons gameobject 180795
+
+    // submerge spells
+    SPELL_SUBMERGE_VISUAL   = 26063,
+#if defined (CLASSIC)  
+    SPELL_SUMMON_OURO_MOUNDS = 26058,                       // summons 5 dirt mounds
+#else
+    SPELL_SUMMON_OURO_MOUND = 26058,                        // summons 5 dirt mounds
+#endif
+
+    SPELL_SUMMON_TRIGGER    = 26284,
+
+    SPELL_SUMMON_OURO       = 26642,
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    SPELL_QUAKE             = 26093,
+#endif
+
+    // other spells - not used TODO check this "synced mess"
+    // SPELL_SUMMON_SCARABS    = 26060,                     // triggered after 30 secs - cast by the Dirt Mounds
+#if defined (CLASSIC)  
+    SPELL_DIRTMOUND_PASSIVE = 26092,                        // casts 26093 every 1 sec
+#endif
+    // SPELL_SET_OURO_HEALTH   = 26075,                     // removed from DBC
+    // SPELL_SAVE_OURO_HEALTH  = 26076,                     // removed from DBC
+    // SPELL_TELEPORT_TRIGGER  = 26285,                     // removed from DBC
+    // SPELL_SUBMERGE_TRIGGER  = 26104,                     // removed from DBC
+#if defined (CLASSIC)  
+    SPELL_SUMMON_OURO_MOUND = 26617,
+#endif
+    // SPELL_SCARABS_PERIODIC  = 26619,                     // cast by the Dirt Mounds in order to spawn the scarabs - removed from DBC
+
+    // summoned npcs
+    NPC_OURO                = 15517,
+    // NPC_OURO_SCARAB       = 15718,                       // summoned by Dirt Mounds
+    NPC_OURO_TRIGGER        = 15717,
+    NPC_DIRT_MOUND          = 15712,                        // summoned also by missing spell 26617
+};
+
+struct boss_ouro : public CreatureScript
+{
+    boss_ouro() : CreatureScript("boss_ouro") {}
+
+    struct boss_ouroAI : public Scripted_NoMovementAI
+    {
+        boss_ouroAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiSweepTimer;
+        uint32 m_uiSandBlastTimer;
+        uint32 m_uiSubmergeTimer;
+        uint32 m_uiSummonBaseTimer;
+
+        uint32 m_uiSummonMoundTimer;
+
+        bool m_bEnraged;
+        bool m_bSubmerged;
+
+        ObjectGuid m_ouroTriggerGuid;
+
+        void Reset() override
+        {
+            m_uiSweepTimer = urand(35000, 40000);
+            m_uiSandBlastTimer = urand(30000, 45000);
+            m_uiSubmergeTimer = 90000;
+            m_uiSummonBaseTimer = 2000;
+
+            m_uiSummonMoundTimer = 10000;
+
+            m_bEnraged = false;
+            m_bSubmerged = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OURO, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OURO, FAIL);
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OURO, DONE);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_OURO_TRIGGER:
+                m_ouroTriggerGuid = pSummoned->GetObjectGuid();
+                // no break;
+            case NPC_DIRT_MOUND:
+                pSummoned->GetMotionMaster()->MoveRandomAroundPoint(pSummoned->GetPositionX(), pSummoned->GetPositionY(), pSummoned->GetPositionZ(), 40.0f);
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no pTarget
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (!m_bSubmerged)
+            {
+                // Summon sandworm base
+                if (m_uiSummonBaseTimer)
+                {
+                    if (m_uiSummonBaseTimer <= uiDiff)
+                    {
+                        // Note: server side spells should be cast directly
+                        m_creature->CastSpell(m_creature, SPELL_SUMMON_BASE, true);
+                        m_uiSummonBaseTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiSummonBaseTimer -= uiDiff;
+                    }
+                }
+
+                // Sweep
+                if (m_uiSweepTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SWEEP) == CAST_OK)
+                    {
+                        m_uiSweepTimer = 20000;
+                    }
+                }
+                else
+                {
+                    m_uiSweepTimer -= uiDiff;
+                }
+
+                // Sand Blast
+                if (m_uiSandBlastTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SANDBLAST) == CAST_OK)
+                    {
+                        m_uiSandBlastTimer = 22000;
+                    }
+                }
+                else
+                {
+                    m_uiSandBlastTimer -= uiDiff;
+                }
+
+                if (!m_bEnraged)
+                {
+                    // Enrage at 20% HP
+                    if (m_creature->GetHealthPercent() < 20.0f)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                        {
+                            m_bEnraged = true;
+                            return;
+                        }
+                    }
+
+                    // Submerge
+                    if (m_uiSubmergeTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_SUBMERGE_VISUAL) == CAST_OK)
+                        {
+#if defined (CLASSIC)  
+                            DoCastSpellIfCan(m_creature, SPELL_SUMMON_OURO_MOUNDS, CAST_TRIGGERED);
+#else
+                            DoCastSpellIfCan(m_creature, SPELL_SUMMON_OURO_MOUND, CAST_TRIGGERED);
+#endif
+                            DoCastSpellIfCan(m_creature, SPELL_SUMMON_TRIGGER, CAST_TRIGGERED);
+
+                            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                            m_bSubmerged = true;
+                            m_uiSubmergeTimer = 30000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiSubmergeTimer -= uiDiff;
+                    }
+                }
+                else
+                {
+                    // Summon 1 mound every 10 secs when enraged
+                    if (m_uiSummonMoundTimer < uiDiff)
+                    {
+
+#if defined (CLASSIC)  
+                        if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_OURO_MOUND) == CAST_OK)
+#else
+                    DoSpawnCreature(NPC_DIRT_MOUND, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+#endif
+                        {
+                            m_uiSummonMoundTimer = 10000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiSummonMoundTimer -= uiDiff;
+                    }
+                }
+
+                // If we are within range melee the target
+                if (m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+                {
+                    DoMeleeAttackIfReady();
+                }
+                // Spam Boulder spell when enraged and not tanked
+                else if (m_bEnraged)
+                {
+                    if (!m_creature->IsNonMeleeSpellCasted(false))
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        {
+                            DoCastSpellIfCan(pTarget, SPELL_BOULDER);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // Resume combat
+                if (m_uiSubmergeTimer < uiDiff)
+                {
+                    // Teleport to the trigger in order to get a new location
+                    if (Creature* pTrigger = m_creature->GetMap()->GetCreature(m_ouroTriggerGuid))
+                    {
+                        m_creature->NearTeleportTo(pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ(), 0);
+                    }
+
+                    if (DoCastSpellIfCan(m_creature, SPELL_BIRTH) == CAST_OK)
+                    {
+                        m_creature->RemoveAurasDueToSpell(SPELL_SUBMERGE_VISUAL);
+                        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                        m_bSubmerged = false;
+                        m_uiSummonBaseTimer = 2000;
+                        m_uiSubmergeTimer = 90000;
+                    }
+                }
+                else
+                {
+                    m_uiSubmergeTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ouroAI(pCreature);
+    }
+};
+
+struct npc_ouro_spawner : public CreatureScript
+{
+    npc_ouro_spawner() : CreatureScript("npc_ouro_spawner") {}
+
+    struct npc_ouro_spawnerAI : public Scripted_NoMovementAI
+    {
+        npc_ouro_spawnerAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    uint32 m_uiQuakeTimer;
+#endif
+        bool m_bHasSummoned;
+
+        void Reset() override
+        {
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+        m_uiQuakeTimer = 1000;
+#endif
+            m_bHasSummoned = false;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // Spawn Ouro on LoS check
+            if (!m_bHasSummoned && pWho->GetTypeId() == TYPEID_PLAYER && !((Player*)pWho)->isGameMaster() && m_creature->IsWithinDistInMap(pWho, 50.0f))
+            {
+
+#if defined (CLASSIC)  
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_OURO, CAST_TRIGGERED) == CAST_OK)
+#else
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_OURO) == CAST_OK)
+#endif
+                {
+#if defined (CLASSIC)  
+                    DoCastSpellIfCan(m_creature, SPELL_DIRTMOUND_PASSIVE, CAST_TRIGGERED);
+#endif
+                    m_bHasSummoned = true;
+                }
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Despanw when Ouro is spawned
+            if (pSummoned->GetEntry() == NPC_OURO)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_BIRTH, false);
+                pSummoned->SetInCombatWithZone();
+                m_creature->ForcedDespawn();
+            }
+        }
+
+    void UpdateAI(const uint32 uiDiff) override
+    {
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+        if (m_bHasSummoned)
+        {
+            if (m_uiQuakeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_QUAKE) == CAST_OK)
+                { m_uiQuakeTimer = 1000; }
+            }
+            else
+            { m_uiQuakeTimer -= uiDiff; }
+        }
+#endif
+    }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ouro_spawnerAI(pCreature);
+    }
+};
+
+void AddSC_boss_ouro()
+{
+    Script* s;
+    s = new boss_ouro();
+    s->RegisterSelf();
+    s = new npc_ouro_spawner();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ouro";
+    //pNewScript->GetAI = &GetAI_boss_ouro;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ouro_spawner";
+    //pNewScript->GetAI = &GetAI_npc_ouro_spawner;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
new file mode 100644
index 000000000..ff8582202
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
@@ -0,0 +1,398 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Sartura
+ * SD%Complete: 95
+ * SDComment:   None
+ * SDCategory:  Temple of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "temple_of_ahnqiraj.h"
+
+enum
+{
+    SAY_AGGRO                   = -1531008,
+    SAY_SLAY                    = -1531009,
+    SAY_DEATH                   = -1531010,
+
+    SPELL_WHIRLWIND             = 26083,
+    SPELL_ENRAGE                = 28747,                    // Not sure if right ID.
+    SPELL_ENRAGEHARD            = 28798,
+
+    // Guard Spell
+    SPELL_WHIRLWIND_ADD         = 26038,
+    SPELL_KNOCKBACK             = 26027,
+};
+
+struct boss_sartura : public CreatureScript
+{
+    boss_sartura() : CreatureScript("boss_sartura") {}
+
+    struct boss_sarturaAI : public ScriptedAI
+    {
+        boss_sarturaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiWhirlWindTimer;
+        uint32 m_uiWhirlWindRandomTimer;
+        uint32 m_uiWhirlWindEndTimer;
+        uint32 m_uiAggroResetTimer;
+        uint32 m_uiAggroResetEndTimer;
+        uint32 m_uiEnrageHardTimer;
+
+        bool m_bIsEnraged;
+
+        void Reset() override
+        {
+            m_uiWhirlWindTimer = 30000;
+            m_uiWhirlWindRandomTimer = urand(3000, 7000);
+            m_uiWhirlWindEndTimer = 0;
+            m_uiAggroResetTimer = urand(45000, 55000);
+            m_uiAggroResetEndTimer = 0;
+            m_uiEnrageHardTimer = 10 * 60000;
+
+            m_bIsEnraged = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SARTURA, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SARTURA, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SARTURA, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiWhirlWindEndTimer)                          // Is in Whirlwind
+            {
+                // While whirlwind, switch to random targets often
+                if (m_uiWhirlWindRandomTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        m_creature->FixateTarget(pTarget);
+                    }
+
+                    m_uiWhirlWindRandomTimer = urand(3000, 7000);
+                }
+                else
+                {
+                    m_uiWhirlWindRandomTimer -= uiDiff;
+                }
+
+                // End Whirlwind Phase
+                if (m_uiWhirlWindEndTimer <= uiDiff)
+                {
+                    m_creature->FixateTarget(NULL);
+                    m_uiWhirlWindEndTimer = 0;
+                    m_uiWhirlWindTimer = urand(25000, 40000);
+                }
+                else
+                {
+                    m_uiWhirlWindEndTimer -= uiDiff;
+                }
+            }
+            else // if (!m_uiWhirlWindEndTimer)                 // Is not in whirlwind
+            {
+                // Enter Whirlwind Phase
+                if (m_uiWhirlWindTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_WHIRLWIND) == CAST_OK)
+                    {
+                        m_uiWhirlWindEndTimer = 15000;
+                        m_uiWhirlWindRandomTimer = 500;
+                    }
+                }
+                else
+                {
+                    m_uiWhirlWindTimer -= uiDiff;
+                }
+
+                // Aquire a new target sometimes
+                if (!m_uiAggroResetEndTimer)                    // No random target picket
+                {
+                    if (m_uiAggroResetTimer < uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                        {
+                            m_creature->FixateTarget(pTarget);
+                        }
+
+                        m_uiAggroResetEndTimer = 5000;
+                    }
+                    else
+                    {
+                        m_uiAggroResetTimer -= uiDiff;
+                    }
+                }
+                else                                            // Reset from recent random target
+                {
+                    // Remove remaining taunts
+                    if (m_uiAggroResetEndTimer <= uiDiff)
+                    {
+                        m_creature->FixateTarget(NULL);
+                        m_uiAggroResetEndTimer = 0;
+                        m_uiAggroResetTimer = urand(35000, 45000);
+                    }
+                    else
+                    {
+                        m_uiAggroResetEndTimer -= uiDiff;
+                    }
+                }
+            }
+
+            // If she is 20% enrage
+            if (!m_bIsEnraged && m_creature->GetHealthPercent() <= 20.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE, m_uiWhirlWindEndTimer ? CAST_TRIGGERED : 0) == CAST_OK)
+                {
+                    m_bIsEnraged = true;
+                }
+            }
+
+            // After 10 minutes hard enrage
+            if (m_uiEnrageHardTimer)
+            {
+                if (m_uiEnrageHardTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ENRAGEHARD, m_uiWhirlWindEndTimer ? CAST_TRIGGERED : 0) == CAST_OK)
+                    {
+                        m_uiEnrageHardTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiEnrageHardTimer -= uiDiff;
+                }
+            }
+
+            // No melee damage while in whirlwind
+            if (!m_uiWhirlWindEndTimer)
+            {
+                DoMeleeAttackIfReady();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_sarturaAI(pCreature);
+    }
+};
+
+struct mob_sartura_royal_guard : public CreatureScript
+{
+    mob_sartura_royal_guard() : CreatureScript("mob_sartura_royal_guard") {}
+
+    struct mob_sartura_royal_guardAI : public ScriptedAI
+    {
+        mob_sartura_royal_guardAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiWhirlWindTimer;
+        uint32 m_uiWhirlWindRandomTimer;
+        uint32 m_uiWhirlWindEndTimer;
+        uint32 m_uiAggroResetTimer;
+        uint32 m_uiAggroResetEndTimer;
+        uint32 m_uiKnockBackTimer;
+
+        void Reset() override
+        {
+            m_uiWhirlWindTimer = 30000;
+            m_uiWhirlWindRandomTimer = urand(3000, 7000);
+            m_uiWhirlWindEndTimer = 0;
+            m_uiAggroResetTimer = urand(45000, 55000);
+            m_uiAggroResetEndTimer = 0;
+            m_uiKnockBackTimer = 10000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiWhirlWindEndTimer)                          // Is in Whirlwind
+            {
+                // While whirlwind, switch to random targets often
+                if (m_uiWhirlWindRandomTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        m_creature->FixateTarget(pTarget);
+                    }
+
+                    m_uiWhirlWindRandomTimer = urand(3000, 7000);
+                }
+                else
+                {
+                    m_uiWhirlWindRandomTimer -= uiDiff;
+                }
+
+                // End Whirlwind Phase
+                if (m_uiWhirlWindEndTimer <= uiDiff)
+                {
+                    m_creature->FixateTarget(NULL);
+                    m_uiWhirlWindEndTimer = 0;
+                    m_uiWhirlWindTimer = urand(25000, 40000);
+                }
+                else
+                {
+                    m_uiWhirlWindEndTimer -= uiDiff;
+                }
+            }
+            else // if (!m_uiWhirlWindEndTimer)                 // Is not in Whirlwind
+            {
+                // Enter Whirlwind Phase
+                if (m_uiWhirlWindTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_WHIRLWIND_ADD) == CAST_OK)
+                    {
+                        m_uiWhirlWindEndTimer = 8000;
+                        m_uiWhirlWindRandomTimer = 500;
+                    }
+                }
+                else
+                {
+                    m_uiWhirlWindTimer -= uiDiff;
+                }
+
+                // Aquire a new target sometimes
+                if (!m_uiAggroResetEndTimer)                    // No random target picket
+                {
+                    if (m_uiAggroResetTimer < uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                        {
+                            m_creature->FixateTarget(pTarget);
+                        }
+
+                        m_uiAggroResetEndTimer = 5000;
+                    }
+                    else
+                    {
+                        m_uiAggroResetTimer -= uiDiff;
+                    }
+                }
+                else                                            // Reset from recent random target
+                {
+                    if (m_uiAggroResetEndTimer <= uiDiff)
+                    {
+                        m_creature->FixateTarget(NULL);
+                        m_uiAggroResetEndTimer = 0;
+                        m_uiAggroResetTimer = urand(30000, 40000);
+                    }
+                    else
+                    {
+                        m_uiAggroResetEndTimer -= uiDiff;
+                    }
+                }
+
+                // Knockback nearby enemies
+                if (m_uiKnockBackTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_KNOCKBACK) == CAST_OK)
+                    {
+                        m_uiKnockBackTimer = urand(10000, 20000);
+                    }
+                }
+                else
+                {
+                    m_uiKnockBackTimer -= uiDiff;
+                }
+            }
+
+            // No melee damage while in whirlwind
+            if (!m_uiWhirlWindEndTimer)
+            {
+                DoMeleeAttackIfReady();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_sartura_royal_guardAI(pCreature);
+    }
+};
+
+void AddSC_boss_sartura()
+{
+    Script* s;
+    s = new boss_sartura();
+    s->RegisterSelf();
+    s = new mob_sartura_royal_guard();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_sartura";
+    //pNewScript->GetAI = &GetAI_boss_sartura;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_sartura_royal_guard";
+    //pNewScript->GetAI = &GetAI_mob_sartura_royal_guard;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
new file mode 100644
index 000000000..c21a3291e
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
@@ -0,0 +1,371 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Skeram
+ * SD%Complete: 90
+ * SDComment:   Timers
+ * SDCategory:  Temple of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "temple_of_ahnqiraj.h"
+
+enum
+{
+    SAY_AGGRO1                  = -1531000,
+    SAY_AGGRO2                  = -1531001,
+    SAY_AGGRO3                  = -1531002,
+    SAY_SLAY1                   = -1531003,
+    SAY_SLAY2                   = -1531004,
+    SAY_SLAY3                   = -1531005,
+    SAY_SPLIT                   = -1531006,
+    SAY_DEATH                   = -1531007,
+
+    SPELL_ARCANE_EXPLOSION      = 26192,
+    SPELL_EARTH_SHOCK           = 26194,
+    SPELL_TRUE_FULFILLMENT      = 785,
+    SPELL_TELEPORT_1            = 4801,
+    SPELL_TELEPORT_2            = 8195,
+    SPELL_TELEPORT_3            = 20449,
+    SPELL_INITIALIZE_IMAGE      = 3730,
+    SPELL_SUMMON_IMAGES         = 747,
+};
+
+struct boss_skeram : public CreatureScript
+{
+    boss_skeram() : CreatureScript("boss_skeram") {}
+
+    struct boss_skeramAI : public ScriptedAI
+    {
+        boss_skeramAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+            // Check this for images, because the Initialize spell hits the target only after aggro
+            m_bIsImage = m_creature->IsTemporarySummon();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiArcaneExplosionTimer;
+        uint32 m_uiFullFillmentTimer;
+        uint32 m_uiBlinkTimer;
+        uint32 m_uiEarthShockTimer;
+
+        float m_fHpCheck;
+
+        bool m_bIsImage;
+
+        void Reset() override
+        {
+            m_uiArcaneExplosionTimer = urand(6000, 12000);
+            m_uiFullFillmentTimer = 15000;
+            m_uiBlinkTimer = urand(30000, 45000);
+            m_uiEarthShockTimer = 1200;
+
+            m_fHpCheck = 75.0f;
+
+            if (m_creature->GetVisibility() != VISIBILITY_ON)
+            {
+                m_creature->SetVisibility(VISIBILITY_ON);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(SAY_SLAY1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_SLAY2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_SLAY3, m_creature);
+                break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (!m_bIsImage)
+            {
+                DoScriptText(SAY_DEATH, m_creature);
+
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_SKERAM, DONE);
+                }
+            }
+            // Else despawn to avoid looting
+            else
+            {
+                m_creature->ForcedDespawn();
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_bIsImage)
+            {
+                return;
+            }
+
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(SAY_AGGRO1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_AGGRO2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_AGGRO3, m_creature);
+                break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SKERAM, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SKERAM, FAIL);
+            }
+
+            if (m_bIsImage)
+            {
+                m_creature->ForcedDespawn();
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                pSummoned->AI()->AttackStart(pTarget);
+            }
+
+            DoCastSpellIfCan(pSummoned, SPELL_INITIALIZE_IMAGE, CAST_TRIGGERED);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+            {
+                DoInitializeImage();
+            }
+        }
+
+        // Wrapper to handle the image version initialize
+        void DoInitializeImage()
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // Initialize the health of the clone
+            if (Creature* pProphet = m_pInstance->GetSingleCreatureFromStorage(NPC_SKERAM))
+            {
+                float fHealthPct = pProphet->GetHealthPercent();
+                float fMaxHealthPct = 0;
+
+                // The max health depends on the split phase. It's percent * original boss health
+                if (fHealthPct < 25.0f)
+                {
+                    fMaxHealthPct = 0.50f;
+                }
+                else if (fHealthPct < 50.0f)
+                {
+                    fMaxHealthPct = 0.20f;
+                }
+                else
+                {
+                    fMaxHealthPct = 0.10f;
+                }
+
+                // Set the same health percent as the original boss
+                m_creature->SetMaxHealth(m_creature->GetMaxHealth()*fMaxHealthPct);
+                m_creature->SetHealthPercent(fHealthPct);
+                m_creature->SetCorpseDelay(0);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // ArcaneExplosion_Timer
+            if (m_uiArcaneExplosionTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_EXPLOSION) == CAST_OK)
+                {
+                    m_uiArcaneExplosionTimer = urand(8000, 18000);
+                }
+            }
+            else
+            {
+                m_uiArcaneExplosionTimer -= uiDiff;
+            }
+
+            // True Fullfilment
+            if (m_uiFullFillmentTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_TRUE_FULFILLMENT) == CAST_OK)
+                    {
+                        m_uiFullFillmentTimer = urand(20000, 30000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiFullFillmentTimer -= uiDiff;
+            }
+
+            // Blink_Timer
+            if (m_uiBlinkTimer < uiDiff)
+            {
+                switch (urand(0, 2))
+                {
+                case 0:
+                    DoCastSpellIfCan(m_creature, SPELL_TELEPORT_1);
+                    break;
+                case 1:
+                    DoCastSpellIfCan(m_creature, SPELL_TELEPORT_2);
+                    break;
+                case 2:
+                    DoCastSpellIfCan(m_creature, SPELL_TELEPORT_3);
+                    break;
+                }
+
+                DoResetThreat();
+                if (m_creature->GetVisibility() != VISIBILITY_ON)
+                {
+                    m_creature->SetVisibility(VISIBILITY_ON);
+                }
+
+                m_uiBlinkTimer = urand(10000, 30000);
+            }
+            else
+            {
+                m_uiBlinkTimer -= uiDiff;
+            }
+
+            // Earth Shock is cast every 1.2s on the victim if Skeram can't reach them or they are not auto attacking him
+            if (m_uiEarthShockTimer < uiDiff)
+            {
+                if (!m_creature->CanReachWithMeleeAttack(m_creature->getVictim()) || !m_creature->getVictim()->hasUnitState(UNIT_STAT_MELEE_ATTACKING))
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_EARTH_SHOCK) == CAST_OK)
+                        m_uiEarthShockTimer = 1200;
+                }
+            }
+            else
+                m_uiEarthShockTimer -= uiDiff;
+
+            // Summon images at 75%, 50% and 25%
+            if (!m_bIsImage && m_creature->GetHealthPercent() < m_fHpCheck)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_IMAGES) == CAST_OK)
+                {
+                    DoScriptText(SAY_SPLIT, m_creature);
+                    m_fHpCheck -= 25.0f;
+                    // Teleport shortly after the images are summoned and set invisible to clear the selection (Workaround alert!!!)
+                    m_creature->SetVisibility(VISIBILITY_OFF);
+                    m_uiBlinkTimer = 2000;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_skeramAI(pCreature);
+    }
+};
+
+struct spell_npc_prophet_skeram : public SpellScript
+{
+    spell_npc_prophet_skeram() : SpellScript("spell_npc_prophet_skeram") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_INITIALIZE_IMAGE && uiEffIndex == EFFECT_INDEX_0)
+        {
+            // check for target == caster first
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreatureTarget->ToCreature()->GetInstanceData())
+            {
+                if (Creature* pProphet = pInstance->GetSingleCreatureFromStorage(NPC_SKERAM))
+                {
+                    if (pProphet == pCreatureTarget)
+                    {
+                        return false;
+                    }
+                }
+            }
+
+            if (CreatureAI* pSkeramAI = pCreatureTarget->ToCreature()->AI())
+            {
+                pSkeramAI->SendAIEvent(AI_EVENT_CUSTOM_A, pCreatureTarget->ToCreature(), pCreatureTarget->ToCreature());
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_skeram()
+{
+    Script* s;
+    s = new boss_skeram();
+    s->RegisterSelf();
+    s = new spell_npc_prophet_skeram();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_skeram";
+    //pNewScript->GetAI = &GetAI_boss_skeram;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_prophet_skeram;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
new file mode 100644
index 000000000..2fc6de905
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
@@ -0,0 +1,538 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Boss_Twinemperors
+ * SD%Complete: 95
+ * SDComment:   Timers
+ * SDCategory:  Temple of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "temple_of_ahnqiraj.h"
+
+enum
+{
+    // yells
+    SAY_VEKLOR_AGGRO_1          = -1531019,
+    SAY_VEKLOR_AGGRO_2          = -1531020,
+    SAY_VEKLOR_AGGRO_3          = -1531021,
+    SAY_VEKLOR_AGGRO_4          = -1531022,
+    SAY_VEKLOR_SLAY             = -1531023,
+    SAY_VEKLOR_DEATH            = -1531024,
+    SAY_VEKLOR_SPECIAL          = -1531025,
+
+    SAY_VEKNILASH_AGGRO_1       = -1531026,
+    SAY_VEKNILASH_AGGRO_2       = -1531027,
+    SAY_VEKNILASH_AGGRO_3       = -1531028,
+    SAY_VEKNILASH_AGGRO_4       = -1531029,
+    SAY_VEKNILASH_SLAY          = -1531030,
+    SAY_VEKNILASH_DEATH         = -1531031,
+    SAY_VEKNILASH_SPECIAL       = -1531032,
+
+    // common spells
+    SPELL_TWIN_TELEPORT         = 799,
+    SPELL_TWIN_TELEPORT_STUN    = 800,
+    SPELL_HEAL_BROTHER          = 7393,
+    SPELL_TWIN_TELEPORT_VISUAL  = 26638,
+
+    // veklor spells
+    SPELL_ARCANE_BURST          = 568,
+    SPELL_EXPLODE_BUG           = 804,          // targets 15316 or 15317
+    SPELL_SHADOW_BOLT           = 26006,
+    SPELL_BLIZZARD              = 26607,
+    SPELL_FRENZY                = 27897,
+
+    // veknilash spells
+    SPELL_MUTATE_BUG            = 802,          // targets 15316 or 15317
+    SPELL_UPPERCUT              = 26007,
+    SPELL_UNBALANCING_STRIKE    = 26613,
+    SPELL_BERSERK               = 27680,
+};
+
+// common AI part
+struct boss_twin_emperorsAI : public ScriptedAI
+{
+    boss_twin_emperorsAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+    }
+
+    ScriptedInstance* m_pInstance;
+
+    uint32 m_uiBerserkTimer;
+    uint32 m_uiBugAbilityTimer;
+    uint32 m_uiTeleportTimer;
+
+    void Reset() override
+    {
+        m_uiTeleportTimer   = 35000;
+        m_uiBugAbilityTimer = urand(7000, 14000);
+        m_uiBerserkTimer    = 15 * MINUTE * IN_MILLISECONDS;
+    }
+
+    // Workaround for the shared health pool
+    void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+    {
+        if (!m_pInstance)
+        {
+            return;
+        }
+
+        if (Creature* pTwin = m_pInstance->GetSingleCreatureFromStorage(m_creature->GetEntry() == NPC_VEKLOR ? NPC_VEKNILASH : NPC_VEKLOR))
+        {
+            float fDamPercent = ((float)uiDamage) / ((float)m_creature->GetMaxHealth());
+            uint32 uiTwinDamage = (uint32)(fDamPercent * ((float)pTwin->GetMaxHealth()));
+            uint32 uiTwinHealth = pTwin->GetHealth() - uiTwinDamage;
+            pTwin->SetHealth(uiTwinHealth > 0 ? uiTwinHealth : 0);
+
+            if (!uiTwinHealth)
+            {
+                pTwin->SetDeathState(JUST_DIED);
+                pTwin->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+            }
+        }
+    }
+
+    // Workaround for the shared health pool
+    void HealedBy(Unit* /*pHealer*/, uint32& uiHealedAmount) override
+    {
+        if (!m_pInstance)
+        {
+            return;
+        }
+
+        if (Creature* pTwin = m_pInstance->GetSingleCreatureFromStorage(m_creature->GetEntry() == NPC_VEKLOR ? NPC_VEKNILASH : NPC_VEKLOR))
+        {
+            float fHealPercent = ((float)uiHealedAmount) / ((float)m_creature->GetMaxHealth());
+            uint32 uiTwinHeal = (uint32)(fHealPercent * ((float)pTwin->GetMaxHealth()));
+            uint32 uiTwinHealth = pTwin->GetHealth() + uiTwinHeal;
+            pTwin->SetHealth(uiTwinHealth < pTwin->GetMaxHealth() ? uiTwinHealth : pTwin->GetMaxHealth());
+        }
+    }
+
+    void Aggro(Unit* /*pWho*/) override
+    {
+        if (m_pInstance)
+        {
+            m_pInstance->SetData(TYPE_TWINS, IN_PROGRESS);
+        }
+    }
+
+    void JustDied(Unit* /*pKiller*/) override
+    {
+        if (m_pInstance)
+        {
+            m_pInstance->SetData(TYPE_TWINS, DONE);
+        }
+    }
+
+    void JustReachedHome() override
+    {
+        if (m_pInstance)
+        {
+            m_pInstance->SetData(TYPE_TWINS, FAIL);
+        }
+    }
+
+    void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+    {
+        if (pSpell->Id == SPELL_TWIN_TELEPORT)
+        {
+            DoTeleportAbility();
+            DoResetThreat();
+            DoCastSpellIfCan(m_creature, SPELL_TWIN_TELEPORT_STUN, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_TWIN_TELEPORT_VISUAL, CAST_TRIGGERED);
+        }
+    }
+
+    // Return true, if succeeded
+    virtual void DoTeleportAbility() {}
+    virtual bool DoHandleBugAbility() = 0;
+    virtual bool DoHandleBerserk() = 0;
+
+    // Return true to handle shared timers and MeleeAttack
+    virtual bool UpdateEmperorAI(const uint32 /*uiDiff*/) { return true; }
+
+    void UpdateAI(const uint32 uiDiff) override
+    {
+        // Return since we have no target
+        if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+        {
+            return;
+        }
+
+        // Call emperor specific virtual function
+        if (!UpdateEmperorAI(uiDiff))
+        {
+            return;
+        }
+
+        if (m_uiTeleportTimer < uiDiff)
+        {
+            if (DoCastSpellIfCan(m_creature, SPELL_TWIN_TELEPORT) == CAST_OK)
+            {
+                m_uiTeleportTimer = 35000;
+            }
+        }
+        else
+            { m_uiTeleportTimer -= uiDiff; }
+
+        if (m_uiBugAbilityTimer < uiDiff)
+        {
+            if (DoHandleBugAbility())
+            {
+                m_uiBugAbilityTimer = urand(10000, 17000);
+            }
+        }
+        else
+            { m_uiBugAbilityTimer -= uiDiff; }
+
+        if (m_uiBerserkTimer)
+        {
+            if (m_uiBerserkTimer <= uiDiff)
+            {
+                if (DoHandleBerserk())
+                {
+                    m_uiBerserkTimer = 0;
+                }
+            }
+            else
+            {
+                m_uiBerserkTimer -= uiDiff;
+            }
+        }
+    }
+};
+
+struct boss_veknilash : public CreatureScript
+{
+    boss_veknilash() : CreatureScript("boss_veknilash") {}
+
+    struct boss_veknilashAI : public boss_twin_emperorsAI
+    {
+        boss_veknilashAI(Creature* pCreature) : boss_twin_emperorsAI(pCreature) { }
+
+        uint32 m_uiUppercutTimer;
+        uint32 m_uiUnbalancingStrikeTimer;
+
+        void Reset() override
+        {
+            boss_twin_emperorsAI::Reset();
+
+            m_uiUppercutTimer = urand(14000, 29000);
+            m_uiUnbalancingStrikeTimer = urand(8000, 18000);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_pInstance && m_pInstance->GetData(TYPE_TWINS) == IN_PROGRESS && pWho->GetEntry() == NPC_VEKLOR && pWho->IsWithinDistInMap(m_creature, 60.0f))
+            {
+                DoCastSpellIfCan(pWho, SPELL_HEAL_BROTHER);
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            boss_twin_emperorsAI::Aggro(pWho);
+
+            switch (urand(0, 3))
+            {
+            case 0:
+                DoScriptText(SAY_VEKNILASH_AGGRO_1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_VEKNILASH_AGGRO_2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_VEKNILASH_AGGRO_3, m_creature);
+                break;
+            case 3:
+                DoScriptText(SAY_VEKNILASH_AGGRO_4, m_creature);
+                break;
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_VEKNILASH_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            boss_twin_emperorsAI::JustDied(pKiller);
+
+            DoScriptText(SAY_VEKNILASH_DEATH, m_creature);
+        }
+
+        bool DoHandleBugAbility()
+        {
+            if (DoCastSpellIfCan(m_creature, SPELL_MUTATE_BUG) == CAST_OK)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        bool DoHandleBerserk()
+        {
+            if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        // Only Vek'nilash handles the teleport for both of them
+        void DoTeleportAbility()
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            if (Creature* pVeklor = m_pInstance->GetSingleCreatureFromStorage(NPC_VEKLOR))
+            {
+                float fTargetX, fTargetY, fTargetZ, fTargetOrient;
+                pVeklor->GetPosition(fTargetX, fTargetY, fTargetZ);
+                fTargetOrient = pVeklor->GetOrientation();
+
+                pVeklor->NearTeleportTo(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), m_creature->GetOrientation(), true);
+                m_creature->NearTeleportTo(fTargetX, fTargetY, fTargetZ, fTargetOrient, true);
+            }
+        }
+
+        bool UpdateEmperorAI(const uint32 uiDiff)
+        {
+            if (m_uiUnbalancingStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_UNBALANCING_STRIKE) == CAST_OK)
+                {
+                    m_uiUnbalancingStrikeTimer = urand(8000, 20000);
+                }
+            }
+            else
+            {
+                m_uiUnbalancingStrikeTimer -= uiDiff;
+            }
+
+            if (m_uiUppercutTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_UPPERCUT, SELECT_FLAG_IN_MELEE_RANGE))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_UPPERCUT) == CAST_OK)
+                    {
+                        m_uiUppercutTimer = urand(15000, 30000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiUppercutTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+
+            return true;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_veknilashAI(pCreature);
+    }
+};
+
+struct boss_veklor : public CreatureScript
+{
+    boss_veklor() : CreatureScript("boss_veklor") {}
+
+    struct boss_veklorAI : public boss_twin_emperorsAI
+    {
+        boss_veklorAI(Creature* pCreature) : boss_twin_emperorsAI(pCreature) { }
+
+        uint32 m_uiShadowBoltTimer;
+        uint32 m_uiBlizzardTimer;
+        uint32 m_uiArcaneBurstTimer;
+
+        void Reset() override
+        {
+            boss_twin_emperorsAI::Reset();
+
+            m_uiShadowBoltTimer = 1000;
+            m_uiBlizzardTimer = urand(15000, 20000);
+            m_uiArcaneBurstTimer = 1000;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_pInstance && m_pInstance->GetData(TYPE_TWINS) == IN_PROGRESS && pWho->GetEntry() == NPC_VEKNILASH && pWho->IsWithinDistInMap(m_creature, 60.0f))
+            {
+                DoCastSpellIfCan(pWho, SPELL_HEAL_BROTHER);
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            boss_twin_emperorsAI::Aggro(pWho);
+
+            switch (urand(0, 3))
+            {
+            case 0:
+                DoScriptText(SAY_VEKLOR_AGGRO_1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_VEKLOR_AGGRO_2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_VEKLOR_AGGRO_3, m_creature);
+                break;
+            case 3:
+                DoScriptText(SAY_VEKLOR_AGGRO_4, m_creature);
+                break;
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_VEKLOR_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            boss_twin_emperorsAI::JustDied(pKiller);
+
+            DoScriptText(SAY_VEKLOR_DEATH, m_creature);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, false))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                m_creature->GetMotionMaster()->MoveChase(pWho, 20.0f);
+            }
+        }
+
+        bool DoHandleBugAbility()
+        {
+            if (DoCastSpellIfCan(m_creature, SPELL_EXPLODE_BUG) == CAST_OK)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        bool DoHandleBerserk()
+        {
+            if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        bool UpdateEmperorAI(const uint32 uiDiff)
+        {
+            if (m_uiShadowBoltTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHADOW_BOLT) == CAST_OK)
+                {
+                    m_uiShadowBoltTimer = 2000;
+                }
+            }
+            else
+            {
+                m_uiShadowBoltTimer -= uiDiff;
+            }
+
+            if (m_uiBlizzardTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_BLIZZARD) == CAST_OK)
+                    {
+                        m_uiBlizzardTimer = urand(15000, 30000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiBlizzardTimer -= uiDiff;
+            }
+
+            if (m_uiArcaneBurstTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_BURST) == CAST_OK)
+                {
+                    m_uiArcaneBurstTimer = 5000;
+                }
+            }
+            else
+            {
+                m_uiArcaneBurstTimer -= uiDiff;
+            }
+
+            return true;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_veklorAI(pCreature);
+    }
+};
+
+void AddSC_boss_twinemperors()
+{
+    Script* s;
+    s = new boss_veknilash();
+    s->RegisterSelf();
+    s = new boss_veklor();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_veknilash";
+    //pNewScript->GetAI = &GetAI_boss_veknilash;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_veklor";
+    //pNewScript->GetAI = &GetAI_boss_veklor;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp
new file mode 100644
index 000000000..edd296362
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp
@@ -0,0 +1,481 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SD%Complete: 90
+ * SDComment: Server side spells implementation need to be checked.
+ * SDComment:   Only basic spells - freeze and explode events require more research
+ * SDCategory:  Temple of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "temple_of_ahnqiraj.h"
+
+enum
+{
+#if defined (WOTLK) || defined (CATA)
+    // Emotes
+    EMOTE_SLOW                  = -1531041,
+    EMOTE_FREEZE                = -1531042,
+    EMOTE_FROZEN                = -1531043,
+    EMOTE_CRACK                 = -1531044,
+    EMOTE_SHATTER               = -1531045,
+    EMOTE_EXPLODE               = -1531046,
+#endif
+    
+    // Timer spells
+    SPELL_POISON_SHOCK          = 25993,
+    SPELL_POISONBOLT_VOLLEY     = 25991,
+    SPELL_TOXIN                 = 26575,                    // Triggers toxin cloud - 25989
+
+    // Debuffs gained by the boss on frost damage
+    SPELL_VISCIDUS_SLOWED       = 26034,
+    SPELL_VISCIDUS_SLOWED_MORE  = 26036,
+    SPELL_VISCIDUS_FREEZE       = 25937,
+
+    // When frost damage exceeds a certain limit, then boss explodes
+    SPELL_REJOIN_VISCIDUS       = 25896,
+    SPELL_VISCIDUS_EXPLODE      = 25938,
+    SPELL_VISCIDUS_SUICIDE      = 26003,                    // cast when boss explodes and is below 5% Hp - should trigger 26002
+#if defined (WOTLK) || defined (CATA)
+    SPELL_DESPAWN_GLOBS         = 26608,
+#endif
+
+#if defined (CLASSIC)  
+    SPELL_MEMBRANE_VISCIDUS     = 25994,                    // damage reduction spell
+#endif
+    // SPELL_VISCIDUS_WEAKNESS   = 25926,                   // aura which procs at damage - should trigger the slow spells
+    // SPELL_VISCIDUS_SHRINKS    = 25893,                   // removed from DBC
+    // SPELL_VISCIDUS_SHRINKS_2  = 27934,                   // removed from DBC
+    // SPELL_VISCIDUS_GROWS      = 25897,                   // removed from DBC
+    // SPELL_SUMMON_GLOBS        = 25885,                   // summons npc 15667 using spells from 25865 to 25884; All spells have target coords - removed from DBC
+    // SPELL_VISCIDUS_TELEPORT   = 25904,                   // removed from DBC
+    // SPELL_SUMMONT_TRIGGER     = 26564,                   // summons 15992 - removed from DBC
+
+#if defined (CLASSIC) || defined (TBC)
+    NPC_GLOB_OF_VISCIDUS        = 15667
+#endif
+#if defined (WOTLK) || defined (CATA)
+    NPC_GLOB_OF_VISCIDUS        = 15667,
+    NPC_VISCIDUS_TRIGGER      = 15922,                      // handles aura 26575
+
+    MAX_VISCIDUS_GLOBS          = 20,                       // there are 20 summoned globs; each glob = 5% hp
+
+    // hitcounts
+    HITCOUNT_SLOW               = 100,
+    HITCOUNT_SLOW_MORE          = 150,
+    HITCOUNT_FREEZE             = 200,
+    HITCOUNT_CRACK              = 50,
+    HITCOUNT_SHATTER            = 100,
+    HITCOUNT_EXPLODE            = 150,
+
+    // phases
+    PHASE_NORMAL                = 1,
+    PHASE_FROZEN                = 2,
+    PHASE_EXPLODED              = 3,
+#endif
+};
+
+#if defined (WOTLK) || defined (CATA)
+static const uint32 auiGlobSummonSpells[MAX_VISCIDUS_GLOBS] = { 25865, 25866, 25867, 25868, 25869, 25870, 25871, 25872, 25873, 25874, 25875, 25876, 25877, 25878, 25879, 25880, 25881, 25882, 25883, 25884 };
+#endif
+
+
+struct boss_viscidus : public CreatureScript
+{
+    boss_viscidus() : CreatureScript("boss_viscidus") {}
+
+    struct boss_viscidusAI : public ScriptedAI
+    {
+        boss_viscidusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+#if defined (WOTLK) || defined (CATA)
+        uint8 m_uiPhase;
+
+        uint32 m_uiHitCount;
+        uint32 m_uiToxinTimer;
+        uint32 m_uiExplodeDelayTimer;
+#endif
+        uint32 m_uiPoisonShockTimer;
+        uint32 m_uiPoisonBoltVolleyTimer;
+
+#if defined (WOTLK) || defined (CATA)
+        GuidList m_lGlobesGuidList;
+#endif
+
+        void Reset() override
+        {
+#if defined (WOTLK) || defined (CATA)
+            m_uiPhase                 = PHASE_NORMAL;
+            m_uiHitCount              = 0;
+        
+            m_uiExplodeDelayTimer     = 0;
+            m_uiToxinTimer            = 30000;
+#endif
+            m_uiPoisonShockTimer = urand(7000, 12000);
+            m_uiPoisonBoltVolleyTimer = urand(10000, 15000);
+
+#if defined (WOTLK) || defined (CATA)
+            SetCombatMovement(true);
+            m_creature->SetVisibility(VISIBILITY_ON);
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            m_creature->SetObjectScale(DEFAULT_OBJECT_SCALE);
+#endif
+#if defined (CLASSIC)  
+            DoCastSpellIfCan(m_creature, SPELL_MEMBRANE_VISCIDUS);
+#endif
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_TOXIN);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VISCIDUS, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VISCIDUS, FAIL);
+
+#if defined (WOTLK) || defined (CATA)
+                DoCastSpellIfCan(m_creature, SPELL_DESPAWN_GLOBS, CAST_TRIGGERED);
+#endif
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VISCIDUS, DONE);
+            }
+        }
+
+#if defined (WOTLK) || defined (CATA)
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_GLOB_OF_VISCIDUS)
+            {
+                float fX, fY, fZ;
+                m_creature->GetRespawnCoord(fX, fY, fZ);
+                pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                m_lGlobesGuidList.push_back(pSummoned->GetObjectGuid());
+            }
+            else if (pSummoned->GetEntry() == NPC_VISCIDUS_TRIGGER)
+                pSummoned->CastSpell(pSummoned, SPELL_TOXIN, true);
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_GLOB_OF_VISCIDUS)
+            {
+                // shrink - modify scale
+                m_creature->ApplyPercentModFloatValue(OBJECT_FIELD_SCALE_X, float(-4), true);
+                m_creature->UpdateModelData();
+                m_creature->SetHealth(m_creature->GetHealth() - (m_creature->GetMaxHealth() * 0.05f));
+                m_lGlobesGuidList.remove(pSummoned->GetObjectGuid());
+
+                // suicide if required
+                if (m_creature->GetHealthPercent() < 5.0f)
+                {
+                    m_creature->SetVisibility(VISIBILITY_ON);
+
+                    if (DoCastSpellIfCan(m_creature, SPELL_VISCIDUS_SUICIDE, CAST_TRIGGERED) == CAST_OK)
+                        m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                }
+                else if (m_lGlobesGuidList.empty())
+                {
+                    m_creature->SetVisibility(VISIBILITY_ON);
+                    m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                    m_uiPhase = PHASE_NORMAL;
+
+                    SetCombatMovement(true);
+                    DoStartMovement(m_creature->getVictim());
+                }
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override
+        {
+            if (pSummoned->GetEntry() != NPC_GLOB_OF_VISCIDUS || uiType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            m_lGlobesGuidList.remove(pSummoned->GetObjectGuid());
+            pSummoned->CastSpell(m_creature, SPELL_REJOIN_VISCIDUS, true);
+            pSummoned->ForcedDespawn(1000);
+
+            if (m_lGlobesGuidList.empty())
+            {
+                m_creature->SetVisibility(VISIBILITY_ON);
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                m_uiPhase = PHASE_NORMAL;
+
+                SetCombatMovement(true);
+                DoStartMovement(m_creature->getVictim());
+            }
+        }
+
+        void DamageTaken(Unit* pDealer, uint32& uiDamage) override
+        {
+            // apply missing aura: 50% damage reduction;
+            uiDamage = uiDamage * 0.5f;
+
+            if (m_uiPhase != PHASE_FROZEN)
+                return;
+
+            ++m_uiHitCount;
+
+            // only count melee attacks
+            if (pDealer->hasUnitState(UNIT_STAT_MELEE_ATTACKING) && m_uiHitCount >= HITCOUNT_EXPLODE)
+            {
+                if (m_creature->GetHealthPercent() <= 5.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_VISCIDUS_SUICIDE, CAST_TRIGGERED) == CAST_OK)
+                        m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                }
+                else if (DoCastSpellIfCan(m_creature, SPELL_VISCIDUS_EXPLODE, CAST_TRIGGERED | CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_EXPLODE, m_creature);
+                    m_uiPhase = PHASE_EXPLODED;
+                    m_uiHitCount = 0;
+                    m_lGlobesGuidList.clear();
+                    uint32 uiGlobeCount = m_creature->GetHealthPercent() / 5.0f;
+
+                    for (uint8 i = 0; i < uiGlobeCount; ++i)
+                        DoCastSpellIfCan(m_creature, auiGlobSummonSpells[i], CAST_TRIGGERED);
+
+                    m_creature->RemoveAurasDueToSpell(SPELL_VISCIDUS_FREEZE);
+                    m_uiExplodeDelayTimer = 2000;
+
+                    SetCombatMovement(false);
+                    m_creature->GetMotionMaster()->MoveIdle();
+                    m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+                }
+            }
+            else if (m_uiHitCount == HITCOUNT_SHATTER)
+                DoScriptText(EMOTE_SHATTER, m_creature);
+            else if (m_uiHitCount == HITCOUNT_CRACK)
+                DoScriptText(EMOTE_CRACK, m_creature);
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (m_uiPhase != PHASE_NORMAL)
+                return;
+
+            // only count frost damage
+            if (pSpell->SchoolMask == SPELL_SCHOOL_MASK_FROST)
+            {
+                ++m_uiHitCount;
+
+                if (m_uiHitCount >= HITCOUNT_FREEZE)
+                {
+                    m_uiPhase = PHASE_FROZEN;
+                    m_uiHitCount = 0;
+
+                    DoScriptText(EMOTE_FROZEN, m_creature);
+                    m_creature->RemoveAurasDueToSpell(SPELL_VISCIDUS_SLOWED_MORE);
+                    DoCastSpellIfCan(m_creature, SPELL_VISCIDUS_FREEZE, CAST_TRIGGERED);
+                }
+                else if (m_uiHitCount >= HITCOUNT_SLOW_MORE)
+                {
+                    DoScriptText(EMOTE_FREEZE, m_creature);
+                    m_creature->RemoveAurasDueToSpell(SPELL_VISCIDUS_SLOWED);
+                    DoCastSpellIfCan(m_creature, SPELL_VISCIDUS_SLOWED_MORE, CAST_TRIGGERED);
+                }
+                else if (m_uiHitCount >= HITCOUNT_SLOW)
+                {
+                    DoScriptText(EMOTE_SLOW, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_VISCIDUS_SLOWED, CAST_TRIGGERED);
+                }
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                if (m_uiPhase == PHASE_EXPLODED)
+                    return;
+
+                // reset phase if not already exploded
+                m_uiPhase = PHASE_NORMAL;
+                m_uiHitCount = 0;
+            }
+        }
+#endif
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+#if defined (WOTLK) || defined (CATA)
+            if (m_uiExplodeDelayTimer)
+            {
+                if (m_uiExplodeDelayTimer <= uiDiff)
+                {
+                    // Make invisible
+                    m_creature->SetVisibility(VISIBILITY_OFF);
+
+                    // Teleport to room center
+                    float fX, fY, fZ, fO;
+                    m_creature->GetRespawnCoord(fX, fY, fZ, &fO);
+                    m_creature->NearTeleportTo(fX, fY, fZ, fO);
+                    m_uiExplodeDelayTimer = 0;
+                }
+                else
+                    m_uiExplodeDelayTimer -= uiDiff;
+            }
+
+            if (m_uiPhase != PHASE_NORMAL)
+                return;
+#endif
+
+            if (m_uiPoisonShockTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_POISON_SHOCK) == CAST_OK)
+                {
+                    m_uiPoisonShockTimer = urand(7000, 12000);
+                }
+            }
+            else
+            {
+                m_uiPoisonShockTimer -= uiDiff;
+            }
+
+            if (m_uiPoisonBoltVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_POISONBOLT_VOLLEY) == CAST_OK)
+                {
+                    m_uiPoisonBoltVolleyTimer = urand(10000, 15000);
+                }
+            }
+            else
+            {
+                m_uiPoisonBoltVolleyTimer -= uiDiff;
+            }
+
+#if defined (WOTLK) || defined (CATA)
+            if (m_uiToxinTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    m_creature->SummonCreature(NPC_VISCIDUS_TRIGGER, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                m_uiToxinTimer = 30000;
+            }
+            else
+                m_uiToxinTimer -= uiDiff;
+#endif
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_viscidusAI(pCreature);
+    }
+};
+
+#if defined (WOTLK) || defined (CATA)
+struct aura_viscidus_freeze : public AuraScript
+{
+    aura_viscidus_freeze() : AuraScript("aura_viscidus_freeze") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        // On Aura removal inform the boss
+        if (pAura->GetId() == SPELL_VISCIDUS_FREEZE && pAura->GetEffIndex() == EFFECT_INDEX_1 && !bApply)
+        {
+            if (Creature* pTarget = (Creature*)pAura->GetTarget())
+                pTarget->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pTarget, pTarget);
+        }
+        return true;
+    }
+};
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_glob_of_viscidus : public CreatureScript
+{
+    npc_glob_of_viscidus() : CreatureScript("npc_glob_of_viscidus") {}
+
+    struct  npc_glob_of_viscidusAI : public ScriptedAI
+    {
+        npc_glob_of_viscidusAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void Reset() override { }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_glob_of_viscidusAI(pCreature);
+    }
+};
+#endif
+
+void AddSC_boss_viscidus()
+{
+    Script* s;
+
+    s = new boss_viscidus();
+    s->RegisterSelf();
+
+#if defined (WOTLK) || defined (CATA)
+    s = new npc_glob_of_viscidus();
+    s->RegisterSelf();
+
+    s = new aura_viscidus_freeze();
+    s->RegisterSelf();
+#endif
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_viscidus";
+    //pNewScript->GetAI = &GetAI_boss_viscidus;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_glob_of_viscidus";
+    //pNewScript->GetAI = &GetAI_npc_glob_of_viscidus;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
new file mode 100644
index 000000000..561c9bcd2
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
@@ -0,0 +1,426 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Temple_of_Ahnqiraj
+ * SD%Complete: 80
+ * SDComment:   C'thun whisperings spells NYI.
+ * SDCategory:  Temple of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "temple_of_ahnqiraj.h"
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    { EMOTE_EYE_INTRO, NPC_MASTERS_EYE, 7000 },
+    { SAY_EMPERORS_INTRO_1, NPC_VEKLOR, 6000 },
+    { SAY_EMPERORS_INTRO_2, NPC_VEKNILASH, 8000 },
+    { SAY_EMPERORS_INTRO_3, NPC_VEKLOR, 3000 },
+    { SAY_EMPERORS_INTRO_4, NPC_VEKNILASH, 3000 },
+    { SAY_EMPERORS_INTRO_5, NPC_VEKLOR, 3000 },
+    { SAY_EMPERORS_INTRO_6, NPC_VEKNILASH, 0 },
+    { 0, 0, 0 }
+};
+
+struct is_temple_of_ahnqiraj : public InstanceScript
+{
+    is_temple_of_ahnqiraj() : InstanceScript("instance_temple_of_ahnqiraj") {}
+
+    class instance_temple_of_ahnqiraj : public ScriptedInstance
+    {
+    public:
+        instance_temple_of_ahnqiraj(Map* pMap) : ScriptedInstance(pMap),
+            m_uiBugTrioDeathCount(0),
+            m_uiCthunWhisperTimer(90000),
+            m_bIsEmperorsIntroDone(false),
+            m_dialogueHelper(aIntroDialogue)
+        {
+            Initialize();
+        };
+
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+
+            m_dialogueHelper.InitializeDialogueHelper(this);
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_SKERAM:
+                // Don't store the summoned images guid
+                if (GetData(TYPE_SKERAM) == IN_PROGRESS)
+                {
+                    break;
+                }
+            case NPC_KRI:
+            case NPC_VEM:
+            case NPC_YAUJ:
+            case NPC_SARTURA:
+            case NPC_VEKLOR:
+            case NPC_VEKNILASH:
+            case NPC_MASTERS_EYE:
+            case NPC_OURO_SPAWNER:
+            case NPC_CTHUN:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_SKERAM_GATE:
+                if (m_auiEncounter[TYPE_SKERAM] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_TWINS_ENTER_DOOR:
+                break;
+            case GO_TWINS_EXIT_DOOR:
+                if (m_auiEncounter[TYPE_TWINS] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_SANDWORM_BASE:
+                break;
+
+            default:
+                return;
+            }
+
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_SKERAM:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_SKERAM_GATE);
+                }
+                break;
+            case TYPE_BUG_TRIO:
+                if (uiData == SPECIAL)
+                {
+                    ++m_uiBugTrioDeathCount;
+                    if (m_uiBugTrioDeathCount == 2)
+                    {
+                        SetData(TYPE_BUG_TRIO, DONE);
+                    }
+
+                    // don't store any special data
+                    break;
+                }
+                if (uiData == FAIL)
+                {
+                    m_uiBugTrioDeathCount = 0;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_SARTURA:
+            case TYPE_FANKRISS:
+            case TYPE_VISCIDUS:
+            case TYPE_HUHURAN:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_TWINS:
+                // Either of the twins can set data, so return to avoid double changing
+                if (m_auiEncounter[uiType] == uiData)
+                {
+                    return;
+                }
+
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_TWINS_ENTER_DOOR);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_TWINS_EXIT_DOOR);
+                }
+                break;
+            case TYPE_OURO:
+                switch (uiData)
+                {
+                case FAIL:
+                    // Respawn the Ouro spawner on fail
+                    if (Creature* pSpawner = GetSingleCreatureFromStorage(NPC_OURO_SPAWNER))
+                    {
+                        pSpawner->Respawn();
+                    }
+                    // no break;
+                case DONE:
+                    // Despawn the sandworm base on Done or Fail
+                    if (GameObject* pBase = GetSingleGameObjectFromStorage(GO_SANDWORM_BASE))
+                    {
+                        pBase->SetLootState(GO_JUST_DEACTIVATED);
+                    }
+                    break;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_CTHUN:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_SIGNAL:
+                DoHandleTempleAreaTrigger(uiData);
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3] << " "
+                    << m_auiEncounter[4] << " " << m_auiEncounter[5] << " " << m_auiEncounter[6] << " " << m_auiEncounter[7] << " "
+#if defined (CLASSIC)
+                    << m_auiEncounter[8] << " " << m_auiEncounter[9];
+#endif
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+                   << m_auiEncounter[8];
+#endif
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7]
+#if defined (CLASSIC)  
+                >> m_auiEncounter[8] >> m_auiEncounter[9];
+#else
+               >> m_auiEncounter[8];
+#endif
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            m_dialogueHelper.DialogueUpdate(uiDiff);
+
+            if (GetData(TYPE_CTHUN) == IN_PROGRESS || GetData(TYPE_CTHUN) == DONE)
+            {
+                return;
+            }
+
+            if (m_uiCthunWhisperTimer < uiDiff)
+            {
+                if (Player* pPlayer = GetPlayerInMap())
+                {
+                    if (Creature* pCthun = GetSingleCreatureFromStorage(NPC_CTHUN))
+                    {
+                        // ToDo: also cast the C'thun Whispering charm spell - requires additional research
+                        switch (urand(0, 7))
+                        {
+                        case 0:
+                            DoScriptText(SAY_CTHUN_WHISPER_1, pCthun, pPlayer);
+                            break;
+                        case 1:
+                            DoScriptText(SAY_CTHUN_WHISPER_2, pCthun, pPlayer);
+                            break;
+                        case 2:
+                            DoScriptText(SAY_CTHUN_WHISPER_3, pCthun, pPlayer);
+                            break;
+                        case 3:
+                            DoScriptText(SAY_CTHUN_WHISPER_4, pCthun, pPlayer);
+                            break;
+                        case 4:
+                            DoScriptText(SAY_CTHUN_WHISPER_5, pCthun, pPlayer);
+                            break;
+                        case 5:
+                            DoScriptText(SAY_CTHUN_WHISPER_6, pCthun, pPlayer);
+                            break;
+                        case 6:
+                            DoScriptText(SAY_CTHUN_WHISPER_7, pCthun, pPlayer);
+                            break;
+                        case 7:
+                            DoScriptText(SAY_CTHUN_WHISPER_8, pCthun, pPlayer);
+                            break;
+                        }
+                    }
+                }
+                m_uiCthunWhisperTimer = urand(1.5 * MINUTE * IN_MILLISECONDS, 5 * MINUTE * IN_MILLISECONDS);
+            }
+            else
+            {
+                m_uiCthunWhisperTimer -= uiDiff;
+            }
+        }
+
+    private:
+        void DoHandleTempleAreaTrigger(uint32 uiTriggerId)
+        {
+            if (uiTriggerId == AREATRIGGER_TWIN_EMPERORS && !m_bIsEmperorsIntroDone)
+            {
+                m_dialogueHelper.StartNextDialogueText(EMOTE_EYE_INTRO);
+                // Note: there may be more related to this; The emperors should kneel before the Eye and they stand up after it despawns
+                if (Creature* pEye = GetSingleCreatureFromStorage(NPC_MASTERS_EYE))
+                {
+                    pEye->ForcedDespawn(1000);
+                }
+                m_bIsEmperorsIntroDone = true;
+            }
+            else if (uiTriggerId == AREATRIGGER_SARTURA)
+            {
+                if (GetData(TYPE_SARTURA) == NOT_STARTED || GetData(TYPE_SARTURA) == FAIL)
+                {
+                    if (Creature* pSartura = GetSingleCreatureFromStorage(NPC_SARTURA))
+                        pSartura->SetInCombatWithZone();
+                }
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint8 m_uiBugTrioDeathCount;
+        uint32 m_uiCthunWhisperTimer;
+
+        bool m_bIsEmperorsIntroDone;
+
+        DialogueHelper m_dialogueHelper;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_temple_of_ahnqiraj(pMap);
+    }
+};
+
+struct at_temple_ahnqiraj : public AreaTriggerScript
+{
+    at_temple_ahnqiraj() : AreaTriggerScript("at_temple_ahnqiraj") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (pPlayer->isGameMaster() || !pPlayer->IsAlive())
+        {
+            return false;
+        }
+
+        if (pAt->id == AREATRIGGER_TWIN_EMPERORS)
+        {
+
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
+            {
+                pInstance->SetData(TYPE_SIGNAL, pAt->id);
+            }
+        }
+
+        if (pAt->id == AREATRIGGER_SARTURA)
+        {
+
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
+            if (Creature* pSartura = pInstance->GetSingleCreatureFromStorage(NPC_SARTURA))
+            if (pSartura->IsAlive() && !pSartura->IsInCombat())
+            {
+                pInstance->SetData(TYPE_SARTURA, IN_PROGRESS);
+
+                pSartura->SetInCombatWithZone();
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_instance_temple_of_ahnqiraj()
+{
+    Script* s;
+    s = new is_temple_of_ahnqiraj();
+    s->RegisterSelf();
+    s = new at_temple_ahnqiraj();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_temple_of_ahnqiraj";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_temple_of_ahnqiraj;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_temple_ahnqiraj";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_temple_ahnqiraj;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
new file mode 100644
index 000000000..d1ff1bd95
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
@@ -0,0 +1,264 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      mob_anubisath_sentinel
+ * SD%Complete: 75
+ * SDComment:   Abilities selection needs further improvements. Shadow storm is not properly implemented in core it should only target ppl outside of melee range.
+ * SDCategory:  Temple of Ahn'Qiraj
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+enum
+{
+    EMOTE_GENERIC_FRENZY            = -1000002,
+
+    SPELL_PERIODIC_MANA_BURN        = 812,
+    SPELL_MENDING                   = 2147,
+    SPELL_PERIODIC_SHADOW_STORM     = 2148,
+    SPELL_PERIODIC_THUNDERCLAP      = 2834,
+    SPELL_MORTAL_STRIKE             = 9347,
+    SPELL_FIRE_ARCANE_REFLECT       = 13022,
+    SPELL_SHADOW_FROST_REFLECT      = 19595,
+    SPELL_PERIODIC_KNOCK_AWAY       = 21737,
+    SPELL_THORNS                    = 25777,
+
+    SPELL_ENRAGE                    = 8599,
+
+    MAX_BUDDY                       = 4
+};
+
+struct npc_anubisath_sentinel : public CreatureScript
+{
+    npc_anubisath_sentinel() : CreatureScript("mob_anubisath_sentinel") {}
+
+    struct npc_anubisath_sentinelAI : public ScriptedAI
+    {
+        npc_anubisath_sentinelAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_lAssistList.clear();
+        }
+
+        uint32 m_uiMyAbility;
+        bool m_bEnraged;
+
+        GuidList m_lAssistList;
+
+        void Reset() override
+        {
+            m_uiMyAbility = 0;
+            m_bEnraged = false;
+        }
+
+        void GetAIInformation(ChatHandler& reader) override
+        {
+            if (m_lAssistList.empty())
+            {
+                reader.PSendSysMessage("Anubisath Sentinel - group not assigned, will be assigned OnAggro");
+            }
+            if (m_lAssistList.size() == MAX_BUDDY)
+            {
+                reader.PSendSysMessage("Anubisath Sentinel - proper group found");
+            }
+            else
+            {
+                reader.PSendSysMessage("Anubisath Sentinel - not correct number of mobs for group found. Number found %lu, should be %u", m_lAssistList.size(), MAX_BUDDY);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            for (GuidList::const_iterator itr = m_lAssistList.begin(); itr != m_lAssistList.end(); ++itr)
+            {
+                if (*itr == m_creature->GetObjectGuid())
+                {
+                    continue;
+                }
+
+                if (Creature* pBuddy = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    if (pBuddy->IsDead())
+                    {
+                        pBuddy->Respawn();
+                    }
+                }
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            SetAbility();
+            InitSentinelsNear(pWho);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoTransferAbility();
+        }
+
+        // this way will make it quite possible that sentinels get the same buff as others, need to fix that, it should be one unique each
+        void SetAbility()
+        {
+            switch (urand(0, 8))
+            {
+            case 0:
+                m_uiMyAbility = SPELL_MENDING;
+                break;
+            case 1:
+                m_uiMyAbility = SPELL_PERIODIC_KNOCK_AWAY;
+                break;
+            case 2:
+                m_uiMyAbility = SPELL_PERIODIC_MANA_BURN;
+                break;
+            case 3:
+                m_uiMyAbility = SPELL_FIRE_ARCANE_REFLECT;
+                break;
+            case 4:
+                m_uiMyAbility = SPELL_SHADOW_FROST_REFLECT;
+                break;
+            case 5:
+                m_uiMyAbility = SPELL_THORNS;
+                break;
+            case 6:
+                m_uiMyAbility = SPELL_PERIODIC_THUNDERCLAP;
+                break;
+            case 7:
+                m_uiMyAbility = SPELL_MORTAL_STRIKE;
+                break;
+            case 8:
+                m_uiMyAbility = SPELL_PERIODIC_SHADOW_STORM;
+                break;
+            }
+
+            DoCastSpellIfCan(m_creature, m_uiMyAbility, CAST_TRIGGERED);
+        }
+
+        void DoTransferAbility()
+        {
+            for (GuidList::const_iterator itr = m_lAssistList.begin(); itr != m_lAssistList.end(); ++itr)
+            {
+                if (Creature* pBuddy = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    if (*itr == m_creature->GetObjectGuid())
+                    {
+                        continue;
+                    }
+
+                    if (!pBuddy->IsAlive())
+                    {
+                        continue;
+                    }
+
+                    pBuddy->SetHealth(pBuddy->GetMaxHealth());
+                    DoCastSpellIfCan(pBuddy, m_uiMyAbility, CAST_TRIGGERED);
+                }
+            }
+        }
+
+        void InitSentinelsNear(Unit* pTarget)
+        {
+            if (!m_lAssistList.empty())
+            {
+                for (GuidList::const_iterator itr = m_lAssistList.begin(); itr != m_lAssistList.end(); ++itr)
+                {
+                    if (*itr == m_creature->GetObjectGuid())
+                    {
+                        continue;
+                    }
+
+                    if (Creature* pBuddy = m_creature->GetMap()->GetCreature(*itr))
+                    {
+                        if (pBuddy->IsAlive())
+                        {
+                            pBuddy->AI()->AttackStart(pTarget);
+                        }
+                    }
+                }
+
+                return;
+            }
+
+            std::list<Creature*> lAssistList;
+            GetCreatureListWithEntryInGrid(lAssistList, m_creature, m_creature->GetEntry(), 80.0f);
+
+            for (std::list<Creature*>::iterator iter = lAssistList.begin(); iter != lAssistList.end(); ++iter)
+            {
+                m_lAssistList.push_back((*iter)->GetObjectGuid());
+
+                if ((*iter)->GetObjectGuid() == m_creature->GetObjectGuid())
+                {
+                    continue;
+                }
+
+                (*iter)->AI()->AttackStart(pTarget);
+            }
+
+            if (m_lAssistList.size() != MAX_BUDDY)
+            {
+                script_error_log("npc_anubisath_sentinel for %s found too few/too many buddies, expected %u.", m_creature->GetGuidStr().c_str(), MAX_BUDDY);
+            }
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (!m_bEnraged && m_creature->GetHealthPercent() < 30.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_GENERIC_FRENZY, m_creature);
+                    m_bEnraged = true;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_anubisath_sentinelAI(pCreature);
+    }
+};
+
+void AddSC_mob_anubisath_sentinel()
+{
+    Script* s;
+    s = new npc_anubisath_sentinel();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_anubisath_sentinel";
+    //pNewScript->GetAI = &GetAI_npc_anubisath_sentinel;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h
new file mode 100644
index 000000000..993333a0b
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h
@@ -0,0 +1,93 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_TEMPLE_OF_AHNQIRAJ_H
+#define DEF_TEMPLE_OF_AHNQIRAJ_H
+
+enum
+{
+    MAX_ENCOUNTER               = 9,
+    TYPE_SIGNAL                 = MAX_ENCOUNTER,
+
+    TYPE_SKERAM                 = 0,
+    TYPE_BUG_TRIO               = 1,
+    TYPE_SARTURA                = 2,
+    TYPE_FANKRISS               = 3,
+    TYPE_VISCIDUS               = 4,
+    TYPE_HUHURAN                = 5,
+    TYPE_TWINS                  = 6,
+    TYPE_OURO                   = 7,
+    TYPE_CTHUN                  = 8,
+
+    NPC_SKERAM                  = 15263,
+    NPC_KRI                     = 15511,
+    NPC_VEM                     = 15544,
+    NPC_YAUJ                    = 15543,
+    NPC_SARTURA                 = 15516,
+    NPC_VEKLOR                  = 15276,
+    NPC_VEKNILASH               = 15275,
+    NPC_MASTERS_EYE             = 15963,
+    NPC_OURO_SPAWNER            = 15957,
+    // NPC_EYE_OF_CTHUN          = 15589,
+    NPC_CTHUN                   = 15727,
+
+    GO_SKERAM_GATE              = 180636,
+    GO_TWINS_ENTER_DOOR         = 180634,
+    GO_TWINS_EXIT_DOOR          = 180635,
+    GO_SANDWORM_BASE            = 180795,
+
+    EMOTE_EYE_INTRO             = -1531012,
+    SAY_EMPERORS_INTRO_1        = -1531013,
+    SAY_EMPERORS_INTRO_2        = -1531014,
+    SAY_EMPERORS_INTRO_3        = -1531015,
+    SAY_EMPERORS_INTRO_4        = -1531016,
+    SAY_EMPERORS_INTRO_5        = -1531017,
+    SAY_EMPERORS_INTRO_6        = -1531018,
+
+    // Whispered on players around the map
+    SAY_CTHUN_WHISPER_1         = -1531033,
+    SAY_CTHUN_WHISPER_2         = -1531034,
+    SAY_CTHUN_WHISPER_3         = -1531035,
+    SAY_CTHUN_WHISPER_4         = -1531036,
+    SAY_CTHUN_WHISPER_5         = -1531037,
+    SAY_CTHUN_WHISPER_6         = -1531038,
+    SAY_CTHUN_WHISPER_7         = -1531039,
+    SAY_CTHUN_WHISPER_8         = -1531040,
+
+    AREATRIGGER_TWIN_EMPERORS   = 4047,
+    AREATRIGGER_SARTURA         = 4052,
+
+    SPELL_SUMMON_PLAYER         = 20477,
+
+    // Cast periodically on players around the instance
+    SPELL_WHISPERINGS_CTHUN_1   = 26195,
+    SPELL_WHISPERINGS_CTHUN_2   = 26197,
+    SPELL_WHISPERINGS_CTHUN_3   = 26198,
+    SPELL_WHISPERINGS_CTHUN_4   = 26258,
+    SPELL_WHISPERINGS_CTHUN_5   = 26259,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/kalimdor/the_barrens.cpp b/src/modules/SD3/scripts/kalimdor/the_barrens.cpp
new file mode 100644
index 000000000..6e29c2717
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/the_barrens.cpp
@@ -0,0 +1,1492 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      The_Barrens
+ * SD%Complete: 90
+ * SDComment:   Quest support: 863, 898, 1719, 2458, 4021, 4921.
+ * SDCategory:  Barrens
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_beaten_corpse
+ * npc_gilthares
+ * npc_taskmaster_fizzule
+ * npc_twiggy_flathead
+ * at_twiggy_flathead
+ * npc_wizzlecrank_shredder
+ * npc_regthar_deathgate
+ * npc_horde_defender
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_beaten_corpse
+######*/
+
+enum
+{
+    QUEST_LOST_IN_BATTLE    = 4921
+};
+
+struct npc_beaten_corpse : public CreatureScript
+{
+    npc_beaten_corpse() : CreatureScript("npc_beaten_corpse") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_INCOMPLETE ||
+            pPlayer->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_COMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Examine corpse in detail...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(3557, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            pPlayer->SEND_GOSSIP_MENU(3558, pCreature->GetObjectGuid());
+            pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetObjectGuid());
+        }
+        return true;
+    }
+};
+
+/*######
+# npc_gilthares
+######*/
+
+enum
+{
+    SAY_GIL_START               = -1000370,
+    SAY_GIL_AT_LAST             = -1000371,
+    SAY_GIL_PROCEED             = -1000372,
+    SAY_GIL_FREEBOOTERS         = -1000373,
+    SAY_GIL_AGGRO_1             = -1000374,
+    SAY_GIL_AGGRO_2             = -1000375,
+    SAY_GIL_AGGRO_3             = -1000376,
+    SAY_GIL_AGGRO_4             = -1000377,
+    SAY_GIL_ALMOST              = -1000378,
+    SAY_GIL_SWEET               = -1000379,
+    SAY_GIL_FREED               = -1000380,
+
+    QUEST_FREE_FROM_HOLD        = 898,
+    AREA_MERCHANT_COAST         = 391
+};
+
+struct npc_gilthares : public CreatureScript
+{
+    npc_gilthares() : CreatureScript("npc_gilthares") {}
+
+    struct npc_giltharesAI : public npc_escortAI
+    {
+        npc_giltharesAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void Reset() override { }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 16:
+                DoScriptText(SAY_GIL_AT_LAST, m_creature, pPlayer);
+                break;
+            case 17:
+                DoScriptText(SAY_GIL_PROCEED, m_creature, pPlayer);
+                break;
+            case 18:
+                DoScriptText(SAY_GIL_FREEBOOTERS, m_creature, pPlayer);
+                break;
+            case 37:
+                DoScriptText(SAY_GIL_ALMOST, m_creature, pPlayer);
+                break;
+            case 47:
+                DoScriptText(SAY_GIL_SWEET, m_creature, pPlayer);
+                break;
+            case 53:
+                DoScriptText(SAY_GIL_FREED, m_creature, pPlayer);
+                pPlayer->GroupEventHappens(QUEST_FREE_FROM_HOLD, m_creature);
+                break;
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            // not always use
+            if (urand(0, 3))
+            {
+                return;
+            }
+
+            // only aggro text if not player and only in this area
+            if (pWho->GetTypeId() != TYPEID_PLAYER && m_creature->GetAreaId() == AREA_MERCHANT_COAST)
+            {
+                // appears to be pretty much random (possible only if escorter not in combat with pWho yet?)
+                switch (urand(0, 3))
+                {
+                case 0:
+                    DoScriptText(SAY_GIL_AGGRO_1, m_creature, pWho);
+                    break;
+                case 1:
+                    DoScriptText(SAY_GIL_AGGRO_2, m_creature, pWho);
+                    break;
+                case 2:
+                    DoScriptText(SAY_GIL_AGGRO_3, m_creature, pWho);
+                    break;
+                case 3:
+                    DoScriptText(SAY_GIL_AGGRO_4, m_creature, pWho);
+                    break;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_giltharesAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_FREE_FROM_HOLD)
+        {
+            pCreature->SetFactionTemporary(FACTION_ESCORT_H_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+            pCreature->SetStandState(UNIT_STAND_STATE_STAND);
+
+            DoScriptText(SAY_GIL_START, pCreature, pPlayer);
+
+            if (npc_giltharesAI* pEscortAI = dynamic_cast<npc_giltharesAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+};
+
+/*######
+## npc_taskmaster_fizzule
+######*/
+
+enum
+{
+    FACTION_FRIENDLY_F  = 35,
+    SPELL_FLARE         = 10113,
+    SPELL_FOLLY         = 10137,
+};
+
+struct npc_taskmaster_fizzule : public CreatureScript
+{
+    npc_taskmaster_fizzule() : CreatureScript("npc_taskmaster_fizzule") {}
+
+    struct npc_taskmaster_fizzuleAI : public ScriptedAI
+    {
+        npc_taskmaster_fizzuleAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiResetTimer;
+        uint8 m_uiFlareCount;
+
+        void Reset() override
+        {
+            m_uiResetTimer = 0;
+            m_uiFlareCount = 0;
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (m_uiResetTimer)
+            {
+                m_creature->RemoveAllAurasOnEvade();
+                m_creature->DeleteThreatList();
+                m_creature->CombatStop(true);
+                m_creature->LoadCreatureAddon(true);
+
+                m_creature->SetLootRecipient(NULL);
+
+                m_creature->SetFactionTemporary(FACTION_FRIENDLY_F, TEMPFACTION_RESTORE_REACH_HOME);
+                m_creature->HandleEmote(EMOTE_ONESHOT_SALUTE);
+            }
+            else
+            {
+                ScriptedAI::EnterEvadeMode();
+            }
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pCaster->GetTypeId() == TYPEID_PLAYER && (pSpell->Id == SPELL_FLARE || pSpell->Id == SPELL_FOLLY))
+            {
+                ++m_uiFlareCount;
+
+                if (m_uiFlareCount >= 2 && m_creature->getFaction() != FACTION_FRIENDLY_F)
+                {
+                    m_uiResetTimer = 120000;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiResetTimer)
+            {
+                if (m_uiResetTimer <= uiDiff)
+                {
+                    m_uiResetTimer = 0;
+                    EnterEvadeMode();
+                }
+                else
+                {
+                    m_uiResetTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+
+        void ReceiveEmote(Player* /*pPlayer*/, uint32 uiTextEmote) override
+        {
+            if (uiTextEmote == TEXTEMOTE_SALUTE)
+            {
+                if (m_uiFlareCount >= 2 && m_creature->getFaction() != FACTION_FRIENDLY_F)
+                {
+                    EnterEvadeMode();
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_taskmaster_fizzuleAI(pCreature);
+    }
+};
+
+/*#####
+## npc_twiggy_flathead
+#####*/
+
+enum
+{
+    SAY_BIG_WILL_READY                  = -1000123,
+    SAY_TWIGGY_BEGIN                    = -1000124,
+    SAY_TWIGGY_FRAY                     = -1000125,
+    SAY_TWIGGY_DOWN                     = -1000126,
+    SAY_TWIGGY_OVER                     = -1000127,
+
+    NPC_TWIGGY                          = 6248,
+    NPC_BIG_WILL                        = 6238,
+    NPC_AFFRAY_CHALLENGER               = 6240,
+
+    QUEST_AFFRAY                        = 1719,
+
+    FACTION_FRIENDLY                    = 35,
+    FACTION_HOSTILE_WILL                = 32,
+    FACTION_HOSTILE_CHALLENGER          = 14,
+
+    MAX_CHALLENGERS                     = 6,
+};
+
+static const float aAffrayChallengerLoc[8][4] =
+{
+    { -1683.0f, -4326.0f, 2.79f, 0.00f},
+    { -1682.0f, -4329.0f, 2.79f, 0.00f},
+    { -1683.0f, -4330.0f, 2.79f, 0.00f},
+    { -1680.0f, -4334.0f, 2.79f, 1.49f},
+    { -1674.0f, -4326.0f, 2.79f, 3.49f},
+    { -1677.0f, -4334.0f, 2.79f, 1.66f},
+    { -1713.79f, -4342.09f, 6.05f, 6.15f},          // Big Will spawn loc
+    { -1682.31f, -4329.68f, 2.78f, 0.0f},           // Big Will move loc
+};
+
+struct npc_twiggy_flathead : public CreatureScript
+{
+    npc_twiggy_flathead() : CreatureScript("npc_twiggy_flathead") {}
+
+    struct npc_twiggy_flatheadAI : public ScriptedAI
+    {
+        npc_twiggy_flatheadAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        bool m_bIsEventInProgress;
+
+        uint32 m_uiEventTimer;
+        uint32 m_uiChallengerCount;
+        uint8 m_uiStep;
+
+        ObjectGuid m_playerGuid;
+        ObjectGuid m_bigWillGuid;
+        GuidVector m_vAffrayChallengerGuidsVector;
+
+        void Reset() override
+        {
+            m_bIsEventInProgress = false;
+
+            m_uiEventTimer = 1000;
+            m_uiChallengerCount = 0;
+            m_uiStep = 0;
+
+            m_playerGuid.Clear();
+            m_bigWillGuid.Clear();
+            m_vAffrayChallengerGuidsVector.clear();
+        }
+
+        bool CanStartEvent(Player* pPlayer)
+        {
+            if (!m_bIsEventInProgress)
+            {
+                DoScriptText(SAY_TWIGGY_BEGIN, m_creature, pPlayer);
+                m_playerGuid = pPlayer->GetObjectGuid();
+                m_bIsEventInProgress = true;
+
+                return true;
+            }
+
+            debug_log("SD3: npc_twiggy_flathead event already in progress, need to wait.");
+            return false;
+        }
+
+        void SetChallengers()
+        {
+            m_vAffrayChallengerGuidsVector.reserve(MAX_CHALLENGERS);
+
+            for (uint8 i = 0; i < MAX_CHALLENGERS; ++i)
+            {
+                m_creature->SummonCreature(NPC_AFFRAY_CHALLENGER, aAffrayChallengerLoc[i][0], aAffrayChallengerLoc[i][1], aAffrayChallengerLoc[i][2], aAffrayChallengerLoc[i][3], TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 600000);
+            }
+        }
+
+        void SetChallengerReady(Creature* pChallenger)
+        {
+            pChallenger->setFaction(FACTION_HOSTILE_CHALLENGER);
+            pChallenger->HandleEmote(EMOTE_ONESHOT_ROAR);
+            ++m_uiChallengerCount;
+
+            if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+            {
+                pChallenger->AI()->AttackStart(pPlayer);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_BIG_WILL)
+            {
+                m_bigWillGuid = pSummoned->GetObjectGuid();
+                pSummoned->setFaction(FACTION_FRIENDLY);
+                pSummoned->SetWalk(false);
+                pSummoned->GetMotionMaster()->MovePoint(1, aAffrayChallengerLoc[7][0], aAffrayChallengerLoc[7][1], aAffrayChallengerLoc[7][2]);
+            }
+            else
+            {
+                pSummoned->setFaction(FACTION_FRIENDLY);
+                pSummoned->HandleEmote(EMOTE_ONESHOT_ROAR);
+                m_vAffrayChallengerGuidsVector.push_back(pSummoned->GetObjectGuid());
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId || pSummoned->GetEntry() != NPC_BIG_WILL)
+            {
+                return;
+            }
+
+            pSummoned->setFaction(FACTION_HOSTILE_WILL);
+
+            if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+            {
+                DoScriptText(SAY_BIG_WILL_READY, pSummoned, pPlayer);
+                pSummoned->SetFacingToObject(pPlayer);
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_BIG_WILL)
+            {
+                DoScriptText(SAY_TWIGGY_OVER, m_creature);
+                EnterEvadeMode();
+            }
+            else
+            {
+                DoScriptText(SAY_TWIGGY_DOWN, m_creature);
+                m_uiEventTimer = 15000;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature && pInvoker->GetTypeId() == TYPEID_PLAYER)
+                CanStartEvent(pInvoker->ToPlayer());
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_bIsEventInProgress)
+            {
+                return;
+            }
+
+            if (m_uiEventTimer < uiDiff)
+            {
+                Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+
+                if (!pPlayer || !pPlayer->IsAlive())
+                {
+                    EnterEvadeMode();
+                }
+
+                switch (m_uiStep)
+                {
+                case 0:
+                    SetChallengers();
+                    m_uiEventTimer = 5000;
+                    ++m_uiStep;
+                    break;
+                case 1:
+                    DoScriptText(SAY_TWIGGY_FRAY, m_creature);
+                    if (Creature* pChallenger = m_creature->GetMap()->GetCreature(m_vAffrayChallengerGuidsVector[m_uiChallengerCount]))
+                    {
+                        SetChallengerReady(pChallenger);
+                    }
+                    else
+                    {
+                        EnterEvadeMode();
+                    }
+
+                    if (m_uiChallengerCount == MAX_CHALLENGERS)
+                    {
+                        ++m_uiStep;
+                        m_uiEventTimer = 5000;
+                    }
+                    else
+                    {
+                        m_uiEventTimer = 25000;
+                    }
+                    break;
+                case 2:
+                    m_creature->SummonCreature(NPC_BIG_WILL, aAffrayChallengerLoc[6][0], aAffrayChallengerLoc[6][1], aAffrayChallengerLoc[6][2], aAffrayChallengerLoc[6][3], TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 300000);
+                    m_uiEventTimer = 15000;
+                    ++m_uiStep;
+                    break;
+                default:
+                    m_uiEventTimer = 5000;
+                    break;
+                }
+            }
+            else
+            {
+                m_uiEventTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_twiggy_flatheadAI(pCreature);
+    }
+};
+
+struct at_twiggy_flathead : public AreaTriggerScript
+{
+    at_twiggy_flathead() : AreaTriggerScript("at_twiggy_flathead") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*pAt*/) override
+    {
+        if (pPlayer->IsAlive() && !pPlayer->isGameMaster() && pPlayer->GetQuestStatus(QUEST_AFFRAY) == QUEST_STATUS_INCOMPLETE)
+        {
+            Creature* pCreature = GetClosestCreatureWithEntry(pPlayer, NPC_TWIGGY, 30.0f);
+            if (!pCreature)
+            {
+                return true;
+            }
+
+            if (CreatureAI* pTwiggyAI = pCreature->AI())
+            {
+                pTwiggyAI->SendAIEvent(AI_EVENT_CUSTOM_A, pPlayer, pCreature);
+            }
+
+            return false;   //this will let the trigger pop up several times until the quest is complete, but who cares
+        }
+        return true;
+    }
+};
+
+/*#####
+## npc_wizzlecranks_shredder
+#####*/
+
+enum
+{
+    SAY_START           = -1000298,
+    SAY_STARTUP1        = -1000299,
+    SAY_STARTUP2        = -1000300,
+    SAY_MERCENARY       = -1000301,
+    SAY_PROGRESS_1      = -1000302,
+    SAY_PROGRESS_2      = -1000303,
+    SAY_PROGRESS_3      = -1000304,
+    SAY_END             = -1000305,
+
+    QUEST_ESCAPE        = 863,
+    FACTION_RATCHET     = 637,
+    NPC_PILOT_WIZZ      = 3451,
+    NPC_MERCENARY       = 3282
+};
+
+struct npc_wizzlecranks_shredder : public CreatureScript
+{
+    npc_wizzlecranks_shredder() : CreatureScript("npc_wizzlecranks_shredder") {}
+
+    struct npc_wizzlecranks_shredderAI : public npc_escortAI
+    {
+        npc_wizzlecranks_shredderAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_bIsPostEvent = false; //TODO check this
+            m_uiPostEventTimer = 1000;
+            m_uiPostEventCount = 0;
+        }
+
+        bool m_bIsPostEvent;
+        uint32 m_uiPostEventTimer;
+        uint32 m_uiPostEventCount;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                if (m_creature->getStandState() == UNIT_STAND_STATE_DEAD)
+                {
+                    m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                }
+
+                m_bIsPostEvent = false;
+                m_uiPostEventTimer = 1000;
+                m_uiPostEventCount = 0;
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_STARTUP1, m_creature, pPlayer);
+                }
+                break;
+            case 9:
+                SetRun(false);
+                break;
+            case 17:
+                if (Creature* pTemp = m_creature->SummonCreature(NPC_MERCENARY, 1128.489f, -3037.611f, 92.701f, 1.472f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                {
+                    DoScriptText(SAY_MERCENARY, pTemp);
+                    m_creature->SummonCreature(NPC_MERCENARY, 1160.172f, -2980.168f, 97.313f, 3.690f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000);
+                }
+                break;
+            case 24:
+                m_bIsPostEvent = true;
+                break;
+            }
+        }
+
+        void WaypointStart(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 9:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_STARTUP2, m_creature, pPlayer);
+                }
+                break;
+            case 18:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_PROGRESS_1, m_creature, pPlayer);
+                }
+                SetRun();
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_PILOT_WIZZ)
+            {
+                m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+            }
+
+            if (pSummoned->GetEntry() == NPC_MERCENARY)
+            {
+                pSummoned->AI()->AttackStart(m_creature);
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (m_bIsPostEvent)
+                {
+                    if (m_uiPostEventTimer < uiDiff)
+                    {
+                        switch (m_uiPostEventCount)
+                        {
+                        case 0:
+                            DoScriptText(SAY_PROGRESS_2, m_creature);
+                            break;
+                        case 1:
+                            DoScriptText(SAY_PROGRESS_3, m_creature);
+                            break;
+                        case 2:
+                            DoScriptText(SAY_END, m_creature);
+                            break;
+                        case 3:
+                            if (Player* pPlayer = GetPlayerForEscort())
+                            {
+                                pPlayer->GroupEventHappens(QUEST_ESCAPE, m_creature);
+                                m_creature->SummonCreature(NPC_PILOT_WIZZ, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 180000);
+                            }
+                            break;
+                        }
+
+                        ++m_uiPostEventCount;
+                        m_uiPostEventTimer = 5000;
+                    }
+                    else
+                    {
+                        m_uiPostEventTimer -= uiDiff;
+                    }
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ESCAPE)
+        {
+            DoScriptText(SAY_START, pCreature);
+            pCreature->SetFactionTemporary(FACTION_RATCHET, TEMPFACTION_RESTORE_RESPAWN);
+
+            if (npc_wizzlecranks_shredderAI* pEscortAI = dynamic_cast<npc_wizzlecranks_shredderAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(true, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_wizzlecranks_shredderAI(pCreature);
+    }
+};
+
+/*#####
+## npc_regthar_deathgate
+#####*/
+
+enum
+{
+    QUEST_COUNTERATTACK        = 4021,
+
+    SAY_START_REGTHAR          = -1000891,
+    SAY_DEFENDER               = -1000892,
+    YELL_RETREAT               = -1000893,
+    YELL_STRONGEST             = -1000894,
+
+    NPC_REGTHAR_DEATHGATE      = 3389,
+    NPC_WARLORD_KROMZAR        = 9456,
+    NPC_HORDE_DEFENDER         = 9457,
+    NPC_HORDE_AXE_THROWER      = 9458,
+    NPC_KOLKAR_INVADER         = 9524,
+    NPC_KOLKAR_STORMSEER       = 9523
+
+};
+
+struct SpawnPoint
+{
+    float fX;
+    float fY;
+    float fZ;
+    float fO;
+};
+
+SpawnPoint SpawnPointsHorde[] =
+{
+    { -307.23f, -1919.84f, 91.66f, 0.64f},
+    { -295.84f, -1913.58f, 91.66f, 1.86f},
+    { -281.15f, -1906.39f, 91.66f, 1.88f},
+    { -270.09f, -1901.58f, 91.66f, 1.88f},
+    { -226.65f, -1927.87f, 93.24f, 0.41f},
+    { -221.61f, -1936.54f, 94.00f, 0.41f},
+    { -275.24f, -1901.96f, 91.66f, 1.90f},
+};
+
+SpawnPoint SpawnPointsKromzar[] =
+{
+    { -281.19f, -1855.54f, 92.58f, 4.85f},
+    { -283.66f, -1858.45f, 92.47f, 4.85f},
+    { -286.50f, -1856.18f, 92.44f, 4.85f}
+};
+
+SpawnPoint SpawnPointsKolkar[] =
+{
+    { -290.26f, -1860.85f, 92.48f, 3.68f},
+    { -311.46f, -1871.16f, 92.64f, 6.06f},
+    { -321.75f, -1868.48f, 93.73f, 0.30f},
+    { -338.12f, -1852.10f, 94.09f, 0.01f},
+    { -311.46f, -1847.78f, 94.93f, 6.15f},
+    { -292.02f, -1840.00f, 93.06f, 3.51f},
+    { -267.14f, -1853.97f, 93.24f, 3.52f},
+    { -267.68f, -1832.77f, 92.69f, 3.52f},
+    { -279.70f, -1845.67f, 92.81f, 3.83f},
+    { -338.99f, -1868.68f, 93.50f, 0.17f},
+    { -210.28f, -1916.22f, 92.87f, 4.89f},
+    { -209.09f, -1922.44f, 93.26f, 3.87f},
+    { -206.64f, -1924.83f, 93.78f, 2.41f},
+    { -283.57f, -1883.91f, 92.60f, 3.53f},
+    { -197.50f, -1929.31f, 94.03f, 3.51f}
+};
+
+struct npc_regthar_deathgate : public CreatureScript
+{
+    npc_regthar_deathgate() : CreatureScript("npc_regthar_deathgate") {}
+
+    struct npc_regthar_deathgateAI : public ScriptedAI
+    {
+        npc_regthar_deathgateAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        std::list<Creature*> lCreatureList;
+        std::list<uint32> lSpawnList;
+        std::list<Creature*>::iterator itr;
+
+        std::list<Creature*> lCreatureListHorde;
+        std::list<uint32> lSpawnListHorde;
+        std::list<Creature*>::iterator itrh;
+
+        void Reset()
+        {
+        }
+
+
+        void JustRespawned()
+        {
+            FinishEvent();
+            Reset();
+        }
+
+        uint64 m_uiPlayerGUID;
+        uint64 m_uiEventTimer;
+        uint32 m_uiSummonCountInvader;
+        uint32 m_uiSummonCountStormseer;
+        uint32 m_uiSummonCountHorde;
+        uint32 m_uiWaitSummonTimer;
+        uint32 m_uiWaitSummonTimerHorde;
+        uint32 m_uiSpawnPosition;
+        uint32 m_uiKillCount;
+        uint32 m_uiCreatureCount;
+        uint32 m_uiPhaseCount;
+        bool   m_bEventStarted;
+
+        void StartEvent(uint64 uiPlayerGUID)
+        {
+            m_uiPlayerGUID = uiPlayerGUID;
+            m_bEventStarted = true;
+            m_uiEventTimer = 1200000;
+            m_uiSummonCountInvader = 0;
+            m_uiSummonCountStormseer = 0;
+            m_uiSummonCountHorde = 0;
+            m_uiWaitSummonTimer = 0;
+            m_uiWaitSummonTimerHorde = 0;
+            m_uiSpawnPosition = 0;
+            m_uiKillCount = 0;
+            m_uiCreatureCount = 0;
+            m_uiPhaseCount = 1;
+            lCreatureList.clear();
+            lSpawnList.clear();
+            lCreatureListHorde.clear();
+            lSpawnListHorde.clear();
+        }
+
+        void FinishEvent()
+        {
+            m_uiPlayerGUID = 0;
+            m_bEventStarted = false;
+            m_uiKillCount = 0;
+        }
+
+        void JustSummoned(Creature* pSummoned)
+        {
+            SendAIEventAround(AI_EVENT_CUSTOM_A, pSummoned->ToUnit(), 0, 40.0f);
+
+            if (pSummoned->GetEntry() == NPC_HORDE_DEFENDER) //replace died creature from list with new spawned one
+            {
+                if (m_uiPhaseCount == 2)
+                {
+                    itrh = lCreatureListHorde.begin();
+                    advance(itrh, lSpawnListHorde.front());
+                    *itrh = pSummoned;
+                    lSpawnListHorde.pop_front(); //Drop spawned creature from spawn list
+                }
+
+                if (m_uiPhaseCount == 1)
+                {
+                    lCreatureListHorde.push_back(pSummoned);
+                }
+            }
+
+            if (pSummoned->GetEntry() == NPC_HORDE_AXE_THROWER) //replace died creature from list with new spawned one
+            {
+                if (m_uiPhaseCount == 2)
+                {
+                    itrh = lCreatureListHorde.begin();
+                    advance(itrh, lSpawnListHorde.front());
+                    *itrh = pSummoned;
+                    lSpawnListHorde.pop_front(); //Drop spawned creature from spawn list
+                }
+
+                if (m_uiPhaseCount == 1)
+                {
+                    lCreatureListHorde.push_back(pSummoned);
+                }
+            }
+
+            if (pSummoned->GetEntry() == NPC_KOLKAR_INVADER) //replace died creature from list with new spawned one
+            {
+                if (m_uiPhaseCount == 2)
+                {
+                    itr = lCreatureList.begin();
+                    advance(itr, lSpawnList.front());
+                    *itr = pSummoned;
+                    lSpawnList.pop_front(); //Drop spawned creature from spawn list
+                }
+
+                if (m_uiPhaseCount == 1)
+                {
+                    lCreatureList.push_back(pSummoned);
+                }
+            }
+
+            if (pSummoned->GetEntry() == NPC_KOLKAR_STORMSEER) //Insert each spawn into list until 10 spawned
+            {
+                if (m_uiPhaseCount == 2)
+                {
+                    itr = lCreatureList.begin();
+                    advance(itr, lSpawnList.front());
+                    *itr = pSummoned;
+                    lSpawnList.pop_front(); //Drop spawned creature from spawn list
+                }
+
+                if (m_uiPhaseCount == 1)
+                {
+                    lCreatureList.push_back(pSummoned);
+                }
+            }
+            if (pSummoned->GetEntry() == NPC_WARLORD_KROMZAR)
+            {
+                DoScriptText(YELL_STRONGEST, m_creature);
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pKilled)
+        {
+            if (pKilled->GetEntry() == NPC_HORDE_DEFENDER) //find spawnpoint of died creature spawnpoint = position in creature list
+            {
+                --m_uiSummonCountHorde;
+                m_uiWaitSummonTimerHorde = 12000;
+
+                m_uiSpawnPosition = 0;
+                for (std::list<Creature*>::iterator itrh = lCreatureListHorde.begin(); itrh != lCreatureListHorde.end(); ++itrh, ++m_uiSpawnPosition)
+                {
+                    if ((*itrh) == pKilled)
+                    {
+                        lSpawnListHorde.push_back(m_uiSpawnPosition);  //put spawnpoint in list
+                        (*itrh) = NULL;
+                    }
+                }
+                if (m_uiWaitSummonTimerHorde < 1000)
+                    m_uiWaitSummonTimerHorde = 1000;
+
+                if (urand(0, 1))
+                    DoScriptText(SAY_DEFENDER, m_creature);
+            }
+
+            if (pKilled->GetEntry() == NPC_HORDE_AXE_THROWER) //find spawnpoint of died creature spawnpoint = position in creature list
+            {
+                --m_uiSummonCountHorde;
+                m_uiSpawnPosition = 0;
+                for (std::list<Creature*>::iterator itrh = lCreatureListHorde.begin(); itrh != lCreatureListHorde.end(); ++itrh, ++m_uiSpawnPosition)
+                {
+                    if ((*itrh) == pKilled)
+                    {
+                        lSpawnListHorde.push_back(m_uiSpawnPosition);  //put spawnpoint in list
+                        (*itrh) = NULL;
+                    }
+                }
+                if (m_uiWaitSummonTimerHorde < 1000)
+                    m_uiWaitSummonTimerHorde = 1000;
+
+                if (urand(0, 1))
+                    DoScriptText(SAY_DEFENDER, m_creature);
+            }
+
+            if (pKilled->GetEntry() == NPC_WARLORD_KROMZAR)
+            {
+                DoScriptText(YELL_RETREAT, m_creature);
+                pKilled->SummonGameObject(164690, pKilled->GetPositionX(), pKilled->GetPositionY(), pKilled->GetPositionZ(),
+                               4.12f, 60000);
+                m_uiPhaseCount = 4;
+            }
+
+            if (pKilled->GetEntry() == NPC_KOLKAR_INVADER) //find spawnpoint of died creature, spawnpoint = position in creature list
+            {
+                --m_uiSummonCountInvader;
+                ++m_uiKillCount;
+                m_uiWaitSummonTimer = 10000;
+
+                m_uiSpawnPosition = 0;
+                for (std::list<Creature*>::iterator itr = lCreatureList.begin(); itr != lCreatureList.end(); ++itr, ++m_uiSpawnPosition)
+                {
+                    if ((*itr) == pKilled)
+                    {
+                        lSpawnList.push_back(m_uiSpawnPosition);  //put spawnpoint in list
+                        (*itr) = NULL;
+                    }
+                }
+            }
+
+            if (pKilled->GetEntry() == NPC_KOLKAR_STORMSEER) //find spawnpoint of died creature, spawnpoint = position in creature list
+            {
+                --m_uiSummonCountStormseer;
+                ++m_uiKillCount;
+                m_uiWaitSummonTimer = 10000;
+
+                m_uiSpawnPosition = 0;
+                for (std::list<Creature*>::iterator itr = lCreatureList.begin(); itr != lCreatureList.end(); ++itr, ++m_uiSpawnPosition)
+                {
+                    if ((*itr) == pKilled)
+                    {
+                        lSpawnList.push_back(m_uiSpawnPosition);  //put spawnpoint in list
+                        (*itr) = NULL;
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff)
+        {
+            if (m_uiPhaseCount <= 2 && m_uiEventTimer < uiDiff)
+                m_uiPhaseCount = 4;
+
+            if (m_uiPhaseCount == 4)
+            {
+                for (std::list<Creature*>::iterator itrh = lCreatureListHorde.begin(); itrh != lCreatureListHorde.end(); ++itrh)
+                {
+                    if ((*itrh) != NULL)
+                    {
+                        (*itrh)->ForcedDespawn();
+                    }
+                }
+                m_uiPhaseCount = 5;
+            }
+
+            if (m_uiPhaseCount == 5)
+            {
+                for (std::list<Creature*>::iterator itr = lCreatureList.begin(); itr != lCreatureList.end(); ++itr)
+                {
+                    if ((*itr) != NULL)
+                    {
+                        (*itr)->ForcedDespawn();
+                    }
+                }
+                m_uiPhaseCount = 6;
+                FinishEvent();
+            }
+            if (m_uiPhaseCount == 2 && m_uiKillCount >= 20)
+            {
+                m_uiPhaseCount = 3;
+                m_creature->SummonCreature(NPC_KOLKAR_INVADER, SpawnPointsKromzar[0].fX, SpawnPointsKromzar[0].fY, SpawnPointsKromzar[0].fZ, SpawnPointsKromzar[0].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 40000);
+                m_creature->SummonCreature(NPC_WARLORD_KROMZAR, SpawnPointsKromzar[1].fX, SpawnPointsKromzar[1].fY, SpawnPointsKromzar[1].fZ, SpawnPointsKromzar[1].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 40000);
+                m_creature->SummonCreature(NPC_KOLKAR_STORMSEER, SpawnPointsKromzar[2].fX, SpawnPointsKromzar[2].fY, SpawnPointsKromzar[2].fZ, SpawnPointsKromzar[2].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 40000);
+            }
+
+            if (m_uiPhaseCount <= 2 && m_uiWaitSummonTimerHorde < uiDiff && m_uiSummonCountHorde < 7)
+            {
+                if (m_uiPhaseCount == 2)
+                    switch (urand(0, 1))
+                {
+                    case 0:
+                        m_creature->SummonCreature(NPC_HORDE_DEFENDER, SpawnPointsHorde[lSpawnListHorde.front()].fX, SpawnPointsHorde[lSpawnListHorde.front()].fY, SpawnPointsHorde[lSpawnListHorde.front()].fZ, SpawnPointsHorde[lSpawnListHorde.front()].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 40000);
+                        ++m_uiSummonCountHorde;
+                        if (m_uiSummonCountHorde <= 4)
+                            m_uiWaitSummonTimerHorde = 1000;
+                        else
+                            m_uiWaitSummonTimerHorde = 12000;
+                        break;
+                    case 1:
+                        m_creature->SummonCreature(NPC_HORDE_AXE_THROWER, SpawnPointsHorde[lSpawnListHorde.front()].fX, SpawnPointsHorde[lSpawnListHorde.front()].fY, SpawnPointsHorde[lSpawnListHorde.front()].fZ, SpawnPointsHorde[lSpawnListHorde.front()].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 40000);
+                        ++m_uiSummonCountHorde;
+                        if (m_uiSummonCountHorde <= 4)
+                            m_uiWaitSummonTimerHorde = 1000;
+                        else
+                            m_uiWaitSummonTimerHorde = 12000;
+                        break;
+                }
+
+                if (m_uiPhaseCount == 1)
+                    switch (urand(0, 1))
+                {
+                    case 0:
+                        m_creature->SummonCreature(NPC_HORDE_DEFENDER, SpawnPointsHorde[m_uiSummonCountHorde].fX, SpawnPointsHorde[m_uiSummonCountHorde].fY, SpawnPointsHorde[m_uiSummonCountHorde].fZ, SpawnPointsHorde[m_uiSummonCountHorde].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 40000);
+                        ++m_uiSummonCountHorde;
+                        break;
+                    case 1:
+                        m_creature->SummonCreature(NPC_HORDE_AXE_THROWER, SpawnPointsHorde[m_uiSummonCountHorde].fX, SpawnPointsHorde[m_uiSummonCountHorde].fY, SpawnPointsHorde[m_uiSummonCountHorde].fZ, SpawnPointsHorde[m_uiSummonCountHorde].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 40000);
+                        ++m_uiSummonCountHorde;
+                        break;
+                }
+            }
+
+            if (m_uiPhaseCount <= 2 && m_uiWaitSummonTimer < uiDiff && (m_uiSummonCountInvader + m_uiSummonCountStormseer) < 15)
+            {
+
+                if (m_uiSummonCountInvader < 8)
+                {
+                    ++m_uiSummonCountInvader;
+
+                    if (m_uiPhaseCount == 2)
+                    {
+                        m_creature->SummonCreature(NPC_KOLKAR_INVADER, SpawnPointsKolkar[lSpawnList.front()].fX, SpawnPointsKolkar[lSpawnList.front()].fY, SpawnPointsKolkar[lSpawnList.front()].fZ, SpawnPointsKolkar[lSpawnList.front()].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 40000);
+                        m_uiWaitSummonTimer = 10000;
+                    }
+
+                    if (m_uiPhaseCount == 1)
+                    {
+                        m_creature->SummonCreature(NPC_KOLKAR_INVADER, SpawnPointsKolkar[m_uiCreatureCount].fX, SpawnPointsKolkar[m_uiCreatureCount].fY, SpawnPointsKolkar[m_uiCreatureCount].fZ, SpawnPointsKolkar[m_uiCreatureCount].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 40000);
+                        ++m_uiCreatureCount;
+                    }
+                }
+
+                if (m_uiSummonCountStormseer < 7)
+                {
+                    ++m_uiSummonCountStormseer;
+                    if (m_uiPhaseCount == 2)
+                    {
+                        m_creature->SummonCreature(NPC_KOLKAR_STORMSEER, SpawnPointsKolkar[lSpawnList.front()].fX, SpawnPointsKolkar[lSpawnList.front()].fY, SpawnPointsKolkar[lSpawnList.front()].fZ, SpawnPointsKolkar[lSpawnList.front()].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 40000);
+                        m_uiWaitSummonTimer = 10000;
+                    }
+
+                    if (m_uiPhaseCount == 1)
+                    {
+                        m_creature->SummonCreature(NPC_KOLKAR_STORMSEER, SpawnPointsKolkar[m_uiCreatureCount].fX, SpawnPointsKolkar[m_uiCreatureCount].fY, SpawnPointsKolkar[m_uiCreatureCount].fZ, SpawnPointsKolkar[m_uiCreatureCount].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 40000);
+                        ++m_uiCreatureCount;
+                    }
+                }
+
+                if (m_uiPhaseCount == 1 && m_uiCreatureCount == 15) //set initial spawn done when 15 enemys spawned
+                {
+                    m_uiPhaseCount = 2;
+                }
+            }
+
+            else
+            {
+                m_uiWaitSummonTimer -= uiDiff;
+                m_uiWaitSummonTimerHorde -= uiDiff;
+                m_uiEventTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_regthar_deathgateAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+
+        if (pPlayer->GetQuestStatus(QUEST_COUNTERATTACK) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Where is warlord Krom'zar?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(2533, pCreature->GetObjectGuid());
+            return true;
+        }
+        else
+            pPlayer->SEND_GOSSIP_MENU(2533, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            DoScriptText(SAY_START_REGTHAR, pCreature, pPlayer);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            if (npc_regthar_deathgateAI* pRegtharAI = dynamic_cast<npc_regthar_deathgateAI*>(pCreature->AI()))
+                pRegtharAI->StartEvent(pPlayer->GetObjectGuid().GetRawValue());
+        }
+        return true;
+    }
+};
+
+/*#####
+## npc_horde_defender
+#####*/
+
+enum
+{
+    SAY_AGGRO_1        = -1000895,
+    SAY_AGGRO_2        = -1000896,
+    SAY_AGGRO_3        = -1000897,
+};
+
+struct horde_defender : public CreatureScript
+{
+    horde_defender() : CreatureScript("npc_horde_defender") {}
+
+    struct npc_horde_defenderAI : public ScriptedAI
+    {
+        npc_horde_defenderAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint64 i_victimGuid;
+        bool m_bCreatureFound;
+
+        void Reset()
+        {
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+//            m_creature->DeleteThreatList();
+            m_creature->SetLootRecipient(NULL);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*miscValue*/)
+        {
+            if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                m_creature->AddThreat(pInvoker, 0.0f);
+                pSender->AddThreat(m_creature->ToUnit(), 0.0f);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(SAY_AGGRO_1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_AGGRO_2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_AGGRO_3, m_creature);
+                break;
+            }
+        }
+
+        void MoveInLineOfSight(Unit* u) override
+        {
+            if (m_creature->CanInitiateAttack() && u->IsTargetableForAttack() &&
+                m_creature->IsHostileTo(u) && u->isInAccessablePlaceFor(m_creature))
+            {
+                float attackRadius = 38.0f;
+                if (m_creature->IsWithinDistInMap(u, attackRadius) && m_creature->IsWithinLOSInMap(u))
+                {
+                    if (!m_creature->getVictim())
+                    {
+                        AttackStart(u);
+
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/)
+        {
+            if (!m_creature->getVictim())
+            {
+                Creature* pCreature = GetClosestCreatureWithEntry(m_creature, NPC_KOLKAR_INVADER, 38.0f);
+                if (!pCreature && m_bCreatureFound)
+                {
+                    m_creature->GetMotionMaster()->MoveTargetedHome();
+                    m_bCreatureFound = false;
+                }
+                if (pCreature)
+                {
+                    AttackStart(pCreature);
+                    m_bCreatureFound = true;
+                }
+            }
+            DoMeleeAttackIfReady();
+        }
+
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_horde_defenderAI(pCreature);
+    }
+};
+
+/*#####
+## npc_kolkar_invader
+#####*/
+
+struct kolkar_invader : public CreatureScript
+{
+    kolkar_invader() : CreatureScript("npc_kolkar_invader") {}
+
+    struct npc_kolkar_invaderAI : public ScriptedAI
+    {
+        npc_kolkar_invaderAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint64 i_victimGuid;
+        bool m_bCreatureFound;
+
+        void Reset()
+        {
+        }
+
+        void JustRespawned()
+        {
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*miscValue*/)
+        {
+            if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                m_creature->AddThreat(pInvoker, 0.0f);
+                pSender->AddThreat(m_creature->ToUnit(), 0.0f);
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            //m_creature->DeleteThreatList();
+            m_creature->SetLootRecipient(NULL);
+        }
+
+        void MoveInLineOfSight(Unit* u) override
+        {
+            if (m_creature->CanInitiateAttack() && u->IsTargetableForAttack() &&
+                m_creature->IsHostileTo(u) && u->isInAccessablePlaceFor(m_creature))
+            {
+                float attackRadius = 38.0f;
+                if (m_creature->IsWithinDistInMap(u, attackRadius) && m_creature->IsWithinLOSInMap(u))
+                {
+                    if (!m_creature->getVictim())
+                    {
+                        AttackStart(u);
+
+                    }
+                }
+            }
+        }
+
+
+
+        void UpdateAI(const uint32 /*uiDiff*/)
+        {
+            if (!m_creature->getVictim())
+            {
+                Creature* pCreature = GetClosestCreatureWithEntry(m_creature, NPC_HORDE_DEFENDER |  NPC_HORDE_AXE_THROWER , 38.0f);
+                if (!pCreature && m_bCreatureFound)
+                {
+                    m_creature->GetMotionMaster()->MoveTargetedHome();
+                    m_bCreatureFound = false;
+                }
+                if (pCreature)
+                {
+                    AttackStart(pCreature);
+                    m_bCreatureFound = true;
+                }
+            }
+            DoMeleeAttackIfReady();
+        }
+
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kolkar_invaderAI(pCreature);
+    }
+};
+
+/*#####
+## NPC_WARLORD_KROMZAR
+#####*/
+
+struct warlord_kromzar : public CreatureScript
+{
+    warlord_kromzar() : CreatureScript("npc_warlord_kromzar") {}
+
+    struct npc_warlord_kromzarAI : public npc_escortAI
+    {
+        npc_warlord_kromzarAI(Creature* pCreature) : npc_escortAI(pCreature) {}
+
+        void Reset() {}
+
+        void WaypointReached(uint32 uiPointId)
+        {
+
+        }
+
+        void JustDied(Unit* /**/)
+        {
+            m_creature->CastSpell(m_creature->ToUnit(), 13965, true);
+        }
+
+        void JustRespawned() override
+        {
+            DoScriptText(YELL_STRONGEST, m_creature);
+            m_creature->SummonCreature(NPC_KOLKAR_INVADER, SpawnPointsKromzar[0].fX, SpawnPointsKromzar[0].fY, SpawnPointsKromzar[0].fZ, SpawnPointsKromzar[0].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 40000);
+            m_creature->SummonCreature(NPC_KOLKAR_STORMSEER, SpawnPointsKromzar[2].fX, SpawnPointsKromzar[2].fY, SpawnPointsKromzar[2].fZ, SpawnPointsKromzar[2].fO, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 40000);
+            Start(false, NULL, NULL, false, true);
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+
+    };
+    
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_warlord_kromzarAI(pCreature);
+    }
+};
+
+void AddSC_the_barrens()
+{
+    Script* s;
+    s = new npc_beaten_corpse();
+    s->RegisterSelf();
+    s = new npc_gilthares();
+    s->RegisterSelf();
+    s = new npc_taskmaster_fizzule();
+    s->RegisterSelf();
+    s = new npc_twiggy_flathead();
+    s->RegisterSelf();
+    s = new at_twiggy_flathead();
+    s->RegisterSelf();
+    s = new npc_wizzlecranks_shredder();
+    s->RegisterSelf();
+    s = new npc_regthar_deathgate();
+    s->RegisterSelf();
+    s = new horde_defender();
+    s->RegisterSelf();
+    s = new kolkar_invader();
+    s->RegisterSelf();
+    s = new warlord_kromzar();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_beaten_corpse";
+    //pNewScript->pGossipHello = &GossipHello_npc_beaten_corpse;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_beaten_corpse;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_gilthares";
+    //pNewScript->GetAI = &GetAI_npc_gilthares;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_gilthares;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_taskmaster_fizzule";
+    //pNewScript->GetAI = &GetAI_npc_taskmaster_fizzule;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_twiggy_flathead";
+    //pNewScript->GetAI = &GetAI_npc_twiggy_flathead;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_twiggy_flathead";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_twiggy_flathead;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_wizzlecranks_shredder";
+    //pNewScript->GetAI = &GetAI_npc_wizzlecranks_shredder;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_wizzlecranks_shredder;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_regthar_deathgate";
+    //pNewScript->pGossipHello = &GossipHello_npc_regthar_deathgate;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_regthar_deathgate;
+    //pNewScript->GetAI = &GetAI_npc_regthar_deathgate;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_horde_defender";
+    //pNewScript->GetAI = &GetAI_npc_horde_defender;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/thousand_needles.cpp b/src/modules/SD3/scripts/kalimdor/thousand_needles.cpp
new file mode 100644
index 000000000..1a11b6e2d
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/thousand_needles.cpp
@@ -0,0 +1,456 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Thousand_Needles
+ * SD%Complete: 90
+ * SDComment:   Quest support: 1950, 4770, 4904, 4966
+ * SDCategory:  Thousand Needles
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_kanati
+ * npc_lakota_windsong
+ * npc_paoka_swiftmountain
+ * npc_plucky_johnson
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+# npc_kanati
+######*/
+
+enum
+{
+    SAY_KAN_START              = -1000410,
+
+    QUEST_PROTECT_KANATI        = 4966,
+    NPC_GALAK_ASS               = 10720
+};
+
+const float m_afGalakLoc[] = { -4867.387695f, -1357.353760f, -48.226f};
+
+struct npc_kanati : public CreatureScript
+{
+    npc_kanati() : CreatureScript("npc_kanati") {}
+
+    struct npc_kanatiAI : public npc_escortAI
+    {
+        npc_kanatiAI(Creature* pCreature) : npc_escortAI(pCreature) {}
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                DoScriptText(SAY_KAN_START, m_creature);
+                DoSpawnGalak();
+                break;
+            case 1:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_PROTECT_KANATI, m_creature);
+                }
+                break;
+            }
+        }
+
+        void DoSpawnGalak()
+        {
+            for (int i = 0; i < 3; ++i)
+                m_creature->SummonCreature(NPC_GALAK_ASS,
+                m_afGalakLoc[0], m_afGalakLoc[1], m_afGalakLoc[2], 0.0f,
+                TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kanatiAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_PROTECT_KANATI)
+        {
+            if (npc_kanatiAI* pEscortAI = dynamic_cast<npc_kanatiAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest, true);
+            }
+        }
+        return true;
+    }
+};
+
+/*######
+# npc_lakota_windsong
+######*/
+
+enum
+{
+    SAY_LAKO_START              = -1000365,
+    SAY_LAKO_LOOK_OUT           = -1000366,
+    SAY_LAKO_HERE_COME          = -1000367,
+    SAY_LAKO_MORE               = -1000368,
+    SAY_LAKO_END                = -1000369,
+
+    QUEST_FREE_AT_LAST          = 4904,
+    NPC_GRIM_BANDIT             = 10758,
+
+    ID_AMBUSH_1                 = 0,
+    ID_AMBUSH_2                 = 2,
+    ID_AMBUSH_3                 = 4
+};
+
+float m_afBanditLoc[6][6] =
+{
+    { -4905.479492f, -2062.732666f, 84.352f},
+    { -4915.201172f, -2073.528320f, 84.733f},
+    { -4878.883301f, -1986.947876f, 91.966f},
+    { -4877.503906f, -1966.113403f, 91.859f},
+    { -4767.985352f, -1873.169189f, 90.192f},
+    { -4788.861328f, -1888.007813f, 89.888f}
+};
+
+struct npc_lakota_windsong : public CreatureScript
+{
+    npc_lakota_windsong() : CreatureScript("npc_lakota_windsong") {}
+
+    struct npc_lakota_windsongAI : public npc_escortAI
+    {
+        npc_lakota_windsongAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 8:
+                DoScriptText(SAY_LAKO_LOOK_OUT, m_creature);
+                DoSpawnBandits(ID_AMBUSH_1);
+                break;
+            case 14:
+                DoScriptText(SAY_LAKO_HERE_COME, m_creature);
+                DoSpawnBandits(ID_AMBUSH_2);
+                break;
+            case 21:
+                DoScriptText(SAY_LAKO_MORE, m_creature);
+                DoSpawnBandits(ID_AMBUSH_3);
+                break;
+            case 45:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_FREE_AT_LAST, m_creature);
+                }
+                break;
+            }
+        }
+
+        void DoSpawnBandits(int uiAmbushId)
+        {
+            for (int i = 0; i < 2; ++i)
+                m_creature->SummonCreature(NPC_GRIM_BANDIT,
+                m_afBanditLoc[i + uiAmbushId][0], m_afBanditLoc[i + uiAmbushId][1], m_afBanditLoc[i + uiAmbushId][2], 0.0f,
+                TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_lakota_windsongAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_FREE_AT_LAST)
+        {
+            DoScriptText(SAY_LAKO_START, pCreature, pPlayer);
+            pCreature->SetFactionTemporary(FACTION_ESCORT_H_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+
+            if (npc_lakota_windsongAI* pEscortAI = dynamic_cast<npc_lakota_windsongAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+            return true;
+        }
+        return false;
+    }
+};
+
+/*######
+# npc_paoka_swiftmountain
+######*/
+
+enum
+{
+    SAY_START           = -1000362,
+    SAY_WYVERN          = -1000363,
+    SAY_COMPLETE        = -1000364,
+
+    QUEST_HOMEWARD      = 4770,
+    NPC_WYVERN          = 4107
+};
+
+float m_afWyvernLoc[3][3] =
+{
+    { -4990.606f, -906.057f, -5.343f},
+    { -4970.241f, -927.378f, -4.951f},
+    { -4985.364f, -952.528f, -5.199f}
+};
+
+struct npc_paoka_swiftmountain : public CreatureScript
+{
+    npc_paoka_swiftmountain() : CreatureScript("npc_paoka_swiftmountain") {}
+
+    struct npc_paoka_swiftmountainAI : public npc_escortAI
+    {
+        npc_paoka_swiftmountainAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 15:
+                DoScriptText(SAY_WYVERN, m_creature);
+                DoSpawnWyvern();
+                break;
+            case 26:
+                DoScriptText(SAY_COMPLETE, m_creature);
+                break;
+            case 27:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_HOMEWARD, m_creature);
+                }
+                break;
+            }
+        }
+
+        void DoSpawnWyvern()
+        {
+            for (int i = 0; i < 3; ++i)
+                m_creature->SummonCreature(NPC_WYVERN,
+                m_afWyvernLoc[i][0], m_afWyvernLoc[i][1], m_afWyvernLoc[i][2], 0.0f,
+                TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_paoka_swiftmountainAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_HOMEWARD)
+        {
+            DoScriptText(SAY_START, pCreature, pPlayer);
+            pCreature->SetFactionTemporary(FACTION_ESCORT_H_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+
+            if (npc_paoka_swiftmountainAI* pEscortAI = dynamic_cast<npc_paoka_swiftmountainAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+            return true;
+        }
+        return false;
+    }
+};
+
+/*######
+# "Plucky" Johnson
+######*/
+
+enum
+{
+    FACTION_FRIENDLY        = 35,
+    QUEST_SCOOP             = 1950,
+    SPELL_PLUCKY_HUMAN      = 9192,
+    SPELL_PLUCKY_CHICKEN    = 9220
+};
+
+#define GOSSIP_ITEM_QUEST   "Please tell me the Phrase.."   //TODO localise
+
+struct npc_plucky_johnson : public CreatureScript
+{
+    npc_plucky_johnson() : CreatureScript("npc_plucky_johnson") {}
+
+    struct npc_plucky_johnsonAI : public ScriptedAI
+    {
+        npc_plucky_johnsonAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+        }
+
+        uint32 m_uiResetTimer;
+
+        void Reset() override
+        {
+            m_uiResetTimer = 120000;
+
+            if (m_creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP))
+            {
+                m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            }
+
+            m_creature->CastSpell(m_creature, SPELL_PLUCKY_CHICKEN, false);
+        }
+
+        void ReceiveEmote(Player* pPlayer, uint32 uiTextEmote) override
+        {
+            if (pPlayer->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE)
+            {
+                if (uiTextEmote == TEXTEMOTE_BECKON)
+                {
+                    m_creature->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_RESTORE_COMBAT_STOP);
+                    m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                    m_creature->CastSpell(m_creature, SPELL_PLUCKY_HUMAN, false);
+                }
+            }
+
+            if (uiTextEmote == TEXTEMOTE_CHICKEN)
+            {
+                if (m_creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP))
+                {
+                    return;
+                }
+                else
+                {
+                    m_creature->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_RESTORE_COMBAT_STOP);
+                    m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                    m_creature->CastSpell(m_creature, SPELL_PLUCKY_HUMAN, false);
+                    m_creature->HandleEmote(EMOTE_ONESHOT_WAVE);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP))
+            {
+                if (m_uiResetTimer < uiDiff)
+                {
+                    if (!m_creature->getVictim())
+                    {
+                        EnterEvadeMode();
+                    }
+                    else
+                    {
+                        m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                    }
+
+                    return;
+                }
+                else
+                {
+                    m_uiResetTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_plucky_johnsonAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_QUEST, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(720, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF)
+        {
+            pPlayer->SEND_GOSSIP_MENU(738, pCreature->GetObjectGuid());
+            pPlayer->AreaExploredOrEventHappens(QUEST_SCOOP);
+        }
+
+        return true;
+    }
+};
+
+void AddSC_thousand_needles()
+{
+    Script* s;
+    s = new npc_kanati();
+    s->RegisterSelf();
+    s = new npc_lakota_windsong();
+    s->RegisterSelf();
+    s = new npc_paoka_swiftmountain();
+    s->RegisterSelf();
+    s = new npc_plucky_johnson();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kanati";
+    //pNewScript->GetAI = &GetAI_npc_kanati;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_kanati;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_lakota_windsong";
+    //pNewScript->GetAI = &GetAI_npc_lakota_windsong;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_lakota_windsong;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_paoka_swiftmountain";
+    //pNewScript->GetAI = &GetAI_npc_paoka_swiftmountain;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_paoka_swiftmountain;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_plucky_johnson";
+    //pNewScript->GetAI = &GetAI_npc_plucky_johnson;
+    //pNewScript->pGossipHello = &GossipHello_npc_plucky_johnson;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_plucky_johnson;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/thunder_bluff.cpp b/src/modules/SD3/scripts/kalimdor/thunder_bluff.cpp
new file mode 100644
index 000000000..c37d1683b
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/thunder_bluff.cpp
@@ -0,0 +1,44 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Thunder_Bluff
+ * SD%Complete: 0
+ * SDComment:   Placeholder
+ * SDCategory:  Thunder Bluff
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+/*#####
+#
+######*/
+
+void AddSC_thunder_bluff()
+{
+}
diff --git a/src/modules/SD3/scripts/kalimdor/ungoro_crater.cpp b/src/modules/SD3/scripts/kalimdor/ungoro_crater.cpp
new file mode 100644
index 000000000..014d50d0b
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/ungoro_crater.cpp
@@ -0,0 +1,414 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Ungoro_Crater
+ * SD%Complete: 100
+ * SDComment:   Quest support: 4245, 4491
+ * SDCategory:  Un'Goro Crater
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_ringo
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "follower_ai.h"
+
+/*######
+## npc_ame01
+######*/
+
+enum
+{
+    SAY_AME_START           = -1000446,
+    SAY_AME_PROGRESS        = -1000447,
+    SAY_AME_END             = -1000448,
+    SAY_AME_AGGRO1          = -1000449,
+    SAY_AME_AGGRO2          = -1000450,
+    SAY_AME_AGGRO3          = -1000451,
+
+    QUEST_CHASING_AME       = 4245
+};
+
+struct npc_ame01 : public CreatureScript
+{
+    npc_ame01() : CreatureScript("npc_ame01") {}
+
+    struct npc_ame01AI : public npc_escortAI
+    {
+        npc_ame01AI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                DoScriptText(SAY_AME_START, m_creature);
+                break;
+            case 19:
+                DoScriptText(SAY_AME_PROGRESS, m_creature);
+                break;
+            case 37:
+                DoScriptText(SAY_AME_END, m_creature);
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_CHASING_AME, m_creature);
+                }
+                break;
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (pWho->GetTypeId() == TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            if (Player* pPlayer = GetPlayerForEscort())
+            {
+                if (pPlayer->getVictim() && pPlayer->getVictim() == pWho)
+                {
+                    return;
+                }
+
+                switch (urand(0, 2))
+                {
+                case 0:
+                    DoScriptText(SAY_AME_AGGRO1, m_creature, pWho);
+                    break;
+                case 1:
+                    DoScriptText(SAY_AME_AGGRO2, m_creature, pWho);
+                    break;
+                case 2:
+                    DoScriptText(SAY_AME_AGGRO3, m_creature, pWho);
+                    break;
+                }
+            }
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_CHASING_AME)
+        {
+            if (npc_ame01AI* pAmeAI = dynamic_cast<npc_ame01AI*>(pCreature->AI()))
+            {
+                pCreature->SetStandState(UNIT_STAND_STATE_STAND);
+
+                if (pPlayer->GetTeam() == ALLIANCE)
+                {
+                    pCreature->SetFactionTemporary(FACTION_ESCORT_A_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+                }
+                else if (pPlayer->GetTeam() == HORDE)
+                {
+                    pCreature->SetFactionTemporary(FACTION_ESCORT_H_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+                }
+
+                pAmeAI->Start(false, pPlayer, pQuest);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ame01AI(pCreature);
+    }
+};
+
+/*####
+# npc_ringo
+####*/
+
+enum
+{
+    SAY_RIN_START_1             = -1000416,
+    SAY_RIN_START_2             = -1000417,
+
+    SAY_FAINT_1                 = -1000418,
+    SAY_FAINT_2                 = -1000419,
+    SAY_FAINT_3                 = -1000420,
+    SAY_FAINT_4                 = -1000421,
+
+    SAY_WAKE_1                  = -1000422,
+    SAY_WAKE_2                  = -1000423,
+    SAY_WAKE_3                  = -1000424,
+    SAY_WAKE_4                  = -1000425,
+
+    SAY_RIN_END_1               = -1000426,
+    SAY_SPR_END_2               = -1000427,
+    SAY_RIN_END_3               = -1000428,
+    EMOTE_RIN_END_4             = -1000429,
+    EMOTE_RIN_END_5             = -1000430,
+    SAY_RIN_END_6               = -1000431,
+    SAY_SPR_END_7               = -1000432,
+    EMOTE_RIN_END_8             = -1000433,
+
+    SPELL_REVIVE_RINGO          = 15591,
+    QUEST_A_LITTLE_HELP         = 4491,
+    NPC_SPRAGGLE                = 9997
+};
+
+struct npc_ringo : public CreatureScript
+{
+    npc_ringo() : CreatureScript("npc_ringo") {}
+
+    struct npc_ringoAI : public FollowerAI
+    {
+        npc_ringoAI(Creature* pCreature) : FollowerAI(pCreature) { }
+
+        uint32 m_uiFaintTimer;
+        uint32 m_uiEndEventProgress;
+        uint32 m_uiEndEventTimer;
+
+        Unit* pSpraggle;
+
+        void Reset() override
+        {
+            m_uiFaintTimer = urand(30000, 60000);
+            m_uiEndEventProgress = 0;
+            m_uiEndEventTimer = 1000;
+            pSpraggle = NULL;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            FollowerAI::MoveInLineOfSight(pWho);
+
+            if (!m_creature->getVictim() && !HasFollowState(STATE_FOLLOW_COMPLETE) && pWho->GetEntry() == NPC_SPRAGGLE)
+            {
+                if (m_creature->IsWithinDistInMap(pWho, INTERACTION_DISTANCE))
+                {
+                    if (Player* pPlayer = GetLeaderForFollower())
+                    {
+                        if (pPlayer->GetQuestStatus(QUEST_A_LITTLE_HELP) == QUEST_STATUS_INCOMPLETE)
+                        {
+                            pPlayer->GroupEventHappens(QUEST_A_LITTLE_HELP, m_creature);
+                        }
+                    }
+
+                    pSpraggle = pWho;
+                    SetFollowComplete(true);
+                }
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (HasFollowState(STATE_FOLLOW_INPROGRESS | STATE_FOLLOW_PAUSED) && pSpell->Id == SPELL_REVIVE_RINGO)
+            {
+                ClearFaint();
+            }
+        }
+
+        void SetFaint()
+        {
+            if (!HasFollowState(STATE_FOLLOW_POSTEVENT))
+            {
+                SetFollowPaused(true);
+
+                switch (urand(0, 3))
+                {
+                case 0:
+                    DoScriptText(SAY_FAINT_1, m_creature);
+                    break;
+                case 1:
+                    DoScriptText(SAY_FAINT_2, m_creature);
+                    break;
+                case 2:
+                    DoScriptText(SAY_FAINT_3, m_creature);
+                    break;
+                case 3:
+                    DoScriptText(SAY_FAINT_4, m_creature);
+                    break;
+                }
+            }
+
+            // what does actually happen here? Emote? Aura?
+            m_creature->SetStandState(UNIT_STAND_STATE_SLEEP);
+        }
+
+        void ClearFaint()
+        {
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+
+            if (HasFollowState(STATE_FOLLOW_POSTEVENT))
+            {
+                return;
+            }
+
+            switch (urand(0, 3))
+            {
+            case 0:
+                DoScriptText(SAY_WAKE_1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_WAKE_2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_WAKE_3, m_creature);
+                break;
+            case 3:
+                DoScriptText(SAY_WAKE_4, m_creature);
+                break;
+            }
+
+            SetFollowPaused(false);
+        }
+
+        void UpdateFollowerAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (HasFollowState(STATE_FOLLOW_POSTEVENT))
+                {
+                    if (m_uiEndEventTimer < uiDiff)
+                    {
+                        if (!pSpraggle || !pSpraggle->IsAlive())
+                        {
+                            SetFollowComplete();
+                            return;
+                        }
+
+                        switch (m_uiEndEventProgress)
+                        {
+                        case 1:
+                            DoScriptText(SAY_RIN_END_1, m_creature);
+                            m_uiEndEventTimer = 3000;
+                            break;
+                        case 2:
+                            DoScriptText(SAY_SPR_END_2, pSpraggle);
+                            m_uiEndEventTimer = 5000;
+                            break;
+                        case 3:
+                            DoScriptText(SAY_RIN_END_3, m_creature);
+                            m_uiEndEventTimer = 1000;
+                            break;
+                        case 4:
+                            DoScriptText(EMOTE_RIN_END_4, m_creature);
+                            SetFaint();
+                            m_uiEndEventTimer = 9000;
+                            break;
+                        case 5:
+                            DoScriptText(EMOTE_RIN_END_5, m_creature);
+                            ClearFaint();
+                            m_uiEndEventTimer = 1000;
+                            break;
+                        case 6:
+                            DoScriptText(SAY_RIN_END_6, m_creature);
+                            m_uiEndEventTimer = 3000;
+                            break;
+                        case 7:
+                            DoScriptText(SAY_SPR_END_7, pSpraggle);
+                            m_uiEndEventTimer = 10000;
+                            break;
+                        case 8:
+                            DoScriptText(EMOTE_RIN_END_8, m_creature);
+                            m_uiEndEventTimer = 5000;
+                            break;
+                        case 9:
+                            SetFollowComplete();
+                            break;
+                        }
+
+                        ++m_uiEndEventProgress;
+                    }
+                    else
+                    {
+                        m_uiEndEventTimer -= uiDiff;
+                    }
+                }
+                else if (HasFollowState(STATE_FOLLOW_INPROGRESS))
+                {
+                    if (!HasFollowState(STATE_FOLLOW_PAUSED))
+                    {
+                        if (m_uiFaintTimer < uiDiff)
+                        {
+                            SetFaint();
+                            m_uiFaintTimer = urand(60000, 120000);
+                        }
+                        else
+                        {
+                            m_uiFaintTimer -= uiDiff;
+                        }
+                    }
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ringoAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_A_LITTLE_HELP)
+        {
+            if (npc_ringoAI* pRingoAI = dynamic_cast<npc_ringoAI*>(pCreature->AI()))
+            {
+                pCreature->SetStandState(UNIT_STAND_STATE_STAND);
+                pRingoAI->StartFollow(pPlayer, FACTION_ESCORT_N_FRIEND_PASSIVE, pQuest);
+            }
+        }
+
+        return true;
+    }
+};
+
+void AddSC_ungoro_crater()
+{
+    Script* s;
+    s = new npc_ame01();
+    s->RegisterSelf();
+    s = new npc_ringo();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ame01";
+    //pNewScript->GetAI = &GetAI_npc_ame01;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_ame01;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ringo";
+    //pNewScript->GetAI = &GetAI_npc_ringo;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_ringo;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp b/src/modules/SD3/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
new file mode 100644
index 000000000..ebb9e338d
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
@@ -0,0 +1,198 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Instance_Wailing_Caverns
+ * SD%Complete: 90
+ * SDComment:   None
+ * SDCategory:  Wailing Caverns
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "wailing_caverns.h"
+
+struct is_wailing_caverns : public InstanceScript
+{
+    is_wailing_caverns() : InstanceScript("instance_wailing_caverns") {}
+
+    class instance_wailing_caverns : public ScriptedInstance
+    {
+    public:
+        instance_wailing_caverns(Map* pMap) : ScriptedInstance(pMap)
+        {
+            Initialize();
+        }
+
+        ~instance_wailing_caverns() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            // Respawn the Mysterious chest if one of the players who enter the instance has the quest in his log
+            if (pPlayer->GetQuestStatus(QUEST_FORTUNE_AWAITS) == QUEST_STATUS_COMPLETE &&
+                !pPlayer->GetQuestRewardStatus(QUEST_FORTUNE_AWAITS))
+            {
+                DoRespawnGameObject(GO_MYSTERIOUS_CHEST, HOUR);
+            }
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_NARALEX:
+            case NPC_DISCIPLE:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            if (pGo->GetEntry() == GO_MYSTERIOUS_CHEST)
+            {
+                m_mGoEntryGuidStore[GO_MYSTERIOUS_CHEST] = pGo->GetObjectGuid();
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_ANACONDRA:
+                m_auiEncounter[0] = uiData;
+                break;
+            case TYPE_COBRAHN:
+                m_auiEncounter[1] = uiData;
+                break;
+            case TYPE_PYTHAS:
+                m_auiEncounter[2] = uiData;
+                break;
+            case TYPE_SERPENTIS:
+                m_auiEncounter[3] = uiData;
+                break;
+            case TYPE_DISCIPLE:
+                m_auiEncounter[4] = uiData;
+                break;
+            case TYPE_MUTANUS:
+                m_auiEncounter[5] = uiData;
+                break;
+            }
+
+            // Set to special in order to start the escort event; only if all four bosses are done
+            if (m_auiEncounter[0] == DONE && m_auiEncounter[1] == DONE && m_auiEncounter[2] == DONE && m_auiEncounter[3] == DONE && (m_auiEncounter[4] == NOT_STARTED || m_auiEncounter[4] == FAIL))
+            {
+                // Yell intro text; only the first time
+                if (m_auiEncounter[4] == NOT_STARTED)
+                {
+                    if (Creature* pDisciple = GetSingleCreatureFromStorage(NPC_DISCIPLE))
+                    {
+                        DoScriptText(SAY_INTRO, pDisciple);
+                    }
+                }
+
+                m_auiEncounter[4] = SPECIAL;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5];
+
+                m_strInstData = saveStream.str();
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2]
+                >> m_auiEncounter[3] >> m_auiEncounter[4] >> m_auiEncounter[5];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    protected:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_wailing_caverns(pMap);
+    }
+};
+
+void AddSC_instance_wailing_caverns()
+{
+    Script* s;
+    s = new is_wailing_caverns();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_wailing_caverns";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_wailing_caverns;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp b/src/modules/SD3/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
new file mode 100644
index 000000000..a04191d18
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
@@ -0,0 +1,575 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      wailing_caverns
+ * SD%Complete: 90
+ * SDComment:   Missing vipers emerge effect, Naralex doesn't fly at exit(Core issue)
+ * SDCategory:  Wailing Caverns
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "wailing_caverns.h"
+#include "escort_ai.h"
+
+enum
+{
+    SAY_PREPARE             = -1043001,
+    SAY_FIRST_CORNER        = -1043002,
+    SAY_CONTINUE            = -1043003,
+    SAY_CIRCLE_BANISH       = -1043004,
+    SAY_PURIFIED            = -1043005,
+    SAY_NARALEX_CHAMBER     = -1043006,
+    SAY_BEGIN_RITUAL        = -1043007,
+    SAY_MUTANUS             = -1043012,
+    SAY_NARALEX_AWAKE       = -1043013,
+    SAY_AWAKE               = -1043014,
+    SAY_NARALEX_THANKYOU    = -1043015,
+    SAY_FAREWELL            = -1043016,
+    SAY_AGGRO_1             = -1043017,                     // Random between the first 2
+    SAY_AGGRO_2             = -1043018,
+    SAY_AGGRO_3             = -1043019,                     // During the awakening ritual
+
+    EMOTE_RITUAL_BEGIN      = -1043008,
+    EMOTE_NARALEX_AWAKE     = -1043009,
+    EMOTE_BREAK_THROUGH     = -1043010,
+    EMOTE_VISION            = -1043011,
+
+    GOSSIP_ITEM_BEGIN       = -3043000,
+    TEXT_ID_DISCIPLE        = 698,
+
+    SPELL_MARK              = 5232,                         // Buff before the fight. To be removed after 4.0.3
+    SPELL_SLEEP             = 1090,
+    SPELL_POTION            = 8141,
+    SPELL_CLEANSING         = 6270,
+    SPELL_AWAKENING         = 6271,
+    SPELL_SHAPESHIFT        = 8153,
+
+    NPC_DEVIATE_RAPTOR      = 3636,                         // 2 of them at the first stop
+    NPC_DEVIATE_VIPER       = 5755,                         // 3 of them at the circle
+    NPC_DEVIATE_MOCCASIN    = 5762,                         // 6 of them at Naralex chamber
+    NPC_NIGHTMARE_ECTOPLASM = 5763,                         // 10 of them at Naralex chamber
+    NPC_MUTANUS             = 3654
+};
+
+// Distance, Angle or Offset
+static const float aSummonPositions[5][2] =
+{
+    {50.0f, -0.507f},                                       // First Raptors
+    {53.0f, -0.603f},
+    { 7.0f, 1.73f},                                         // Vipers
+    {45.0f, 5.16f},                                         // Chamber
+    {47.0f, 0.5901f}                                        // Mutanus
+};
+
+struct npc_disciple_of_naralex : public CreatureScript
+{
+    npc_disciple_of_naralex() : CreatureScript("npc_disciple_of_naralex") {}
+
+    struct npc_disciple_of_naralexAI : public npc_escortAI
+    {
+        npc_disciple_of_naralexAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiEventTimer;
+        uint32 m_uiSleepTimer;
+        uint32 m_uiPotionTimer;
+        uint32 m_uiCleansingTimer;
+        uint8 m_uiSummonedAlive;
+        bool m_bIsFirstHit;
+
+        uint32 m_uiPoint;
+        uint8 m_uiSubeventPhase;
+
+        void Reset() override
+        {
+            m_uiSleepTimer = 5000;
+            m_uiPotionTimer = 5000;
+            m_uiCleansingTimer = 0;
+            m_bIsFirstHit = false;                        // Used to trigger the combat yell; reset at every evade
+
+            // Don't reset mob counter during the event
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiEventTimer = 0;
+
+                m_uiPoint = 0;
+                m_uiSubeventPhase = 0;
+
+                m_uiSummonedAlive = 0;
+            }
+        }
+
+        void JustRespawned() override
+        {
+            npc_escortAI::JustRespawned();
+
+            // Reset event if can
+            if (m_pInstance && m_pInstance->GetData(TYPE_DISCIPLE) != DONE)
+            {
+                m_pInstance->SetData(TYPE_DISCIPLE, FAIL);
+            }
+        }
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            if (!m_bIsFirstHit)
+            {
+                if (pAttacker->GetEntry() == NPC_MUTANUS)
+                {
+                    DoScriptText(SAY_MUTANUS, m_creature, pAttacker);
+                }
+                // Check if already in ritual
+                else if (m_uiPoint >= 30)
+                {
+                    DoScriptText(SAY_AGGRO_3, m_creature, pAttacker);
+                }
+                else
+                    // Aggro 1 should be in 90% of the cases
+                {
+                    DoScriptText(roll_chance_i(90) ? SAY_AGGRO_1 : SAY_AGGRO_2, m_creature, pAttacker);
+                }
+
+                m_bIsFirstHit = true;
+            }
+        }
+
+        // Overwrite the evade function, to change the combat stop function (keep casting some spells)
+        void EnterEvadeMode() override
+        {
+            // Do not stop casting at these points
+            if (m_uiPoint == 15 || m_uiPoint == 32)
+            {
+                m_creature->SetLootRecipient(NULL);
+                m_creature->DeleteThreatList();
+                m_creature->CombatStop(false);
+                Reset();
+
+                // Remove running
+                m_creature->SetWalk(true);
+            }
+            else
+            {
+                npc_escortAI::EnterEvadeMode();
+            }
+        }
+
+        void JustStartedEscort() override
+        {
+            DoScriptText(SAY_PREPARE, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_DISCIPLE, IN_PROGRESS);
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 7:
+                DoScriptText(SAY_FIRST_CORNER, m_creature);
+                m_uiSubeventPhase = 0;
+                m_uiEventTimer = 2000;
+                m_uiPoint = uiPointId;
+                SetEscortPaused(true);
+                break;
+            case 15:
+                m_uiSubeventPhase = 0;
+                m_uiEventTimer = 2000;
+                m_uiPoint = uiPointId;
+                SetEscortPaused(true);
+                break;
+            case 26:
+                DoScriptText(SAY_NARALEX_CHAMBER, m_creature);
+                break;
+            case 32:
+                if (Creature* pNaralex = m_pInstance->GetSingleCreatureFromStorage(NPC_NARALEX))
+                {
+                    m_creature->SetFacingToObject(pNaralex);
+                }
+
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                m_uiEventTimer = 2000;
+                m_uiSubeventPhase = 0;
+                m_uiPoint = uiPointId;
+                SetEscortPaused(true);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Attack the disciple
+            pSummoned->AI()->AttackStart(m_creature);
+
+            ++m_uiSummonedAlive;
+        }
+
+        void SummonedCreatureJustDied(Creature* /*pSummoned*/) override
+        {
+            if (m_uiSummonedAlive == 0)
+            {
+                return;    // Actually if this happens, something went wrong before
+            }
+
+            --m_uiSummonedAlive;
+
+            // Continue Event if all are dead and we are in a stopped subevent
+            if (m_uiSummonedAlive == 0 && m_uiEventTimer == 0)
+            {
+                m_uiEventTimer = 1000;
+            }
+        }
+
+        // Summon mobs at calculated points
+        void DoSpawnMob(uint32 uiEntry, float fDistance, float fAngle)
+        {
+            float fX, fY, fZ;
+            m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, fDistance, fAngle);
+
+            m_creature->SummonCreature(uiEntry, fX, fY, fZ, 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000);
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (m_uiEventTimer)
+            {
+                if (m_uiEventTimer <= uiDiff)
+                {
+                    switch (m_uiPoint)
+                    {
+                        // Corner stop -> raptors
+                    case 7:
+                        switch (m_uiSubeventPhase)
+                        {
+                        case 0:
+                            // Summon raptors at first stop
+                            DoSpawnMob(NPC_DEVIATE_RAPTOR, aSummonPositions[0][0], aSummonPositions[0][1]);
+                            DoSpawnMob(NPC_DEVIATE_RAPTOR, aSummonPositions[1][0], aSummonPositions[1][1]);
+                            m_uiEventTimer = 0;
+                            ++m_uiSubeventPhase;
+                            break;
+                        case 1:
+                            // After the summoned mobs are killed continue
+                            DoScriptText(SAY_CONTINUE, m_creature);
+                            SetEscortPaused(false);
+                            m_uiEventTimer = 0;
+                            break;
+                        }
+                        break;
+                        // Circle stop -> vipers
+                    case 15:
+                        switch (m_uiSubeventPhase)
+                        {
+                        case 0:
+                            DoScriptText(SAY_CIRCLE_BANISH, m_creature);
+                            m_uiEventTimer = 2000;
+                            ++m_uiSubeventPhase;
+                            break;
+                        case 1:
+                            DoCastSpellIfCan(m_creature, SPELL_CLEANSING);
+                            m_uiEventTimer = 20000;
+                            ++m_uiSubeventPhase;
+                            break;
+                        case 2:
+                            // Summon vipers at the first circle
+                            for (uint8 i = 0; i < 3; ++i)
+                            {
+                                DoSpawnMob(NPC_DEVIATE_VIPER, aSummonPositions[2][0], aSummonPositions[2][1] + 2 * M_PI_F / 3 * i);
+                            }
+                            m_uiEventTimer = 0;
+                            ++m_uiSubeventPhase;
+                            break;
+                        case 3:
+                            // Wait for casting to be complete - TODO, this might have to be done better
+                            ++m_uiSubeventPhase;
+                            m_uiEventTimer = 10000;
+                            break;
+                        case 4:
+                            DoScriptText(SAY_PURIFIED, m_creature);
+                            m_uiEventTimer = 0;
+                            ++m_uiPoint;             // Increment this in order to avoid the special case evade
+                            SetEscortPaused(false);
+                            break;
+                        }
+                        break;
+                        // Chamber stop -> ritual and final boss
+                    case 32:
+                        switch (m_uiSubeventPhase)
+                        {
+                        case 0:
+                            DoScriptText(SAY_BEGIN_RITUAL, m_creature);
+                            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                            m_uiEventTimer = 2000;
+                            ++m_uiSubeventPhase;
+                            break;
+                        case 1:
+                            DoCastSpellIfCan(m_creature, SPELL_AWAKENING);
+                            DoScriptText(EMOTE_RITUAL_BEGIN, m_creature);
+                            m_uiEventTimer = 4000;
+                            ++m_uiSubeventPhase;
+                            break;
+                        case 2:
+                            if (Creature* pNaralex = m_pInstance->GetSingleCreatureFromStorage(NPC_NARALEX))
+                            {
+                                DoScriptText(EMOTE_NARALEX_AWAKE, pNaralex);
+                            }
+                            m_uiEventTimer = 5000;
+                            ++m_uiSubeventPhase;
+                            break;
+                        case 3:
+                            // First set of mobs
+                            for (uint8 i = 0; i < 3; ++i)
+                            {
+                                DoSpawnMob(NPC_DEVIATE_MOCCASIN, aSummonPositions[3][0], aSummonPositions[3][1] + M_PI_F / 3 * i);
+                            }
+                            m_uiEventTimer = 20000;
+                            ++m_uiSubeventPhase;
+                            break;
+                        case 4:
+                            // Second set of mobs
+                            for (uint8 i = 0; i < 7; ++i)
+                            {
+                                DoSpawnMob(NPC_NIGHTMARE_ECTOPLASM, aSummonPositions[3][0], aSummonPositions[3][1] + M_PI_F / 7 * i);
+                            }
+                            m_uiEventTimer = 0;
+                            ++m_uiSubeventPhase;
+                            break;
+                        case 5:
+                            // Advance only when all mobs are dead
+                            if (Creature* pNaralex = m_pInstance->GetSingleCreatureFromStorage(NPC_NARALEX))
+                            {
+                                DoScriptText(EMOTE_BREAK_THROUGH, pNaralex);
+                            }
+                            ++m_uiSubeventPhase;
+                            m_uiEventTimer = 10000;
+                            break;
+                        case 6:
+                            // Mutanus
+                            if (Creature* pNaralex = m_pInstance->GetSingleCreatureFromStorage(NPC_NARALEX))
+                            {
+                                DoScriptText(EMOTE_VISION, pNaralex);
+                            }
+                            DoSpawnMob(NPC_MUTANUS, aSummonPositions[4][0], aSummonPositions[4][1]);
+                            m_uiEventTimer = 0;
+                            ++m_uiSubeventPhase;
+                            break;
+                        case 7:
+                            // Awaken Naralex after mutanus is defeated
+                            if (Creature* pNaralex = m_pInstance->GetSingleCreatureFromStorage(NPC_NARALEX))
+                            {
+                                pNaralex->SetStandState(UNIT_STAND_STATE_SIT);
+                                DoScriptText(SAY_NARALEX_AWAKE, pNaralex);
+                            }
+                            m_creature->InterruptNonMeleeSpells(false, SPELL_AWAKENING);
+                            m_creature->RemoveAurasDueToSpell(SPELL_AWAKENING);
+                            m_pInstance->SetData(TYPE_DISCIPLE, DONE);
+                            ++m_uiSubeventPhase;
+                            m_uiEventTimer = 2000;
+                            break;
+                        case 8:
+                            DoScriptText(SAY_AWAKE, m_creature);
+                            m_uiEventTimer = 5000;
+                            ++m_uiSubeventPhase;
+                            break;
+                        case 9:
+                            if (Creature* pNaralex = m_pInstance->GetSingleCreatureFromStorage(NPC_NARALEX))
+                            {
+                                DoScriptText(SAY_NARALEX_THANKYOU, pNaralex);
+                                pNaralex->SetStandState(UNIT_STAND_STATE_STAND);
+                            }
+                            m_uiEventTimer = 10000;
+                            ++m_uiSubeventPhase;
+                            break;
+                        case 10:
+                            // Shapeshift into a bird
+                            if (Creature* pNaralex = m_pInstance->GetSingleCreatureFromStorage(NPC_NARALEX))
+                            {
+                                DoScriptText(SAY_FAREWELL, pNaralex);
+                                pNaralex->CastSpell(pNaralex, SPELL_SHAPESHIFT, false);
+                            }
+                            DoCastSpellIfCan(m_creature, SPELL_SHAPESHIFT);
+                            m_uiEventTimer = 10000;
+                            ++m_uiSubeventPhase;
+                            break;
+                        case 11:
+                            SetEscortPaused(false);
+                            m_creature->SetLevitate(true);
+                            SetRun();
+                            // Send them flying somewhere outside of the room
+                            if (Creature* pNaralex = m_pInstance->GetSingleCreatureFromStorage(NPC_NARALEX))
+                            {
+                                // ToDo: Make Naralex fly
+                                // sort of a hack, compare to boss_onyxia
+#if defined (CLASSIC)  
+                                pNaralex->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND);
+#else
+                                    pNaralex->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+#endif
+
+                                // Set to flying
+                                pNaralex->SetLevitate(true);
+                                pNaralex->SetWalk(false);
+
+                                // Set following
+                                pNaralex->GetMotionMaster()->MoveFollow(m_creature, 5.0f, 0);
+                                // Despawn after some time
+                                pNaralex->ForcedDespawn(30000);
+                            }
+                            m_uiEventTimer = 0;
+                            break;
+                        }
+                        break;
+                    }
+                }
+                else
+                {
+                    m_uiEventTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiPotionTimer < uiDiff)
+            {
+                // if health lower than 80%, cast heal
+                if (m_creature->GetHealthPercent() < 80.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_POTION) == CAST_OK)
+                    {
+                        m_uiPotionTimer = 45000;
+                    }
+                }
+                else
+                {
+                    m_uiPotionTimer = 5000;
+                }
+            }
+            else
+            {
+                m_uiPotionTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiSleepTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SLEEP) == CAST_OK)
+                    {
+                        m_uiSleepTimer = 30000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiSleepTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        ScriptedInstance* m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+
+        // Buff the players
+        pCreature->CastSpell(pPlayer, SPELL_MARK, false);
+
+        if (m_pInstance && m_pInstance->GetData(TYPE_DISCIPLE) == SPECIAL)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_DISCIPLE, pCreature->GetObjectGuid());
+        }
+        else
+        {
+            pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        }
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        ScriptedInstance* m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+        if (!m_pInstance)
+        {
+            return false;
+        }
+
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            if (npc_disciple_of_naralexAI* pEscortAI = dynamic_cast<npc_disciple_of_naralexAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer);               // Note: after 4.0.3 set him run = true
+#if defined (CLASSIC)  
+                pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+#else
+            pCreature->SetFactionTemporary(FACTION_ESCORT_N_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+#endif
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_disciple_of_naralexAI(pCreature);
+    }
+};
+
+void AddSC_wailing_caverns()
+{
+    Script* s;
+    s = new npc_disciple_of_naralex();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_disciple_of_naralex";
+    //pNewScript->GetAI = &GetAI_npc_disciple_of_naralex;
+    //pNewScript->pGossipHello =  &GossipHello_npc_disciple_of_naralex;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_disciple_of_naralex;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/wailing_caverns/wailing_caverns.h b/src/modules/SD3/scripts/kalimdor/wailing_caverns/wailing_caverns.h
new file mode 100644
index 000000000..eccf85245
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/wailing_caverns/wailing_caverns.h
@@ -0,0 +1,51 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_WAILING_CAVERNS_H
+#define DEF_WAILING_CAVERNS_H
+
+enum
+{
+    MAX_ENCOUNTER   = 6,
+
+    TYPE_ANACONDRA  = 0,
+    TYPE_COBRAHN    = 1,
+    TYPE_PYTHAS     = 2,
+    TYPE_SERPENTIS  = 3,
+    TYPE_DISCIPLE   = 4,
+    TYPE_MUTANUS    = 5,
+
+    NPC_NARALEX     = 3679,
+    NPC_DISCIPLE    = 3678,
+
+    SAY_INTRO       = -1043000,                             // Say when the first 4 encounter are DONE
+
+    GO_MYSTERIOUS_CHEST     = 180055,                       // used for quest 7944; spawns in the instance only if one of the players has the quest
+
+    QUEST_FORTUNE_AWAITS    = 7944,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/kalimdor/winterspring.cpp b/src/modules/SD3/scripts/kalimdor/winterspring.cpp
new file mode 100644
index 000000000..0a794c827
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/winterspring.cpp
@@ -0,0 +1,552 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Winterspring
+ * SD%Complete: 90
+ * SDComment:   Quest support: 4901.
+ * SDCategory:  Winterspring
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * npc_ranshalla
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+# npc_ranshalla
+####*/
+
+enum
+{
+    // Escort texts
+    SAY_QUEST_START             = -1000739,
+    SAY_ENTER_OWL_THICKET       = -1000707,
+    SAY_REACH_TORCH_1           = -1000708,
+    SAY_REACH_TORCH_2           = -1000709,
+    SAY_REACH_TORCH_3           = -1000710,
+    SAY_AFTER_TORCH_1           = -1000711,
+    SAY_AFTER_TORCH_2           = -1000712,
+    SAY_REACH_ALTAR_1           = -1000713,
+    SAY_REACH_ALTAR_2           = -1000714,
+
+    // After lighting the altar cinematic
+    SAY_RANSHALLA_ALTAR_1       = -1000715,
+    SAY_RANSHALLA_ALTAR_2       = -1000716,
+    SAY_PRIESTESS_ALTAR_3       = -1000717,
+    SAY_PRIESTESS_ALTAR_4       = -1000718,
+    SAY_RANSHALLA_ALTAR_5       = -1000719,
+    SAY_RANSHALLA_ALTAR_6       = -1000720,
+    SAY_PRIESTESS_ALTAR_7       = -1000721,
+    SAY_PRIESTESS_ALTAR_8       = -1000722,
+    SAY_PRIESTESS_ALTAR_9       = -1000723,
+    SAY_PRIESTESS_ALTAR_10      = -1000724,
+    SAY_PRIESTESS_ALTAR_11      = -1000725,
+    SAY_PRIESTESS_ALTAR_12      = -1000726,
+    SAY_PRIESTESS_ALTAR_13      = -1000727,
+    SAY_PRIESTESS_ALTAR_14      = -1000728,
+    SAY_VOICE_ALTAR_15          = -1000729,
+    SAY_PRIESTESS_ALTAR_16      = -1000730,
+    SAY_PRIESTESS_ALTAR_17      = -1000731,
+    SAY_PRIESTESS_ALTAR_18      = -1000732,
+    SAY_PRIESTESS_ALTAR_19      = -1000733,
+    SAY_PRIESTESS_ALTAR_20      = -1000734,
+    SAY_PRIESTESS_ALTAR_21      = -1000735,
+    SAY_QUEST_END_1             = -1000736,
+    SAY_QUEST_END_2             = -1000737,
+
+    EMOTE_CHANT_SPELL           = -1000738,
+
+    SPELL_LIGHT_TORCH           = 18953,        // channeled spell by Ranshalla while waiting for the torches / altar
+
+    NPC_RANSHALLA               = 10300,
+    NPC_PRIESTESS_ELUNE         = 12116,
+    NPC_VOICE_ELUNE             = 12152,
+    NPC_GUARDIAN_ELUNE          = 12140,
+
+    NPC_PRIESTESS_DATA_1        = 1,            // dummy member for the first priestess (right)
+    NPC_PRIESTESS_DATA_2        = 2,            // dummy member for the second priestess (left)
+    DATA_MOVE_PRIESTESS         = 3,            // dummy member to check the priestess movement
+    DATA_EVENT_END              = 4,            // dummy member to indicate the event end
+
+    GO_ELUNE_ALTAR              = 177404,
+    GO_ELUNE_FIRE               = 177417,
+    GO_ELUNE_GEM                = 177414,       // is respawned in script
+    GO_ELUNE_LIGHT              = 177415,       // are respawned in script
+
+    QUEST_GUARDIANS_ALTAR       = 4901,
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {SAY_REACH_ALTAR_1,      NPC_RANSHALLA,        2000},
+    {SAY_REACH_ALTAR_2,      NPC_RANSHALLA,        3000},
+    {NPC_RANSHALLA,          0,                    0},      // start the altar channeling
+    {SAY_PRIESTESS_ALTAR_3,  NPC_PRIESTESS_DATA_2, 1000},
+    {SAY_PRIESTESS_ALTAR_4,  NPC_PRIESTESS_DATA_1, 4000},
+    {SAY_RANSHALLA_ALTAR_5,  NPC_RANSHALLA,        4000},
+    {SAY_RANSHALLA_ALTAR_6,  NPC_RANSHALLA,        4000},   // start the escort here
+    {SAY_PRIESTESS_ALTAR_7,  NPC_PRIESTESS_DATA_2, 4000},
+    {SAY_PRIESTESS_ALTAR_8,  NPC_PRIESTESS_DATA_2, 5000},   // show the gem
+    {GO_ELUNE_GEM,           0,                    5000},
+    {SAY_PRIESTESS_ALTAR_9,  NPC_PRIESTESS_DATA_1, 4000},   // move priestess 1 near m_creature
+    {NPC_PRIESTESS_DATA_1,   0,                    3000},
+    {SAY_PRIESTESS_ALTAR_10, NPC_PRIESTESS_DATA_1, 5000},
+    {SAY_PRIESTESS_ALTAR_11, NPC_PRIESTESS_DATA_1, 4000},
+    {SAY_PRIESTESS_ALTAR_12, NPC_PRIESTESS_DATA_1, 5000},
+    {SAY_PRIESTESS_ALTAR_13, NPC_PRIESTESS_DATA_1, 8000},   // summon voice and guard of elune
+    {NPC_VOICE_ELUNE,        0,                    12000},
+    {SAY_VOICE_ALTAR_15,     NPC_VOICE_ELUNE,      5000},   // move priestess 2 near m_creature
+    {NPC_PRIESTESS_DATA_2,   0,                    3000},
+    {SAY_PRIESTESS_ALTAR_16, NPC_PRIESTESS_DATA_2, 4000},
+    {SAY_PRIESTESS_ALTAR_17, NPC_PRIESTESS_DATA_2, 6000},
+    {SAY_PRIESTESS_ALTAR_18, NPC_PRIESTESS_DATA_1, 5000},
+    {SAY_PRIESTESS_ALTAR_19, NPC_PRIESTESS_DATA_1, 3000},   // move the owlbeast
+    {NPC_GUARDIAN_ELUNE,     0,                    2000},
+    {SAY_PRIESTESS_ALTAR_20, NPC_PRIESTESS_DATA_1, 4000},   // move the first priestess up
+    {SAY_PRIESTESS_ALTAR_21, NPC_PRIESTESS_DATA_2, 10000},  // move second priestess up
+    {DATA_MOVE_PRIESTESS,    0,                    6000},   // despawn the gem
+    {DATA_EVENT_END,         0,                    2000},   // turn towards the player
+    {SAY_QUEST_END_2,        NPC_RANSHALLA,        0},
+    {0, 0, 0},
+};
+
+struct EventLocations
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+static EventLocations aWingThicketLocations[] =
+{
+    {5515.98f, -4903.43f, 846.30f, 4.58f},      // 0 right priestess summon loc
+    {5501.94f, -4920.20f, 848.69f, 6.15f},      // 1 left priestess summon loc
+    {5497.35f, -4906.49f, 850.83f, 2.76f},      // 2 guard of elune summon loc
+    {5518.38f, -4913.47f, 845.57f, 0.0f},       // 3 right priestess move loc
+    {5510.36f, -4921.17f, 846.33f, 0.0f},       // 4 left priestess move loc
+    {5511.31f, -4913.82f, 847.17f, 0.0f},       // 5 guard of elune move loc
+    {5518.51f, -4917.56f, 845.23f, 0.0f},       // 6 right priestess second move loc
+    {5514.40f, -4921.16f, 845.49f, 0.0f}        // 7 left priestess second move loc
+};
+
+struct npc_ranshalla : public CreatureScript
+{
+    npc_ranshalla() : CreatureScript("npc_ranshalla") {}
+
+    struct npc_ranshallaAI : public npc_escortAI, private DialogueHelper
+    {
+        npc_ranshallaAI(Creature* pCreature) : npc_escortAI(pCreature),
+        DialogueHelper(aIntroDialogue)
+        {
+        }
+
+        uint32 m_uiDelayTimer;
+
+        ObjectGuid m_firstPriestessGuid;
+        ObjectGuid m_secondPriestessGuid;
+        ObjectGuid m_guardEluneGuid;
+        ObjectGuid m_voiceEluneGuid;
+        ObjectGuid m_altarGuid;
+
+        void Reset() override
+        {
+            m_uiDelayTimer = 0;
+        }
+
+        // Called when the player activates the torch / altar
+        void DoContinueEscort(bool bIsAltarWaypoint = false)
+        {
+            if (bIsAltarWaypoint)
+            {
+                DoScriptText(SAY_RANSHALLA_ALTAR_1, m_creature);
+            }
+            else
+            {
+                switch (urand(0, 1))
+                {
+                case 0:
+                    DoScriptText(SAY_AFTER_TORCH_1, m_creature);
+                    break;
+                case 1:
+                    DoScriptText(SAY_AFTER_TORCH_2, m_creature);
+                    break;
+                }
+            }
+
+            m_uiDelayTimer = 2000;
+        }
+
+        // Called when Ranshalla starts to channel on a torch / altar
+        void DoChannelTorchSpell(bool bIsAltarWaypoint = false)
+        {
+            // Check if we are using the fire or the altar and remove the no_interact flag
+            if (bIsAltarWaypoint)
+            {
+                if (GameObject* pGo = GetClosestGameObjectWithEntry(m_creature, GO_ELUNE_ALTAR, 10.0f))
+                {
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                    m_creature->SetFacingToObject(pGo);
+                    m_altarGuid = pGo->GetObjectGuid();
+                }
+            }
+            else
+            {
+                if (GameObject* pGo = GetClosestGameObjectWithEntry(m_creature, GO_ELUNE_FIRE, 10.0f))
+                {
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                }
+            }
+
+            // Yell and set escort to pause
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(SAY_REACH_TORCH_1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_REACH_TORCH_2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_REACH_TORCH_3, m_creature);
+                break;
+            }
+
+            DoScriptText(EMOTE_CHANT_SPELL, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_LIGHT_TORCH);
+            SetEscortPaused(true);
+        }
+
+        void DoSummonPriestess()
+        {
+            // Summon 2 Elune priestess and make each of them move to a different spot
+            if (Creature* pPriestess = m_creature->SummonCreature(NPC_PRIESTESS_ELUNE, aWingThicketLocations[0].m_fX, aWingThicketLocations[0].m_fY, aWingThicketLocations[0].m_fZ, aWingThicketLocations[0].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 0))
+            {
+                pPriestess->GetMotionMaster()->MovePoint(0, aWingThicketLocations[3].m_fX, aWingThicketLocations[3].m_fY, aWingThicketLocations[3].m_fZ);
+                m_firstPriestessGuid = pPriestess->GetObjectGuid();
+            }
+            if (Creature* pPriestess = m_creature->SummonCreature(NPC_PRIESTESS_ELUNE, aWingThicketLocations[1].m_fX, aWingThicketLocations[1].m_fY, aWingThicketLocations[1].m_fZ, aWingThicketLocations[1].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 0))
+            {
+                // Left priestess should have a distinct move point because she is the one who starts the dialogue at point reach
+                pPriestess->GetMotionMaster()->MovePoint(1, aWingThicketLocations[4].m_fX, aWingThicketLocations[4].m_fY, aWingThicketLocations[4].m_fZ);
+                m_secondPriestessGuid = pPriestess->GetObjectGuid();
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || pSummoned->GetEntry() != NPC_PRIESTESS_ELUNE || uiPointId != 1)
+            {
+                return;
+            }
+
+            // Start the dialogue when the priestess reach the altar (they should both reach the point in the same time)
+            StartNextDialogueText(SAY_PRIESTESS_ALTAR_3);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 3:
+                DoScriptText(SAY_ENTER_OWL_THICKET, m_creature);
+                break;
+            case 10: // Cavern 1
+            case 15: // Cavern 2
+            case 20: // Cavern 3
+            case 25: // Cavern 4
+            case 36: // Cavern 5
+                DoChannelTorchSpell();
+                break;
+            case 39:
+                StartNextDialogueText(SAY_REACH_ALTAR_1);
+                SetEscortPaused(true);
+                break;
+            case 41:
+            {
+                       // Search for all nearest lights and respawn them
+                       std::list<GameObject*> m_lEluneLights;
+                       GetGameObjectListWithEntryInGrid(m_lEluneLights, m_creature, GO_ELUNE_LIGHT, 20.0f);
+                       for (std::list<GameObject*>::const_iterator itr = m_lEluneLights.begin(); itr != m_lEluneLights.end(); ++itr)
+                       {
+                           if ((*itr)->isSpawned())
+                           {
+                               continue;
+                           }
+
+                           (*itr)->SetRespawnTime(115);
+                           (*itr)->Refresh();
+                       }
+
+                       if (GameObject* pAltar = m_creature->GetMap()->GetGameObject(m_altarGuid))
+                       {
+                           m_creature->SetFacingToObject(pAltar);
+                       }
+                       break;
+            }
+            case 42:
+                // Summon the 2 priestess
+                SetEscortPaused(true);
+                DoSummonPriestess();
+                DoScriptText(SAY_RANSHALLA_ALTAR_2, m_creature);
+                break;
+            case 44:
+                // Stop the escort and turn towards the altar
+                SetEscortPaused(true);
+                if (GameObject* pAltar = m_creature->GetMap()->GetGameObject(m_altarGuid))
+                {
+                    m_creature->SetFacingToObject(pAltar);
+                }
+                break;
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case NPC_RANSHALLA:
+                // Start the altar channeling
+                DoChannelTorchSpell(true);
+                break;
+            case SAY_RANSHALLA_ALTAR_6:
+                SetEscortPaused(false);
+                break;
+            case SAY_PRIESTESS_ALTAR_8:
+                // make the gem respawn
+                if (GameObject* pGem = GetClosestGameObjectWithEntry(m_creature, GO_ELUNE_GEM, 10.0f))
+                {
+                    if (pGem->isSpawned())
+                    {
+                        break;
+                    }
+
+                    pGem->SetRespawnTime(90);
+                    pGem->Refresh();
+                }
+                break;
+            case SAY_PRIESTESS_ALTAR_9:
+                // move near the escort npc
+                if (Creature* pPriestess = m_creature->GetMap()->GetCreature(m_firstPriestessGuid))
+                {
+                    pPriestess->GetMotionMaster()->MovePoint(0, aWingThicketLocations[6].m_fX, aWingThicketLocations[6].m_fY, aWingThicketLocations[6].m_fZ);
+                }
+                break;
+            case SAY_PRIESTESS_ALTAR_13:
+                // summon the Guardian of Elune
+                if (Creature* pGuard = m_creature->SummonCreature(NPC_GUARDIAN_ELUNE, aWingThicketLocations[2].m_fX, aWingThicketLocations[2].m_fY, aWingThicketLocations[2].m_fZ, aWingThicketLocations[2].m_fO, TEMPSUMMON_CORPSE_DESPAWN, 0))
+                {
+                    pGuard->GetMotionMaster()->MovePoint(0, aWingThicketLocations[5].m_fX, aWingThicketLocations[5].m_fY, aWingThicketLocations[5].m_fZ);
+                    m_guardEluneGuid = pGuard->GetObjectGuid();
+                }
+                // summon the Voice of Elune
+                if (GameObject* pAltar = m_creature->GetMap()->GetGameObject(m_altarGuid))
+                {
+                    if (Creature* pVoice = m_creature->SummonCreature(NPC_VOICE_ELUNE, pAltar->GetPositionX(), pAltar->GetPositionY(), pAltar->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000))
+                    {
+                        m_voiceEluneGuid = pVoice->GetObjectGuid();
+                    }
+                }
+                break;
+            case SAY_VOICE_ALTAR_15:
+                // move near the escort npc and continue dialogue
+                if (Creature* pPriestess = m_creature->GetMap()->GetCreature(m_secondPriestessGuid))
+                {
+                    DoScriptText(SAY_PRIESTESS_ALTAR_14, pPriestess);
+                    pPriestess->GetMotionMaster()->MovePoint(0, aWingThicketLocations[7].m_fX, aWingThicketLocations[7].m_fY, aWingThicketLocations[7].m_fZ);
+                }
+                break;
+            case SAY_PRIESTESS_ALTAR_19:
+                // make the voice of elune leave
+                if (Creature* pGuard = m_creature->GetMap()->GetCreature(m_guardEluneGuid))
+                {
+                    pGuard->GetMotionMaster()->MovePoint(0, aWingThicketLocations[2].m_fX, aWingThicketLocations[2].m_fY, aWingThicketLocations[2].m_fZ);
+                    pGuard->ForcedDespawn(4000);
+                }
+                break;
+            case SAY_PRIESTESS_ALTAR_20:
+                // make the first priestess leave
+                if (Creature* pPriestess = m_creature->GetMap()->GetCreature(m_firstPriestessGuid))
+                {
+                    pPriestess->GetMotionMaster()->MovePoint(0, aWingThicketLocations[0].m_fX, aWingThicketLocations[0].m_fY, aWingThicketLocations[0].m_fZ);
+                    pPriestess->ForcedDespawn(4000);
+                }
+                break;
+            case SAY_PRIESTESS_ALTAR_21:
+                // make the second priestess leave
+                if (Creature* pPriestess = m_creature->GetMap()->GetCreature(m_secondPriestessGuid))
+                {
+                    pPriestess->GetMotionMaster()->MovePoint(0, aWingThicketLocations[1].m_fX, aWingThicketLocations[1].m_fY, aWingThicketLocations[1].m_fZ);
+                    pPriestess->ForcedDespawn(4000);
+                }
+                break;
+            case DATA_EVENT_END:
+                // Turn towards the player
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    m_creature->SetFacingToObject(pPlayer);
+                    DoScriptText(SAY_QUEST_END_1, m_creature, pPlayer);
+                }
+                break;
+            case SAY_QUEST_END_2:
+                // Turn towards the altar and kneel - quest complete
+                if (GameObject* pAltar = m_creature->GetMap()->GetGameObject(m_altarGuid))
+                {
+                    m_creature->SetFacingToObject(pAltar);
+                }
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_GUARDIANS_ALTAR, m_creature);
+                }
+                break;
+            }
+        }
+
+        Creature* GetSpeakerByEntry(uint32 uiEntry) override
+        {
+            switch (uiEntry)
+            {
+            case NPC_RANSHALLA:
+                return m_creature;
+            case NPC_VOICE_ELUNE:
+                return m_creature->GetMap()->GetCreature(m_voiceEluneGuid);
+            case NPC_PRIESTESS_DATA_1:
+                return m_creature->GetMap()->GetCreature(m_firstPriestessGuid);
+            case NPC_PRIESTESS_DATA_2:
+                return m_creature->GetMap()->GetCreature(m_secondPriestessGuid);
+
+            default:
+                return NULL;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* /*pInvoker*/, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+                DoContinueEscort(bool(uiMiscValue));
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (m_uiDelayTimer)
+            {
+                if (m_uiDelayTimer <= uiDiff)
+                {
+                    m_creature->InterruptNonMeleeSpells(false);
+                    SetEscortPaused(false);
+                    m_uiDelayTimer = 0;
+                }
+                else
+                {
+                    m_uiDelayTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ranshallaAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_GUARDIANS_ALTAR)
+        {
+            DoScriptText(SAY_QUEST_START, pCreature);
+            pCreature->SetFactionTemporary(FACTION_ESCORT_A_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+
+            if (npc_ranshallaAI* pEscortAI = dynamic_cast<npc_ranshallaAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest, true);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+};
+
+struct go_elune_fire : public GameObjectScript
+{
+    go_elune_fire() : GameObjectScript("go_elune_fire") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        // Check if we are using the torches or the altar
+        bool bIsAltar = false;
+
+        if (pGo->GetEntry() == GO_ELUNE_ALTAR)
+        {
+            bIsAltar = true;
+        }
+
+        if (Creature* pRanshalla = GetClosestCreatureWithEntry(pGo, NPC_RANSHALLA, 10.0f))
+        {
+            if (CreatureAI* pEscortAI = pRanshalla->AI())
+            {
+                pEscortAI->SendAIEvent(AI_EVENT_CUSTOM_A, NULL, pRanshalla, uint32(bIsAltar)); //->DoContinueEscort(bIsAltar);
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_winterspring()
+{
+    Script* s;
+    s = new npc_ranshalla();
+    s->RegisterSelf();
+    s = new go_elune_fire();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ranshalla";
+    //pNewScript->GetAI = &GetAI_npc_ranshalla;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_ranshalla;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_elune_fire";
+    //pNewScript->pGOUse = &GOUse_go_elune_fire;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/zulfarrak/boss_zumrah.cpp b/src/modules/SD3/scripts/kalimdor/zulfarrak/boss_zumrah.cpp
new file mode 100644
index 000000000..aaa25dd2b
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/zulfarrak/boss_zumrah.cpp
@@ -0,0 +1,244 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      boss_zumrah
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Zul'Farrak
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "zulfarrak.h"
+
+enum
+{
+    SAY_INTRO                   = -1209000,
+    SAY_AGGRO                   = -1209001,
+    SAY_KILL                    = -1209002,
+    SAY_SUMMON                  = -1209003,
+
+    SPELL_SHADOW_BOLT           = 12739,
+    SPELL_SHADOW_BOLT_VOLLEY    = 15245,
+    SPELL_WARD_OF_ZUMRAH        = 11086,
+    SPELL_HEALING_WAVE          = 12491,
+    SPELL_SUMMON_ZOMBIES        = 10247,            // spell should be triggered by missing trap 128972
+
+    // NPC_WARD_OF_ZUMRAH       = 7785,
+    // NPC_SKELETON_OF_ZUMRAH   = 7786,
+    NPC_ZULFARRAK_ZOMBIE        = 7286,             // spawned by the graves
+    NPC_ZULFARRAK_DEAD_HERO     = 7276,             // spawned by the graves
+
+    FACTION_HOSTILE             = 14,
+};
+
+struct boss_zumrah : public CreatureScript
+{
+    boss_zumrah() : CreatureScript("boss_zumrah") {}
+
+    struct boss_zumrahAI : public ScriptedAI
+    {
+        boss_zumrahAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bHasTurnedHostile = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiShadowBoltTimer;
+        uint32 m_uiShadowBoltVolleyTimer;
+        uint32 m_uiWardOfZumrahTimer;
+        uint32 m_uHealingWaveTimer;
+        uint32 m_uiSpawnZombieTimer;
+
+        bool m_bHasTurnedHostile;
+
+        void Reset() override
+        {
+            m_uiShadowBoltTimer = 1000;
+            m_uiShadowBoltVolleyTimer = urand(6000, 30000);
+            m_uiWardOfZumrahTimer = urand(7000, 20000);
+            m_uHealingWaveTimer = urand(10000, 15000);
+            m_uiSpawnZombieTimer = 1000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_KILL, m_creature);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                DoStartMovement(pWho, 10.0f);
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasTurnedHostile && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 9.0f) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                m_creature->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_NONE);
+                DoScriptText(SAY_INTRO, m_creature);
+                m_bHasTurnedHostile = true;
+                AttackStart(pWho);
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_ZULFARRAK_ZOMBIE || pSummoned->GetEntry() == NPC_ZULFARRAK_DEAD_HERO)
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiSpawnZombieTimer)
+            {
+                if (m_uiSpawnZombieTimer <= uiDiff)
+                {
+                    // Use a nearby grave to spawn zombies
+                    m_pInstance->SetData64(TYPE_SIGNAL, m_creature->GetObjectGuid().GetRawValue());
+                    if (GameObject* pGrave = m_pInstance->instance->GetGameObject(ObjectGuid(m_pInstance->GetData64(TYPE_SIGNAL))))
+                    {
+                        m_creature->CastSpell(pGrave->GetPositionX(), pGrave->GetPositionY(), pGrave->GetPositionZ(), SPELL_SUMMON_ZOMBIES, true, NULL, NULL, pGrave->GetObjectGuid());
+                        pGrave->SetLootState(GO_JUST_DEACTIVATED);
+
+                        if (roll_chance_i(30))
+                        {
+                            DoScriptText(SAY_SUMMON, m_creature);
+                        }
+
+                        m_uiSpawnZombieTimer = 20000;
+                    }
+                    else                                        // No Grave usable any more
+                    {
+                        m_uiSpawnZombieTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiSpawnZombieTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiShadowBoltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_BOLT) == CAST_OK)
+                    {
+                        m_uiShadowBoltTimer = urand(3500, 5000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiShadowBoltTimer -= uiDiff;
+            }
+
+            if (m_uiShadowBoltVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_BOLT_VOLLEY) == CAST_OK)
+                {
+                    m_uiShadowBoltVolleyTimer = urand(10000, 18000);
+                }
+            }
+            else
+            {
+                m_uiShadowBoltVolleyTimer -= uiDiff;
+            }
+
+            if (m_uiWardOfZumrahTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WARD_OF_ZUMRAH) == CAST_OK)
+                {
+                    m_uiWardOfZumrahTimer = urand(15000, 32000);
+                }
+            }
+            else
+            {
+                m_uiWardOfZumrahTimer -= uiDiff;
+            }
+
+            if (m_uHealingWaveTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(40.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_HEALING_WAVE) == CAST_OK)
+                    {
+                        m_uHealingWaveTimer = urand(15000, 23000);
+                    }
+                }
+            }
+            else
+            {
+                m_uHealingWaveTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_zumrahAI(pCreature);
+    }
+};
+
+void AddSC_boss_zumrah()
+{
+    Script* s;
+
+    s = new boss_zumrah();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_zumrah";
+    //pNewScript->GetAI = &GetAI_boss_zumrah;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/zulfarrak/instance_zulfarrak.cpp b/src/modules/SD3/scripts/kalimdor/zulfarrak/instance_zulfarrak.cpp
new file mode 100644
index 000000000..2e37411eb
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/zulfarrak/instance_zulfarrak.cpp
@@ -0,0 +1,411 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      instance_zulfarrak
+ * SD%Complete: 80
+ * SDComment:   None
+ * SDCategory:  Zul'Farrak
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "zulfarrak.h"
+
+struct is_zulfarrak : public InstanceScript
+{
+    is_zulfarrak() : InstanceScript("instance_zulfarrak") {}
+
+    class instance_zulfarrak : public ScriptedInstance
+    {
+    public:
+        instance_zulfarrak(Map* pMap) : ScriptedInstance(pMap),
+            m_uiGraveyardSearcherGuid(0),
+            m_uiPyramidEventTimer(0)
+        {
+            Initialize();
+        }
+
+        ~instance_zulfarrak() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_VELRATHA:
+                SetData(TYPE_VELRATHA, IN_PROGRESS);
+                break;
+            case NPC_GAHZRILLA:
+                SetData(TYPE_GAHZRILLA, IN_PROGRESS);
+                break;
+            case NPC_ANTUSUL:
+                SetData(TYPE_ANTUSUL, IN_PROGRESS);
+                break;
+            case NPC_THEKA:
+                SetData(TYPE_THEKA, IN_PROGRESS);
+                break;
+            case NPC_ZUMRAH:
+                SetData(TYPE_ZUMRAH, IN_PROGRESS);
+                break;
+            case NPC_NEKRUM:
+                SetData(TYPE_NEKRUM, IN_PROGRESS);
+                break;
+            case NPC_SEZZZIZ:
+                SetData(TYPE_SEZZZIZ, IN_PROGRESS);
+                break;
+            case NPC_CHIEF_SANDSCALP:
+                SetData(TYPE_CHIEF_SANDSCALP, IN_PROGRESS);
+                break;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_VELRATHA:
+                SetData(TYPE_VELRATHA, FAIL);
+                break;
+            case NPC_GAHZRILLA:
+                SetData(TYPE_GAHZRILLA, FAIL);
+                break;
+            case NPC_ANTUSUL:
+                SetData(TYPE_ANTUSUL, FAIL);
+                break;
+            case NPC_THEKA:
+                SetData(TYPE_THEKA, FAIL);
+                break;
+            case NPC_ZUMRAH:
+                SetData(TYPE_ZUMRAH, FAIL);
+                break;
+            case NPC_NEKRUM:
+                SetData(TYPE_NEKRUM, FAIL);
+                break;
+            case NPC_SEZZZIZ:
+                SetData(TYPE_SEZZZIZ, FAIL);
+                break;
+            case NPC_CHIEF_SANDSCALP:
+                SetData(TYPE_CHIEF_SANDSCALP, FAIL);
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_VELRATHA:
+                SetData(TYPE_VELRATHA, DONE);
+                break;
+            case NPC_GAHZRILLA:
+                SetData(TYPE_GAHZRILLA, DONE);
+                break;
+            case NPC_ANTUSUL:
+                SetData(TYPE_ANTUSUL, DONE);
+                break;
+            case NPC_THEKA:
+                SetData(TYPE_THEKA, DONE);
+                break;
+            case NPC_ZUMRAH:
+                SetData(TYPE_ZUMRAH, DONE);
+                break;
+            case NPC_NEKRUM:
+                SetData(TYPE_NEKRUM, DONE);
+                break;
+            case NPC_SEZZZIZ:
+                SetData(TYPE_SEZZZIZ, DONE);
+                break;
+            case NPC_CHIEF_SANDSCALP:
+                SetData(TYPE_CHIEF_SANDSCALP, DONE);
+                break;
+            }
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_ANTUSUL:
+            case NPC_SERGEANT_BLY:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_SANDFURY_SLAVE:
+            case NPC_SANDFURY_DRUDGE:
+            case NPC_SANDFURY_CRETIN:
+            case NPC_SANDFURY_ACOLYTE:
+            case NPC_SANDFURY_ZEALOT:
+                m_lPyramidTrollsGuidList.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            if (pGo->GetEntry() == GO_SHALLOW_GRAVE)
+            {
+                m_lShallowGravesGuidList.push_back(pGo->GetObjectGuid());
+            }
+            else if (pGo->GetEntry() == GO_END_DOOR)
+            {
+                if (GetData(TYPE_PYRAMID_EVENT) == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_VELRATHA:
+            case TYPE_GAHZRILLA:
+            case TYPE_ANTUSUL:
+            case TYPE_THEKA:
+            case TYPE_ZUMRAH:
+            case TYPE_CHIEF_SANDSCALP:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_NEKRUM:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE && GetData(TYPE_SEZZZIZ) == DONE)
+                {
+                    SetData(TYPE_PYRAMID_EVENT, DONE);
+                }
+                break;
+            case TYPE_SEZZZIZ:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE && GetData(TYPE_NEKRUM) == DONE)
+                {
+                    SetData(TYPE_PYRAMID_EVENT, DONE);
+                }
+                break;
+            case TYPE_PYRAMID_EVENT:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                {
+                    m_uiPyramidEventTimer = 20000;
+                }
+                else if (uiData == DONE)
+                {
+                    m_uiPyramidEventTimer = 0;
+                }
+                break;
+            default:
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]
+                    << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " " << m_auiEncounter[6] << " " << m_auiEncounter[7]
+                    << " " << m_auiEncounter[8];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        void SetData64(uint32 type, uint64 data)
+        {
+            switch (type)
+            {
+            case TYPE_SIGNAL:
+                m_uiGraveyardSearcherGuid = data;
+                break;
+            default:
+                break;
+            }
+        }
+
+        uint64 GetData64(uint32 type) const override
+        {
+            switch (type)
+            {
+            case TYPE_SIGNAL:
+                return (const_cast<instance_zulfarrak*>(this))->SelectNearbyShallowGrave();
+            default:
+                break;
+            }
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7]
+                >> m_auiEncounter[8];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_uiPyramidEventTimer)
+            {
+                if (m_uiPyramidEventTimer <= uiDiff)
+                {
+                    if (m_lPyramidTrollsGuidList.empty())
+                    {
+                        m_uiPyramidEventTimer = urand(3000, 10000);
+                        return;
+                    }
+
+                    GuidList::iterator iter = m_lPyramidTrollsGuidList.begin();
+                    advance(iter, urand(0, m_lPyramidTrollsGuidList.size() - 1));
+
+                    // Remove the selected troll
+                    ObjectGuid selectedGuid = *iter;
+                    m_lPyramidTrollsGuidList.erase(iter);
+
+                    // Move the selected troll to the top of the pyramid. Note: the algorythm may be more complicated than this, but for the moment this will do.
+                    if (Creature* pTroll = instance->GetCreature(selectedGuid))
+                    {
+                        // Pick another one if already in combat or already killed
+                        if (pTroll->getVictim() || !pTroll->IsAlive())
+                        {
+                            m_uiPyramidEventTimer = urand(0, 2) ? urand(3000, 10000) : 1000;
+                            return;
+                        }
+
+                        float fX, fY, fZ;
+                        if (Creature* pBly = GetSingleCreatureFromStorage(NPC_SERGEANT_BLY))
+                        {
+                            // ToDo: research if there is anything special if these guys die
+                            if (!pBly->IsAlive())
+                            {
+                                m_uiPyramidEventTimer = 0;
+                                return;
+                            }
+
+                            pBly->GetRandomPoint(pBly->GetPositionX(), pBly->GetPositionY(), pBly->GetPositionZ(), 4.0f, fX, fY, fZ);
+                            pTroll->SetWalk(false);
+                            pTroll->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                        }
+                    }
+                    m_uiPyramidEventTimer = urand(0, 2) ? urand(3000, 10000) : 1000;
+                }
+                else
+                {
+                    m_uiPyramidEventTimer -= uiDiff;
+                }
+            }
+        }
+
+    private:
+        uint64 SelectNearbyShallowGrave()
+        {
+            Unit *searcher = instance->GetUnit(ObjectGuid(m_uiGraveyardSearcherGuid));
+            // Get the list of usable graves (not used already by players)
+            std::list<GameObject*> lGravesInRange;
+
+            for (GuidList::const_iterator itr = m_lShallowGravesGuidList.begin(); itr != m_lShallowGravesGuidList.end(); ++itr)
+            {
+                GameObject* pGo = searcher->GetMap()->GetGameObject(*itr);
+                // Go spawned and no looting in process
+                if (pGo && pGo->isSpawned() && pGo->getLootState() == GO_READY)
+                {
+                    lGravesInRange.push_back(pGo);
+                }
+            }
+
+            if (lGravesInRange.empty())
+            {
+                return 0;
+            }
+
+            // Sort the graves
+            lGravesInRange.sort(ObjectDistanceOrder(searcher));
+
+            return (*lGravesInRange.begin())->GetObjectGuid().GetRawValue();
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        GuidList m_lShallowGravesGuidList;
+        GuidList m_lPyramidTrollsGuidList;
+
+        uint64 m_uiGraveyardSearcherGuid;
+        uint32 m_uiPyramidEventTimer;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_zulfarrak(pMap);
+    }
+};
+
+void AddSC_instance_zulfarrak()
+{
+    Script* s;
+    s = new is_zulfarrak();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_zulfarrak";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_zulfarrak;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/zulfarrak/zulfarrak.cpp b/src/modules/SD3/scripts/kalimdor/zulfarrak/zulfarrak.cpp
new file mode 100644
index 000000000..0474533fe
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/zulfarrak/zulfarrak.cpp
@@ -0,0 +1,170 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Zulfarrak
+ * SD%Complete: 100
+ * SDComment:   None
+ * SDCategory:  Zul'Farrak
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * event_go_zulfarrak_gong
+ * event_spell_unlocking
+ * at_zulfarrak
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "zulfarrak.h"
+
+//TODO transfer event scripts into instance script which also accepts events
+/*######
+## event_go_zulfarrak_gong
+######*/
+
+struct event_go_zulfarrak_gong : public MapEventScript
+{
+    event_go_zulfarrak_gong() : MapEventScript("event_go_zulfarrak_gong") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* /*pTarget*/, bool bIsStart) override
+    {
+        if (bIsStart && pSource->GetTypeId() == TYPEID_PLAYER)
+        {
+            if (InstanceData* pInstance = ((Player*)pSource)->GetInstanceData())
+            {
+                if (pInstance->GetData(TYPE_GAHZRILLA) == NOT_STARTED || pInstance->GetData(TYPE_GAHZRILLA) == FAIL)
+                {
+                    pInstance->SetData(TYPE_GAHZRILLA, IN_PROGRESS);
+                    return false;                               // Summon Gahz'rilla by Database Script
+                }
+                else
+                {
+                    return true;    // Prevent DB script summoning Gahz'rilla
+                }
+            }
+        }
+        return false;
+    }
+};
+
+/*######
+## event_spell_unlocking
+######*/
+
+struct event_spell_unlocking : public MapEventScript
+{
+    event_spell_unlocking() : MapEventScript("event_spell_unlocking") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* /*pTarget*/, bool bIsStart) override
+    {
+        if (bIsStart && pSource->GetTypeId() == TYPEID_PLAYER)
+        {
+            if (InstanceData* pInstance = ((Player*)pSource)->GetInstanceData())
+            {
+                if (pInstance->GetData(TYPE_PYRAMID_EVENT) == NOT_STARTED)
+                {
+                    pInstance->SetData(TYPE_PYRAMID_EVENT, IN_PROGRESS);
+                    return false;                               // Summon pyramid trolls by Database Script
+                }
+                else
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+};
+
+/*######
+## at_zulfarrak
+######*/
+
+struct at_zulfarrak : public AreaTriggerScript
+{
+    at_zulfarrak() : AreaTriggerScript("at_zulfarrak") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (pAt->id == AREATRIGGER_ANTUSUL)
+        {
+            if (pPlayer->isGameMaster() || pPlayer->IsDead())
+            {
+                return false;
+            }
+
+            ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData();
+
+            if (!pInstance)
+            {
+                return false;
+            }
+
+            if (pInstance->GetData(TYPE_ANTUSUL) == NOT_STARTED || pInstance->GetData(TYPE_ANTUSUL) == FAIL)
+            {
+                if (Creature* pAntuSul = pInstance->GetSingleCreatureFromStorage(NPC_ANTUSUL))
+                {
+                    if (pAntuSul->IsAlive())
+                    {
+                        pAntuSul->AI()->AttackStart(pPlayer);
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_zulfarrak()
+{
+    Script* s;
+    s = new event_go_zulfarrak_gong();
+    s->RegisterSelf();
+    s = new event_spell_unlocking();
+    s->RegisterSelf();
+    s = new at_zulfarrak();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_go_zulfarrak_gong";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_go_zulfarrak_gong;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_spell_unlocking";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_spell_unlocking;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_zulfarrak";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_zulfarrak;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/kalimdor/zulfarrak/zulfarrak.h b/src/modules/SD3/scripts/kalimdor/zulfarrak/zulfarrak.h
new file mode 100644
index 000000000..d7c09e37c
--- /dev/null
+++ b/src/modules/SD3/scripts/kalimdor/zulfarrak/zulfarrak.h
@@ -0,0 +1,70 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_ZULFARRAK_H
+#define DEF_ZULFARRAK_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 9,
+    TYPE_SIGNAL                     = MAX_ENCOUNTER + 1,
+
+    TYPE_VELRATHA                   = 0,
+    TYPE_GAHZRILLA                  = 1,
+    TYPE_ANTUSUL                    = 2,
+    TYPE_THEKA                      = 3,
+    TYPE_ZUMRAH                     = 4,
+    TYPE_NEKRUM                     = 5,
+    TYPE_SEZZZIZ                    = 6,
+    TYPE_CHIEF_SANDSCALP            = 7,
+    TYPE_PYRAMID_EVENT              = 8,
+
+    NPC_VELRATHA                    = 7795,
+    NPC_GAHZRILLA                   = 7273,
+    NPC_ANTUSUL                     = 8127,
+    NPC_THEKA                       = 7272,
+    NPC_ZUMRAH                      = 7271,
+    NPC_NEKRUM                      = 7796,
+    NPC_SEZZZIZ                     = 7275,
+    NPC_CHIEF_SANDSCALP             = 7267,
+
+    NPC_SERGEANT_BLY                = 7604,
+    NPC_SANDFURY_SLAVE              = 7787,
+    NPC_SANDFURY_DRUDGE             = 7788,
+    NPC_SANDFURY_CRETIN             = 7789,
+    NPC_SANDFURY_ACOLYTE            = 8876,
+    NPC_SANDFURY_ZEALOT             = 8877,
+
+    GO_SHALLOW_GRAVE                = 128403,
+    GO_END_DOOR                     = 146084,
+
+    // EVENT_ID_GONG_ZULFARRAK      = 2488,                 // go 141832
+    // EVENT_ID_UNLOCKING           = 2609,                 // spell 10738
+
+    AREATRIGGER_ANTUSUL             = 1447,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/ahnkahet.h b/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/ahnkahet.h
new file mode 100644
index 000000000..dd22a40c8
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/ahnkahet.h
@@ -0,0 +1,69 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_AHNKAHET_H
+#define DEF_AHNKAHET_H
+/* Encounters
+ * Elder Nadox         = 1
+ * Prince Taldram      = 2
+ * Jedoga Shadowseeker = 3
+ * Herald Volazj       = 4
+ * Amanitar            = 5
+*/
+enum
+{
+    MAX_ENCOUNTER               = 5,
+    MAX_INITIATES               = 15,
+
+    TYPE_NADOX                  = 0,
+    TYPE_TALDARAM               = 1,
+    TYPE_JEDOGA                 = 2,
+    TYPE_VOLAZJ                 = 3,
+    TYPE_AMANITAR               = 4,
+    TYPE_DO_JEDOGA              = MAX_ENCOUNTER,
+    TYPE_DO_NADOX               = MAX_ENCOUNTER + 1,
+    TYPE_DO_TALDARAM            = MAX_ENCOUNTER + 2,
+
+    DATA_INSANITY_PLAYER        = 1,
+
+    GO_DOOR_TALDARAM            = 192236,
+    GO_ANCIENT_DEVICE_L         = 193093,
+    GO_ANCIENT_DEVICE_R         = 193094,
+    GO_VORTEX                   = 193564,
+
+    NPC_ELDER_NADOX             = 29309,
+    NPC_TALDARAM                = 29308,
+    NPC_JEDOGA_SHADOWSEEKER     = 29310,
+    NPC_AHNKAHAR_GUARDIAN_EGG   = 30173,
+    NPC_AHNKAHAR_SWARM_EGG      = 30172,
+    NPC_JEDOGA_CONTROLLER       = 30181,
+    NPC_TWILIGHT_INITIATE       = 30114,
+
+    NPC_HERALD_VOLAZJ           = 29311,
+    NPC_TWISTED_VISAGE_1        = 30621,
+    NPC_TWISTED_VISAGE_2        = 30622,
+    NPC_TWISTED_VISAGE_3        = 30623,
+    NPC_TWISTED_VISAGE_4        = 30624,
+    NPC_TWISTED_VISAGE_5        = 30625,
+
+    SPELL_TWISTED_VISAGE_DEATH  = 57555,
+    SPELL_INSANITY_SWITCH       = 57538,
+    SPELL_INSANITY_CLEAR        = 57558,
+
+    SPELL_INSANITY_PHASE_16     = 57508,
+    SPELL_INSANITY_PHASE_32     = 57509,
+    SPELL_INSANITY_PHASE_64     = 57510,
+    SPELL_INSANITY_PHASE_128    = 57511,
+    SPELL_INSANITY_PHASE_256    = 57512,
+
+    ACHIEV_START_VOLAZJ_ID      = 20382,
+
+    ACHIEV_CRIT_RESPECT_ELDERS  = 7317,             // Nadox, achiev 2038
+    ACHIEV_CRIT_VOLUNTEER_WORK  = 7359,             // Jedoga, achiev 2056
+};
+
+static const float aTaldaramLandingLoc[4] = {528.734f, -845.998f, 11.54f, 0.68f};
+static const float aJedogaLandingLoc[4] = {375.4977f, -707.3635f, -16.094f, 5.42f};
+
+#endif
diff --git a/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_amanitar.cpp b/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_amanitar.cpp
new file mode 100644
index 000000000..5886e0e84
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_amanitar.cpp
@@ -0,0 +1,244 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Amanitar
+SD%Complete: 80
+SDComment: Mushrooms summoning may need improvements;
+SDCategory: Ahn'kahet
+EndScriptData */
+
+#include "precompiled.h"
+#include "ahnkahet.h"
+
+enum
+{
+    SPELL_BASH                      = 57094,
+    SPELL_VENOM_BOLT_VOLLEY         = 57088,
+    SPELL_ENTANGLING_ROOTS          = 57095,
+    SPELL_MINI                      = 57055,
+    SPELL_REMOVE_MUSHROOM_POWER     = 57283,                // purpose unk - this spell may remove the Mini aura from all players
+
+    // Mushroom entries
+    NPC_HEALTHY_MUSHROOM            = 30391,
+    NPC_POISONOUS_MUSHROOM          = 30435,
+
+    // Mushroom spells
+    SPELL_POISON_CLOUD              = 57061,
+    SPELL_POTENT_FUNGUS             = 56648,
+    SPELL_POISON_MUSHROOM_VISUAL    = 56741,
+    SPELL_POWER_MUSHROOM_VISUAL     = 56740,
+    SPELL_MUSHROOM_FORM             = 31690,
+};
+
+static const float aMushroomPos[3] = {362.8f, -869.16f, -75.03f};
+
+/*######
+## boss_amanitar
+######*/
+
+struct boss_amanitar : public CreatureScript
+{
+    boss_amanitar() : CreatureScript("boss_amanitar") {}
+
+    struct boss_amanitarAI : public ScriptedAI
+    {
+        boss_amanitarAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiBashTimer;
+        uint32 m_uiVenomBoltTimer;
+        uint32 m_uiRootsTimer;
+        uint32 m_uiMiniTimer;
+        uint32 m_uiMushroomTimer;
+
+        void Reset() override
+        {
+            m_uiBashTimer = urand(7000, 10000);
+            m_uiVenomBoltTimer = urand(10000, 15000);
+            m_uiRootsTimer = 20000;
+            m_uiMiniTimer = urand(20000, 25000);
+            m_uiMushroomTimer = urand(10000, 20000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoSummonMushrooms(true);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_AMANITAR, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_AMANITAR, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_AMANITAR, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_POISONOUS_MUSHROOM)
+                pSummoned->CastSpell(pSummoned, SPELL_POISON_MUSHROOM_VISUAL, true);
+            else if (pSummoned->GetEntry() == NPC_HEALTHY_MUSHROOM)
+                pSummoned->CastSpell(pSummoned, SPELL_POWER_MUSHROOM_VISUAL, true);
+
+            // ToDo: research if the mushrooms should have a grow effect!
+            pSummoned->CastSpell(pSummoned, SPELL_MUSHROOM_FORM, true);
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_POISONOUS_MUSHROOM)
+                pSummoned->CastSpell(pSummoned, SPELL_POISON_CLOUD, true);
+            else if (pSummoned->GetEntry() == NPC_HEALTHY_MUSHROOM)
+                pSummoned->CastSpell(pSummoned, SPELL_POTENT_FUNGUS, true);
+        }
+
+        void DoSummonMushrooms(bool bIsFirstSummon)
+        {
+            // This implementation may not be 100% accurate;
+            // On aggro boss summons about 20 mushrooms; On timer it summons about 5 mushrooms per turn
+            // There is a 33% chance that the mushroom will be healthy
+            // The summon position is based on the center of the area coords
+
+            float fX, fY, fZ;
+            uint32 uiMaxMushrooms = bIsFirstSummon ? 20 : 5;
+
+            for (uint8 i = 0; i < uiMaxMushrooms; ++i)
+            {
+                uint32 uiMushroomEntry = roll_chance_i(33) ? NPC_HEALTHY_MUSHROOM : NPC_POISONOUS_MUSHROOM;
+                m_creature->GetRandomPoint(aMushroomPos[0], aMushroomPos[1], aMushroomPos[2], 30.0f, fX, fY, fZ);
+                m_creature->SummonCreature(uiMushroomEntry, fX, fY, fZ, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiBashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_BASH) == CAST_OK)
+                    m_uiBashTimer = urand(8000, 13000);
+            }
+            else
+                m_uiBashTimer -= uiDiff;
+
+            if (m_uiVenomBoltTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_VENOM_BOLT_VOLLEY) == CAST_OK)
+                    m_uiVenomBoltTimer = urand(15000, 20000);
+            }
+            else
+                m_uiVenomBoltTimer -= uiDiff;
+
+            if (m_uiRootsTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_ENTANGLING_ROOTS) == CAST_OK)
+                        m_uiRootsTimer = urand(20000, 25000);
+                }
+            }
+            else
+                m_uiRootsTimer -= uiDiff;
+
+            if (m_uiMiniTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MINI) == CAST_OK)
+                    m_uiMiniTimer = 30000;
+            }
+            else
+                m_uiMiniTimer -= uiDiff;
+
+            if (m_uiMushroomTimer < uiDiff)
+            {
+                DoSummonMushrooms(false);
+                m_uiMushroomTimer = urand(10000, 20000);
+            }
+            else
+                m_uiMushroomTimer -= uiDiff;
+
+            // ToDo: Research if he requires out of combat area evade check
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_amanitarAI(pCreature);
+    }
+};
+
+/*######
+## npc_amanitar_mushroom
+######*/
+
+struct npc_amanitar_mushroom : public CreatureScript
+{
+    npc_amanitar_mushroom() : CreatureScript("npc_amanitar_mushroom") {}
+
+    struct npc_amanitar_mushroomAI : public Scripted_NoMovementAI
+    {
+        npc_amanitar_mushroomAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void Reset() override { }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_amanitar_mushroomAI(pCreature);
+    }
+};
+
+void AddSC_boss_amanitar()
+{
+    Script* s;
+
+    s = new boss_amanitar();
+    s->RegisterSelf();
+    s = new npc_amanitar_mushroom();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_amanitar";
+    //pNewScript->GetAI = &GetAI_boss_amanitar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_amanitar_mushroom";
+    //pNewScript->GetAI = &GetAI_npc_amanitar_mushroom;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_jedoga.cpp b/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_jedoga.cpp
new file mode 100644
index 000000000..53068aa5b
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_jedoga.cpp
@@ -0,0 +1,485 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Jedoga
+SD%Complete: 90
+SDComment: The movement points for the volunteers are not 100% blizzlike. On retail they use hardcoded points
+SDCategory: Ahn'kahet
+EndScriptData */
+
+#include "precompiled.h"
+#include "ahnkahet.h"
+
+enum
+{
+    SAY_AGGRO                = -1619017,
+    SAY_CALL_SACRIFICE1      = -1619018,
+    SAY_CALL_SACRIFICE2      = -1619019,
+    SAY_SACRIFICE1           = -1619020,
+    SAY_SACRIFICE2           = -1619021,
+    SAY_SLAY_1               = -1619022,
+    SAY_SLAY_2               = -1619023,
+    SAY_SLAY_3               = -1619024,
+    SAY_DEATH                = -1619025,
+
+    // preaching 1-5 when it is used?
+    SAY_PREACHING1           = -1619026,
+    SAY_PREACHING2           = -1619027,
+    SAY_PREACHING3           = -1619028,
+    SAY_PREACHING4           = -1619029,
+    SAY_PREACHING5           = -1619030,
+
+    SAY_VOLUNTEER_CHOOSEN    = -1619031,                    // I have been choosen!
+    SAY_VOLUNTEER_SACRIFICED = -1619032,                    // I give myself to the master!
+
+    SPELL_SPHERE_VISUAL      = 56075,                       // already included in creature_template_addon
+    SPELL_LIGHTNING_VISUAL   = 56327,
+
+    SPELL_CYCLONE_STRIKE     = 56855,
+    SPELL_CYCLONE_STRIKE_H   = 60030,
+    SPELL_LIGHTNING_BOLT     = 56891,
+    SPELL_LIGHTNING_BOLT_H   = 60032,
+    SPELL_THUNDERSHOCK       = 56926,
+    SPELL_THUNDERSHOCK_H     = 60029,
+
+    SPELL_HOVER_FALL         = 56100,
+    SPELL_SACRIFICE_BEAM     = 56150,
+    SPELL_VOLUNTEER_SPHERE   = 56102,
+    SPELL_PILLAR_LIGHTNING   = 56868,
+
+    NPC_TWILIGHT_VOLUNTEER   = 30385,
+
+    MAX_VOLUNTEERS_PER_SIDE  = 13,
+
+    POINT_ID_PREPARE         = 1,
+    POINT_ID_SACRIFICE       = 2,
+    POINT_ID_LEVITATE        = 3,
+    POINT_ID_COMBAT          = 4,
+};
+
+static const float aVolunteerPosition[2][3] =
+{
+    {456.09f, -724.34f, -31.58f},
+    {410.11f, -785.46f, -31.58f},
+};
+
+/*######
+## boss_jedoga
+######*/
+
+struct boss_jedoga : public CreatureScript
+{
+    boss_jedoga() : CreatureScript("boss_jedoga") {}
+
+    struct boss_jedogaAI : public ScriptedAI
+    {
+        boss_jedogaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_bHasDoneIntro = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiVisualTimer;
+        uint32 m_uiThundershockTimer;
+        uint32 m_uiCycloneStrikeTimer;
+        uint32 m_uiLightningBoltTimer;
+        uint8 m_uiSacrificeCount;
+        bool m_bSacrifice;
+        bool m_bIsSacrificing;
+        bool m_bHasDoneIntro;
+
+        GuidList m_lVolunteerGuidList;
+
+        void Reset() override
+        {
+            m_uiThundershockTimer = 40000;
+            m_uiCycloneStrikeTimer = 15000;
+            m_uiLightningBoltTimer = 7000;
+            m_uiVisualTimer = 5000;
+            m_bSacrifice = false;
+            m_bIsSacrificing = false;
+
+            m_lVolunteerGuidList.clear();
+
+            SetCombatMovement(true);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        ObjectGuid SelectRandomVolunteer()
+        {
+            if (m_lVolunteerGuidList.empty())
+                return ObjectGuid();
+
+            GuidList::iterator iter = m_lVolunteerGuidList.begin();
+            advance(iter, urand(0, m_lVolunteerGuidList.size() - 1));
+
+            return *iter;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+            DoCallVolunteers();
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_JEDOGA, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_JEDOGA, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_JEDOGA, FAIL);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasDoneIntro && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 110.0f) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                switch (urand(0, 4))
+                {
+                case 0: DoScriptText(SAY_PREACHING1, m_creature); break;
+                case 1: DoScriptText(SAY_PREACHING2, m_creature); break;
+                case 2: DoScriptText(SAY_PREACHING3, m_creature); break;
+                case 3: DoScriptText(SAY_PREACHING4, m_creature); break;
+                case 4: DoScriptText(SAY_PREACHING5, m_creature); break;
+                }
+                m_bHasDoneIntro = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        // Helper function which summons all the Volunteers
+        void DoCallVolunteers()
+        {
+            // The volunteers should be summoned on the bottom of each stair in 2 lines - 7 in the front line and 6 in the back line
+            // However, because this would involve too many hardcoded coordinates we'll summon this on random point near the stairs
+
+            float fX, fY, fZ;
+            for (uint8 j = 0; j < 2; ++j)
+            {
+                for (uint8 i = 0; i < MAX_VOLUNTEERS_PER_SIDE; ++i)
+                {
+                    // In order to get a good movement position we need to handle the coordinates calculation here, inside the iteration.
+                    m_creature->GetRandomPoint(aVolunteerPosition[j][0], aVolunteerPosition[j][1], aVolunteerPosition[j][2], 10.0f, fX, fY, fZ);
+                    if (Creature* pVolunteer = m_creature->SummonCreature(NPC_TWILIGHT_VOLUNTEER, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0))
+                    {
+                        // Adjust coordinates based on the wave number and side
+                        float fDist = i < 7 ? 20.0f : 30.0f;
+                        float fAngle = 0;
+                        if (!j)
+                            fAngle = i < 7 ? (i - 2) * (3 * M_PI_F / 35) : (i - 6) * (M_PI_F / 16);
+                        else
+                            fAngle = i < 7 ? (i - 10) * (3 * M_PI_F / 35) : 3 * M_PI_F / 2 - (i - 6) * (M_PI_F / 16);
+
+                        m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, fDist, fAngle);
+                        pVolunteer->GetMotionMaster()->MovePoint(POINT_ID_PREPARE, fX, fY, fZ);
+                    }
+                }
+            }
+
+            // Summon one more Volunteer for the center position
+            m_creature->GetRandomPoint(aVolunteerPosition[0][0], aVolunteerPosition[0][1], aVolunteerPosition[0][2], 10.0f, fX, fY, fZ);
+            if (Creature* pVolunteer = m_creature->SummonCreature(NPC_TWILIGHT_VOLUNTEER, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0))
+            {
+                m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 20.0f, 7 * M_PI_F / 4);
+                pVolunteer->GetMotionMaster()->MovePoint(POINT_ID_PREPARE, fX, fY, fZ);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_TWILIGHT_VOLUNTEER)
+            {
+                pSummoned->SetWalk(false);
+                pSummoned->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_6);
+                m_lVolunteerGuidList.push_back(pSummoned->GetObjectGuid());
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_TWILIGHT_VOLUNTEER)
+            {
+                m_lVolunteerGuidList.remove(pSummoned->GetObjectGuid());
+
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_DO_JEDOGA, 1);
+                }
+
+                m_creature->GetMotionMaster()->MovePoint(POINT_ID_COMBAT, aJedogaLandingLoc[0], aJedogaLandingLoc[1], aJedogaLandingLoc[2]);
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || pSummoned->GetEntry() != NPC_TWILIGHT_VOLUNTEER)
+                return;
+
+            if (uiPointId == POINT_ID_PREPARE)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_VOLUNTEER_SPHERE, true);
+                pSummoned->SetFacingToObject(m_creature);
+                pSummoned->SetStandState(UNIT_STAND_STATE_KNEEL);
+            }
+            else if (uiPointId == POINT_ID_SACRIFICE)
+            {
+                DoCastSpellIfCan(pSummoned, SPELL_SACRIFICE_BEAM);
+                DoScriptText(urand(0, 1) ? SAY_SACRIFICE1 : SAY_SACRIFICE2, m_creature);
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE)
+                return;
+
+            switch (uiPointId)
+            {
+                // Prepare for combat
+            case POINT_ID_PREPARE:
+
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->RemoveAurasDueToSpell(SPELL_LIGHTNING_VISUAL);
+                m_creature->RemoveAurasDueToSpell(SPELL_SPHERE_VISUAL);
+                m_creature->SetLevitate(false);
+                break;
+
+                // Prepare for sacrifice lift off
+            case POINT_ID_SACRIFICE:
+                DoCastSpellIfCan(m_creature, SPELL_HOVER_FALL);
+                m_creature->SetLevitate(true);
+                m_creature->GetMotionMaster()->MovePoint(POINT_ID_LEVITATE, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() + 10.0f);
+                break;
+
+                // Call a volunteer to sacrifice
+            case POINT_ID_LEVITATE:
+                if (Creature* pVolunteer = m_creature->GetMap()->GetCreature(SelectRandomVolunteer()))
+                {
+                    DoScriptText(urand(0, 1) ? SAY_CALL_SACRIFICE1 : SAY_CALL_SACRIFICE2, m_creature);
+                    DoScriptText(SAY_VOLUNTEER_CHOOSEN, pVolunteer);
+
+                    pVolunteer->RemoveAurasDueToSpell(SPELL_VOLUNTEER_SPHERE);
+                    pVolunteer->SetStandState(UNIT_STAND_STATE_STAND);
+                    pVolunteer->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    pVolunteer->CastSpell(pVolunteer, SPELL_PILLAR_LIGHTNING, false);
+                    pVolunteer->SetWalk(true);
+                    pVolunteer->GetMotionMaster()->MovePoint(POINT_ID_SACRIFICE, aJedogaLandingLoc[0], aJedogaLandingLoc[1], aJedogaLandingLoc[2]);
+                }
+
+                // Set visual aura
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_DO_JEDOGA, 0);
+                }
+                break;
+
+                // Resume combat
+            case POINT_ID_COMBAT:
+                m_creature->RemoveAurasDueToSpell(SPELL_HOVER_FALL);
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                m_bIsSacrificing = false;
+                SetCombatMovement(true);
+                m_creature->SetLevitate(false);
+                if (m_creature->getVictim())
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiVisualTimer)
+            {
+                if (m_uiVisualTimer <= uiDiff)
+                {
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_JEDOGA, 2);
+
+                    if (DoCastSpellIfCan(m_creature, SPELL_LIGHTNING_VISUAL) == CAST_OK)
+                        m_uiVisualTimer = 0;
+                }
+                else
+                    m_uiVisualTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Don't use abilities while sacrificing
+            if (m_bIsSacrificing)
+                return;
+
+            // Note: this was changed in 3.3.2 and now it does this only once
+            if (m_creature->GetHealthPercent() < 50.0f && !m_bSacrifice)
+            {
+                SetCombatMovement(false);
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->GetMotionMaster()->MovePoint(POINT_ID_SACRIFICE, aJedogaLandingLoc[0], aJedogaLandingLoc[1], aJedogaLandingLoc[2]);
+                m_bSacrifice = true;
+                m_bIsSacrificing = true;
+            }
+
+            if (m_uiThundershockTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_THUNDERSHOCK : SPELL_THUNDERSHOCK_H);
+
+                m_uiThundershockTimer = 40000;
+            }
+            else
+                m_uiThundershockTimer -= uiDiff;
+
+            if (m_uiLightningBoltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_LIGHTNING_BOLT : SPELL_LIGHTNING_BOLT_H);
+
+                m_uiLightningBoltTimer = 7000;
+            }
+            else
+                m_uiLightningBoltTimer -= uiDiff;
+
+            if (m_uiCycloneStrikeTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_CYCLONE_STRIKE : SPELL_CYCLONE_STRIKE_H);
+                m_uiCycloneStrikeTimer = 15000;
+            }
+            else
+                m_uiCycloneStrikeTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_jedogaAI(pCreature);
+    }
+};
+
+/*######
+## npc_twilight_volunteer
+######*/
+
+struct npc_twilight_volunteer : public CreatureScript
+{
+    npc_twilight_volunteer() : CreatureScript("npc_twilight_volunteer") {}
+
+    struct npc_twilight_volunteerAI : public Scripted_NoMovementAI
+    {
+        npc_twilight_volunteerAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            // If it's not killed by Jedoga then set the achiev to fail
+            if (pKiller->GetEntry() == NPC_JEDOGA_SHADOWSEEKER)
+                return;
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_JEDOGA, SPECIAL);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_twilight_volunteerAI(pCreature);
+    }
+};
+
+struct aura_sacrifice_beam : public AuraScript
+{
+    aura_sacrifice_beam() : AuraScript("aura_sacrifice_beam") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() == SPELL_SACRIFICE_BEAM && pAura->GetEffIndex() == EFFECT_INDEX_0 && !bApply)
+        {
+            if (Creature* pTarget = (Creature*)pAura->GetTarget())
+            {
+                if (ScriptedInstance* pInstance = (ScriptedInstance*)pTarget->GetInstanceData())
+                {
+                    if (Creature* pJedoga = pInstance->GetSingleCreatureFromStorage(NPC_JEDOGA_SHADOWSEEKER))
+                        pJedoga->DealDamage(pTarget, pTarget->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                }
+            }
+        }
+        return true;
+    }
+};
+
+void AddSC_boss_jedoga()
+{
+    Script* s;
+
+    s = new boss_jedoga();
+    s->RegisterSelf();
+    s = new npc_twilight_volunteer();
+    s->RegisterSelf();
+
+    s = new aura_sacrifice_beam();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_jedoga";
+    //pNewScript->GetAI = &GetAI_boss_jedoga;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_twilight_volunteer";
+    //pNewScript->GetAI = &GetAI_npc_twilight_volunteer;
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_spell_aura_dummy_sacrifice_beam;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_nadox.cpp b/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_nadox.cpp
new file mode 100644
index 000000000..8efb256b4
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_nadox.cpp
@@ -0,0 +1,263 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Nadox
+SD%Complete: 90%
+SDComment: Some adjustment may be required
+SDCategory: Ahn'kahet
+EndScriptData */
+
+#include "precompiled.h"
+#include "ahnkahet.h"
+
+enum
+{
+    SAY_AGGRO                     = -1619000,
+    SAY_SUMMON_EGG_1              = -1619001,
+    SAY_SUMMON_EGG_2              = -1619002,
+    SAY_SLAY_1                    = -1619003,
+    SAY_SLAY_2                    = -1619004,
+    SAY_SLAY_3                    = -1619005,
+    SAY_DEATH                     = -1619006,
+    EMOTE_HATCH                   = -1619007,
+
+    SPELL_BROOD_PLAGUE            = 56130,
+    SPELL_BROOD_PLAGUE_H          = 59467,
+    SPELL_BERSERK                 = 26662,
+    SPELL_BROOD_RAGE              = 59465,
+
+    SPELL_GUARDIAN_AURA           = 56151,
+
+    // JustSummoned is not called for spell summoned creatures
+
+    NPC_AHNKAHAR_GUARDIAN         = 30176,
+    NPC_AHNKAHAR_SWARMER          = 30178
+};
+
+/*######
+## mob_ahnkahat_egg
+######*/
+struct mob_ahnkahar_egg : public CreatureScript
+{
+    mob_ahnkahar_egg() : CreatureScript("mob_ahnkahar_egg") {}
+
+    struct mob_ahnkahar_eggAI : public ScriptedAI
+    {
+        mob_ahnkahar_eggAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override {}
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+        void AttackStart(Unit* /*pWho*/) override {}
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_AHNKAHAR_GUARDIAN)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_GUARDIAN_AURA, true);
+                DoScriptText(EMOTE_HATCH, m_creature);
+            }
+
+            if (m_pInstance)
+            {
+                if (Creature* pElderNadox = m_pInstance->GetSingleCreatureFromStorage(NPC_ELDER_NADOX))
+                {
+                    float fPosX, fPosY, fPosZ;
+                    pElderNadox->GetPosition(fPosX, fPosY, fPosZ);
+                    pSummoned->SetWalk(false);
+                    pSummoned->GetMotionMaster()->MovePoint(0, fPosX, fPosY, fPosZ);
+                }
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // If the Guardian is killed set the achiev criteria to false
+            if (pSummoned->GetEntry() == NPC_AHNKAHAR_GUARDIAN)
+            {
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_NADOX, SPECIAL);
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_ahnkahar_eggAI(pCreature);
+    }
+};
+
+/*######
+## boss_nadox
+######*/
+
+struct boss_nadox : public CreatureScript
+{
+    boss_nadox() : CreatureScript("boss_nadox") {}
+
+    struct boss_nadoxAI : public ScriptedAI
+    {
+        boss_nadoxAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool   m_bBerserk;
+        bool   m_bGuardianSummoned;
+        uint32 m_uiBroodPlagueTimer;
+        uint32 m_uiBroodRageTimer;
+        uint32 m_uiSummonTimer;
+
+        void Reset() override
+        {
+            m_bBerserk = false;
+            m_bGuardianSummoned = false;
+            m_uiSummonTimer = 5000;
+            m_uiBroodPlagueTimer = 15000;
+            m_uiBroodRageTimer = 20000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_NADOX, IN_PROGRESS);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_NADOX, FAIL);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_NADOX, DONE);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (!m_bGuardianSummoned && m_creature->GetHealthPercent() < 50.0f)
+            {
+                // guardian is summoned at 50% of boss HP
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_DO_NADOX, 0);
+
+                    m_bGuardianSummoned = true;
+                }
+            }
+
+            if (m_uiSummonTimer < uiDiff)
+            {
+                if (roll_chance_i(50))
+                    DoScriptText(urand(0, 1) ? SAY_SUMMON_EGG_1 : SAY_SUMMON_EGG_2, m_creature);
+
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_DO_NADOX, 1);
+                }
+
+                m_uiSummonTimer = urand(5000, 10000);
+            }
+            else
+                m_uiSummonTimer -= uiDiff;
+
+            if (m_uiBroodPlagueTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_BROOD_PLAGUE : SPELL_BROOD_PLAGUE_H);
+
+                m_uiBroodPlagueTimer = 20000;
+            }
+            else
+                m_uiBroodPlagueTimer -= uiDiff;
+
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiBroodRageTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BROOD_RAGE) == CAST_OK)
+                        m_uiBroodRageTimer = 20000;
+                }
+                else
+                    m_uiBroodRageTimer -= uiDiff;
+            }
+
+            if (!m_bBerserk && m_creature->GetPositionZ() < 24.0)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    m_bBerserk = true;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_nadoxAI(pCreature);
+    }
+};
+
+void AddSC_boss_nadox()
+{
+    Script* s;
+
+    s = new mob_ahnkahar_egg();
+    s->RegisterSelf();
+    s = new boss_nadox();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_nadox";
+    //pNewScript->GetAI = &GetAI_boss_nadox;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_ahnkahar_egg";
+    //pNewScript->GetAI = &GetAI_mob_ahnkahar_egg;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_taldaram.cpp b/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_taldaram.cpp
new file mode 100644
index 000000000..fff61bc38
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_taldaram.cpp
@@ -0,0 +1,364 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Taldaram
+SD%Complete: 90%
+SDComment: Timers;
+SDCategory: Ahn'kahet
+EndScriptData */
+
+#include "precompiled.h"
+#include "ahnkahet.h"
+
+enum
+{
+    SAY_AGGRO                       = -1619008,
+    SAY_VANISH_1                    = -1619009,
+    SAY_VANISH_2                    = -1619010,
+    SAY_FEED_1                      = -1619011,
+    SAY_FEED_2                      = -1619012,
+    SAY_SLAY_1                      = -1619013,
+    SAY_SLAY_2                      = -1619014,
+    SAY_SLAY_3                      = -1619015,
+    SAY_DEATH                       = -1619016,
+
+    SPELL_CONJURE_FLAME_SPHERE      = 55931,
+    SPELL_FLAME_SPHERE_SUMMON_1     = 55895,        // summons 30106
+    SPELL_FLAME_SPHERE_SUMMON_2     = 59511,        // summons 31686
+    SPELL_FLAME_SPHERE_SUMMON_3     = 59512,        // summons 31687
+    SPELL_BLOODTHIRST               = 55968,
+    SPELL_VANISH                    = 55964,
+    SPELL_EMBRACE_OF_THE_VAMPYR     = 55959,
+    SPELL_EMBRACE_OF_THE_VAMPYR_H   = 59513,
+
+    // Spells used by the Flame Sphere
+    SPELL_FLAME_SPHERE_PERIODIC     = 55926,
+    SPELL_FLAME_SPHERE_PERIODIC_H   = 59508,
+    SPELL_FLAME_SPHERE_SPAWN_EFFECT = 55891,
+    SPELL_FLAME_SPHERE_VISUAL       = 55928,
+    SPELL_FLAME_SPHERE_DEATH_EFFECT = 55947,
+};
+
+/*######
+## boss_taldaram
+######*/
+
+struct boss_taldaram : public CreatureScript
+{
+    boss_taldaram() : CreatureScript("boss_taldaram") {}
+
+    struct boss_taldaramAI : public ScriptedAI
+    {
+        boss_taldaramAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            // Don't set the visual timers if the devices are already activated (reload case)
+            m_uiVisualTimer = m_pInstance->GetData(TYPE_TALDARAM) == SPECIAL ? 0 : 1000;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bIsFirstAggro;
+        uint32 m_uiVisualTimer;
+        uint32 m_uiBloodthirstTimer;
+        uint32 m_uiFlameOrbTimer;
+        uint32 m_uiVanishTimer;
+        uint32 m_uiEmbraceTimer;
+
+        GuidList m_lFlameOrbsGuidList;
+
+        void Reset() override
+        {
+            // Timers seem to be very random...
+            m_uiBloodthirstTimer = urand(20000, 25000);
+            m_uiFlameOrbTimer = urand(15000, 20000);
+            m_uiVanishTimer = 0;
+            m_uiEmbraceTimer = 0;
+            m_bIsFirstAggro = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            // Aggro is called after the boss vanish expires. There is no need to call this multiple times
+            if (m_bIsFirstAggro)
+                return;
+
+            DoScriptText(SAY_AGGRO, m_creature);
+            m_bIsFirstAggro = true;
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_TALDARAM, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_TALDARAM, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_TALDARAM, FAIL);
+        }
+
+        void EnterEvadeMode() override
+        {
+            // Don't allow him to evade during vanish
+            if (m_uiEmbraceTimer)
+                return;
+
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            // should evade on the ground
+            if (m_creature->IsAlive())
+                m_creature->GetMotionMaster()->MovePoint(1, aTaldaramLandingLoc[0], aTaldaramLandingLoc[1], aTaldaramLandingLoc[2]);
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE)
+                return;
+
+            // Adjust orientation
+            if (uiPointId)
+            {
+                m_creature->SetLevitate(false);
+                m_creature->SetFacingTo(aTaldaramLandingLoc[3]);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->CastSpell(pSummoned, SPELL_FLAME_SPHERE_SPAWN_EFFECT, true);
+            pSummoned->CastSpell(pSummoned, SPELL_FLAME_SPHERE_VISUAL, true);
+
+            m_lFlameOrbsGuidList.push_back(pSummoned->GetObjectGuid());
+        }
+
+        void SummonedCreatureDespawn(Creature* pSummoned) override
+        {
+            pSummoned->CastSpell(pSummoned, SPELL_FLAME_SPHERE_DEATH_EFFECT, true);
+        }
+
+        // Wrapper which sends each sphere in a different direction
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*sender*/, Unit* invoker, uint32 /**/) override
+        {
+            if (eventType != AI_EVENT_CUSTOM_A || invoker != m_creature)
+                return;
+
+            float fX, fY;
+            uint8 uiIndex = m_bIsRegularMode ? urand(0, 2) : 0;
+            for (GuidList::const_iterator itr = m_lFlameOrbsGuidList.begin(); itr != m_lFlameOrbsGuidList.end(); ++itr)
+            {
+                if (Creature* pOrb = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pOrb->CastSpell(pOrb, m_bIsRegularMode ? SPELL_FLAME_SPHERE_PERIODIC : SPELL_FLAME_SPHERE_PERIODIC_H, true);
+
+                    pOrb->GetNearPoint2D(fX, fY, 70.0f, (2 * M_PI_F / 3)*uiIndex);
+                    pOrb->GetMotionMaster()->MovePoint(0, fX, fY, pOrb->GetPositionZ());
+                }
+                ++uiIndex;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiVisualTimer)
+            {
+                if (m_uiVisualTimer <= uiDiff)
+                {
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_TALDARAM, 0);
+                    m_uiVisualTimer = 0;
+                }
+                else
+                    m_uiVisualTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Cast Embrace of the Vampyr after Vanish expires - note: because of the invisibility effect, the timers won't decrease during vanish
+            if (m_uiEmbraceTimer)
+            {
+                if (m_uiEmbraceTimer <= uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_EMBRACE_OF_THE_VAMPYR : SPELL_EMBRACE_OF_THE_VAMPYR_H) == CAST_OK)
+                        {
+                            DoScriptText(urand(0, 1) ? SAY_FEED_1 : SAY_FEED_2, m_creature);
+                            m_uiEmbraceTimer = 0;
+                        }
+                    }
+                }
+                else
+                    m_uiEmbraceTimer -= uiDiff;
+
+                // do not use other abilities during vanish
+                return;
+            }
+
+            if (m_uiVanishTimer)
+            {
+                if (m_uiVanishTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_VANISH) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_VANISH_1 : SAY_VANISH_2, m_creature);
+                        m_uiVanishTimer = 0;
+                        m_uiEmbraceTimer = 2000;
+                    }
+                }
+                else
+                    m_uiVanishTimer -= uiDiff;
+            }
+
+            if (m_uiBloodthirstTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BLOODTHIRST) == CAST_OK)
+                    m_uiBloodthirstTimer = urand(20000, 25000);
+            }
+            else
+                m_uiBloodthirstTimer -= uiDiff;
+
+            if (m_uiFlameOrbTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CONJURE_FLAME_SPHERE) == CAST_OK)
+                {
+                    m_lFlameOrbsGuidList.clear();
+
+                    // Flame speres are summoned above the boss
+                    m_creature->CastSpell(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() + 5.0f, SPELL_FLAME_SPHERE_SUMMON_1, true);
+
+                    // 2 more spheres on heroic
+                    if (!m_bIsRegularMode)
+                    {
+                        m_creature->CastSpell(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() + 5.0f, SPELL_FLAME_SPHERE_SUMMON_2, true);
+                        m_creature->CastSpell(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() + 5.0f, SPELL_FLAME_SPHERE_SUMMON_3, true);
+                    }
+
+                    m_uiFlameOrbTimer = urand(50000, 60000);
+                    m_uiVanishTimer = 12000;
+                }
+            }
+            else
+                m_uiFlameOrbTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_taldaramAI(pCreature);
+    }
+};
+
+struct spell_conjure_flame_sphere : public SpellScript
+{
+    spell_conjure_flame_sphere() : SpellScript("spell_conjure_flame_sphere") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_CONJURE_FLAME_SPHERE && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (CreatureAI* pBossAI = pTarget->ToCreature()->AI())
+                pBossAI->SendAIEvent(AI_EVENT_CUSTOM_A, pTarget->ToCreature(), pTarget->ToCreature());
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## go_nerubian_device
+######*/
+
+struct go_nerubian_device : public GameObjectScript
+{
+    go_nerubian_device() : GameObjectScript("go_nerubian_device") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+
+        if (!pInstance)
+            return false;
+
+        // Don't allow players to use the devices if encounter is already finished or in progress (reload case)
+        if (pInstance->GetData(TYPE_TALDARAM) == SPECIAL || pInstance->GetData(TYPE_TALDARAM) == DONE)
+            return false;
+
+        pInstance->SetData(TYPE_TALDARAM, SPECIAL);
+        return false;
+    }
+};
+
+void AddSC_boss_taldaram()
+{
+    Script* s;
+
+    s = new boss_taldaram();
+    s->RegisterSelf();
+
+    s = new go_nerubian_device();
+    s->RegisterSelf();
+
+    s = new spell_conjure_flame_sphere();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_taldaram";
+    //pNewScript->GetAI = &GetAI_boss_taldaram;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_conjure_flame_orbs;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_nerubian_device";
+    //pNewScript->pGOUse = &GOUse_go_nerubian_device;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_volazj.cpp b/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_volazj.cpp
new file mode 100644
index 000000000..69d25778d
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/boss_volazj.cpp
@@ -0,0 +1,307 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Volazj
+SD%Complete: 50%
+SDComment: Insanity NYI; Timers need adjustments
+SDCategory: Ahn'kahet
+EndScriptData */
+
+#include "precompiled.h"
+#include "ahnkahet.h"
+#include "TemporarySummon.h"
+
+enum
+{
+    SAY_AGGRO                       = -1619033,
+    SAY_INSANITY                    = -1619034,
+    SAY_SLAY_1                      = -1619035,
+    SAY_SLAY_2                      = -1619036,
+    SAY_SLAY_3                      = -1619037,
+    SAY_DEATH_1                     = -1619038,         // missing text
+    SAY_DEATH_2                     = -1619039,
+
+    SPELL_MIND_FLAY                 = 57941,
+    SPELL_MIND_FLAY_H               = 59974,
+    SPELL_SHADOW_BOLT               = 57942,
+    SPELL_SHADOW_BOLT_H             = 59975,
+    SPELL_SHIVER                    = 57949,
+    SPELL_SHIVER_H                  = 59978,
+
+    SPELL_WHISPER_AGGRO             = 60291,
+    SPELL_WHISPER_INSANITY          = 60292,
+    SPELL_WHISPER_SLAY_1            = 60293,
+    SPELL_WHISPER_SLAY_2            = 60294,
+    SPELL_WHISPER_SLAY_3            = 60295,
+    SPELL_WHISPER_DEATH_1           = 60296,
+    SPELL_WHISPER_DEATH_2           = 60297,
+
+    SPELL_INSANITY                  = 57496,            // start insanity phasing
+    SPELL_INSANITY_VISUAL           = 57561,
+
+    SPELL_TWISTED_VISAGE_SPAWN      = 57506,
+    SPELL_TWISTED_VISAGE_SPAWN_H    = 59982,
+    SPELL_TWISTED_VISAGE_EFFECT     = 57507,
+    SPELL_TWISTED_VISAGE_PASSIVE    = 57551,
+
+    SPELL_SUMMON_VISAGE_1           = 57500,
+    SPELL_SUMMON_VISAGE_2           = 57501,
+    SPELL_SUMMON_VISAGE_3           = 57502,
+    SPELL_SUMMON_VISAGE_4           = 57503,
+    SPELL_SUMMON_VISAGE_5           = 57504,
+
+    MAX_INSANITY_SPELLS             = 5,
+};
+
+static const uint32 aInsanityPhaseSpells[MAX_INSANITY_SPELLS] = {SPELL_INSANITY_PHASE_16, SPELL_INSANITY_PHASE_32, SPELL_INSANITY_PHASE_64, SPELL_INSANITY_PHASE_128, SPELL_INSANITY_PHASE_256};
+static const uint32 aSpawnVisageSpells[MAX_INSANITY_SPELLS] = {SPELL_SUMMON_VISAGE_1, SPELL_SUMMON_VISAGE_2, SPELL_SUMMON_VISAGE_3, SPELL_SUMMON_VISAGE_4, SPELL_SUMMON_VISAGE_5};
+
+/*######
+## boss_volazj
+######*/
+
+struct boss_volazj : public CreatureScript
+{
+    boss_volazj() : CreatureScript("boss_volazj") {}
+
+    struct boss_volazjAI : public ScriptedAI
+    {
+        boss_volazjAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiCombatPhase;
+        uint32 m_uiMindFlayTimer;
+        uint32 m_uiShadowBoltTimer;
+        uint32 m_uiShiverTimer;
+
+        uint8 m_uiInsanityIndex;
+        bool m_bIsInsanityInProgress;
+
+        void Reset() override
+        {
+            m_uiCombatPhase = 1;
+            m_uiMindFlayTimer = 10000;
+            m_uiShadowBoltTimer = 5000;
+            m_uiShiverTimer = 18000;
+
+            m_uiInsanityIndex = 0;
+            m_bIsInsanityInProgress = false;
+
+            SetCombatMovement(true);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_WHISPER_AGGRO);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VOLAZJ, IN_PROGRESS);
+
+                // Start achievement only on first aggro
+                m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_VOLAZJ_ID);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(SAY_SLAY_1, m_creature);
+                DoCastSpellIfCan(m_creature, SPELL_WHISPER_SLAY_1);
+                break;
+            case 1:
+                DoScriptText(SAY_SLAY_2, m_creature);
+                DoCastSpellIfCan(m_creature, SPELL_WHISPER_SLAY_2);
+                break;
+            case 2:
+                DoScriptText(SAY_SLAY_3, m_creature);
+                DoCastSpellIfCan(m_creature, SPELL_WHISPER_SLAY_3);
+                break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (urand(0, 1))
+            {
+                DoScriptText(SAY_DEATH_1, m_creature);
+                DoCastSpellIfCan(m_creature, SPELL_WHISPER_DEATH_1, CAST_TRIGGERED);
+            }
+            else
+            {
+                DoScriptText(SAY_DEATH_2, m_creature);
+                DoCastSpellIfCan(m_creature, SPELL_WHISPER_DEATH_2, CAST_TRIGGERED);
+            }
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_VOLAZJ, DONE);
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (m_pInstance && m_pInstance->GetData(TYPE_VOLAZJ) == SPECIAL)
+                return;
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_VOLAZJ, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->CastSpell(pSummoned, SPELL_TWISTED_VISAGE_PASSIVE, true);
+
+            if (pSummoned->IsTemporarySummon())
+            {
+                TemporarySummon* pTemporary = (TemporarySummon*)pSummoned;
+
+                if (Player* pPlayer = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                {
+                    pPlayer->CastSpell(pSummoned, SPELL_TWISTED_VISAGE_EFFECT, true);
+                    pSummoned->CastSpell(pPlayer, m_bIsRegularMode ? SPELL_TWISTED_VISAGE_SPAWN : SPELL_TWISTED_VISAGE_SPAWN_H, true);
+
+                    pSummoned->AI()->AttackStart(pPlayer);
+                }
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_INSANITY && pTarget->GetTypeId() == TYPEID_PLAYER)
+            {
+                // Apply this only for the first target hit
+                if (!m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_INSANITY_VISUAL, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_WHISPER_INSANITY, CAST_TRIGGERED);
+
+                    DoScriptText(SAY_INSANITY, m_creature);
+
+                    m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    SetCombatMovement(false);
+
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_VOLAZJ, SPECIAL);
+
+                    m_bIsInsanityInProgress = true;
+                }
+
+                // Store the players in the instance, in order to better handle phasing
+                if (m_pInstance)
+                    m_pInstance->SetData64(DATA_INSANITY_PLAYER, pTarget->GetObjectGuid());
+
+                // Phase and summon a Visage for each player
+                pTarget->CastSpell(pTarget, aInsanityPhaseSpells[m_uiInsanityIndex], true, 0, 0, m_creature->GetObjectGuid());
+                pTarget->CastSpell(pTarget, aSpawnVisageSpells[m_uiInsanityIndex], true, 0, 0, m_creature->GetObjectGuid());
+                ++m_uiInsanityIndex;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Check for Insanity
+            if (m_bIsInsanityInProgress)
+            {
+                if (!m_creature->HasAura(SPELL_INSANITY_VISUAL))
+                {
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    SetCombatMovement(true);
+                    m_bIsInsanityInProgress = false;
+                }
+
+                // No other actions during insanity
+                return;
+            }
+
+            if (m_creature->GetHealthPercent() < 100.0f - (float)m_uiCombatPhase * 33.4f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_INSANITY) == CAST_OK)
+                {
+                    m_uiInsanityIndex = 0;
+                    ++m_uiCombatPhase;
+                }
+            }
+
+            if (m_uiMindFlayTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_MIND_FLAY : SPELL_MIND_FLAY_H) == CAST_OK)
+                    m_uiMindFlayTimer = urand(10000, 20000);
+            }
+            else
+                m_uiMindFlayTimer -= uiDiff;
+
+            if (m_uiShadowBoltTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SHADOW_BOLT : SPELL_SHADOW_BOLT_H) == CAST_OK)
+                    m_uiShadowBoltTimer = urand(8000, 13000);
+            }
+            else
+                m_uiShadowBoltTimer -= uiDiff;
+
+            if (m_uiShiverTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_SHIVER : SPELL_SHIVER_H) == CAST_OK)
+                        m_uiShiverTimer = 30000;
+                }
+            }
+            else
+                m_uiShiverTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_volazjAI(pCreature);
+    }
+};
+
+void AddSC_boss_volazj()
+{
+    Script* s;
+
+    s = new boss_volazj();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_volazj";
+    //pNewScript->GetAI = &GetAI_boss_volazj;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/instance_ahnkahet.cpp b/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/instance_ahnkahet.cpp
new file mode 100644
index 000000000..6a8b61673
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/azjol-nerub/ahnkahet/instance_ahnkahet.cpp
@@ -0,0 +1,525 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: instance_ahnkahet
+SD%Complete: 75
+SDComment:
+SDCategory: Ahn'kahet
+EndScriptData */
+
+#include "precompiled.h"
+#include "ahnkahet.h"
+#include "TemporarySummon.h"
+
+enum
+{
+    SPELL_JE_SACRIFICE_VISUAL   = 56133,
+    SPELL_JE_BEAM_VISUAL        = 56312,
+    SPELL_SUMMON_SWARM_GUARDIAN = 56120,
+    SPELL_SUMMON_SWARMERS       = 56119,
+    SPELL_TA_BEAM_VISUAL        = 60342,        // Visual spell, used before Taldaram is lowered to the ground
+};
+
+struct is_ahnkahet : public InstanceScript
+{
+    is_ahnkahet() : InstanceScript("instance_ahnkahet") {}
+
+    class instance_ahnkahet : public ScriptedInstance
+    {
+    public:
+        instance_ahnkahet(Map* pMap) : ScriptedInstance(pMap),
+            m_bRespectElders(false),
+            m_bVolunteerWork(false),
+            m_uiDevicesActivated(0),
+            m_uiInitiatesKilled(0),
+            m_uiTwistedVisageCount(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_ELDER_NADOX:
+            case NPC_TALDARAM:
+            case NPC_JEDOGA_SHADOWSEEKER:
+            case NPC_HERALD_VOLAZJ:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_AHNKAHAR_GUARDIAN_EGG:
+                m_GuardianEggList.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_AHNKAHAR_SWARM_EGG:
+                m_SwarmerEggList.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_JEDOGA_CONTROLLER:
+                // Sort the controllers based on their purpose
+                if (pCreature->GetPositionZ() > 30.0f)
+                    // Used for Taldaram visual
+                    m_lJedogaControllersGuidList.push_back(pCreature->GetObjectGuid());
+                else if (pCreature->GetPositionZ() > 20.0f)
+                    // Used for Jedoga visual
+                    m_lJedogaEventControllersGuidList.push_back(pCreature->GetObjectGuid());
+                else if (pCreature->GetPositionZ() < -16.0f)
+                    // Used for Jedoga sacrifice
+                    m_jedogaSacrificeController = pCreature->GetObjectGuid();
+                break;
+            case NPC_TWISTED_VISAGE_1:
+            case NPC_TWISTED_VISAGE_2:
+            case NPC_TWISTED_VISAGE_3:
+            case NPC_TWISTED_VISAGE_4:
+            case NPC_TWISTED_VISAGE_5:
+                ++m_uiTwistedVisageCount;
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_DOOR_TALDARAM:
+                if (m_auiEncounter[TYPE_TALDARAM] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_VORTEX:
+                if (m_auiEncounter[TYPE_TALDARAM] == SPECIAL)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+
+            case GO_ANCIENT_DEVICE_L:
+            case GO_ANCIENT_DEVICE_R:
+                if (m_auiEncounter[TYPE_NADOX] == DONE)
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_TWISTED_VISAGE_1:
+            case NPC_TWISTED_VISAGE_2:
+            case NPC_TWISTED_VISAGE_3:
+            case NPC_TWISTED_VISAGE_4:
+            case NPC_TWISTED_VISAGE_5:
+                --m_uiTwistedVisageCount;
+
+                // When all Twisted Visages were killed or despawned switch back to combat phase
+                if (!m_uiTwistedVisageCount)
+                {
+                    // Clear Insanity
+                    if (Creature* pVolazj = GetSingleCreatureFromStorage(NPC_HERALD_VOLAZJ))
+                    {
+                        pVolazj->CastSpell(pVolazj, SPELL_INSANITY_CLEAR, true);
+                        pVolazj->RemoveAllAuras();
+                    }
+
+                    // Clear insanity manually for now, because the spell won't hit phased players
+                    HandleInsanityClear();
+
+                    SetData(TYPE_VOLAZJ, IN_PROGRESS);
+                }
+
+                pCreature->ForcedDespawn();
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_TWILIGHT_INITIATE:
+                ++m_uiInitiatesKilled;
+
+                // If all initiates are killed, then land Jedoga and stop the channeling
+                if (m_uiInitiatesKilled == MAX_INITIATES)
+                {
+                    if (Creature* pJedoga = GetSingleCreatureFromStorage(NPC_JEDOGA_SHADOWSEEKER))
+                        pJedoga->GetMotionMaster()->MovePoint(1, aJedogaLandingLoc[0], aJedogaLandingLoc[1], aJedogaLandingLoc[2]);
+
+                    for (GuidList::const_iterator itr = m_lJedogaEventControllersGuidList.begin(); itr != m_lJedogaEventControllersGuidList.end(); ++itr)
+                    {
+                        if (Creature* pTemp = instance->GetCreature(*itr))
+                            pTemp->InterruptNonMeleeSpells(false);
+                    }
+                }
+
+                break;
+            case NPC_TWISTED_VISAGE_1:
+            case NPC_TWISTED_VISAGE_2:
+            case NPC_TWISTED_VISAGE_3:
+            case NPC_TWISTED_VISAGE_4:
+            case NPC_TWISTED_VISAGE_5:
+                pCreature->CastSpell(pCreature, SPELL_TWISTED_VISAGE_DEATH, true);
+
+                --m_uiTwistedVisageCount;
+
+                // When all Twisted Visages were killed or despawned switch back to combat phase
+                if (!m_uiTwistedVisageCount)
+                {
+                    // Clear Insanity
+                    if (Creature* pVolazj = GetSingleCreatureFromStorage(NPC_HERALD_VOLAZJ))
+                    {
+                        pVolazj->CastSpell(pVolazj, SPELL_INSANITY_CLEAR, true);
+                        pVolazj->RemoveAllAuras();
+                    }
+
+                    // Clear insanity manually for now, because the spell won't hit phased players
+                    HandleInsanityClear();
+
+                    SetData(TYPE_VOLAZJ, IN_PROGRESS);
+                }
+                else
+                {
+                    // Switch Insanity
+                    if (Creature* pVolazj = GetSingleCreatureFromStorage(NPC_HERALD_VOLAZJ))
+                        pVolazj->CastSpell(pVolazj, SPELL_INSANITY_SWITCH, true);
+
+                    // Handle insanity switch manually, because the boss can't hit phased players
+                    if (pCreature->IsTemporarySummon())
+                    {
+                        TemporarySummon* pTemporary = (TemporarySummon*)pCreature;
+
+                        // Switch insanity phase for the master player
+                        if (Player* pPlayer = instance->GetPlayer(pTemporary->GetSummonerGuid()))
+                            HandleInsanitySwitch(pPlayer);
+                    }
+                }
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            debug_log("SD3: Instance Ahn'Kahet: SetData received for type %u with data %u", uiType, uiData);
+
+            switch (uiType)
+            {
+            case TYPE_NADOX:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                    m_bRespectElders = true;
+                else if (uiData == SPECIAL)
+                    m_bRespectElders = false;
+                else if (uiData == DONE)
+                {
+                    DoToggleGameObjectFlags(GO_ANCIENT_DEVICE_L, GO_FLAG_NO_INTERACT, false);
+                    DoToggleGameObjectFlags(GO_ANCIENT_DEVICE_R, GO_FLAG_NO_INTERACT, false);
+                }
+                break;
+            case TYPE_TALDARAM:
+                if (uiData == SPECIAL)
+                {
+                    ++m_uiDevicesActivated;
+
+                    if (m_uiDevicesActivated == 2)
+                    {
+                        m_auiEncounter[uiType] = uiData;
+                        DoUseDoorOrButton(GO_VORTEX);
+
+                        // Lower Taldaram
+                        if (Creature* pTaldaram = GetSingleCreatureFromStorage(NPC_TALDARAM))
+                            pTaldaram->GetMotionMaster()->MovePoint(1, aTaldaramLandingLoc[0], aTaldaramLandingLoc[1], aTaldaramLandingLoc[2]);
+
+                        // Interrupt the channeling
+                        for (GuidList::const_iterator itr = m_lJedogaControllersGuidList.begin(); itr != m_lJedogaControllersGuidList.end(); ++itr)
+                        {
+                            if (Creature* pTemp = instance->GetCreature(*itr))
+                                pTemp->InterruptNonMeleeSpells(false);
+                        }
+                    }
+                }
+                else if (uiData == DONE)
+                {
+                    m_auiEncounter[uiType] = uiData;
+                    DoUseDoorOrButton(GO_DOOR_TALDARAM);
+                }
+                break;
+            case TYPE_JEDOGA:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                    m_bVolunteerWork = true;
+                else if (uiData == SPECIAL)
+                    m_bVolunteerWork = false;
+                else if (uiData == FAIL)
+                    m_uiInitiatesKilled = 0;
+                break;
+            case TYPE_AMANITAR:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_VOLAZJ:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                {
+                    m_uiTwistedVisageCount = 0;
+                    m_lInsanityPlayersGuidList.clear();
+                }
+                break;
+            case TYPE_DO_JEDOGA:
+                switch (uiData)
+                {
+                case 0:
+                    if (Creature* pTemp = instance->GetCreature(m_jedogaSacrificeController))
+                        pTemp->CastSpell(pTemp, SPELL_JE_SACRIFICE_VISUAL, false);
+                    break;
+                case 1:
+                    if (Creature* pTemp = instance->GetCreature(m_jedogaSacrificeController))
+                        pTemp->RemoveAurasDueToSpell(SPELL_JE_SACRIFICE_VISUAL);
+                    break;
+                case 2:
+                    for (GuidList::const_iterator itr = m_lJedogaEventControllersGuidList.begin(); itr != m_lJedogaEventControllersGuidList.end(); ++itr)
+                    {
+                        if (Creature* pTemp = instance->GetCreature(*itr))
+                            pTemp->CastSpell(GetSingleCreatureFromStorage(NPC_JEDOGA_SHADOWSEEKER), SPELL_JE_BEAM_VISUAL, false);
+                    }
+                    break;
+                default:
+                    break;
+                }
+                return;
+            case TYPE_DO_NADOX:
+                switch (uiData)
+                {
+                case 0:
+                    if (Creature* pGuardianEgg = instance->GetCreature(SelectRandomGuardianEggGuid()))
+                        pGuardianEgg->CastSpell(pGuardianEgg, SPELL_SUMMON_SWARM_GUARDIAN, false);
+                    break;
+                case 1:
+                    // There are 2 Swarmers summoned at a timer; @TODO check to do not use single mob twice
+                    if (Creature* pSwarmerEgg = instance->GetCreature(SelectRandomSwarmerEggGuid()))
+                    {
+                        for (uint8 i = 0; i < 2; ++i)
+                            pSwarmerEgg->CastSpell(pSwarmerEgg, SPELL_SUMMON_SWARMERS, false);
+                    }
+                    break;
+                default:
+                    break;
+                }
+                return;
+            case TYPE_DO_TALDARAM:
+                for (GuidList::const_iterator itr = m_lJedogaControllersGuidList.begin(); itr != m_lJedogaControllersGuidList.end(); ++itr)
+                {
+                    if (Creature* pTemp = instance->GetCreature(*itr))
+                        pTemp->CastSpell(GetSingleCreatureFromStorage(NPC_TALDARAM), SPELL_TA_BEAM_VISUAL, false);
+                }
+                return;
+
+            default:
+                script_error_log("Instance Ahn'Kahet: ERROR SetData = %u for type %u does not exist/not implemented.", uiType, uiData);
+                break;
+            }
+
+            // For some encounters Special data needs to be saved
+            if (uiData == DONE || (uiData == SPECIAL && uiType == TYPE_TALDARAM))
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]
+                    << " " << m_auiEncounter[4];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            return 0;
+        }
+
+        void SetData64(uint32 uiType, uint64 uiGuid) override
+        {
+            // Store all the players hit by the insanity spell in order to use them for the phasing switch / clear
+            if (uiType == DATA_INSANITY_PLAYER)
+            {
+                if (Player* pPlayer = instance->GetPlayer(ObjectGuid(uiGuid)))
+                    m_lInsanityPlayersGuidList.push_back(pPlayer->GetObjectGuid());
+            }
+        }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+            case ACHIEV_CRIT_RESPECT_ELDERS:
+                return m_bRespectElders;
+            case ACHIEV_CRIT_VOLUNTEER_WORK:
+                return m_bVolunteerWork;
+
+            default:
+                return false;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] >> m_auiEncounter[4];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        void HandleInsanityClear()
+        {
+            for (GuidList::const_iterator itr = m_lInsanityPlayersGuidList.begin(); itr != m_lInsanityPlayersGuidList.end(); ++itr)
+            {
+                if (Player* pPlayer = instance->GetPlayer(*itr))
+                    pPlayer->RemoveSpellsCausingAura(SPELL_AURA_PHASE);
+            }
+        }
+
+        void HandleInsanitySwitch(Player* pPlayer)
+        {
+            // Get the phase aura id
+            std::list<Aura*> lAuraList = pPlayer->GetAurasByType(SPELL_AURA_PHASE);
+            if (lAuraList.empty())
+                return;
+
+            uint32 uiPhaseAura = (*lAuraList.begin())->GetId();
+
+            std::list<Player*> lSamePhasePlayers;
+            std::vector<Player*> vOtherPhasePlayers;
+
+            // Sort the insanity players, into those which have same phase and others
+            for (GuidList::const_iterator itr = m_lInsanityPlayersGuidList.begin(); itr != m_lInsanityPlayersGuidList.end(); ++itr)
+            {
+                if (Player* pTemp = instance->GetPlayer(*itr))
+                {
+                    if (pTemp->HasAura(uiPhaseAura))
+                        lSamePhasePlayers.push_back(pTemp);
+                    // Check only for alive players
+                    else if (pTemp->IsAlive())
+                        vOtherPhasePlayers.push_back(pTemp);
+                }
+            }
+
+            // This shouldn't happen
+            if (vOtherPhasePlayers.empty())
+                return;
+
+            // Get the phase aura of the new selected player
+            Player* pNewPlayer = vOtherPhasePlayers[urand(0, vOtherPhasePlayers.size() - 1)];
+
+            // Get the phase aura id
+            std::list<Aura*> lNewAuraList = pNewPlayer->GetAurasByType(SPELL_AURA_PHASE);
+            if (lNewAuraList.empty())
+                return;
+
+            uint32 uiNewPhaseAura = (*lNewAuraList.begin())->GetId();
+
+            // Move the same phase players to the new phase
+            for (std::list<Player*>::const_iterator itr = lSamePhasePlayers.begin(); itr != lSamePhasePlayers.end(); ++itr)
+                (*itr)->CastSpell((*itr), uiNewPhaseAura, true);
+        }
+
+        ObjectGuid SelectRandomGuardianEggGuid()
+        {
+            if (m_GuardianEggList.empty())
+                return ObjectGuid();
+
+            GuidList::iterator iter = m_GuardianEggList.begin();
+            advance(iter, urand(0, m_GuardianEggList.size() - 1));
+
+            return *iter;
+        }
+
+        ObjectGuid SelectRandomSwarmerEggGuid()
+        {
+            if (m_SwarmerEggList.empty())
+                return ObjectGuid();
+
+            GuidList::iterator iter = m_SwarmerEggList.begin();
+            advance(iter, urand(0, m_SwarmerEggList.size() - 1));
+
+            return *iter;
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        bool m_bRespectElders;
+        bool m_bVolunteerWork;
+
+        uint8 m_uiDevicesActivated;
+        uint8 m_uiInitiatesKilled;
+        uint8 m_uiTwistedVisageCount;
+
+        ObjectGuid m_jedogaSacrificeController;
+
+        GuidList m_GuardianEggList;
+        GuidList m_SwarmerEggList;
+        GuidList m_lJedogaControllersGuidList;
+        GuidList m_lJedogaEventControllersGuidList;
+        GuidList m_lInsanityPlayersGuidList;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_ahnkahet(pMap);
+    }
+};
+
+void AddSC_instance_ahnkahet()
+{
+    Script* s;
+
+    s = new is_ahnkahet();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_ahnkahet";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_ahnkahet;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/azjol-nerub.h b/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/azjol-nerub.h
new file mode 100644
index 000000000..5a73a4ca5
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/azjol-nerub.h
@@ -0,0 +1,52 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_AZJOL_NERUB_H
+#define DEF_AZJOL_NERUB_H
+
+enum
+{
+    MAX_ENCOUNTER               = 3,
+
+    TYPE_KRIKTHIR               = 0,
+    TYPE_HADRONOX               = 1,
+    TYPE_ANUBARAK               = 2,
+    TYPE_DO_HADRONOX            = MAX_ENCOUNTER,
+
+    DATA64_ANUB_TRIGGER         = 0,
+    DATA64_ANUB_ASSASIN         = 1,
+    DATA64_ANUB_GUARDIAN        = 2,
+    DATA64_ANUB_DARTER          = 3,
+
+    NPC_KRIKTHIR                = 28684,
+    NPC_HADRONOX                = 28921,
+    NPC_ANUBARAK                = 29120,
+
+    SAY_SEND_GROUP_1            = -1601004,
+    SAY_SEND_GROUP_2            = -1601005,
+    SAY_SEND_GROUP_3            = -1601006,
+
+    NPC_GASHRA                  = 28730,
+    NPC_NARJIL                  = 28729,
+    NPC_SILTHIK                 = 28731,
+    NPC_ANUBAR_CRUSHER          = 28922,
+
+    NPC_WORLD_TRIGGER           = 22515,
+    NPC_WORLD_TRIGGER_LARGE     = 23472,
+
+    GO_DOOR_KRIKTHIR            = 192395,
+    GO_DOOR_ANUBARAK_1          = 192396,
+    GO_DOOR_ANUBARAK_2          = 192397,
+    GO_DOOR_ANUBARAK_3          = 192398,
+
+    SAY_CRUSHER_AGGRO           = -1601025,
+    SAY_CRUSHER_SPECIAL         = -1601026,
+
+    ACHIEV_START_ANUB_ID        = 20381,
+
+    ACHIEV_CRITERIA_WATCH_DIE   = 4240,         // Krikthir, achiev 1296
+    ACHIEV_CRITERIA_DENIED      = 4244,         // Hadronox, achiev 1297
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/boss_anubarak.cpp b/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/boss_anubarak.cpp
new file mode 100644
index 000000000..4a68c65f3
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/boss_anubarak.cpp
@@ -0,0 +1,408 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Anubarak
+SD%Complete: 80%
+SDComment: Summoned creatures movement may need some adjustments - may be solved with movement maps
+SDCategory: Azjol'Nerub
+EndScriptData */
+
+#include "precompiled.h"
+#include "azjol-nerub.h"
+
+enum
+{
+    SAY_INTRO                       = -1601014,
+    SAY_AGGRO                       = -1601015,
+    SAY_KILL_1                      = -1601016,
+    SAY_KILL_2                      = -1601017,
+    SAY_KILL_3                      = -1601018,
+    SAY_SUBMERGE_1                  = -1601019,
+    SAY_SUBMERGE_2                  = -1601020,
+    SAY_LOCUST_1                    = -1601021,
+    SAY_LOCUST_2                    = -1601022,
+    SAY_LOCUST_3                    = -1601023,
+    SAY_DEATH                       = -1601024,
+
+    SPELL_CARRION_BEETLES           = 53520,
+    SPELL_LEECHING_SWARM            = 53467,
+    SPELL_LEECHING_SWARM_H          = 59430,
+    SPELL_IMPALE_AURA               = 53456,        // ticks at each 10 secs - summons 29184
+    SPELL_POUND                     = 53472,
+    SPELL_POUND_H                   = 59433,
+    SPELL_SUBMERGE                  = 53421,
+    SPELL_EMERGE                    = 53500,
+
+    // NOTES:
+    // The Assassin and Guardian summon spell should be 53609 and 53613
+    // They are currently not used because of the ignore LoS issue in core
+    SPELL_SUMMON_ASSASSIN           = 53610,        // summons 29214
+    SPELL_SUMMON_GUARDIAN           = 53614,        // summons 29216
+    SPELL_SUMMON_VENOMANCER         = 53615,        // summons 29217
+    SPELL_SUMMON_DARTER             = 53599,        // summons 29213
+
+    // impale spells
+    SPELL_IMPALE_VISUAL             = 53455,
+    SPELL_IMPALE                    = 53454,
+    SPELL_IMPALE_H                  = 59446,
+
+    NPC_ANUBAR_DARTER               = 29213,
+    NPC_ANUBAR_ASSASSIN             = 29214,
+    NPC_ANUBAR_GUARDIAN             = 29216,
+    NPC_ANUBAR_VENOMANCER           = 29217,
+    NPC_IMPALE_TARGET               = 29184,
+
+    PHASE_GROUND                    = 1,
+    PHASE_SUBMERGED                 = 2
+};
+
+
+/*######
+## boss_anubarak
+######*/
+
+struct boss_anubarak : public CreatureScript
+{
+    boss_anubarak() : CreatureScript("boss_anubarak") {}
+
+    struct boss_anubarakAI : public ScriptedAI
+    {
+        boss_anubarakAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_bDoneIntro = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiPhase;
+        uint8 m_uiSubmergePhase;
+
+        uint32 m_uiCarrionBeetlesTimer;
+        uint32 m_uiLeechingSwarmTimer;
+        uint32 m_uiPoundTimer;
+        uint32 m_uiEmergeTimer;
+        uint32 m_uiSummonTimer;
+        uint32 m_uiDarterTimer;
+        bool m_bIsFirstWave;
+        bool m_bDoneIntro;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_GROUND;
+            m_uiSubmergePhase = 1;
+
+            m_uiCarrionBeetlesTimer = 8000;
+            m_uiLeechingSwarmTimer = 20000;
+            m_uiPoundTimer = 15000;
+            m_uiDarterTimer = 5000;
+
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ANUBARAK, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_KILL_1, m_creature); break;
+            case 1: DoScriptText(SAY_KILL_2, m_creature); break;
+            case 2: DoScriptText(SAY_KILL_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ANUBARAK, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ANUBARAK, NOT_STARTED);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bDoneIntro && m_creature->IsWithinDistInMap(pWho, 60.0f))
+            {
+                DoScriptText(SAY_INTRO, m_creature);
+                m_bDoneIntro = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (!m_pInstance)
+                return;
+
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_ANUBAR_GUARDIAN:
+            case NPC_ANUBAR_VENOMANCER:
+                pSummoned->SetWalk(false);
+                if (Creature* pTrigger = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_ANUB_TRIGGER))))
+                    pSummoned->GetMotionMaster()->MovePoint(0, pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ());
+                break;
+            case NPC_ANUBAR_DARTER:
+            case NPC_ANUBAR_ASSASSIN:
+                if (Creature* pTrigger = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_ANUB_TRIGGER))))
+                {
+                    float fX, fY, fZ;
+                    m_creature->GetRandomPoint(pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ(), 15.0f, fX, fY, fZ);
+
+                    pSummoned->SetWalk(false);
+                    pSummoned->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                }
+                break;
+            case NPC_IMPALE_TARGET:
+                pSummoned->CastSpell(pSummoned, SPELL_IMPALE_VISUAL, true);
+                break;
+            default:
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiPhase == PHASE_GROUND)
+            {
+                if (m_uiLeechingSwarmTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_LEECHING_SWARM : SPELL_LEECHING_SWARM_H) == CAST_OK)
+                    {
+                        switch (urand(0, 2))
+                        {
+                        case 0: DoScriptText(SAY_LOCUST_1, m_creature); break;
+                        case 1: DoScriptText(SAY_LOCUST_2, m_creature); break;
+                        case 2: DoScriptText(SAY_LOCUST_3, m_creature); break;
+                        }
+
+                        m_uiLeechingSwarmTimer = 19000;
+                    }
+                }
+                else
+                    m_uiLeechingSwarmTimer -= uiDiff;
+
+                if (m_uiCarrionBeetlesTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_CARRION_BEETLES) == CAST_OK)
+                        m_uiCarrionBeetlesTimer = 25000;
+                }
+                else
+                    m_uiCarrionBeetlesTimer -= uiDiff;
+
+                if (m_uiPoundTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_POUND : SPELL_POUND_H) == CAST_OK)
+                        m_uiPoundTimer = 16000;
+                }
+                else
+                    m_uiPoundTimer -= uiDiff;
+
+                if (m_creature->GetHealthPercent() < 100 - 25 * m_uiSubmergePhase)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_IMPALE_AURA, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_SUBMERGE, CAST_TRIGGERED);
+                    DoScriptText(urand(0, 1) ? SAY_SUBMERGE_1 : SAY_SUBMERGE_2, m_creature);
+                    m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
+                    m_uiPhase = PHASE_SUBMERGED;
+                    m_bIsFirstWave = true;
+                    m_uiSummonTimer = 5000;
+
+                    // Emerge timers aren't the same. They depend on the submerge phase
+                    switch (m_uiSubmergePhase)
+                    {
+                    case 1:
+                        m_uiEmergeTimer = 20000;
+                        break;
+                    case 2:
+                        m_uiEmergeTimer = 45000;
+                        break;
+                    case 3:
+                        m_uiEmergeTimer = 50000;
+                        break;
+                    }
+                    ++m_uiSubmergePhase;
+                }
+
+                DoMeleeAttackIfReady();
+            }
+            else if (m_uiPhase == PHASE_SUBMERGED)
+            {
+                if (m_uiSummonTimer < uiDiff)
+                {
+                    if (!m_pInstance)
+                        return;
+
+                    // Summon 2 Assassins
+                    for (uint8 i = 0; i < 2; ++i)
+                    {
+                        if (Creature* pTrigger = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_ANUB_ASSASIN))))
+                            pTrigger->CastSpell(pTrigger, SPELL_SUMMON_ASSASSIN, true, NULL, NULL, m_creature->GetObjectGuid());
+                    }
+
+                    // on the first wave summon a guardian; on the second wave summon a venonmancer
+                    if (Creature* pTrigger = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_ANUB_GUARDIAN))))
+                    {
+                        pTrigger->CastSpell(pTrigger, m_bIsFirstWave ? SPELL_SUMMON_GUARDIAN : SPELL_SUMMON_VENOMANCER, true, NULL, NULL, m_creature->GetObjectGuid());
+                        m_bIsFirstWave = false;
+                    }
+
+                    m_uiSummonTimer = 26000;
+                }
+                else
+                    m_uiSummonTimer -= uiDiff;
+
+                // only on the last submerge phase
+                if (m_uiSubmergePhase == 4)
+                {
+                    if (m_uiDarterTimer < uiDiff)
+                    {
+                        if (!m_pInstance)
+                            return;
+
+                        if (Creature* pTrigger = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_ANUB_DARTER))))
+                        {
+                            pTrigger->CastSpell(pTrigger, SPELL_SUMMON_DARTER, true, NULL, NULL, m_creature->GetObjectGuid());
+                            m_uiDarterTimer = urand(10000, 15000);
+                        }
+                    }
+                    else
+                        m_uiDarterTimer -= uiDiff;
+                }
+
+                if (m_uiEmergeTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_EMERGE, CAST_INTERRUPT_PREVIOUS);
+                    m_creature->RemoveAurasDueToSpell(SPELL_SUBMERGE);
+                    m_creature->RemoveAurasDueToSpell(SPELL_IMPALE_AURA);
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
+                    m_uiPhase = PHASE_GROUND;
+                }
+                else
+                    m_uiEmergeTimer -= uiDiff;
+            }
+
+            EnterEvadeIfOutOfCombatArea(uiDiff);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_anubarakAI(pCreature);
+    }
+};
+
+/*######
+## npc_impale_target
+######*/
+
+struct npc_impale_target : public CreatureScript
+{
+    npc_impale_target() : CreatureScript("npc_impale_target") {}
+
+    struct npc_impale_targetAI : public Scripted_NoMovementAI
+    {
+        npc_impale_targetAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiImpaleTimer;
+
+        void Reset() override
+        {
+            m_uiImpaleTimer = 3000;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiImpaleTimer)
+            {
+                if (m_uiImpaleTimer <= uiDiff)
+                {
+                    if (!m_pInstance)
+                        return;
+
+                    m_creature->RemoveAurasDueToSpell(SPELL_IMPALE_VISUAL);
+
+                    // The impale is cast by Anub on the impale target
+                    if (Creature* pAnub = m_pInstance->GetSingleCreatureFromStorage(NPC_ANUBARAK))
+                        pAnub->CastSpell(m_creature, m_bIsRegularMode ? SPELL_IMPALE : SPELL_IMPALE_H, true);
+
+                    m_creature->ForcedDespawn(3000);
+                    m_uiImpaleTimer = 0;
+                }
+                else
+                    m_uiImpaleTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_impale_targetAI(pCreature);
+    }
+};
+
+void AddSC_boss_anubarak()
+{
+    Script* s;
+
+    s = new boss_anubarak();
+    s->RegisterSelf();
+    s = new npc_impale_target();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_anubarak";
+    //pNewScript->GetAI = &GetAI_boss_anubarak;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_impale_target";
+    //pNewScript->GetAI = &GetAI_npc_impale_target;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/boss_hadronox.cpp b/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/boss_hadronox.cpp
new file mode 100644
index 000000000..7fdad2579
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/boss_hadronox.cpp
@@ -0,0 +1,293 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Hadronox
+SD%Complete: 90%
+SDComment: Some details and timers can be improved.
+SDCategory: Azjol'Nerub
+EndScriptData */
+
+#include "precompiled.h"
+#include "azjol-nerub.h"
+
+enum
+{
+    EMOTE_MOVE_TUNNEL           = -1601013,
+
+    SPELL_TAUNT                 = 53799,
+    SPELL_PIERCE_ARMOR          = 53418,
+    SPELL_ACID_CLOUD            = 53400,
+    SPELL_ACID_CLOUD_H          = 59419,
+    SPELL_LEECH_POISON          = 53030,
+    SPELL_LEECH_POISON_H        = 59417,
+    SPELL_WEB_GRAB              = 57731,
+    SPELL_WEB_GRAB_H            = 59421,
+
+    // Gauntlet spells
+    SPELL_WEB_FRONT_DOORS       = 53177,            // sends event 19101
+    SPELL_WEB_SIDE_DOORS        = 53185,            // sends event 19102 - it seems that this isn't actually used here
+
+    MAX_SPIDERS                 = 9,
+};
+
+static const uint32 aSpiderEntries[MAX_SPIDERS] = {28924, 28925, 29051, 29062, 29063, 29064, 29096, 29097, 29098};
+
+/* ##### Gauntlet description #####
+ * This is the timed gauntlet - waves of non-elite spiders will spawn from the 3 doors located a little above the main room
+ * They will make their way down to fight Hadronox but she will head to the main room, fighting the spiders
+ * When Hadronox enters the main room, she will web the doors, and no more spiders will spawn.
+ */
+
+/*######
+## boss_hadronox
+######*/
+
+struct boss_hadronox : public CreatureScript
+{
+    boss_hadronox() : CreatureScript("boss_hadronox") {}
+
+    struct boss_hadronoxAI : public ScriptedAI
+    {
+        boss_hadronoxAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_uiGauntletStartTimer = 1000;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiGauntletStartTimer;
+
+        uint32 m_uiAcidTimer;
+        uint32 m_uiLeechTimer;
+        uint32 m_uiPierceTimer;
+        uint32 m_uiGrabTimer;
+        uint32 m_uiTauntTimer;
+
+        void Reset() override
+        {
+            m_uiAcidTimer = urand(10000, 14000);
+            m_uiLeechTimer = urand(3000, 9000);
+            m_uiPierceTimer = urand(1000, 3000);
+            m_uiGrabTimer = urand(15000, 19000);
+            m_uiTauntTimer = urand(2000, 5000);
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (pWho->GetTypeId() == TYPEID_PLAYER && m_pInstance)
+                m_pInstance->SetData(TYPE_HADRONOX, IN_PROGRESS);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            // No more attacks during the movement upstairs
+            if ((m_pInstance && m_pInstance->GetData(TYPE_HADRONOX) == SPECIAL) && pWho->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // Force the spiders to attack him
+            if (pWho->GetTypeId() == TYPEID_UNIT && m_creature->IsWithinDistInMap(pWho, 2 * ATTACK_DISTANCE) && !pWho->getVictim())
+            {
+                for (uint8 i = 0; i < MAX_SPIDERS; ++i)
+                {
+                    if (pWho->GetEntry() == aSpiderEntries[i])
+                        ((Creature*)pWho)->AI()->AttackStart(m_creature);
+                }
+            }
+
+            // No more attacks during the movement upstairs
+            if ((m_pInstance && m_pInstance->GetData(TYPE_HADRONOX) == SPECIAL) && pWho->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            m_creature->SetHealth(m_creature->GetHealth() + (m_creature->GetMaxHealth() * 0.1));
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_HADRONOX, DONE);
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+
+            if (!m_creature->IsAlive() || !m_pInstance)
+                return;
+
+            // Moving upstairs, don't disturb
+            if (m_pInstance->GetData(TYPE_HADRONOX) == SPECIAL)
+            {
+                m_creature->GetMotionMaster()->MoveWaypoint();
+                DoScriptText(EMOTE_MOVE_TUNNEL, m_creature);
+            }
+            // Stay upstairs if evade from players
+            else if (m_pInstance->GetData(TYPE_HADRONOX) == IN_PROGRESS)
+                m_creature->GetMotionMaster()->MovePoint(1, 530.42f, 560.003f, 733.0308f);
+            else
+                m_creature->GetMotionMaster()->MoveTargetedHome();
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            // Mark as failed if evaded while upstairs
+            if (uiMoveType == POINT_MOTION_TYPE && uiPointId)
+            {
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_HADRONOX, FAIL);
+            }
+            // Web the doors when upstairs
+            else if (uiMoveType == WAYPOINT_MOTION_TYPE && uiPointId == 10)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WEB_FRONT_DOORS, CAST_TRIGGERED) == CAST_OK)
+                {
+                    // These should be handled by the scripted event
+                    if (m_pInstance)
+                    {
+                        m_pInstance->SetData(TYPE_HADRONOX, IN_PROGRESS);
+                        m_pInstance->SetData(TYPE_DO_HADRONOX, 0);
+                    }
+
+                    // No more movement
+                    m_creature->GetMotionMaster()->MoveIdle();
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Allow the spawns to make a few steps so we can use move maps
+            pSummoned->SetWalk(false);
+            pSummoned->GetMotionMaster()->MoveWaypoint();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiGauntletStartTimer)
+            {
+                if (m_uiGauntletStartTimer <= uiDiff)
+                {
+                    if (!m_pInstance)
+                    {
+                        script_error_log("Instance Azjol-Nerub: ERROR Failed to load instance data for this instace.");
+                        return;
+                    }
+
+                    m_pInstance->SetData(TYPE_DO_HADRONOX, 1);
+
+                    m_uiGauntletStartTimer = 0;
+                }
+                else
+                    m_uiGauntletStartTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiPierceTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_PIERCE_ARMOR) == CAST_OK)
+                    m_uiPierceTimer = urand(8000, 15000);
+            }
+            else
+                m_uiPierceTimer -= uiDiff;
+
+            if (m_uiAcidTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_ACID_CLOUD : SPELL_ACID_CLOUD_H) == CAST_OK)
+                        m_uiAcidTimer = urand(10000, 15000);
+                }
+            }
+            else
+                m_uiAcidTimer -= uiDiff;
+
+            if (m_uiLeechTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_LEECH_POISON : SPELL_LEECH_POISON_H) == CAST_OK)
+                        m_uiLeechTimer = urand(10000, 15000);
+                }
+            }
+            else
+                m_uiLeechTimer -= uiDiff;
+
+            if (m_uiGrabTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_WEB_GRAB : SPELL_WEB_GRAB_H) == CAST_OK)
+                    m_uiGrabTimer = urand(25000, 30000);
+            }
+            else
+                m_uiGrabTimer -= uiDiff;
+
+            if (m_uiTauntTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_TAUNT) == CAST_OK)
+                        m_uiTauntTimer = urand(7000, 14000);
+                }
+            }
+            else
+                m_uiTauntTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_hadronoxAI(pCreature);
+    }
+};
+
+void AddSC_boss_hadronox()
+{
+    Script* s;
+
+    s = new boss_hadronox();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_hadronox";
+    //pNewScript->GetAI = &GetAI_boss_hadronox;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/boss_krikthir.cpp b/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/boss_krikthir.cpp
new file mode 100644
index 000000000..6f7ef9378
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/boss_krikthir.cpp
@@ -0,0 +1,197 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Krikthir
+SD%Complete: 90%
+SDComment: Implement Achievement
+SDCategory: Azjol'Nerub
+EndScriptData */
+
+#include "precompiled.h"
+#include "azjol-nerub.h"
+
+enum
+{
+    SAY_AGGRO                 = -1601000,
+    SAY_KILL_1                = -1601001,
+    SAY_KILL_2                = -1601002,
+    SAY_KILL_3                = -1601003,
+    SAY_PREFIGHT_1            = -1601007,
+    SAY_PREFIGHT_2            = -1601008,
+    SAY_PREFIGHT_3            = -1601009,
+    SAY_SWARM_1               = -1601010,
+    SAY_SWARM_2               = -1601011,
+    SAY_DEATH                 = -1601012,
+    EMOTE_BOSS_GENERIC_FRENZY = -1000005,
+
+    SPELL_SWARM               = 52440,
+    SPELL_CURSE_OF_FATIGUE    = 52592,
+    SPELL_CURSE_OF_FATIGUE_H  = 59368,
+    SPELL_MINDFLAY            = 52586,
+    SPELL_MINDFLAY_H          = 59367,
+    SPELL_FRENZY              = 28747,
+
+    NPC_SKITTERING_SWARMER    = 28735,
+    NPC_SKITTERING_INFECTOR   = 28736
+};
+
+/*######
+## boss_krikthir
+######*/
+
+struct boss_krikthir : public CreatureScript
+{
+    boss_krikthir() : CreatureScript("boss_krikthir") {}
+
+    struct boss_krikthirAI : public ScriptedAI
+    {
+        boss_krikthirAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bFrenzy;
+        bool m_bIntroSpeech;
+
+        uint32 m_uiSwarmTimer;
+        uint32 m_uiCurseTimer;
+        uint32 m_uiMindFlayTimer;
+
+        void Reset() override
+        {
+            m_uiSwarmTimer = 15000;
+            m_uiCurseTimer = 20000;
+            m_uiMindFlayTimer = 8000;
+
+            m_bIntroSpeech = false;
+            m_bFrenzy = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_KILL_1, m_creature); break;
+            case 1: DoScriptText(SAY_KILL_2, m_creature); break;
+            case 2: DoScriptText(SAY_KILL_3, m_creature); break;
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bIntroSpeech && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, DEFAULT_VISIBILITY_INSTANCE) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                switch (urand(0, 2))
+                {
+                case 0: DoScriptText(SAY_PREFIGHT_1, m_creature); break;
+                case 1: DoScriptText(SAY_PREFIGHT_2, m_creature); break;
+                case 2: DoScriptText(SAY_PREFIGHT_3, m_creature); break;
+                }
+                m_bIntroSpeech = true;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_KRIKTHIR, DONE);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            uint32 uiEntry = pSummoned->GetEntry();
+            if (uiEntry == NPC_SKITTERING_SWARMER || uiEntry == NPC_SKITTERING_INFECTOR)
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (!m_bFrenzy && m_creature->GetHealthPercent() <= 10.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_BOSS_GENERIC_FRENZY, m_creature);
+                    m_bFrenzy = true;
+                }
+            }
+
+            if (m_uiCurseTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_CURSE_OF_FATIGUE : SPELL_CURSE_OF_FATIGUE_H) == CAST_OK)
+                    m_uiCurseTimer = 20000;
+            }
+            else
+                m_uiCurseTimer -= uiDiff;
+
+            if (m_uiMindFlayTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_MINDFLAY : SPELL_MINDFLAY_H) == CAST_OK)
+                    m_uiMindFlayTimer = 8000;
+            }
+            else
+                m_uiMindFlayTimer -= uiDiff;
+
+            if (m_uiSwarmTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SWARM) == CAST_OK)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_SWARM_1 : SAY_SWARM_2, m_creature);
+                    m_uiSwarmTimer = 15000;
+                }
+            }
+            else
+                m_uiSwarmTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_krikthirAI(pCreature);
+    }
+};
+
+void AddSC_boss_krikthir()
+{
+    Script* s;
+
+    s = new boss_krikthir();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_krikthir";
+    //pNewScript->GetAI = &GetAI_boss_krikthir;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/instance_azjol-nerub.cpp b/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/instance_azjol-nerub.cpp
new file mode 100644
index 000000000..4c0caa0ed
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/azjol-nerub/azjol-nerub/instance_azjol-nerub.cpp
@@ -0,0 +1,454 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Azjol-Nerub
+SD%Complete: 50
+SDComment:
+SDCategory: Azjol-Nerub
+EndScriptData */
+
+#include "precompiled.h"
+#include "azjol-nerub.h"
+
+static const uint32 aWatchers[] = { NPC_GASHRA, NPC_NARJIL, NPC_SILTHIK };
+
+// Used to sort the summont triggers
+static const int aSortDistance[4] = { -90, 10, 20, 30 };
+
+enum
+{
+    SPELL_SUMMON_CHAMPION       = 53035,
+    SPELL_SUMMON_NECROMANCER    = 53036,
+    SPELL_SUMMON_CRYPT_FIEND    = 53037,
+};
+
+struct is_azjol_nerub : public InstanceScript
+{
+    is_azjol_nerub() : InstanceScript("instance_azjol-nerub") {}
+
+    class instance_azjol_nerub : public ScriptedInstance
+    {
+    public:
+        instance_azjol_nerub(Map* pMap) : ScriptedInstance(pMap),
+            m_uiWatcherTimer(0),
+            m_uiGauntletEndTimer(0),
+            m_bWatchHimDie(true),
+            m_bHadronoxDenied(true),
+            m_bGauntletStarted(false)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_DOOR_KRIKTHIR:
+                if (m_auiEncounter[TYPE_KRIKTHIR] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_DOOR_ANUBARAK_1:
+            case GO_DOOR_ANUBARAK_2:
+            case GO_DOOR_ANUBARAK_3:
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_KRIKTHIR:
+            case NPC_GASHRA:
+            case NPC_NARJIL:
+            case NPC_SILTHIK:
+            case NPC_HADRONOX:
+            case NPC_ANUBARAK:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_WORLD_TRIGGER:
+                m_lTriggerGuids.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_WORLD_TRIGGER_LARGE:
+                m_lSpiderTriggersGuids.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            uint32 uiEntry = pCreature->GetEntry();
+
+            if (uiEntry == NPC_GASHRA || uiEntry == NPC_NARJIL || uiEntry == NPC_SILTHIK)
+            {
+                // Creature enter combat is not equal to having a victim yet.
+                if (!m_playerGuid && pCreature->getVictim())
+                    m_playerGuid = pCreature->getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->GetObjectGuid();
+            }
+            else if (uiEntry == NPC_ANUBAR_CRUSHER)
+            {
+                // Only for the first try
+                if (m_bGauntletStarted)
+                    return;
+
+                DoScriptText(SAY_CRUSHER_AGGRO, pCreature);
+
+                // Spawn 2 more crushers - note these are not the exact spawn coords, but we need to use this workaround for better movement
+                if (Creature* pCrusher = pCreature->SummonCreature(NPC_ANUBAR_CRUSHER, 485.25f, 611.46f, 771.42f, 4.74f, TEMPSUMMON_DEAD_DESPAWN, 0))
+                {
+                    pCrusher->SetWalk(false);
+                    pCrusher->GetMotionMaster()->MovePoint(0, 517.51f, 561.439f, 734.0306f);
+                    pCrusher->HandleEmote(EMOTE_STATE_READYUNARMED);
+                }
+                if (Creature* pCrusher = pCreature->SummonCreature(NPC_ANUBAR_CRUSHER, 575.21f, 611.47f, 771.46f, 3.59f, TEMPSUMMON_DEAD_DESPAWN, 0))
+                {
+                    pCrusher->SetWalk(false);
+                    pCrusher->GetMotionMaster()->MovePoint(0, 543.414f, 551.728f, 732.0522f);
+                    pCrusher->HandleEmote(EMOTE_STATE_READYUNARMED);
+                }
+
+                // Spawn 2 more crushers and start the countdown
+                m_uiGauntletEndTimer = 2 * MINUTE * IN_MILLISECONDS;
+                m_bGauntletStarted = true;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            uint32 uiEntry = pCreature->GetEntry();
+            if (uiEntry == NPC_GASHRA || uiEntry == NPC_NARJIL || uiEntry == NPC_SILTHIK)
+                m_playerGuid.Clear();
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            uint32 uiEntry = pCreature->GetEntry();
+            if (uiEntry == NPC_GASHRA || uiEntry == NPC_NARJIL || uiEntry == NPC_SILTHIK)
+            {
+                if (m_auiEncounter[TYPE_KRIKTHIR] == NOT_STARTED)
+                    m_uiWatcherTimer = 5000;
+
+                // Set achiev criteriat to false if one of the watchers dies
+                m_bWatchHimDie = false;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_KRIKTHIR:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                    DoUseDoorOrButton(GO_DOOR_KRIKTHIR);
+                break;
+            case TYPE_HADRONOX:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                    ResetHadronoxTriggers();
+                break;
+            case TYPE_ANUBARAK:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_DOOR_ANUBARAK_1);
+                DoUseDoorOrButton(GO_DOOR_ANUBARAK_2);
+                DoUseDoorOrButton(GO_DOOR_ANUBARAK_3);
+                if (uiData == IN_PROGRESS)
+                {
+                    DoSortWorldTriggers();
+                    DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_ANUB_ID);
+                }
+                break;
+            case TYPE_DO_HADRONOX:
+                switch (uiData)
+                {
+                case 0:
+                    ResetHadronoxTriggers();
+                    m_bHadronoxDenied = false;
+                    break;
+                case 1:
+                    // Need to force the triggers to cast this with Hadronox Guid so we can control the summons better
+                    for (GuidList::const_iterator itr = m_lSpiderTriggersGuids.begin(); itr != m_lSpiderTriggersGuids.end(); ++itr)
+                    {
+                        if (Creature* pTrigger = instance->GetCreature(*itr))
+                        {
+                            pTrigger->CastSpell(pTrigger, SPELL_SUMMON_CHAMPION, true, NULL, NULL, m_mNpcEntryGuidStore[NPC_HADRONOX]);
+                            pTrigger->CastSpell(pTrigger, SPELL_SUMMON_NECROMANCER, true, NULL, NULL, m_mNpcEntryGuidStore[NPC_HADRONOX]);
+                            pTrigger->CastSpell(pTrigger, SPELL_SUMMON_CRYPT_FIEND, true, NULL, NULL, m_mNpcEntryGuidStore[NPC_HADRONOX]);
+                        }
+                    }
+                    break;
+                default:
+                    break;
+                }
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            return 0;
+        }
+
+        uint64 GetData64(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case DATA64_ANUB_TRIGGER:
+                return m_anubSummonTarget.GetRawValue();
+            case DATA64_ANUB_ASSASIN:
+                // Get a random summon target
+                if (m_vAssassinSummonTargetsVect.size() > 0)
+                    return m_vAssassinSummonTargetsVect[urand(0, m_vAssassinSummonTargetsVect.size() - 1)].GetRawValue();
+                break;
+            case DATA64_ANUB_GUARDIAN:
+                return m_guardianSummonTarget.GetRawValue();
+            case DATA64_ANUB_DARTER:
+                return m_darterSummonTarget.GetRawValue();
+            default:
+                break;
+            }
+            return 0;
+        }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+            case ACHIEV_CRITERIA_WATCH_DIE:
+                return m_bWatchHimDie;
+            case ACHIEV_CRITERIA_DENIED:
+                return m_bHadronoxDenied;
+
+            default:
+                return false;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_uiWatcherTimer)
+            {
+                if (m_uiWatcherTimer <= uiDiff)
+                {
+                    DoSendWatcherOrKrikthir();
+                    m_uiWatcherTimer = 0;
+                }
+                else
+                    m_uiWatcherTimer -= uiDiff;
+            }
+
+            if (m_uiGauntletEndTimer)
+            {
+                if (m_uiGauntletEndTimer <= uiDiff)
+                {
+                    if (GetData(TYPE_HADRONOX) == IN_PROGRESS)
+                    {
+                        m_uiGauntletEndTimer = 0;
+                        return;
+                    }
+
+                    SetData(TYPE_HADRONOX, SPECIAL);
+
+                    // Allow him to evade - this will start the waypoint movement
+                    if (Creature* pHadronox = GetSingleCreatureFromStorage(NPC_HADRONOX))
+                        pHadronox->AI()->EnterEvadeMode();
+
+                    m_uiGauntletEndTimer = 0;
+                }
+                else
+                    m_uiGauntletEndTimer -= uiDiff;
+            }
+        }
+
+    private:
+        void ResetHadronoxTriggers()
+        {
+            // Drop the summon auras from the triggers
+            for (GuidList::const_iterator itr = m_lSpiderTriggersGuids.begin(); itr != m_lSpiderTriggersGuids.end(); ++itr)
+            {
+                if (Creature* pTrigger = instance->GetCreature(*itr))
+                    pTrigger->RemoveAllAurasOnEvade();
+            }
+        }
+
+        void DoSendWatcherOrKrikthir()
+        {
+            Creature* pAttacker = NULL;
+            Creature* pKrikthir = GetSingleCreatureFromStorage(NPC_KRIKTHIR);
+
+            if (!pKrikthir)
+                return;
+
+            for (uint8 i = 0; i < countof(aWatchers); ++i)
+            {
+                if (Creature* pTemp = GetSingleCreatureFromStorage(aWatchers[i]))
+                {
+                    if (pTemp->IsAlive())
+                    {
+                        if (pAttacker && urand(0, 1))
+                            continue;
+                        else
+                            pAttacker = pTemp;
+                    }
+                }
+            }
+
+            if (pAttacker)
+            {
+                switch (urand(0, 2))
+                {
+                case 0: DoScriptText(SAY_SEND_GROUP_1, pKrikthir); break;
+                case 1: DoScriptText(SAY_SEND_GROUP_2, pKrikthir); break;
+                case 2: DoScriptText(SAY_SEND_GROUP_3, pKrikthir); break;
+                }
+            }
+            else
+                pAttacker = pKrikthir;
+
+            if (Player* pTarget = instance->GetPlayer(m_playerGuid))
+            {
+                if (pTarget->IsAlive())
+                    pAttacker->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void DoSortWorldTriggers()
+        {
+            if (Creature* pAnub = GetSingleCreatureFromStorage(NPC_ANUBARAK))
+            {
+                float fZ = pAnub->GetPositionZ();
+                float fTriggZ = 0;
+
+                for (GuidList::const_iterator itr = m_lTriggerGuids.begin(); itr != m_lTriggerGuids.end(); ++itr)
+                {
+                    if (Creature* pTrigg = instance->GetCreature(*itr))
+                    {
+                        // Sort only triggers in a range of 100
+                        if (pTrigg->GetPositionY() < pAnub->GetPositionY() + 110)
+                        {
+                            fTriggZ = pTrigg->GetPositionZ();
+
+                            // One npc below the platform
+                            if (fTriggZ < fZ + aSortDistance[0])
+                                m_darterSummonTarget = pTrigg->GetObjectGuid();
+                            // One npc on the boss platform - used to handle the summoned movement
+                            else if (fTriggZ < fZ + aSortDistance[1])
+                                m_anubSummonTarget = pTrigg->GetObjectGuid();
+                            // One npc on the upper pathway
+                            else if (fTriggZ < fZ + aSortDistance[2])
+                                m_guardianSummonTarget = pTrigg->GetObjectGuid();
+                            // Eight npcs on the upper ledges
+                            else if (fTriggZ < fZ + aSortDistance[3])
+                                m_vAssassinSummonTargetsVect.push_back(pTrigg->GetObjectGuid());
+                        }
+                    }
+                }
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        ObjectGuid m_playerGuid;
+
+        // Hadronox triggers
+        GuidList m_lSpiderTriggersGuids;
+
+        // Anub triggers
+        ObjectGuid m_darterSummonTarget;
+        ObjectGuid m_guardianSummonTarget;
+        ObjectGuid m_anubSummonTarget;
+        GuidVector m_vAssassinSummonTargetsVect;
+        GuidList m_lTriggerGuids;
+
+        uint32 m_uiWatcherTimer;
+        uint32 m_uiGauntletEndTimer;
+
+        bool m_bWatchHimDie;
+        bool m_bHadronoxDenied;
+        bool m_bGauntletStarted;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_azjol_nerub(pMap);
+    }
+};
+
+void AddSC_instance_azjol_nerub()
+{
+    Script* s;
+
+    s = new is_azjol_nerub();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_azjol-nerub";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_azjol_nerub;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/borean_tundra.cpp b/src/modules/SD3/scripts/northrend/borean_tundra.cpp
new file mode 100644
index 000000000..8e51c8ab6
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/borean_tundra.cpp
@@ -0,0 +1,1225 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Borean_Tundra
+SD%Complete: 100
+SDComment: Quest support: 11570, 11590, 11673, 11728, 11865, 11889, 11897, 11919, 11940
+SDCategory: Borean Tundra
+EndScriptData */
+
+/* ContentData
+npc_nesingwary_trapper
+npc_sinkhole_kill_credit
+npc_lurgglbr
+npc_beryl_sorcerer
+npc_captured_beryl_sorcerer
+npc_nexus_drake_hatchling
+npc_scourged_flamespitter
+npc_bonker_togglevolt
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "TemporarySummon.h"
+#include "follower_ai.h"
+
+/*######
+## npc_nesingwary_trapper
+######*/
+
+enum
+{
+    NPC_NESINGWARY_TRAPPER  = 25835,
+    GO_QUALITY_FUR          = 187983,
+
+    SAY_PHRASE_1            = -1000599,
+    SAY_PHRASE_2            = -1000600,
+    SAY_PHRASE_3            = -1000601,
+    SAY_PHRASE_4            = -1000602
+};
+
+struct npc_nesingwary_trapper : public CreatureScript
+{
+    npc_nesingwary_trapper() : CreatureScript("npc_nesingwary_trapper") {}
+
+    struct npc_nesingwary_trapperAI : public ScriptedAI
+    {
+        npc_nesingwary_trapperAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint8 m_uiPhase;
+        uint32 m_uiPhaseTimer;
+        ObjectGuid m_playerGuid;
+        ObjectGuid m_trapGuid;
+
+        void Reset() override
+        {
+            m_uiPhase = 0;
+            m_uiPhaseTimer = 0;
+            m_playerGuid.Clear();
+            m_trapGuid.Clear();
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_uiPhase && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 20.0f))
+            {
+                m_uiPhase = 1;
+                m_uiPhaseTimer = 1000;
+                m_playerGuid = pWho->GetObjectGuid();
+
+                if (m_creature->IsTemporarySummon())
+                {
+                    // Get the summoner trap
+                    if (GameObject* pTrap = m_creature->GetMap()->GetGameObject(((TemporarySummon*)m_creature)->GetSummonerGuid()))
+                        m_trapGuid = pTrap->GetObjectGuid();
+                }
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            if (GameObject* pTrap = m_creature->GetMap()->GetGameObject(m_trapGuid))
+            {
+                // respawn the Quality Fur
+                if (GameObject* pGoFur = GetClosestGameObjectWithEntry(pTrap, GO_QUALITY_FUR, INTERACTION_DISTANCE))
+                {
+                    if (!pGoFur->isSpawned())
+                    {
+                        pGoFur->SetRespawnTime(10);
+                        pGoFur->Refresh();
+                    }
+                }
+            }
+
+            m_uiPhaseTimer = 2000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->getVictim() && m_uiPhaseTimer)
+            {
+                if (m_uiPhaseTimer <= uiDiff)
+                {
+                    switch (m_uiPhase)
+                    {
+                    case 1:
+                        if (GameObject* pTrap = m_creature->GetMap()->GetGameObject(m_trapGuid))
+                        {
+                            float fX, fY, fZ;
+                            pTrap->GetContactPoint(m_creature, fX, fY, fZ);
+
+                            m_creature->SetWalk(false);
+                            m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                        }
+                        m_uiPhaseTimer = 0;
+                        break;
+                    case 2:
+                        switch (urand(0, 3))
+                        {
+                        case 0: DoScriptText(SAY_PHRASE_1, m_creature); break;
+                        case 1: DoScriptText(SAY_PHRASE_2, m_creature); break;
+                        case 2: DoScriptText(SAY_PHRASE_3, m_creature); break;
+                        case 3: DoScriptText(SAY_PHRASE_4, m_creature); break;
+                        }
+                        m_creature->HandleEmote(EMOTE_ONESHOT_LOOT);
+                        m_uiPhaseTimer = 3000;
+                        break;
+                    case 3:
+                        if (GameObject* pTrap = m_creature->GetMap()->GetGameObject(m_trapGuid))
+                        {
+                            pTrap->Use(m_creature);
+
+                            if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                            {
+                                if (pPlayer->IsAlive())
+                                    pPlayer->KilledMonsterCredit(m_creature->GetEntry());
+                            }
+                        }
+                        m_uiPhaseTimer = 0;
+                        break;
+                    }
+                    ++m_uiPhase;
+                }
+                else
+                    m_uiPhaseTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_nesingwary_trapperAI(pCreature);
+    }
+};
+
+/*#####
+# npc_oil_stained_wolf
+#####*/
+
+enum
+{
+    SPELL_THROW_WOLF_BAIT           = 53326,
+    SPELL_PLACE_WOLF_BAIT           = 46072,                // doesn't appear to be used for anything
+    SPELL_HAS_EATEN                 = 46073,
+    SPELL_SUMMON_DROPPINGS          = 46075,
+
+    FACTION_MONSTER                 = 634,
+
+    POINT_DEST                      = 1
+};
+
+struct npc_oil_stained_wolf : public CreatureScript
+{
+    npc_oil_stained_wolf() : CreatureScript("npc_oil_stained_wolf") {}
+
+    struct npc_oil_stained_wolfAI : public ScriptedAI
+    {
+        npc_oil_stained_wolfAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        bool m_bCanCrapInPublic;
+        uint32 m_uiPooTimer;
+
+        void Reset() override
+        {
+            m_bCanCrapInPublic = false;
+            m_uiPooTimer = 0;
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE)
+                return;
+
+            if (uiPointId == POINT_DEST)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_HAS_EATEN);
+                m_uiPooTimer = 4000;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (m_uiPooTimer)
+                {
+                    if (m_uiPooTimer <= uiDiff)
+                    {
+                        if (m_bCanCrapInPublic)
+                        {
+                            DoCastSpellIfCan(m_creature, SPELL_SUMMON_DROPPINGS);
+                            m_creature->GetMotionMaster()->Clear();
+                            Reset();
+                        }
+                        else
+                        {
+                            m_creature->HandleEmote(EMOTE_ONESHOT_BATTLEROAR);
+                            m_bCanCrapInPublic = true;
+                            m_uiPooTimer = 3000;
+                        }
+                    }
+                    else
+                        m_uiPooTimer -= uiDiff;
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_oil_stained_wolfAI(pCreature);
+    }
+};
+
+struct spell_throw_wolf_batt : public SpellScript
+{
+    spell_throw_wolf_batt() : SpellScript("spell_throw_wolf_batt") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_THROW_WOLF_BAIT)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+            if (uiEffIndex == EFFECT_INDEX_0 && pCreatureTarget->getFaction() != FACTION_MONSTER && !pCreatureTarget->HasAura(SPELL_HAS_EATEN))
+            {
+                pCreatureTarget->SetFactionTemporary(FACTION_MONSTER);
+                pCreatureTarget->SetWalk(false);
+
+                pCreatureTarget->GetMotionMaster()->MoveIdle();
+
+                float fX, fY, fZ;
+                pCaster->GetContactPoint(pCreatureTarget, fX, fY, fZ, CONTACT_DISTANCE);
+                pCreatureTarget->GetMotionMaster()->MovePoint(POINT_DEST, fX, fY, fZ);
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+struct aura_wolf_has_eaten : public AuraScript
+{
+    aura_wolf_has_eaten() : AuraScript("aura_wolf_has_eaten") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() == SPELL_HAS_EATEN)
+        {
+            if (pAura->GetEffIndex() != EFFECT_INDEX_0)
+                return false;
+
+            if (bApply)
+            {
+                pAura->GetTarget()->HandleEmote(EMOTE_ONESHOT_CUSTOMSPELL01);
+            }
+            else
+            {
+                Creature* pCreature = (Creature*)pAura->GetTarget();
+                pCreature->setFaction(pCreature->GetCreatureInfo()->FactionAlliance);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*#####
+# npc_sinkhole_kill_credit
+#####*/
+
+enum
+{
+    SPELL_SUMMON_EXPLOSIVES_CART_FIRE   = 46799,
+    SPELL_SUMMON_SCOURGE_BURROWER       = 46800,
+    SPELL_COSMETIC_HUGE_EXPLOSION       = 46225,
+    SPELL_CANNON_FIRE                   = 42445,
+};
+
+struct npc_sinkhole_kill_credit : public CreatureScript
+{
+    npc_sinkhole_kill_credit() : CreatureScript("npc_sinkhole_kill_credit") {}
+
+    struct npc_sinkhole_kill_creditAI : public ScriptedAI
+    {
+        npc_sinkhole_kill_creditAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_cartGuid;
+        ObjectGuid m_wormGuid;
+        uint32 m_uiCartTimer;
+        uint32 m_uiCartPhase;
+
+        void Reset() override
+        {
+            m_cartGuid.Clear();
+            m_wormGuid.Clear();
+            m_uiCartTimer = 2000;
+            m_uiCartPhase = 0;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            m_wormGuid = pSummoned->GetObjectGuid();
+        }
+
+        void JustSummoned(GameObject* pGo) override
+        {
+            // Go is not really needed, but ok to use as a check point so only one "event" can be processed at a time
+            if (m_cartGuid)
+                return;
+
+            // Expecting summoned from mangos dummy effect 46797
+            m_cartGuid = pGo->GetObjectGuid();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_cartGuid)
+            {
+                if (m_uiCartTimer <= uiDiff)
+                {
+                    switch (m_uiCartPhase)
+                    {
+                    case 0:
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_EXPLOSIVES_CART_FIRE);
+                        m_uiCartTimer = 4000;
+                        break;
+                    case 1:
+                        // Unclear if these should be in a dummy effect or not.
+                        // The order of spells are correct though.
+                        DoCastSpellIfCan(m_creature, SPELL_COSMETIC_HUGE_EXPLOSION, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_CANNON_FIRE, CAST_TRIGGERED);
+                        break;
+                    case 2:
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_SCOURGE_BURROWER);
+                        m_uiCartTimer = 2000;
+                        break;
+                    case 3:
+                        if (Creature* pWorm = m_creature->GetMap()->GetCreature(m_wormGuid))
+                        {
+                            pWorm->SetDeathState(JUST_DIED);
+                            pWorm->SetHealth(0);
+                        }
+                        m_uiCartTimer = 10000;
+                        break;
+                    case 4:
+                        if (Creature* pWorm = m_creature->GetMap()->GetCreature(m_wormGuid))
+                            pWorm->RemoveCorpse();
+
+                        Reset();
+                        return;
+                    }
+
+                    ++m_uiCartPhase;
+                }
+                else
+                    m_uiCartTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_sinkhole_kill_creditAI(pCreature);
+    }
+};
+
+/*######
+## npc_lurgglbr
+######*/
+
+enum
+{
+    QUEST_ESCAPE_FROM_WINTERFIN_CAVERNS = 11570,
+    GO_CAGE                             = 187369,
+
+    SAY_START_1                         = -1000575,
+    SAY_START_2                         = -1000576,
+    SAY_END_1                           = -1000577,
+    SAY_END_2                           = -1000578
+};
+
+struct npc_lurgglbr : public CreatureScript
+{
+    npc_lurgglbr() : CreatureScript("npc_lurgglbr") {}
+
+    struct npc_lurgglbrAI : public npc_escortAI
+    {
+        npc_lurgglbrAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_uiSayTimer = 0;
+            m_uiSpeech = 0;
+        }
+
+        uint32 m_uiSayTimer;
+        uint8 m_uiSpeech;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiSayTimer = 0;
+                m_uiSpeech = 0;
+            }
+        }
+
+        void JustStartedEscort() override
+        {
+            if (GameObject* pCage = GetClosestGameObjectWithEntry(m_creature, GO_CAGE, INTERACTION_DISTANCE))
+            {
+                if (pCage->GetGoState() == GO_STATE_READY)
+                    pCage->Use(m_creature);
+            }
+        }
+
+        void WaypointStart(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 1:
+                if (Player* pPlayer = GetPlayerForEscort())
+                    DoScriptText(SAY_START_2, m_creature, pPlayer);
+
+                // Cage actually closes here, however it's normally determined by GO template and auto close time
+
+                break;
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    m_creature->SetFacingToObject(pPlayer);
+                    DoScriptText(SAY_START_1, m_creature, pPlayer);
+                }
+                break;
+            case 25:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_END_1, m_creature, pPlayer);
+                    m_uiSayTimer = 3000;
+                }
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (m_uiSayTimer)
+                {
+                    if (m_uiSayTimer <= uiDiff)
+                    {
+                        Player* pPlayer = GetPlayerForEscort();
+
+                        if (!pPlayer)
+                        {
+                            m_uiSayTimer = 0;
+                            return;
+                        }
+
+                        m_creature->SetFacingToObject(pPlayer);
+
+                        switch (m_uiSpeech)
+                        {
+                        case 0:
+                            DoScriptText(SAY_END_2, m_creature, pPlayer);
+                            m_uiSayTimer = 3000;
+                            break;
+                        case 1:
+                            pPlayer->GroupEventHappens(QUEST_ESCAPE_FROM_WINTERFIN_CAVERNS, m_creature);
+                            m_uiSayTimer = 0;
+                            break;
+                        }
+
+                        ++m_uiSpeech;
+                    }
+                    else
+                        m_uiSayTimer -= uiDiff;
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ESCAPE_FROM_WINTERFIN_CAVERNS)
+        {
+            if (npc_lurgglbrAI* pEscortAI = dynamic_cast<npc_lurgglbrAI*>(pCreature->AI()))
+            {
+                pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_lurgglbrAI(pCreature);
+    }
+};
+
+/*#####
+# npc_beryl_sorcerer
+#####*/
+
+enum
+{
+    SPELL_ARCANE_CHAINS                 = 45611,
+    SPELL_ARCANE_CHAINS_CHANNEL         = 45630,
+    SPELL_SUMMON_CHAINS_CHARACTER       = 45625,                // triggers 45626
+    // SPELL_ENSLAVED_ARCANE_CHAINS     = 45632,                // chain visual - purpose unk, probably used on quest end
+
+    NPC_BERYL_SORCERER                  = 25316,
+    NPC_CAPTURED_BERYL_SORCERER         = 25474,
+};
+
+struct aura_arcane_chains : public AuraScript
+{
+    aura_arcane_chains() : AuraScript("aura_arcane_chains") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() == SPELL_ARCANE_CHAINS)
+        {
+            if (pAura->GetEffIndex() != EFFECT_INDEX_0 || !bApply)
+                return false;
+
+            Creature* pCreature = (Creature*)pAura->GetTarget();
+            Unit* pCaster = pAura->GetCaster();
+            if (!pCreature || !pCaster || pCaster->GetTypeId() != TYPEID_PLAYER || pCreature->GetEntry() != NPC_BERYL_SORCERER)
+                return false;
+
+            // only for wounded creatures
+            if (pCreature->GetHealthPercent() > 30.0f)
+                return false;
+
+            // spawn the captured sorcerer, apply dummy aura on the summoned and despawn
+            pCaster->CastSpell(pCreature, SPELL_SUMMON_CHAINS_CHARACTER, true);
+            pCaster->CastSpell(pCaster, SPELL_ARCANE_CHAINS_CHANNEL, true);
+            pCreature->ForcedDespawn();
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*#####
+# npc_captured_beryl_sorcerer
+#####*/
+struct aura_arcane_chains_cancel : public AuraScript
+{
+    aura_arcane_chains_cancel() : AuraScript("aura_arcane_chains_cancel") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() == SPELL_ARCANE_CHAINS_CHANNEL)
+        {
+            if (pAura->GetEffIndex() != EFFECT_INDEX_0 || !bApply)
+                return false;
+
+            Creature* pCreature = (Creature*)pAura->GetTarget();
+            Unit* pCaster = pAura->GetCaster();
+            if (!pCreature || !pCaster || pCaster->GetTypeId() != TYPEID_PLAYER || pCreature->GetEntry() != NPC_CAPTURED_BERYL_SORCERER)
+                return false;
+
+            // follow the caster
+            ((Player*)pCaster)->KilledMonsterCredit(NPC_CAPTURED_BERYL_SORCERER);
+            pCreature->GetMotionMaster()->MoveFollow(pCaster, pCreature->GetDistance(pCaster), M_PI_F - pCreature->GetAngle(pCaster));
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_nexus_drake_hatchling
+######*/
+
+enum
+{
+    // combat spells
+    SPELL_INTANGIBLE_PRESENCE           = 36513,
+    SPELL_NETHERBREATH                  = 36631,
+
+    // quest start spells
+    SPELL_DRAKE_HARPOON                 = 46607,                    // initial spell
+    SPELL_RED_DRAGONBLOOD               = 46620,                    // applied by aura 46607
+    SPELL_CAPTURE_TRIGGER               = 46673,                    // notify the drake that it was captured; triggered by aura 46620 expire
+    SPELL_SUBDUED                       = 46675,                    // visual spell; triggered by spell 46673
+    SPELL_DRAKE_HATCHLING_SUBDUED       = 46691,                    // inform player that drake has been captured; triggered by spell 46673
+    SPELL_DRAKE_VOMIT_PERIODIC          = 46678,                    // visual spell; triggered by spell 46673
+
+    // quest completion spells
+    SPELL_DRAKE_TURN_IN                 = 46696,                    // notify the drake that quest is finised
+    SPELL_STRIP_AURAS                   = 46693,                    // remove all quest auras
+    SPELL_DRAKE_COMPLETION_PING         = 46702,
+    SPELL_RAELORASZ_FIREBALL            = 46704,
+    SPELL_COMPLETE_IMMOLATION           = 46703,
+
+    NPC_RAELORASZ                       = 26117,                    // quest giver / taker
+    NPC_NEXUS_DRAKE_HATCHLING           = 26127,
+    NPC_COLDARRA_DRAKE_HUNT_INVISMAN    = 26175,                    // quest credit
+
+    QUEST_DRAKE_HUNT                    = 11919,
+    QUEST_DRAKE_HUNT_DAILY              = 11940,
+
+    FACTION_FRIENDLY                    = 35,
+};
+
+struct npc_nexus_drake_hatchling : public CreatureScript
+{
+    npc_nexus_drake_hatchling() : CreatureScript("npc_nexus_drake_hatchling") {}
+
+    struct npc_nexus_drake_hatchlingAI : public FollowerAI
+    {
+        npc_nexus_drake_hatchlingAI(Creature* pCreature) : FollowerAI(pCreature) { }
+
+        uint32 m_uiNetherbreathTimer;
+        uint32 m_uiPresenceTimer;
+        uint32 m_uiSubduedTimer;
+
+        void Reset() override
+        {
+            m_uiNetherbreathTimer = urand(2000, 4000);
+            m_uiPresenceTimer = urand(15000, 17000);
+            m_uiSubduedTimer = 0;
+        }
+
+        void EnterEvadeMode() override
+        {
+            // force check for evading when the faction is changed
+            if (m_uiSubduedTimer)
+                return;
+
+            FollowerAI::EnterEvadeMode();
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            FollowerAI::MoveInLineOfSight(pWho);
+
+            if (!m_creature->HasAura(SPELL_SUBDUED) || m_creature->getVictim())
+                return;
+
+            if (pWho->GetEntry() == NPC_COLDARRA_DRAKE_HUNT_INVISMAN && m_creature->IsWithinDistInMap(pWho, 20.0f))
+            {
+                Player* pPlayer = GetLeaderForFollower();
+                if (!pPlayer || !pPlayer->HasAura(SPELL_DRAKE_HATCHLING_SUBDUED))
+                    return;
+
+                pWho->CastSpell(pPlayer, SPELL_STRIP_AURAS, true);
+                // give kill credit, mark the follow as completed and start the final event
+                pPlayer->KilledMonsterCredit(NPC_COLDARRA_DRAKE_HUNT_INVISMAN);
+                pPlayer->CastSpell(m_creature, SPELL_DRAKE_TURN_IN, true);
+                SetFollowComplete(true);
+            }
+        }
+
+        void JustRespawned() override
+        {
+            // reset stand state if required
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            FollowerAI::JustRespawned();
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            // start following
+            if (eventType == AI_EVENT_START_EVENT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                StartFollow((Player*)pInvoker);
+                m_uiSubduedTimer = 3 * MINUTE * IN_MILLISECONDS;
+            }
+            // timeout; quest failed
+            else if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                // check if the quest isn't already completed
+                if (!HasFollowState(STATE_FOLLOW_COMPLETE))
+                {
+                    // force reset
+                    JustRespawned();
+                    ScriptedAI::EnterEvadeMode();
+                }
+            }
+        }
+
+        void UpdateFollowerAI(const uint32 uiDiff)
+        {
+            if (m_uiSubduedTimer)
+            {
+                if (m_uiSubduedTimer <= uiDiff)
+                    m_uiSubduedTimer = 0;
+                else
+                    m_uiSubduedTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiNetherbreathTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_NETHERBREATH) == CAST_OK)
+                    m_uiNetherbreathTimer = urand(17000, 20000);
+            }
+            else
+                m_uiNetherbreathTimer -= uiDiff;
+
+            if (m_uiPresenceTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_INTANGIBLE_PRESENCE) == CAST_OK)
+                    m_uiPresenceTimer = urand(18000, 20000);
+            }
+            else
+                m_uiPresenceTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_nexus_drake_hatchlingAI(pCreature);
+    }
+};
+
+struct aura_drake_harpoon : public AuraScript
+{
+    aura_drake_harpoon() : AuraScript("aura_drake_harpoon") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetEffIndex() != EFFECT_INDEX_0 || !bApply)
+            return false;
+
+        Creature* pCreature = (Creature*)pAura->GetTarget();
+        Unit* pCaster = pAura->GetCaster();
+        if (!pCreature || !pCaster || pCaster->GetTypeId() != TYPEID_PLAYER || pCreature->GetEntry() != NPC_NEXUS_DRAKE_HATCHLING)
+            return false;
+
+        // check if drake is already doing the quest
+        if (pCreature->HasAura(SPELL_RED_DRAGONBLOOD) || pCreature->HasAura(SPELL_SUBDUED))
+            return false;
+
+        pCaster->CastSpell(pCreature, SPELL_RED_DRAGONBLOOD, true);
+        return true;
+    }
+};
+
+struct aura_red_dragonblood : public AuraScript
+{
+    aura_red_dragonblood() : AuraScript("aura_red_dragonblood") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        Creature* pCreature = (Creature*)pAura->GetTarget();
+        Unit* pCaster = pAura->GetCaster();
+        if (!pCreature || !pCaster || pCaster->GetTypeId() != TYPEID_PLAYER || pCreature->GetEntry() != NPC_NEXUS_DRAKE_HATCHLING)
+            return false;
+
+        // start attacking on apply and capture on aura expire
+        if (bApply)
+            pCreature->AI()->AttackStart(pCaster);
+        else
+            pCaster->CastSpell(pCreature, SPELL_CAPTURE_TRIGGER, true);
+
+        return true;
+    }
+};
+
+struct aura_spell_drake_subdued : public AuraScript
+{
+    aura_spell_drake_subdued() : AuraScript("aura_spell_drake_subdued") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        Creature* pCreature = (Creature*)pAura->GetTarget();
+        if (!pCreature || pCreature->GetEntry() != NPC_NEXUS_DRAKE_HATCHLING)
+            return false;
+
+        // aura expired - evade
+        pCreature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pCreature, pCreature);
+        return true;
+    }
+};
+
+struct spell_capture_trigger : public SpellScript
+{
+    spell_capture_trigger() : SpellScript("spell_capture_trigger") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (pCaster->GetTypeId() != TYPEID_PLAYER)
+            return true;
+
+        Creature* pCreatureTarget = pTarget->ToCreature();
+        if (pCaster->HasAura(SPELL_DRAKE_HATCHLING_SUBDUED) || pCreatureTarget->HasAura(SPELL_SUBDUED))
+            return true;
+
+        Player* pPlayer = (Player*)pCaster;
+        if (!pPlayer)
+            return true;
+
+        // check the quest
+        if (pPlayer->GetQuestStatus(QUEST_DRAKE_HUNT) != QUEST_STATUS_INCOMPLETE && pPlayer->GetQuestStatus(QUEST_DRAKE_HUNT_DAILY) != QUEST_STATUS_INCOMPLETE)
+            return true;
+
+        // evade and set friendly and start following @TODO move to creature script
+        pCreatureTarget->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_REACH_HOME | TEMPFACTION_RESTORE_RESPAWN);
+        pCreatureTarget->DeleteThreatList();
+        pCreatureTarget->CombatStop(true);
+        pCreatureTarget->AI()->SendAIEvent(AI_EVENT_START_EVENT, pCaster, pCreatureTarget);
+
+        // cast visual spells
+        pCreatureTarget->CastSpell(pCreatureTarget, SPELL_DRAKE_VOMIT_PERIODIC, true);
+        pCreatureTarget->CastSpell(pCreatureTarget, SPELL_SUBDUED, true);
+        pCreatureTarget->CastSpell(pCaster, SPELL_DRAKE_HATCHLING_SUBDUED, true);
+        return true;
+    }
+};
+
+struct spell_drake_turn_in : public SpellScript
+{
+    spell_drake_turn_in() : SpellScript("spell_drake_turn_in") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        Creature* pCreatureTarget = pTarget->ToCreature();
+
+        if (Creature* pRaelorasz = GetClosestCreatureWithEntry(pCreatureTarget, NPC_RAELORASZ, 30.0f))
+        {
+            // Inform Raelorasz and move in front of him
+            pCreatureTarget->CastSpell(pRaelorasz, SPELL_DRAKE_COMPLETION_PING, true);
+            float fX, fY, fZ;
+            pRaelorasz->GetContactPoint(pCreatureTarget, fX, fY, fZ, CONTACT_DISTANCE);
+            pCreatureTarget->GetMotionMaster()->Clear(true, true);
+            pCreatureTarget->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+        }
+        return true;
+    }
+};
+
+struct spell_raelorasz_fireball : public SpellScript
+{
+    spell_raelorasz_fireball() : SpellScript("spell_raelorasz_fireball") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        Creature* pCreatureTarget = pTarget->ToCreature();
+        pCreatureTarget->CastSpell(pCreatureTarget, SPELL_COMPLETE_IMMOLATION, true);
+        pCreatureTarget->SetStandState(UNIT_STAND_STATE_DEAD);
+        pCreatureTarget->ForcedDespawn(10000);
+        return true;
+    }
+};
+
+/*#####
+# npc_scourged_flamespitter
+#####*/
+
+enum
+{
+    SPELL_REINFORCED_NET                = 46361,
+    SPELL_NET                           = 47021,
+
+    SPELL_INCINERATE_COSMETIC           = 45863,
+    SPELL_INCINERATE                    = 32707,
+
+    NPC_FLAMESPITTER                    = 25582,
+};
+
+struct npc_scourged_flamespitter : public CreatureScript
+{
+    npc_scourged_flamespitter() : CreatureScript("npc_scourged_flamespitter") {}
+
+    struct  npc_scourged_flamespitterAI : public ScriptedAI
+    {
+        npc_scourged_flamespitterAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiIncinerateTimer;
+        uint32 m_uiNetExpireTimer;
+
+        void Reset() override
+        {
+            m_uiIncinerateTimer = urand(1000, 2000);
+            m_uiNetExpireTimer = 0;
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, false))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                DoStartMovement(pWho, 10.0f);
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            if (DoCastSpellIfCan(m_creature, SPELL_NET) == CAST_OK)
+                m_uiNetExpireTimer = 20000;
+        }
+
+        void UpdateAI(const uint32 uiDiff)
+        {
+            if (m_uiNetExpireTimer)
+            {
+                if (m_uiNetExpireTimer <= uiDiff)
+                {
+                    // evade when the net root has expired
+                    if (!m_creature->getVictim())
+                        EnterEvadeMode();
+
+                    m_uiNetExpireTimer = 0;
+                }
+                else
+                    m_uiNetExpireTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                // incinerate visual on OOC timer, unless creature is rooted
+                if (!m_uiNetExpireTimer)
+                {
+                    if (m_uiIncinerateTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_INCINERATE_COSMETIC) == CAST_OK)
+                            m_uiIncinerateTimer = urand(3000, 5000);
+                    }
+                    else
+                        m_uiIncinerateTimer -= uiDiff;
+                }
+
+                return;
+            }
+
+            if (m_uiIncinerateTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_INCINERATE) == CAST_OK)
+                    m_uiIncinerateTimer = urand(3000, 5000);
+            }
+            else
+                m_uiIncinerateTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_scourged_flamespitterAI(pCreature);
+    }
+};
+
+struct aura_reinforced_net : public AuraScript
+{
+    aura_reinforced_net() : AuraScript("aura_reinforced_net") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply)
+    {
+        if (pAura->GetId() == SPELL_REINFORCED_NET && pAura->GetEffIndex() == EFFECT_INDEX_0 && bApply)
+        {
+            Creature* pCreature = (Creature*)pAura->GetTarget();
+            Unit* pCaster = pAura->GetCaster();
+            if (!pCreature || !pCaster || pCaster->GetTypeId() != TYPEID_PLAYER || pCreature->GetEntry() != NPC_FLAMESPITTER)
+                return false;
+
+            // move the flamespitter to the ground level
+            pCreature->GetMotionMaster()->Clear();
+            pCreature->SetWalk(false);
+
+            float fGroundZ = pCreature->GetMap()->GetHeight(pCreature->GetPhaseMask(), pCreature->GetPositionX(), pCreature->GetPositionY(), pCreature->GetPositionZ());
+            pCreature->GetMotionMaster()->MovePoint(1, pCreature->GetPositionX(), pCreature->GetPositionY(), fGroundZ);
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*#####
+## npc_bonker_togglevolt
+#####*/
+
+enum
+{
+    SAY_BONKER_START            = -1001013,
+    SAY_BONKER_GO               = -1001014,
+    SAY_BONKER_AGGRO            = -1001015,
+    SAY_BONKER_LEFT             = -1001016,
+    SAY_BONKER_COMPLETE         = -1001017,
+
+    QUEST_ID_GET_ME_OUTA_HERE   = 11673,
+};
+
+struct npc_bonker_togglevolt : public CreatureScript
+{
+    npc_bonker_togglevolt() : CreatureScript("npc_bonker_togglevolt") {}
+
+    struct npc_bonker_togglevoltAI : public npc_escortAI
+    {
+        npc_bonker_togglevoltAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void Reset() override { }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (urand(0, 1))
+                DoScriptText(SAY_BONKER_AGGRO, m_creature);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                DoScriptText(SAY_BONKER_START, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_BONKER_GO, m_creature);
+                // WORKAROUND ALERT - temp ignore pathfinding until we pass the pool
+                // creature cannont find a proper swimming path in this area, so ignore pathfinding for the moment
+                m_creature->addUnitState(UNIT_STAT_IGNORE_PATHFINDING);
+                break;
+            case 3:
+                DoScriptText(SAY_BONKER_LEFT, m_creature);
+                // WORKAROUND END - resume pathfinding
+                m_creature->clearUnitState(UNIT_STAT_IGNORE_PATHFINDING);
+                break;
+            case 32:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_ID_GET_ME_OUTA_HERE, m_creature);
+                    DoScriptText(SAY_BONKER_COMPLETE, m_creature, pPlayer);
+                }
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_bonker_togglevoltAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_GET_ME_OUTA_HERE)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_borean_tundra()
+{
+    Script* s;
+
+    s = new npc_nesingwary_trapper();
+    s->RegisterSelf();
+    s = new npc_oil_stained_wolf();
+    s->RegisterSelf();
+    s = new npc_sinkhole_kill_credit();
+    s->RegisterSelf();
+    s = new npc_lurgglbr();
+    s->RegisterSelf();
+    s = new npc_nexus_drake_hatchling();
+    s->RegisterSelf();
+    s = new npc_scourged_flamespitter();
+    s->RegisterSelf();
+    s = new npc_bonker_togglevolt();
+    s->RegisterSelf();
+
+    s = new spell_throw_wolf_batt();
+    s->RegisterSelf();
+    s = new spell_capture_trigger();
+    s->RegisterSelf();
+    s = new spell_drake_turn_in();
+    s->RegisterSelf();
+    s = new spell_raelorasz_fireball();
+    s->RegisterSelf();
+
+    s = new aura_wolf_has_eaten();
+    s->RegisterSelf();
+    s = new aura_arcane_chains();
+    s->RegisterSelf();
+    s = new aura_arcane_chains_cancel();
+    s->RegisterSelf();
+    s = new aura_drake_harpoon();
+    s->RegisterSelf();
+    s = new aura_red_dragonblood();
+    s->RegisterSelf();
+    s = new spell_capture_trigger();
+    s->RegisterSelf();
+    s = new aura_reinforced_net();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_nesingwary_trapper";
+    //pNewScript->GetAI = &GetAI_npc_nesingwary_trapper;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_oil_stained_wolf";
+    //pNewScript->GetAI = &GetAI_npc_oil_stained_wolf;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_oil_stained_wolf;
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_npc_oil_stained_wolf;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_sinkhole_kill_credit";
+    //pNewScript->GetAI = &GetAI_npc_sinkhole_kill_credit;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_lurgglbr";
+    //pNewScript->GetAI = &GetAI_npc_lurgglbr;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_lurgglbr;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_beryl_sorcerer";
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_npc_beryl_sorcerer;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_captured_beryl_sorcerer";
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_npc_captured_beryl_sorcerer;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_nexus_drake_hatchling";
+    //pNewScript->GetAI = &GetAI_npc_nexus_drake_hatchling;
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_npc_nexus_drake_hatchling;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_nexus_drake_hatchling;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_scourged_flamespitter";
+    //pNewScript->GetAI = &GetAI_npc_scourged_flamespitter;
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_npc_scourged_flamespitter;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_bonker_togglevolt";
+    //pNewScript->GetAI = &GetAI_npc_bonker_togglevolt;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_bonker_togglevolt;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp
new file mode 100644
index 000000000..fca26b870
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp
@@ -0,0 +1,32 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: grand_champions
+SD%Complete: 0
+SDComment:
+SDCategory: Crusader Coliseum, Trial of the Champion
+EndScriptData */
+
+#include "precompiled.h"
+#include "trial_of_the_champion.h"
+
+void AddSC_boss_grand_champions()
+{
+}
diff --git a/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp
new file mode 100644
index 000000000..541c04319
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp
@@ -0,0 +1,405 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: instance_trial_of_the_champion
+SD%Complete: 20
+SDComment: Basic support
+SDCategory: Crusader Coliseum, Trial of the Champion
+EndScriptData */
+
+#include "precompiled.h"
+#include "trial_of_the_champion.h"
+
+/* Trial of the Champion encounters:
+0 - Grand Champions
+1 - Argent Champion
+2 - Black Knight
+*/
+
+enum
+{
+    // grand champions
+    SAY_HERALD_HORDE_CHALLENGE              = -1650000,
+    SAY_HERALD_HORDE_WARRIOR                = -1650001,
+    SAY_HERALD_HORDE_MAGE                   = -1650002,
+    SAY_HERALD_HORDE_SHAMAN                 = -1650003,
+    SAY_HERALD_HORDE_HUNTER                 = -1650004,
+    SAY_HERALD_HORDE_ROGUE                  = -1650005,
+
+    SAY_HERALD_ALLIANCE_CHALLENGE           = -1650006,
+    SAY_HERALD_ALLIANCE_WARRIOR             = -1650007,
+    SAY_HERALD_ALLIANCE_MAGE                = -1650008,
+    SAY_HERALD_ALLIANCE_SHAMAN              = -1650009,
+    SAY_HERALD_ALLIANCE_HUNTER              = -1650010,
+    SAY_HERALD_ALLIANCE_ROGUE               = -1650011,
+
+    SAY_TIRION_CHALLENGE_WELCOME            = -1650012,
+    SAY_TIRION_FIRST_CHALLENGE              = -1650013,
+    SAY_THRALL_ALLIANCE_CHALLENGE           = -1650014,
+    SAY_GARROSH_ALLIANCE_CHALLENGE          = -1650015,
+    SAY_VARIAN_HORDE_CHALLENGE              = -1650016,
+    SAY_TIRION_CHALLENGE_BEGIN              = -1650017,
+
+    // argent champion
+    SAY_TIRION_ARGENT_CHAMPION              = -1650028,
+    SAY_TIRION_ARGENT_CHAMPION_BEGIN        = -1650029,
+    SAY_HERALD_EADRIC                       = -1650030,
+    SAY_HERALD_PALETRESS                    = -1650031,
+    EMOTE_HORDE_ARGENT_CHAMPION             = -1650032,
+    EMOTE_ALLIANCE_ARGENT_CHAMPION          = -1650033,
+    SAY_EADRIC_INTRO                        = -1650034,
+    SAY_PALETRESS_INTRO_1                   = -1650035,
+    SAY_PALETRESS_INTRO_2                   = -1650036,
+
+    // black knight
+    SAY_TIRION_ARGENT_CHAMPION_COMPLETE     = -1650037,
+    SAY_HERALD_BLACK_KNIGHT_SPAWN           = -1650038,
+    SAY_BLACK_KNIGHT_INTRO_1                = -1650039,
+    SAY_TIRION_BLACK_KNIGHT_INTRO_2         = -1650040,
+    SAY_BLACK_KNIGHT_INTRO_3                = -1650041,
+    SAY_BLACK_KNIGHT_INTRO_4                = -1650042,
+
+    // event complete
+    SAY_TIRION_EPILOG_1                     = -1650043,
+    SAY_TIRION_EPILOG_2                     = -1650044,
+    SAY_VARIAN_ALLIANCE_EPILOG_3            = -1650045,
+    SAY_THRALL_HORDE_EPILOG_3               = -1650046,
+
+    // other texts
+    SAY_GARROSH_OTHER_1                     = -1650047,
+    SAY_THRALL_OTHER_2                      = -1650048,
+    SAY_GARROSH_OTHER_3                     = -1650049,
+    SAY_VARIAN_OTHER_4                      = -1650050,
+    SAY_VARIAN_OTHER_5                      = -1650051,
+
+    // spells
+    SPELL_ARGENT_GET_PLAYER_COUNT           = 66986,
+    SPELL_ARGENT_SUMMON_CHAMPION_1          = 66654,
+    SPELL_ARGENT_SUMMON_CHAMPION_2          = 66671,
+    SPELL_ARGENT_SUMMON_CHAMPION_3          = 66673,
+    SPELL_ARGENT_SUMMON_CHAMPION_WAVE       = 67295,
+    SPELL_ARGENT_SUMMON_BOSS_4              = 67396,
+    SPELL_ARGENT_HERALD_FEIGN_DEATH         = 66804,
+};
+
+static const DialogueEntryTwoSide aTocDialogues[] =
+{
+    // ToDo:
+    {0, 0, 0, 0 , 0}
+};
+
+static const float aHeraldPositions[3][4] =
+{
+    { 745.606f, 619.705f, 411.172f, 4.66003f },                           // Spawn position
+    { 732.524f, 663.007f, 412.393f, 0.0f },                               // Gate movement position
+    { 743.377f, 630.240f, 411.073f, 0.0f },                               // Near center position
+};
+
+// data that provides grand champion entry, vehicle mount, trash champions with the spawn locations as well as crowd stalker and emote entry
+struct ChampionsData
+{
+    uint32 uiEntry, uiMount, uiChampion, uiCrowdStalker;
+    int32 iEmoteEntry;
+    float fX, fY, fZ, fO;
+};
+
+// ToDo: add coords
+static const ChampionsData aAllianceChampions[MAX_CHAMPIONS_AVAILABLE] =
+{
+    { NPC_ALLIANCE_WARRIOR, NPC_ALLIANCE_WARRIOR_MOUNT, NPC_ALLIANCE_WARRIOR_CHAMPION, NPC_SPECTATOR_HUMAN, EMOTE_HUMANS },
+    { NPC_ALLIANCE_MAGE, NPC_ALLIANCE_MAGE_MOUNT, NPC_ALLIANCE_MAGE_CHAMPION, NPC_SPECTATOR_GNOME, EMOTE_GNOMES },
+    { NPC_ALLIANCE_SHAMAN, NPC_ALLIANCE_SHAMAN_MOUNT, NPC_ALLIANCE_SHAMAN_CHAMPION, NPC_SPECTATOR_DRAENEI, EMOTE_DRAENEI },
+    { NPC_ALLIANCE_HUNTER, NPC_ALLIANCE_HUNTER_MOUNT, NPC_ALLIANCE_HUNTER_CHAMPION, NPC_SPECTATOR_NIGHT_ELF, EMOTE_NIGHT_ELVES },
+    { NPC_ALLIANCE_ROGUE, NPC_ALLIANCE_ROGUE_MOUNT, NPC_ALLIANCE_ROGUE_CHAMPION, NPC_SPECTATOR_DWARF, EMOTE_DWARVES }
+};
+
+// ToDo: add coords
+static const ChampionsData aHordeChampions[MAX_CHAMPIONS_AVAILABLE] =
+{
+    { NPC_HORDE_WARRIOR, NPC_HORDE_WARRIOR_MOUNT, NPC_HORDE_WARRIOR_CHAMPION, NPC_SPECTATOR_ORC, EMOTE_ORCS },
+    { NPC_HORDE_MAGE, NPC_HORDE_MAGE_MOUNT, NPC_HORDE_MAGE_CHAMPION, NPC_SPECTATOR_BLOOD_ELF, EMOTE_BLOOD_ELVES },
+    { NPC_HORDE_SHAMAN, NPC_HORDE_SHAMAN_MOUNT, NPC_HORDE_SHAMAN_CHAMPION, NPC_SPECTATOR_TAUREN, EMOTE_TAUREN },
+    { NPC_HORDE_HUNTER, NPC_HORDE_HUNTER_MOUNT, NPC_HORDE_HUNTER_CHAMPION, NPC_SPECTATOR_TROLL, EMOTE_TROLLS },
+    { NPC_HORDE_ROGUE, NPC_HORDE_ROGUE_MOUNT, NPC_HORDE_ROGUE_CHAMPION, NPC_SPECTATOR_UNDEAD, EMOTE_UNDEAD }
+};
+
+// data that provides spawn coordinates and entry for the player mounts
+struct ChampionsMountsData
+{
+    uint32 uiEntryAlliance, uiEntryHorde;
+    float fX, fY, fZ, fO;
+};
+
+static const ChampionsMountsData aTrialChampionsMounts[MAX_CHAMPIONS_MOUNTS] =
+{
+    { NPC_WARHORSE_ALLIANCE, NPC_WARHORSE_HORDE, 720.569f, 571.285f, 412.475f, 1.064f },
+    { NPC_WARHORSE_ALLIANCE, NPC_WARHORSE_HORDE, 722.363f, 660.745f, 412.468f, 4.834f },
+    { NPC_WARHORSE_ALLIANCE, NPC_WARHORSE_HORDE, 699.943f, 643.370f, 412.474f, 5.777f },
+    { NPC_WARHORSE_ALLIANCE, NPC_WARHORSE_HORDE, 768.255f, 661.606f, 412.470f, 4.555f },
+    { NPC_WARHORSE_ALLIANCE, NPC_WARHORSE_HORDE, 787.439f, 584.969f, 412.476f, 2.478f },
+    { NPC_WARHORSE_ALLIANCE, NPC_WARHORSE_HORDE, 793.009f, 592.667f, 412.475f, 2.652f },
+    { NPC_WARHORSE_ALLIANCE, NPC_WARHORSE_HORDE, 704.943f, 651.330f, 412.475f, 5.602f },
+    { NPC_WARHORSE_ALLIANCE, NPC_WARHORSE_HORDE, 702.967f, 587.649f, 412.475f, 0.610f },
+    { NPC_WARHORSE_ALLIANCE, NPC_WARHORSE_HORDE, 712.594f, 576.260f, 412.476f, 0.890f },
+    { NPC_WARHORSE_ALLIANCE, NPC_WARHORSE_HORDE, 774.898f, 573.736f, 412.475f, 2.146f },
+    { NPC_WARHORSE_ALLIANCE, NPC_WARHORSE_HORDE, 790.490f, 646.533f, 412.474f, 3.717f },
+    { NPC_WARHORSE_ALLIANCE, NPC_WARHORSE_HORDE, 777.564f, 660.300f, 412.467f, 4.345f },
+    { NPC_BATTLEWORG_ALLIANCE, NPC_BATTLEWORG_HORDE, 705.497f, 583.944f, 412.476f, 0.698f },
+    { NPC_BATTLEWORG_ALLIANCE, NPC_BATTLEWORG_HORDE, 790.177f, 589.059f, 412.475f, 2.565f },
+    { NPC_BATTLEWORG_ALLIANCE, NPC_BATTLEWORG_HORDE, 702.165f, 647.267f, 412.475f, 5.689f },
+    { NPC_BATTLEWORG_ALLIANCE, NPC_BATTLEWORG_HORDE, 717.443f, 660.646f, 412.467f, 4.921f },
+    { NPC_BATTLEWORG_ALLIANCE, NPC_BATTLEWORG_HORDE, 716.665f, 573.495f, 412.475f, 0.977f },
+    { NPC_BATTLEWORG_ALLIANCE, NPC_BATTLEWORG_HORDE, 793.052f, 642.851f, 412.474f, 3.630f },
+    { NPC_BATTLEWORG_ALLIANCE, NPC_BATTLEWORG_HORDE, 726.826f, 661.201f, 412.472f, 4.660f },
+    { NPC_BATTLEWORG_ALLIANCE, NPC_BATTLEWORG_HORDE, 773.097f, 660.733f, 412.467f, 4.450f },
+    { NPC_BATTLEWORG_ALLIANCE, NPC_BATTLEWORG_HORDE, 788.016f, 650.788f, 412.475f, 3.804f },
+    { NPC_BATTLEWORG_ALLIANCE, NPC_BATTLEWORG_HORDE, 700.531f, 591.927f, 412.475f, 0.523f },
+    { NPC_BATTLEWORG_ALLIANCE, NPC_BATTLEWORG_HORDE, 770.486f, 571.552f, 412.475f, 2.059f },
+    { NPC_BATTLEWORG_ALLIANCE, NPC_BATTLEWORG_HORDE, 778.741f, 576.049f, 412.476f, 2.234f },
+};
+
+struct is_trial_of_the_champion : public InstanceScript
+{
+    is_trial_of_the_champion() : InstanceScript("instance_trial_of_the_champion") {}
+
+    class instance_trial_of_the_champion : public ScriptedInstance, private DialogueHelper
+    {
+    public:
+        instance_trial_of_the_champion(Map* pMap) : ScriptedInstance(pMap), DialogueHelper(aTocDialogues),
+            m_uiTeam(TEAM_NONE),
+            m_uiHeraldEntry(0),
+            m_uiGrandChampionEntry(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+            InitializeDialogueHelper(this);
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            if (!m_uiTeam)
+            {
+                m_uiTeam = pPlayer->GetTeam();
+                SetDialogueSide(m_uiTeam == ALLIANCE);
+
+                m_uiHeraldEntry = m_uiTeam == ALLIANCE ? NPC_ARELAS_BRIGHTSTAR : NPC_JAEREN_SUNSWORN;
+
+                // set a random grand champion
+                m_uiGrandChampionEntry = urand(0, 1) ? NPC_EADRIC : NPC_PALETRESS;
+
+                if (m_vChampionsIndex.empty())
+                {
+                    m_vChampionsIndex.resize(MAX_CHAMPIONS_AVAILABLE);
+
+                    // fill vector array with indexes from creature array
+                    for (uint8 i = 0; i < MAX_CHAMPIONS_AVAILABLE; ++i)
+                        m_vChampionsIndex[i] = i;
+
+                    // set a random champion list
+                    std::random_shuffle(m_vChampionsIndex.begin(), m_vChampionsIndex.end());
+                }
+            }
+
+            DoSummonHeraldIfNeeded(pPlayer);
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_JAEREN_SUNSWORN:
+            case NPC_ARELAS_BRIGHTSTAR:
+            case NPC_TIRION_FORDRING:
+            case NPC_VARIAN_WRYNN:
+            case NPC_THRALL:
+            case NPC_GARROSH:
+            case NPC_ALLIANCE_WARRIOR:
+            case NPC_ALLIANCE_MAGE:
+            case NPC_ALLIANCE_SHAMAN:
+            case NPC_ALLIANCE_HUNTER:
+            case NPC_ALLIANCE_ROGUE:
+            case NPC_HORDE_WARRIOR:
+            case NPC_HORDE_MAGE:
+            case NPC_HORDE_SHAMAN:
+            case NPC_HORDE_HUNTER:
+            case NPC_HORDE_ROGUE:
+            case NPC_EADRIC:
+            case NPC_PALETRESS:
+                break;
+            default:
+                return;
+            }
+
+            m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_MAIN_GATE:
+            case GO_NORTH_GATE:
+            case GO_CHAMPIONS_LOOT:
+            case GO_CHAMPIONS_LOOT_H:
+            case GO_EADRIC_LOOT:
+            case GO_EADRIC_LOOT_H:
+            case GO_PALETRESS_LOOT:
+            case GO_PALETRESS_LOOT_H:
+                break;
+            default:
+                return;
+            }
+
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_GRAND_CHAMPIONS:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                    DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CHAMPIONS_LOOT : GO_CHAMPIONS_LOOT_H, 30 * MINUTE);
+                break;
+            case TYPE_ARGENT_CHAMPION:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    if (m_uiGrandChampionEntry == NPC_EADRIC)
+                        DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_EADRIC_LOOT : GO_EADRIC_LOOT_H, 30 * MINUTE);
+                    else if (m_uiGrandChampionEntry == NPC_PALETRESS)
+                        DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_PALETRESS_LOOT : GO_PALETRESS_LOOT_H, 30 * MINUTE);
+                }
+                break;
+            case TYPE_BLACK_KNIGHT:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_DO_PREPARE_CHAMPIONS:
+                DoPrepareChampions(bool(uiData));
+                return;
+            default:
+                script_error_log("Instance Trial of The Champion: ERROR SetData = %u for type %u does not exist/not implemented.", uiType, uiData);
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override { DialogueUpdate(uiDiff); }
+
+    private:
+        void DoPrepareChampions(bool bSkipIntro) {} //@TODO
+
+        void JustDidDialogueStep(int32 iEntry) override {}  //@TODO
+
+        void DoSummonHeraldIfNeeded(Unit* pSummoner)
+        {
+            if (!pSummoner)
+                return;
+
+            if (GetSingleCreatureFromStorage(m_uiHeraldEntry, true))
+                return;
+
+            pSummoner->SummonCreature(m_uiHeraldEntry, aHeraldPositions[0][0], aHeraldPositions[0][1], aHeraldPositions[0][2], aHeraldPositions[0][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+
+            // summon champion mounts if required
+            if (GetData(TYPE_GRAND_CHAMPIONS) != DONE)
+            {
+                for (uint8 i = 0; i < MAX_CHAMPIONS_MOUNTS; ++i)
+                    pSummoner->SummonCreature(m_uiTeam == ALLIANCE ? aTrialChampionsMounts[i].uiEntryAlliance : aTrialChampionsMounts[i].uiEntryHorde, aTrialChampionsMounts[i].fX, aTrialChampionsMounts[i].fY, aTrialChampionsMounts[i].fZ, aTrialChampionsMounts[i].fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        Team m_uiTeam;
+
+        uint32 m_uiHeraldEntry;
+        uint32 m_uiGrandChampionEntry;
+
+        std::vector<uint8> m_vChampionsIndex;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_trial_of_the_champion(pMap);
+    }
+};
+
+void AddSC_instance_trial_of_the_champion()
+{
+    Script* s;
+
+    s = new is_trial_of_the_champion();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_trial_of_the_champion";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_trial_of_the_champion;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp
new file mode 100644
index 000000000..d0d0b5828
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp
@@ -0,0 +1,116 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: trial_of_the_champion
+SD%Complete: 20
+SDComment: Gossip
+SDCategory: Crusader Coliseum, Trial of the Champion
+EndScriptData */
+
+#include "precompiled.h"
+#include "trial_of_the_champion.h"
+
+/*######
+## npc_toc_herald
+######*/
+
+enum
+{
+    GOSSIP_ITEM_READY                   = -3650000,
+    GOSSIP_ITEM_READY_SKIP_INTRO        = -3650001,
+    GOSSIP_ITEM_READY_NEXT_CHALLENGE    = -3650002,
+
+    TEXT_ID_READY_FIRST_CHALLENGE       = 14688,
+    TEXT_ID_READY_NEXT_CHALLENGE        = 14737,
+    TEXT_ID_READY_FINAL_CHALLENGE       = 14738,
+};
+
+struct npc_toc_herald : public CreatureScript
+{
+    npc_toc_herald() : CreatureScript("npc_toc_herald") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        if (!pInstance)
+            return true;
+
+        if (pInstance->GetData(TYPE_GRAND_CHAMPIONS) == NOT_STARTED)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_READY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_READY_SKIP_INTRO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_READY_FIRST_CHALLENGE, pCreature->GetObjectGuid());
+        }
+        else if (pInstance->GetData(TYPE_GRAND_CHAMPIONS) == DONE && pInstance->GetData(TYPE_ARGENT_CHAMPION) == NOT_STARTED)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_READY_NEXT_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_READY_NEXT_CHALLENGE, pCreature->GetObjectGuid());
+        }
+        else if (pInstance->GetData(TYPE_ARGENT_CHAMPION) == DONE && pInstance->GetData(TYPE_BLACK_KNIGHT) == NOT_STARTED)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_READY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_READY_FINAL_CHALLENGE, pCreature->GetObjectGuid());
+        }
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*sender*/, uint32 uiAction) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        if (!pInstance)
+            return true;
+
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pInstance->SetData(TYPE_DO_PREPARE_CHAMPIONS, uint32(false));
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pInstance->SetData(TYPE_DO_PREPARE_CHAMPIONS, uint32(true));
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 3:
+            pInstance->SetData(TYPE_ARGENT_CHAMPION, SPECIAL);
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 4:
+            pInstance->SetData(TYPE_BLACK_KNIGHT, SPECIAL);
+            break;
+        }
+
+        pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+        pPlayer->CLOSE_GOSSIP_MENU();
+
+        return true;
+    }
+};
+
+void AddSC_trial_of_the_champion()
+{
+    Script* s;
+
+    s = new npc_toc_herald();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_toc_herald";
+    //pNewScript->pGossipHello = &GossipHello_npc_toc_herald;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_toc_herald;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.h b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.h
new file mode 100644
index 000000000..939dc3e74
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.h
@@ -0,0 +1,138 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_TRIAL_OF_THE_CHAMPION_H
+#define DEF_TRIAL_OF_THE_CHAMPION_H
+
+enum
+{
+    MAX_ENCOUNTER                       = 3,
+    MAX_CHAMPIONS_AVAILABLE             = 5,
+    MAX_CHAMPIONS_ARENA                 = 3,
+    MAX_CHAMPIONS_MOUNTS                = 24,
+
+    TYPE_GRAND_CHAMPIONS                = 0,
+    TYPE_ARGENT_CHAMPION                = 1,
+    TYPE_BLACK_KNIGHT                   = 2,
+    TYPE_DO_PREPARE_CHAMPIONS           = MAX_ENCOUNTER,
+
+    // event handler
+    NPC_ARELAS_BRIGHTSTAR               = 35005,                        // alliance
+    NPC_JAEREN_SUNSWORN                 = 35004,                        // horde
+    NPC_TIRION_FORDRING                 = 34996,
+    NPC_VARIAN_WRYNN                    = 34990,
+    NPC_THRALL                          = 34994,
+    NPC_GARROSH                         = 34995,
+
+    // champions alliance
+    NPC_ALLIANCE_WARRIOR                = 34705,                        // Jacob Alerius
+    NPC_ALLIANCE_WARRIOR_MOUNT          = 35637,                        // Jacob vehicle mount
+    NPC_ALLIANCE_WARRIOR_CHAMPION       = 35328,                        // Stormwind Champion
+    NPC_ALLIANCE_MAGE                   = 34702,                        // Ambrose Boltspark
+    NPC_ALLIANCE_MAGE_MOUNT             = 35633,                        // Ambrose vehicle mount
+    NPC_ALLIANCE_MAGE_CHAMPION          = 35331,                        // Gnomeregan Champion
+    NPC_ALLIANCE_SHAMAN                 = 34701,                        // Colosos
+    NPC_ALLIANCE_SHAMAN_MOUNT           = 35768,                        // Colosos vehicle mount
+    NPC_ALLIANCE_SHAMAN_CHAMPION        = 35330,                        // Exodar Champion
+    NPC_ALLIANCE_HUNTER                 = 34657,                        // Jaelyne Evensong
+    NPC_ALLIANCE_HUNTER_MOUNT           = 34658,                        // Jaelyne vehicle mount
+    NPC_ALLIANCE_HUNTER_CHAMPION        = 35332,                        // Darnassus Champion
+    NPC_ALLIANCE_ROGUE                  = 34703,                        // Lana Stouthammer
+    NPC_ALLIANCE_ROGUE_MOUNT            = 35636,                        // Lana vehicle mount
+    NPC_ALLIANCE_ROGUE_CHAMPION         = 35329,                        // Ironforge Champion
+
+    // champions horde
+    NPC_HORDE_WARRIOR                   = 35572,                        // Mokra Skullcrusher
+    NPC_HORDE_WARRIOR_MOUNT             = 35638,                        // Mokra vehicle mount
+    NPC_HORDE_WARRIOR_CHAMPION          = 35314,                        // Orgrimmar Champion
+    NPC_HORDE_MAGE                      = 35569,                        // Eressea Dawnsinger
+    NPC_HORDE_MAGE_MOUNT                = 35635,                        // Eressea vehicle mount
+    NPC_HORDE_MAGE_CHAMPION             = 35326,                        // Silvermoon Champion
+    NPC_HORDE_SHAMAN                    = 35571,                        // Runok Wildmane
+    NPC_HORDE_SHAMAN_MOUNT              = 35640,                        // Runok vehicle mount
+    NPC_HORDE_SHAMAN_CHAMPION           = 35325,                        // Thunder Bluff Champion
+    NPC_HORDE_HUNTER                    = 35570,                        // Zul'tore
+    NPC_HORDE_HUNTER_MOUNT              = 35641,                        // Zul'tore vehicle mount
+    NPC_HORDE_HUNTER_CHAMPION           = 35323,                        // Sen'jin Champion
+    NPC_HORDE_ROGUE                     = 35617,                        // Deathstalker Visceri
+    NPC_HORDE_ROGUE_MOUNT               = 35634,                        // Visceri vehicle mount
+    NPC_HORDE_ROGUE_CHAMPION            = 35327,                        // Undercity Champion
+
+    // spectators triggers
+    NPC_WORLD_TRIGGER                   = 22515,
+    NPC_SPECTATOR_GENERIC               = 35016,
+    NPC_SPECTATOR_HORDE                 = 34883,
+    NPC_SPECTATOR_ALLIANCE              = 34887,
+    NPC_SPECTATOR_HUMAN                 = 34900,
+    NPC_SPECTATOR_ORC                   = 34901,
+    NPC_SPECTATOR_TROLL                 = 34902,
+    NPC_SPECTATOR_TAUREN                = 34903,
+    NPC_SPECTATOR_BLOOD_ELF             = 34904,
+    NPC_SPECTATOR_UNDEAD                = 34905,
+    NPC_SPECTATOR_DWARF                 = 34906,
+    NPC_SPECTATOR_DRAENEI               = 34908,
+    NPC_SPECTATOR_NIGHT_ELF             = 34909,
+    NPC_SPECTATOR_GNOME                 = 34910,
+
+    // mounts
+    NPC_WARHORSE_ALLIANCE               = 36557,                        // alliance mount vehicle
+    NPC_WARHORSE_HORDE                  = 35644,                        // dummy - part of the decorations
+    NPC_BATTLEWORG_ALLIANCE             = 36559,                        // dummy - part of the decorations
+    NPC_BATTLEWORG_HORDE                = 36558,                        // horde mount vehicle
+
+    // argent challegers
+    NPC_EADRIC                          = 35119,
+    NPC_PALETRESS                       = 34928,
+    // trash mobs
+    NPC_ARGENT_LIGHTWIELDER             = 35309,
+    NPC_ARGENT_MONK                     = 35305,
+    NPC_ARGENT_PRIESTESS                = 35307,
+
+    // black knight
+    NPC_BLACK_KNIGHT                    = 35451,
+    NPC_BLACK_KNIGHT_GRYPHON            = 35491,
+    // risen zombies
+    NPC_RISEN_JAEREN                    = 35545,
+    NPC_RISEN_ARELAS                    = 35564,
+    NPC_RISEN_CHAMPION                  = 35590,
+
+    // doors
+    GO_MAIN_GATE                        = 195647,
+    GO_NORTH_GATE                       = 195650,                       // combat door
+
+    // chests
+    GO_CHAMPIONS_LOOT                   = 195709,
+    GO_CHAMPIONS_LOOT_H                 = 195710,
+    GO_EADRIC_LOOT                      = 195374,
+    GO_EADRIC_LOOT_H                    = 195375,
+    GO_PALETRESS_LOOT                   = 195323,
+    GO_PALETRESS_LOOT_H                 = 195324,
+
+    // fireworks
+    GO_FIREWORKS_RED_1                  = 180703,
+    GO_FIREWORKS_RED_2                  = 180708,
+    GO_FIREWORKS_BLUE_1                 = 180720,
+    GO_FIREWORKS_BLUE_2                 = 180723,
+    GO_FIREWORKS_WHITE_1                = 180728,
+    GO_FIREWORKS_WHITE_2                = 180730,
+    GO_FIREWORKS_YELLOW_1               = 180736,
+    GO_FIREWORKS_YELLOW_2               = 180738,
+
+    // area triggers - purpose unk
+    // AREATRIGGER_ID_TOC_1             = 5491,
+    // AREATRIGGER_ID_TOC_2             = 5492,
+
+    // emotes
+    EMOTE_BLOOD_ELVES                   = -1650018,
+    EMOTE_TROLLS                        = -1650019,
+    EMOTE_TAUREN                        = -1650020,
+    EMOTE_UNDEAD                        = -1650021,
+    EMOTE_ORCS                          = -1650022,
+    EMOTE_DWARVES                       = -1650023,
+    EMOTE_GNOMES                        = -1650024,
+    EMOTE_NIGHT_ELVES                   = -1650025,
+    EMOTE_HUMANS                        = -1650026,
+    EMOTE_DRAENEI                       = -1650027,
+};
+#endif
diff --git a/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_anubarak_trial.cpp b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_anubarak_trial.cpp
new file mode 100644
index 000000000..2c5da6ed2
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_anubarak_trial.cpp
@@ -0,0 +1,690 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_anubarak_trial
+SD%Complete: 100
+SDComment:
+SDCategory: Crusader Coliseum
+EndScriptData */
+
+#include "precompiled.h"
+#include "trial_of_the_crusader.h"
+
+enum
+{
+    SAY_INTRO                           = -1649038,
+    SAY_AGGRO                           = -1649064,
+    SAY_SLAY_1                          = -1649065,
+    SAY_SLAY_2                          = -1649066,
+    SAY_DEATH                           = -1649067,
+    SAY_BERSERK                         = -1649068,
+    SAY_SUBMERGE                        = -1649069,
+    SAY_LEECHING_SWARM                  = -1649070,
+
+    EMOTE_BURROW                        = -1649071,
+    EMOTE_PURSUE                        = -1649072,
+    EMOTE_EMERGE                        = -1649073,
+    EMOTE_LEECHING_SWARM                = -1649074,
+
+    // Anub'arak
+    SPELL_FREEZING_SLASH                = 66012,
+    SPELL_PENETRATING_COLD              = 66013,
+    SPELL_SUMMON_NERUBIAN_BURROWER      = 66332,
+    SPELL_SUMMON_SCARAB                 = 66339,
+    SPELL_SUBMERGE                      = 65981,
+    SPELL_EMERGE                        = 65982,
+    SPELL_TELEPORT_TO_SPIKE             = 66170,            // used when the underground phase ends
+    SPELL_CLEAR_ALL_DEBUFFS             = 34098,
+    SPELL_SUMMON_SPIKES                 = 66169,
+    SPELL_LEECHING_SWARM                = 66118,
+    SPELL_BERSERK                       = 26662,
+
+    // Pursuing Spikes
+    SPELL_PURSUING_SPIKES_FAIL          = 66181,
+    SPELL_PURSUING_SPIKES_DUMMY         = 67470,            // target selection spell
+    SPELL_PURSUING_SPIKES_SPEED1        = 65920,
+    // SPELL_PURSUING_SPIKES_GROUND      = 65921,           // included in creature_template_addon
+    SPELL_PURSUING_SPIKES_SPEED2        = 65922,
+    SPELL_PURSUING_SPIKES_SPEED3        = 65923,
+    SPELL_MARK                          = 67574,
+
+    // Frostsphere
+    SPELL_PERMAFROST_VISUAL             = 65882,            // triggers 65872
+    SPELL_PERMAFROST_DUMMY              = 65872,            // dummy spell which handles the spike fail event
+    SPELL_PERMAFROST_TRANSFORM          = 66185,
+    SPELL_PERMAFROST_SLOW               = 66193,            // slow spell
+    SPELL_FROSTSPHERE_VISUAL            = 67539,
+
+    POINT_GROUND                        = 0,
+
+    // npcs
+    NPC_SCARAB                          = 34605,
+    NPC_FROSTSPHERE                     = 34606,
+    NPC_NERUBIAN_BURROWER               = 34607,
+    NPC_ANUBARAK_SPIKE                  = 34660,
+    NPC_BURROW                          = 34862,
+
+    MAX_FROSTSPHERES                    = 6,
+    MAX_BURROWS                         = 4
+};
+
+enum Phases
+{
+    PHASE_GROUND         = 0,
+    PHASE_UNDERGROUND    = 1,
+    PHASE_LEECHING_SWARM = 2,
+    PHASE_SUBMERGING     = 3,                               // virtual use only while casting SPELL_SUBMERGE (triggered by script!)
+};
+
+enum PursuingSpikesPhases
+{
+    PHASE_NO_MOVEMENT   = 0,
+    PHASE_IMPALE_NORMAL = 1,
+    PHASE_IMPALE_MIDDLE = 2,
+    PHASE_IMPALE_FAST   = 3
+};
+
+static const float aFrostSphereSpawnPositions[MAX_FROSTSPHERES][3] =
+{
+    { 701.4270f, 126.4739f, 158.0205f },
+    { 712.5711f, 160.9948f, 158.4367f },
+    { 736.0243f, 113.4201f, 158.0225f },
+    { 747.9201f, 155.0920f, 158.0613f },
+    { 769.6285f, 121.1024f, 158.0504f },
+    { 779.8038f, 150.658f,  158.1426f }
+};
+
+static const float aBurrowSpawnPositions[MAX_BURROWS][4] =
+{
+    { 735.4028f, 75.35764f, 142.2023f, 2.094395f  },
+    { 692.9202f, 184.809f,  142.2026f, 5.358161f  },
+    { 688.2066f, 102.8472f, 142.2023f, 0.6457718f },
+    { 740.5452f, 189.1129f, 142.1972f, 3.752458f  }
+};
+
+/*######
+## boss_anubarak_trial
+######*/
+
+struct boss_anubarak_trial : public CreatureScript
+{
+    boss_anubarak_trial() : CreatureScript("boss_anubarak_trial") {}
+
+    struct boss_anubarak_trialAI : public ScriptedAI
+    {
+        boss_anubarak_trialAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bDidIntroYell = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        Phases m_Phase;
+
+        uint32 m_PhaseSwitchTimer;
+        uint32 m_uiFreezingSlashTimer;
+        uint32 m_uiPenetratingColdTimer;
+        uint32 m_uiBurrowerSummonTimer;
+        uint32 m_uiBerserkTimer;
+        bool m_bDidIntroYell;
+
+        ObjectGuid m_PursuingSpikesGuid;
+        GuidVector m_vSpheresGuidVector;
+
+        void Reset() override
+        {
+            m_Phase = PHASE_GROUND;
+            m_PhaseSwitchTimer = 80000;
+            m_uiFreezingSlashTimer = 20000;
+            m_uiPenetratingColdTimer = urand(15000, 25000);
+            m_uiBurrowerSummonTimer = 10000;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            m_vSpheresGuidVector.clear();
+            m_vSpheresGuidVector.resize(MAX_FROSTSPHERES, ObjectGuid());
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ANUBARAK, FAIL);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ANUBARAK, DONE);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bDidIntroYell && pWho->GetTypeId() == TYPEID_PLAYER && !((Player*)pWho)->isGameMaster() &&
+                !m_creature->IsInEvadeMode() && pWho->IsWithinDistInMap(m_creature, 100) && pWho->IsWithinLOSInMap(m_creature))
+            {
+                DoScriptText(SAY_INTRO, m_creature);
+
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->RemoveAurasDueToSpell(SPELL_SUBMERGE);
+                DoCastSpellIfCan(m_creature, SPELL_EMERGE);
+
+                m_bDidIntroYell = true;
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            // Summon the spheres on random points
+            for (uint8 i = 0; i < MAX_FROSTSPHERES; ++i)
+            {
+                if (Creature* pTemp = m_creature->SummonCreature(NPC_FROSTSPHERE, aFrostSphereSpawnPositions[i][0], aFrostSphereSpawnPositions[i][1], aFrostSphereSpawnPositions[i][2], 0, TEMPSUMMON_DEAD_DESPAWN, 0))
+                    m_vSpheresGuidVector[i] = pTemp->GetObjectGuid();
+            }
+
+            // It's not clear if these should be spawned by DB or summoned
+            for (uint8 i = 0; i < MAX_BURROWS; ++i)
+                m_creature->SummonCreature(NPC_BURROW, aBurrowSpawnPositions[i][0], aBurrowSpawnPositions[i][1], aBurrowSpawnPositions[i][2], aBurrowSpawnPositions[i][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ANUBARAK, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            DoScriptText((urand(0, 1)) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_SUBMERGE)
+            {
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                // Extra check here, because AnubArak must be submerged by default
+                if (m_Phase != PHASE_SUBMERGING)
+                    return;
+
+                m_Phase = PHASE_UNDERGROUND;
+
+                // Refresh spheres only on normal difficulty
+                if (m_pInstance && !m_pInstance->GetData(TYPE_DATA_IS_HEROIC))
+                    DoRefreshSpheres();
+
+                DoCastSpellIfCan(m_creature, SPELL_CLEAR_ALL_DEBUFFS, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_SPIKES, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_SCARAB, CAST_TRIGGERED);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_ANUBARAK_SPIKE:
+                m_PursuingSpikesGuid = pSummoned->GetObjectGuid();
+                // no break here
+            case NPC_NERUBIAN_BURROWER:
+            case NPC_SCARAB:
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+                break;
+            }
+        }
+
+        // Wrapper to refresh frost spheres - it's not very clear how ofter should this happen
+        void DoRefreshSpheres()
+        {
+            for (uint8 i = 0; i < MAX_FROSTSPHERES; ++i)
+            {
+                // If the sphere is alive and hasn't transfomed to permafrost yet summon a new one
+                Creature* pTemp = m_creature->GetMap()->GetCreature(m_vSpheresGuidVector[i]);
+                if (pTemp && !pTemp->HasAura(SPELL_PERMAFROST_TRANSFORM))
+                    continue;
+
+                // Summon a new frost sphere instead of the killed one
+                if (Creature* pTemp = m_creature->SummonCreature(NPC_FROSTSPHERE, aFrostSphereSpawnPositions[i][0], aFrostSphereSpawnPositions[i][1], aFrostSphereSpawnPositions[i][2], 0, TEMPSUMMON_DEAD_DESPAWN, 0))
+                    m_vSpheresGuidVector[i] = pTemp->GetObjectGuid();
+            }
+        }
+
+        // Wrapper to despawn the Spikes
+        void DoDespawnPursuingSpikes()
+        {
+            if (Creature* pPursuingSpikes = m_creature->GetMap()->GetCreature(m_PursuingSpikesGuid))
+                pPursuingSpikes->ForcedDespawn();
+
+            m_PursuingSpikesGuid.Clear();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            switch (m_Phase)
+            {
+            case PHASE_GROUND:
+
+                // Switch to underground phase on timer
+                if (m_PhaseSwitchTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUBMERGE) == CAST_OK)
+                    {
+                        DoScriptText(SAY_SUBMERGE, m_creature);
+                        DoScriptText(EMOTE_BURROW, m_creature);
+                        m_PhaseSwitchTimer = 63000;
+                        m_Phase = PHASE_SUBMERGING;
+                        return;
+                    }
+                }
+                else
+                    m_PhaseSwitchTimer -= uiDiff;
+
+                // Switch to phase 3 when below 30%
+                if (m_creature->GetHealthPercent() <= 30.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_LEECHING_SWARM) == CAST_OK)
+                    {
+                        DoScriptText(SAY_LEECHING_SWARM, m_creature);
+                        DoScriptText(EMOTE_LEECHING_SWARM, m_creature);
+                        m_Phase = PHASE_LEECHING_SWARM;
+                    }
+                }
+
+                // No break - the spells are used in both phase 1 and 3
+            case PHASE_LEECHING_SWARM:
+
+                if (m_uiFreezingSlashTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FREEZING_SLASH) == CAST_OK)
+                        m_uiFreezingSlashTimer = 20000;
+                }
+                else
+                    m_uiFreezingSlashTimer -= uiDiff;
+
+                if (m_uiPenetratingColdTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_PENETRATING_COLD) == CAST_OK)
+                        m_uiPenetratingColdTimer = 15000;
+                }
+                else
+                    m_uiPenetratingColdTimer -= uiDiff;
+
+                // The Borrowers are summoned in Ground phase only on normal mode or during Ground and Swarm phase on heroic mode
+                if (m_Phase == PHASE_GROUND || (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC)))
+                {
+                    if (m_uiBurrowerSummonTimer < uiDiff)
+                    {
+                        // The number of targets is handled in core, based on difficulty
+                        if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_NERUBIAN_BURROWER) == CAST_OK)
+                            m_uiBurrowerSummonTimer = 45000;
+                    }
+                    else
+                        m_uiBurrowerSummonTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+
+                break;
+
+            case PHASE_UNDERGROUND:
+
+                // Underground phase is finished
+                if (m_PhaseSwitchTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_EMERGE, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_TELEPORT_TO_SPIKE, CAST_TRIGGERED);
+                    DoScriptText(EMOTE_EMERGE, m_creature);
+                    DoDespawnPursuingSpikes();
+
+                    m_creature->RemoveAurasDueToSpell(SPELL_SUBMERGE);
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                    // Refresh spheres only on normal difficulty
+                    if (m_pInstance && !m_pInstance->GetData(TYPE_DATA_IS_HEROIC))
+                        DoRefreshSpheres();
+
+                    m_PhaseSwitchTimer = 80000;
+                    m_Phase = PHASE_GROUND;
+                }
+                else
+                    m_PhaseSwitchTimer -= uiDiff;
+
+                break;
+            case PHASE_SUBMERGING:                          // Do nothing, but continue berserk timer
+                break;
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (m_Phase != PHASE_UNDERGROUND)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                        {
+                            DoScriptText(SAY_BERSERK, m_creature);
+                            m_uiBerserkTimer = 0;
+                        }
+                    }
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_anubarak_trialAI(pCreature);
+    }
+};
+
+/*######
+## npc_anubarak_trial_spike
+######*/
+
+struct npc_anubarak_trial_spike : public CreatureScript
+{
+    npc_anubarak_trial_spike() : CreatureScript("npc_anubarak_spike") {}
+
+    struct npc_anubarak_trial_spikeAI : public ScriptedAI
+    {
+        npc_anubarak_trial_spikeAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        PursuingSpikesPhases m_Phase;
+        uint32 m_PhaseSwitchTimer;
+
+        void Reset() override
+        {
+            m_Phase = PHASE_NO_MOVEMENT;
+            m_PhaseSwitchTimer = 5000;
+
+            SetCombatMovement(false);
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_PURSUING_SPIKES_DUMMY && pTarget->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoScriptText(EMOTE_PURSUE, m_creature, pTarget);
+                DoCastSpellIfCan(pTarget, SPELL_MARK, CAST_TRIGGERED);
+                DoStartMovement(pTarget);
+            }
+        }
+
+        // Handle permafrost hit from dummy spell
+        void ReceiveAIEvent(AIEventType eventType, Creature*, Unit* pPermafrost, uint32 /**/) override
+        {
+            if (eventType != AI_EVENT_CUSTOM_A)
+                return;
+
+            // To prevent more than one call
+            if (m_Phase == PHASE_NO_MOVEMENT)
+                return;
+
+            // Remove the speed auras
+            switch (m_Phase)
+            {
+            case PHASE_IMPALE_NORMAL:
+                m_creature->RemoveAurasDueToSpell(SPELL_PURSUING_SPIKES_SPEED1);
+                break;
+            case PHASE_IMPALE_MIDDLE:
+                m_creature->RemoveAurasDueToSpell(SPELL_PURSUING_SPIKES_SPEED2);
+                break;
+            case PHASE_IMPALE_FAST:
+                m_creature->RemoveAurasDueToSpell(SPELL_PURSUING_SPIKES_SPEED3);
+                break;
+            default:
+                break;
+            }
+
+            // Set Spike fail animation and despawn
+            DoCastSpellIfCan(m_creature, SPELL_PURSUING_SPIKES_FAIL, CAST_TRIGGERED);
+
+            if (pPermafrost)
+                pPermafrost->ToCreature()->ForcedDespawn(2000);
+
+            // After the spikes hit the icy surface they can't move for about ~5 seconds
+            m_Phase = PHASE_NO_MOVEMENT;
+            m_PhaseSwitchTimer = 5000;
+            DoResetThreat();
+
+            SetCombatMovement(false);
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MoveIdle();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_PhaseSwitchTimer)
+            {
+                if (m_PhaseSwitchTimer <= uiDiff)
+                {
+                    switch (m_Phase)
+                    {
+                    case PHASE_NO_MOVEMENT:
+                        if (DoCastSpellIfCan(m_creature, SPELL_PURSUING_SPIKES_SPEED1) == CAST_OK)
+                        {
+                            DoCastSpellIfCan(m_creature, SPELL_PURSUING_SPIKES_DUMMY, CAST_TRIGGERED);
+
+                            m_Phase = PHASE_IMPALE_NORMAL;
+                            m_PhaseSwitchTimer = 7000;
+                        }
+                        break;
+                    case PHASE_IMPALE_NORMAL:
+                        if (DoCastSpellIfCan(m_creature, SPELL_PURSUING_SPIKES_SPEED2) == CAST_OK)
+                        {
+                            m_Phase = PHASE_IMPALE_MIDDLE;
+                            m_PhaseSwitchTimer = 7000;
+                        }
+                        break;
+                    case PHASE_IMPALE_MIDDLE:
+                        if (DoCastSpellIfCan(m_creature, SPELL_PURSUING_SPIKES_SPEED3) == CAST_OK)
+                        {
+                            m_Phase = PHASE_IMPALE_FAST;
+                            m_PhaseSwitchTimer = 0;
+                        }
+                        break;
+                    default:
+                        break;
+                    }
+                }
+                else
+                    m_PhaseSwitchTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_anubarak_trial_spikeAI(pCreature);
+    }
+};
+
+struct spell_permafrost_dummy : public SpellScript
+{
+    spell_permafrost_dummy() : SpellScript("spell_permafrost_dummy") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_PERMAFROST_DUMMY && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+            if (CreatureAI* pSpikeAI = pCreatureTarget->AI())
+                pSpikeAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pCreatureTarget, pCaster, 0);
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_anubarak_trial_frostsphere
+######*/
+
+struct npc_anubarak_trial_frostsphere : public CreatureScript
+{
+    npc_anubarak_trial_frostsphere() : CreatureScript("npc_frost_sphere") {}
+
+    struct npc_anubarak_trial_frostsphereAI : public Scripted_NoMovementAI
+    {
+        npc_anubarak_trial_frostsphereAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        bool m_bPermafrost;
+
+        void Reset() override
+        {
+            m_bPermafrost = false;
+
+            m_creature->GetMotionMaster()->MoveRandomAroundPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 15.0f);
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+        {
+            if (uiDamage < m_creature->GetHealth())
+                return;
+
+            // Set fake death in order to apply permafrost
+            uiDamage = 0;
+
+            if (m_bPermafrost)
+                return;
+
+            m_creature->InterruptNonMeleeSpells(false);
+            m_creature->SetHealth(0);
+            m_creature->StopMoving();
+            m_creature->ClearComboPointHolders();
+            m_creature->RemoveAllAurasOnDeath();
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            m_creature->ClearAllReactives();
+            m_creature->SetTargetGuid(ObjectGuid());
+
+            // Set proper Z position
+            m_creature->SetWalk(false);
+            float fZ = pDoneBy->GetPositionZ();
+            MaNGOS::NormalizeMapCoord(fZ);
+
+            // Note: This should be fall movement
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MovePoint(1, m_creature->GetPositionX(), m_creature->GetPositionY(), fZ);
+            m_bPermafrost = true;
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            DoCastSpellIfCan(m_creature, SPELL_PERMAFROST_VISUAL, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_PERMAFROST_TRANSFORM, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_PERMAFROST_SLOW, CAST_TRIGGERED);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_anubarak_trial_frostsphereAI(pCreature);
+    }
+};
+
+/*######
+## npc_nerubian_borrow
+######*/
+
+// TODO Remove this 'script' when combat movement can be proper prevented from core-side
+struct npc_nerubian_borrow : public CreatureScript
+{
+    npc_nerubian_borrow() : CreatureScript("npc_nerubian_borrow") {}
+
+    struct npc_nerubian_borrowAI : public Scripted_NoMovementAI
+    {
+        npc_nerubian_borrowAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { Reset(); }
+
+        void Reset() override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_nerubian_borrowAI(pCreature);
+    }
+};
+
+void AddSC_boss_anubarak_trial()
+{
+    Script* s;
+
+    s = new boss_anubarak_trial();
+    s->RegisterSelf();
+    s = new npc_anubarak_trial_spike();
+    s->RegisterSelf();
+    s = new npc_anubarak_trial_frostsphere();
+    s->RegisterSelf();
+    s = new npc_nerubian_borrow();
+    s->RegisterSelf();
+
+    s = new spell_permafrost_dummy();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_anubarak_trial";
+    //pNewScript->GetAI = &GetAI_boss_anubarak_trial;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_anubarak_spike";
+    //pNewScript->GetAI = &GetAI_npc_anubarak_trial_spike;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_dummy_permafrost;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_frost_sphere";
+    //pNewScript->GetAI = &GetAI_npc_anubarak_trial_frostsphere;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_nerubian_borrow";
+    //pNewScript->GetAI = &GetAI_npc_nerubian_borrow;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_faction_champions.cpp b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_faction_champions.cpp
new file mode 100644
index 000000000..b279e70eb
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_faction_champions.cpp
@@ -0,0 +1,45 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: faction_champions
+SD%Complete: 0
+SDComment:
+SDCategory: Crusader Coliseum
+EndScriptData */
+
+#include "precompiled.h"
+#include "trial_of_the_crusader.h"
+
+enum
+{
+    SAY_GARROSH_PVP_A_SLAY_1            = -1649048,
+    SAY_GARROSH_PVP_A_SLAY_2            = -1649049,
+    SAY_GARROSH_PVP_A_SLAY_3            = -1649050,
+    SAY_GARROSH_PVP_A_SLAY_4            = -1649051,
+
+    SAY_VARIAN_PVP_H_SLAY_1             = -1649052,
+    SAY_VARIAN_PVP_H_SLAY_2             = -1649053,
+    SAY_VARIAN_PVP_H_SLAY_3             = -1649054,
+    SAY_VARIAN_PVP_H_SLAY_4             = -1649055,
+};
+
+void AddSC_boss_faction_champions()
+{
+}
diff --git a/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_jaraxxus.cpp b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_jaraxxus.cpp
new file mode 100644
index 000000000..ac9fee44a
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_jaraxxus.cpp
@@ -0,0 +1,284 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: trial_of_the_crusader
+SD%Complete: 75
+SDComment: Evade handling must be fixed, this is currently totally wrong. Some issues with emotes and texts, generic improvements related to spells can be missing
+SDCategory: Crusader Coliseum
+EndScriptData */
+
+#include "precompiled.h"
+#include "trial_of_the_crusader.h"
+
+/*######
+## boss_jaraxxus
+######*/
+
+enum
+{
+    SAY_AGGRO                           = -1649040,
+    SAY_SLAY_1                          = -1649041,
+    SAY_SLAY_2                          = -1649042,
+    SAY_BERSERK                         = -1649044,
+    SAY_INCINERATE                      = -1649045,
+    SAY_MISTRESS                        = -1649046,
+    SAY_INFERNO                         = -1649047,
+
+    // boss spells
+    SPELL_JARAXXUS_HITTIN_YA            = 66327,
+    SPELL_FEL_FIREBALL                  = 66532,
+    SPELL_FEL_LIGHTNING                 = 66528,
+    SPELL_INCINERATE_FLESH              = 66237,
+    SPELL_BURNING_INFERNO               = 66242,
+    SPELL_LEGION_FLAME                  = 66197,
+    SPELL_INFERNAL_ERUPTION             = 66258,            // summons a volcano
+    SPELL_NETHER_PORTAL_SUMMON          = 66269,            // summons a nether portal
+    SPELL_NETHER_PORTAL                 = 66263,            // spell casted by the portal
+    SPELL_ERUPTION                      = 66252,            // spell casted by the volcano
+    SPELL_NETHER_POWER                  = 67009,
+    SPELL_BERSERK                       = 26662,
+
+    // npcs
+    NPC_INFERNAL_VOLCANO                = 34813,
+    NPC_NETHER_PORTAL                   = 34825
+};
+
+struct boss_jaraxxus : public CreatureScript
+{
+    boss_jaraxxus() : CreatureScript("boss_jaraxxus") {}
+
+    struct boss_jaraxxusAI : public ScriptedAI
+    {
+        boss_jaraxxusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiFelFireballTimer;
+        uint32 m_uiFelLightningTimer;
+        uint32 m_uiIncinerateFleshTimer;
+        uint32 m_uiBurningInfernoTimer;
+        uint32 m_uiLegionFlameTimer;
+        uint32 m_uiSummonTimer;
+        uint32 m_uiNetherPowerTimer;
+        uint32 m_uiBerserkTimer;
+        bool m_bVolcanoSummon;
+
+        void Reset() override
+        {
+            m_uiFelFireballTimer = urand(20000, 25000);  // maybe too early, and too often!
+            m_uiFelLightningTimer = urand(5000, 8000);
+            m_uiIncinerateFleshTimer = 25000;
+            m_uiLegionFlameTimer = 10000;
+            m_uiSummonTimer = 20000;
+            m_uiNetherPowerTimer = urand(20000, 30000);
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            m_bVolcanoSummon = true;
+
+            DoCastSpellIfCan(m_creature, SPELL_JARAXXUS_HITTIN_YA);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_JARAXXUS, FAIL);
+
+            m_creature->ForcedDespawn();
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_JARAXXUS, DONE);
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (pWho->GetEntry() == NPC_FIZZLEBANG)
+                return;
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_JARAXXUS, IN_PROGRESS);
+
+            DoCastSpellIfCan(m_creature, SPELL_NETHER_POWER);
+            m_creature->SetInCombatWithZone();
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (m_pInstance && m_pInstance->GetData(TYPE_JARAXXUS) != IN_PROGRESS)
+                return;
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetEntry() == NPC_FIZZLEBANG)
+                return;
+
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_INFERNAL_VOLCANO:
+                pSummoned->CastSpell(pSummoned, SPELL_ERUPTION, true, NULL, NULL, m_creature->GetObjectGuid());
+                break;
+            case NPC_NETHER_PORTAL:
+                pSummoned->CastSpell(pSummoned, SPELL_NETHER_PORTAL, true, NULL, NULL, m_creature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void MovementInform(uint32 uiMovementType, uint32 uiPointId) override
+        {
+            if (uiMovementType != POINT_MOTION_TYPE)
+                return;
+
+            if (m_pInstance && uiPointId == POINT_COMBAT_POSITION)
+            if (Creature* pFizzlebang = m_pInstance->GetSingleCreatureFromStorage(NPC_FIZZLEBANG))
+                m_creature->SetFacingToObject(pFizzlebang);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Spells
+            if (m_uiIncinerateFleshTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_INCINERATE_FLESH) == CAST_OK)
+                        m_uiIncinerateFleshTimer = 25000;
+                }
+            }
+            else
+                m_uiIncinerateFleshTimer -= uiDiff;
+
+            if (m_uiFelFireballTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_FEL_FIREBALL) == CAST_OK)
+                        m_uiFelFireballTimer = urand(20000, 30000);
+                }
+            }
+            else
+                m_uiFelFireballTimer -= uiDiff;
+
+            if (m_uiFelLightningTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_FEL_LIGHTNING) == CAST_OK)
+                        m_uiFelLightningTimer = urand(10000, 18000);
+                }
+            }
+            else
+                m_uiFelLightningTimer -= uiDiff;
+
+            if (m_uiSummonTimer < uiDiff)
+            {
+                if (m_bVolcanoSummon)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_NETHER_PORTAL_SUMMON) == CAST_OK)
+                    {
+                        // TODO missing emote?
+                        // DoScriptText(EMOTE_PORTAL, m_creature);
+                        m_bVolcanoSummon = false;
+                        m_uiSummonTimer = 60000;
+                    }
+                }
+                // summon volcano
+                else
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_INFERNAL_ERUPTION) == CAST_OK)
+                    {
+                        // TODO missing emote?
+                        // DoScriptText(EMOTE_VOLCANO, m_creature);
+                        m_bVolcanoSummon = true;
+                        m_uiSummonTimer = 60000;
+                    }
+                }
+            }
+            else
+                m_uiSummonTimer -= uiDiff;
+
+            if (m_uiLegionFlameTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_LEGION_FLAME) == CAST_OK)
+                        m_uiLegionFlameTimer = 30000;
+                }
+            }
+            else
+                m_uiLegionFlameTimer -= uiDiff;
+
+            if (m_uiNetherPowerTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_NETHER_POWER) == CAST_OK)
+                    m_uiNetherPowerTimer = 42000;
+            }
+            else
+                m_uiNetherPowerTimer -= uiDiff;
+
+            // berserk
+            if (m_uiBerserkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                {
+                    DoScriptText(SAY_BERSERK, m_creature);
+                    m_uiBerserkTimer = 60000;
+                }
+            }
+            else
+                m_uiBerserkTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_jaraxxusAI(pCreature);
+    }
+};
+
+void AddSC_boss_jaraxxus()
+{
+    Script* s;
+
+    s = new boss_jaraxxus();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_jaraxxus";
+    //pNewScript->GetAI = &GetAI_boss_jaraxxus;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_northrend_beasts.cpp b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_northrend_beasts.cpp
new file mode 100644
index 000000000..5062f341b
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_northrend_beasts.cpp
@@ -0,0 +1,447 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName:
+SD%Complete: 0
+SDComment:
+SDCategory:
+EndScriptData */
+
+#include "precompiled.h"
+#include "trial_of_the_crusader.h"
+
+/*######
+## npc_beast_combat_stalker
+######*/
+
+enum
+{
+    SAY_TIRION_BEAST_2                  = -1649005,
+    SAY_TIRION_BEAST_3                  = -1649006,
+
+    SPELL_BERSERK                       = 26662,
+
+    PHASE_GORMOK                        = 0,
+    PHASE_WORMS                         = 1,
+    PHASE_ICEHOWL                       = 2,
+};
+
+struct npc_beast_combat_stalker : public CreatureScript
+{
+    npc_beast_combat_stalker() : CreatureScript("npc_beast_combat_stalker") {}
+
+    struct npc_beast_combat_stalkerAI : public Scripted_NoMovementAI
+    {
+        npc_beast_combat_stalkerAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_creature->SetInCombatWithZone();
+        }
+
+        ScriptedInstance* m_pInstance;
+        ObjectGuid m_aSummonedBossGuid[4];
+        bool m_bFirstWormDied;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiAttackDelayTimer;
+        uint32 m_uiNextBeastTimer;
+        uint32 m_uiPhase;
+
+        void Reset() override
+        {
+            m_uiAttackDelayTimer = 0;
+            m_uiNextBeastTimer = 0;
+            m_bFirstWormDied = false;
+            m_uiPhase = PHASE_GORMOK;
+
+            if (m_creature->GetMap()->GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL || m_creature->GetMap()->GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL)
+                m_uiBerserkTimer = 15 * MINUTE * IN_MILLISECONDS;
+            else
+                m_uiBerserkTimer = 9 * MINUTE * IN_MILLISECONDS;
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+
+        void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override
+        {
+            uiDamage = 0;
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_NORTHREND_BEASTS, FAIL);
+
+            for (uint8 i = 0; i < 4; ++i)
+            {
+                if (Creature* pBoss = m_creature->GetMap()->GetCreature(m_aSummonedBossGuid[i]))
+                    pBoss->ForcedDespawn();
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_NORTHREND_BEASTS, IN_PROGRESS);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_GORMOK:     m_uiPhase = PHASE_GORMOK;  break;
+            case NPC_DREADSCALE: m_uiPhase = PHASE_WORMS;   break;
+            case NPC_ICEHOWL:    m_uiPhase = PHASE_ICEHOWL; break;
+            case NPC_ACIDMAW:
+                // Cast emerge and delayed set in combat?
+                pSummoned->SetInCombatWithZone();
+                m_aSummonedBossGuid[3] = pSummoned->GetObjectGuid();
+                return;
+            }
+
+            m_aSummonedBossGuid[m_uiPhase] = pSummoned->GetObjectGuid();
+
+            pSummoned->GetMotionMaster()->MovePoint(m_uiPhase, aMovePositions[m_uiPhase][0], aMovePositions[m_uiPhase][1], aMovePositions[m_uiPhase][2]);
+
+            // Next beasts are summoned only for heroic modes
+            if (m_creature->GetMap()->GetDifficulty() == RAID_DIFFICULTY_10MAN_HEROIC || m_creature->GetMap()->GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC)
+                m_uiNextBeastTimer = 150 * IN_MILLISECONDS;     // 2 min 30
+
+            m_uiAttackDelayTimer = 15000;                       // TODO, must be checked.
+        }
+
+        // Only for Dreadscale and Icehowl
+        void DoSummonNextBeast(uint32 uiBeastEntry)
+        {
+            if (uiBeastEntry == NPC_DREADSCALE)
+            {
+                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_TIRION_A))
+                    DoScriptText(SAY_TIRION_BEAST_2, pTirion);
+
+                m_creature->SummonCreature(NPC_DREADSCALE, aSpawnPositions[2][0], aSpawnPositions[2][1], aSpawnPositions[2][2], aSpawnPositions[2][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+            else
+            {
+                if (Creature* pTirion = m_pInstance->GetSingleCreatureFromStorage(NPC_TIRION_A))
+                    DoScriptText(SAY_TIRION_BEAST_3, pTirion);
+
+                m_creature->SummonCreature(NPC_ICEHOWL, aSpawnPositions[4][0], aSpawnPositions[4][1], aSpawnPositions[4][2], aSpawnPositions[4][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (!m_pInstance)
+                return;
+
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_GORMOK:
+                if (m_uiPhase == PHASE_GORMOK)
+                    DoSummonNextBeast(NPC_DREADSCALE);
+                break;
+
+            case NPC_DREADSCALE:
+            case NPC_ACIDMAW:
+                if (m_bFirstWormDied && m_uiPhase == PHASE_WORMS)
+                    DoSummonNextBeast(NPC_ICEHOWL);
+                else
+                    m_bFirstWormDied = true;
+                break;
+
+            case NPC_ICEHOWL:
+                m_pInstance->SetData(TYPE_NORTHREND_BEASTS, DONE);
+                m_creature->ForcedDespawn();
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiNextBeastTimer)
+            {
+                if (m_uiNextBeastTimer <= uiDiff)
+                {
+                    if (m_uiPhase == PHASE_GORMOK)
+                        DoSummonNextBeast(NPC_DREADSCALE);
+                    else if (m_uiPhase == PHASE_WORMS)
+                        DoSummonNextBeast(NPC_ICEHOWL);
+
+                    m_uiNextBeastTimer = 0;
+                }
+                else
+                    m_uiNextBeastTimer -= uiDiff;
+            }
+
+            if (m_uiAttackDelayTimer)
+            {
+                if (m_uiAttackDelayTimer <= uiDiff)
+                {
+                    if (m_uiPhase == PHASE_WORMS)
+                        m_creature->SummonCreature(NPC_ACIDMAW, aSpawnPositions[3][0], aSpawnPositions[3][1], aSpawnPositions[3][2], aSpawnPositions[3][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                    if (Creature* pBeast = m_creature->GetMap()->GetCreature(m_aSummonedBossGuid[m_uiPhase]))
+                        pBeast->SetInCombatWithZone();
+
+                    m_uiAttackDelayTimer = 0;
+                }
+                else
+                    m_uiAttackDelayTimer -= uiDiff;
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer < uiDiff)
+                {
+                    for (uint8 i = 0; i < 4; ++i)
+                    {
+                        Creature* pBoss = m_creature->GetMap()->GetCreature(m_aSummonedBossGuid[i]);
+                        if (pBoss && pBoss->IsAlive())
+                            pBoss->CastSpell(pBoss, SPELL_BERSERK, true);
+                    }
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            m_creature->SelectHostileTarget();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_beast_combat_stalkerAI(pCreature);
+    }
+};
+
+/*######
+## boss_gormok, vehicle driven by 34800 (multiple times)
+######*/
+
+struct boss_gormok : public CreatureScript
+{
+    boss_gormok() : CreatureScript("boss_gormok") {}
+
+    struct boss_gormokAI : public ScriptedAI
+    {
+        boss_gormokAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override {}
+
+        void JustReachedHome() override
+        {
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_gormokAI(pCreature);
+    }
+};
+
+/*######
+## boss_acidmaw
+######*/
+
+struct boss_acidmaw : public CreatureScript
+{
+    boss_acidmaw() : CreatureScript("boss_acidmaw") {}
+
+    struct boss_acidmawAI : public ScriptedAI
+    {
+        boss_acidmawAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override {}
+
+        void JustReachedHome() override
+        {
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_acidmawAI(pCreature);
+    }
+};
+
+/*######
+## boss_dreadscale
+######*/
+
+struct boss_dreadscale : public CreatureScript
+{
+    boss_dreadscale() : CreatureScript("boss_dreadscale") {}
+
+    struct boss_dreadscaleAI : public ScriptedAI
+    {
+        boss_dreadscaleAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override {}
+
+        void JustReachedHome() override
+        {
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_dreadscaleAI(pCreature);
+    }
+};
+
+/*######
+## boss_icehowl
+######*/
+
+enum
+{
+    EMOTE_MASSIVE_CRASH                 = -1649039,
+};
+
+struct boss_icehowl : public CreatureScript
+{
+    boss_icehowl() : CreatureScript("boss_icehowl") {}
+
+    struct boss_icehowlAI : public ScriptedAI
+    {
+        boss_icehowlAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override {}
+
+        void JustReachedHome() override
+        {
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_icehowlAI(pCreature);
+    }
+};
+
+void AddSC_northrend_beasts()
+{
+    Script* s;
+
+    s = new npc_beast_combat_stalker();
+    s->RegisterSelf();
+    s = new boss_gormok();
+    s->RegisterSelf();
+    s = new boss_acidmaw();
+    s->RegisterSelf();
+    s = new boss_dreadscale();
+    s->RegisterSelf();
+    s = new boss_icehowl();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_beast_combat_stalker";
+    //pNewScript->GetAI = &GetAI_npc_beast_combat_stalker;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_gormok";
+    //pNewScript->GetAI = &GetAI_boss_gormok;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_acidmaw";
+    //pNewScript->GetAI = &GetAI_boss_acidmaw;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_dreadscale";
+    //pNewScript->GetAI = &GetAI_boss_dreadscale;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_icehowl";
+    //pNewScript->GetAI = &GetAI_boss_icehowl;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_twin_valkyr.cpp b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_twin_valkyr.cpp
new file mode 100644
index 000000000..62084a96e
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_twin_valkyr.cpp
@@ -0,0 +1,130 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: trial_of_the_crusader
+SD%Complete: 0
+SDComment:
+SDCategory: Crusader Coliseum
+EndScriptData */
+
+#include "precompiled.h"
+#include "trial_of_the_crusader.h"
+
+enum
+{
+    SAY_AGGRO                           = -1649056,
+    SAY_BERSERK                         = -1649057,
+    SAY_COLORSWITCH                     = -1649058,
+    SAY_DEATH                           = -1649059,
+    SAY_SLAY_1                          = -1649060,
+    SAY_SLAY_2                          = -1649061,
+    SAY_TO_BLACK                        = -1649062,
+    SAY_TO_WHITE                        = -1649063,
+};
+
+/*######
+## boss_fjola
+######*/
+
+struct boss_fjola : CreatureScript
+{
+    boss_fjola() : CreatureScript("boss_fjola") {}
+
+    struct boss_fjolaAI : public ScriptedAI
+    {
+        boss_fjolaAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override {}
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            m_creature->SetInCombatWithZone();
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_fjolaAI(pCreature);
+    }
+};
+
+/*######
+## boss_eydis
+######*/
+
+struct boss_eydis : public CreatureScript
+{
+    boss_eydis() : CreatureScript("boss_eydis") {}
+
+    struct boss_eydisAI : public ScriptedAI
+    {
+        boss_eydisAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        void Reset() override {}
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            m_creature->SetInCombatWithZone();
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_eydisAI(pCreature);
+    }
+};
+
+void AddSC_twin_valkyr()
+{
+    Script* s;
+
+    s = new boss_fjola();
+    s->RegisterSelf();
+    s = new boss_eydis();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_fjola";
+    //pNewScript->GetAI = &GetAI_boss_fjola;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_eydis";
+    //pNewScript->GetAI = &GetAI_boss_fjola;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/instance_trial_of_the_crusader.cpp b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/instance_trial_of_the_crusader.cpp
new file mode 100644
index 000000000..cd49e77f4
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/instance_trial_of_the_crusader.cpp
@@ -0,0 +1,570 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: instance_trial_of_the_crusader
+SD%Complete: 100
+SDComment:
+SDCategory: Crusader Coliseum
+EndScriptData */
+
+#include "precompiled.h"
+#include "trial_of_the_crusader.h"
+
+/* Trial Of The Crusader encounters:
+0 - Wipe Count
+1 - Northrend Beasts
+2 - Jaraxxus
+3 - Faction Champions
+4 - Twin Valkyr
+5 - Anubarak
+*/
+
+enum
+{
+    SAY_TIRION_RAID_INTRO_LONG          = -1649000,
+    SAY_RAID_TRIALS_INTRO               = -1649001,
+
+    // Northrend Beasts
+    SAY_TIRION_BEAST_1                  = -1649002,
+    SAY_VARIAN_BEAST_1                  = -1649003,
+    SAY_GARROSH_BEAST_1                 = -1649004,
+    SAY_TIRION_BEAST_SLAY               = -1649007,
+    SAY_TIRION_BEAST_WIPE               = -1649008,
+
+    // Jaraxxus Encounter
+    SAY_TIRION_JARAXXUS_INTRO_1         = -1649009,
+    SAY_WILFRED_JARAXXUS_INTRO_1        = -1649010,
+    SAY_WILFRED_JARAXXUS_INTRO_2        = -1649011,
+    SAY_WILFRED_JARAXXUS_INTRO_3        = -1649012,
+    SAY_JARAXXUS_JARAXXAS_INTRO_1       = -1649013,
+    SAY_WILFRED_DEATH                   = -1649014,
+    SAY_TIRION_JARAXXUS_INTRO_2         = -1649015,
+    SAY_JARAXXUS_DEATH                  = -1649043,
+    SAY_TIRION_JARAXXUS_EXIT_1          = -1649016,
+    SAY_GARROSH_JARAXXUS_EXIT_1         = -1649017,
+    SAY_VARIAN_JARAXXUS_SLAY            = -1649018,
+    SAY_TIRION_JARAXXUS_EXIT_2          = -1649019,
+
+    // Faction-Champions
+    SAY_TIRION_PVP_INTRO_1              = -1649020,
+    SAY_GARROSH_PVP_A_INTRO_1           = -1649021,
+    SAY_VARIAN_PVP_H_INTRO_1            = -1649022,
+    SAY_TIRION_PVP_INTRO_2              = -1649023,
+    SAY_VARIAN_PVP_H_INTRO_2            = -1649024,
+    SAY_GARROSH_PVP_A_INTRO_2           = -1649025,
+    SAY_VARIAN_PVP_A_WIN                = -1649026,
+    SAY_GARROSH_PVP_H_WIN               = -1649027,
+    SAY_TIRION_PVP_WIN                  = -1649028,
+
+    // Twin Valkyrs
+    SAY_TIRION_TWINS_INTRO              = -1649029,
+    SAY_RAID_INTRO_SHORT                = -1649030,
+    SAY_VARIAN_TWINS_A_WIN              = -1649031,
+    SAY_GARROSH_TWINS_H_WIN             = -1649032,
+    SAY_TIRION_TWINS_WIN                = -1649033,
+
+    // Anub'Arak Encounter
+    SAY_LKING_ANUB_INTRO_1              = -1649034,
+    SAY_TIRION_ABUN_INTRO_1             = -1649035,
+    SAY_LKING_ANUB_INTRO_2              = -1649036,
+    SAY_LKING_ANUB_INTRO_3              = -1649037,
+
+    // Epilogue
+    SAY_TIRION_EPILOGUE                 = -1649075,
+};
+
+static const DialogueEntryTwoSide aTocDialogues[] =
+{
+    // Beasts related, summons in between not handled here
+    {TYPE_NORTHREND_BEASTS, 0, 0, 0,                        24000},
+    {SAY_TIRION_BEAST_1,            NPC_TIRION_A, 0, 0,     12000},
+    {SAY_VARIAN_BEAST_1,            NPC_VARIAN,         SAY_GARROSH_BEAST_1,        NPC_GARROSH,  0},
+    {SAY_TIRION_BEAST_SLAY,         NPC_TIRION_A, 0, 0,     8000},
+    {NPC_RAMSEY_2, 0, 0, 0,                                 0},
+    {SAY_TIRION_BEAST_WIPE,         NPC_TIRION_A, 0, 0,     8000},
+    {NPC_RAMSEY_1, 0, 0, 0,                                 0},
+    // Jaruxxus (Intro)
+    {TYPE_JARAXXUS, 0, 0, 0,                                1000},
+    {SAY_TIRION_JARAXXUS_INTRO_1,   NPC_TIRION_A, 0, 0,     6000},
+    {NPC_FIZZLEBANG, 0, 0, 0,                               26000},
+    {SAY_WILFRED_JARAXXUS_INTRO_1,  NPC_FIZZLEBANG, 0, 0,   10000},
+    {SAY_WILFRED_JARAXXUS_INTRO_2,  NPC_FIZZLEBANG, 0, 0,   7000},
+    {EVENT_OPEN_PORTAL, 0, 0, 0,                            5000},
+    {SAY_WILFRED_JARAXXUS_INTRO_3,  NPC_FIZZLEBANG, 0, 0,   12000}, // Summon also Jaraxxus
+    {SAY_JARAXXUS_JARAXXAS_INTRO_1, NPC_JARAXXUS, 0, 0,     6000},
+    {SAY_WILFRED_DEATH,             NPC_FIZZLEBANG, 0, 0,   1000},
+    {EVENT_KILL_FIZZLEBANG, 0, 0, 0,                        5000},  // Kill Fizzlebang
+    {SAY_TIRION_JARAXXUS_INTRO_2,   NPC_TIRION_A, 0, 0,     6000},
+    {EVENT_JARAXXUS_START_ATTACK, 0, 0, 0,                  0},
+    // Jaruxxus (Outro)
+    {SAY_JARAXXUS_DEATH,            NPC_JARAXXUS, 0, 0,     6000},  // Jaraxxus Death
+    {SAY_TIRION_JARAXXUS_EXIT_1,    NPC_TIRION_A, 0, 0,     5000},
+    {SAY_GARROSH_JARAXXUS_EXIT_1,   NPC_GARROSH, 0, 0,      11000},
+    {SAY_VARIAN_JARAXXUS_SLAY,      NPC_VARIAN, 0, 0,       8000},
+    {SAY_TIRION_JARAXXUS_EXIT_2,    NPC_TIRION_A, 0, 0,     19000},
+    {NPC_RAMSEY_3, 0, 0, 0,                                 0},
+    // Grand Champions
+    {SAY_TIRION_PVP_INTRO_1,        NPC_TIRION_A, 0, 0,     9000},
+    {SAY_GARROSH_PVP_A_INTRO_1,     NPC_GARROSH,        SAY_VARIAN_PVP_H_INTRO_1,   NPC_VARIAN, 14000},
+    {SAY_TIRION_PVP_INTRO_2,        NPC_TIRION_A, 0, 0,     1000},
+    {TYPE_FACTION_CHAMPIONS, 0, 0, 0,                       5000},
+    {SAY_GARROSH_PVP_A_INTRO_2,     NPC_GARROSH,        SAY_VARIAN_PVP_H_INTRO_2,   NPC_VARIAN, 0},
+    {SAY_VARIAN_PVP_A_WIN,          NPC_VARIAN,         SAY_GARROSH_PVP_H_WIN,      NPC_GARROSH, 4000},
+    {SAY_TIRION_PVP_WIN,            NPC_TIRION_A, 0, 0,     27000},
+    {NPC_RAMSEY_4, 0, 0, 0,                                 0},
+    // Twin Valkyrs
+    {TYPE_TWIN_VALKYR, 0, 0, 0,                             17000},
+    {EVENT_SUMMON_TWINS, 0, 0, 0,                           0},
+    {EVENT_TWINS_KILLED, 0, 0, 0,                           2000},
+    {NPC_RAMSEY_5, 0, 0, 0,                                 4000},
+    {SAY_VARIAN_TWINS_A_WIN,        NPC_VARIAN,         SAY_GARROSH_TWINS_H_WIN,    NPC_GARROSH, 1000},
+    {SAY_TIRION_TWINS_WIN,          NPC_TIRION_A, 0, 0,     0},
+    // Anub'arak
+    {TYPE_ANUBARAK, 0, 0, 0,                                19000},
+    {SAY_LKING_ANUB_INTRO_1,        NPC_THE_LICHKING, 0, 0, 4000},
+    {EVENT_ARTHAS_PORTAL, 0, 0, 0,                          2000},
+    {EVENT_SUMMON_THE_LICHKING, 0, 0, 0,                    3000},
+    {SAY_TIRION_ABUN_INTRO_1,       NPC_TIRION_A, 0, 0,     8000},
+    {SAY_LKING_ANUB_INTRO_2,        NPC_THE_LICHKING_VISUAL, 0, 0, 18500},
+    {EVENT_DESTROY_FLOOR, 0, 0, 0,                          2500},
+    {SAY_LKING_ANUB_INTRO_3,        NPC_THE_LICHKING, 0, 0, 0},
+    {0, 0, 0, 0 , 0}
+};
+
+struct is_trial_of_the_crusader : public InstanceScript
+{
+    is_trial_of_the_crusader() : InstanceScript("instance_trial_of_the_crusader") {}
+
+    class instance_trial_of_the_crusader : public ScriptedInstance, private DialogueHelper
+    {
+    public:
+        instance_trial_of_the_crusader(Map* pMap) : ScriptedInstance(pMap), DialogueHelper(aTocDialogues),
+            m_uiTeam(TEAM_NONE)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+            InitializeDialogueHelper(this);
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = TYPE_NORTHREND_BEASTS; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    return true;
+            }
+
+            return false;
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_FIZZLEBANG:
+                DoUseDoorOrButton(GO_MAIN_GATE);
+            case NPC_TIRION_A:
+            case NPC_TIRION_B:
+            case NPC_VARIAN:
+            case NPC_GARROSH:
+            case NPC_JARAXXUS:
+            case NPC_OPEN_PORTAL_TARGET:
+            case NPC_EYDIS:
+            case NPC_WORLD_TRIGGER_LARGE:
+            case NPC_THE_LICHKING:
+            case NPC_THE_LICHKING_VISUAL:
+                break;
+            default:
+                return;
+            }
+
+            m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_COLISEUM_FLOOR:
+                if (m_auiEncounter[TYPE_TWIN_VALKYR] == DONE)
+                {
+                    pGo->SetDisplayId(DISPLAYID_DESTROYED_FLOOR);
+                    pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK_10 | GO_FLAG_NODESPAWN);
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_TRIBUTE_CHEST_10H_01:
+            case GO_TRIBUTE_CHEST_10H_25:
+            case GO_TRIBUTE_CHEST_10H_45:
+            case GO_TRIBUTE_CHEST_10H_50:
+            case GO_TRIBUTE_CHEST_25H_01:
+            case GO_TRIBUTE_CHEST_25H_25:
+            case GO_TRIBUTE_CHEST_25H_45:
+            case GO_TRIBUTE_CHEST_25H_50:
+            case GO_MAIN_GATE:
+            case GO_WEB_DOOR:
+            case GO_PORTAL_DALARAN:
+                break;
+            case GO_CRUSADERS_CACHE:
+            case GO_CRUSADERS_CACHE_25:
+            case GO_CRUSADERS_CACHE_10_H:
+            case GO_CRUSADERS_CACHE_25_H:
+                m_mGoEntryGuidStore[GO_CRUSADERS_CACHE] = pGo->GetObjectGuid();
+                return;
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            if (m_uiTeam)
+                return;
+
+            m_uiTeam = pPlayer->GetTeam();
+            SetDialogueSide(m_uiTeam == ALLIANCE);
+
+            DoSummonRamsey(0);
+
+            // Show wipe world state on heroic difficulty
+            if (IsHeroicDifficulty())
+            {
+                pPlayer->SendUpdateWorldState(WORLD_STATE_WIPES, 1);
+                pPlayer->SendUpdateWorldState(WORLD_STATE_WIPES_COUNT, MAX_WIPES_ALLOWED >= GetData(TYPE_WIPE_COUNT) ? MAX_WIPES_ALLOWED - GetData(TYPE_WIPE_COUNT) : 0);
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_WIPE_COUNT:
+                // Update data before updating worldstate
+                m_auiEncounter[uiType] = uiData;
+                if (IsHeroicDifficulty())
+                    DoUpdateWorldState(WORLD_STATE_WIPES_COUNT, MAX_WIPES_ALLOWED >= GetData(TYPE_WIPE_COUNT) ? MAX_WIPES_ALLOWED - GetData(TYPE_WIPE_COUNT) : 0);
+                break;
+            case TYPE_NORTHREND_BEASTS:
+                if (uiData == SPECIAL)
+                {
+                    if (Creature* pTirion = GetSingleCreatureFromStorage(NPC_TIRION_A))
+                        DoScriptText(m_auiEncounter[uiType] != FAIL ? SAY_TIRION_RAID_INTRO_LONG : SAY_RAID_TRIALS_INTRO, pTirion);
+                    StartNextDialogueText(TYPE_NORTHREND_BEASTS);
+                }
+                else if (uiData == FAIL)
+                {
+                    SetData(TYPE_WIPE_COUNT, m_auiEncounter[TYPE_WIPE_COUNT] + 1);
+                    StartNextDialogueText(SAY_TIRION_BEAST_WIPE);
+                }
+                else if (uiData == DONE)
+                    StartNextDialogueText(SAY_TIRION_BEAST_SLAY);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_JARAXXUS:
+                if (uiData == SPECIAL)
+                    // TODO - What happen in wipe case?
+                    StartNextDialogueText(TYPE_JARAXXUS);
+                else if (uiData == FAIL)
+                {
+                    SetData(TYPE_WIPE_COUNT, m_auiEncounter[TYPE_WIPE_COUNT] + 1);
+                    StartNextDialogueText(NPC_RAMSEY_2);
+                }
+                else if (uiData == DONE)
+                    StartNextDialogueText(SAY_JARAXXUS_DEATH);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_FACTION_CHAMPIONS:
+                if (uiData == SPECIAL)
+                    StartNextDialogueText(m_auiEncounter[uiType] != FAIL ? uint8(SAY_TIRION_PVP_INTRO_1) : uint8(TYPE_FACTION_CHAMPIONS));
+                else if (uiData == FAIL)
+                {
+                    SetData(TYPE_WIPE_COUNT, m_auiEncounter[TYPE_WIPE_COUNT] + 1);
+                    StartNextDialogueText(NPC_RAMSEY_3);
+                }
+                else if (uiData == DONE)
+                {
+                    DoRespawnGameObject(GO_CRUSADERS_CACHE, 60 * MINUTE);
+                    StartNextDialogueText(SAY_VARIAN_PVP_A_WIN);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_TWIN_VALKYR:
+                if (uiData == SPECIAL)
+                {
+                    if (Creature* pTirion = GetSingleCreatureFromStorage(NPC_TIRION_A))
+                        DoScriptText(m_auiEncounter[uiType] != FAIL ? SAY_TIRION_TWINS_INTRO : SAY_RAID_INTRO_SHORT, pTirion);
+                    StartNextDialogueText(TYPE_TWIN_VALKYR);
+                }
+                else if (uiData == FAIL)
+                {
+                    SetData(TYPE_WIPE_COUNT, m_auiEncounter[TYPE_WIPE_COUNT] + 1);
+                    StartNextDialogueText(NPC_RAMSEY_4);
+                }
+                else if (uiData == DONE)
+                    StartNextDialogueText(EVENT_TWINS_KILLED);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_ANUBARAK:
+                if (uiData == SPECIAL)
+                    StartNextDialogueText(TYPE_ANUBARAK);
+                else if (uiData == FAIL)
+                    SetData(TYPE_WIPE_COUNT, m_auiEncounter[TYPE_WIPE_COUNT] + 1);
+                else if (uiData == DONE)
+                    DoHandleEventEpilogue();
+                // Handle combat door
+                if (uiData != SPECIAL)
+                    DoUseDoorOrButton(GO_WEB_DOOR);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            default:
+                script_error_log("Instance Trial of The Crusader: ERROR SetData = %u for type %u does not exist/not implemented.", uiType, uiData);
+                return;
+            }
+
+            if (uiData == DONE || uiType == TYPE_WIPE_COUNT)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            if (uiType == TYPE_DATA_IS_HEROIC)
+                return uint32(IsHeroicDifficulty());
+
+            return 0;
+        }
+
+        // Difficulty wrappers
+        bool IsHeroicDifficulty() const { return instance->GetDifficulty() == RAID_DIFFICULTY_10MAN_HEROIC || instance->GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC; }
+        bool Is25ManDifficulty() const { return instance->GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL || instance->GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC; }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5];
+
+            for (uint8 i = TYPE_NORTHREND_BEASTS; i < MAX_ENCOUNTER; ++i)
+            if (m_auiEncounter[i] == IN_PROGRESS)            // Do not load an encounter as "In Progress" - reset it instead.
+                m_auiEncounter[i] = NOT_STARTED;
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) { DialogueUpdate(uiDiff); }
+
+    private:
+        void DoSummonRamsey(uint32 uiEntry)
+        {
+            Player* pPlayer = GetPlayerInMap();
+            if (!pPlayer)
+                return;
+
+            if (uiEntry)
+                ;
+            // For initial case, figure which Ramsay to summon
+            else if (m_auiEncounter[TYPE_TWIN_VALKYR] == DONE)
+                uiEntry = NPC_RAMSEY_5;
+            else if (m_auiEncounter[TYPE_FACTION_CHAMPIONS] == DONE)
+                uiEntry = NPC_RAMSEY_4;
+            else if (m_auiEncounter[TYPE_JARAXXUS] == DONE)
+                uiEntry = NPC_RAMSEY_3;
+            else if (m_auiEncounter[TYPE_NORTHREND_BEASTS] == DONE)
+                uiEntry = NPC_RAMSEY_2;
+            else
+                uiEntry = NPC_RAMSEY_1;
+
+            pPlayer->SummonCreature(uiEntry, aRamsayPositions[0][0], aRamsayPositions[0][1], aRamsayPositions[0][2], aRamsayPositions[0][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case NPC_RAMSEY_1:
+            case NPC_RAMSEY_2:
+            case NPC_RAMSEY_3:
+            case NPC_RAMSEY_4:
+            case NPC_RAMSEY_5:
+                DoSummonRamsey(iEntry);
+                break;
+            case SAY_VARIAN_BEAST_1:
+                if (Player* pPlayer = GetPlayerInMap())
+                {
+                    if (Creature* pBeasts = pPlayer->SummonCreature(NPC_BEAST_COMBAT_STALKER, aSpawnPositions[0][0], aSpawnPositions[0][1], aSpawnPositions[0][2], aSpawnPositions[0][3], TEMPSUMMON_DEAD_DESPAWN, 0))
+                        pBeasts->SummonCreature(NPC_GORMOK, aSpawnPositions[1][0], aSpawnPositions[1][1], aSpawnPositions[1][2], aSpawnPositions[1][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+                break;
+            case NPC_FIZZLEBANG:
+                if (Player* pPlayer = GetPlayerInMap())
+                    pPlayer->SummonCreature(NPC_FIZZLEBANG, aSpawnPositions[5][0], aSpawnPositions[5][1], aSpawnPositions[5][2], aSpawnPositions[5][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                break;
+            case SAY_WILFRED_JARAXXUS_INTRO_1:
+                DoUseDoorOrButton(GO_MAIN_GATE); // Close main gate
+                break;
+            case SAY_WILFRED_JARAXXUS_INTRO_2:
+                if (Creature* pFizzlebang = GetSingleCreatureFromStorage(NPC_FIZZLEBANG))
+                {
+                    pFizzlebang->SummonCreature(NPC_PURPLE_RUNE, aSpawnPositions[11][0], aSpawnPositions[11][1], aSpawnPositions[11][2], aSpawnPositions[11][3], TEMPSUMMON_TIMED_DESPAWN, 15000);
+                    pFizzlebang->CastSpell(pFizzlebang, SPELL_OPEN_PORTAL, false);
+                }
+                break;
+            case EVENT_OPEN_PORTAL:
+                if (Creature* pOpenPortalTarget = GetSingleCreatureFromStorage(NPC_OPEN_PORTAL_TARGET))
+                {
+                    pOpenPortalTarget->CastSpell(pOpenPortalTarget, SPELL_WILFRED_PORTAL, true);
+                    pOpenPortalTarget->ForcedDespawn(9000);
+                }
+                break;
+            case SAY_WILFRED_JARAXXUS_INTRO_3:
+                if (Player* pPlayer = GetPlayerInMap())
+                if (Creature* pJaraxxus = pPlayer->SummonCreature(NPC_JARAXXUS, aSpawnPositions[6][0], aSpawnPositions[6][1], aSpawnPositions[6][2], aSpawnPositions[6][3], TEMPSUMMON_DEAD_DESPAWN, 0))
+                    pJaraxxus->GetMotionMaster()->MovePoint(POINT_COMBAT_POSITION, aMovePositions[3][0], aMovePositions[3][1], aMovePositions[3][2]);
+                break;
+            case EVENT_KILL_FIZZLEBANG:
+                if (Creature* pJaraxxus = GetSingleCreatureFromStorage(NPC_JARAXXUS))
+                    pJaraxxus->CastSpell(pJaraxxus, SPELL_FEL_LIGHTNING_KILL, true);
+                break;
+            case EVENT_JARAXXUS_START_ATTACK:
+                if (Creature* pJaraxxus = GetSingleCreatureFromStorage(NPC_JARAXXUS))
+                    pJaraxxus->SetInCombatWithZone();
+                break;
+            case EVENT_SUMMON_TWINS:
+                if (Player* pPlayer = GetPlayerInMap())
+                {
+                    pPlayer->SummonCreature(NPC_FJOLA, aSpawnPositions[7][0], aSpawnPositions[7][1], aSpawnPositions[7][2], aSpawnPositions[7][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                    pPlayer->SummonCreature(NPC_EYDIS, aSpawnPositions[8][0], aSpawnPositions[8][1], aSpawnPositions[8][2], aSpawnPositions[8][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+                break;
+            case SAY_LKING_ANUB_INTRO_1:
+                if (Player* pPlayer = GetPlayerInMap())
+                    pPlayer->SummonCreature(NPC_WORLD_TRIGGER_LARGE, aSpawnPositions[9][0], aSpawnPositions[9][1], aSpawnPositions[9][2], aSpawnPositions[9][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                break;
+            case EVENT_ARTHAS_PORTAL:
+                if (Creature* pWorldTriggerLarge = GetSingleCreatureFromStorage(NPC_WORLD_TRIGGER_LARGE))
+                    pWorldTriggerLarge->CastSpell(pWorldTriggerLarge, SPELL_ARTHAS_PORTAL, true);
+                break;
+            case EVENT_SUMMON_THE_LICHKING:
+                if (Player* pPlayer = GetPlayerInMap())
+                    pPlayer->SummonCreature(NPC_THE_LICHKING_VISUAL, aSpawnPositions[10][0], aSpawnPositions[10][1], aSpawnPositions[10][2], aSpawnPositions[10][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                break;
+            case EVENT_DESTROY_FLOOR:
+                if (GameObject* pColiseumFloor = GetSingleGameObjectFromStorage(GO_COLISEUM_FLOOR))
+                {
+                    pColiseumFloor->SetDisplayId(DISPLAYID_DESTROYED_FLOOR);
+                    pColiseumFloor->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK_10 | GO_FLAG_NODESPAWN);
+                    pColiseumFloor->SetGoState(GO_STATE_ACTIVE);
+                }
+
+                if (Creature* pLichKingVisual = GetSingleCreatureFromStorage(NPC_THE_LICHKING_VISUAL))
+                {
+                    pLichKingVisual->CastSpell(pLichKingVisual, SPELL_FROSTNOVA, true);
+                    // pLichKingVisual->CastSpell(pLichKingVisual, SPELL_CORPSE_TELEPORT, true); // NYI
+                    pLichKingVisual->ForcedDespawn();
+                }
+
+                if (Creature* pLichKing = GetSingleCreatureFromStorage(NPC_THE_LICHKING))
+                    pLichKing->CastSpell(pLichKing, SPELL_DESTROY_FLOOR_KNOCKUP, true);
+
+                if (Creature* pWorldTriggerLarge = GetSingleCreatureFromStorage(NPC_WORLD_TRIGGER_LARGE))
+                    pWorldTriggerLarge->ForcedDespawn();
+                break;
+            }
+        }
+
+        void DoHandleEventEpilogue()
+        {
+            Player* pPlayer = GetPlayerInMap();
+            if (!pPlayer)
+                return;
+
+            // Spawn Tirion and the mage
+            if (Creature* pTirion = pPlayer->SummonCreature(NPC_TIRION_B, aSpawnPositions[12][0], aSpawnPositions[12][1], aSpawnPositions[12][2], aSpawnPositions[12][3], TEMPSUMMON_CORPSE_DESPAWN, 0))
+                DoScriptText(SAY_TIRION_EPILOGUE, pTirion);
+
+            pPlayer->SummonCreature(NPC_ARGENT_MAGE, aSpawnPositions[13][0], aSpawnPositions[13][1], aSpawnPositions[13][2], aSpawnPositions[13][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
+
+            DoRespawnGameObject(GO_PORTAL_DALARAN, 60 * MINUTE);
+
+            // Spawn the chest for heroic difficulty
+            if (IsHeroicDifficulty())
+            {
+                if (GetData(TYPE_WIPE_COUNT) == 0)
+                    DoRespawnGameObject(Is25ManDifficulty() ? GO_TRIBUTE_CHEST_25H_50 : GO_TRIBUTE_CHEST_10H_50, 60 * MINUTE);
+                else if (GetData(TYPE_WIPE_COUNT) < 5)
+                    DoRespawnGameObject(Is25ManDifficulty() ? GO_TRIBUTE_CHEST_25H_45 : GO_TRIBUTE_CHEST_10H_45, 60 * MINUTE);
+                else if (GetData(TYPE_WIPE_COUNT) < 25)
+                    DoRespawnGameObject(Is25ManDifficulty() ? GO_TRIBUTE_CHEST_25H_25 : GO_TRIBUTE_CHEST_10H_25, 60 * MINUTE);
+                else
+                    DoRespawnGameObject(Is25ManDifficulty() ? GO_TRIBUTE_CHEST_25H_01 : GO_TRIBUTE_CHEST_10H_01, 60 * MINUTE);
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        Team m_uiTeam;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_trial_of_the_crusader(pMap);
+    }
+};
+
+void AddSC_instance_trial_of_the_crusader()
+{
+    Script* s;
+
+    s = new is_trial_of_the_crusader();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_trial_of_the_crusader";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_trial_of_the_crusader;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/trial_of_the_crusader.cpp b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/trial_of_the_crusader.cpp
new file mode 100644
index 000000000..17ab95b9f
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/trial_of_the_crusader.cpp
@@ -0,0 +1,229 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: trial_of_the_crusader
+SD%Complete: 0
+SDComment:
+SDCategory: Crusader Coliseum
+EndScriptData */
+
+#include "precompiled.h"
+#include "trial_of_the_crusader.h"
+
+enum
+{
+    GOSSIP_TEXT_BEAST_INIT              = 14664,
+    GOSSIP_TEXT_BEAST_START             = 14665,
+    GOSSIP_TEXT_BEAST_WIPE_INIT         = 14667,
+    GOSSIP_TEXT_BEAST_WIPE_START        = 14668,
+
+    GOSSIP_TEXT_JARAXXUS_INIT           = 14678,
+    GOSSIP_TEXT_JARAXXUS_START          = 14680,
+    GOSSIP_TEXT_JARAXXUS_WIPE_INIT      = 14679,
+    GOSSIP_TEXT_JARAXXUS_WIPE_START     = 14682,
+
+    GOSSIP_TEXT_PVP_INIT                = 14813,
+    GOSSIP_TEXT_PVP_START               = 14814,
+    GOSSIP_TEXT_PVP_WIPE_INIT           = 14815,
+    GOSSIP_TEXT_PVP_WIPE_START          = 14816,
+
+    GOSSIP_TEXT_TWINS_INIT              = 14819,
+    GOSSIP_TEXT_TWINS_START             = 14821,
+    GOSSIP_TEXT_TWINS_WIPE_INIT         = 14820,
+    GOSSIP_TEXT_TWINS_WIPE_START        = 14822,
+
+    GOSSIP_TEXT_ANUB_INIT               = 14828,
+    GOSSIP_TEXT_ANUB_START              = 14829,
+
+    GOSSIP_ITEM_BEAST_INIT              = -3649000,
+    GOSSIP_ITEM_BEAST_START             = -3649001,
+    GOSSIP_ITEM_BEAST_WIPE_INIT         = -3649002,
+    GOSSIP_ITEM_BEAST_WIPE_START        = -3000000,
+
+    GOSSIP_ITEM_JARAXXUS_INIT           = -3649003,
+    GOSSIP_ITEM_JARAXXUS_START          = -3000000,
+    GOSSIP_ITEM_JARAXXUS_WIPE_INIT      = -3649004,
+    GOSSIP_ITEM_JARAXXUS_WIPE_START     = -3000000,
+
+    GOSSIP_ITEM_PVP_INIT                = -3649005,
+    GOSSIP_ITEM_PVP_START               = -3649006,
+    GOSSIP_ITEM_PVP_WIPE_INIT           = -3000000,
+    GOSSIP_ITEM_PVP_WIPE_START          = -3000000,
+
+    GOSSIP_ITEM_TWINS_INIT              = -3649007,
+    GOSSIP_ITEM_TWINS_START             = -3649008,
+    GOSSIP_ITEM_TWINS_WIPE_INIT         = -3000000,
+    GOSSIP_ITEM_TWINS_WIPE_START        = -3000000,
+
+    GOSSIP_ITEM_ANUB_INIT               = -3649009,
+    GOSSIP_ITEM_ANUB_START              = -3649010,
+};
+
+/*######
+## npc_barrett_ramsey
+######*/
+
+struct RamseyInfo
+{
+    uint32 uiEntry;
+    uint32 uiTextEntry;
+    int32  iGossipItem;
+    uint32 uiWipeTextEntry;
+    int32  iWipeGossipItem;
+    uint32 uiOptionId;                                      // If . > 0 SetInstData(. , SPECIAL), else open new DiagMenu
+};
+
+static const RamseyInfo aRamseyInfo[] =
+{
+    {NPC_RAMSEY_1, GOSSIP_TEXT_BEAST_INIT,  GOSSIP_ITEM_BEAST_INIT,  GOSSIP_TEXT_BEAST_WIPE_INIT,  GOSSIP_ITEM_BEAST_WIPE_INIT,  0},
+    {NPC_RAMSEY_1, GOSSIP_TEXT_BEAST_START, GOSSIP_ITEM_BEAST_START, GOSSIP_TEXT_BEAST_WIPE_START, GOSSIP_ITEM_BEAST_WIPE_START, TYPE_NORTHREND_BEASTS},
+
+    {NPC_RAMSEY_2, GOSSIP_TEXT_JARAXXUS_INIT,  GOSSIP_ITEM_JARAXXUS_INIT,  GOSSIP_TEXT_JARAXXUS_WIPE_INIT,  GOSSIP_ITEM_JARAXXUS_WIPE_INIT,  0},
+    {NPC_RAMSEY_2, GOSSIP_TEXT_JARAXXUS_START, GOSSIP_ITEM_JARAXXUS_START, GOSSIP_TEXT_JARAXXUS_WIPE_START, GOSSIP_ITEM_JARAXXUS_WIPE_START, TYPE_JARAXXUS},
+
+    {NPC_RAMSEY_3, GOSSIP_TEXT_PVP_INIT,  GOSSIP_ITEM_PVP_INIT,  GOSSIP_TEXT_PVP_WIPE_INIT,  GOSSIP_ITEM_PVP_WIPE_INIT,  0},
+    {NPC_RAMSEY_3, GOSSIP_TEXT_PVP_START, GOSSIP_ITEM_PVP_START, GOSSIP_TEXT_PVP_WIPE_START, GOSSIP_ITEM_PVP_WIPE_START, TYPE_FACTION_CHAMPIONS},
+
+    {NPC_RAMSEY_4, GOSSIP_TEXT_TWINS_INIT,  GOSSIP_ITEM_TWINS_INIT,  GOSSIP_TEXT_TWINS_WIPE_INIT,  GOSSIP_ITEM_TWINS_WIPE_INIT,  0},
+    {NPC_RAMSEY_4, GOSSIP_TEXT_TWINS_START, GOSSIP_ITEM_TWINS_START, GOSSIP_TEXT_TWINS_WIPE_START, GOSSIP_ITEM_TWINS_WIPE_START, TYPE_TWIN_VALKYR},
+
+    {NPC_RAMSEY_5, GOSSIP_TEXT_ANUB_INIT,  GOSSIP_ITEM_ANUB_INIT,  0,  0,  0},
+    {NPC_RAMSEY_5, GOSSIP_TEXT_ANUB_START, GOSSIP_ITEM_ANUB_START, 0, 0, TYPE_ANUBARAK},
+};
+
+struct npc_barrett_ramsey : public CreatureScript
+{
+    npc_barrett_ramsey() : CreatureScript("npc_barrett_ramsey") {}
+
+    struct npc_barrett_ramseyAI : public ScriptedAI
+    {
+        npc_barrett_ramseyAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override {}
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType == POINT_MOTION_TYPE && uiPointId == 1)
+                m_creature->ForcedDespawn();
+        }
+    };
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        uint8 uiPos = 0;
+        uint32 uiType = 0;
+
+        for (uint8 i = 0; i < countof(aRamseyInfo); ++i)
+        {
+            if (pCreature->GetEntry() == aRamseyInfo[i].uiEntry)
+            {
+                if (!aRamseyInfo[i].uiOptionId)
+                    uiPos = i;
+                else
+                {
+                    uiType = aRamseyInfo[i].uiOptionId;
+                    break;
+                }
+            }
+        }
+
+        if (!uiType || !pInstance)
+            return true;
+
+        if (pInstance->GetData(uiType) == FAIL)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, aRamseyInfo[uiPos].iWipeGossipItem, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+            pPlayer->SEND_GOSSIP_MENU(aRamseyInfo[uiPos].uiWipeTextEntry, pCreature->GetObjectGuid());
+        }
+        else
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, aRamseyInfo[uiPos].iGossipItem, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+            pPlayer->SEND_GOSSIP_MENU(aRamseyInfo[uiPos].uiTextEntry, pCreature->GetObjectGuid());
+        }
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        if (!pInstance)
+            return true;
+
+        if (uiAction > GOSSIP_ACTION_INFO_DEF)
+        {
+            // Begin Event
+            uint32 uiType = uiAction - GOSSIP_ACTION_INFO_DEF;
+            if (pInstance->GetData(uiType) == FAIL || pInstance->GetData(uiType) == NOT_STARTED)
+                pInstance->SetData(uiAction - GOSSIP_ACTION_INFO_DEF, SPECIAL);
+
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            pCreature->GetMotionMaster()->MovePoint(1, aRamsayPositions[1][0], aRamsayPositions[1][1], aRamsayPositions[1][2]);
+
+            return true;
+        }
+
+        for (uint8 i = 0; i < countof(aRamseyInfo); ++i)
+        {
+            if (pCreature->GetEntry() == aRamseyInfo[i].uiEntry && aRamseyInfo[i].uiOptionId)
+            {
+                if (pInstance->GetData(aRamseyInfo[i].uiOptionId) == FAIL)
+                {
+                    pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, aRamseyInfo[i].iWipeGossipItem, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + aRamseyInfo[i].uiOptionId);
+                    pPlayer->SEND_GOSSIP_MENU(aRamseyInfo[i].uiWipeTextEntry, pCreature->GetObjectGuid());
+                }
+                else
+                {
+                    pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, aRamseyInfo[i].iGossipItem, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + aRamseyInfo[i].uiOptionId);
+                    pPlayer->SEND_GOSSIP_MENU(aRamseyInfo[i].uiTextEntry, pCreature->GetObjectGuid());
+                }
+
+                return true;
+            }
+        }
+
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_barrett_ramseyAI(pCreature);
+    }
+};
+
+void AddSC_trial_of_the_crusader()
+{
+    Script* s;
+
+    s = new npc_barrett_ramsey();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_barrett_ramsey";
+    //pNewScript->GetAI = &GetAI_npc_barrett_ramsey;
+    //pNewScript->pGossipHello = &GossipHello_npc_barrett_ramsey;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_barrett_ramsey;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/trial_of_the_crusader.h b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/trial_of_the_crusader.h
new file mode 100644
index 000000000..cf459799e
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/crusaders_coliseum/trial_of_the_crusader/trial_of_the_crusader.h
@@ -0,0 +1,130 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_TRIAL_OF_THE_CRUSADER_H
+#define DEF_TRIAL_OF_THE_CRUSADER_H
+
+enum
+{
+    MAX_ENCOUNTER               = 6,
+    MAX_WIPES_ALLOWED           = 50,
+
+    TYPE_WIPE_COUNT             = 0,
+    TYPE_NORTHREND_BEASTS       = 1,
+    TYPE_JARAXXUS               = 2,
+    TYPE_FACTION_CHAMPIONS      = 3,
+    TYPE_TWIN_VALKYR            = 4,
+    TYPE_ANUBARAK               = 5,
+
+    EVENT_OPEN_PORTAL           = 6,
+    EVENT_KILL_FIZZLEBANG       = 7,
+    EVENT_JARAXXUS_START_ATTACK = 8,
+    EVENT_SUMMON_TWINS          = 9,
+    EVENT_TWINS_KILLED          = 10,
+    EVENT_ARTHAS_PORTAL         = 11,
+    EVENT_SUMMON_THE_LICHKING   = 12,
+    EVENT_DESTROY_FLOOR         = 13,
+    TYPE_DATA_IS_HEROIC         = 14,
+
+    NPC_BEAST_COMBAT_STALKER    = 36549,
+    NPC_GORMOK                  = 34796,
+    NPC_ACIDMAW                 = 35144,
+    NPC_DREADSCALE              = 34799,
+    NPC_ICEHOWL                 = 34797,
+    NPC_JARAXXUS                = 34780,
+    NPC_FJOLA                   = 34497,
+    NPC_EYDIS                   = 34496,
+    NPC_ANUBARAK                = 34564,
+
+    NPC_TIRION_A                = 34996,
+    NPC_TIRION_B                = 36095,                    // Summoned after his text (Champions, you're alive! Not only have you defeated every challenge of the Trial of the Crusader, but also thwarted Arthas' plans! Your skill and cunning will prove to be a powerful weapon against the Scourge. Well done! Allow one of the Crusade's mages to transport you to the surface!) is said..
+    NPC_ARGENT_MAGE             = 36097,                    // Summoned along with Tirion B
+    NPC_VARIAN                  = 34990,
+    NPC_GARROSH                 = 34995,
+    NPC_FIZZLEBANG              = 35458,
+    NPC_OPEN_PORTAL_TARGET      = 17965,
+    NPC_WORLD_TRIGGER_LARGE     = 22517,                    // Used for Lich King summon event
+    NPC_THE_LICHKING            = 16980,
+    NPC_THE_LICHKING_VISUAL     = 35877,
+    NPC_RAMSEY_1                = 34816,
+    NPC_RAMSEY_2                = 35035,
+    NPC_RAMSEY_3                = 35766,
+    NPC_RAMSEY_4                = 35770,
+    NPC_RAMSEY_5                = 35771,
+    NPC_RAMSEY_6                = 35895,                    // Unknown what these three NPCs are used for, maybe horde events?
+    NPC_RAMSEY_7                = 35909,
+    NPC_RAMSEY_8                = 35910,
+
+    NPC_PURPLE_RUNE             = 35651,
+
+    GO_MAIN_GATE                = 195647,
+    GO_WEST_GATE                = 195648,                   // entrance gate
+    GO_SOUTH_GATE               = 195649,                   // south and north doors are used to allow the Champions to enter the arena
+    GO_NORTH_GATE               = 195650,
+    GO_COLISEUM_FLOOR           = 195527,
+    GO_WEB_DOOR                 = 195485,
+    GO_PORTAL_DALARAN           = 195682,
+
+    GO_CRUSADERS_CACHE          = 195631,
+    GO_CRUSADERS_CACHE_25       = 195632,
+    GO_CRUSADERS_CACHE_10_H     = 195633,
+    GO_CRUSADERS_CACHE_25_H     = 195635,
+
+    GO_TRIBUTE_CHEST_10H_01     = 195665,
+    GO_TRIBUTE_CHEST_10H_25     = 195666,
+    GO_TRIBUTE_CHEST_10H_45     = 195667,
+    GO_TRIBUTE_CHEST_10H_50     = 195668,
+
+    GO_TRIBUTE_CHEST_25H_01     = 195669,
+    GO_TRIBUTE_CHEST_25H_25     = 195670,
+    GO_TRIBUTE_CHEST_25H_45     = 195671,
+    GO_TRIBUTE_CHEST_25H_50     = 195672,
+
+    SPELL_OPEN_PORTAL           = 67864,
+    SPELL_FEL_LIGHTNING_KILL    = 67888,
+    SPELL_WILFRED_PORTAL        = 68424,
+    SPELL_ARTHAS_PORTAL         = 51807,
+    SPELL_FROSTNOVA             = 68198,
+    SPELL_CORPSE_TELEPORT       = 69016, // NYI
+    SPELL_DESTROY_FLOOR_KNOCKUP = 68193,
+
+    DISPLAYID_DESTROYED_FLOOR   = 9060,
+    POINT_COMBAT_POSITION       = 10,
+
+    WORLD_STATE_WIPES           = 4390,
+    WORLD_STATE_WIPES_COUNT     = 4389,
+};
+
+static const float aRamsayPositions[2][4] =
+{
+    {559.1528f, 90.55729f, 395.2734f, 5.078908f},           // Summon Position
+    {563.556f,  78.72571f, 395.2125f, 0}                    // Movement Position
+};
+
+static const float aSpawnPositions[][4] =
+{
+    {563.8941f, 137.3333f, 405.8467f, 0},                   // Beast combat stalker (Summoned when SAY_VARIAN_BEAST_1)
+    {563.9358f, 229.8299f, 394.8061f, 4.694936f},           // Gormok (vehicle) (Summoned when SAY_VARIAN_BEAST_1)
+    {564.3301f, 232.1549f, 394.8188f, 1.621917f},           // Dreadscale (Summoned when Tirion says SAY_TIRION_BEAST_2)
+    {549.5139f, 170.1389f, 394.7965f, 5.009095f},           // Acidmaw (Summoned(?) 14s after Dreadscale)
+    {563.6081f, 228.1491f, 394.7057f, 4.664022f},           // Icehowl (Summoned when SAY_TIRION_BEAST_3)
+    {563.6007f, 208.5278f, 395.2696f, 4.729842f},           // Fizzlebang
+    {563.8264f, 140.6563f, 393.9861f, 4.694936f},           // Jaraxxus
+    {571.684f,  204.9028f, 399.263f,  4.590216f},           // Fjola
+    {555.4514f, 205.8889f, 399.2634f, 4.886922f},           // Eydis
+    {563.6996f, 175.9826f, 394.5042f, 4.694936f},           // World Trigger Large
+    {563.5712f, 174.8351f, 394.4954f, 4.712389f},           // Lich King
+    {563.6858f, 139.4323f, 393.9862f, 4.694936f},           // Purple Rune / Center Position
+    {648.9169f, 131.0209f, 141.6159f, 0},                   // Tirion B
+    {649.1610f, 142.0399f, 141.3060f, 0},                   // Argent mage
+};
+
+static const float aMovePositions[][3] =
+{
+    {563.748f,  179.766f,  394.4862f},                      // Gormok
+    {576.5347f, 168.9514f, 394.7064f},                      // Dreadscale
+    {563.8577f, 176.5885f, 394.4417f},                      // Icehowl
+    {563.7223f, 131.2344f, 393.9901f},                      // Jaraxxus
+};
+#endif
diff --git a/src/modules/SD3/scripts/northrend/dalaran.cpp b/src/modules/SD3/scripts/northrend/dalaran.cpp
new file mode 100644
index 000000000..8bf7414bd
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/dalaran.cpp
@@ -0,0 +1,107 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Dalaran
+SD%Complete: 100
+SDComment:
+SDCategory: Dalaran
+EndScriptData */
+
+/* ContentData
+npc_dalaran_guardian_mage
+EndContentData */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_TRESPASSER_H          = 54029,
+    SPELL_TRESPASSER_A          = 54028,
+
+    // Exception auras - used for quests 20439 and 24451
+    SPELL_COVENANT_DISGUISE_1   = 70971,
+    SPELL_COVENANT_DISGUISE_2   = 70972,
+    SPELL_SUNREAVER_DISGUISE_1  = 70973,
+    SPELL_SUNREAVER_DISGUISE_2  = 70974,
+
+    AREA_ID_SUNREAVER           = 4616,
+    AREA_ID_SILVER_ENCLAVE      = 4740
+};
+
+struct npc_dalaran_guardian_mage : public CreatureScript
+{
+    npc_dalaran_guardian_mage() : CreatureScript("npc_dalaran_guardian_mage") {}
+
+    struct npc_dalaran_guardian_mageAI : public ScriptedAI
+    {
+        npc_dalaran_guardian_mageAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_creature->GetDistanceZ(pWho) > CREATURE_Z_ATTACK_RANGE)
+                return;
+
+            if (pWho->IsTargetableForAttack() && m_creature->IsHostileTo(pWho))
+            {
+                // exception for quests 20439 and 24451
+                if (pWho->HasAura(SPELL_COVENANT_DISGUISE_1) || pWho->HasAura(SPELL_COVENANT_DISGUISE_2) ||
+                    pWho->HasAura(SPELL_SUNREAVER_DISGUISE_1) || pWho->HasAura(SPELL_SUNREAVER_DISGUISE_2))
+                    return;
+
+                if (m_creature->IsWithinDistInMap(pWho, m_creature->GetAttackDistance(pWho)) && m_creature->IsWithinLOSInMap(pWho))
+                {
+                    if (Player* pPlayer = pWho->GetCharmerOrOwnerPlayerOrPlayerItself())
+                    {
+                        // it's mentioned that pet may also be teleported, if so, we need to tune script to apply to those in addition.
+
+                        if (pPlayer->GetAreaId() == AREA_ID_SILVER_ENCLAVE)
+                            DoCastSpellIfCan(pPlayer, SPELL_TRESPASSER_A);
+                        else if (pPlayer->GetAreaId() == AREA_ID_SUNREAVER)
+                            DoCastSpellIfCan(pPlayer, SPELL_TRESPASSER_H);
+                    }
+                }
+            }
+        }
+
+        void AttackedBy(Unit* /*pAttacker*/) override {}
+
+        void Reset() override {}
+
+        void UpdateAI(const uint32 /*uiDiff*/) override {}
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_dalaran_guardian_mageAI(pCreature);
+    }
+};
+
+void AddSC_dalaran()
+{
+    Script* s;
+
+    s = new npc_dalaran_guardian_mage();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_dalaran_guardian_mage";
+    //pNewScript->GetAI = &GetAI_npc_dalaran_guardian_mage;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/dragonblight.cpp b/src/modules/SD3/scripts/northrend/dragonblight.cpp
new file mode 100644
index 000000000..b775218b5
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/dragonblight.cpp
@@ -0,0 +1,226 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Dragonblight
+SD%Complete: 100
+SDComment: Quest support: 12075, 12166, 12261.
+SDCategory: Dragonblight
+EndScriptData */
+
+/* ContentData
+npc_destructive_ward
+npc_crystalline_ice_giant
+EndContentData */
+
+#include "precompiled.h"
+
+/*######
+# npc_destructive_ward
+#####*/
+
+enum
+{
+    SAY_WARD_POWERUP                    = -1000664,
+    SAY_WARD_CHARGED                    = -1000665,
+
+    SPELL_DESTRUCTIVE_PULSE             = 48733,
+    SPELL_DESTRUCTIVE_BARRAGE           = 48734,
+    SPELL_DESTRUCTIVE_WARD_POWERUP      = 48735,
+
+    SPELL_SUMMON_SMOLDERING_SKELETON    = 48715,
+    SPELL_SUMMON_SMOLDERING_CONSTRUCT   = 48718,
+    SPELL_DESTRUCTIVE_WARD_KILL_CREDIT  = 52409,
+
+    MAX_STACK                           = 1,
+};
+
+// Script is based on real event from you-know-where.
+// Some sources show the event in a bit different way, for unknown reason.
+// Devs decided to add it in the below way, until more details can be obtained.
+
+// It will be only two power-up's, where other sources has a different count (2-4 stacks has been observed)
+// Probably caused by either a change in a patch (bugfix?) or the powerup has a condition (some
+// sources suggest this, but without any explanation about what this might be)
+
+struct npc_destructive_ward : public CreatureScript
+{
+    npc_destructive_ward() : CreatureScript("npc_destructive_ward") {}
+
+    struct npc_destructive_wardAI : public Scripted_NoMovementAI
+    {
+        npc_destructive_wardAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_uiPowerTimer = 30000;
+            m_uiStack = 0;
+            m_uiSummonTimer = 2000;
+            m_bCanPulse = false;
+            m_bFirst = true;
+        }
+
+        uint32 m_uiPowerTimer;
+        uint32 m_uiStack;
+        uint32 m_uiSummonTimer;
+        bool m_bFirst;
+        bool m_bCanPulse;
+
+        void Reset() override { }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_bCanPulse)
+            {
+                if (DoCastSpellIfCan(m_creature, m_uiStack > MAX_STACK ? SPELL_DESTRUCTIVE_BARRAGE : SPELL_DESTRUCTIVE_PULSE) == CAST_OK)
+                    m_bCanPulse = false;
+            }
+
+            if (m_uiSummonTimer)
+            {
+                if (m_uiSummonTimer <= uiDiff)
+                {
+                    if (m_bFirst)
+                        m_uiSummonTimer = 25000;
+                    else
+                        m_uiSummonTimer = 0;
+
+                    switch (m_uiStack)
+                    {
+                    case 0:
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_SMOLDERING_SKELETON, CAST_TRIGGERED);
+                        break;
+                    case 1:
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_SMOLDERING_CONSTRUCT, CAST_TRIGGERED);
+
+                        if (m_bFirst)
+                            break;
+
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_SMOLDERING_CONSTRUCT, CAST_TRIGGERED);
+                        break;
+                    case 2:
+                        if (m_bFirst)
+                            break;
+
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_SMOLDERING_SKELETON, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_SMOLDERING_SKELETON, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_SMOLDERING_CONSTRUCT, CAST_TRIGGERED);
+                        break;
+                    }
+
+                    m_bFirst = !m_bFirst;
+                }
+                else
+                    m_uiSummonTimer -= uiDiff;
+            }
+
+            if (!m_uiPowerTimer)
+                return;
+
+            if (m_uiPowerTimer <= uiDiff)
+            {
+                if (m_uiStack > MAX_STACK)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DESTRUCTIVE_WARD_KILL_CREDIT) == CAST_OK)
+                    {
+                        DoScriptText(SAY_WARD_CHARGED, m_creature, m_creature->GetOwner());
+                        m_uiPowerTimer = 0;
+                        m_uiSummonTimer = 0;
+                        m_bCanPulse = true;
+                    }
+                }
+                else if (DoCastSpellIfCan(m_creature, SPELL_DESTRUCTIVE_WARD_POWERUP) == CAST_OK)
+                {
+                    DoScriptText(SAY_WARD_POWERUP, m_creature, m_creature->GetOwner());
+
+                    m_uiPowerTimer = 30000;
+                    m_uiSummonTimer = 2000;
+
+                    m_bFirst = true;
+                    m_bCanPulse = true;                         // pulse right after each charge
+
+                    ++m_uiStack;
+                }
+            }
+            else
+                m_uiPowerTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_destructive_wardAI(pCreature);
+    }
+};
+
+/*######
+## npc_crystalline_ice_giant
+######*/
+
+enum
+{
+    SPELL_FEIGN_DEATH_PERMANENT     = 31261,
+    ITEM_ID_SAMPLE_ROCKFLESH        = 36765,
+    NPC_CRYSTALLINE_GIANT           = 26809,
+};
+
+struct npc_crystalline_ice_giant : public CreatureScript
+{
+    npc_crystalline_ice_giant() : CreatureScript("npc_crystalline_ice_giant") {}
+
+    bool OnSpellClick(Player* pPlayer, Creature* pClickedCreature, uint32 /*uiSpellId*/) override
+    {
+        if (pClickedCreature->GetEntry() == NPC_CRYSTALLINE_GIANT && pClickedCreature->HasAura(SPELL_FEIGN_DEATH_PERMANENT))
+        {
+            if (Item* pItem = pPlayer->StoreNewItemInInventorySlot(ITEM_ID_SAMPLE_ROCKFLESH, 1))
+            {
+                pPlayer->SendNewItem(pItem, 1, true, false);
+                pClickedCreature->ForcedDespawn();
+
+                // always return true when handled special npc spell click
+                return true;
+            }
+        }
+
+        return true;
+    }
+};
+
+void AddSC_dragonblight()
+{
+    Script* s;
+
+    s = new npc_destructive_ward();
+    s->RegisterSelf();
+    s = new npc_crystalline_ice_giant();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_destructive_ward";
+    //pNewScript->GetAI = &GetAI_npc_destructive_ward;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_crystalline_ice_giant";
+    //pNewScript->pNpcSpellClick = &NpcSpellClick_npc_crystalline_ice_giant;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/draktharon_keep/boss_novos.cpp b/src/modules/SD3/scripts/northrend/draktharon_keep/boss_novos.cpp
new file mode 100644
index 000000000..c1ea612a8
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/draktharon_keep/boss_novos.cpp
@@ -0,0 +1,451 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Novos
+SD%Complete: 90%
+SDComment: Summon Timers are vague
+SDCategory: Drak'Tharon Keep
+EndScriptData */
+
+#include "precompiled.h"
+#include "draktharon_keep.h"
+
+enum
+{
+    SAY_AGGRO                       = -1600005,
+    SAY_DEATH                       = -1600006,
+    SAY_KILL                        = -1600007,
+    SAY_ADDS                        = -1600008,
+    SAY_BUBBLE_1                    = -1600009,
+    SAY_BUBBLE_2                    = -1600010,
+
+    EMOTE_ASSISTANCE                = -1600011,
+
+    SPELL_ARCANE_FIELD              = 47346,
+    SPELL_IMMUNITY                  = 34098,
+    SPELL_SUMMON_MINIONS_H          = 59910,
+    SPELL_FROSTBOLT                 = 49037,
+    SPELL_FROSTBOLT_H               = 59855,
+    SPELL_ARCANE_BLAST              = 49198,
+    SPELL_ARCANE_BLAST_H            = 59909,
+    SPELL_BLIZZARD                  = 49034,
+    SPELL_BLIZZARD_H                = 59854,
+    SPELL_TOUCH_OF_MISERY           = 50090,                // TODO - purpose of this spell (triggers SPELL_WRATH_OF_MISERY) unknown
+    SPELL_WRATH_OF_MISERY           = 50089,
+    SPELL_WRATH_OF_MISERY_H         = 59856,
+
+    // SPELL_SUMMON_CRYSTAL_HANDLER    = 49179,             // Spell seems to be unused, perhaps only server-side, and especially no suitable positioned caster are found for this spell
+    SPELL_SUMMON_FETID_TROLL_CORPSE = 49103,
+    SPELL_SUMMON_HULKING_CORPSE     = 49104,
+    SPELL_SUMMON_RISON_SHADOWCASTER = 49105,
+
+    // Spells 'Crystal Handler Death' 47336, 55801, 55803, 55805 (defined in instance script)
+
+    NPC_CRYSTAL_HANDLER             = 26627,
+    NPC_HULKING_CORPSE              = 27597,
+    NPC_FETID_TROLL_CORPSE          = 27598,
+    NPC_RISON_SHADOWCASTER          = 27600,
+    NPC_ROTTED_TROLL_CORPSE         = 32786,                // On heroic as effect of SPELL_SUMMON_MINIONS_H
+};
+
+// The Crystal Handlers are summoned around the two entrances of the room
+static const float aHandlerSummonPos[2][3] =
+{
+    { -342.894836f, -727.016846f, 28.581081f},
+    { -410.644653f, -731.826904f, 28.580412f}
+};
+
+/*######
+## boss_novos
+######*/
+
+enum Phases
+{
+    PHASE_SHIELDED  = 0,
+    PHASE_WAITING   = 1,
+    PHASE_NORMAL    = 2,
+};
+
+struct boss_novos : public CreatureScript
+{
+    boss_novos() : CreatureScript("boss_novos") {}
+
+    struct boss_novosAI : public Scripted_NoMovementAI
+    {
+        boss_novosAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiSummonHandlerTimer;                          // TODO the summoning timers are weak
+        uint32 m_uiSummonShadowcasterTimer;
+        uint32 m_uiSummonFetidTrollTimer;
+        uint32 m_uiSummonHulkingCorpseTimer;
+        uint32 m_uiPhaseTimer;
+        uint32 m_uiArcaneBlastTimer;
+        uint32 m_uiBlizzardTimer;
+        uint32 m_uiWrathTimer;
+
+        uint8 m_uiSummonedHandlers;
+        uint8 m_uiLostCrystals;
+        Phases m_uiPhase;
+
+        void Reset() override
+        {
+            m_uiSummonHandlerTimer = 25000;
+            m_uiSummonShadowcasterTimer = 3000;
+            m_uiSummonFetidTrollTimer = 10000;
+            m_uiSummonHulkingCorpseTimer = 30000;
+            m_uiPhaseTimer = 3000;
+            m_uiArcaneBlastTimer = urand(6000, 8000);
+            m_uiBlizzardTimer = urand(8000, 12000);
+            m_uiWrathTimer = urand(12000, 15000);
+
+            m_uiSummonedHandlers = 0;
+            m_uiLostCrystals = 0;
+            // This ensures that in the shield phase m_pInstance is valid
+            m_uiPhase = m_pInstance ? PHASE_SHIELDED : PHASE_NORMAL;
+
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void LostOneCrystal(uint8 /*index*/)    //index shows what crystal was lost
+        {
+            ++m_uiLostCrystals;
+
+            DoScriptText(urand(0, 1) ? SAY_BUBBLE_1 : SAY_BUBBLE_2, m_creature);
+
+            if (m_uiLostCrystals == MAX_CRYSTALS)               // Enter Phase 2
+                m_uiPhase = PHASE_WAITING;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // An Add reached the ground, if its z-pos is near the z pos of Novos
+            if (pWho->GetEntry() == NPC_HULKING_CORPSE || pWho->GetEntry() == NPC_FETID_TROLL_CORPSE || pWho->GetEntry() == NPC_RISON_SHADOWCASTER)
+            {
+                // Add reached ground, and the failure has not yet been reported
+                if (pWho->GetPositionZ() < m_creature->GetPositionZ() + 1.5f && m_pInstance && m_pInstance->GetData(TYPE_NOVOS) == IN_PROGRESS)
+                    m_pInstance->SetData(TYPE_NOVOS, SPECIAL);
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ARCANE_BLAST : SPELL_ARCANE_BLAST_H, CAST_TRIGGERED);
+
+            DoCastSpellIfCan(m_creature, SPELL_IMMUNITY, CAST_TRIGGERED);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+            DoCastSpellIfCan(m_creature, SPELL_ARCANE_FIELD);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_NOVOS, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_KILL, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_NOVOS, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_NOVOS, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_CRYSTAL_HANDLER:
+            case NPC_ROTTED_TROLL_CORPSE:
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    pSummoned->AI()->AttackStart(pTarget);
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_CRYSTAL_HANDLER && m_pInstance)
+            {
+                m_pInstance->SetData64(DATA64_NOVOS_CRYSTAL_HANDLER, pSummoned->GetObjectGuid().GetRawValue());
+                if (Creature* pTarget = m_pInstance->instance->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_NOVOS_CRYSTAL_HANDLER))))
+                    pSummoned->CastSpell(pTarget, aCrystalHandlerDeathSpells[m_pInstance->GetData(TYPE_DATA_NOVOS_CRYSTAL_INDEX)], true, NULL, NULL, m_creature->GetObjectGuid());
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*sender*/, Unit* invoker, uint32 data) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && invoker == m_creature)
+            {
+                LostOneCrystal(uint8(data));
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            switch (m_uiPhase)
+            {
+            case PHASE_SHIELDED:                            // Event Phase, only summoning of mobs
+                if (m_uiSummonHandlerTimer < uiDiff)
+                {
+                    float fX, fY, fZ;
+                    ++m_uiSummonedHandlers;
+                    m_creature->GetRandomPoint(aHandlerSummonPos[m_uiSummonedHandlers % 2][0], aHandlerSummonPos[m_uiSummonedHandlers % 2][1], aHandlerSummonPos[m_uiSummonedHandlers % 2][2], 10.0f, fX, fY, fZ);
+                    m_creature->SummonCreature(NPC_CRYSTAL_HANDLER, fX, fY, fZ, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                    DoScriptText(SAY_ADDS, m_creature);
+                    DoScriptText(EMOTE_ASSISTANCE, m_creature);
+
+                    m_uiSummonHandlerTimer = 40000;
+                }
+                else
+                    m_uiSummonHandlerTimer -= uiDiff;
+
+                if (m_uiSummonShadowcasterTimer < uiDiff)
+                {
+                    if (Creature* pSummoner = m_pInstance->instance->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_NOVOS_SUMMON_DUMMY))))
+                        pSummoner->CastSpell(pSummoner, SPELL_SUMMON_RISON_SHADOWCASTER, false, NULL, NULL, m_creature->GetObjectGuid());
+                    m_uiSummonShadowcasterTimer = 25000;
+                }
+                else
+                    m_uiSummonShadowcasterTimer -= uiDiff;
+
+                if (m_uiSummonFetidTrollTimer < uiDiff)
+                {
+                    if (Creature* pSummoner = m_pInstance->instance->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_NOVOS_SUMMON_DUMMY))))
+                        pSummoner->CastSpell(pSummoner, SPELL_SUMMON_FETID_TROLL_CORPSE, false, NULL, NULL, m_creature->GetObjectGuid());
+                    m_uiSummonFetidTrollTimer = 5000;
+                }
+                else
+                    m_uiSummonFetidTrollTimer -= uiDiff;
+
+                if (m_uiSummonHulkingCorpseTimer < uiDiff)
+                {
+                    if (Creature* pSummoner = m_pInstance->instance->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_NOVOS_SUMMON_DUMMY))))
+                        pSummoner->CastSpell(pSummoner, SPELL_SUMMON_HULKING_CORPSE, false, NULL, NULL, m_creature->GetObjectGuid());
+                    m_uiSummonHulkingCorpseTimer = 30000;
+                }
+                else
+                    m_uiSummonHulkingCorpseTimer -= uiDiff;
+
+                break;
+
+            case PHASE_WAITING:                             // Short delay between last destroyed crystal and entering combat
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    m_uiPhase = PHASE_NORMAL;
+                    // Remove Immunity and Shield Aura
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    m_creature->RemoveAllAuras();
+
+                    if (!m_bIsRegularMode)
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_MINIONS_H, CAST_INTERRUPT_PREVIOUS);
+                    else
+                        m_creature->InterruptNonMeleeSpells(true);
+                }
+                else
+                    m_uiPhaseTimer -= uiDiff;
+
+                break;
+
+            case PHASE_NORMAL:                              // Normal Phase, attack enemies
+                if (m_uiArcaneBlastTimer < uiDiff)
+                {
+                    // TODO - might be possible that this spell is only casted, when there is an enemy in range
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ARCANE_BLAST : SPELL_ARCANE_BLAST_H) == CAST_OK)
+                        m_uiArcaneBlastTimer = urand(7000, 9000);
+                }
+                else
+                    m_uiArcaneBlastTimer -= uiDiff;
+
+                if (m_uiBlizzardTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_BLIZZARD : SPELL_BLIZZARD_H) == CAST_OK)
+                        m_uiBlizzardTimer = urand(9000, 13500);
+                }
+                else
+                    m_uiBlizzardTimer -= uiDiff;
+
+                if (m_uiWrathTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_WRATH_OF_MISERY : SPELL_WRATH_OF_MISERY_H) == CAST_OK)
+                        m_uiWrathTimer = urand(12500, 17200);
+                }
+                else
+                    m_uiWrathTimer -= uiDiff;
+
+                if (!m_creature->IsNonMeleeSpellCasted(true))       // TODO Use this additional check, because might want to change the random target to be a target that is in LoS (which then is expensive)
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_FROSTBOLT : SPELL_FROSTBOLT_H);
+
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_novosAI(pCreature);
+    }
+};
+
+// Small helper script to handle summoned adds for Novos
+struct npc_crystal_channel_target : public CreatureScript
+{
+    npc_crystal_channel_target() : CreatureScript("npc_crystal_channel_target") {}
+
+    struct npc_crystal_channel_targetAI : public ScriptedAI
+    {
+        npc_crystal_channel_targetAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override {}
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+        void AttackStart(Unit* /*pWho*/) override {}
+        void UpdateAI(const uint32 /*uiDiff*/) override {}
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_HULKING_CORPSE || pSummoned->GetEntry() == NPC_FETID_TROLL_CORPSE || pSummoned->GetEntry() == NPC_RISON_SHADOWCASTER)
+            {
+                // The end of the stairs is approximately at 1/3 of the way between summoning-position and novos, height of Novos
+                if (Creature* pNovos = m_pInstance->GetSingleCreatureFromStorage(NPC_NOVOS))
+                {
+                    // Let them move down the stairs
+                    float fX, fY, fZ;
+
+                    m_creature->GetRandomPoint(0.70 * pNovos->GetPositionX() + 0.30 * pSummoned->GetPositionX(), 0.70 * pNovos->GetPositionY() + 0.30 * pSummoned->GetPositionY(), pNovos->GetPositionZ() + 1.5f, 4.0f, fX, fY, fZ);
+                    pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                }
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiPointId != 1 || uiMotionType != POINT_MOTION_TYPE || (pSummoned->GetEntry() != NPC_HULKING_CORPSE && pSummoned->GetEntry() != NPC_FETID_TROLL_CORPSE && pSummoned->GetEntry() != NPC_RISON_SHADOWCASTER))
+                return;
+
+            if (!pSummoned->IsInCombat() && m_pInstance)
+            {
+                if (Creature* pNovos = m_pInstance->GetSingleCreatureFromStorage(NPC_NOVOS))
+                {
+                    if (Unit* pTarget = pNovos->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_crystal_channel_targetAI(pCreature);
+    }
+};
+
+// Handling of the dummy auras of Crystal Handler Death spells, on remove the Crystal needs to be opened
+struct aura_npc_crystal_channel_target : public AuraScript
+{
+    aura_npc_crystal_channel_target() : AuraScript("aura_npc_crystal_channel_target") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply)
+    {
+        for (uint8 i = 0; i < MAX_CRYSTALS; ++i)
+        {
+            if (pAura->GetId() == aCrystalHandlerDeathSpells[i])
+            {
+                if (pAura->GetEffIndex() == EFFECT_INDEX_0 && !bApply)
+                {
+                    if (Creature* pCreature = (Creature*)pAura->GetTarget())
+                    {
+                        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+                        {
+                            if (pInstance->GetData(TYPE_NOVOS) == NOT_STARTED || pInstance->GetData(TYPE_NOVOS) == FAIL)
+                                return true;
+
+                            pInstance->SetData(TYPE_DATA_NOVOS_CRYSTAL_INDEX, uint32(i));
+
+                            // Inform Novos about removed
+                            if (Creature* pNovos = pInstance->GetSingleCreatureFromStorage(NPC_NOVOS))
+                            if (CreatureAI* pNovosAI = pNovos->AI())
+                                pNovosAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pNovos, pNovos, i);
+                        }
+                    }
+                }
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_novos()
+{
+    Script* s;
+
+    s = new boss_novos();
+    s->RegisterSelf();
+    s = new npc_crystal_channel_target();
+    s->RegisterSelf();
+
+    s = new aura_npc_crystal_channel_target();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_novos";
+    //pNewScript->GetAI = &GetAI_boss_novos;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_crystal_channel_target";
+    //pNewScript->GetAI = &GetAI_npc_crystal_channel_target;
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_npc_crystal_channel_target;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/draktharon_keep/boss_tharonja.cpp b/src/modules/SD3/scripts/northrend/draktharon_keep/boss_tharonja.cpp
new file mode 100644
index 000000000..0d05f0e36
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/draktharon_keep/boss_tharonja.cpp
@@ -0,0 +1,303 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Tharonja
+SD%Complete: 80%
+SDComment: Encounter mechanic is not verified, spell CLEAR_GIFT_OF_THARONJA need core support
+SDCategory: Drak'Tharon Keep
+EndScriptData */
+
+#include "precompiled.h"
+#include "ObjectMgr.h"
+#include "draktharon_keep.h"
+
+enum
+{
+    SAY_AGGRO                       = -1600012,
+    SAY_KILL_1                      = -1600013,
+    SAY_KILL_2                      = -1600014,
+    SAY_FLESH_1                     = -1600015,
+    SAY_FLESH_2                     = -1600016,
+    SAY_SKELETON_1                  = -1600017,
+    SAY_SKELETON_2                  = -1600018,
+    SAY_DEATH                       = -1600019,
+
+    SPELL_CURSE_OF_LIFE             = 49527,
+    SPELL_CURSE_OF_LIFE_H           = 59972,
+    SPELL_RAIN_OF_FIRE              = 49518,
+    SPELL_RAIN_OF_FIRE_H            = 59971,
+    SPELL_SHADOW_VOLLEY             = 49528,
+    SPELL_SHADOW_VOLLEY_H           = 59973,
+    SPELL_LIGHTNING_BREATH          = 49537,
+    SPELL_LIGHTNING_BREATH_H        = 59963,
+    SPELL_EYE_BEAM                  = 49544,
+    SPELL_EYE_BEAM_H                = 59965,
+    SPELL_POISON_CLOUD              = 49548,
+    SPELL_POISON_CLOUD_H            = 59969,
+    SPELL_DECAY_FLESH               = 49356,                // Has also unknown dummy aura onto all players while transforming
+    SPELL_GIFT_OF_THARONJA          = 52509,
+    SPELL_RETURN_FLESH              = 53463,                // Has also unknown dummy aura onto all players while transforming
+    SPELL_CLEAR_GIFT_OF_THARONJA    = 53242,
+
+    SPELL_ACHIEVEMENT_CHECK         = 61863,                // Exact Purpose unknown, but is criteria (BE_SPELL_TARGET(28) and BE_SPELL_TARGET2(69))
+
+    // Only used to change display ID, might infact be some sort of UpdateEntry - TODO, research!
+    NPC_THARONJA_SKELETAL           = 26632,
+    NPC_THARONJA_FLESH              = 27696,
+};
+
+enum Phases
+{
+    PHASE_SKELETAL                  = 0,
+    PHASE_TAKE_FLESH                = 1,
+    PHASE_FLESH                     = 2,
+    PHASE_RETURN_FLESH              = 3,
+    PHASE_SKELETAL_END              = 4,
+};
+
+/*######
+## boss_tharonja
+######*/
+
+struct boss_tharonja : public CreatureScript
+{
+    boss_tharonja() : CreatureScript("boss_tharonja") {}
+
+    struct boss_tharonjaAI : public ScriptedAI
+    {
+        boss_tharonjaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        Phases m_uiPhase;
+
+        uint32 m_uiCurseLifeTimer;
+        uint32 m_uiRainFireTimer;
+        uint32 m_uiShadowVolleyTimer;
+        uint32 m_uiLightningBreathTimer;
+        uint32 m_uiEyeBeamTimer;
+        uint32 m_uiPoisonCloudTimer;
+        uint32 m_uiReturnFleshTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_SKELETAL;
+
+            m_uiCurseLifeTimer = urand(15000, 20000);
+            m_uiRainFireTimer = urand(16000, 23000);            // This timer is not very accurate
+            m_uiShadowVolleyTimer = urand(8000, 10000);
+            m_uiLightningBreathTimer = urand(3000, 4000);
+            m_uiEyeBeamTimer = urand(15000, 18000);             // This timer is not very accurate
+            m_uiPoisonCloudTimer = urand(9000, 11000);          // This timer is not very accurate
+            m_uiReturnFleshTimer = 26000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_THARONJA, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL_1 : SAY_KILL_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            DoCastSpellIfCan(m_creature, SPELL_ACHIEVEMENT_CHECK, CAST_TRIGGERED | CAST_FORCE_CAST);
+
+            // TODO check if this spell casting is infact also needed on phase-switch or only here (possible that there is also some sort of hp% dependency
+            if (m_uiPhase == PHASE_FLESH)
+                DoCastSpellIfCan(m_creature, SPELL_CLEAR_GIFT_OF_THARONJA, CAST_TRIGGERED | CAST_FORCE_CAST);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_THARONJA, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            // Reset Display ID
+            if (CreatureInfo const* pCreatureInfo = GetCreatureTemplateStore(NPC_THARONJA_SKELETAL))
+            {
+                uint32 uiDisplayId = Creature::ChooseDisplayId(pCreatureInfo);
+                if (m_creature->GetDisplayId() != uiDisplayId)
+                    m_creature->SetDisplayId(uiDisplayId);
+            }
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_THARONJA, FAIL);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            switch (m_uiPhase)
+            {
+            case PHASE_SKELETAL:
+                // Phase switching at 50% (was in older patch versions multiple times, but from 335 on only once)
+                if (m_creature->GetHealthPercent() < 50)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DECAY_FLESH, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_FLESH_1 : SAY_FLESH_2, m_creature);
+                        m_uiPhase = PHASE_TAKE_FLESH;
+
+                        return;                             // return here, as there is nothing more to be done in this phase
+                    }
+                }
+
+                // No break here, the last phase is exactly like the first, but he doesn't change anymore
+            case PHASE_SKELETAL_END:
+                if (m_uiCurseLifeTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_CURSE_OF_LIFE : SPELL_CURSE_OF_LIFE_H) == CAST_OK)
+                        m_uiCurseLifeTimer = urand(12000, 18000);
+                }
+                else
+                    m_uiCurseLifeTimer -= uiDiff;
+
+                if (m_uiRainFireTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_RAIN_OF_FIRE : SPELL_RAIN_OF_FIRE_H) == CAST_OK)
+                        m_uiRainFireTimer = urand(22000, 29000);
+                }
+                else
+                    m_uiRainFireTimer -= uiDiff;
+
+                if (m_uiShadowVolleyTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SHADOW_VOLLEY : SPELL_SHADOW_VOLLEY_H) == CAST_OK)
+                        m_uiShadowVolleyTimer = urand(6000, 12000);
+                }
+                else
+                    m_uiShadowVolleyTimer -= uiDiff;
+
+                DoMeleeAttackIfReady();
+                break;
+
+            case PHASE_FLESH:
+                // This is not entirely clear if this _might_ also be triggered HP-dependend
+                if (m_uiReturnFleshTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_RETURN_FLESH, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_SKELETON_1 : SAY_SKELETON_2, m_creature);
+                        m_uiReturnFleshTimer = 26000;
+                        m_uiPhase = PHASE_RETURN_FLESH;
+
+                        return;                             // return here, as there is nothing more to be done in this phase
+                    }
+                }
+                else
+                    m_uiReturnFleshTimer -= uiDiff;
+
+                if (m_uiPoisonCloudTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_POISON_CLOUD : SPELL_POISON_CLOUD_H) == CAST_OK)
+                        m_uiPoisonCloudTimer = urand(7000, 12000);
+                }
+                else
+                    m_uiPoisonCloudTimer -= uiDiff;
+
+                if (m_uiLightningBreathTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_LIGHTNING_BREATH : SPELL_LIGHTNING_BREATH_H) == CAST_OK)
+                        m_uiLightningBreathTimer = urand(5000, 8000);
+                }
+                else
+                    m_uiLightningBreathTimer -= uiDiff;
+
+                if (m_uiEyeBeamTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_EYE_BEAM : SPELL_EYE_BEAM_H) == CAST_OK)
+                        m_uiEyeBeamTimer = urand(12000, 15000);
+                }
+                else
+                    m_uiEyeBeamTimer -= uiDiff;
+
+                DoMeleeAttackIfReady();
+                break;
+
+            case PHASE_TAKE_FLESH:
+                // Turn players into skeletons
+                if (DoCastSpellIfCan(m_creature, SPELL_GIFT_OF_THARONJA) == CAST_OK)
+                {
+                    // Change modell - might be UpdateEntry
+                    if (CreatureInfo const* pCreatureInfo = GetCreatureTemplateStore(NPC_THARONJA_FLESH))
+                    {
+                        uint32 uiDisplayId = Creature::ChooseDisplayId(pCreatureInfo);
+                        m_creature->SetDisplayId(uiDisplayId);
+                    }
+
+                    m_uiPhase = PHASE_FLESH;
+                }
+                break;
+
+            case PHASE_RETURN_FLESH:
+                // Turn players into normal
+                if (DoCastSpellIfCan(m_creature, SPELL_CLEAR_GIFT_OF_THARONJA) == CAST_OK)
+                {
+                    // Change modell - might be UpdateEntry
+                    if (CreatureInfo const* pCreatureInfo = GetCreatureTemplateStore(NPC_THARONJA_SKELETAL))
+                    {
+                        uint32 uiDisplayId = Creature::ChooseDisplayId(pCreatureInfo);
+                        m_creature->SetDisplayId(uiDisplayId);
+                    }
+
+                    m_uiPhase = PHASE_SKELETAL_END;
+                }
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_tharonjaAI(pCreature);
+    }
+};
+
+void AddSC_boss_tharonja()
+{
+    Script* s;
+
+    s = new boss_tharonja();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_tharonja";
+    //pNewScript->GetAI = &GetAI_boss_tharonja;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/draktharon_keep/boss_trollgore.cpp b/src/modules/SD3/scripts/northrend/draktharon_keep/boss_trollgore.cpp
new file mode 100644
index 000000000..92beabfc6
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/draktharon_keep/boss_trollgore.cpp
@@ -0,0 +1,214 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Trollgore
+SD%Complete: 80%
+SDComment: Some details related to the summoned creatures need more adjustments
+SDCategory: Drak'Tharon Keep
+EndScriptData */
+
+#include "precompiled.h"
+#include "draktharon_keep.h"
+
+enum
+{
+    SAY_AGGRO                       = -1600000,
+    SAY_CONSUME                     = -1600001,
+    SAY_DEATH                       = -1600002,
+    SAY_EXPLODE                     = -1600003,
+    SAY_KILL                        = -1600004,
+
+    SPELL_CRUSH                     = 49639,
+    SPELL_INFECTED_WOUND            = 49637,
+    SPELL_CORPSE_EXPLODE            = 49555,
+    SPELL_CORPSE_EXPLODE_H          = 59807,
+    SPELL_CONSUME                   = 49380,
+    SPELL_CONSUME_H                 = 59803,
+    SPELL_CONSUME_BUFF              = 49381,            // used to measure the achiev
+    SPELL_CONSUME_BUFF_H            = 59805,
+
+    // SPELL_SUMMON_INVADER_3        = 49458,            // summon 27754
+    SPELL_INVADER_TAUNT             = 49405,            // triggers 49406
+
+    MAX_CONSOME_STACKS              = 10,
+};
+
+/*######
+## boss_trollgore
+######*/
+
+struct boss_trollgore : public CreatureScript
+{
+    boss_trollgore() : CreatureScript("boss_trollgore") {}
+
+    struct boss_trollgoreAI : public ScriptedAI
+    {
+        boss_trollgoreAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiConsumeStacks;
+
+        uint32 m_uiConsumeTimer;
+        uint32 m_uiCrushTimer;
+        uint32 m_uiInfectedWoundTimer;
+        uint32 m_uiWaveTimer;
+        uint32 m_uiCorpseExplodeTimer;
+
+        void Reset() override
+        {
+            m_uiCorpseExplodeTimer = 20000;
+            m_uiConsumeTimer = 15000;
+            m_uiCrushTimer = 10000;
+            m_uiInfectedWoundTimer = 5000;
+            m_uiWaveTimer = 0;
+            m_uiConsumeStacks = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_TROLLGORE, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetCharmerOrOwnerPlayerOrPlayerItself())
+                DoScriptText(SAY_KILL, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_TROLLGORE, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_TROLLGORE, FAIL);
+        }
+
+        void SpellHit(Unit* /*pTarget*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_CONSUME_BUFF || pSpell->Id == SPELL_CONSUME_BUFF_H)
+            {
+                ++m_uiConsumeStacks;
+
+                // if the boss has 10 stacks then set the achiev to fail
+                if (m_uiConsumeStacks == MAX_CONSOME_STACKS)
+                {
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_TROLLGORE, SPECIAL);
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // This spell taunts the boss and the boss taunts back
+            pSummoned->CastSpell(m_creature, SPELL_INVADER_TAUNT, true);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiCrushTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CRUSH) == CAST_OK)
+                    m_uiCrushTimer = 10000;
+            }
+            else
+                m_uiCrushTimer -= uiDiff;
+
+            if (m_uiInfectedWoundTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_INFECTED_WOUND) == CAST_OK)
+                    m_uiInfectedWoundTimer = urand(20000, 30000);
+            }
+            else
+                m_uiInfectedWoundTimer -= uiDiff;
+
+            if (m_uiWaveTimer < uiDiff)
+            {
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_DO_TROLLGORE, 0);
+                m_uiWaveTimer = 30000;
+            }
+            else
+                m_uiWaveTimer -= uiDiff;
+
+            if (m_uiConsumeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_CONSUME : SPELL_CONSUME_H) == CAST_OK)
+                {
+                    DoScriptText(SAY_CONSUME, m_creature);
+                    m_uiConsumeTimer = 15000;
+                }
+            }
+            else
+                m_uiConsumeTimer -= uiDiff;
+
+            if (m_uiCorpseExplodeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_CORPSE_EXPLODE : SPELL_CORPSE_EXPLODE_H) == CAST_OK)
+                {
+                    DoScriptText(SAY_EXPLODE, m_creature);
+                    m_uiCorpseExplodeTimer = 10000;
+                }
+            }
+            else
+                m_uiCorpseExplodeTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_trollgoreAI(pCreature);
+    }
+};
+
+void AddSC_boss_trollgore()
+{
+    Script* s;
+
+    s = new boss_trollgore();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_trollgore";
+    //pNewScript->GetAI = &GetAI_boss_trollgore;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/draktharon_keep/draktharon_keep.h b/src/modules/SD3/scripts/northrend/draktharon_keep/draktharon_keep.h
new file mode 100644
index 000000000..540204174
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/draktharon_keep/draktharon_keep.h
@@ -0,0 +1,49 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_DRAKTHARON_KEEP_H
+#define DEF_DRAKTHARON_KEEP_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 4,
+
+    TYPE_TROLLGORE                  = 0,
+    TYPE_NOVOS                      = 1,
+    TYPE_KING_DRED                  = 2,
+    TYPE_THARONJA                   = 3,
+    TYPE_DATA_NOVOS_CRYSTAL_INDEX   = MAX_ENCOUNTER,
+    TYPE_DO_TROLLGORE               = MAX_ENCOUNTER + 1,
+
+    DATA64_NOVOS_SUMMON_DUMMY       = 0,
+    DATA64_NOVOS_CRYSTAL_HANDLER    = 1,
+
+    NPC_NOVOS                       = 26631,
+    NPC_KING_DRED                   = 27483,
+    NPC_TROLLGORE                   = 26630,
+
+    // Adds of King Dred Encounter - deaths counted for achievement
+    NPC_DRAKKARI_GUTRIPPER          = 26641,
+    NPC_DRAKKARI_SCYTHECLAW         = 26628,
+    NPC_WORLD_TRIGGER               = 22515,
+
+    // Novos Encounter
+    SPELL_BEAM_CHANNEL              = 52106,
+    SPELL_CRYSTAL_HANDLER_DEATH_1   = 47336,
+    SPELL_CRYSTAL_HANDLER_DEATH_2   = 55801,
+    SPELL_CRYSTAL_HANDLER_DEATH_3   = 55803,
+    SPELL_CRYSTAL_HANDLER_DEATH_4   = 55805,
+
+    MAX_CRYSTALS                    = 4,
+    NPC_CRYSTAL_CHANNEL_TARGET      = 26712,
+    GO_CRYSTAL_SW                   = 189299,
+    GO_CRYSTAL_NE                   = 189300,
+    GO_CRYSTAL_NW                   = 189301,
+    GO_CRYSTAL_SE                   = 189302,
+};
+
+static const uint32 aCrystalHandlerDeathSpells[MAX_CRYSTALS] =
+{SPELL_CRYSTAL_HANDLER_DEATH_1, SPELL_CRYSTAL_HANDLER_DEATH_2, SPELL_CRYSTAL_HANDLER_DEATH_3, SPELL_CRYSTAL_HANDLER_DEATH_4};
+
+#endif
diff --git a/src/modules/SD3/scripts/northrend/draktharon_keep/instance_draktharon_keep.cpp b/src/modules/SD3/scripts/northrend/draktharon_keep/instance_draktharon_keep.cpp
new file mode 100644
index 000000000..e39bf9256
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/draktharon_keep/instance_draktharon_keep.cpp
@@ -0,0 +1,464 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: instance_draktharon_keep
+SD%Complete: 50%
+SDComment:
+SDCategory: Drak'Tharon Keep
+EndScriptData */
+
+#include "precompiled.h"
+#include "draktharon_keep.h"
+
+struct NovosCrystalInfo
+{
+    ObjectGuid m_crystalGuid;
+    ObjectGuid m_channelGuid;
+    bool m_bWasUsed;
+};
+
+enum
+{
+    // Achievement Criterias to be handled with SD3
+    ACHIEV_CRIT_BETTER_OFF_DREAD= 7318,
+    ACHIEV_CRIT_CONSUME_JUNCTION= 7579,
+    ACHIEV_CRIT_OH_NOVOS        = 7361,
+
+    SPELL_SUMMON_INVADER_1      = 49456,            // summon 27709
+    SPELL_SUMMON_INVADER_2      = 49457,            // summon 27753
+};
+
+struct is_draktharon_keep : public InstanceScript
+{
+    is_draktharon_keep() : InstanceScript("instance_draktharon_keep") {}
+
+    class instance_draktharon_keep : public ScriptedInstance
+    {
+    public:
+        instance_draktharon_keep(Map* pMap) : ScriptedInstance(pMap),
+            m_uiDreadAddsKilled(0),
+            m_bNovosAddGrounded(false),
+            m_bTrollgoreConsume(true),
+            m_uiNovosCrystalIndex(0)
+        {
+            Initialize();
+        }
+
+        ~instance_draktharon_keep() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_TROLLGORE:
+                if (uiData == IN_PROGRESS)
+                    m_bTrollgoreConsume = true;
+                if (uiData == SPECIAL)
+                    m_bTrollgoreConsume = false;
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_NOVOS:
+                if (uiData == IN_PROGRESS)
+                {
+                    // Sort the dummies
+                    DoSortNovosDummies();
+
+                    // Cast some visual spells
+                    Creature* pTarget = instance->GetCreature(m_novosChannelGuid);
+                    for (uint8 i = 0; i < MAX_CRYSTALS; ++i)
+                    {
+                        Creature* pCaster = instance->GetCreature(m_aNovosCrystalInfo[i].m_channelGuid);
+                        if (pCaster && pTarget)
+                            pCaster->CastSpell(pTarget, SPELL_BEAM_CHANNEL, false);
+
+                        m_aNovosCrystalInfo[i].m_bWasUsed = false;
+                    }
+
+                    // Achievement related
+                    m_bNovosAddGrounded = false;
+                }
+                else if (uiData == SPECIAL)
+                {
+                    // Achievement related
+                    m_bNovosAddGrounded = true;
+                }
+                else if (uiData == FAIL)
+                {
+                    // Interrupt casted spells
+                    for (uint8 i = 0; i < MAX_CRYSTALS; ++i)
+                    {
+                        Creature* pDummy = instance->GetCreature(m_aNovosCrystalInfo[i].m_channelGuid);
+                        if (pDummy)
+                            pDummy->InterruptNonMeleeSpells(false);
+                        // And reset used crystals
+                        if (m_aNovosCrystalInfo[i].m_bWasUsed)
+                            DoUseDoorOrButton(m_aNovosCrystalInfo[i].m_crystalGuid);
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_KING_DRED:
+                if (uiData == IN_PROGRESS)
+                    m_uiDreadAddsKilled = 0;
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_THARONJA:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_DATA_NOVOS_CRYSTAL_INDEX:
+                DoHandleCrystal(uint8(uiData));
+                return;
+            case TYPE_DO_TROLLGORE:
+                DoSummonDrakkariInvaders();
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+            switch (uiType)
+            {
+            case TYPE_DATA_NOVOS_CRYSTAL_INDEX:
+                return uint32(m_uiNovosCrystalIndex);
+            default:
+                return 0;
+            }
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_KING_DRED)
+                SetData(TYPE_KING_DRED, IN_PROGRESS);
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_KING_DRED)
+                SetData(TYPE_KING_DRED, FAIL);
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            if ((pCreature->GetEntry() == NPC_DRAKKARI_GUTRIPPER || pCreature->GetEntry() == NPC_DRAKKARI_SCYTHECLAW) && m_auiEncounter[TYPE_KING_DRED] == IN_PROGRESS)
+                ++m_uiDreadAddsKilled;
+
+            if (pCreature->GetEntry() == NPC_KING_DRED)
+                SetData(TYPE_KING_DRED, DONE);
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_NOVOS:
+            case NPC_TROLLGORE:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_CRYSTAL_CHANNEL_TARGET:
+                m_lNovosDummyGuids.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_WORLD_TRIGGER:
+                if (pCreature->GetPositionZ() > 30.0f)
+                    m_vTriggerGuids.push_back(pCreature->GetObjectGuid());
+                else
+                    m_trollgoreCornerTriggerGuid = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_CRYSTAL_SW: m_aNovosCrystalInfo[0].m_crystalGuid = pGo->GetObjectGuid(); break;
+            case GO_CRYSTAL_NW: m_aNovosCrystalInfo[1].m_crystalGuid = pGo->GetObjectGuid(); break;
+            case GO_CRYSTAL_SE: m_aNovosCrystalInfo[2].m_crystalGuid = pGo->GetObjectGuid(); break;
+            case GO_CRYSTAL_NE: m_aNovosCrystalInfo[3].m_crystalGuid = pGo->GetObjectGuid(); break;
+            }
+        }
+
+        void GetTrollgoreOutsideTriggers(GuidVector& vTriggers) { vTriggers = m_vTriggerGuids; }
+        ObjectGuid GetTrollgoreCornerTrigger() { return m_trollgoreCornerTriggerGuid; }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+            case ACHIEV_CRIT_BETTER_OFF_DREAD: return m_uiDreadAddsKilled >= 6;
+            case ACHIEV_CRIT_OH_NOVOS:         return !m_bNovosAddGrounded;
+            case ACHIEV_CRIT_CONSUME_JUNCTION: return m_bTrollgoreConsume;
+            default:
+                return false;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void SetData64(uint32 uiType, uint64 uiData) override
+        {
+            switch (uiType)
+            {
+            case DATA64_NOVOS_CRYSTAL_HANDLER:
+            {
+                Creature* pCrystalHandler = instance->GetCreature(ObjectGuid(uiData));
+                Creature* pTarget = NULL;
+                m_uiNovosCrystalIndex = MAX_CRYSTALS;
+
+                for (uint8 i = 0; i < MAX_CRYSTALS; ++i)
+                {
+                    Creature* pDummy = instance->GetCreature(m_aNovosCrystalInfo[i].m_channelGuid);
+                    // Return the nearest 'unused' crystal dummy
+                    // unused means, that the crystal was not already used, and the dummy-npc doesn't have the aura that will trigger the use on remove
+                    if (pDummy && !m_aNovosCrystalInfo[i].m_bWasUsed && (!pTarget || pCrystalHandler->GetDistanceOrder(pDummy, pTarget)) && !pDummy->HasAura(aCrystalHandlerDeathSpells[i]))
+                    {
+                        pTarget = pDummy;
+                        m_uiNovosCrystalIndex = i;
+                    }
+                }
+            }
+                break;
+            default:
+                break;
+            }
+        }
+
+        uint64 GetData64(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case DATA64_NOVOS_SUMMON_DUMMY:
+                if (!m_vSummonDummyGuids.empty())
+                    m_vSummonDummyGuids[urand(0, m_vSummonDummyGuids.size() - 1)].GetRawValue();
+                break;
+            case DATA64_NOVOS_CRYSTAL_HANDLER:
+                return m_uiNovosCrystalIndex < MAX_CRYSTALS ? m_aNovosCrystalInfo[m_uiNovosCrystalIndex].m_channelGuid : 0;
+            default:
+                break;
+            }
+            return 0;
+        }
+
+    private:
+        void DoSortNovosDummies()
+        {
+            // Sorting once is good enough
+            if (m_lNovosDummyGuids.empty())
+                return;
+
+            Creature* pNovos = GetSingleCreatureFromStorage(NPC_NOVOS);
+            if (!pNovos)
+                return;
+
+            // First sort the Dummies to the Crystals
+            for (uint8 i = 0; i < MAX_CRYSTALS; ++i)
+            {
+                GameObject* pCrystal = instance->GetGameObject(m_aNovosCrystalInfo[i].m_crystalGuid);
+                if (!pCrystal)
+                    continue;
+
+                for (GuidList::iterator itr = m_lNovosDummyGuids.begin(); itr != m_lNovosDummyGuids.end();)
+                {
+                    Creature* pDummy = instance->GetCreature(*itr);
+                    if (!pDummy)
+                    {
+                        m_lNovosDummyGuids.erase(itr++);
+                        continue;
+                    }
+
+                    // Check if dummy fits to crystal
+                    if (pCrystal->IsWithinDistInMap(pDummy, INTERACTION_DISTANCE, false))
+                    {
+                        m_aNovosCrystalInfo[i].m_channelGuid = pDummy->GetObjectGuid();
+                        m_lNovosDummyGuids.erase(itr);
+                        break;
+                    }
+
+                    ++itr;
+                }
+            }
+
+            // Find the crystal channel target (above Novos)
+            float fNovosX, fNovosY, fNovosZ;
+            pNovos->GetRespawnCoord(fNovosX, fNovosY, fNovosZ);
+            for (GuidList::iterator itr = m_lNovosDummyGuids.begin(); itr != m_lNovosDummyGuids.end();)
+            {
+                Creature* pDummy = instance->GetCreature(*itr);
+                if (!pDummy)
+                {
+                    m_lNovosDummyGuids.erase(itr++);
+                    continue;
+                }
+
+                // As the wanted dummy is exactly above Novos, check small range, and only 2d
+                if (pDummy->IsWithinDist2d(fNovosX, fNovosY, 5.0f))
+                {
+                    m_novosChannelGuid = pDummy->GetObjectGuid();
+                    m_lNovosDummyGuids.erase(itr);
+                    break;
+                }
+
+                ++itr;
+            }
+
+            // Summon positions (at end of stairs)
+            for (GuidList::iterator itr = m_lNovosDummyGuids.begin(); itr != m_lNovosDummyGuids.end();)
+            {
+                Creature* pDummy = instance->GetCreature(*itr);
+                if (!pDummy)
+                {
+                    m_lNovosDummyGuids.erase(itr++);
+                    continue;
+                }
+
+                // The wanted dummies are quite above Novos
+                if (pDummy->GetPositionZ() > fNovosZ + 20.0f)
+                {
+                    m_vSummonDummyGuids.push_back(pDummy->GetObjectGuid());
+                    m_lNovosDummyGuids.erase(itr++);
+                }
+                else
+                    ++itr;
+            }
+
+            // Clear remaining (unused) dummies
+            m_lNovosDummyGuids.clear();
+        }
+
+        void DoHandleCrystal(uint8 uiIndex)
+        {
+            m_aNovosCrystalInfo[uiIndex].m_bWasUsed = true;
+
+            DoUseDoorOrButton(m_aNovosCrystalInfo[uiIndex].m_crystalGuid);
+
+            if (Creature* pDummy = instance->GetCreature(m_aNovosCrystalInfo[uiIndex].m_channelGuid))
+                pDummy->InterruptNonMeleeSpells(false);
+        }
+
+        // Wrapper to handle the drakkari invaders summon
+        void DoSummonDrakkariInvaders()
+        {
+            // check if there are there are at least 2 triggers in the vector
+            if (m_vTriggerGuids.size() < 2)
+                return;
+
+            if (roll_chance_i(30))
+            {
+                // Summon a troll in the corner and 2 trolls in the air
+                if (Creature* pTrigger = instance->GetCreature(GetTrollgoreCornerTrigger()))
+                    pTrigger->CastSpell(pTrigger, roll_chance_i(20) ? SPELL_SUMMON_INVADER_1 : SPELL_SUMMON_INVADER_2, true, NULL, NULL, m_mNpcEntryGuidStore[NPC_TROLLGORE]);
+
+                // get two random outside triggers
+                uint8 uiMaxTriggers = m_vTriggerGuids.size();
+                uint8 uiPos1 = urand(0, uiMaxTriggers - 1);
+                uint8 uiPos2 = (uiPos1 + urand(1, uiMaxTriggers - 1)) % uiMaxTriggers;
+
+                if (Creature* pTrigger = instance->GetCreature(m_vTriggerGuids[uiPos1]))
+                    pTrigger->CastSpell(pTrigger, roll_chance_i(30) ? SPELL_SUMMON_INVADER_1 : SPELL_SUMMON_INVADER_2, true, NULL, NULL, m_mNpcEntryGuidStore[NPC_TROLLGORE]);
+                if (Creature* pTrigger = instance->GetCreature(m_vTriggerGuids[uiPos2]))
+                    pTrigger->CastSpell(pTrigger, roll_chance_i(30) ? SPELL_SUMMON_INVADER_1 : SPELL_SUMMON_INVADER_2, true, NULL, NULL, m_mNpcEntryGuidStore[NPC_TROLLGORE]);
+            }
+            else
+            {
+                // Summon 3 trolls in the air
+                for (uint8 i = 0; i < m_vTriggerGuids.size(); ++i)
+                {
+                    if (Creature* pTrigger = instance->GetCreature(m_vTriggerGuids[i]))
+                        pTrigger->CastSpell(pTrigger, roll_chance_i(30) ? SPELL_SUMMON_INVADER_1 : SPELL_SUMMON_INVADER_2, true, NULL, NULL, m_mNpcEntryGuidStore[NPC_TROLLGORE]);
+                }
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiDreadAddsKilled;
+        bool m_bNovosAddGrounded;
+        bool m_bTrollgoreConsume;
+
+        ObjectGuid m_novosChannelGuid;
+        ObjectGuid m_trollgoreCornerTriggerGuid;
+        uint8 m_uiNovosCrystalIndex;
+
+        NovosCrystalInfo m_aNovosCrystalInfo[MAX_CRYSTALS];
+
+        GuidVector m_vSummonDummyGuids;
+        GuidList m_lNovosDummyGuids;
+        GuidVector m_vTriggerGuids;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_draktharon_keep(pMap);
+    }
+};
+
+void AddSC_instance_draktharon_keep()
+{
+    Script* s;
+
+    s = new is_draktharon_keep();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_draktharon_keep";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_draktharon_keep;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/grizzly_hills.cpp b/src/modules/SD3/scripts/northrend/grizzly_hills.cpp
new file mode 100644
index 000000000..a93ef6ced
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/grizzly_hills.cpp
@@ -0,0 +1,581 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Grizzly_Hills
+SD%Complete:
+SDComment: Quest support: 12027, 12082, 12138, 12198
+SDCategory: Grizzly Hills
+EndScriptData */
+
+/* ContentData
+npc_depleted_war_golem
+npc_harrison_jones
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "pet_ai.h"
+
+/*######
+## npc_depleted_war_golem
+######*/
+
+enum
+{
+    SAY_GOLEM_CHARGE            = -1000626,
+    SAY_GOLEM_COMPLETE          = -1000627,
+
+    NPC_LIGHTNING_SENTRY        = 26407,
+
+    SPELL_CHARGE_GOLEM          = 47799,
+    SPELL_GOLEM_CHARGE_CREDIT   = 47797,
+};
+
+struct npc_depleted_war_golem : public CreatureScript
+{
+    npc_depleted_war_golem() : CreatureScript("npc_depleted_war_golem") {}
+
+    struct  npc_depleted_war_golemAI : public ScriptedPetAI
+    {
+        npc_depleted_war_golemAI(Creature* pCreature) : ScriptedPetAI(pCreature) { }
+
+        void Reset() override { }
+
+        void OwnerKilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_UNIT && pVictim->GetEntry() == NPC_LIGHTNING_SENTRY)
+            {
+                // Is distance expected?
+                if (m_creature->IsWithinDistInMap(pVictim, 10.0f))
+                    m_creature->CastSpell(m_creature, SPELL_CHARGE_GOLEM, true);
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_depleted_war_golemAI(pCreature);
+    }
+};
+
+struct aura_charge_golem : public AuraScript
+{
+    aura_charge_golem() : AuraScript("aura_charge_golem") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() != SPELL_CHARGE_GOLEM)
+            return true;
+
+        Creature* pCreature = (Creature*)pAura->GetTarget();
+
+        if (!pCreature)
+            return true;
+
+        if (pAura->GetEffIndex() == EFFECT_INDEX_0)
+        {
+            if (bApply)
+            {
+                DoScriptText(SAY_GOLEM_CHARGE, pCreature);
+                pCreature->addUnitState(UNIT_STAT_STUNNED);
+            }
+            else
+            {
+                DoScriptText(SAY_GOLEM_COMPLETE, pCreature);
+                pCreature->clearUnitState(UNIT_STAT_STUNNED);
+
+                // targets master
+                pCreature->CastSpell(pCreature, SPELL_GOLEM_CHARGE_CREDIT, true);
+            }
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_harrison_jones
+######*/
+
+enum
+{
+    // yells
+    SAY_HARRISON_ESCORT_START           = -1001053,
+    SAY_HARRISON_CHAMBER_1              = -1001054,
+    SAY_HARRISON_CHAMBER_2              = -1001055,
+    SAY_HARRISON_CHAMBER_RELEASE        = -1001056,
+    SAY_ADARRAH_THANK_YOU               = -1001057,
+    SAY_HARRISON_CHAMBER_3              = -1001058,
+    SAY_HARRISON_CHAMBER_4              = -1001059,
+    SAY_HARRISON_CHAMBER_5              = -1001060,
+    SAY_HARRISON_CHAMBER_6              = -1001061,
+    SAY_HARRISON_CHAMBER_7              = -1001062,
+    SAY_HARRISON_ESCORT_COMPELTE        = -1001063,
+
+    // quest
+    QUEST_ID_DUN_DA_DUN_TAH             = 12082,
+
+    // npcs
+    NPC_ADARRAH                         = 24405,
+    NPC_TECAHUNA                        = 26865,
+    NPC_MUMMY_EFFECT_BUNNY              = 26867,
+    NPC_ANCIENT_DRAKKARI_KING           = 26871,
+
+    // spells
+    SPELL_BUNNY_IMMOLATION              = 48150,
+    SPELL_GONG_EFFECT                   = 47730,
+    SPELL_TECAHUNA_SPIRIT_BEAM          = 47601,
+    SPELL_SUMMON_DRAKKARI_KING          = 47602,
+
+    // objects
+    GO_HARRISON_CAGE                    = 188465,
+    GO_ADARRAH_CAGE                     = 188487,
+    GO_FIRE_DOOR                        = 188480,
+};
+
+struct npc_harrison_jones : public CreatureScript
+{
+    npc_harrison_jones() : CreatureScript("npc_harrison_jones") {}
+
+    struct npc_harrison_jonesAI : public npc_escortAI
+    {
+        npc_harrison_jonesAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_uiActivateMummiesTimer = 0;
+        }
+
+        ObjectGuid m_tecahunaGuid;
+        ObjectGuid m_adarrahGuid;
+
+        uint32 m_uiActivateMummiesTimer;
+
+        GuidList m_lImmolationBunnyGuids;
+
+        void Reset() override { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            DoCleanChamberRoom();
+
+            npc_escortAI::JustDied(pKiller);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoScriptText(SAY_HARRISON_ESCORT_START, m_creature);
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+
+                if (GameObject* pCage = GetClosestGameObjectWithEntry(m_creature, GO_HARRISON_CAGE, 5.0f))
+                    pCage->Use(m_creature);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_TECAHUNA)
+            {
+                m_tecahunaGuid = pSummoned->GetObjectGuid();
+
+                // sort the mummies based on the distance
+                std::list<Creature*> lBunniesInRange;
+                GetCreatureListWithEntryInGrid(lBunniesInRange, m_creature, NPC_MUMMY_EFFECT_BUNNY, 50.0f);
+
+                lBunniesInRange.sort(ObjectDistanceOrder(pSummoned));
+
+                for (std::list<Creature*>::const_iterator itr = lBunniesInRange.begin(); itr != lBunniesInRange.end(); ++itr)
+                    m_lImmolationBunnyGuids.push_back((*itr)->GetObjectGuid());
+            }
+            else if (pSummoned->GetEntry() == NPC_ANCIENT_DRAKKARI_KING)
+                pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_TECAHUNA)
+            {
+                SetEscortPaused(false);
+                DoCleanChamberRoom();
+            }
+        }
+
+        void DoCleanChamberRoom()
+        {
+            // open door
+            if (GameObject* pDoor = GetClosestGameObjectWithEntry(m_creature, GO_FIRE_DOOR, 50.0f))
+                pDoor->ResetDoorOrButton();
+
+            // clear auras
+            std::list<Creature*> lBunniesInRange;
+            GetCreatureListWithEntryInGrid(lBunniesInRange, m_creature, NPC_MUMMY_EFFECT_BUNNY, 50.0f);
+
+            for (std::list<Creature*>::const_iterator itr = lBunniesInRange.begin(); itr != lBunniesInRange.end(); ++itr)
+                (*itr)->RemoveAurasDueToSpell(SPELL_BUNNY_IMMOLATION);
+
+            m_uiActivateMummiesTimer = 0;
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 7:
+                DoScriptText(SAY_HARRISON_CHAMBER_1, m_creature);
+                break;
+            case 8:
+                DoScriptText(SAY_HARRISON_CHAMBER_2, m_creature);
+                break;
+            case 10:
+                m_creature->HandleEmote(EMOTE_ONESHOT_USESTANDING);
+                break;
+            case 11:
+                DoScriptText(SAY_HARRISON_CHAMBER_RELEASE, m_creature);
+                if (GameObject* pCage = GetClosestGameObjectWithEntry(m_creature, GO_ADARRAH_CAGE, 5.0f))
+                    pCage->Use(m_creature);
+                break;
+            case 12:
+                if (Creature* pAdarrah = GetClosestCreatureWithEntry(m_creature, NPC_ADARRAH, 5.0f))
+                {
+                    DoScriptText(SAY_ADARRAH_THANK_YOU, pAdarrah);
+                    m_adarrahGuid = pAdarrah->GetObjectGuid();
+                }
+                break;
+            case 13:
+                if (Creature* pAdarrah = m_creature->GetMap()->GetCreature(m_adarrahGuid))
+                {
+                    pAdarrah->SetWalk(false);
+                    pAdarrah->GetMotionMaster()->MovePoint(0, 4878.416f, -4793.893f, 32.549f);
+                    pAdarrah->ForcedDespawn(5000);
+                }
+                break;
+            case 15:
+                m_creature->SetFacingTo(0.2f);
+                m_creature->HandleEmote(EMOTE_ONESHOT_KNEEL);
+                break;
+            case 16:
+            {
+                       // set mummies in fire
+                       std::list<Creature*> lBunniesInRange;
+                       GetCreatureListWithEntryInGrid(lBunniesInRange, m_creature, NPC_MUMMY_EFFECT_BUNNY, 50.0f);
+
+                       for (std::list<Creature*>::const_iterator itr = lBunniesInRange.begin(); itr != lBunniesInRange.end(); ++itr)
+                           (*itr)->CastSpell((*itr), SPELL_BUNNY_IMMOLATION, true);
+
+                       m_creature->SetFacingTo(5.0f);
+                       DoCastSpellIfCan(m_creature, SPELL_GONG_EFFECT);
+                       break;
+            }
+            case 17:
+                DoScriptText(SAY_HARRISON_CHAMBER_3, m_creature);
+                break;
+            case 18:
+                DoScriptText(SAY_HARRISON_CHAMBER_4, m_creature);
+                break;
+            case 21:
+                // close door
+                if (GameObject* pDoor = GetClosestGameObjectWithEntry(m_creature, GO_FIRE_DOOR, 10.0f))
+                    pDoor->Use(m_creature);
+                break;
+            case 22:
+                DoScriptText(SAY_HARRISON_CHAMBER_5, m_creature);
+                SetRun();
+                // summon snake
+                m_creature->SummonCreature(NPC_TECAHUNA, 4907.077f, -4819.035f, 32.55f, 2.32f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                break;
+            case 23:
+                DoScriptText(SAY_HARRISON_CHAMBER_6, m_creature);
+                break;
+            case 24:
+                DoScriptText(SAY_HARRISON_CHAMBER_7, m_creature);
+                break;
+            case 25:
+                // attack snake
+                if (Creature* pTecahuna = m_creature->GetMap()->GetCreature(m_tecahunaGuid))
+                    AttackStart(pTecahuna);
+                SetEscortPaused(true);
+                m_uiActivateMummiesTimer = 10000;
+                break;
+            case 53:
+                DoScriptText(SAY_HARRISON_ESCORT_COMPELTE, m_creature);
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_ID_DUN_DA_DUN_TAH, m_creature);
+                    m_creature->SetFacingToObject(pPlayer);
+                }
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // special script for snake fight
+            if (m_uiActivateMummiesTimer)
+            {
+                if (m_uiActivateMummiesTimer <= uiDiff)
+                {
+                    if (Creature* pTecahuna = m_creature->GetMap()->GetCreature(m_tecahunaGuid))
+                    {
+                        // activate 2 mummies at each turn
+                        for (uint8 i = 0; i < 2; ++i)
+                        {
+                            if (Creature* pBunny = m_creature->GetMap()->GetCreature(m_lImmolationBunnyGuids.front()))
+                            {
+                                pTecahuna->CastSpell(pBunny, SPELL_TECAHUNA_SPIRIT_BEAM, true);
+                                pBunny->CastSpell(pBunny, SPELL_SUMMON_DRAKKARI_KING, true, NULL, NULL, m_creature->GetObjectGuid());
+                                pBunny->RemoveAurasDueToSpell(SPELL_BUNNY_IMMOLATION);
+                                m_lImmolationBunnyGuids.remove(m_lImmolationBunnyGuids.front());
+                            }
+                        }
+                    }
+
+                    // set timer based on the remaining mummies
+                    if (m_lImmolationBunnyGuids.empty())
+                        m_uiActivateMummiesTimer = 0;
+                    else
+                        m_uiActivateMummiesTimer = urand(5000, 10000);
+                }
+                else
+                    m_uiActivateMummiesTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_harrison_jonesAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_DUN_DA_DUN_TAH)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_emily
+######*/
+
+enum
+{
+    SAY_ESCORT_START                    = -1001173,
+    SAY_FIRST_WOLF                      = -1001174,
+    SAY_FIRST_WOLF_ATTACK               = -1001175,
+    SAY_HELP_FLOPPY_1                   = -1001176,
+    SAY_FIRST_WOLF_DEFEAT               = -1001177,
+    SAY_SECOND_WOLF                     = -1001178,
+    SAY_HELP_FLOPPY_2                   = -1001179,
+    SAY_FLOPPY_ALMOST_DEAD              = -1001180,
+    SAY_SECOND_WOLF_DEFEAT              = -1001181,
+    SAY_RESUME_ESCORT                   = -1001182,
+    SAY_ESCORT_COMPLETE                 = -1001183,
+
+    SPELL_FLOPPY_BECOMES_LUNCH          = 47184,
+
+    NPC_HUNGRY_WORG                     = 26586,
+    NPC_RAVENOUS_WORG                   = 26590,
+    NPC_MR_FLOPPY                       = 26589,
+
+    QUEST_ID_MR_FLOPPY_ADVENTURE        = 12027,
+};
+
+struct npc_emily : public CreatureScript
+{
+    npc_emily() : CreatureScript("npc_emily") {}
+
+    struct npc_emilyAI : public npc_escortAI
+    {
+        npc_emilyAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        ObjectGuid m_floppyGuid;
+
+        void Reset() override { }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+
+                if (Creature* pFloppy = GetClosestCreatureWithEntry(m_creature, NPC_MR_FLOPPY, 10.0f))
+                    m_floppyGuid = pFloppy->GetObjectGuid();
+            }
+            else if (eventType == AI_EVENT_JUST_DIED && pSender->GetEntry() == NPC_MR_FLOPPY)
+            {
+                npc_escortAI::JustDied(m_creature);
+                m_creature->ForcedDespawn();
+            }
+            else if (eventType == AI_EVENT_CRITICAL_HEALTH && pSender->GetEntry() == NPC_MR_FLOPPY)
+                DoScriptText(SAY_FLOPPY_ALMOST_DEAD, m_creature);
+            else if (eventType == AI_EVENT_LOST_SOME_HEALTH && pSender->GetEntry() == NPC_MR_FLOPPY)
+                DoScriptText(urand(0, 1) ? SAY_HELP_FLOPPY_1 : SAY_HELP_FLOPPY_2, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_RAVENOUS_WORG:
+            case NPC_HUNGRY_WORG:
+                if (Creature* pFloppy = m_creature->GetMap()->GetCreature(m_floppyGuid))
+                {
+                    float fX, fY, fZ;
+                    pFloppy->GetContactPoint(pSummoned, fX, fY, fZ);
+                    pSummoned->SetWalk(false);
+                    pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                }
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_RAVENOUS_WORG:
+                DoScriptText(SAY_SECOND_WOLF_DEFEAT, m_creature);
+                SetEscortPaused(false);
+                // resume follow after vehicle unboard
+                if (Creature* pFloppy = m_creature->GetMap()->GetCreature(m_floppyGuid))
+                    pFloppy->GetMotionMaster()->MoveFollow(m_creature, pFloppy->GetDistance(m_creature), M_PI_F - pFloppy->GetAngle(m_creature));
+                break;
+            case NPC_HUNGRY_WORG:
+                DoScriptText(SAY_FIRST_WOLF_DEFEAT, m_creature);
+                SetEscortPaused(false);
+                break;
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_RAVENOUS_WORG:
+                // board the ravenous worg vehicle
+                if (Creature* pFloppy = m_creature->GetMap()->GetCreature(m_floppyGuid))
+                    pFloppy->CastSpell(pSummoned, SPELL_FLOPPY_BECOMES_LUNCH, true);
+                // no break;
+            case NPC_HUNGRY_WORG:
+                if (Creature* pFloppy = m_creature->GetMap()->GetCreature(m_floppyGuid))
+                    pSummoned->AI()->AttackStart(pFloppy);
+                break;
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                DoScriptText(SAY_ESCORT_START, m_creature);
+                break;
+            case 10:
+                DoScriptText(SAY_FIRST_WOLF, m_creature);
+                m_creature->SummonCreature(NPC_HUNGRY_WORG, 4305.514f, -3799.008f, 237.034f, 2.20f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                break;
+            case 11:
+                SetEscortPaused(true);
+                DoScriptText(SAY_FIRST_WOLF_ATTACK, m_creature);
+                break;
+            case 22:
+                SetEscortPaused(true);
+                DoScriptText(SAY_SECOND_WOLF, m_creature);
+                m_creature->SummonCreature(NPC_RAVENOUS_WORG, 4339.643f, -3948.972f, 194.904f, 0.90f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                break;
+            case 24:
+                DoScriptText(SAY_RESUME_ESCORT, m_creature);
+                SetRun();
+                if (Player* pPlayer = GetPlayerForEscort())
+                    pPlayer->GroupEventHappens(QUEST_ID_MR_FLOPPY_ADVENTURE, m_creature);
+                break;
+            case 25:
+                DoScriptText(SAY_ESCORT_COMPLETE, m_creature);
+                break;
+            case 27:
+                if (Creature* pFloppy = m_creature->GetMap()->GetCreature(m_floppyGuid))
+                    pFloppy->ForcedDespawn();
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_emilyAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_MR_FLOPPY_ADVENTURE)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_grizzly_hills()
+{
+    Script* s;
+
+    s = new npc_depleted_war_golem();
+    s->RegisterSelf();
+    s = new npc_harrison_jones();
+    s->RegisterSelf();
+    s = new npc_emily();
+    s->RegisterSelf();
+
+    s = new aura_charge_golem();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_depleted_war_golem";
+    //pNewScript->GetAI = &GetAI_npc_depleted_war_golem;
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_npc_depleted_war_golem;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_harrison_jones";
+    //pNewScript->GetAI = &GetAI_npc_harrison_jones;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_harrison_jones;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_emily";
+    //pNewScript->GetAI = &GetAI_npc_emily;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_emily;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/gundrak/boss_colossus.cpp b/src/modules/SD3/scripts/northrend/gundrak/boss_colossus.cpp
new file mode 100644
index 000000000..6f80a4895
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/gundrak/boss_colossus.cpp
@@ -0,0 +1,454 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Colossus
+SD%Complete: 95%
+SDComment: Timers; May need small adjustments
+SDCategory: Gundrak
+EndScriptData */
+
+#include "precompiled.h"
+#include "gundrak.h"
+
+enum
+{
+    EMOTE_SURGE                 = -1604008,
+    EMOTE_SEEP                  = -1604009,
+    EMOTE_GLOW                  = -1604010,
+
+    // collosus' abilities
+    SPELL_FREEZE_ANIM           = 16245,                // Colossus stun aura
+    SPELL_EMERGE                = 54850,
+    SPELL_MIGHTY_BLOW           = 54719,
+    SPELL_MORTAL_STRIKES        = 54715,
+    SPELL_MORTAL_STRIKES_H      = 59454,
+
+    // elemental's abilities
+    SPELL_MERGE                 = 54878,
+    SPELL_SURGE                 = 54801,
+    SPELL_MOJO_VOLLEY           = 59453,
+    SPELL_MOJO_VOLLEY_H         = 54849,
+
+    // Living Mojo spells
+    SPELL_MOJO_WAVE             = 55626,
+    SPELL_MOJO_WAVE_H           = 58993,
+    SPELL_MOJO_PUDDLE           = 55627,
+    SPELL_MOJO_PUDDLE_H         = 58994,
+
+    MAX_COLOSSUS_MOJOS          = 5,
+};
+
+/*######
+## boss_drakkari_elemental
+######*/
+
+struct boss_drakkari_elemental : public CreatureScript
+{
+    boss_drakkari_elemental() : CreatureScript("boss_drakkari_elemental") {}
+
+    struct boss_drakkari_elementalAI : public ScriptedAI
+    {
+        boss_drakkari_elementalAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+        bool m_bIsFirstEmerge;
+
+        uint32 m_uiSurgeTimer;
+
+        void Reset() override
+        {
+            m_bIsFirstEmerge = true;
+            m_uiSurgeTimer = urand(9000, 13000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_MOJO_VOLLEY : SPELL_MOJO_VOLLEY_H);
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& /*uiDamage*/) override
+        {
+            if (!m_bIsFirstEmerge)
+                return;
+
+            if (m_creature->GetHealthPercent() < 50.0f)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_MERGE, CAST_INTERRUPT_PREVIOUS);
+                m_bIsFirstEmerge = false;
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                if (Creature* pColossus = m_pInstance->GetSingleCreatureFromStorage(NPC_COLOSSUS))
+                    pColossus->AI()->EnterEvadeMode();
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                // kill colossus on death - this will finish the encounter
+                if (Creature* pColossus = m_pInstance->GetSingleCreatureFromStorage(NPC_COLOSSUS))
+                    pColossus->DealDamage(pColossus, pColossus->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+            }
+        }
+
+        // Set the second emerge of the Elemental
+        void ReceiveAIEvent(AIEventType eventType, Creature* sender, Unit* invoker, uint32 /**/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && sender == invoker)
+            {
+                m_bIsFirstEmerge = false;
+                m_creature->SetHealth(m_creature->GetMaxHealth()/2);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiSurgeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SURGE) == CAST_OK)
+                        m_uiSurgeTimer = urand(12000, 17000);
+                }
+            }
+            else
+                m_uiSurgeTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_drakkari_elementalAI(pCreature);
+    }
+};
+
+/*######
+## boss_drakkari_colossus
+######*/
+
+struct boss_drakkari_colossus : public CreatureScript
+{
+    boss_drakkari_colossus() : CreatureScript("boss_drakkari_colossus") {}
+
+    struct boss_drakkari_colossusAI : public ScriptedAI
+    {
+        boss_drakkari_colossusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+        bool m_bFirstEmerge;
+
+        uint32 m_uiMightyBlowTimer;
+        uint32 m_uiColossusStartTimer;
+        uint8 m_uiMojosGathered;
+
+        void Reset() override
+        {
+            m_bFirstEmerge = true;
+            m_uiMightyBlowTimer = 10000;
+            m_uiColossusStartTimer = 0;
+            m_uiMojosGathered = 0;
+
+            // Reset unit flags
+            SetCombatMovement(true);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_MORTAL_STRIKES : SPELL_MORTAL_STRIKES_H);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_COLOSSUS, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_COLOSSUS, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_COLOSSUS, FAIL);
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_MERGE)
+            {
+                // re-activate colossus here
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM);
+
+                SetCombatMovement(true);
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                ((Creature*)pCaster)->ForcedDespawn();
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_ELEMENTAL)
+            {
+                // If this is the second summon, then set the health to half
+                if (!m_bFirstEmerge)
+                {
+                    if (CreatureAI* pBossAI = pSummoned->AI())
+                        pBossAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, m_creature, m_creature, 0);
+                }
+
+                m_bFirstEmerge = false;
+                if (m_creature->getVictim())
+                    pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (m_bFirstEmerge && m_creature->GetHealthPercent() < 50.0f)
+                DoEmergeElemental();
+            else if (uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+                DoEmergeElemental();
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *sender, Unit* invoker, uint32 /**/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && sender == invoker)
+            {
+                // Wrapper to prepare the Colossus
+                ++m_uiMojosGathered;
+
+                if (m_uiMojosGathered == MAX_COLOSSUS_MOJOS)
+                    m_uiColossusStartTimer = 1000;
+            }
+        }
+
+        void DoEmergeElemental()
+        {
+            // Avoid casting the merge spell twice
+            if (m_creature->HasAura(SPELL_FREEZE_ANIM))
+                return;
+
+            if (DoCastSpellIfCan(m_creature, SPELL_EMERGE, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+            {
+                SetCombatMovement(false);
+                m_creature->GetMotionMaster()->MoveIdle();
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                DoCastSpellIfCan(m_creature, SPELL_FREEZE_ANIM, CAST_TRIGGERED);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiColossusStartTimer)
+            {
+                if (m_uiColossusStartTimer <= uiDiff)
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM);
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                    m_uiColossusStartTimer = 0;
+                }
+                else
+                    m_uiColossusStartTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiMightyBlowTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_MIGHTY_BLOW);
+                m_uiMightyBlowTimer = 10000;
+            }
+            else
+                m_uiMightyBlowTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_drakkari_colossusAI(pCreature);
+    }
+};
+
+/*######
+## npc_living_mojo
+######*/
+
+struct npc_living_mojo : public CreatureScript
+{
+    npc_living_mojo() : CreatureScript("npc_living_mojo") {}
+
+    struct npc_living_mojoAI : public ScriptedAI
+    {
+        npc_living_mojoAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsPartOfColossus = pCreature->GetPositionX() > 1650.0f ? true : false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+        bool m_bIsPartOfColossus;
+
+        uint32 m_uiMojoWaveTimer;
+
+        void Reset() override
+        {
+            m_uiMojoWaveTimer = urand(10000, 13000);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            // Don't attack if is part of the Colossus event
+            if (m_bIsPartOfColossus)
+                return;
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE)
+                return;
+
+            if (uiPointId)
+            {
+                m_creature->ForcedDespawn(1000);
+
+                if (m_pInstance)
+                {
+                    // Prepare to set the Colossus in combat
+                    if (Creature* pColossus = m_pInstance->GetSingleCreatureFromStorage(NPC_COLOSSUS))
+                    {
+                        if (CreatureAI* pBossAI = pColossus->AI())
+                            pBossAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, m_creature, m_creature, 0);
+                    }
+                }
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (!m_bIsPartOfColossus)
+                ScriptedAI::EnterEvadeMode();
+            // Force the Mojo to move to the Colossus position
+            else
+            {
+                if (m_pInstance)
+                {
+                    float fX, fY, fZ;
+                    m_creature->GetPosition(fX, fY, fZ);
+
+                    if (Creature* pColossus = m_pInstance->GetSingleCreatureFromStorage(NPC_COLOSSUS))
+                        pColossus->GetPosition(fX, fY, fZ);
+
+                    m_creature->SetWalk(false);
+                    m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                }
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_MOJO_PUDDLE : SPELL_MOJO_PUDDLE_H, CAST_TRIGGERED);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiMojoWaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_MOJO_WAVE : SPELL_MOJO_WAVE_H) == CAST_OK)
+                    m_uiMojoWaveTimer = urand(15000, 18000);
+            }
+            else
+                m_uiMojoWaveTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_living_mojoAI(pCreature);
+    }
+};
+
+void AddSC_boss_colossus()
+{
+    Script* s;
+
+    s = new boss_drakkari_colossus();
+    s->RegisterSelf();
+    s = new boss_drakkari_elemental();
+    s->RegisterSelf();
+    s = new npc_living_mojo();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_drakkari_colossus";
+    //pNewScript->GetAI = &GetAI_boss_drakkari_colossus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_drakkari_elemental";
+    //pNewScript->GetAI = &GetAI_boss_drakkari_elemental;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_living_mojo";
+    //pNewScript->GetAI = &GetAI_npc_living_mojo;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/gundrak/boss_eck.cpp b/src/modules/SD3/scripts/northrend/gundrak/boss_eck.cpp
new file mode 100644
index 000000000..13aa0894b
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/gundrak/boss_eck.cpp
@@ -0,0 +1,165 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_eck
+SD%Complete: 80%
+SDComment: Timers need improval, Spring Spells are not clear.
+SDCategory: Gundrak
+EndScriptData */
+
+#include "precompiled.h"
+#include "gundrak.h"
+
+enum
+{
+    SPELL_ECK_BITE            = 55813,
+    SPELL_ECK_SPIT            = 55814,
+    SPELL_ECK_SPRING          = 55815,
+    SPELL_ECK_BERSERK         = 55816,
+    SPELL_ECK_RESIDUE         = 55817,
+    SPELL_ECK_SPRING_ALT      = 55837,                      // Purpose unknown
+};
+
+/*######
+## boss_eck
+######*/
+
+struct boss_eck : public CreatureScript
+{
+    boss_eck() : CreatureScript("boss_eck") {}
+
+    struct boss_eckAI : public ScriptedAI
+    {
+        boss_eckAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsBerserk;
+
+        uint32 m_uiSpitTimer;
+        uint32 m_uiSpringTimer;
+        uint32 m_uiBiteTimer;
+        uint32 m_uiBerserkTimer;
+
+        void Reset() override
+        {
+            m_uiSpitTimer = urand(10000, 20000);
+            m_uiSpringTimer = urand(15000, 25000);
+            m_uiBiteTimer = urand(5000, 15000);
+            m_uiBerserkTimer = urand(60000, 90000);             // Enrange at 20% HP or after 60-90 seconds
+            m_bIsBerserk = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ECK, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ECK, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ECK, FAIL);
+        }
+
+        // As the Eck Spite spell has no dummy or similar effect, applying the residue aura has to be done with spellHitTarget
+        void SpellHitTarget(Unit* pUnit, const SpellEntry* pSpellEntry) override
+        {
+            if (pSpellEntry->Id == SPELL_ECK_SPIT && pUnit->GetTypeId() == TYPEID_PLAYER && !pUnit->HasAura(SPELL_ECK_RESIDUE))
+                pUnit->CastSpell(pUnit, SPELL_ECK_RESIDUE, true);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiSpitTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ECK_SPIT) == CAST_OK)
+                    m_uiSpitTimer = urand(10000, 20000);
+            }
+            else
+                m_uiSpitTimer -= uiDiff;
+
+            if (m_uiSpringTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+                if (!pTarget)
+                    pTarget = m_creature->getVictim();
+
+                if (DoCastSpellIfCan(pTarget, SPELL_ECK_SPRING) == CAST_OK)
+                {
+                    DoResetThreat();
+                    m_uiSpringTimer = urand(15000, 25000);
+                }
+            }
+            else
+                m_uiSpringTimer -= uiDiff;
+
+            if (m_uiBiteTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_ECK_BITE);
+                m_uiBiteTimer = urand(5000, 15000);
+            }
+            else
+                m_uiBiteTimer -= uiDiff;
+
+            if (!m_bIsBerserk)                                  // Go into Berserk after time, or when below 20% health
+            {
+                if (m_creature->GetHealthPercent() <= 20.0f || m_uiBerserkTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ECK_BERSERK) == CAST_OK)
+                        m_bIsBerserk = true;
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_eckAI(pCreature);
+    }
+};
+
+void AddSC_boss_eck()
+{
+    Script* s;
+
+    s = new boss_eck();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_eck";
+    //pNewScript->GetAI = &GetAI_boss_eck;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/gundrak/boss_galdarah.cpp b/src/modules/SD3/scripts/northrend/gundrak/boss_galdarah.cpp
new file mode 100644
index 000000000..22186838d
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/gundrak/boss_galdarah.cpp
@@ -0,0 +1,281 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Galdarah
+SD%Complete: 80%
+SDComment: achievements need to be implemented, channeling before engage is missing
+SDCategory: Gundrak
+EndScriptData */
+
+#include "precompiled.h"
+#include "gundrak.h"
+
+enum
+{
+    SAY_AGGRO                  = -1604019,
+    SAY_TRANSFORM_1            = -1604020,
+    SAY_TRANSFORM_2            = -1604021,
+    SAY_SUMMON_1               = -1604022,
+    SAY_SUMMON_2               = -1604023,
+    SAY_SUMMON_3               = -1604024,
+    SAY_SLAY_1                 = -1604025,
+    SAY_SLAY_2                 = -1604026,
+    SAY_SLAY_3                 = -1604027,
+    SAY_DEATH                  = -1604028,
+
+    EMOTE_IMPALED              = -1604030,
+
+    NPC_RHINO_SPIRIT           = 29791,
+    SPELL_STAMPEDE_RHINO       = 55220,
+    SPELL_STAMPEDE_RHINO_H     = 59823,
+
+    // troll form spells
+    SPELL_STAMPEDE             = 55218,
+    SPELL_WHIRLING_SLASH       = 55250,
+    SPELL_WHIRLING_SLASH_H     = 59824,
+    SPELL_RHINO_TRANSFORM      = 55297,
+    SPELL_PUNCTURE             = 55276,
+    SPELL_PUNCTURE_H           = 59826,
+
+    // rhino form spells
+    SPELL_TROLL_TRANSFORM      = 55299,
+    SPELL_ENRAGE               = 55285,
+    SPELL_ENRAGE_H             = 59828,
+    SPELL_IMPALING_CHARGE      = 54956,
+    SPELL_IMPALING_CHARGE_H    = 59827,
+    SPELL_STOMP                = 55292,
+    SPELL_STOMP_H              = 59829,
+};
+
+/*######
+## boss_galdarah
+######*/
+
+struct boss_galdarah : public CreatureScript
+{
+    boss_galdarah() : CreatureScript("boss_galdarah") {}
+
+    struct boss_galdarahAI : public ScriptedAI
+    {
+        boss_galdarahAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+        bool m_bIsTrollPhase;
+
+        uint32 m_uiStampedeTimer;
+        uint32 m_uiPhaseChangeTimer;
+        uint32 m_uiSpecialAbilityTimer;                         // Impaling Charge and Whirling Slash
+        uint32 m_uiPunctureTimer;
+        uint32 m_uiStompTimer;
+        uint32 m_uiEnrageTimer;
+        uint8 m_uiAbilityCount;
+
+        void Reset() override
+        {
+            m_bIsTrollPhase = true;
+
+            m_uiStampedeTimer = 10000;
+            m_uiSpecialAbilityTimer = 12000;
+            m_uiPunctureTimer = 25000;
+            m_uiPhaseChangeTimer = 7000;
+            m_uiAbilityCount = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GALDARAH, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GALDARAH, FAIL);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GALDARAH, DONE);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_RHINO_SPIRIT)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, m_bIsRegularMode ? SPELL_STAMPEDE_RHINO : SPELL_STAMPEDE_RHINO_H, SELECT_FLAG_PLAYER))
+                {
+                    pSummoned->CastSpell(pTarget, m_bIsRegularMode ? SPELL_STAMPEDE_RHINO : SPELL_STAMPEDE_RHINO_H, false, NULL, NULL, m_creature->GetObjectGuid());
+
+                    // Store the player guid in order to count it for the achievement
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_ACHIEV_SHARE_LOVE, pTarget->GetGUIDLow());
+                }
+            }
+        }
+
+        void DoPhaseSwitch()
+        {
+            if (!m_bIsTrollPhase)
+                m_creature->RemoveAurasDueToSpell(SPELL_RHINO_TRANSFORM);
+
+            m_bIsTrollPhase = !m_bIsTrollPhase;
+
+            if (m_bIsTrollPhase)
+                DoCastSpellIfCan(m_creature, SPELL_TROLL_TRANSFORM);
+            else
+            {
+                DoScriptText(urand(0, 1) ? SAY_TRANSFORM_1 : SAY_TRANSFORM_2, m_creature);
+                DoCastSpellIfCan(m_creature, SPELL_RHINO_TRANSFORM);
+
+                m_uiEnrageTimer = 4000;
+                m_uiStompTimer = 1000;
+            }
+
+            m_uiAbilityCount = 0;
+            m_uiPhaseChangeTimer = 7000;
+            m_uiSpecialAbilityTimer = 12000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiAbilityCount == 2)
+            {
+                if (m_uiPhaseChangeTimer < uiDiff)
+                    DoPhaseSwitch();
+                else
+                    m_uiPhaseChangeTimer -= uiDiff;
+            }
+
+            if (m_bIsTrollPhase)
+            {
+                if (m_uiPunctureTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_PUNCTURE : SPELL_PUNCTURE_H);
+                    m_uiPunctureTimer = 25000;
+                }
+                else
+                    m_uiPunctureTimer -= uiDiff;
+
+                if (m_uiStampedeTimer < uiDiff)
+                {
+                    switch (urand(0, 2))
+                    {
+                    case 0: DoScriptText(SAY_SUMMON_1, m_creature); break;
+                    case 1: DoScriptText(SAY_SUMMON_2, m_creature); break;
+                    case 2: DoScriptText(SAY_SUMMON_3, m_creature); break;
+                    }
+
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_STAMPEDE);
+                    m_uiStampedeTimer = 15000;
+                }
+                else
+                    m_uiStampedeTimer -= uiDiff;
+
+                if (m_uiSpecialAbilityTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_WHIRLING_SLASH : SPELL_WHIRLING_SLASH_H) == CAST_OK)
+                        m_uiSpecialAbilityTimer = 12000;
+
+                    ++m_uiAbilityCount;
+                }
+                else
+                    m_uiSpecialAbilityTimer -= uiDiff;
+            }
+            else
+            {
+                if (m_uiEnrageTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ENRAGE : SPELL_ENRAGE_H);
+                    m_uiEnrageTimer = 15000;
+                }
+                else
+                    m_uiEnrageTimer -= uiDiff;
+
+                if (m_uiStompTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_STOMP : SPELL_STOMP_H);
+                    m_uiStompTimer = 10000;
+                }
+                else
+                    m_uiStompTimer -= uiDiff;
+
+                if (m_uiSpecialAbilityTimer < uiDiff)
+                {
+                    Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+                    if (!pTarget)
+                        pTarget = m_creature->getVictim();
+
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_IMPALING_CHARGE : SPELL_IMPALING_CHARGE_H) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_IMPALED, m_creature, pTarget);
+                        m_uiSpecialAbilityTimer = 12000;
+
+                        ++m_uiAbilityCount;
+                    }
+                }
+                else
+                    m_uiSpecialAbilityTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_galdarahAI(pCreature);
+    }
+};
+
+void AddSC_boss_galdarah()
+{
+    Script* s;
+
+    s = new boss_galdarah();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_galdarah";
+    //pNewScript->GetAI = &GetAI_boss_galdarah;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/gundrak/boss_moorabi.cpp b/src/modules/SD3/scripts/northrend/gundrak/boss_moorabi.cpp
new file mode 100644
index 000000000..405a65d9c
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/gundrak/boss_moorabi.cpp
@@ -0,0 +1,201 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Moorabi
+SD%Complete: 20%
+SDComment:
+SDCategory: Gundrak
+EndScriptData */
+
+#include "precompiled.h"
+#include "gundrak.h"
+
+enum
+{
+    SAY_AGGRO                   = -1604011,
+    SAY_QUAKE                   = -1604012,
+    SAY_TRANSFORM               = -1604013,
+    SAY_SLAY_1                  = -1604014,
+    SAY_SLAY_2                  = -1604015,
+    SAY_SLAY_3                  = -1604016,
+    SAY_DEATH                   = -1604017,
+    EMOTE_TRANSFORM             = -1604018,
+    EMOTE_TRANSFORMED           = -1604029,
+
+    // Troll form
+    SPELL_DETERMINED_STAB   = 55104,
+    SPELL_MOJO_FRENZY       = 55163,
+    SPELL_GROUND_TREMOR     = 55142,
+    SPELL_NUMBING_SHOUT     = 55106,
+    SPELL_TRANSFORMATION    = 55098,
+
+    // Mammoth
+    SPELL_DETERMINED_GORE   = 55102,
+    SPELL_DETERMINED_GORE_H = 59444,
+    SPELL_QUAKE             = 55101,
+    SPELL_NUMBING_ROAR      = 55100,
+};
+
+/*######
+## boss_moorabi
+######*/
+
+struct boss_moorabi : public CreatureScript
+{
+    boss_moorabi() : CreatureScript("boss_moorabi") {}
+
+    struct boss_moorabiAI : public ScriptedAI
+    {
+        boss_moorabiAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiStabTimer;                                   // used for stab and gore
+        uint32 m_uiQuakeTimer;                                  // used for quake and ground tremor
+        uint32 m_uiRoarTimer;                                   // both roars on it
+        uint32 m_uiTransformationTimer;
+        uint32 m_uiPreviousTimer;
+
+        bool m_bMammothPhase;
+
+        void Reset() override
+        {
+            m_bMammothPhase = false;
+
+            m_uiStabTimer = 8000;
+            m_uiQuakeTimer = 1000;
+            m_uiRoarTimer = 7000;
+            m_uiTransformationTimer = 10000;
+            m_uiPreviousTimer = 10000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_MOJO_FRENZY);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MOORABI, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MOORABI, DONE);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_creature->HasAura(SPELL_TRANSFORMATION) && !m_bMammothPhase)
+            {
+                DoScriptText(EMOTE_TRANSFORMED, m_creature);
+                m_bMammothPhase = true;
+
+                // Set the achievement to failed
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_ACHIEV_LESS_RABI, uint32(false));
+            }
+
+            if (m_uiRoarTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), m_bMammothPhase ? SPELL_NUMBING_ROAR : SPELL_NUMBING_SHOUT);
+                m_uiRoarTimer = 20000;
+            }
+            else
+                m_uiRoarTimer -= uiDiff;
+
+            if (m_uiQuakeTimer < uiDiff)
+            {
+                DoScriptText(SAY_QUAKE, m_creature);
+                DoCastSpellIfCan(m_creature->getVictim(), m_bMammothPhase ? SPELL_QUAKE : SPELL_GROUND_TREMOR);
+                m_uiQuakeTimer = m_bMammothPhase ? 13000 : 18000;
+            }
+            else
+                m_uiQuakeTimer -= uiDiff;
+
+            if (m_uiStabTimer < uiDiff)
+            {
+                if (m_bMammothPhase)
+                    DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_DETERMINED_GORE : SPELL_DETERMINED_GORE_H);
+                else
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_DETERMINED_STAB);
+
+                m_uiStabTimer = 7000;
+            }
+            else
+                m_uiStabTimer -= uiDiff;
+
+            // check only in troll phase
+            if (!m_bMammothPhase)
+            {
+                if (m_uiTransformationTimer < uiDiff)
+                {
+                    DoScriptText(SAY_TRANSFORM, m_creature);
+                    DoScriptText(EMOTE_TRANSFORM, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_TRANSFORMATION);
+                    m_uiPreviousTimer *= 0.8;
+                    m_uiTransformationTimer = m_uiPreviousTimer;
+                }
+                else
+                    m_uiTransformationTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_moorabiAI(pCreature);
+    }
+};
+
+void AddSC_boss_moorabi()
+{
+    Script* s;
+
+    s = new boss_moorabi();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_moorabi";
+    //pNewScript->GetAI = &GetAI_boss_moorabi;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/gundrak/boss_sladran.cpp b/src/modules/SD3/scripts/northrend/gundrak/boss_sladran.cpp
new file mode 100644
index 000000000..1db9baaeb
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/gundrak/boss_sladran.cpp
@@ -0,0 +1,229 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Sladran
+SD%Complete: 75%
+SDComment:
+SDCategory: Gundrak
+EndScriptData */
+
+#include "precompiled.h"
+#include "gundrak.h"
+
+enum
+{
+    SAY_AGGRO                 = -1604000,
+    SAY_SUMMON_SNAKE          = -1604001,
+    SAY_SUMMON_CONSTRICTOR    = -1604002,
+    SAY_SLAY_1                = -1604003,
+    SAY_SLAY_2                = -1604004,
+    SAY_SLAY_3                = -1604005,
+    SAY_DEATH                 = -1604006,
+    EMOTE_NOVA                = -1604007,
+
+    // Slad'Ran spells
+    SPELL_POISON_NOVA         = 55081,
+    SPELL_POISON_NOVA_H       = 59842,
+    SPELL_POWERFUL_BITE       = 48287,
+    SPELL_POWERFUL_BITE_H     = 59840,
+    SPELL_VENOM_BOLT          = 54970,
+    SPELL_VENOM_BOLT_H        = 59839,
+
+    // Summon spells
+    SPELL_SUMMON_VIPER        = 55060,
+    SPELL_SUMMON_CONSTRICTOR  = 54969,
+
+    // Constrictor spells
+    SPELL_GRIP_OF_SLADRAN     = 55093,
+    SPELL_GRIP_OF_SLADRAN_H   = 61474,
+
+    // Snake Wrap spells - mechanics unk
+    SPELL_SNAKE_WRAP          = 55099,
+    SPELL_SNAKE_WRAP_H        = 61475,
+    SPELL_SNAKE_WRAP_SUMMON   = 55126,
+    SPELL_SNAKE_WRAP_SUMMON_H = 61476,
+    SPELL_SNAKE_WRAP_EFFECT   = 55128,
+    SPELL_SNAKE_WRAP_SNAKES   = 55127,              // kills all snakes
+
+    NPC_SLADRAN_CONSTRICTOR   = 29713,
+    NPC_SLADRAN_VIPER         = 29680,
+    NPC_SNAKE_WRAP            = 29742,
+};
+
+/*######
+## boss_sladran
+######*/
+
+struct boss_sladran : public CreatureScript
+{
+    boss_sladran() : CreatureScript("boss_sladran") {}
+
+    struct boss_sladranAI : public ScriptedAI
+    {
+        boss_sladranAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiSummonTimer;
+        uint32 m_uiPoisonNovaTimer;
+        uint32 m_uiPowerfulBiteTimer;
+        uint32 m_uiVenomBoltTimer;
+
+        void Reset() override
+        {
+            m_uiSummonTimer = m_bIsRegularMode ? 5000 : 3000;
+            m_uiPoisonNovaTimer = 22000;
+            m_uiPowerfulBiteTimer = 10000;
+            m_uiVenomBoltTimer = 15000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SLADRAN, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SLADRAN, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SLADRAN, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() != NPC_SLADRAN_CONSTRICTOR && pSummoned->GetEntry() != NPC_SLADRAN_VIPER)
+                return;
+
+            pSummoned->SetWalk(false);
+            pSummoned->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), false);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiPoisonNovaTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_POISON_NOVA : SPELL_POISON_NOVA_H) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_NOVA, m_creature);
+                    m_uiPoisonNovaTimer = 22000;
+                }
+            }
+            else
+                m_uiPoisonNovaTimer -= uiDiff;
+
+            if (m_uiSummonTimer < uiDiff)
+            {
+                if (!m_pInstance)
+                    return;
+
+                if (Creature* pSummonTarget = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(TYPE_SLADRAN))))
+                {
+                    if (urand(0, 3))
+                    {
+                        // we don't want to get spammed
+                        if (!urand(0, 4))
+                            DoScriptText(SAY_SUMMON_CONSTRICTOR, m_creature);
+
+                        pSummonTarget->CastSpell(pSummonTarget, SPELL_SUMMON_CONSTRICTOR, false, NULL, NULL, m_creature->GetObjectGuid());
+                    }
+                    else
+                    {
+                        // we don't want to get spammed
+                        if (!urand(0, 4))
+                            DoScriptText(SAY_SUMMON_SNAKE, m_creature);
+
+                        pSummonTarget->CastSpell(pSummonTarget, SPELL_SUMMON_VIPER, false, NULL, NULL, m_creature->GetObjectGuid());
+                    }
+                }
+
+                m_uiSummonTimer = m_bIsRegularMode ? 5000 : 3000;
+            }
+            else
+                m_uiSummonTimer -= uiDiff;
+
+            if (m_uiPowerfulBiteTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_POWERFUL_BITE : SPELL_POWERFUL_BITE_H) == CAST_OK)
+                    m_uiPowerfulBiteTimer = 10000;
+            }
+            else
+                m_uiPowerfulBiteTimer -= uiDiff;
+
+            if (m_uiVenomBoltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_VENOM_BOLT : SPELL_VENOM_BOLT_H) == CAST_OK)
+                        m_uiVenomBoltTimer = 15000;
+                }
+            }
+            else
+                m_uiVenomBoltTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_sladranAI(pCreature);
+    }
+};
+
+void AddSC_boss_sladran()
+{
+    Script* s;
+
+    s = new boss_sladran();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_sladran";
+    //pNewScript->GetAI = &GetAI_boss_sladran;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/gundrak/gundrak.h b/src/modules/SD3/scripts/northrend/gundrak/gundrak.h
new file mode 100644
index 000000000..4ad75fd58
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/gundrak/gundrak.h
@@ -0,0 +1,71 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_GUNDRAK_H
+#define DEF_GUNDRAK_H
+/* Encounters
+ * Slad'ran          = 0
+ * Moorabi           = 1
+ * Drakkari Colossus = 2
+ * Gal'darah         = 3
+ * Eck the Ferocious = 4
+*/
+enum
+{
+    MAX_ENCOUNTER          = 5,
+    MIN_LOVE_SHARE_PLAYERS = 5,
+
+    TYPE_SLADRAN           = 0,
+    TYPE_MOORABI           = 1,
+    TYPE_COLOSSUS          = 2,
+    TYPE_GALDARAH          = 3,
+    TYPE_ECK               = 4,
+
+    // Used to handle achievements
+    TYPE_ACHIEV_WHY_SNAKES = 5,
+    TYPE_ACHIEV_SHARE_LOVE = 6,
+    TYPE_ACHIEV_LESS_RABI  = 7,
+
+    NPC_SLADRAN            = 29304,
+    NPC_MOORABI            = 29305,
+    NPC_COLOSSUS           = 29307,
+    NPC_ELEMENTAL          = 29573,
+    NPC_LIVIN_MOJO         = 29830,
+    NPC_GALDARAH           = 29306,
+    NPC_ECK                = 29932,
+    NPC_INVISIBLE_STALKER  = 30298,                         // Caster and Target for visual spells on altar use
+    NPC_SLADRAN_SUMMON_T   = 29682,
+
+    GO_ECK_DOOR            = 192632,
+    GO_ECK_UNDERWATER_DOOR = 192569,
+    GO_GALDARAH_DOOR       = 192568,
+    GO_EXIT_DOOR_L         = 193208,
+    GO_EXIT_DOOR_R         = 193209,
+
+    GO_ALTAR_OF_SLADRAN    = 192518,
+    GO_ALTAR_OF_MOORABI    = 192519,
+    GO_ALTAR_OF_COLOSSUS   = 192520,
+
+    GO_SNAKE_KEY           = 192564,
+    GO_TROLL_KEY           = 192567,
+    GO_MAMMOTH_KEY         = 192565,
+    GO_RHINO_KEY           = 192566,
+
+    GO_BRIDGE              = 193188,
+    GO_COLLISION           = 192633,
+
+    SPELL_BEAM_MAMMOTH     = 57068,
+    SPELL_BEAM_SNAKE       = 57071,
+    SPELL_BEAM_ELEMENTAL   = 57072,
+
+    TIMER_VISUAL_ALTAR     = 3000,
+    TIMER_VISUAL_BEAM      = 2500,
+    TIMER_VISUAL_KEY       = 2000,
+
+    ACHIEV_CRIT_LESS_RABI  = 7319,              // Moorabi achiev 2040
+    ACHIEV_CRIT_WHY_SNAKES = 7363,              // Sladran achiev 2058
+    ACHIEV_CRIT_SHARE_LOVE = 7583,              // Galdarah achiev 2152
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/northrend/gundrak/instance_gundrak.cpp b/src/modules/SD3/scripts/northrend/gundrak/instance_gundrak.cpp
new file mode 100644
index 000000000..0df51d0b4
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/gundrak/instance_gundrak.cpp
@@ -0,0 +1,546 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: instance_gundrak
+SD%Complete: 80
+SDComment: Reload case for bridge support is missing, achievement support is missing
+SDCategory: Gundrak
+EndScriptData */
+
+#include "precompiled.h"
+#include "gundrak.h"
+
+typedef std::map<uint8, uint32>  TypeTimerMap;
+typedef std::pair<uint8, uint32> TypeTimerPair;
+
+static bool sortFromEastToWest(Creature* pFirst, Creature* pSecond)
+{
+    return pFirst && pSecond && pFirst->GetPositionY() < pSecond->GetPositionY();
+}
+
+struct is_gundrak : public InstanceScript
+{
+    is_gundrak() : InstanceScript("instance_gundrak") {}
+
+    class instance_gundrak : public ScriptedInstance
+    {
+    public:
+        instance_gundrak(Map* pMap) : ScriptedInstance(pMap),
+            m_bLessRabi(false)
+        {
+            Initialize();
+        }
+
+        ~instance_gundrak() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+
+            m_vStalkerCasterGuids.reserve(3);
+            m_vStalkerTargetGuids.reserve(3);
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_SLADRAN:
+            case NPC_ELEMENTAL:
+            case NPC_COLOSSUS:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+
+            case NPC_INVISIBLE_STALKER:
+                m_luiStalkerGUIDs.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_SLADRAN_SUMMON_T:
+                m_lSummonTargetsGuids.push_back(pCreature->GetObjectGuid());
+                break;
+
+            case NPC_LIVIN_MOJO:
+                // Store only the Mojos used to activate the Colossus
+                if (pCreature->GetPositionX() > 1650.0f)
+                    m_sColossusMojosGuids.insert(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        /* TODO: Reload case need some love!
+        *  Problem is to get the bridge/ collision work correct in relaod case.
+        *  To provide correct functionality(expecting testers to activate all altars in reload case), the Keys aren't loaded, too
+        *  TODO: When fixed, also remove the SPECIAL->DONE data translation in Load().
+        *
+        *  For the Keys should be used something like this, and for bridge and collision similar
+        *
+        *   if (m_auiEncounter[0] == SPECIAL && m_auiEncounter[1] == SPECIAL && m_auiEncounter[2] == SPECIAL)
+        *       pGo->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
+        *   else
+        *       pGo->SetGoState(GO_STATE_READY);
+        */
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_ECK_DOOR:
+                if (m_auiEncounter[TYPE_MOORABI] == DONE && !instance->IsRegularDifficulty())
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_ECK_UNDERWATER_DOOR:
+                if (m_auiEncounter[TYPE_ECK] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_GALDARAH_DOOR:
+                pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_EXIT_DOOR_L:
+                if (m_auiEncounter[TYPE_GALDARAH] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_EXIT_DOOR_R:
+                if (m_auiEncounter[TYPE_GALDARAH] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_ALTAR_OF_SLADRAN:
+                if (m_auiEncounter[TYPE_SLADRAN] == DONE)
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                break;
+            case GO_ALTAR_OF_MOORABI:
+                if (m_auiEncounter[TYPE_MOORABI] == DONE)
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                break;
+            case GO_ALTAR_OF_COLOSSUS:
+                if (m_auiEncounter[TYPE_COLOSSUS] == DONE)
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                break;
+            case GO_SNAKE_KEY:
+            case GO_TROLL_KEY:
+            case GO_MAMMOTH_KEY:
+            case GO_RHINO_KEY:
+            case GO_BRIDGE:
+            case GO_COLLISION:
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_LIVIN_MOJO)
+            {
+                // If not found in the set, or the event is already started, return
+                if (m_sColossusMojosGuids.find(pCreature->GetObjectGuid()) == m_sColossusMojosGuids.end())
+                    return;
+
+                // Move all 4 Mojos to evade and move to the Colossus position
+                for (GuidSet::const_iterator itr = m_sColossusMojosGuids.begin(); itr != m_sColossusMojosGuids.end(); ++itr)
+                {
+                    if (Creature* pMojo = instance->GetCreature(*itr))
+                        pMojo->AI()->EnterEvadeMode();
+                }
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            debug_log("SD3: Instance Gundrak: SetData received for type %u with data %u", uiType, uiData);
+
+            switch (uiType)
+            {
+            case TYPE_SLADRAN:
+                m_auiEncounter[TYPE_SLADRAN] = uiData;
+                if (uiData == DONE)
+                if (GameObject* pGo = GetSingleGameObjectFromStorage(GO_ALTAR_OF_SLADRAN))
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                if (uiData == FAIL)
+                    m_uisWhySnakesAchievPlayers.clear();
+                if (uiData == SPECIAL)
+                    m_mAltarInProgress.insert(TypeTimerPair(TYPE_SLADRAN, TIMER_VISUAL_ALTAR));
+                break;
+            case TYPE_MOORABI:
+                m_auiEncounter[TYPE_MOORABI] = uiData;
+                if (uiData == DONE)
+                {
+                    if (!instance->IsRegularDifficulty())
+                        DoUseDoorOrButton(GO_ECK_DOOR);
+                    if (GameObject* pGo = GetSingleGameObjectFromStorage(GO_ALTAR_OF_MOORABI))
+                        pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                }
+                if (uiData == IN_PROGRESS)
+                    SetLessRabiAchievementCriteria(true);
+                if (uiData == SPECIAL)
+                    m_mAltarInProgress.insert(TypeTimerPair(TYPE_MOORABI, TIMER_VISUAL_ALTAR));
+                break;
+            case TYPE_COLOSSUS:
+                m_auiEncounter[TYPE_COLOSSUS] = uiData;
+                if (uiData == DONE)
+                if (GameObject* pGo = GetSingleGameObjectFromStorage(GO_ALTAR_OF_COLOSSUS))
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                if (uiData == FAIL)
+                {
+                    for (GuidSet::const_iterator itr = m_sColossusMojosGuids.begin(); itr != m_sColossusMojosGuids.end(); ++itr)
+                    {
+                        if (Creature* pMojo = instance->GetCreature(*itr))
+                            pMojo->Respawn();
+                    }
+                }
+                if (uiData == SPECIAL)
+                    m_mAltarInProgress.insert(TypeTimerPair(TYPE_COLOSSUS, TIMER_VISUAL_ALTAR));
+                break;
+            case TYPE_GALDARAH:
+                m_auiEncounter[TYPE_GALDARAH] = uiData;
+                DoUseDoorOrButton(GO_GALDARAH_DOOR);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_EXIT_DOOR_L);
+                    DoUseDoorOrButton(GO_EXIT_DOOR_R);
+                }
+                if (uiData == FAIL)
+                    m_uisShareLoveAchievPlayers.clear();
+                break;
+            case TYPE_ECK:
+                m_auiEncounter[TYPE_ECK] = uiData;
+                if (uiData == DONE)
+                    DoUseDoorOrButton(GO_ECK_UNDERWATER_DOOR);
+                break;
+            case TYPE_ACHIEV_WHY_SNAKES:
+                // insert the players who failed the achiev and haven't been already inserted in the set
+                if (m_uisWhySnakesAchievPlayers.find(uiData) == m_uisWhySnakesAchievPlayers.end())
+                    m_uisWhySnakesAchievPlayers.insert(uiData);
+                return;
+            case TYPE_ACHIEV_SHARE_LOVE:
+                // insert players who got stampeled and haven't been already inserted in the set
+                if (m_uisShareLoveAchievPlayers.find(uiData) == m_uisShareLoveAchievPlayers.end())
+                    m_uisShareLoveAchievPlayers.insert(uiData);
+                return;
+            case TYPE_ACHIEV_LESS_RABI:
+                SetLessRabiAchievementCriteria(bool(uiData));
+                return;
+            default:
+                script_error_log("Instance Gundrak: ERROR SetData = %u for type %u does not exist/not implemented.", uiType, uiData);
+                return;
+            }
+
+            if (uiData == DONE || uiData == SPECIAL)                // Save activated altars, too
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[TYPE_SLADRAN] << " " << m_auiEncounter[TYPE_MOORABI] << " " << m_auiEncounter[TYPE_COLOSSUS] << " " << m_auiEncounter[TYPE_GALDARAH] << " "
+                    << m_auiEncounter[TYPE_ECK];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            return 0;
+        }
+
+        uint64 GetData64(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case TYPE_SLADRAN:
+                if (!m_lSummonTargetsGuids.empty())
+                {
+                    GuidList::const_iterator iter = m_lSummonTargetsGuids.begin();
+                    advance(iter, urand(0, m_lSummonTargetsGuids.size() - 1));
+                    return *iter;
+                }
+                break;
+            default:
+                break;
+            }
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[TYPE_SLADRAN] >> m_auiEncounter[TYPE_MOORABI] >> m_auiEncounter[TYPE_COLOSSUS] >> m_auiEncounter[TYPE_GALDARAH] >> m_auiEncounter[TYPE_ECK];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+
+                // TODO: REMOVE when bridge/ collision reloading correctly working
+                if (m_auiEncounter[i] == SPECIAL)
+                    m_auiEncounter[i] = DONE;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+            case ACHIEV_CRIT_LESS_RABI:
+                return m_bLessRabi;
+            case ACHIEV_CRIT_SHARE_LOVE:
+                // Return true if all the players in the group got stampeled
+                return m_uisShareLoveAchievPlayers.size() == MIN_LOVE_SHARE_PLAYERS;
+                // ToDo: enable this criteria when the script will be implemented
+                // case ACHIEV_CRIT_WHY_SNAKES:
+                //    // Return true if not found in the set
+                //    return m_uisWhySnakesAchievPlayers.find(pSource->GetGUIDLow()) == m_uisWhySnakesAchievPlayers.end();
+
+            default:
+                return false;
+            }
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            // Possible multible altars used at the same time, process their timers
+            if (!m_mAltarInProgress.empty())
+            {
+                for (TypeTimerMap::iterator itr = m_mAltarInProgress.begin(); itr != m_mAltarInProgress.end();)
+                {
+                    if (itr->second < uiDiff)
+                    {
+                        // Do Visual Effect
+                        DoAltarVisualEffect(itr->first);
+                        // Set Timer for Beam-Duration
+                        m_mBeamInProgress.insert(TypeTimerPair(itr->first, TIMER_VISUAL_BEAM));
+                        // Remove this timer, as processed
+                        m_mAltarInProgress.erase(itr++);
+                    }
+                    else
+                    {
+                        itr->second -= uiDiff;
+                        ++itr;
+                    }
+                }
+            }
+
+            // Possible multible beams used at the same time, process their timers
+            if (!m_mBeamInProgress.empty())
+            {
+                for (TypeTimerMap::iterator itr = m_mBeamInProgress.begin(); itr != m_mBeamInProgress.end();)
+                {
+                    if (itr->second < uiDiff)
+                    {
+                        // Use Key
+                        switch (itr->first)
+                        {
+                        case TYPE_SLADRAN: DoUseDoorOrButton(GO_SNAKE_KEY); break;
+                        case TYPE_MOORABI: DoUseDoorOrButton(GO_MAMMOTH_KEY); break;
+                        case TYPE_COLOSSUS: DoUseDoorOrButton(GO_TROLL_KEY); break;
+                        }
+                        // Set Timer for Beam-Duration
+                        m_mKeyInProgress.insert(TypeTimerPair(itr->first, TIMER_VISUAL_KEY));
+                        m_mBeamInProgress.erase(itr++);
+                    }
+                    else
+                    {
+                        itr->second -= uiDiff;
+                        ++itr;
+                    }
+                }
+            }
+
+            // Activate Bridge if all Three Encounters are used
+            if (!m_mKeyInProgress.empty())
+            {
+                for (TypeTimerMap::iterator itr = m_mKeyInProgress.begin(); itr != m_mKeyInProgress.end();)
+                {
+                    if (itr->second < uiDiff)
+                    {
+                        // Activate Bridge (and all other Keys) if we are on the last Key, and all other keys are already set
+                        if (m_auiEncounter[0] == SPECIAL && m_auiEncounter[1] == SPECIAL && m_auiEncounter[2] == SPECIAL
+                            && m_mAltarInProgress.empty() && m_mBeamInProgress.empty() && m_mKeyInProgress.size() == 1)
+                        {
+                            DoUseDoorOrButton(GO_COLLISION);
+                            DoUseDoorOrButton(GO_RHINO_KEY, 0, true);
+
+                            // The already closed keys cannot be done with DoUseDoorOrButton
+                            if (GameObject* pTrollKey = GetSingleGameObjectFromStorage(GO_TROLL_KEY))
+                                pTrollKey->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
+                            if (GameObject* pMammothKey = GetSingleGameObjectFromStorage(GO_MAMMOTH_KEY))
+                                pMammothKey->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
+                            if (GameObject* pSnakeKey = GetSingleGameObjectFromStorage(GO_SNAKE_KEY))
+                                pSnakeKey->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
+
+                            // GO_BRIDGE is type 35 (TRAP_DOOR) and needs to be handled directly
+                            // Real Use of this GO is unknown, but this change of state is expected
+                            DoUseDoorOrButton(GO_BRIDGE);
+                        }
+                        // Remove this timer, as processed
+                        m_mKeyInProgress.erase(itr++);
+                    }
+                    else
+                    {
+                        itr->second -= uiDiff;
+                        ++itr;
+                    }
+                }
+            }
+        }
+
+    private:
+        void SetLessRabiAchievementCriteria(bool bIsMet) { m_bLessRabi = bIsMet; }
+        void DoAltarVisualEffect(uint8 uiType)
+        {
+            // Sort the lists if not yet done
+            if (!m_luiStalkerGUIDs.empty())
+            {
+                float fHeight = 10.0f;                              // A bit higher than the altar is needed
+                if (GameObject* pCollusAltar = GetSingleGameObjectFromStorage(GO_ALTAR_OF_COLOSSUS))
+                    fHeight += pCollusAltar->GetPositionZ();
+
+                std::list<Creature*> lStalkerTargets, lStalkerCasters;
+                for (GuidList::const_iterator itr = m_luiStalkerGUIDs.begin(); itr != m_luiStalkerGUIDs.end(); ++itr)
+                {
+                    if (Creature* pStalker = instance->GetCreature(*itr))
+                    {
+                        if (pStalker->GetPositionZ() > fHeight)
+                            lStalkerTargets.push_back(pStalker);
+                        else
+                            lStalkerCasters.push_back(pStalker);
+                    }
+                }
+                m_luiStalkerGUIDs.clear();
+
+                lStalkerTargets.sort(sortFromEastToWest);
+                lStalkerCasters.sort(sortFromEastToWest);
+
+                for (std::list<Creature*>::const_iterator itr = lStalkerTargets.begin(); itr != lStalkerTargets.end(); ++itr)
+                    m_vStalkerTargetGuids.push_back((*itr)->GetObjectGuid());
+                for (std::list<Creature*>::const_iterator itr = lStalkerCasters.begin(); itr != lStalkerCasters.end(); ++itr)
+                    m_vStalkerCasterGuids.push_back((*itr)->GetObjectGuid());
+            }
+
+            // Verify that the DB has enough trigger spawned
+            if (m_vStalkerTargetGuids.size() < 3 || m_vStalkerCasterGuids.size() < 3)
+                return;
+
+            // Get the Index from the bosses
+            uint8 uiIndex = 0;
+            switch (uiType)
+            {
+            case TYPE_SLADRAN:  uiIndex = 0; break;
+            case TYPE_COLOSSUS: uiIndex = 1; break;
+            case TYPE_MOORABI:  uiIndex = 2; break;
+            default:
+                return;
+            }
+
+            Creature* pTarget = instance->GetCreature(m_vStalkerTargetGuids[uiIndex]);
+            Creature* pCaster = instance->GetCreature(m_vStalkerCasterGuids[uiIndex]);
+
+            if (!pTarget || !pCaster)
+                return;
+
+            uint32 auiFireBeamSpells[3] = { SPELL_BEAM_SNAKE, SPELL_BEAM_ELEMENTAL, SPELL_BEAM_MAMMOTH };
+
+            // Cast from Caster to Target
+            pCaster->CastSpell(pTarget, auiFireBeamSpells[uiIndex], false);
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        TypeTimerMap m_mAltarInProgress;
+        TypeTimerMap m_mBeamInProgress;
+        TypeTimerMap m_mKeyInProgress;
+
+        GuidList m_luiStalkerGUIDs;
+        GuidList m_lSummonTargetsGuids;
+        GuidVector m_vStalkerCasterGuids;
+        GuidVector m_vStalkerTargetGuids;
+        GuidSet m_sColossusMojosGuids;
+
+        bool m_bLessRabi;
+
+        std::set<uint32> m_uisShareLoveAchievPlayers;
+        std::set<uint32> m_uisWhySnakesAchievPlayers;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_gundrak(pMap);
+    }
+};
+
+struct go_gundrak_altar : public GameObjectScript
+{
+    go_gundrak_altar() : GameObjectScript("go_gundrak_altar") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+
+        if (!pInstance)
+            return false;
+
+        switch (pGo->GetEntry())
+        {
+        case GO_ALTAR_OF_SLADRAN:  pInstance->SetData(TYPE_SLADRAN, SPECIAL);  break;
+        case GO_ALTAR_OF_MOORABI:  pInstance->SetData(TYPE_MOORABI, SPECIAL);  break;
+        case GO_ALTAR_OF_COLOSSUS: pInstance->SetData(TYPE_COLOSSUS, SPECIAL); break;
+        }
+
+        pGo->UseDoorOrButton(0, true);
+        return true;
+    }
+};
+
+void AddSC_instance_gundrak()
+{
+    Script* s;
+
+    s = new is_gundrak();
+    s->RegisterSelf();
+
+    s = new go_gundrak_altar();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_gundrak_altar";
+    //pNewScript->pGOUse = &GOUse_go_gundrak_altar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_gundrak";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_gundrak;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/howling_fjord.cpp b/src/modules/SD3/scripts/northrend/howling_fjord.cpp
new file mode 100644
index 000000000..543836aba
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/howling_fjord.cpp
@@ -0,0 +1,1137 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Howling_Fjord
+SD%Complete: ?
+SDComment: Quest support: 11154, 11241, 11300, 11343, 11344, 11464, 11476
+SDCategory: Howling Fjord
+EndScriptData */
+
+/* ContentData
+npc_ancient_male_vrykul
+at_ancient_male_vrykul
+npc_daegarn
+npc_silvermoon_harry
+npc_lich_king_village
+npc_king_ymiron
+npc_firecrackers_bunny
+npc_apothecary_hanes
+npc_scalawag_frog
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+enum
+{
+    SPELL_ECHO_OF_YMIRON                    = 42786,
+    SPELL_SECRET_OF_WYRMSKULL               = 43458,
+    QUEST_ECHO_OF_YMIRON                    = 11343,
+    NPC_MALE_VRYKUL                         = 24314,
+    NPC_FEMALE_VRYKUL                       = 24315,
+
+    SAY_VRYKUL_CURSED                       = -1000635,
+    EMOTE_VRYKUL_POINT                      = -1000636,
+    EMOTE_VRYKUL_SOB                        = -1000637,
+    SAY_VRYKUL_DISPOSE                      = -1000638,
+    SAY_VRYKUL_BEG                          = -1000639,
+    SAY_VRYKUL_WHAT                         = -1000640,
+    SAY_VRYKUL_HIDE                         = -1000641,
+};
+
+struct npc_ancient_male_vrykul : public CreatureScript
+{
+    npc_ancient_male_vrykul() : CreatureScript("npc_ancient_male_vrykul") {}
+
+    struct  npc_ancient_male_vrykulAI : public ScriptedAI
+    {
+        npc_ancient_male_vrykulAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        bool m_bEventInProgress;
+        uint32 m_uiPhase;
+        uint32 m_uiPhaseTimer;
+
+        void Reset() override
+        {
+            m_bEventInProgress = false;
+            m_uiPhase = 0;
+            m_uiPhaseTimer = 0;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 /**/) override
+        {
+            if (eventType != AI_EVENT_CUSTOM_A)
+                return;
+
+            if (m_bEventInProgress)
+                return;
+
+            m_bEventInProgress = true;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_bEventInProgress)
+                return;
+
+            if (m_uiPhaseTimer < uiDiff)
+                m_uiPhaseTimer = 5000;
+            else
+            {
+                m_uiPhaseTimer -= uiDiff;
+                return;
+            }
+
+            Creature* pFemale = GetClosestCreatureWithEntry(m_creature, NPC_FEMALE_VRYKUL, 10.0f);
+
+            switch (m_uiPhase)
+            {
+            case 0:
+                DoScriptText(SAY_VRYKUL_CURSED, m_creature);
+                DoScriptText(EMOTE_VRYKUL_POINT, m_creature);
+                break;
+            case 1:
+                if (pFemale)
+                    DoScriptText(EMOTE_VRYKUL_SOB, pFemale);
+                DoScriptText(SAY_VRYKUL_DISPOSE, m_creature);
+                break;
+            case 2:
+                if (pFemale)
+                    DoScriptText(SAY_VRYKUL_BEG, pFemale);
+                break;
+            case 3:
+                DoScriptText(SAY_VRYKUL_WHAT, m_creature);
+                break;
+            case 4:
+                if (pFemale)
+                    DoScriptText(SAY_VRYKUL_HIDE, pFemale);
+                break;
+            case 5:
+                DoCastSpellIfCan(m_creature, SPELL_SECRET_OF_WYRMSKULL);
+                break;
+            case 6:
+                Reset();
+                return;
+            }
+
+            ++m_uiPhase;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ancient_male_vrykulAI(pCreature);
+    }
+};
+
+struct at_ancient_male_vrykul : public AreaTriggerScript
+{
+    at_ancient_male_vrykul() : AreaTriggerScript("at_ancient_male_vrykul") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*pAt*/) override
+    {
+        if (pPlayer->IsAlive() && pPlayer->GetQuestStatus(QUEST_ECHO_OF_YMIRON) == QUEST_STATUS_INCOMPLETE &&
+            pPlayer->HasAura(SPELL_ECHO_OF_YMIRON))
+        {
+            if (Creature* pCreature = GetClosestCreatureWithEntry(pPlayer, NPC_MALE_VRYKUL, 20.0f))
+            {
+                if (CreatureAI* pVrykulAI = pCreature->AI())
+                    pVrykulAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pCreature, pPlayer, 0);
+            }
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_daegarn
+######*/
+
+enum
+{
+    QUEST_DEFEAT_AT_RING            = 11300,
+
+    NPC_FIRJUS                      = 24213,
+    NPC_JLARBORN                    = 24215,
+    NPC_YOROS                       = 24214,
+    NPC_OLUF                        = 23931,
+
+    NPC_PRISONER_1                  = 24253,                // looks the same but has different abilities
+    NPC_PRISONER_2                  = 24254,
+    NPC_PRISONER_3                  = 24255,
+};
+
+static float afSummon[] = {838.81f, -4678.06f, -94.182f};
+static float afCenter[] = {801.88f, -4721.87f, -96.143f};
+
+// TODO: make prisoners help (unclear if summoned or using npc's from surrounding cages (summon inside small cages?))
+struct npc_daegarn : public CreatureScript
+{
+    npc_daegarn() : CreatureScript("npc_daegarn") {}
+
+    struct  npc_daegarnAI : public ScriptedAI
+    {
+        npc_daegarnAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        bool m_bEventInProgress;
+        ObjectGuid m_playerGuid;
+
+        void Reset() override
+        {
+            m_bEventInProgress = false;
+            m_playerGuid.Clear();
+        }
+
+        void StartEvent(Player* pPlayer)
+        {
+            if (m_bEventInProgress)
+                return;
+
+            m_playerGuid = pPlayer->GetObjectGuid();
+
+            SummonGladiator(NPC_FIRJUS);
+        }
+
+        void JustSummoned(Creature* pSummon) override
+        {
+            if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+            {
+                if (pPlayer->IsAlive())
+                {
+                    pSummon->SetWalk(false);
+                    pSummon->GetMotionMaster()->MovePoint(0, afCenter[0], afCenter[1], afCenter[2]);
+                    return;
+                }
+            }
+
+            Reset();
+        }
+
+        void SummonGladiator(uint32 uiEntry)
+        {
+            m_creature->SummonCreature(uiEntry, afSummon[0], afSummon[1], afSummon[2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 20 * IN_MILLISECONDS);
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 /*uiMotionType*/, uint32 /*uiPointId*/) override
+        {
+            Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+
+            // could be group, so need additional here.
+            if (!pPlayer || !pPlayer->IsAlive())
+            {
+                Reset();
+                return;
+            }
+
+            if (pSummoned->IsWithinDistInMap(pPlayer, 75.0f))   // ~the radius of the ring
+                pSummoned->AI()->AttackStart(pPlayer);
+        }
+
+        void SummonedCreatureDespawn(Creature* pSummoned) override
+        {
+            uint32 uiEntry = 0;
+
+            // will eventually reset the event if something goes wrong
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_FIRJUS:    uiEntry = NPC_JLARBORN; break;
+            case NPC_JLARBORN:  uiEntry = NPC_YOROS;    break;
+            case NPC_YOROS:     uiEntry = NPC_OLUF;     break;
+            case NPC_OLUF:      Reset();                return;
+            }
+
+            SummonGladiator(uiEntry);
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_DEFEAT_AT_RING)
+        {
+            if (npc_daegarnAI* pDaegarnAI = dynamic_cast<npc_daegarnAI*>(pCreature->AI()))
+                pDaegarnAI->StartEvent(pPlayer);
+        }
+
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_daegarnAI(pCreature);
+    }
+};
+
+/*######
+## npc_silvermoon_harry
+######*/
+
+enum
+{
+    QUEST_GAMBLING_DEBT         = 11464,
+
+    SAY_AGGRO                   = -1000603,
+    SAY_BEATEN                  = -1000604,
+
+    GOSSIP_ITEM_GAMBLING_DEBT   = -3000101,
+    GOSSIP_ITEM_PAYING          = -3000102,
+
+    SPELL_BLAST_WAVE            = 15091,
+    SPELL_SCORCH                = 50183,
+
+    ITEM_HARRY_DEBT             = 34115,
+    FACTION_HOSTILE_SH          = 90,                       // guessed, possibly not correct
+};
+
+struct npc_silvermoon_harry : public CreatureScript
+{
+    npc_silvermoon_harry() : CreatureScript("npc_silvermoon_harry") {}
+
+    struct  npc_silvermoon_harryAI : public ScriptedAI
+    {
+        npc_silvermoon_harryAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        bool m_bHarryBeaten;
+        uint32 m_uiBlastWaveTimer;
+        uint32 m_uiScorchTimer;
+        uint32 m_uiResetBeatenTimer;
+
+        void Reset() override
+        {
+            m_bHarryBeaten = false;
+
+            // timers guessed
+            m_uiScorchTimer = 5 * IN_MILLISECONDS;
+            m_uiBlastWaveTimer = 7 * IN_MILLISECONDS;
+
+            m_uiResetBeatenTimer = MINUTE * IN_MILLISECONDS;
+        }
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            if (m_creature->getVictim())
+                return;
+
+            if (m_creature->IsHostileTo(pAttacker))
+                AttackStart(pAttacker);
+        }
+
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+        {
+            if (uiDamage > m_creature->GetHealth() || (m_creature->GetHealth() - uiDamage) * 100 / m_creature->GetMaxHealth() < 20)
+            {
+                if (Player* pPlayer = pDoneBy->GetCharmerOrOwnerPlayerOrPlayerItself())
+                {
+                    if (!m_bHarryBeaten && pPlayer->GetQuestStatus(QUEST_GAMBLING_DEBT) == QUEST_STATUS_INCOMPLETE)
+                    {
+                        uiDamage = 0;                           // Take 0 damage
+
+                        m_creature->RemoveAllAurasOnDeath();
+                        m_creature->DeleteThreatList();
+                        m_creature->CombatStop(true);
+
+                        DoScriptText(SAY_BEATEN, m_creature);
+                        m_bHarryBeaten = true;
+                    }
+                }
+            }
+        }
+
+        bool IsBeaten()
+        {
+            return m_bHarryBeaten;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_bHarryBeaten)
+            {
+                if (m_uiResetBeatenTimer < uiDiff)
+                    EnterEvadeMode();
+                else
+                    m_uiResetBeatenTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiScorchTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_SCORCH);
+                m_uiScorchTimer = 10 * IN_MILLISECONDS;
+            }
+            else
+                m_uiScorchTimer -= uiDiff;
+
+            if (m_uiBlastWaveTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_BLAST_WAVE);
+                m_uiBlastWaveTimer = 50 * IN_MILLISECONDS;
+            }
+            else
+                m_uiBlastWaveTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_silvermoon_harryAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+
+        if (pCreature->IsVendor())
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+
+        if (pPlayer->GetQuestStatus(QUEST_GAMBLING_DEBT) == QUEST_STATUS_INCOMPLETE)
+        {
+            if (npc_silvermoon_harryAI* pHarryAI = dynamic_cast<npc_silvermoon_harryAI*>(pCreature->AI()))
+            {
+                if (!pHarryAI->IsBeaten())
+                    pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GAMBLING_DEBT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                else
+                    pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_PAYING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            }
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_TRADE:
+            pPlayer->SEND_VENDORLIST(pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+            DoScriptText(SAY_AGGRO, pCreature, pPlayer);
+            pCreature->SetFactionTemporary(FACTION_HOSTILE_SH, TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_RESTORE_COMBAT_STOP);
+            pCreature->AI()->AttackStart(pPlayer);
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            if (!pPlayer->HasItemCount(ITEM_HARRY_DEBT, 1))
+            {
+                if (Item* pItem = pPlayer->StoreNewItemInInventorySlot(ITEM_HARRY_DEBT, 1))
+                {
+                    pPlayer->SendNewItem(pItem, 1, true, false);
+                    pPlayer->CLOSE_GOSSIP_MENU();
+                    pCreature->AI()->EnterEvadeMode();
+                }
+            }
+            break;
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_lich_king_village
+######*/
+
+enum
+{
+    EMOTE_LICH_KING_FACE            = -1000920,
+    SAY_LICH_KING_1                 = -1000921,
+    SAY_PREPARE                     = -1000922,
+    SAY_LICH_KING_2                 = -1000923,
+    SAY_LICH_KING_3                 = -1000924,
+    SAY_LICH_KING_4                 = -1000925,
+    SAY_LICH_KING_5                 = -1000926,
+    SAY_PERSISTANCE                 = -1000927,
+
+    SPELL_GRASP_OF_THE_LICH_KING    = 43489,
+    SPELL_MAGNETIC_PULL             = 29661,
+    SPELL_WRATH_LICH_KING_FIRST     = 43488,
+    SPELL_WRATH_LICH_KING           = 50156,
+
+    NPC_VALKYR_SOULCLAIMER          = 24327,
+    NPC_LICH_KING_WYRMSKULL         = 24248,
+
+    QUEST_ID_LK_FLAG                = 12485,            // Server side dummy quest
+};
+
+static const DialogueEntry aLichDialogue[] =
+{
+    // first time dialogue only
+    {EMOTE_LICH_KING_FACE,          NPC_LICH_KING_WYRMSKULL, 4000},
+    {QUEST_ID_LK_FLAG,              0,                       3000},
+    {SAY_LICH_KING_1,               NPC_LICH_KING_WYRMSKULL, 20000},
+    {NPC_VALKYR_SOULCLAIMER,        0,                       4000},
+    {SAY_LICH_KING_2,               NPC_LICH_KING_WYRMSKULL, 10000},
+    {SAY_LICH_KING_3,               NPC_LICH_KING_WYRMSKULL, 25000},
+    {SAY_LICH_KING_4,               NPC_LICH_KING_WYRMSKULL, 25000},
+    {SAY_LICH_KING_5,               NPC_LICH_KING_WYRMSKULL, 20000},
+    {SPELL_WRATH_LICH_KING_FIRST,   0,                       10000},
+    {NPC_LICH_KING_WYRMSKULL,       0,                       0},
+    // if the player persists...
+    {SAY_PERSISTANCE,               NPC_LICH_KING_WYRMSKULL, 15000},
+    {SPELL_WRATH_LICH_KING,         0,                       10000},
+    {NPC_LICH_KING_WYRMSKULL,       0,                       0},
+    {0, 0, 0},
+};
+
+struct npc_lich_king_village : public CreatureScript
+{
+    npc_lich_king_village() : CreatureScript("npc_lich_king_village") {}
+
+    struct  npc_lich_king_villageAI : public ScriptedAI, private DialogueHelper
+    {
+        npc_lich_king_villageAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aLichDialogue)
+        {
+        }
+
+        ObjectGuid m_pHeldPlayer;
+        bool m_bEventInProgress;
+
+        void Reset() override
+        {
+            m_bEventInProgress = false;
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case QUEST_ID_LK_FLAG:
+                m_creature->HandleEmote(EMOTE_ONESHOT_LAUGH);
+                break;
+            case NPC_VALKYR_SOULCLAIMER:
+                if (Creature* pCreature = GetClosestCreatureWithEntry(m_creature, NPC_VALKYR_SOULCLAIMER, 20.0f))
+                    DoScriptText(SAY_PREPARE, pCreature);
+                break;
+            case SPELL_WRATH_LICH_KING_FIRST:
+                if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_pHeldPlayer))
+                {
+                    DoCastSpellIfCan(pPlayer, SPELL_WRATH_LICH_KING_FIRST);
+                    // handle spell scriptEffect in the script
+                    m_creature->DealDamage(pPlayer, pPlayer->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                }
+                break;
+            case SPELL_WRATH_LICH_KING:
+                if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_pHeldPlayer))
+                {
+                    DoCastSpellIfCan(pPlayer, SPELL_WRATH_LICH_KING);
+                    // handle spell scriptEffect in the script
+                    m_creature->DealDamage(pPlayer, pPlayer->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                }
+                break;
+            case NPC_LICH_KING_WYRMSKULL:
+                EnterEvadeMode();
+                break;
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bEventInProgress && pWho->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (pWho->IsAlive() && m_creature->IsWithinDistInMap(pWho, 15.0) && pWho->HasAura(SPELL_ECHO_OF_YMIRON))
+                {
+                    m_pHeldPlayer = pWho->GetObjectGuid();
+                    m_bEventInProgress = true;
+
+                    DoCastSpellIfCan(pWho, SPELL_MAGNETIC_PULL, CAST_TRIGGERED);
+                    DoCastSpellIfCan(pWho, SPELL_GRASP_OF_THE_LICH_KING, CAST_TRIGGERED);
+
+                    if (((Player*)pWho)->GetQuestStatus(QUEST_ID_LK_FLAG) == QUEST_STATUS_COMPLETE)
+                        StartNextDialogueText(SAY_PERSISTANCE);
+                    else
+                        StartNextDialogueText(EMOTE_LICH_KING_FACE);
+                }
+            }
+        }
+
+        Creature* GetSpeakerByEntry(uint32 uiEntry) override
+        {
+            if (uiEntry == NPC_LICH_KING_WYRMSKULL)
+                return m_creature;
+
+            return NULL;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override { DialogueUpdate(uiDiff); }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_lich_king_villageAI(pCreature);
+    }
+};
+
+/*######
+## npc_king_ymiron
+######*/
+
+enum
+{
+    EMOTE_KING_SILENCE                      = -1000928,
+    SAY_KING_YMIRON_SPEECH_1                = -1000929,
+    SAY_KING_YMIRON_SPEECH_2                = -1000930,
+    EMOTE_YMIRON_CROWD_1                    = -1000931,
+    SAY_KING_YMIRON_SPEECH_3                = -1000932,
+    SAY_KING_YMIRON_SPEECH_4                = -1000933,
+    SAY_KING_YMIRON_SPEECH_5                = -1000934,
+    SAY_KING_YMIRON_SPEECH_6                = -1000935,
+    SAY_KING_YMIRON_SPEECH_7                = -1000936,
+    EMOTE_YMIRON_CROWD_2                    = -1000937,
+    SAY_KING_YMIRON_SPEECH_8                = -1000938,
+    EMOTE_YMIRON_CROWD_3                    = -1000939,
+    SAY_KING_YMIRON_SPEECH_9                = -1000940,
+
+    SPELL_ECHO_OF_YMIRON_NIFFLEVAR          = 43466,
+    SPELL_SECRETS_OF_NIFFLEVAR              = 43468,
+
+    NPC_CITIZEN_OF_NIFFLEVAR_MALE           = 24322,
+    NPC_CITIZEN_OF_NIFFLEVAR_FEMALE         = 24323,
+    NPC_KING_YMIRON                         = 24321,
+
+    QUEST_ID_ANGUISH_OF_NIFFLEVAR           = 11344,
+
+    MAX_CROWD_TEXT_ENTRIES                  = 7
+};
+
+static const DialogueEntry aNifflevarDialogue[] =
+{
+    {EMOTE_KING_SILENCE,            NPC_KING_YMIRON,    3000},
+    {SAY_KING_YMIRON_SPEECH_1,      NPC_KING_YMIRON,    5000},
+    {SAY_KING_YMIRON_SPEECH_2,      NPC_KING_YMIRON,    2000},
+    {EMOTE_YMIRON_CROWD_1,          NPC_KING_YMIRON,    5000},
+    {SAY_KING_YMIRON_SPEECH_3,      NPC_KING_YMIRON,    10000},
+    {SAY_KING_YMIRON_SPEECH_4,      NPC_KING_YMIRON,    9000},
+    {SAY_KING_YMIRON_SPEECH_5,      NPC_KING_YMIRON,    7000},
+    {SAY_KING_YMIRON_SPEECH_6,      NPC_KING_YMIRON,    5000},
+    {SAY_KING_YMIRON_SPEECH_7,      NPC_KING_YMIRON,    9000},
+    {EMOTE_YMIRON_CROWD_2,          NPC_KING_YMIRON,    5000},
+    {SAY_KING_YMIRON_SPEECH_8,      NPC_KING_YMIRON,    8000},
+    {EMOTE_YMIRON_CROWD_3,          NPC_KING_YMIRON,    4000},
+    {SAY_KING_YMIRON_SPEECH_9,      NPC_KING_YMIRON,    10000},
+    {SPELL_SECRETS_OF_NIFFLEVAR,    0,                  10000},
+    {QUEST_ID_ANGUISH_OF_NIFFLEVAR, 0,                  0},
+    {0, 0, 0},
+};
+
+static const int32 aRandomTextEntries[MAX_CROWD_TEXT_ENTRIES] = { -1000941, -1000942, -1000943, -1000944, -1000945, -1000946, -1000947};
+
+struct  npc_king_ymiron : public CreatureScript
+{
+    npc_king_ymiron() : CreatureScript("npc_king_ymiron") {}
+
+    struct  npc_king_ymironAI : public ScriptedAI, private DialogueHelper
+    {
+        npc_king_ymironAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aNifflevarDialogue)
+        {
+        }
+
+        uint32 m_uiCrowdSpeechTimer;
+
+        bool m_bEventInProgress;
+        bool m_bEventInit;
+
+        GuidList m_lCrowdGuidList;
+
+        void Reset() override
+        {
+            m_uiCrowdSpeechTimer = 0;
+            m_bEventInit = false;
+            m_bEventInProgress = false;
+            m_lCrowdGuidList.clear();
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bEventInit && pWho->GetTypeId() == TYPEID_PLAYER)
+            {
+                // Get all the citizen around the king for future use
+                if (pWho->IsAlive() && m_creature->IsWithinDistInMap(pWho, 60.0) && ((Player*)pWho)->GetQuestStatus(QUEST_ID_ANGUISH_OF_NIFFLEVAR) == QUEST_STATUS_INCOMPLETE
+                    && pWho->HasAura(SPELL_ECHO_OF_YMIRON_NIFFLEVAR))
+                {
+                    std::list<Creature*> lCrowdList;
+                    GetCreatureListWithEntryInGrid(lCrowdList, m_creature, NPC_CITIZEN_OF_NIFFLEVAR_MALE, 60.0f);
+                    GetCreatureListWithEntryInGrid(lCrowdList, m_creature, NPC_CITIZEN_OF_NIFFLEVAR_FEMALE, 60.0f);
+
+                    for (std::list<Creature*>::const_iterator itr = lCrowdList.begin(); itr != lCrowdList.end(); ++itr)
+                        m_lCrowdGuidList.push_back((*itr)->GetObjectGuid());
+
+                    m_uiCrowdSpeechTimer = 1000;
+                    m_bEventInit = true;
+                }
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case SPELL_SECRETS_OF_NIFFLEVAR:
+                DoCastSpellIfCan(m_creature, SPELL_SECRETS_OF_NIFFLEVAR);
+                break;
+            case QUEST_ID_ANGUISH_OF_NIFFLEVAR:
+                EnterEvadeMode();
+                break;
+            }
+        }
+
+        Creature* GetSpeakerByEntry(uint32 uiEntry) override
+        {
+            if (uiEntry == NPC_KING_YMIRON)
+                return m_creature;
+
+            return NULL;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (m_bEventInProgress)
+                    return;
+
+                StartNextDialogueText(EMOTE_KING_SILENCE);
+                m_uiCrowdSpeechTimer = 0;
+                m_bEventInProgress = true;
+            }
+        }
+
+        ObjectGuid SelectRandomCrowdNpc()
+        {
+            if (m_lCrowdGuidList.empty())
+                return ObjectGuid();
+
+            GuidList::iterator iter = m_lCrowdGuidList.begin();
+            advance(iter, urand(0, m_lCrowdGuidList.size() - 1));
+
+            return *iter;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (m_uiCrowdSpeechTimer)
+            {
+                if (m_uiCrowdSpeechTimer <= uiDiff)
+                {
+                    // only 15% chance to yell (guessed)
+                    if (roll_chance_i(15))
+                    {
+                        if (Creature* pCitizen = m_creature->GetMap()->GetCreature(SelectRandomCrowdNpc()))
+                            DoScriptText(aRandomTextEntries[urand(0, MAX_CROWD_TEXT_ENTRIES - 1)], pCitizen);
+                    }
+
+                    m_uiCrowdSpeechTimer = 1000;
+                }
+                else
+                    m_uiCrowdSpeechTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_king_ymironAI(pCreature);
+    }
+};
+
+struct at_nifflevar : public AreaTriggerScript
+{
+    at_nifflevar() : AreaTriggerScript("at_nifflevar") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*pAt*/) override
+    {
+        if (pPlayer->IsAlive() && pPlayer->GetQuestStatus(QUEST_ID_ANGUISH_OF_NIFFLEVAR) == QUEST_STATUS_INCOMPLETE && pPlayer->HasAura(SPELL_ECHO_OF_YMIRON_NIFFLEVAR))
+        {
+            if (Creature* pCreature = GetClosestCreatureWithEntry(pPlayer, NPC_KING_YMIRON, 30.0f))
+                pCreature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pPlayer, pCreature);
+
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_firecrackers_bunny
+######*/
+
+enum
+{
+    SPELL_FIRECRACKER_VISUAL                = 43314,
+    SPELL_SUMMON_DARKCLAW_GUANO             = 43307,
+
+    NPC_DARKCLAW_BAT                        = 23959,
+};
+
+struct npc_firecrackers_bunny : public CreatureScript
+{
+    npc_firecrackers_bunny() : CreatureScript("npc_firecrackers_bunny") {}
+
+    struct  npc_firecrackers_bunnyAI : public ScriptedAI
+    {
+        npc_firecrackers_bunnyAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiStartTimer;
+        bool m_bHasValidBat;
+
+        ObjectGuid m_selectedBatGuid;
+
+        void Reset() override
+        {
+            m_uiStartTimer = 1000;
+            m_bHasValidBat = false;
+
+            DoCastSpellIfCan(m_creature, SPELL_FIRECRACKER_VISUAL);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_bHasValidBat && pWho->GetObjectGuid() == m_selectedBatGuid && m_creature->IsWithinDistInMap(pWho, 3.5f))
+            {
+                // spawn the Guano loot
+                pWho->GetMotionMaster()->MoveIdle();
+                pWho->CastSpell(m_creature, SPELL_SUMMON_DARKCLAW_GUANO, true);
+                m_bHasValidBat = false;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiStartTimer)
+            {
+                if (m_uiStartTimer <= uiDiff)
+                {
+                    // get all the bats list in range; note: this will compare the 2D distance
+                    std::list<Creature*> lBatsList;
+                    GetCreatureListWithEntryInGrid(lBatsList, m_creature, NPC_DARKCLAW_BAT, 10.0f);
+
+                    if (lBatsList.empty())
+                    {
+                        m_uiStartTimer = 5000;
+                        return;
+                    }
+
+                    // sort by distance and get only the closest
+                    lBatsList.sort(ObjectDistanceOrder(m_creature));
+
+                    std::list<Creature*>::const_iterator batItr = lBatsList.begin();
+                    Creature* pBat = NULL;
+
+                    do
+                    {
+                        // check for alive and out of combat only
+                        if ((*batItr)->IsAlive() && !(*batItr)->getVictim())
+                            pBat = *batItr;
+
+                        ++batItr;
+                    } while (!pBat && batItr != lBatsList.end());
+
+                    if (!pBat)
+                    {
+                        m_uiStartTimer = 5000;
+                        return;
+                    }
+
+                    // Move bat to the point
+                    float fX, fY, fZ;
+                    pBat->SetWalk(false);
+                    pBat->GetMotionMaster()->Clear();
+                    m_creature->GetContactPoint(pBat, fX, fY, fZ);
+                    pBat->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+
+                    m_selectedBatGuid = pBat->GetObjectGuid();
+                    m_uiStartTimer = 0;
+                    m_bHasValidBat = true;
+                }
+                else
+                    m_uiStartTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_firecrackers_bunnyAI(pCreature);
+    }
+};
+
+/*######
+## npc_apothecary_hanes
+######*/
+enum
+{
+    // yells
+    SAY_HANES_ESCORT_START = -1001064,
+    SAY_HANES_FIRE_1 = -1001065,
+    SAY_HANES_FIRE_2 = -1001066,
+    SAY_HANES_SUPPLIES_1 = -1001067,
+    SAY_HANES_SUPPLIES_2 = -1001068,
+    SAY_HANES_SUPPLIES_ESCAPE = -1001069,
+    SAY_HANES_SUPPLIES_COMPLETE = -1001070,
+    SAY_HANES_ARRIVE_BASE = -1001071,
+    // spells
+    SPELL_HEALING_POTION = 17534,
+    SPELL_LOW_POLY_FIRE = 51195,
+    // misc
+    NPC_HANES_TRIGGER = 23968,
+    QUEST_ID_TRIAL_OF_FIRE = 11241,
+};
+
+struct npc_apothecary_hanes : public CreatureScript
+{
+    npc_apothecary_hanes() : CreatureScript("npc_apothecary_hanes") {}
+
+    struct npc_apothecary_hanesAI : public npc_escortAI
+    {
+        npc_apothecary_hanesAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+        uint32 m_uiHealingTimer;
+
+        void Reset() override
+        {
+            m_uiHealingTimer = 0;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                Start(true, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+                DoScriptText(SAY_HANES_ESCORT_START, m_creature);
+                m_creature->SetFactionTemporary(FACTION_ESCORT_H_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 2:
+                DoScriptText(SAY_HANES_FIRE_1, m_creature);
+                break;
+            case 3:
+                DoScriptText(SAY_HANES_FIRE_2, m_creature);
+                break;
+            case 14:
+            case 20:
+            case 21:
+            case 29:
+            {
+                       m_creature->HandleEmote(EMOTE_ONESHOT_ATTACK1H);
+
+                       // set all nearby triggers on fire - ToDo: research if done by spell!
+                       std::list<Creature*> lTriggersInRange;
+                       GetCreatureListWithEntryInGrid(lTriggersInRange, m_creature, NPC_HANES_TRIGGER, 10.0f);
+
+                       for (std::list<Creature*>::const_iterator itr = lTriggersInRange.begin(); itr != lTriggersInRange.end(); ++itr)
+                       {
+                           (*itr)->CastSpell((*itr), SPELL_LOW_POLY_FIRE, true);
+                           (*itr)->ForcedDespawn(30000);
+                       }
+
+                       break;
+            }
+
+            case 15:
+                DoScriptText(SAY_HANES_SUPPLIES_1, m_creature);
+                break;
+            case 22:
+                DoScriptText(SAY_HANES_SUPPLIES_2, m_creature);
+                break;
+            case 30:
+                m_creature->HandleEmote(EMOTE_ONESHOT_LAUGH_NOSHEATHE);
+                break;
+            case 31:
+                DoScriptText(SAY_HANES_SUPPLIES_COMPLETE, m_creature);
+                break;
+            case 32:
+                DoScriptText(SAY_HANES_SUPPLIES_ESCAPE, m_creature);
+                break;
+            case 40:
+                DoScriptText(SAY_HANES_ARRIVE_BASE, m_creature);
+                break;
+            case 44:
+                if (Player* pPlayer = GetPlayerForEscort())
+                    pPlayer->GroupEventHappens(QUEST_ID_TRIAL_OF_FIRE, m_creature);
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_creature->GetHealthPercent() < 75.0f)
+            {
+                if (m_uiHealingTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_HEALING_POTION) == CAST_OK)
+                        m_uiHealingTimer = 10000;
+                }
+                else
+                    m_uiHealingTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_apothecary_hanesAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_TRIAL_OF_FIRE)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_scalawag_frog
+######*/
+
+enum
+{
+    ITEM_ID_SCALAWAG_FROG = 35803,
+    ITEM_ID_SHINY_KNIFE = 35813,
+    NPC_SCALAWAG_FROG = 26503,
+};
+
+struct npc_scalawag_frog : public CreatureScript
+{
+    npc_scalawag_frog() : CreatureScript("npc_scalawag_frog") {}
+
+    bool OnSpellClick(Player* pPlayer, Creature* pClickedCreature, uint32 /*uiSpellId*/) override
+    {
+        if (pClickedCreature->GetEntry() == NPC_SCALAWAG_FROG && pPlayer->HasItemCount(ITEM_ID_SHINY_KNIFE, 1))
+        {
+            if (Item* pItem = pPlayer->StoreNewItemInInventorySlot(ITEM_ID_SCALAWAG_FROG, 1))
+            {
+                pPlayer->SendNewItem(pItem, 1, true, false);
+                pClickedCreature->ForcedDespawn();
+
+                // always return true when handled special npc spell click
+                return true;
+            }
+        }
+
+        return true;
+    }
+};
+
+void AddSC_howling_fjord()
+{
+    Script* s;
+
+    s = new npc_ancient_male_vrykul();
+    s->RegisterSelf();
+    s = new npc_daegarn();
+    s->RegisterSelf();
+    s = new npc_silvermoon_harry();
+    s->RegisterSelf();
+    s = new npc_lich_king_village();
+    s->RegisterSelf();
+    s = new npc_king_ymiron();
+    s->RegisterSelf();
+    s = new npc_firecrackers_bunny();
+    s->RegisterSelf();
+    s = new npc_apothecary_hanes();
+    s->RegisterSelf();
+    s = new npc_scalawag_frog();
+    s->RegisterSelf();
+
+    s = new at_ancient_male_vrykul();
+    s->RegisterSelf();
+    s = new at_nifflevar();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ancient_male_vrykul";
+    //pNewScript->GetAI = &GetAI_npc_ancient_male_vrykul;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_ancient_male_vrykul";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_ancient_male_vrykul;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_daegarn";
+    //pNewScript->GetAI = &GetAI_npc_daegarn;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_daegarn;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_silvermoon_harry";
+    //pNewScript->GetAI = &GetAI_npc_silvermoon_harry;
+    //pNewScript->pGossipHello = &GossipHello_npc_silvermoon_harry;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_silvermoon_harry;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_lich_king_village";
+    //pNewScript->GetAI = &GetAI_npc_lich_king_village;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_king_ymiron";
+    //pNewScript->GetAI = &GetAI_npc_king_ymiron;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_nifflevar";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_nifflevar;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_firecrackers_bunny";
+    //pNewScript->GetAI = &GetAI_npc_firecrackers_bunny;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_apothecary_hanes";
+    //pNewScript->GetAI = &GetAI_npc_apothecary_hanes;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_apothecary_hanes;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_scalawag_frog";
+    //pNewScript->pNpcSpellClick = &NpcSpellClick_npc_scalawag_frog;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown.cpp b/src/modules/SD3/scripts/northrend/icecrown.cpp
new file mode 100644
index 000000000..6e2af0078
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown.cpp
@@ -0,0 +1,712 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Icecrown
+SD%Complete: 100
+SDComment: Quest support: 13221, 13229, 13284, 13300, 13301, 13302, 13481, 13482.
+SDCategory: Icecrown
+EndScriptData */
+
+/* ContentData
+npc_squad_leader
+npc_infantry
+npc_father_kamaros
+npc_saronite_mine_slave
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_squad_leader
+######*/
+
+enum
+{
+    // yells
+    SAY_HORDE_SQUAD_RUN                 = -1001018,
+    SAY_ALLIANCE_SQUAD_RUN              = -1001019,
+    SAY_SQUAD_AGGRO_1                   = -1001020,
+    SAY_SQUAD_AGGRO_2                   = -1001021,
+    SAY_HORDE_SQUAD_AGGRO_1             = -1001022,
+    SAY_HORDE_SQUAD_AGGRO_2             = -1001023,
+    SAY_HORDE_SQUAD_AGGRO_3             = -1001024,
+    SAY_HORDE_SQUAD_AGGRO_4             = -1001025,
+    SAY_ALLIANCE_SQUAD_AGGRO_1          = -1001026,
+    SAY_ALLIANCE_SQUAD_AGGRO_2          = -1001027,
+    SAY_ALLIANCE_SQUAD_AGGRO_3          = -1001028,
+    SAY_ALLIANCE_SQUAD_AGGRO_4          = -1001029,
+    SAY_HORDE_SQUAD_BREAK               = -1001030,
+    SAY_HORDE_SQUAD_BREAK_DONE          = -1001031,
+    SAY_ALLIANCE_SQUAD_BREAK            = -1001032,
+    SAY_ALLIANCE_SQUAD_BREAK_DONE       = -1001033,
+    SAY_EVENT_COMPLETE                  = -1001034,
+    SAY_DEFENDER_AGGRO_1                = -1001035,
+    SAY_DEFENDER_AGGRO_2                = -1001036,
+    SAY_DEFENDER_AGGRO_3                = -1001037,
+    SAY_DEFENDER_AGGRO_4                = -1001038,
+    SAY_DEFENDER_AGGRO_5                = -1001039,
+    SAY_DEFENDER_AGGRO_6                = -1001040,
+    SAY_DEFENDER_AGGRO_7                = -1001041,
+    SAY_DEFENDER_AGGRO_8                = -1001042,
+    SAY_DEFENDER_AGGRO_9                = -1001043,
+
+    // combat spells
+    SPELL_CLEAVE                        = 15496,
+    SPELL_FROST_SHOT                    = 12551,
+    SPELL_ALLIANCE_TROOP_CREDIT         = 59677,
+    SPELL_HORDE_TROOP_CREDIT            = 59764,
+
+    NPC_SKYBREAKER_SQUAD_LEADER         = 31737,
+    NPC_SKYBREAKER_INFANTRY             = 31701,
+    NPC_KORKRON_SQUAD_LEADER            = 31833,
+    NPC_KORKRON_INFANTRY                = 31832,
+    NPC_YMIRHEIM_DEFENDER               = 31746,
+
+    // quests
+    QUEST_ID_ASSAULT_BY_GROUND_A        = 13284,
+    QUEST_ID_ASSAULT_BY_GROUND_H        = 13301,
+};
+
+struct npc_squad_leader : public CreatureScript
+{
+    npc_squad_leader() : CreatureScript("npc_squad_leader") {}
+
+    struct npc_squad_leaderAI : public npc_escortAI
+    {
+        npc_squad_leaderAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiFrostShotTimer;
+
+        void Reset() override
+        {
+            m_uiCleaveTimer = urand(3000, 5000);
+            m_uiFrostShotTimer = urand(1000, 3000);
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            switch (urand(0, 5))
+            {
+            case 0: DoScriptText(SAY_SQUAD_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_SQUAD_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(m_creature->GetEntry() == NPC_SKYBREAKER_SQUAD_LEADER ? SAY_ALLIANCE_SQUAD_AGGRO_1 : SAY_HORDE_SQUAD_AGGRO_1, m_creature); break;
+            case 3: DoScriptText(m_creature->GetEntry() == NPC_SKYBREAKER_SQUAD_LEADER ? SAY_ALLIANCE_SQUAD_AGGRO_2 : SAY_HORDE_SQUAD_AGGRO_2, m_creature); break;
+            case 4: DoScriptText(m_creature->GetEntry() == NPC_SKYBREAKER_SQUAD_LEADER ? SAY_ALLIANCE_SQUAD_AGGRO_3 : SAY_HORDE_SQUAD_AGGRO_3, m_creature); break;
+            case 5: DoScriptText(m_creature->GetEntry() == NPC_SKYBREAKER_SQUAD_LEADER ? SAY_ALLIANCE_SQUAD_AGGRO_4 : SAY_HORDE_SQUAD_AGGRO_4, m_creature); break;
+            }
+
+            if (pWho->GetEntry() == NPC_YMIRHEIM_DEFENDER && urand(0, 1))
+            {
+                switch (urand(0, 8))
+                {
+                case 0: DoScriptText(SAY_DEFENDER_AGGRO_1, pWho); break;
+                case 1: DoScriptText(SAY_DEFENDER_AGGRO_2, pWho); break;
+                case 2: DoScriptText(SAY_DEFENDER_AGGRO_3, pWho); break;
+                case 3: DoScriptText(SAY_DEFENDER_AGGRO_4, pWho); break;
+                case 4: DoScriptText(SAY_DEFENDER_AGGRO_5, pWho); break;
+                case 5: DoScriptText(SAY_DEFENDER_AGGRO_6, pWho); break;
+                case 6: DoScriptText(SAY_DEFENDER_AGGRO_7, pWho); break;
+                case 7: DoScriptText(SAY_DEFENDER_AGGRO_8, pWho); break;
+                case 8: DoScriptText(SAY_DEFENDER_AGGRO_9, pWho); break;
+                }
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+                SendAIEventAround(AI_EVENT_CUSTOM_A, pInvoker, 0, 12.0f);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_YMIRHEIM_DEFENDER)
+                pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 2:
+                SetRun();
+                DoScriptText(m_creature->GetEntry() == NPC_SKYBREAKER_SQUAD_LEADER ? SAY_ALLIANCE_SQUAD_RUN : SAY_HORDE_SQUAD_RUN, m_creature);
+                break;
+            case 4:
+                // first horde attack
+                if (m_creature->GetEntry() == NPC_KORKRON_SQUAD_LEADER)
+                {
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7433.193f, 1838.199f, 402.43f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7441.071f, 1848.997f, 401.03f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7451.976f, 1850.776f, 402.96f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                }
+                break;
+            case 6:
+                // first alliance attack
+                if (m_creature->GetEntry() == NPC_SKYBREAKER_SQUAD_LEADER)
+                {
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7217.792f, 1602.024f, 378.86f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7235.733f, 1597.831f, 381.08f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                }
+                break;
+            case 9:
+                // second horde attack
+                if (m_creature->GetEntry() == NPC_KORKRON_SQUAD_LEADER)
+                {
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7420.511f, 1813.180f, 425.14f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7411.768f, 1784.054f, 427.84f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7418.514f, 1805.596f, 425.50f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                }
+                break;
+            case 13:
+                if (m_creature->GetEntry() == NPC_KORKRON_SQUAD_LEADER)
+                {
+                    DoScriptText(SAY_HORDE_SQUAD_BREAK, m_creature);
+                    m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                }
+                break;
+            case 14:
+                if (m_creature->GetEntry() == NPC_KORKRON_SQUAD_LEADER)
+                {
+                    DoScriptText(SAY_HORDE_SQUAD_BREAK_DONE, m_creature);
+                    m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                }
+                break;
+            case 15:
+                // second alliance attack
+                if (m_creature->GetEntry() == NPC_SKYBREAKER_SQUAD_LEADER)
+                {
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7328.375f, 1631.935f, 416.06f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7334.475f, 1618.401f, 412.93f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7341.556f, 1632.023f, 423.01f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                }
+                break;
+            case 20:
+                if (m_creature->GetEntry() == NPC_SKYBREAKER_SQUAD_LEADER)
+                {
+                    DoScriptText(SAY_ALLIANCE_SQUAD_BREAK, m_creature);
+                    m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                }
+                break;
+            case 21:
+                if (m_creature->GetEntry() == NPC_SKYBREAKER_SQUAD_LEADER)
+                {
+                    DoScriptText(SAY_ALLIANCE_SQUAD_BREAK_DONE, m_creature);
+                    m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                }
+                break;
+            case 22:
+                // horde gate attack
+                if (m_creature->GetEntry() == NPC_KORKRON_SQUAD_LEADER)
+                {
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7280.229f, 1725.829f, 471.37f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7272.390f, 1732.530f, 472.43f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7285.863f, 1690.997f, 483.35f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7334.487f, 1690.376f, 443.32f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7371.765f, 1699.052f, 442.50f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                }
+                break;
+            case 25:
+                // alliance gate attack
+                if (m_creature->GetEntry() == NPC_SKYBREAKER_SQUAD_LEADER)
+                {
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7205.636f, 1648.500f, 453.59f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7224.602f, 1677.164f, 454.65f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7220.114f, 1667.603f, 451.01f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7220.528f, 1634.114f, 434.81f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_creature->SummonCreature(NPC_YMIRHEIM_DEFENDER, 7237.092f, 1687.461f, 459.81f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                }
+                break;
+            case 26:
+            {
+                       // event complete
+                       if (Player* pPlayer = GetPlayerForEscort())
+                           m_creature->SetFacingToObject(pPlayer);
+                       DoScriptText(SAY_EVENT_COMPLETE, m_creature);
+
+                       // get all the soldiers around
+                       std::list<Creature*> lSoldiersList;
+                       GetCreatureListWithEntryInGrid(lSoldiersList, m_creature, m_creature->GetEntry() == NPC_SKYBREAKER_SQUAD_LEADER ? NPC_SKYBREAKER_INFANTRY : NPC_KORKRON_INFANTRY, 30.0f);
+
+                       // for each soldier alive cast the kill credit
+                       for (std::list<Creature*>::const_iterator itr = lSoldiersList.begin(); itr != lSoldiersList.end(); ++itr)
+                       {
+                           if ((*itr) && (*itr)->IsAlive())
+                           {
+                               (*itr)->CastSpell(*itr, (*itr)->GetEntry() == NPC_SKYBREAKER_INFANTRY ? SPELL_ALLIANCE_TROOP_CREDIT : SPELL_HORDE_TROOP_CREDIT, true);
+                               (*itr)->ForcedDespawn(10000);
+                           }
+                       }
+
+                       // set to pause and despawn on timer
+                       SetEscortPaused(true);
+                       m_creature->ForcedDespawn(10000);
+                       break;
+            }
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiFrostShotTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROST_SHOT) == CAST_OK)
+                    m_uiFrostShotTimer = urand(1000, 3000);
+            }
+            else
+                m_uiFrostShotTimer -= uiDiff;
+
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                    m_uiCleaveTimer = urand(3000, 5000);
+            }
+            else
+                m_uiCleaveTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_squad_leaderAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_ASSAULT_BY_GROUND_A || pQuest->GetQuestId() == QUEST_ID_ASSAULT_BY_GROUND_H)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_infantry
+######*/
+
+enum
+{
+    SPELL_SHOOT                         = 15547,
+    SPELL_HEROIC_STRIKE                 = 29426,
+};
+
+struct npc_infantry : public CreatureScript
+{
+    npc_infantry() : CreatureScript("npc_infantry") {}
+
+    struct npc_infantryAI : public ScriptedAI
+    {
+        npc_infantryAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bEscortActive = false;
+        }
+
+        uint32 m_uiShootTimer;
+        uint32 m_uiHeroicStrikeTimer;
+
+        bool m_bEscortActive;
+
+        ObjectGuid m_squadLeaderGuid;
+
+        void Reset() override
+        {
+            m_uiShootTimer = urand(1000, 3000);
+            m_uiHeroicStrikeTimer = urand(3000, 5000);
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+
+            if (!m_creature->IsAlive())
+                return;
+
+            if (m_bEscortActive)
+            {
+                if (Creature* pLeader = m_creature->GetMap()->GetCreature(m_squadLeaderGuid))
+                    m_creature->GetMotionMaster()->MoveFollow(pLeader, m_creature->GetDistance(pLeader), M_PI_F / 2 + m_creature->GetAngle(pLeader));
+            }
+            else
+                m_creature->GetMotionMaster()->MoveTargetedHome();
+        }
+
+        void JustRespawned() override
+        {
+            m_bEscortActive = false;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* /*pInvoker*/, uint32 uiMiscValue) override
+        {
+            // start following the squad leader
+            if (eventType == AI_EVENT_CUSTOM_A && (pSender->GetEntry() == NPC_SKYBREAKER_SQUAD_LEADER || pSender->GetEntry() == NPC_KORKRON_SQUAD_LEADER))
+            {
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                m_creature->GetMotionMaster()->MoveFollow(pSender, m_creature->GetDistance(pSender), M_PI_F / 2 + m_creature->GetAngle(pSender));
+                m_squadLeaderGuid = pSender->GetObjectGuid();
+                m_bEscortActive = true;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiShootTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHOOT) == CAST_OK)
+                    m_uiShootTimer = urand(1000, 3000);
+            }
+            else
+                m_uiShootTimer -= uiDiff;
+
+            if (m_uiHeroicStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HEROIC_STRIKE) == CAST_OK)
+                    m_uiHeroicStrikeTimer = urand(3000, 5000);
+            }
+            else
+                m_uiHeroicStrikeTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_infantryAI(pCreature);
+    }
+};
+
+/*######
+## npc_father_kamaros
+######*/
+
+enum
+{
+    // yells
+    SAY_KAMAROS_START_1                 = -1001044,
+    SAY_KAMAROS_START_2                 = -1001045,
+    SAY_KAMAROS_AGGRO_1                 = -1001046,
+    SAY_KAMAROS_AGGRO_2                 = -1001047,
+    SAY_KAMAROS_AGGRO_3                 = -1001048,
+    SAY_KAMAROS_COMPLETE_1              = -1001050,
+    SAY_KAMAROS_COMPLETE_2              = -1001049,
+
+    // combat spells
+    SPELL_HOLY_SMITE                    = 25054,
+    SPELL_POWER_WORD_FORTITUDE          = 58921,
+    SPELL_POWER_WORD_SHIELD             = 32595,
+    SPELL_SHADOW_WORD_PAIN              = 17146,
+
+    NPC_SPIKED_GHOUL                    = 30597,
+    NPC_KAMAROS_1                       = 31279,                    // phase 1 npc
+    NPC_KAMAROS_2                       = 32800,                    // phase 64 npc
+
+    // quests
+    // all four quests have the same script;
+    // they depend only on faction and quest giver (same npc, different entries in different phases);
+    QUEST_ID_NOT_DEAD_YET_A             = 13221,
+    QUEST_ID_NOT_DEAD_YET_H             = 13229,
+    QUEST_ID_GET_OUT_OF_HERE_A          = 13482,
+    QUEST_ID_GET_OUT_OF_HERE_H          = 13481,
+};
+
+struct npc_father_kamaros : public CreatureScript
+{
+    npc_father_kamaros() : CreatureScript("npc_father_kamaros") {}
+
+    struct npc_father_kamarosAI : public npc_escortAI
+    {
+        npc_father_kamarosAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_uiCurrentQuestId = 0;
+        }
+
+        uint32 m_uiSmiteTimer;
+        uint32 m_uiShadowWordTimer;
+        uint32 m_uiCurrentQuestId;
+
+        void Reset() override
+        {
+            m_uiSmiteTimer = urand(3000, 5000);
+            m_uiShadowWordTimer = urand(1000, 3000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_KAMAROS_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_KAMAROS_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_KAMAROS_AGGRO_3, m_creature); break;
+            }
+
+            if (DoCastSpellIfCan(m_creature, SPELL_POWER_WORD_SHIELD) != CAST_OK)
+            {
+                if (Player* pPlayer = GetPlayerForEscort())
+                    DoCastSpellIfCan(pPlayer, SPELL_POWER_WORD_SHIELD);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                m_uiCurrentQuestId = uiMiscValue;
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_KAMAROS_START_1, m_creature, pPlayer);
+                    DoCastSpellIfCan(pPlayer, SPELL_POWER_WORD_FORTITUDE);
+                }
+                break;
+            case 1:
+                DoScriptText(SAY_KAMAROS_START_2, m_creature);
+                break;
+            case 11:
+            case 13:
+            case 16:
+                if (Creature* pGhoul = GetClosestCreatureWithEntry(m_creature, NPC_SPIKED_GHOUL, 25.0f))
+                    pGhoul->AI()->AttackStart(m_creature);
+                break;
+            case 23:
+                if (Player* pPlayer = GetPlayerForEscort())
+                    m_creature->SetFacingToObject(pPlayer);
+                DoScriptText(SAY_KAMAROS_COMPLETE_1, m_creature);
+                break;
+            case 24:
+                SetRun();
+                DoScriptText(SAY_KAMAROS_COMPLETE_2, m_creature);
+                if (Player* pPlayer = GetPlayerForEscort())
+                    pPlayer->GroupEventHappens(m_uiCurrentQuestId, m_creature);
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiSmiteTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HOLY_SMITE) == CAST_OK)
+                    m_uiSmiteTimer = urand(3000, 4000);
+            }
+            else
+                m_uiSmiteTimer -= uiDiff;
+
+            if (m_uiShadowWordTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHADOW_WORD_PAIN) == CAST_OK)
+                    m_uiShadowWordTimer = urand(15000, 20000);
+            }
+            else
+                m_uiShadowWordTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_father_kamarosAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_NOT_DEAD_YET_A || pQuest->GetQuestId() == QUEST_ID_NOT_DEAD_YET_H ||
+            pQuest->GetQuestId() == QUEST_ID_GET_OUT_OF_HERE_A || pQuest->GetQuestId() == QUEST_ID_GET_OUT_OF_HERE_H)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_saronite_mine_slave
+######*/
+
+enum
+{
+    SAY_MINER_SUICIDE_1                 = -1001117,
+    SAY_MINER_SUICIDE_2                 = -1001118,
+    SAY_MINER_SUICIDE_3                 = -1001119,
+    SAY_MINER_SUICIDE_4                 = -1001120,
+    SAY_MINER_SUICIDE_5                 = -1001121,
+    SAY_MINER_SUICIDE_6                 = -1001122,
+    SAY_MINER_SUICIDE_7                 = -1001123,
+    SAY_MINER_SUICIDE_8                 = -1001124,
+
+    GOSSIP_ITEM_SLAVE_FREE              = -3000113,
+    TEXT_ID                             = 14068,
+
+    NPC_SARONITE_KILL_CREDIT_BUNNY      = 31866,
+
+    FACTION_HOSTILE                     = 14,
+
+    QUEST_SLAVES_TO_SARONITE_A          = 13300,
+    QUEST_SLAVES_TO_SARONITE_H          = 13302,
+};
+
+static const float afPointSlaveSalvation[3] = {7030.59f, 1866.73f, 533.94f};
+static const float afPointSlaveSuicide1[3] = {6965.99f, 2051.44f, 519.49f};
+static const float afPointSlaveSuicide2[3] = {6920.47f, 1973.46f, 523.38f};
+static const float afPointSlaveSuicide3[3] = {6915.35f, 2026.35f, 518.53f};
+
+struct npc_saronite_mine_slave : public CreatureScript
+{
+    npc_saronite_mine_slave() : CreatureScript("npc_saronite_mine_slave") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_SLAVES_TO_SARONITE_A) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_SLAVES_TO_SARONITE_H) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SLAVE_FREE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+
+        pPlayer->SEND_GOSSIP_MENU(TEXT_ID, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        if (uiAction != GOSSIP_ACTION_INFO_DEF + 1)
+            return false;
+
+        pPlayer->CLOSE_GOSSIP_MENU();
+
+        switch (urand(0, 5))
+        {
+        case 0:
+        case 1:
+        case 2:
+            pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            pPlayer->KilledMonsterCredit(NPC_SARONITE_KILL_CREDIT_BUNNY);
+
+            pCreature->SetWalk(false);
+            pCreature->GetMotionMaster()->MovePoint(0, afPointSlaveSalvation[0], afPointSlaveSalvation[1], afPointSlaveSalvation[2]);
+            pCreature->ForcedDespawn(20000);
+            break;
+        case 3:
+        case 4:
+            pCreature->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_RESTORE_REACH_HOME);
+            pCreature->AI()->AttackStart(pPlayer);
+            break;
+        case 5:
+            switch (urand(0, 7))
+            {
+            case 0: DoScriptText(SAY_MINER_SUICIDE_1, pCreature); break;
+            case 1: DoScriptText(SAY_MINER_SUICIDE_2, pCreature); break;
+            case 2: DoScriptText(SAY_MINER_SUICIDE_3, pCreature); break;
+            case 3: DoScriptText(SAY_MINER_SUICIDE_4, pCreature); break;
+            case 4: DoScriptText(SAY_MINER_SUICIDE_5, pCreature); break;
+            case 5: DoScriptText(SAY_MINER_SUICIDE_6, pCreature); break;
+            case 6: DoScriptText(SAY_MINER_SUICIDE_7, pCreature); break;
+            case 7: DoScriptText(SAY_MINER_SUICIDE_8, pCreature); break;
+            }
+
+            pCreature->SetWalk(false);
+            switch (urand(0, 2))
+            {
+            case 0:
+                pCreature->GetMotionMaster()->MovePoint(0, afPointSlaveSuicide1[0], afPointSlaveSuicide1[1], afPointSlaveSuicide1[2]);
+                break;
+            case 1:
+                pCreature->GetMotionMaster()->MovePoint(0, afPointSlaveSuicide2[0], afPointSlaveSuicide2[1], afPointSlaveSuicide2[2]);
+                break;
+            case 2:
+                pCreature->GetMotionMaster()->MovePoint(0, afPointSlaveSuicide3[0], afPointSlaveSuicide3[1], afPointSlaveSuicide3[2]);
+                break;
+            }
+            pCreature->ForcedDespawn(20000);
+            break;
+        }
+
+        return true;
+    }
+};
+
+void AddSC_icecrown()
+{
+    Script* s;
+    s = new npc_squad_leader();
+    s->RegisterSelf();
+    s = new npc_infantry();
+    s->RegisterSelf();
+    s = new npc_father_kamaros();
+    s->RegisterSelf();
+    s = new npc_saronite_mine_slave();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_squad_leader";
+    //pNewScript->GetAI = &GetAI_npc_squad_leader;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_squad_leader;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_infantry";
+    //pNewScript->GetAI = &GetAI_npc_infantry;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_father_kamaros";
+    //pNewScript->GetAI = &GetAI_npc_father_kamaros;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_father_kamaros;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_saronite_mine_slave";
+    //pNewScript->pGossipHello = &GossipHello_npc_saronite_mine_slave;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_saronite_mine_slave;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/boss_bronjahm.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/boss_bronjahm.cpp
new file mode 100644
index 000000000..9ec862d25
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/boss_bronjahm.cpp
@@ -0,0 +1,291 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_bronjahm
+SD%Complete: 90%
+SDComment: Small unknown behaviour for his Shadow Bolt use in phase 1; Soulstorm needs additional handling in core
+SDCategory: The Forge of Souls
+EndScriptData */
+
+#include "precompiled.h"
+#include "forge_of_souls.h"
+
+enum
+{
+    SAY_AGGRO_1                 = -1632000,                 // Without sound, really correct?
+    SAY_AGGRO_2                 = -1632001,
+    SAY_SLAY_1                  = -1632002,
+    SAY_SLAY_2                  = -1632003,
+    SAY_DEATH                   = -1632004,
+    SAY_SOULSTORM               = -1632005,
+    SAY_CORRUPT_SOUL            = -1632006,
+
+    // Heroic spells are selected by spell difficulty dbc
+    SPELL_SOULSTORM_VISUAL_OOC  = 69008,
+    SPELL_MAGICS_BANE           = 68793,
+    SPELL_SHADOW_BOLT           = 70043,
+    SPELL_CORRUPT_SOUL          = 68839,
+    SPELL_BANISH_VISUAL         = 68862,
+    SPELL_CONSUME_SOUL_TRIGGER  = 68861,
+    SPELL_TELEPORT              = 68988,
+    SPELL_SOULSTORM_VISUAL      = 68870,                    // Cast before Soulstorm, should trigger some visual spells
+    SPELL_SOULSTORM             = 68872,
+    SPELL_FEAR                  = 68950,
+};
+
+struct boss_bronjahm : public CreatureScript
+{
+    boss_bronjahm() : CreatureScript("boss_bronjahm") {}
+
+    struct boss_bronjahmAI : public ScriptedAI
+    {
+        boss_bronjahmAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiPhase;
+
+        uint32 m_uiMagicsBaneTimer;
+        uint32 m_uiCorruptSoulTimer;
+        uint32 m_uiFearTimer;
+        uint32 m_uiShadowboltTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = 0;
+            m_uiMagicsBaneTimer = urand(8000, 12000);
+            m_uiCorruptSoulTimer = urand(20000, 30000);
+            m_uiFearTimer = 1000;
+            m_uiShadowboltTimer = 5000;
+            SetCombatMovement(true);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_AGGRO_1 : SAY_AGGRO_2, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_BRONJAHM, IN_PROGRESS);
+
+            // Remove OOC visual soulstorm effect (added in creature_template_addon
+            m_creature->RemoveAurasDueToSpell(SPELL_SOULSTORM_VISUAL_OOC);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            if (urand(0, 1))
+                DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_BRONJAHM, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_BRONJAHM, FAIL);
+        }
+
+        void SpellHitTarget(Unit* pTarget, SpellEntry const* pSpellEntry) override
+        {
+            if (pTarget == m_creature && pSpellEntry->Id == SPELL_TELEPORT)
+            {
+                // Say Text and cast Soulstorm
+                DoScriptText(SAY_SOULSTORM, m_creature);
+                DoCastSpellIfCan(m_creature, SPELL_SOULSTORM_VISUAL, CAST_TRIGGERED | CAST_INTERRUPT_PREVIOUS);
+                DoCastSpellIfCan(m_creature, SPELL_SOULSTORM, CAST_INTERRUPT_PREVIOUS);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiPhase == 0)                                 // Phase 1
+            {
+                // Switching Phase, Soulstorm is cast in SpellHitTarget
+                if (m_creature->GetHealthPercent() < 30.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT) == CAST_OK)
+                        m_uiPhase = 1;
+                }
+
+                // Corrupt Soul
+                if (m_uiCorruptSoulTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_CORRUPT_SOUL) == CAST_OK)
+                        {
+                            DoScriptText(SAY_CORRUPT_SOUL, m_creature);
+                            m_uiCorruptSoulTimer = urand(20000, 30000);
+                        }
+                    }
+                }
+                else
+                    m_uiCorruptSoulTimer -= uiDiff;
+
+                // Magic's Bane
+                if (m_uiMagicsBaneTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_MAGICS_BANE) == CAST_OK)
+                        m_uiMagicsBaneTimer = urand(7000, 15000);
+                }
+                else
+                    m_uiMagicsBaneTimer -= uiDiff;
+
+                // Used to prevent Shadowbolt-Casting on Aggro for a few seconds
+                if (m_uiShadowboltTimer <= uiDiff)
+                    m_uiShadowboltTimer = 0;
+                else
+                    m_uiShadowboltTimer -= uiDiff;
+
+                // Use ShadowBolt as default attack if victim is not in range
+                // TODO - not entirely clear how this works in case the tank is out of shadow-bolt range
+                if (!m_uiShadowboltTimer && !m_creature->CanReachWithMeleeAttack(m_creature->getVictim()) && m_creature->GetCombatDistance(m_creature->getVictim(), false) < 20.0f)
+                {
+                    if (IsCombatMovement())
+                    {
+                        SetCombatMovement(false);
+                        m_creature->GetMotionMaster()->MoveIdle();
+                        m_creature->StopMoving();
+                    }
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHADOW_BOLT);
+                }
+                else
+                {
+                    if (!IsCombatMovement())
+                    {
+                        SetCombatMovement(true);
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                        m_uiShadowboltTimer = 2000;             // Give some time to chase
+                    }
+
+                    DoMeleeAttackIfReady();
+                }
+            }
+            else                                                // Soulstorm Phase
+            {
+                if (m_uiFearTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FEAR) == CAST_OK)
+                        m_uiFearTimer = urand(10000, 15000);
+                }
+                else
+                    m_uiFearTimer -= uiDiff;
+
+                // Default attack
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    DoCastSpellIfCan(pTarget, SPELL_SHADOW_BOLT);
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_bronjahmAI(pCreature);
+    }
+};
+
+struct npc_corrupted_soul_fragment : public CreatureScript
+{
+    npc_corrupted_soul_fragment() : CreatureScript("npc_corrupted_soul_fragment") {}
+
+    struct npc_corrupted_soul_fragmentAI : public ScriptedAI
+    {
+        npc_corrupted_soul_fragmentAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            DoCastSpellIfCan(m_creature, SPELL_BANISH_VISUAL);
+        }
+
+        void Reset() override
+        {
+            SetCombatMovement(true);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (InstanceData* pInstance = m_creature->GetInstanceData())
+                pInstance->SetGuid(DATA_SOULFRAGMENT_REMOVE, m_creature->GetObjectGuid());
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (pWho->GetEntry() == NPC_BRONJAHM)
+            {
+                if (m_creature->IsWithinDistInMap(pWho, INTERACTION_DISTANCE))
+                {
+                    DoCastSpellIfCan(pWho, SPELL_CONSUME_SOUL_TRIGGER, CAST_TRIGGERED);
+
+                    // Inform the instance about a used soul fragment
+                    if (InstanceData* pInstance = m_creature->GetInstanceData())
+                        pInstance->SetGuid(DATA_SOULFRAGMENT_REMOVE, m_creature->GetObjectGuid());
+
+                    m_creature->ForcedDespawn();
+                    return;
+                }
+                if (IsCombatMovement())
+                {
+                    SetCombatMovement(false);
+                    m_creature->GetMotionMaster()->MoveFollow(pWho, 0.0f, 0.0f);
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_corrupted_soul_fragmentAI(pCreature);
+    }
+};
+
+void AddSC_boss_bronjahm()
+{
+    Script* s;
+
+    s = new boss_bronjahm();
+    s->RegisterSelf();
+    s = new npc_corrupted_soul_fragment();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_bronjahm";
+    //pNewScript->GetAI = &GetAI_boss_bronjahm;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_corrupted_soul_fragment";
+    //pNewScript->GetAI = &GetAI_npc_corrupted_soul_fragment;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp
new file mode 100644
index 000000000..59f946195
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp
@@ -0,0 +1,344 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_devourer_of_souls
+SD%Complete: 90%
+SDComment: Timers need more love, NPC_UNLEASHED_SOUL are not handled properly
+SDCategory: The Forge of Souls
+EndScriptData */
+
+#include "precompiled.h"
+#include "forge_of_souls.h"
+
+enum
+{
+    SAY_MALE_1_AGGRO            = -1632007,
+    SAY_FEMALE_AGGRO            = -1632008,
+    SAY_MALE_1_SLAY_1           = -1632009,
+    SAY_FEMALE_SLAY_1           = -1632010,
+    SAY_MALE_2_SLAY_1           = -1632011,
+    SAY_MALE_1_SLAY_2           = -1632012,
+    SAY_FEMALE_SLAY_2           = -1632013,
+    SAY_MALE_2_SLAY_2           = -1632014,
+    SAY_MALE_1_DEATH            = -1632015,
+    SAY_FEMALE_DEATH            = -1632016,
+    SAY_MALE_2_DEATH            = -1632017,
+    SAY_MALE_1_SOUL_ATTACK      = -1632018,
+    SAY_FEMALE_SOUL_ATTACK      = -1632019,
+    SAY_MALE_2_SOUL_ATTACK      = -1632020,
+    SAY_MALE_1_DARK_GLARE       = -1632021,
+    SAY_FEMALE_DARK_GLARE       = -1632022,
+
+    EMOTE_MIRRORED_SOUL         = -1632023,
+    EMOTE_UNLEASH_SOULS         = -1632024,
+    EMOTE_WAILING_SOULS         = -1632025,
+
+    FACE_NORMAL                 = 0,
+    FACE_WAILING                = 1,
+    FACE_UNLEASHING             = 2,
+
+    SPELL_PHANTOM_BLAST         = 68982,
+    SPELL_PHANTOM_BLAST_H       = 70322,
+    SPELL_WELL_OF_SOULS         = 68820,                    // spawns 36536, this one should cast 68854 (triggers normal dmg spell 68863 ) - 68855(visual) - 72630 (visual)
+    SPELL_WELL_OF_SOULS_TRIGGER = 68854,
+    SPELL_WELL_OF_SOULS_VISUAL1 = 68855,
+    SPELL_WELL_OF_SOULS_VISUAL2 = 72630,
+
+    SPELL_MIRRORED_SOUL         = 69048,                    // selecting target, applying aura 69023 to pass on dmg, dmg triggers 69034 with right amount
+    SPELL_UNLEASHED_SOULS       = 68939,                    // trigger (68967, select nearby target trigger 68979(summon 36595)), transform, root
+    SPELL_WAILING_SOULS         = 68899,
+    SPELL_WALIING_SOULS_TARGETS = 68912,
+
+    SPELL_DRUID_MORPH_1_5       = 68931,                    // delayed visual, 1.5s delay - used before wailing souls
+    SPELL_DRUID_MORPH_0_5       = 68977,                    // delayed visual, .5s delay  - used before unleash souls
+    SPELL_SUBMERGE_VISUAL       = 68909,                    // visual used to 'whirl' the heads, used by SPELL_DRUID_MORPH if spell DRUID_MORPH is used to "end" a phase
+    SPELL_DRUID_MORPH           = 68929,                    // used after wailing and unleashed souls, also triggered by DRUIT_MORPH_*
+
+    NPC_WELL_OF_SOULS           = 36536,
+    NPC_UNLEASHED_SOUL          = 36595,
+};
+
+static const int aTexts[6][3] =
+{
+    {SAY_MALE_1_AGGRO,       SAY_FEMALE_AGGRO,       0},    // 0 - aggro
+    {SAY_MALE_1_SLAY_1,      SAY_FEMALE_SLAY_1,      SAY_MALE_2_SLAY_1},        // 1 - slay1
+    {SAY_MALE_1_SLAY_2,      SAY_FEMALE_SLAY_2,      SAY_MALE_2_SLAY_2},        // 2 - slay2
+    {SAY_MALE_1_DEATH,       SAY_FEMALE_DEATH,       SAY_MALE_2_DEATH},         // 3 - death
+    {SAY_MALE_1_SOUL_ATTACK, SAY_FEMALE_SOUL_ATTACK, SAY_MALE_2_SOUL_ATTACK},   // 4 - unleashing soul
+    {SAY_MALE_1_DARK_GLARE,  SAY_FEMALE_DARK_GLARE,  0}     // 5 - glare
+};
+
+struct boss_devourer_of_souls : public CreatureScript
+{
+    boss_devourer_of_souls() : CreatureScript("boss_devourer_of_souls") {}
+
+    struct boss_devourer_of_soulsAI : public ScriptedAI
+    {
+        boss_devourer_of_soulsAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        uint8 m_uiFace;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiPhantomBlastTimer;
+        uint32 m_uiWellTimer;
+        uint32 m_uiMirrorTimer;
+        uint32 m_uiUnleashTimer;
+        uint32 m_uiWailingTimer;
+        uint32 m_uiEndPhaseTimer;
+
+        GuidList m_lWellGuids;
+
+        void Reset() override
+        {
+            m_uiFace = FACE_NORMAL;
+
+            m_uiPhantomBlastTimer = urand(5000, 10000);
+            m_uiWellTimer = urand(10000, 15000);
+            m_uiMirrorTimer = urand(10000, 15000);
+            m_uiUnleashTimer = urand(15000, 20000);
+            m_uiWailingTimer = urand(40000, 60000);
+            m_uiEndPhaseTimer = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(aTexts[0][m_uiFace], m_creature);
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_DEVOURER_OF_SOULS, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            if (urand(0, 1))
+                DoScriptText(aTexts[urand(1, 2)][m_uiFace], m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(aTexts[3][m_uiFace], m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_DEVOURER_OF_SOULS, DONE);
+
+            for (GuidList::const_iterator itr = m_lWellGuids.begin(); itr != m_lWellGuids.end(); ++itr)
+            {
+                if (Creature* pWell = m_creature->GetMap()->GetCreature(*itr))
+                    pWell->ForcedDespawn();
+            }
+            m_lWellGuids.clear();
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(NPC_DEVOURER_OF_SOULS, FAIL);
+                // If we previously failed, set such that possible to try again
+                m_pInstance->SetData(TYPE_ACHIEV_PHANTOM_BLAST, IN_PROGRESS);
+            }
+
+            for (GuidList::const_iterator itr = m_lWellGuids.begin(); itr != m_lWellGuids.end(); ++itr)
+            {
+                if (Creature* pWell = m_creature->GetMap()->GetCreature(*itr))
+                    pWell->ForcedDespawn();
+            }
+            m_lWellGuids.clear();
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_WELL_OF_SOULS)
+            {
+                m_lWellGuids.push_back(pSummoned->GetObjectGuid());
+                pSummoned->CastSpell(pSummoned, SPELL_WELL_OF_SOULS_TRIGGER, true, NULL, NULL, m_creature->GetObjectGuid());
+                // Commented as of not stacking auras
+                // pSummoned->CastSpell(pSummoned, SPELL_WELL_OF_SOULS_VISUAL1, true);
+                // pSummoned->CastSpell(pSummoned, SPELL_WELL_OF_SOULS_VISUAL2, true);
+            }
+            else if (pSummoned->GetEntry() == NPC_UNLEASHED_SOUL)
+            {
+                if (Unit* pEnemy = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    // It seems the summoned should rather walk towards the boss, but this results in them attacking the healer
+                    pSummoned->AI()->AttackStart(pEnemy);
+                    pSummoned->AddThreat(pEnemy, 10000.0f);
+                }
+                pSummoned->ForcedDespawn(15000);                // Note that this is sort of a hack, the more correct fix however would require to toggle the interpretation of summon properties in mangos
+            }
+        }
+
+        void SpellHitTarget(Unit* /*pTarget*/, SpellEntry const* pSpellEntry) override
+        {
+            switch (pSpellEntry->Id)
+            {
+                // If we hit a target with phantom blast, the achievement_criteria is failed
+            case SPELL_PHANTOM_BLAST:
+            case SPELL_PHANTOM_BLAST_H:
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_ACHIEV_PHANTOM_BLAST, FAIL);
+                break;
+                // Might be placed somewhere else better, important is to note that this text is said after the 3s cast time
+            case SPELL_WAILING_SOULS:
+                DoScriptText(aTexts[5][m_uiFace], m_creature);
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->IsInCombat())
+                return;
+
+            // Ending a phase
+            if (m_uiEndPhaseTimer)
+            {
+                if (m_uiEndPhaseTimer <= uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_DRUID_MORPH, CAST_INTERRUPT_PREVIOUS);
+                    // Sumberge visual might be cast as effect of the above spell.
+                    DoCastSpellIfCan(m_creature, SPELL_SUBMERGE_VISUAL, CAST_TRIGGERED);
+                    m_uiEndPhaseTimer = 0;
+
+                    m_uiFace = FACE_NORMAL;
+                }
+                else
+                    m_uiEndPhaseTimer -= uiDiff;
+            }
+
+            // No additional spells, no target selection for wailing souls
+            if (m_uiFace == FACE_WAILING)
+            {
+                // Some special handling in case of starting phase of wailings
+                if (ObjectGuid targetGuid = m_creature->GetTargetGuid())
+                {
+                    if (Unit* pTarget = m_creature->GetMap()->GetUnit(targetGuid))
+                        m_creature->SetFacingTo(m_creature->GetAngle(pTarget));
+                }
+
+                if (m_creature->GetThreatManager().isThreatListEmpty() || !m_creature->GetThreatManager().getHostileTarget())
+                    m_creature->SelectHostileTarget();          // Most likely must evade, use additional checks in case evading would be prevented
+                return;
+            }
+
+            // Update Target and do Combat Spells
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // No additional abilities while unleashing
+            if (m_uiFace == FACE_UNLEASHING)
+                return;
+
+            // Phantom Blast
+            if (m_uiPhantomBlastTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_PHANTOM_BLAST : SPELL_PHANTOM_BLAST_H) == CAST_OK)
+                        m_uiPhantomBlastTimer = urand(5000, 10000); // TODO
+                }
+            }
+            else
+                m_uiPhantomBlastTimer -= uiDiff;
+
+            // Jump towards random enemy
+            if (m_uiWellTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_WELL_OF_SOULS) == CAST_OK)
+                        m_uiWellTimer = urand(15000, 25000);    // TODO
+                }
+            }
+            else
+                m_uiWellTimer -= uiDiff;
+
+            // DMG reflection
+            if (m_uiMirrorTimer < uiDiff)
+            {
+                if (!m_creature->IsNonMeleeSpellCasted(true))
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_MIRRORED_SOUL, CAST_TRIGGERED);
+                    m_uiMirrorTimer = urand(25000, 35000);      // TODO
+                    DoScriptText(EMOTE_MIRRORED_SOUL, m_creature);
+                }
+            }
+            else
+                m_uiMirrorTimer -= uiDiff;
+
+            // Spawning of Adds
+            if (m_uiUnleashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_UNLEASHED_SOULS) == CAST_OK && DoCastSpellIfCan(m_creature, SPELL_DRUID_MORPH_0_5, CAST_TRIGGERED) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_UNLEASH_SOULS, m_creature);
+                    m_uiUnleashTimer = urand(30000, 60000);     // TODO
+
+                    m_uiFace = FACE_UNLEASHING;
+                    DoScriptText(aTexts[4][m_uiFace], m_creature);
+                    m_uiEndPhaseTimer = 4500;                   // 5000 (Duration of Unleasing) + 850(Cast time for unleashing) - 1000(duration of whirl) - a bit air
+                }
+            }
+            else
+                m_uiUnleashTimer -= uiDiff;
+
+            if (m_uiWailingTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WALIING_SOULS_TARGETS) == CAST_OK)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_DRUID_MORPH_1_5, CAST_TRIGGERED);
+                    DoScriptText(EMOTE_WAILING_SOULS, m_creature);
+                    m_uiFace = FACE_WAILING;
+                    m_uiEndPhaseTimer = 12500;                  // 100000 (Duration of Wailing) + 3000(casting time) - 1000 (duration of whirl) + 500 (some add. time)
+                    m_uiWailingTimer = urand(25000, 35000);     // TODO
+                }
+            }
+            else
+                m_uiWailingTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_devourer_of_soulsAI(pCreature);
+    }
+};
+
+void AddSC_boss_devourer_of_souls()
+{
+    Script* s;
+
+    s = new boss_devourer_of_souls();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_devourer_of_souls";
+    //pNewScript->GetAI = &GetAI_boss_devourer_of_souls;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/forge_of_souls.h b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/forge_of_souls.h
new file mode 100644
index 000000000..35e9f8883
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/forge_of_souls.h
@@ -0,0 +1,40 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_FORGE_OF_SOULS_H
+#define DEF_FORGE_OF_SOULS_H
+
+enum
+{
+    MAX_ENCOUNTER               = 2,
+    TYPE_BRONJAHM               = 1,
+    TYPE_DEVOURER_OF_SOULS      = 2,
+    TYPE_ACHIEV_PHANTOM_BLAST   = 3,
+
+    DATA_SOULFRAGMENT_REMOVE    = 4,                        // on Death and on Use
+
+    NPC_BRONJAHM                = 36497,
+    NPC_DEVOURER_OF_SOULS       = 36502,
+    NPC_CORRUPTED_SOUL_FRAGMENT = 36535,
+
+    // Event NPCs
+    NPC_SILVANA_BEGIN           = 37596,
+    NPC_SILVANA_END             = 38161,
+    NPC_JAINA_BEGIN             = 37597,
+    NPC_JAINA_END               = 38160,
+    NPC_ARCHMAGE_ELANDRA        = 37774,
+    NPC_ARCHMAGE_KORELN         = 37582,
+    NPC_DARK_RANGER_KALIRA      = 37583,
+    NPC_DARK_RANGER_LORALEN     = 37779,
+    NPC_COLISEUM_CHAMPION_A_P   = 37498,                    // Alliance Paladin
+    NPC_COLISEUM_CHAMPION_A_F   = 37496,                    // Alliance Footman
+    NPC_COLISEUM_CHAMPION_A_M   = 37497,                    // Alliance Mage
+    NPC_COLISEUM_CHAMPION_H_F   = 37584,                    // Horde Footman
+    NPC_COLISEUM_CHAMPION_H_T   = 37587,                    // Horde Taure
+    NPC_COLISEUM_CHAMPION_H_M   = 37588,                    // Horde Mage
+
+    ACHIEV_CRIT_SOUL_POWER      = 12752,
+    ACHIEV_CRIT_PHANTOM_BLAST   = 12976,
+};
+#endif
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp
new file mode 100644
index 000000000..16fe8c1cc
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp
@@ -0,0 +1,293 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: instance_forge_of_souls
+SD%Complete: 90%
+SDComment: TODO: Movement of the extro-event is missing, implementation unclear!
+SDCategory: The Forge of Souls
+EndScriptData */
+
+#include "precompiled.h"
+#include "forge_of_souls.h"
+
+struct sIntoEventNpcSpawnLocations
+{
+    uint32 uiEntryHorde, uiEntryAlliance;
+    float fSpawnX, fSpawnY, fSpawnZ, fSpawnO;
+};
+
+/* Still TODO
+** We have 12 npc-entries to do moving, and often different waypoints for one entry
+** Best way to handle the paths of these mobs is still open
+*/
+
+struct sExtroEventNpcLocations
+{
+    uint32 uiEntryHorde, uiEntryAlliance;
+    float fStartO, fEndO;                                   // Orientation for Spawning
+    float fSpawnX, fSpawnY, fSpawnZ;
+    float fEndX, fEndY, fEndZ;
+};
+
+// TODO: verify Horde - Entries
+const sIntoEventNpcSpawnLocations aEventBeginLocations[3] =
+{
+    { NPC_SILVANA_BEGIN, NPC_JAINA_BEGIN, 4901.25439f, 2206.861f, 638.8166f, 5.88175964f },
+    { NPC_DARK_RANGER_KALIRA, NPC_ARCHMAGE_ELANDRA, 4899.709961f, 2205.899902f, 638.817017f, 5.864306f },
+    { NPC_DARK_RANGER_LORALEN, NPC_ARCHMAGE_KORELN, 4903.160156f, 2213.090088f, 638.817017f, 0.1745329f }
+};
+
+const sExtroEventNpcLocations aEventEndLocations[18] =
+{
+    // Horde Entry              Ally Entry                 O_Spawn     O_End      SpawnPos                             EndPos
+    { NPC_SILVANA_END, NPC_JAINA_END, 0.8901179f, 0.890118f, 5606.34033f, 2436.32129f, 705.9351f, 5638.404f, 2477.154f, 708.6932f },
+    { NPC_COLISEUM_CHAMPION_H_F, NPC_COLISEUM_CHAMPION_A_F, 0.9773844f, 1.780236f, 5593.632f, 2428.57983f, 705.9351f, 5695.879f, 2522.944f, 714.6915f },
+    { NPC_COLISEUM_CHAMPION_H_F, NPC_COLISEUM_CHAMPION_A_F, 1.1519173f, 1.78023f, 5594.079f, 2425.111f, 705.9351f, 5692.123f, 2522.613f, 714.6915f },
+    { NPC_COLISEUM_CHAMPION_H_F, NPC_COLISEUM_CHAMPION_A_F, 0.6108652f, 0.296706f, 5597.932f, 2421.78125f, 705.9351f, 5669.314f, 2540.029f, 714.6915f },
+    { NPC_COLISEUM_CHAMPION_H_F, NPC_COLISEUM_CHAMPION_A_F, 1.0471975f, 5.358161f, 5598.03564f, 2429.37671f, 705.9351f, 5639.267f, 2520.912f, 708.6959f },
+    { NPC_COLISEUM_CHAMPION_H_F, NPC_COLISEUM_CHAMPION_A_F, 0.8901179f, 0.112373f, 5600.836f, 2421.35938f, 705.9351f, 5668.145f, 2543.854f, 714.6915f },
+    { NPC_COLISEUM_CHAMPION_H_F, NPC_COLISEUM_CHAMPION_A_F, 0.8901179f, 5.358161f, 5600.848f, 2429.54517f, 705.9351f, 5639.961f, 2522.936f, 708.6959f },
+    { NPC_COLISEUM_CHAMPION_H_F, NPC_COLISEUM_CHAMPION_A_F, 0.8901179f, 5.347504f, 5601.46533f, 2426.77075f, 705.9351f, 5643.156f, 2525.342f, 708.6958f },
+    { NPC_COLISEUM_CHAMPION_H_F, NPC_COLISEUM_CHAMPION_A_F, 1.1519173f, 0.232039f, 5601.587f, 2418.60425f, 705.9351f, 5670.483f, 2536.204f, 714.6915f },
+    { NPC_DARK_RANGER_LORALEN, NPC_ARCHMAGE_KORELN, 0.7853982f, 3.717551f, 5606.35059f, 2432.88013f, 705.9351f, 5688.9f, 2538.981f, 714.6915f },
+    { NPC_DARK_RANGER_KALIRA, NPC_ARCHMAGE_ELANDRA, 0.9599311f, 4.694936f, 5602.80371f, 2435.66846f, 705.9351f, 5685.069f, 2541.771f, 714.6915f },
+    { NPC_COLISEUM_CHAMPION_H_T, NPC_COLISEUM_CHAMPION_A_P, 0.8552113f, 1.958489f, 5589.8125f, 2421.27075f, 705.9351f, 5669.351f, 2472.626f, 708.6959f },
+    { NPC_COLISEUM_CHAMPION_H_T, NPC_COLISEUM_CHAMPION_A_P, 0.8552113f, 2.111848f, 5592.2666f, 2419.37842f, 705.9351f, 5665.927f, 2470.574f, 708.6959f },
+    { NPC_COLISEUM_CHAMPION_H_T, NPC_COLISEUM_CHAMPION_A_P, 0.9075712f, 2.196496f, 5594.64746f, 2417.10767f, 705.9351f, 5662.503f, 2468.522f, 708.6958f },
+    { NPC_COLISEUM_CHAMPION_H_M, NPC_COLISEUM_CHAMPION_A_M, 1.0646508f, 0.837758f, 5585.49854f, 2418.22925f, 705.9351f, 5624.832f, 2473.713f, 708.6959f },
+    { NPC_COLISEUM_CHAMPION_H_M, NPC_COLISEUM_CHAMPION_A_M, 0.9424777f, 0.837758f, 5586.80029f, 2416.97388f, 705.9351f, 5627.443f, 2472.236f, 708.6959f },
+    { NPC_COLISEUM_CHAMPION_H_M, NPC_COLISEUM_CHAMPION_A_M, 0.9250245f, 0.977384f, 5591.653f, 2412.89771f, 705.9351f, 5637.912f, 2465.69f, 708.6959f },
+    { NPC_COLISEUM_CHAMPION_H_M, NPC_COLISEUM_CHAMPION_A_M, 0.8726646f, 0.977384f, 5593.93652f, 2410.875f, 705.9351f, 5642.629f, 2474.331f, 708.6959f }
+};
+
+struct is_forge_of_souls : public InstanceScript
+{
+    is_forge_of_souls() : InstanceScript("instance_forge_of_souls") {}
+
+    class  instance_forge_of_souls : public ScriptedInstance
+    {
+    public:
+        instance_forge_of_souls(Map* pMap) : ScriptedInstance(pMap),
+            m_bCriteriaPhantomBlastFailed(false),
+            m_uiTeam(0)
+        {
+            Initialize();
+        }
+
+        ~instance_forge_of_souls() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_BRONJAHM:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+
+            case NPC_CORRUPTED_SOUL_FRAGMENT:
+                m_luiSoulFragmentAliveGUIDs.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_BRONJAHM:
+                m_auiEncounter[0] = uiData;
+
+                // Despawn remaining adds and clear list
+                for (GuidList::const_iterator itr = m_luiSoulFragmentAliveGUIDs.begin(); itr != m_luiSoulFragmentAliveGUIDs.end(); ++itr)
+                {
+                    if (Creature* pFragment = instance->GetCreature(*itr))
+                        pFragment->ForcedDespawn();
+                }
+                m_luiSoulFragmentAliveGUIDs.clear();
+                break;
+            case TYPE_DEVOURER_OF_SOULS:
+                m_auiEncounter[1] = uiData;
+                if (uiData == DONE)
+                    ProcessEventNpcs(GetPlayerInMap(), true);
+                break;
+            case TYPE_ACHIEV_PHANTOM_BLAST:
+                m_bCriteriaPhantomBlastFailed = (uiData == FAIL);
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case TYPE_BRONJAHM:
+                return m_auiEncounter[0];
+            case TYPE_DEVOURER_OF_SOULS:
+                return m_auiEncounter[1];
+            default:
+                return 0;
+            }
+        }
+
+        void SetData64(uint32 uiType, uint64 uiData) override
+        {
+            if (uiType == DATA_SOULFRAGMENT_REMOVE)
+                m_luiSoulFragmentAliveGUIDs.remove(ObjectGuid(uiData));
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            if (!m_uiTeam)                                          // very first player to enter
+            {
+                m_uiTeam = pPlayer->GetTeam();
+                ProcessEventNpcs(pPlayer, false);
+            }
+        }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+            case ACHIEV_CRIT_SOUL_POWER:
+                return m_luiSoulFragmentAliveGUIDs.size() >= 4;
+            case ACHIEV_CRIT_PHANTOM_BLAST:
+                return !m_bCriteriaPhantomBlastFailed;
+            default:
+                return 0;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        void ProcessEventNpcs(Player* pPlayer, bool bChanged)
+        {
+            if (!pPlayer)
+                return;
+
+            if (m_auiEncounter[0] != DONE || m_auiEncounter[1] != DONE)
+            {
+                // Spawn Begin Mobs
+                for (uint8 i = 0; i < countof(aEventBeginLocations); ++i)
+                {
+                    if (Creature* pSummon = pPlayer->SummonCreature(m_uiTeam == HORDE ? aEventBeginLocations[i].uiEntryHorde : aEventBeginLocations[i].uiEntryAlliance,
+                        aEventBeginLocations[i].fSpawnX, aEventBeginLocations[i].fSpawnY, aEventBeginLocations[i].fSpawnZ, aEventBeginLocations[i].fSpawnO, TEMPSUMMON_DEAD_DESPAWN, 24 * HOUR * IN_MILLISECONDS))
+                        m_lEventMobGUIDs.push_back(pSummon->GetObjectGuid());
+                }
+            }
+            else
+            {
+                // if bChanged, despawn Begin Mobs, spawn End Mobs at Spawn, else spawn EndMobs at End
+                if (bChanged)
+                {
+                    for (GuidList::const_iterator itr = m_lEventMobGUIDs.begin(); itr != m_lEventMobGUIDs.end(); ++itr)
+                    {
+                        if (Creature* pSummoned = instance->GetCreature(*itr))
+                            pSummoned->ForcedDespawn();
+                    }
+
+                    for (uint8 i = 0; i < countof(aEventEndLocations); ++i)
+                    {
+                        pPlayer->SummonCreature(m_uiTeam == HORDE ? aEventEndLocations[i].uiEntryHorde : aEventEndLocations[i].uiEntryAlliance,
+                            aEventEndLocations[i].fSpawnX, aEventEndLocations[i].fSpawnY, aEventEndLocations[i].fSpawnZ, aEventEndLocations[i].fStartO, TEMPSUMMON_DEAD_DESPAWN, 24 * HOUR * IN_MILLISECONDS);
+
+                        // TODO: Let the NPCs Move along their paths
+                    }
+                }
+                else
+                {
+                    // Summon at end, without event
+                    for (uint8 i = 0; i < countof(aEventEndLocations); ++i)
+                    {
+                        pPlayer->SummonCreature(m_uiTeam == HORDE ? aEventEndLocations[i].uiEntryHorde : aEventEndLocations[i].uiEntryAlliance,
+                            aEventEndLocations[i].fEndX, aEventEndLocations[i].fEndY, aEventEndLocations[i].fEndZ, aEventEndLocations[i].fEndO, TEMPSUMMON_DEAD_DESPAWN, 24 * HOUR * IN_MILLISECONDS);
+                    }
+                }
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        bool m_bCriteriaPhantomBlastFailed;
+
+        uint32 m_uiTeam;                                    // Team of first entered player, used to set if Jaina or Silvana to spawn
+
+        GuidList m_luiSoulFragmentAliveGUIDs;
+        GuidList m_lEventMobGUIDs;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_forge_of_souls(pMap);
+    }
+};
+
+void AddSC_instance_forge_of_souls()
+{
+    Script* s;
+
+    s = new is_forge_of_souls();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_forge_of_souls";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_forge_of_souls;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/boss_falric.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/boss_falric.cpp
new file mode 100644
index 000000000..780849bb0
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/boss_falric.cpp
@@ -0,0 +1,31 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_falric
+SD%Complete: 0%
+SDComment:
+SDCategory: Halls of Reflection
+EndScriptData */
+
+#include "precompiled.h"
+
+void AddSC_boss_falric()
+{
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/boss_lich_king.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/boss_lich_king.cpp
new file mode 100644
index 000000000..7c4305423
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/boss_lich_king.cpp
@@ -0,0 +1,31 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_lich_king
+SD%Complete: 0%
+SDComment:
+SDCategory: Halls of Reflection
+EndScriptData */
+
+#include "precompiled.h"
+
+void AddSC_boss_lich_king()
+{
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/boss_marwyn.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/boss_marwyn.cpp
new file mode 100644
index 000000000..be41b119a
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/boss_marwyn.cpp
@@ -0,0 +1,31 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_marwyn
+SD%Complete: 0%
+SDComment:
+SDCategory: Halls of Reflection
+EndScriptData */
+
+#include "precompiled.h"
+
+void AddSC_boss_marwyn()
+{
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/halls_of_reflection.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/halls_of_reflection.cpp
new file mode 100644
index 000000000..ae09438ef
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/halls_of_reflection.cpp
@@ -0,0 +1,31 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: halls_of_reflection.cpp
+SD%Complete: 0
+SDComment: Placeholder
+SDCategory: Halls of Reflection
+EndScriptData */
+
+#include "precompiled.h"
+
+void AddSC_halls_of_reflection()
+{
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/halls_of_reflection.h b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/halls_of_reflection.h
new file mode 100644
index 000000000..6b5f9ef47
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/halls_of_reflection.h
@@ -0,0 +1,3 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp
new file mode 100644
index 000000000..52bcc1e97
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp
@@ -0,0 +1,31 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: instance_halls_of_reflection
+SD%Complete: 0
+SDComment: Placeholder
+SDCategory: Halls of Reflection
+EndScriptData */
+
+#include "precompiled.h"
+
+void AddSC_instance_halls_of_reflection()
+{
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp
new file mode 100644
index 000000000..2b54f5269
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp
@@ -0,0 +1,305 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_forgemaster_garfrost
+SD%Complete: 90
+SDComment: Tyrannus outro event NYI.
+SDCategory: Pit of Saron
+EndScriptData */
+
+#include "precompiled.h"
+#include "pit_of_saron.h"
+
+enum
+{
+    SAY_AGGRO                           = -1658014,
+    SAY_SLAY_1                          = -1658015,
+    SAY_BOULDER_HIT                     = -1658016,         // TODO How must this be handled?
+    SAY_DEATH                           = -1658017,
+    SAY_FORGE_1                         = -1658018,
+    SAY_FORGE_2                         = -1658019,
+
+    EMOTE_THROW_SARONITE                = -1658022,
+    EMOTE_DEEP_FREEZE                   = -1658023,
+
+    SPELL_PERMAFROST                    = 70326,
+    SPELL_PERMAFROST_AURA_H             = 70336,
+    SPELL_THROW_SARONITE                = 68788,
+    SPELL_THUNDERING_STOMP              = 68771,
+    SPELL_FORGE_FROZEN_BLADE            = 68774,
+    SPELL_CHILLING_WAVE                 = 68778,
+    SPELL_FORGE_FROSTBORN_MACE          = 68785,
+    SPELL_DEEP_FREEZE                   = 70381,
+
+    MAX_PERMAFROST_STACK                = 10,               // the max allowed stacks for the achiev to pass
+
+    PHASE_NO_ENCHANTMENT                = 1,
+    PHASE_BLADE_ENCHANTMENT             = 2,
+    PHASE_MACE_ENCHANTMENT              = 3,
+    PHASE_MOVEMENT                      = 4,
+};
+
+static const float aGarfrostMoveLocs[2][3] =
+{
+    {657.539f, -203.564f, 526.691f},
+    {719.785f, -230.227f, 527.033f},
+};
+
+static const float afOutroNpcSpawnLoc[4] = {695.0146f, -123.7532f, 515.3067f, 4.59f};
+
+struct boss_forgemaster_garfrost : public CreatureScript
+{
+    boss_forgemaster_garfrost() : CreatureScript("boss_forgemaster_garfrost") {}
+
+    struct boss_forgemaster_garfrostAI : public ScriptedAI
+    {
+        boss_forgemaster_garfrostAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiThrowSaroniteTimer;
+        uint32 m_uiPhase;
+        uint32 m_uiChillingWaveTimer;
+        uint32 m_uiDeepFreezeTimer;
+        uint32 m_uiCheckPermafrostTimer;
+
+        void Reset() override
+        {
+            m_uiCheckPermafrostTimer = 2000;
+            m_uiThrowSaroniteTimer = 13000;
+            m_uiChillingWaveTimer = 10000;
+            m_uiDeepFreezeTimer = 10000;
+            SetCombatMovement(true);
+            m_uiPhase = PHASE_NO_ENCHANTMENT;
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature, pWho);
+            DoCastSpellIfCan(m_creature, SPELL_PERMAFROST);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GARFROST, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            DoScriptText(SAY_DEATH, m_creature, pKiller);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GARFROST, DONE);
+
+                // Summon Ironskull or Victus for outro
+                m_creature->SummonCreature(m_pInstance->GetData(TYPE_DATA_PLAYER_TEAM) == HORDE ? NPC_IRONSKULL_PART1 : NPC_VICTUS_PART1,
+                    afOutroNpcSpawnLoc[0], afOutroNpcSpawnLoc[1], afOutroNpcSpawnLoc[2], afOutroNpcSpawnLoc[3], TEMPSUMMON_TIMED_DESPAWN, 2 * MINUTE * IN_MILLISECONDS);
+
+                // ToDo: handle the other npcs movement
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_SLAY_1, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GARFROST, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_IRONSKULL_PART1:
+            case NPC_VICTUS_PART1:
+            {
+                float fX, fY, fZ;
+                pSummoned->SetWalk(false);
+                m_creature->GetContactPoint(pSummoned, fX, fY, fZ, 4 * INTERACTION_DISTANCE);
+                pSummoned->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                break;
+            }
+            }
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != EFFECT_MOTION_TYPE)
+                return;
+
+            if (uiPointId != PHASE_BLADE_ENCHANTMENT && uiPointId != PHASE_MACE_ENCHANTMENT)
+                return;
+
+            // Cast and say expected spell
+            DoCastSpellIfCan(m_creature, uiPointId == PHASE_BLADE_ENCHANTMENT ? SPELL_FORGE_FROZEN_BLADE : SPELL_FORGE_FROSTBORN_MACE);
+            DoScriptText(uiPointId == PHASE_BLADE_ENCHANTMENT ? SAY_FORGE_1 : SAY_FORGE_2, m_creature);
+
+            m_uiThrowSaroniteTimer += 5000;                     // Delay next Saronit
+            m_uiPhase = uiPointId;
+            SetCombatMovement(true);
+
+            if (m_creature->getVictim())
+            {
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // This needs to be checked only on heroic
+            if (!m_bIsRegularMode && m_uiCheckPermafrostTimer)
+            {
+                if (m_uiCheckPermafrostTimer <= uiDiff) //@TODO rethink it with spellscripts maybe
+                {
+                    ThreatList playerList = m_creature->GetThreatManager().getThreatList();
+                    for (ThreatList::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr)
+                    {
+                        if (Player* pTarget = m_creature->GetMap()->GetPlayer((*itr)->getUnitGuid()))
+                        {
+                            Aura* pAuraIntenseCold = pTarget->GetAura(SPELL_PERMAFROST_AURA_H, EFFECT_INDEX_2);
+
+                            if (pAuraIntenseCold)
+                            {
+                                if (pAuraIntenseCold->GetStackAmount() > MAX_PERMAFROST_STACK)
+                                {
+                                    if (m_pInstance)
+                                        m_pInstance->SetData(TYPE_ACHIEV_DOESNT_GO_ELEVEN, uint32(false));
+
+                                    m_uiCheckPermafrostTimer = 0;
+                                    return;
+                                }
+                            }
+                        }
+                    }
+                    m_uiCheckPermafrostTimer = 1000;
+                }
+                else
+                    m_uiCheckPermafrostTimer -= uiDiff;
+            }
+
+            // Do nothing more while moving
+            if (m_uiPhase == PHASE_MOVEMENT)
+                return;
+
+            // Casted in every phase
+            if (m_uiThrowSaroniteTimer < uiDiff)
+            {
+                // TODO - only target players?
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_THROW_SARONITE) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_THROW_SARONITE, m_creature, pTarget);
+                        m_uiThrowSaroniteTimer = 16000;
+                    }
+                }
+            }
+            else
+                m_uiThrowSaroniteTimer -= uiDiff;
+
+            switch (m_uiPhase)
+            {
+            case PHASE_NO_ENCHANTMENT:
+                if (m_creature->GetHealthPercent() < 66.0f)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_THUNDERING_STOMP, CAST_INTERRUPT_PREVIOUS);
+                    SetCombatMovement(false);
+
+                    m_creature->GetMotionMaster()->MoveJump(aGarfrostMoveLocs[0][0], aGarfrostMoveLocs[0][1], aGarfrostMoveLocs[0][2], 3 * m_creature->GetSpeed(MOVE_RUN), 10.0f, PHASE_BLADE_ENCHANTMENT);
+                    m_uiPhase = PHASE_MOVEMENT;
+
+                    // Stop further action
+                    return;
+                }
+                break;
+            case PHASE_BLADE_ENCHANTMENT:
+                if (m_creature->GetHealthPercent() < 33.0f)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_THUNDERING_STOMP, CAST_INTERRUPT_PREVIOUS);
+                    SetCombatMovement(false);
+
+                    m_creature->GetMotionMaster()->MoveJump(aGarfrostMoveLocs[1][0], aGarfrostMoveLocs[1][1], aGarfrostMoveLocs[1][2], 3 * m_creature->GetSpeed(MOVE_RUN), 10.0f, PHASE_MACE_ENCHANTMENT);
+                    m_uiPhase = PHASE_MOVEMENT;
+
+                    // Stop further action
+                    return;
+                }
+
+                if (m_uiChillingWaveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CHILLING_WAVE) == CAST_OK)
+                        m_uiChillingWaveTimer = 14000;
+                }
+                else
+                    m_uiChillingWaveTimer -= uiDiff;
+
+                break;
+            case PHASE_MACE_ENCHANTMENT:
+                if (m_uiDeepFreezeTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_DEEP_FREEZE) == CAST_OK)
+                        {
+                            DoScriptText(EMOTE_DEEP_FREEZE, m_creature, pTarget);
+                            m_uiDeepFreezeTimer = 20000;
+                        }
+                    }
+                }
+                else
+                    m_uiDeepFreezeTimer -= uiDiff;
+
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_forgemaster_garfrostAI(pCreature);
+    }
+};
+
+void AddSC_boss_garfrost()
+{
+    Script* s;
+
+    s = new boss_forgemaster_garfrost();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_forgemaster_garfrost";
+    //pNewScript->GetAI = &GetAI_boss_forgemaster_garfrost;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/boss_krick_and_ick.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/boss_krick_and_ick.cpp
new file mode 100644
index 000000000..f90cabdc4
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/boss_krick_and_ick.cpp
@@ -0,0 +1,443 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_krick_and_ick
+SD%Complete: 95
+SDComment: Timers may need adjustments.
+SDCategory: Pit of Saron
+EndScriptData */
+
+#include "precompiled.h"
+#include "pit_of_saron.h"
+
+enum
+{
+    SAY_AGGRO                           = -1658024,
+    SAY_SLAY_1                          = -1658025,
+    SAY_SLAY_2                          = -1658026,
+    SAY_ORDER_STOP                      = -1658027,
+    SAY_ORDER_BLOW                      = -1658028,
+    SAY_TARGET_1                        = -1658029,
+    SAY_TARGET_2                        = -1658030,
+    SAY_TARGET_3                        = -1658031,
+    SAY_OUTRO_1                         = -1658035,
+
+    EMOTE_KRICK_MINES                   = -1658032,
+    EMOTE_ICK_POISON                    = -1658033,
+    EMOTE_ICK_CHASING                   = -1658034,
+
+    // ick spells
+    SPELL_POISON_NOVA                   = 68989,
+    SPELL_MIGHTY_KICK                   = 69021,
+    SPELL_PURSUIT                       = 68987,
+    SPELL_EXPLOSIVE_BARRAGE_ICK         = 69263,
+
+    // krick spells
+    SPELL_TOXIC_WASTE                   = 69024,
+    SPELL_SHADOW_BOLT                   = 69028,
+    SPELL_EXPLOSIVE_BARRAGE_KRICK       = 69012,                // Triggers 69015 every 2 sec
+
+    NPC_EXPLODING_ORB                   = 36610,
+
+    // exploding orb spells
+    // SPELL_EXPLOSIVE_BARRAGE_SUMMON   = 69015,
+    SPELL_EXPLODING_ORB_VISUAL          = 69017,
+    SPELL_AUTO_GROW_AND_SPEED_BOOST     = 69020,
+    SPELL_EXPLOSIVE_BARRAGE_DMG         = 69019,
+    SPELL_HASTY_GROW                    = 44851,                // Orb explodes after the 15th stack
+
+    MAX_HASTY_GROW_STACKS               = 15,
+};
+
+static const float afOutroNpcSpawnLoc[4] = {777.2274f, 119.5521f, 510.0363f, 6.05f};
+static const float afTyrannusTeleLoc[4] = {841.01f, 196.245f, 573.964f, 4.46f};
+
+/*######
+## boss_ick
+######*/
+
+struct boss_ick : public CreatureScript
+{
+    boss_ick() : CreatureScript("boss_ick") {}
+
+    struct boss_ickAI : public ScriptedAI
+    {
+        boss_ickAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_uiMountTimer = 1000;
+        }
+
+        ScriptedInstance* m_pInstance;
+        uint32 m_uiMountTimer;
+
+        uint32 m_uiPoisonNovaTimer;
+        uint32 m_uiPursueTimer;
+        uint32 m_uiMightKickTimer;
+        uint32 m_uiToxicWasteTimer;
+        uint32 m_uiShadowboltTimer;
+        uint32 m_uiExplosivBarrageTimer;
+        uint32 m_uiCooldownTimer;
+
+        void Reset() override
+        {
+            m_uiPoisonNovaTimer = urand(20000, 25000);
+            m_uiPursueTimer = 20000;
+            m_uiMightKickTimer = 1000;
+            m_uiToxicWasteTimer = urand(3000, 5000);
+            m_uiShadowboltTimer = urand(5000, 7000);
+            m_uiExplosivBarrageTimer = urand(30000, 35000);
+            m_uiCooldownTimer = 0;
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KRICK, IN_PROGRESS);
+
+                // Say aggro and also put Krick in combat
+                if (Creature* pKrick = m_pInstance->GetSingleCreatureFromStorage(NPC_KRICK))
+                {
+                    DoScriptText(SAY_AGGRO, pKrick);
+                    pKrick->AI()->AttackStart(pWho);
+                }
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/)
+        {
+            if (m_pInstance)
+            {
+                if (Creature* pKrick = m_pInstance->GetSingleCreatureFromStorage(NPC_KRICK))
+                    DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, pKrick);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KRICK, DONE);
+
+                if (Creature* pKrick = m_pInstance->GetSingleCreatureFromStorage(NPC_KRICK))
+                {
+                    DoScriptText(SAY_OUTRO_1, pKrick);
+                    pKrick->AI()->EnterEvadeMode();
+
+                    // Summon Jaina or Sylvanas for epilogue
+                    pKrick->SummonCreature(m_pInstance->GetData(TYPE_DATA_PLAYER_TEAM) == HORDE ? NPC_SYLVANAS_PART1 : NPC_JAINA_PART1,
+                        afOutroNpcSpawnLoc[0], afOutroNpcSpawnLoc[1], afOutroNpcSpawnLoc[2], afOutroNpcSpawnLoc[3], TEMPSUMMON_TIMED_DESPAWN, 2 * MINUTE * IN_MILLISECONDS);
+                }
+
+                if (Creature* pTyrannus = m_pInstance->GetSingleCreatureFromStorage(NPC_TYRANNUS_INTRO))
+                    pTyrannus->NearTeleportTo(afTyrannusTeleLoc[0], afTyrannusTeleLoc[1], afTyrannusTeleLoc[2], afTyrannusTeleLoc[3]);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_KRICK, FAIL);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_pInstance)
+                return;
+
+            // He needs to be mounted manually, not by vehicle_accessories
+            if (m_uiMountTimer)
+            {
+                if (m_uiMountTimer <= uiDiff)
+                {
+                    if (Creature* pKrick = m_pInstance->GetSingleCreatureFromStorage(NPC_KRICK))
+                        pKrick->CastSpell(m_creature, SPELL_RIDE_VEHICLE_HARDCODED, true);
+
+                    m_uiMountTimer = 0;
+                }
+                else
+                    m_uiMountTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Cooldown timer - we need to block all Krick spell during some events
+            if (m_uiCooldownTimer)
+            {
+                if (m_uiCooldownTimer <= uiDiff)
+                    m_uiCooldownTimer = 0;
+                else
+                    m_uiCooldownTimer -= uiDiff;
+
+                return;
+            }
+
+            if (m_uiPoisonNovaTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_POISON_NOVA) == CAST_OK)
+                {
+                    if (Creature* pKrick = m_pInstance->GetSingleCreatureFromStorage(NPC_KRICK))
+                    {
+                        DoScriptText(SAY_ORDER_BLOW, pKrick);
+                        DoScriptText(EMOTE_ICK_POISON, pKrick);
+                    }
+
+                    m_uiCooldownTimer = 5000;
+                    m_uiPoisonNovaTimer = urand(20000, 25000);
+                }
+            }
+            else
+                m_uiPoisonNovaTimer -= uiDiff;
+
+            if (m_uiPursueTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_PURSUIT) == CAST_OK)
+                {
+                    if (Creature* pKrick = m_pInstance->GetSingleCreatureFromStorage(NPC_KRICK))
+                    {
+                        switch (urand(0, 2))
+                        {
+                        case 0: DoScriptText(SAY_TARGET_1, pKrick); break;
+                        case 1: DoScriptText(SAY_TARGET_2, pKrick); break;
+                        case 2: DoScriptText(SAY_TARGET_3, pKrick); break;
+                        }
+                    }
+
+                    m_uiCooldownTimer = 17000;
+                    m_uiPursueTimer = urand(50000, 70000);
+                }
+            }
+            else
+                m_uiPursueTimer -= uiDiff;
+
+            if (m_uiMightKickTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MIGHTY_KICK) == CAST_OK)
+                    m_uiMightKickTimer = 10000;
+            }
+            else
+                m_uiMightKickTimer -= uiDiff;
+
+            if (m_uiToxicWasteTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (Creature* pKrick = m_pInstance->GetSingleCreatureFromStorage(NPC_KRICK))
+                        pKrick->CastSpell(pTarget, SPELL_TOXIC_WASTE, true);
+
+                    m_uiToxicWasteTimer = urand(3000, 5000);
+                }
+            }
+            else
+                m_uiToxicWasteTimer -= uiDiff;
+
+            if (m_uiShadowboltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (Creature* pKrick = m_pInstance->GetSingleCreatureFromStorage(NPC_KRICK))
+                        pKrick->CastSpell(pTarget, SPELL_SHADOW_BOLT, true);
+
+                    m_uiShadowboltTimer = urand(4000, 8000);
+                }
+            }
+            else
+                m_uiShadowboltTimer -= uiDiff;
+
+            if (m_uiExplosivBarrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_EXPLOSIVE_BARRAGE_ICK) == CAST_OK)
+                {
+                    if (Creature* pKrick = m_pInstance->GetSingleCreatureFromStorage(NPC_KRICK))
+                    {
+                        pKrick->CastSpell(pKrick, SPELL_EXPLOSIVE_BARRAGE_KRICK, true);
+
+                        DoScriptText(SAY_ORDER_STOP, pKrick);
+                        DoScriptText(EMOTE_KRICK_MINES, pKrick);
+                    }
+
+                    m_uiCooldownTimer = 20000;
+                    m_uiExplosivBarrageTimer = urand(25000, 30000);
+                }
+            }
+            else
+                m_uiExplosivBarrageTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ickAI(pCreature);
+    }
+};
+
+/*######
+## boss_krick
+######*/
+
+struct boss_krick : public CreatureScript
+{
+    boss_krick() : CreatureScript("boss_krick") {}
+
+    struct boss_krickAI : public ScriptedAI
+    {
+        boss_krickAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override { }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+
+            // Don't handle movement. Boss is on vehicle so he doesn't have to go anywhere. On epilogue he needs to stay in place
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_SYLVANAS_PART1:
+            case NPC_JAINA_PART1:
+            {
+                float fX, fY, fZ;
+                pSummoned->SetWalk(false);
+                m_creature->GetContactPoint(pSummoned, fX, fY, fZ, 2 * INTERACTION_DISTANCE);
+                pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                break;
+            }
+            case NPC_EXPLODING_ORB:
+                pSummoned->CastSpell(pSummoned, SPELL_EXPLODING_ORB_VISUAL, true);
+                pSummoned->CastSpell(pSummoned, SPELL_AUTO_GROW_AND_SPEED_BOOST, true);
+                break;
+            }
+        }
+
+        void SummonedMovementInform(Creature* /*pSummoned*/, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_KRICK, SPECIAL);
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_krickAI(pCreature);
+    }
+};
+
+/*######
+## npc_exploding_orb
+######*/
+
+struct npc_exploding_orb : public CreatureScript
+{
+    npc_exploding_orb() : CreatureScript("npc_exploding_orb") {}
+
+    struct npc_exploding_orbAI : public Scripted_NoMovementAI
+    {
+        npc_exploding_orbAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        uint8 m_uiGrowCount;
+
+        void Reset() override
+        {
+            m_uiGrowCount = 0;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_HASTY_GROW)
+            {
+                ++m_uiGrowCount;
+
+                if (m_uiGrowCount == MAX_HASTY_GROW_STACKS)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_EXPLOSIVE_BARRAGE_DMG) == CAST_OK)
+                    {
+                        m_creature->RemoveAllAuras();
+                        m_creature->ForcedDespawn(1000);
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_exploding_orbAI(pCreature);
+    }
+};
+
+void AddSC_boss_krick_and_ick()
+{
+    Script* s;
+
+    s = new boss_ick();
+    s->RegisterSelf();
+    s = new boss_krick();
+    s->RegisterSelf();
+    s = new npc_exploding_orb();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ick";
+    //pNewScript->GetAI = &GetAI_boss_ick;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_krick";
+    //pNewScript->GetAI = &GetAI_boss_krick;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_exploding_orb";
+    //pNewScript->GetAI = &GetAI_npc_exploding_orb;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp
new file mode 100644
index 000000000..652a5e87b
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp
@@ -0,0 +1,350 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_scourgelord_tyrannus
+SD%Complete: 90
+SDComment: Small adjustments may be required
+SDCategory: Pit of Saron
+EndScriptData */
+
+#include "precompiled.h"
+#include "pit_of_saron.h"
+
+enum
+{
+    SAY_AGGRO                           = -1658053,
+    SAY_SLAY_1                          = -1658054,
+    SAY_SLAY_2                          = -1658055,
+    SAY_DEATH                           = -1658056,
+    SAY_MARK                            = -1658057,
+    SAY_SMASH                           = -1658058,
+
+    EMOTE_RIMEFANG_ICEBOLT              = -1658059,
+    EMOTE_SMASH                         = -1658060,
+
+    // Tyrannus spells
+    SPELL_FORCEFUL_SMASH                = 69155,
+    SPELL_OVERLORDS_BRAND               = 69172,                // triggers 69189 and 69190 from target
+    SPELL_UNHOLY_POWER                  = 69167,
+    SPELL_MARK_OF_RIMEFANG              = 69275,
+
+    // Rimefang spells
+    SPELL_HOARFROST                     = 69246,
+    SPELL_ICY_BLAST                     = 69232,
+    SPELL_KILLING_ICE                   = 72531,
+
+    // Icy blast
+    // SPELL_ICY_BLAST_AURA             = 69238,
+    NPC_ICY_BLAST                       = 36731,                // handled in eventAI
+};
+
+static const float afRimefangExitPos[3] = {1248.29f, 145.924f, 733.914f};
+
+/*######
+## boss_tyrannus
+######*/
+
+struct boss_tyrannus : public CreatureScript
+{
+    boss_tyrannus() : CreatureScript("boss_tyrannus") {}
+
+    struct boss_tyrannusAI : public ScriptedAI
+    {
+        boss_tyrannusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiForcefulSmashTimer;
+        uint32 m_uiOverlordsBrandTimer;
+        uint32 m_uiUnholyPowerTimer;
+        uint32 m_uiMarkOfRimefangTimer;
+
+        void Reset() override
+        {
+            m_uiForcefulSmashTimer = 10000;
+            m_uiOverlordsBrandTimer = 9000;
+            m_uiUnholyPowerTimer = urand(30000, 35000);
+            m_uiMarkOfRimefangTimer = 20000;
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_TYRANNUS, IN_PROGRESS);
+
+                // Set Rimefang in combat - ToDo: research if it has some wp movement during combat
+                if (Creature* pRimefang = m_pInstance->GetSingleCreatureFromStorage(NPC_RIMEFANG))
+                    pRimefang->AI()->AttackStart(pWho);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/)
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_TYRANNUS, DONE);
+
+                // Move Rimefang out of the area
+                if (Creature* pRimefang = m_pInstance->GetSingleCreatureFromStorage(NPC_RIMEFANG))
+                {
+                    pRimefang->AI()->EnterEvadeMode();
+                    pRimefang->SetWalk(false);
+                    pRimefang->ForcedDespawn(25000);
+                    pRimefang->GetMotionMaster()->MovePoint(0, afRimefangExitPos[0], afRimefangExitPos[1], afRimefangExitPos[2]);
+                }
+
+                // Move the general near the boss - ToDo: move the other freed slaves as well
+                if (Creature* pGeneral = m_pInstance->GetSingleCreatureFromStorage(m_pInstance->GetData(TYPE_DATA_PLAYER_TEAM) == HORDE ? NPC_IRONSKULL_PART2 : NPC_VICTUS_PART2))
+                {
+                    float fX, fY, fZ;
+                    pGeneral->SetWalk(false);
+                    m_creature->GetContactPoint(pGeneral, fX, fY, fZ, INTERACTION_DISTANCE);
+                    pGeneral->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                }
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_TYRANNUS, FAIL);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiForcefulSmashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FORCEFUL_SMASH) == CAST_OK)
+                    m_uiForcefulSmashTimer = 50000;
+            }
+            else
+                m_uiForcefulSmashTimer -= uiDiff;
+
+            if (m_uiOverlordsBrandTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_OVERLORDS_BRAND) == CAST_OK)
+                        m_uiOverlordsBrandTimer = urand(10000, 13000);
+                }
+            }
+            else
+                m_uiOverlordsBrandTimer -= uiDiff;
+
+            if (m_uiUnholyPowerTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_UNHOLY_POWER) == CAST_OK)
+                {
+                    DoScriptText(SAY_SMASH, m_creature);
+                    DoScriptText(EMOTE_SMASH, m_creature);
+                    m_uiUnholyPowerTimer = 60000;
+                }
+            }
+            else
+                m_uiUnholyPowerTimer -= uiDiff;
+
+            if (m_uiMarkOfRimefangTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_MARK_OF_RIMEFANG) == CAST_OK)
+                    {
+                        DoScriptText(SAY_MARK, m_creature);
+                        if (m_pInstance)
+                        {
+                            if (Creature* pRimefang = m_pInstance->GetSingleCreatureFromStorage(NPC_RIMEFANG))
+                            {
+                                pRimefang->InterruptNonMeleeSpells(true);
+                                pRimefang->CastSpell(pTarget, SPELL_HOARFROST, false);
+                                DoScriptText(EMOTE_RIMEFANG_ICEBOLT, pRimefang, pTarget);
+                            }
+                        }
+                        m_uiMarkOfRimefangTimer = urand(20000, 25000);
+                    }
+                }
+            }
+            else
+                m_uiMarkOfRimefangTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_tyrannusAI(pCreature);
+    }
+};
+
+/*######
+## boss_rimefang_pos
+######*/
+
+struct boss_rimefang_pos : public CreatureScript
+{
+    boss_rimefang_pos() : CreatureScript("boss_rimefang_pos") {}
+
+    struct boss_rimefang_posAI : public ScriptedAI
+    {
+        boss_rimefang_posAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            SetCombatMovement(false);
+            m_bHasDoneIntro = false;
+            m_uiMountTimer = 1000;
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+        uint32 m_uiMountTimer;
+
+        uint32 m_uiIcyBlastTimer;
+        bool m_bHasDoneIntro;
+
+        void Reset() override
+        {
+            m_uiIcyBlastTimer = 8000;
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+
+            // Don't handle movement.
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            // Don't attack unless Tyrannus is in combat or Ambush is completed
+            if (m_pInstance && (m_pInstance->GetData(TYPE_AMBUSH) != DONE || m_pInstance->GetData(TYPE_TYRANNUS) != IN_PROGRESS))
+                return;
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_pInstance)
+                return;
+
+            // Check if ambush is done
+            if (m_pInstance->GetData(TYPE_AMBUSH) != DONE)
+                return;
+
+            // Start the intro when possible
+            if (!m_bHasDoneIntro && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 85.0f) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                m_pInstance->SetData(TYPE_TYRANNUS, SPECIAL);
+                m_bHasDoneIntro = true;
+                return;
+            }
+
+            // Check for out of range players - ToDo: confirm the distance
+            if (m_pInstance->GetData(TYPE_TYRANNUS) == IN_PROGRESS && pWho->GetTypeId() == TYPEID_PLAYER && !m_creature->IsWithinDistInMap(pWho, DEFAULT_VISIBILITY_INSTANCE))
+                DoCastSpellIfCan(pWho, SPELL_KILLING_ICE);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_pInstance)
+                return;
+
+            // He needs to be mounted manually, not by vehicle_accessories
+            if (m_uiMountTimer)
+            {
+                if (m_uiMountTimer <= uiDiff)
+                {
+                    if (Creature* pTyrannus = m_pInstance->GetSingleCreatureFromStorage(NPC_TYRANNUS))
+                        pTyrannus->CastSpell(m_creature, SPELL_RIDE_VEHICLE_HARDCODED, true);
+
+                    m_uiMountTimer = 0;
+                }
+                else
+                    m_uiMountTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiIcyBlastTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_ICY_BLAST) == CAST_OK)
+                    {
+                        m_creature->SummonCreature(NPC_ICY_BLAST, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 90000);
+                        m_uiIcyBlastTimer = 8000;
+                    }
+                }
+            }
+            else
+                m_uiIcyBlastTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_rimefang_posAI(pCreature);
+    }
+};
+
+void AddSC_boss_tyrannus()
+{
+    Script* s;
+
+    s = new boss_tyrannus();
+    s->RegisterSelf();
+    s = new boss_rimefang_pos();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_tyrannus";
+    //pNewScript->GetAI = &GetAI_boss_tyrannus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_rimefang_pos";
+    //pNewScript->GetAI = &GetAI_boss_rimefang_pos;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp
new file mode 100644
index 000000000..5331ab47f
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp
@@ -0,0 +1,745 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+* 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: instance_pit_of_saron
+SD%Complete: 80%
+SDComment:
+SDCategory: Pit of Saron
+EndScriptData */
+
+#include "precompiled.h"
+#include "pit_of_saron.h"
+
+enum
+{
+    // Intro
+    SAY_TYRANNUS_INTRO_1            = -1658001,
+    SAY_JAINA_INTRO_1               = -1658002,
+    SAY_SYLVANAS_INTRO_1            = -1658003,
+    SAY_TYRANNUS_INTRO_2            = -1658004,
+    SAY_TYRANNUS_INTRO_3            = -1658005,
+    SAY_JAINA_INTRO_2               = -1658006,
+    SAY_SYLVANAS_INTRO_2            = -1658007,
+    SAY_TYRANNUS_INTRO_4            = -1658008,
+    SAY_JAINA_INTRO_3               = -1658009,
+    SAY_JAINA_INTRO_4               = -1658010,
+    SAY_SYLVANAS_INTRO_3            = -1658011,
+    SAY_JAINA_INTRO_5               = -1658012,
+    SAY_SYLVANAS_INTRO_4            = -1658013,
+
+    // Intro spells
+    SPELL_NECROMATIC_POWER          = 69347,
+    SPELL_FEIGN_DEATH               = 28728,
+    SPELL_RAISE_DEAD                = 69350,
+
+    // Garfrost outro
+    SAY_TYRANNUS_GARFROST           = -1658020,
+    SAY_GENERAL_GARFROST            = -1658021,
+
+    // Ick and Krick outro
+    SAY_JAINA_KRICK_1               = -1658036,
+    SAY_SYLVANAS_KRICK_1            = -1658037,
+    SAY_OUTRO_2                     = -1658038,
+    SAY_JAINA_KRICK_2               = -1658039,
+    SAY_SYLVANAS_KRICK_2            = -1658040,
+    SAY_OUTRO_3                     = -1658041,
+    SAY_TYRANNUS_KRICK_1            = -1658042,
+    SAY_OUTRO_4                     = -1658043,
+    SAY_TYRANNUS_KRICK_2            = -1658044,
+    SAY_JAINA_KRICK_3               = -1658045,
+    SAY_SYLVANAS_KRICK_3            = -1658046,
+
+    // Ick and Krick outro spells
+    SPELL_STRANGULATING             = 69413,
+    SPELL_KRICK_KILL_CREDIT         = 71308,
+    SPELL_SUICIDE                   = 7,
+
+    // Ambush and Gauntlet
+    SAY_TYRANNUS_AMBUSH_1           = -1658047,
+    SAY_TYRANNUS_AMBUSH_2           = -1658048,
+    SAY_GAUNTLET                    = -1658049,
+
+    // Gauntlet spells
+    SPELL_ICICLE_SUMMON             = 69424,
+    SPELL_ACHIEVEMENT_CHECK         = 72845,
+
+    // Tyrannus intro
+    SAY_PREFIGHT_1                  = -1658050,
+    SAY_VICTUS_TRASH                = -1658051,
+    SAY_IRONSKULL_TRASH             = -1658068,
+    SAY_PREFIGHT_2                  = -1658052,
+
+    SPELL_EJECT_ALL_PASSENGERS      = 50630,
+    // SPELL_CSA_DUMMY_EFFECT_1     = 56685,                // What is this?
+
+    // Sindragosa outro
+    SAY_VICTUS_OUTRO_1              = -1658061,
+    SAY_IRONSKULL_OUTRO_2           = -1658069,
+    SAY_GENERAL_OUTRO_2             = -1658062,
+    SAY_JAINA_OUTRO_1               = -1658063,
+    SAY_SYLVANAS_OUTRO_1            = -1658064,
+    SAY_JAINA_OUTRO_2               = -1658065,
+    SAY_JAINA_OUTRO_3               = -1658066,
+    SAY_SYLVANAS_OUTRO_2            = -1658067,
+
+    SPELL_FROST_BOMB                = 70521,
+    SPELL_FROZEN_AFTERMATH          = 70518,
+    SPELL_ARCANE_FORM               = 70573,
+    SPELL_CALL_OF_SYLVANAS_1        = 70636,                // triggers 70639
+    SPELL_CALL_OF_SYLVANAS_2        = 70638,
+    // SPELL_CALL_OF_SYLVANAS_3     = 70642,
+    SPELL_JAINAS_CALL_1             = 70527,                // triggers 70525
+    SPELL_JAINAS_CALL_2             = 70623,
+};
+
+static const DialogueEntryTwoSide aPoSDialogues[] =
+{
+    // Instance intro
+    {NPC_TYRANNUS_INTRO,   0,                  0,                    0,                  4000},
+    {SAY_TYRANNUS_INTRO_1, NPC_TYRANNUS_INTRO, 0,                    0,                  6000},
+    {SAY_TYRANNUS_INTRO_2, NPC_TYRANNUS_INTRO, 0,                    0,                  12000},
+    {SAY_JAINA_INTRO_1,    NPC_JAINA_PART1,    SAY_SYLVANAS_INTRO_1, NPC_SYLVANAS_PART1, 5000},         // ToDo: move the soldiers to attack position
+    {SAY_TYRANNUS_INTRO_3, NPC_TYRANNUS_INTRO, 0,                    0,                  5000},
+    {SPELL_NECROMATIC_POWER, 0,                0,                    0,                  3000},
+    {SAY_JAINA_INTRO_2,    NPC_JAINA_PART1,    SAY_SYLVANAS_INTRO_2, NPC_SYLVANAS_PART1, 4000},
+    {SAY_TYRANNUS_INTRO_4, NPC_TYRANNUS_INTRO, 0,                    0,                  4000},         // ToDo: send the solderis back to fight as zombies
+    {SAY_JAINA_INTRO_3,    NPC_JAINA_PART1,    0,                    0,                  6000},
+    {SAY_JAINA_INTRO_4,    NPC_JAINA_PART1,    SAY_SYLVANAS_INTRO_3, NPC_SYLVANAS_PART1, 5000},
+    {SAY_JAINA_INTRO_5,    NPC_JAINA_PART1,    SAY_SYLVANAS_INTRO_4, NPC_SYLVANAS_PART1, 0},
+
+    // Garfrost outro
+    {NPC_GARFROST,         0,                  0,                    0,                  4000},         // ToDo: move the freed slaves to position
+    {SAY_GENERAL_GARFROST, NPC_VICTUS_PART1,   SAY_GENERAL_GARFROST, NPC_IRONSKULL_PART1, 2000},
+    {SAY_TYRANNUS_GARFROST, NPC_TYRANNUS_INTRO, 0,                   0,                  0},
+
+    // Ick and Krick outro
+    {SAY_JAINA_KRICK_1,    NPC_JAINA_PART1,    SAY_SYLVANAS_KRICK_1, NPC_SYLVANAS_PART1, 6000},
+    {SAY_OUTRO_2,          NPC_KRICK,          0,                    0,                  16000},
+    {SAY_JAINA_KRICK_2,    NPC_JAINA_PART1,    SAY_SYLVANAS_KRICK_2, NPC_SYLVANAS_PART1, 7000},
+    {SAY_OUTRO_3,          NPC_KRICK,          0,                    0,                  7000},
+    {SAY_TYRANNUS_KRICK_1, NPC_TYRANNUS_INTRO, 0,                    0,                  3000},
+    {SPELL_STRANGULATING,  0,                  0,                    0,                  3000},
+    {SAY_OUTRO_4,          NPC_KRICK,          0,                    0,                  3000},
+    {SAY_TYRANNUS_KRICK_2, NPC_TYRANNUS_INTRO, 0,                    0,                  11000},
+    {SAY_JAINA_KRICK_3,    NPC_JAINA_PART1,    SAY_SYLVANAS_KRICK_3, NPC_SYLVANAS_PART1, 0},
+
+    // Tyrannus intro
+    {NPC_TYRANNUS,         0,                  0,                    0,                  10000},        // ToDo: move the freed slaves to position
+    {SAY_PREFIGHT_1,       NPC_TYRANNUS,       0,                    0,                  13000},
+    {SAY_VICTUS_TRASH,     NPC_VICTUS_PART2,   SAY_IRONSKULL_TRASH,  NPC_IRONSKULL_PART2, 9000},
+    {SAY_PREFIGHT_2,       NPC_TYRANNUS,       0,                    0,                  10000},
+    {NPC_RIMEFANG,         0,                  0,                    0,                  0},
+
+    // Tyrannus outro
+    {NPC_SINDRAGOSA,       0,                  0,                    0,                  30000},
+    {SAY_VICTUS_OUTRO_1,   NPC_VICTUS_PART2,   SAY_IRONSKULL_OUTRO_2, NPC_IRONSKULL_PART2, 17000},
+    {SAY_GENERAL_OUTRO_2,  NPC_VICTUS_PART2,   SAY_GENERAL_OUTRO_2,  NPC_IRONSKULL_PART2, 14000},
+    {SAY_JAINA_OUTRO_1,    NPC_JAINA_PART2,    SAY_SYLVANAS_OUTRO_1, NPC_SYLVANAS_PART2,  1000},
+    {SPELL_FROST_BOMB,     0,                  0,                    0,                   7000},
+    {NPC_JAINA_PART2,      0,                  0,                    0,                   8000},
+    {SAY_JAINA_OUTRO_2,    NPC_JAINA_PART2,    SAY_SYLVANAS_OUTRO_2, NPC_SYLVANAS_PART2,  15000},
+    {SAY_JAINA_OUTRO_3,    NPC_JAINA_PART2,    0,                    0,                   0},
+    {0, 0, 0, 0, 0},
+};
+
+static const float afTyrannusMovePos[4][3] =
+{
+    { 922.6365f, 145.877f, 643.2216f },                       // Hide position
+    { 835.5887f, 139.4345f, 530.9526f },                      // Ick position
+    { 906.9048f, -49.03813f, 618.8016f },                     // Tunnel position
+    { 966.3345f, 159.2058f, 665.0453f },                      // Rimefang position
+};
+
+struct EventNpcLocations
+{
+    uint32 uiEntryHorde, uiEntryAlliance;
+    float fX, fY, fZ, fO;
+    float fMoveX, fMoveY, fMoveZ;
+};
+
+const EventNpcLocations aEventBeginLocations[3] =
+{
+    { NPC_SYLVANAS_PART1, NPC_JAINA_PART1, 430.3012f, 212.204f, 530.1146f, 0.042f, 440.7882f, 213.7587f, 528.7103f },
+    { NPC_KILARA, NPC_ELANDRA, 429.7142f, 212.3021f, 530.2822f, 0.14f, 438.9462f, 215.4271f, 528.7087f },
+    { NPC_LORALEN, NPC_KORELN, 429.5675f, 211.7748f, 530.3246f, 5.972f, 438.5052f, 211.5399f, 528.7085f },
+    // ToDo: add the soldiers here when proper waypoint movement is supported
+};
+
+const EventNpcLocations aEventFirstAmbushLocations[2] =
+{
+    { NPC_YMIRJAR_DEATHBRINGER, 0, 951.6696f, 53.06405f, 567.5153f, 1.51f, 914.7256f, 76.66406f, 553.8029f },
+    { NPC_YMIRJAR_DEATHBRINGER, 0, 950.9911f, 60.26712f, 566.7658f, 1.79f, 883.1805f, 52.69792f, 527.6385f },
+};
+
+const EventNpcLocations aEventSecondAmbushLocations[] =
+{
+    { NPC_FALLEN_WARRIOR, 0, 916.658f, -55.94097f, 591.6827f, 1.85f, 950.5694f, 31.85649f, 572.2693f },
+    { NPC_FALLEN_WARRIOR, 0, 923.8055f, -55.63195f, 591.8663f, 1.85f, 941.3954f, 35.83769f, 571.4308f },
+    { NPC_FALLEN_WARRIOR, 0, 936.0625f, -53.52778f, 592.0226f, 1.85f, 934.8011f, 8.024931f, 577.3419f },
+    { NPC_FALLEN_WARRIOR, 0, 919.7518f, -68.39236f, 592.2916f, 1.85f, 932.5734f, -22.54153f, 587.403f },
+    { NPC_FALLEN_WARRIOR, 0, 926.8993f, -68.08334f, 592.0798f, 1.85f, 922.6043f, -22.07627f, 585.6684f },
+    { NPC_FALLEN_WARRIOR, 0, 939.1563f, -65.97916f, 592.2205f, 1.85f, 927.0928f, -32.97949f, 589.3028f },
+    { NPC_COLDWRAITH, 0, 924.0261f, -62.3316f, 592.0191f, 2.01f, 929.4673f, 9.722589f, 577.4904f },
+    { NPC_COLDWRAITH, 0, 936.4531f, -60.45486f, 592.1215f, 1.63f, 936.1395f, -4.003471f, 581.3139f },
+    { NPC_COLDWRAITH, 0, 935.8055f, -72.76736f, 592.077f, 1.66f, 933.8441f, -47.83234f, 591.7538f },
+    { NPC_COLDWRAITH, 0, 923.3785f, -74.6441f, 592.368f, 2.37f, 920.726f, -42.32272f, 589.9808f }
+};
+
+const EventNpcLocations aEventTunnelEndLocations[] =
+{
+    { NPC_IRONSKULL_PART2, NPC_VICTUS_PART2, 1071.45f, 48.23907f, 630.4871f, 1.68f, 1046.361f, 124.7031f, 628.2811f },
+    // ToDo: add the freed slaves here when proper waypoint movement is supported
+};
+const EventNpcLocations aEventOutroLocations[] =
+{
+    { NPC_SINDRAGOSA, 0, 842.8611f, 194.5556f, 531.6536f, 6.108f, 900.106f, 181.677f, 659.374f },
+    { NPC_SYLVANAS_PART2, NPC_JAINA_PART2, 1062.85f, 100.075f, 631.0021f, 1.77f, 1062.85f, 100.075f, 631.0021f },
+};
+
+struct is_pit_of_saron : public InstanceScript
+{
+    is_pit_of_saron() : InstanceScript("instance_pit_of_saron") {}
+
+    class instance_pit_of_saron : public ScriptedInstance, private DialogueHelper
+    {
+    public:
+        instance_pit_of_saron(Map* pMap) : ScriptedInstance(pMap), DialogueHelper(aPoSDialogues),
+            m_uiAmbushAggroCount(0),
+            m_uiTeam(TEAM_NONE),
+            m_uiIciclesTimer(0)
+        {
+            Initialize();
+        }
+
+        ~instance_pit_of_saron() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+            InitializeDialogueHelper(this);
+
+            for (uint8 i = 0; i < MAX_SPECIAL_ACHIEV_CRITS; ++i)
+                m_abAchievCriteria[i] = false;
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_TYRANNUS_INTRO:
+            case NPC_JAINA_PART1:
+            case NPC_SYLVANAS_PART1:
+            case NPC_GARFROST:
+            case NPC_KRICK:
+            case NPC_ICK:
+            case NPC_TYRANNUS:
+            case NPC_RIMEFANG:
+            case NPC_IRONSKULL_PART1:
+            case NPC_VICTUS_PART1:
+            case NPC_IRONSKULL_PART2:
+            case NPC_VICTUS_PART2:
+            case NPC_JAINA_PART2:
+            case NPC_SYLVANAS_PART2:
+            case NPC_SINDRAGOSA:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_STALKER:
+                m_lTunnelStalkersGuidList.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_YMIRJAR_DEATHBRINGER:
+            case NPC_YMIRJAR_WRATHBRINGER:
+            case NPC_YMIRJAR_FLAMEBEARER:
+            case NPC_FALLEN_WARRIOR:
+            case NPC_COLDWRAITH:
+                // Sort only the temporary summons
+                if (pCreature->IsTemporarySummon())
+                    m_lAmbushNpcsGuidList.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_GENERAL_BUNNY:
+                if (pCreature->GetPositionY() < 130.0f)
+                {
+                    if (pCreature->GetOrientation() != 0)
+                        m_lArcaneShieldBunniesGuidList.push_back(pCreature->GetObjectGuid());
+                    else
+                        m_lFrozenAftermathBunniesGuidList.push_back(pCreature->GetObjectGuid());
+                }
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_ICEWALL:
+                if (m_auiEncounter[TYPE_GARFROST] == DONE && m_auiEncounter[TYPE_KRICK] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_HALLS_OF_REFLECT_PORT:
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            if (!m_uiTeam)                                          // very first player to enter
+            {
+                m_uiTeam = pPlayer->GetTeam();
+                SetDialogueSide(m_uiTeam == ALLIANCE);
+                ProcessIntroEventNpcs(pPlayer);
+            }
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_YMIRJAR_DEATHBRINGER)
+            {
+                ++m_uiAmbushAggroCount;
+
+                // Summon the rest of the mobs at the 2nd ambush
+                if (m_uiAmbushAggroCount == 2)
+                {
+                    Creature* pTyrannus = GetSingleCreatureFromStorage(NPC_TYRANNUS_INTRO);
+                    if (!pTyrannus)
+                        return;
+
+                    DoScriptText(SAY_TYRANNUS_AMBUSH_2, pTyrannus);
+                    pTyrannus->SetWalk(false);
+                    pTyrannus->GetMotionMaster()->MovePoint(0, afTyrannusMovePos[2][0], afTyrannusMovePos[2][1], afTyrannusMovePos[2][2]);
+
+                    // Spawn Mobs
+                    for (uint8 i = 0; i < countof(aEventSecondAmbushLocations); ++i)
+                    {
+                        if (Creature* pSummon = pTyrannus->SummonCreature(aEventSecondAmbushLocations[i].uiEntryHorde, aEventSecondAmbushLocations[i].fX, aEventSecondAmbushLocations[i].fY,
+                            aEventSecondAmbushLocations[i].fZ, aEventSecondAmbushLocations[i].fO, TEMPSUMMON_DEAD_DESPAWN, 0))
+                        {
+                            pSummon->SetWalk(false);
+                            pSummon->GetMotionMaster()->MovePoint(1, aEventSecondAmbushLocations[i].fMoveX, aEventSecondAmbushLocations[i].fMoveY, aEventSecondAmbushLocations[i].fMoveZ);
+                        }
+                    }
+                }
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_YMIRJAR_DEATHBRINGER:
+            case NPC_YMIRJAR_WRATHBRINGER:
+            case NPC_YMIRJAR_FLAMEBEARER:
+            case NPC_FALLEN_WARRIOR:
+            case NPC_COLDWRAITH:
+                // Check for tunnel event end - these mobs are not summoned
+                if (pCreature->IsTemporarySummon())
+                {
+                    m_lAmbushNpcsGuidList.remove(pCreature->GetObjectGuid());
+
+                    // If empty start tunnel event
+                    if (m_lAmbushNpcsGuidList.empty())
+                    {
+                        Creature* pTyrannus = GetSingleCreatureFromStorage(NPC_TYRANNUS_INTRO);
+                        if (!pTyrannus)
+                            return;
+
+                        DoScriptText(SAY_GAUNTLET, pTyrannus);
+                        pTyrannus->SetWalk(false);
+                        pTyrannus->GetMotionMaster()->MovePoint(0, afTyrannusMovePos[0][0], afTyrannusMovePos[0][1], afTyrannusMovePos[0][2]);
+                        pTyrannus->ForcedDespawn(20000);
+
+                        m_uiIciclesTimer = urand(3000, 5000);
+                        SetSpecialAchievementCriteria(TYPE_ACHIEV_DONT_LOOK_UP, true);
+                    }
+                }
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_GARFROST:
+                if (uiData == DONE && m_auiEncounter[TYPE_KRICK] == DONE)
+                    DoUseDoorOrButton(GO_ICEWALL);
+                if (uiData == IN_PROGRESS)
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_DOESNT_GO_ELEVEN, true);
+                else if (uiData == DONE)
+                    StartNextDialogueText(NPC_GARFROST);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_KRICK:
+                if (uiData == DONE && m_auiEncounter[TYPE_GARFROST] == DONE)
+                    DoUseDoorOrButton(GO_ICEWALL);
+                if (uiData == SPECIAL)
+                {
+                    // Used just to start the epilogue
+                    StartNextDialogueText(SAY_JAINA_KRICK_1);
+                    return;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_TYRANNUS:
+                if (uiData == DONE)
+                    StartNextDialogueText(NPC_SINDRAGOSA);
+                else if (uiData == SPECIAL)
+                {
+                    // Used just to start the intro
+                    StartNextDialogueText(NPC_TYRANNUS);
+                    return;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_AMBUSH:
+                if (uiData == DONE)
+                {
+                    // Complete tunnel achievement
+                    if (Creature* pTyrannus = GetSingleCreatureFromStorage(NPC_TYRANNUS))
+                        pTyrannus->CastSpell(pTyrannus, SPELL_ACHIEVEMENT_CHECK, true);
+
+                    m_uiIciclesTimer = 0;
+                }
+                else if (uiData == IN_PROGRESS)
+                    DoStartAmbushEvent();
+
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_ACHIEV_DOESNT_GO_ELEVEN:
+            case TYPE_ACHIEV_DONT_LOOK_UP:
+                SetSpecialAchievementCriteria(uiType - TYPE_ACHIEV_DOESNT_GO_ELEVEN, bool(uiData));
+                return;
+            default:
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            if (uiType == TYPE_DATA_PLAYER_TEAM)
+                return m_uiTeam;
+
+            return 0;
+        }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+            case ACHIEV_CRIT_DOESNT_GO_ELEVEN:
+                return m_abAchievCriteria[0];
+            case ACHIEV_CRIT_DONT_LOOK_UP:
+                return m_abAchievCriteria[1];
+
+            default:
+                return false;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff)
+        {
+            DialogueUpdate(uiDiff);
+
+            if (m_uiIciclesTimer)
+            {
+                if (m_uiIciclesTimer <= uiDiff)
+                {
+                    for (GuidList::const_iterator itr = m_lTunnelStalkersGuidList.begin(); itr != m_lTunnelStalkersGuidList.end(); ++itr)
+                    {
+                        // Only 5% of the stalkers will actually spawn an icicle
+                        if (roll_chance_i(95))
+                            continue;
+
+                        if (Creature* pStalker = instance->GetCreature(*itr))
+                            pStalker->CastSpell(pStalker, SPELL_ICICLE_SUMMON, true);
+                    }
+                    m_uiIciclesTimer = urand(3000, 5000);
+                }
+                else
+                    m_uiIciclesTimer -= uiDiff;
+            }
+        }
+
+    protected:
+        void DoStartAmbushEvent()
+        {
+            Creature* pTyrannus = GetSingleCreatureFromStorage(NPC_TYRANNUS_INTRO);
+            if (!pTyrannus)
+                return;
+
+            DoScriptText(SAY_TYRANNUS_AMBUSH_1, pTyrannus);
+
+            // Spawn Mobs
+            for (uint8 i = 0; i < countof(aEventFirstAmbushLocations); ++i)
+            {
+                if (Creature* pSummon = pTyrannus->SummonCreature(aEventFirstAmbushLocations[i].uiEntryHorde, aEventFirstAmbushLocations[i].fX, aEventFirstAmbushLocations[i].fY,
+                    aEventFirstAmbushLocations[i].fZ, aEventFirstAmbushLocations[i].fO, TEMPSUMMON_DEAD_DESPAWN, 0))
+                {
+                    pSummon->SetWalk(false);
+                    pSummon->GetMotionMaster()->MovePoint(1, aEventFirstAmbushLocations[i].fMoveX, aEventFirstAmbushLocations[i].fMoveY, aEventFirstAmbushLocations[i].fMoveZ);
+                }
+            }
+        }
+
+        void SetSpecialAchievementCriteria(uint32 uiType, bool bIsMet)
+        {
+            if (uiType < MAX_SPECIAL_ACHIEV_CRITS)
+                m_abAchievCriteria[uiType] = bIsMet;
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case SPELL_NECROMATIC_POWER:
+                // Transfor all soldiers into undead
+                if (Creature* pTyrannus = GetSingleCreatureFromStorage(NPC_TYRANNUS_INTRO))
+                    pTyrannus->CastSpell(pTyrannus, SPELL_NECROMATIC_POWER, true);
+                break;
+            case SAY_OUTRO_3:
+                // Move Tyrannus into position
+                if (Creature* pTyrannus = GetSingleCreatureFromStorage(NPC_TYRANNUS_INTRO))
+                {
+                    pTyrannus->SetWalk(false);
+                    pTyrannus->GetMotionMaster()->MovePoint(0, afTyrannusMovePos[1][0], afTyrannusMovePos[1][1], afTyrannusMovePos[1][2]);
+                }
+                break;
+            case SPELL_STRANGULATING:
+                // Strangulate Krick
+                if (Creature* pKrick = GetSingleCreatureFromStorage(NPC_KRICK))
+                {
+                    pKrick->CastSpell(pKrick, SPELL_STRANGULATING, true);
+                    pKrick->SetLevitate(true);
+                    pKrick->GetMotionMaster()->MovePoint(0, pKrick->GetPositionX(), pKrick->GetPositionY(), pKrick->GetPositionZ() + 5.0f);
+                }
+                break;
+            case SAY_TYRANNUS_KRICK_2:
+                // Kill Krick
+                if (Creature* pKrick = GetSingleCreatureFromStorage(NPC_KRICK))
+                {
+                    pKrick->CastSpell(pKrick, SPELL_KRICK_KILL_CREDIT, true);
+                    pKrick->CastSpell(pKrick, SPELL_SUICIDE, true);
+                }
+                break;
+            case SAY_JAINA_INTRO_3:
+            case SAY_JAINA_KRICK_3:
+                // Move Tyrannus to a safe position
+                if (Creature* pTyrannus = GetSingleCreatureFromStorage(NPC_TYRANNUS_INTRO))
+                    pTyrannus->GetMotionMaster()->MovePoint(0, afTyrannusMovePos[0][0], afTyrannusMovePos[0][1], afTyrannusMovePos[0][2]);
+                break;
+            case NPC_TYRANNUS:
+            {
+                                 Creature* pTyrannus = GetSingleCreatureFromStorage(NPC_TYRANNUS);
+                                 if (!pTyrannus)
+                                     return;
+
+                                 // Spawn tunnel end event mobs
+                                 for (uint8 i = 0; i < countof(aEventTunnelEndLocations); ++i)
+                                 {
+                                     if (Creature* pSummon = pTyrannus->SummonCreature(m_uiTeam == HORDE ? aEventTunnelEndLocations[i].uiEntryHorde : aEventTunnelEndLocations[i].uiEntryAlliance,
+                                         aEventTunnelEndLocations[i].fX, aEventTunnelEndLocations[i].fY, aEventTunnelEndLocations[i].fZ, aEventTunnelEndLocations[i].fO, TEMPSUMMON_DEAD_DESPAWN, 0))
+                                     {
+                                         pSummon->SetWalk(false);
+                                         pSummon->GetMotionMaster()->MovePoint(0, aEventTunnelEndLocations[i].fMoveX, aEventTunnelEndLocations[i].fMoveY, aEventTunnelEndLocations[i].fMoveZ);
+                                     }
+                                 }
+                                 break;
+            }
+            case NPC_RIMEFANG:
+                // Eject Tyrannus and prepare for combat
+                if (Creature* pRimefang = GetSingleCreatureFromStorage(NPC_RIMEFANG))
+                {
+                    pRimefang->CastSpell(pRimefang, SPELL_EJECT_ALL_PASSENGERS, true);
+                    pRimefang->SetWalk(false);
+                    pRimefang->GetMotionMaster()->MovePoint(0, afTyrannusMovePos[3][0], afTyrannusMovePos[3][1], afTyrannusMovePos[3][2]);
+                }
+                if (Creature* pTyrannus = GetSingleCreatureFromStorage(NPC_TYRANNUS))
+                    pTyrannus->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                break;
+            case SAY_VICTUS_OUTRO_1:
+            {
+                                       Player* pPlayer = GetPlayerInMap();
+                                       if (!pPlayer)
+                                           return;
+
+                                       // Spawn Sindragosa
+                                       if (Creature* pSummon = pPlayer->SummonCreature(aEventOutroLocations[0].uiEntryHorde, aEventOutroLocations[0].fX, aEventOutroLocations[0].fY,
+                                           aEventOutroLocations[0].fZ, aEventOutroLocations[0].fO, TEMPSUMMON_TIMED_DESPAWN, 2 * MINUTE * IN_MILLISECONDS))
+                                       {
+                                           pSummon->SetWalk(false);
+                                           pSummon->GetMotionMaster()->MovePoint(0, aEventOutroLocations[0].fMoveX, aEventOutroLocations[0].fMoveY, aEventOutroLocations[0].fMoveZ);
+                                       }
+                                       // Spawn Jaina or Sylvanas
+                                       if (Creature* pSummon = pPlayer->SummonCreature(m_uiTeam == HORDE ? aEventOutroLocations[1].uiEntryHorde : aEventOutroLocations[1].uiEntryAlliance,
+                                           aEventOutroLocations[1].fX, aEventOutroLocations[1].fY, aEventOutroLocations[1].fZ, aEventOutroLocations[1].fO, TEMPSUMMON_TIMED_DESPAWN, 24 * HOUR * IN_MILLISECONDS))
+                                       {
+                                           pSummon->SetWalk(false);
+                                           pSummon->GetMotionMaster()->MovePoint(0, aEventOutroLocations[1].fMoveX, aEventOutroLocations[1].fMoveY, aEventOutroLocations[1].fMoveZ);
+                                       }
+                                       break;
+            }
+            case SAY_JAINA_OUTRO_1:
+                // Visual effect
+                for (GuidList::const_iterator itr = m_lArcaneShieldBunniesGuidList.begin(); itr != m_lArcaneShieldBunniesGuidList.end(); ++itr)
+                {
+                    if (Creature* pBunny = instance->GetCreature(*itr))
+                        pBunny->CastSpell(pBunny, SPELL_ARCANE_FORM, true);
+                }
+                // Teleport players
+                if (Creature* pTemp = GetSingleCreatureFromStorage(m_uiTeam == HORDE ? NPC_SYLVANAS_PART2 : NPC_JAINA_PART2))
+                {
+                    pTemp->CastSpell(pTemp, m_uiTeam == HORDE ? SPELL_CALL_OF_SYLVANAS_2 : SPELL_JAINAS_CALL_2, true);
+                    pTemp->CastSpell(pTemp, m_uiTeam == HORDE ? SPELL_CALL_OF_SYLVANAS_2 : SPELL_JAINAS_CALL_2, true);
+                }
+                break;
+            case SPELL_FROST_BOMB:
+                // Frost bomb on the platform
+                if (Creature* pSindragosa = GetSingleCreatureFromStorage(NPC_SINDRAGOSA))
+                    pSindragosa->CastSpell(pSindragosa, SPELL_FROST_BOMB, true);
+                // Visual effect
+                for (GuidList::const_iterator itr = m_lFrozenAftermathBunniesGuidList.begin(); itr != m_lFrozenAftermathBunniesGuidList.end(); ++itr)
+                {
+                    if (Creature* pBunny = instance->GetCreature(*itr))
+                        pBunny->CastSpell(pBunny, SPELL_FROZEN_AFTERMATH, true);
+                }
+                break;
+            case NPC_JAINA_PART2:
+                // Visual effect remove
+                for (GuidList::const_iterator itr = m_lArcaneShieldBunniesGuidList.begin(); itr != m_lArcaneShieldBunniesGuidList.end(); ++itr)
+                {
+                    if (Creature* pBunny = instance->GetCreature(*itr))
+                        pBunny->RemoveAurasDueToSpell(SPELL_ARCANE_FORM);
+                }
+                // Sindragosa exit
+                if (Creature* pSindragosa = GetSingleCreatureFromStorage(NPC_SINDRAGOSA))
+                    pSindragosa->GetMotionMaster()->MovePoint(0, 759.148f, 199.955f, 720.857f);
+                // Jaina / Sylvanas starts moving (should use wp)
+                if (Creature* pTemp = GetSingleCreatureFromStorage(m_uiTeam == HORDE ? NPC_SYLVANAS_PART2 : NPC_JAINA_PART2))
+                {
+                    pTemp->SetWalk(true);
+                    pTemp->GetMotionMaster()->MovePoint(0, 1057.76f, 111.927f, 628.4123f);
+                }
+                break;
+            case SAY_JAINA_OUTRO_2:
+                if (Creature* pTemp = GetSingleCreatureFromStorage(m_uiTeam == HORDE ? NPC_SYLVANAS_PART2 : NPC_JAINA_PART2))
+                    pTemp->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+
+                // ToDo: Jaina / Sylvanas should have some waypoint movement here and the door should be opened only when they get in front of it.
+                DoUseDoorOrButton(GO_HALLS_OF_REFLECT_PORT);
+                break;
+            }
+        }
+
+        void ProcessIntroEventNpcs(Player* pPlayer)
+        {
+            if (!pPlayer)
+                return;
+
+            // Not if the bosses are already killed
+            if (GetData(TYPE_GARFROST) == DONE || GetData(TYPE_KRICK) == DONE)
+                return;
+
+            StartNextDialogueText(NPC_TYRANNUS_INTRO);
+
+            // Spawn Begin Mobs
+            for (uint8 i = 0; i < countof(aEventBeginLocations); ++i)
+            {
+                // ToDo: maybe despawn the intro npcs when the other events occur
+                if (Creature* pSummon = pPlayer->SummonCreature(m_uiTeam == HORDE ? aEventBeginLocations[i].uiEntryHorde : aEventBeginLocations[i].uiEntryAlliance,
+                    aEventBeginLocations[i].fX, aEventBeginLocations[i].fY, aEventBeginLocations[i].fZ, aEventBeginLocations[i].fO, TEMPSUMMON_TIMED_DESPAWN, 24 * HOUR * IN_MILLISECONDS))
+                {
+                    pSummon->SetWalk(false);
+                    pSummon->GetMotionMaster()->MovePoint(0, aEventBeginLocations[i].fMoveX, aEventBeginLocations[i].fMoveY, aEventBeginLocations[i].fMoveZ);
+                }
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        bool m_abAchievCriteria[MAX_SPECIAL_ACHIEV_CRITS];
+
+        uint8 m_uiAmbushAggroCount;
+        uint32 m_uiTeam;                                    // Team of first entered player, used to set if Jaina or Silvana to spawn
+        uint32 m_uiIciclesTimer;
+
+        GuidList m_lTunnelStalkersGuidList;
+        GuidList m_lAmbushNpcsGuidList;
+        GuidList m_lArcaneShieldBunniesGuidList;
+        GuidList m_lFrozenAftermathBunniesGuidList;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_pit_of_saron(pMap);
+    }
+};
+
+void AddSC_instance_pit_of_saron()
+{
+    Script* s;
+
+    s = new is_pit_of_saron();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_pit_of_saron";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_pit_of_saron;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/pit_of_saron.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/pit_of_saron.cpp
new file mode 100644
index 000000000..65542f087
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/pit_of_saron.cpp
@@ -0,0 +1,238 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: pit_of_saron
+SD%Complete: 100
+SDComment:
+SDCategory: Pit of Saron
+EndScriptData */
+
+/* ContentData
+EndContentData */
+
+#include "precompiled.h"
+#include "pit_of_saron.h"
+
+enum
+{
+    // Ambush event
+    SPELL_EMPOWERED_SHADOW_BOLT         = 69528,
+    SPELL_SUMMON_UNDEAD                 = 69516,
+
+    // Icicles
+    SPELL_ICICLE                        = 69426,
+    SPELL_ICICLE_DUMMY                  = 69428,
+    SPELL_ICE_SHARDS_H                  = 70827,            // used to check the tunnel achievement
+};
+
+/*######
+## npc_ymirjar_deathbringer
+######*/
+
+struct npc_ymirjar_deathbringer : public CreatureScript
+{
+    npc_ymirjar_deathbringer() : CreatureScript("npc_ymirjar_deathbringer") {}
+
+    struct npc_ymirjar_deathbringerAI : public ScriptedAI
+    {
+        npc_ymirjar_deathbringerAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiShadowBoltTimer;
+
+        void Reset() override
+        {
+            m_uiShadowBoltTimer = urand(1000, 3000);
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_UNDEAD);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiShadowBoltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_EMPOWERED_SHADOW_BOLT) == CAST_OK)
+                        m_uiShadowBoltTimer = urand(2000, 3000);
+                }
+            }
+            else
+                m_uiShadowBoltTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ymirjar_deathbringerAI(pCreature);
+    }
+};
+
+struct spell_pos_summon_undead : public SpellScript
+{
+    spell_pos_summon_undead() : SpellScript("spell_pos_summon_undead") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_SUMMON_UNDEAD && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+
+            if (pCreatureTarget->GetEntry() != NPC_YMIRJAR_DEATHBRINGER)
+                return true;
+
+            float fX, fY, fZ;
+            for (uint8 i = 0; i < 4; ++i)
+            {
+                pCreatureTarget->GetNearPoint(pCreatureTarget, fX, fY, fZ, 0, frand(8.0f, 12.0f), M_PI_F * 0.5f * i);
+                pCreatureTarget->SummonCreature(i % 2 ? NPC_YMIRJAR_WRATHBRINGER : NPC_YMIRJAR_FLAMEBEARER, fX, fY, fZ, 3.75f, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_collapsing_icicle
+######*/
+
+struct npc_collapsing_icicle : public CreatureScript
+{
+    npc_collapsing_icicle() : CreatureScript("npc_collapsing_icicle") {}
+
+    struct npc_collapsing_icicleAI : public ScriptedAI
+    {
+        npc_collapsing_icicleAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_ICICLE_DUMMY, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_ICICLE, CAST_TRIGGERED);
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            // Mark the achiev failed
+            if (pSpell->Id == SPELL_ICE_SHARDS_H && pTarget->GetTypeId() == TYPEID_PLAYER && m_pInstance)
+                m_pInstance->SetData(TYPE_ACHIEV_DONT_LOOK_UP, uint32(false));
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_collapsing_icicleAI(pCreature);
+    }
+};
+
+/*######
+## at_pit_of_saron
+######*/
+
+struct at_pit_of_saron : public AreaTriggerScript
+{
+    at_pit_of_saron() : AreaTriggerScript("at_pit_of_saron") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (pPlayer->isGameMaster() || !pPlayer->IsAlive())
+            return false;
+
+        InstanceData* pInstance = pPlayer->GetInstanceData();
+        if (!pInstance)
+            return false;
+
+        if (pAt->id == AREATRIGGER_ID_TUNNEL_START)
+        {
+            if (pInstance->GetData(TYPE_GARFROST) != DONE || pInstance->GetData(TYPE_KRICK) != DONE ||
+                pInstance->GetData(TYPE_AMBUSH) != NOT_STARTED)
+                return false;
+
+            pInstance->SetData(TYPE_AMBUSH, IN_PROGRESS);
+            return true;
+        }
+        else if (pAt->id == AREATRIGGER_ID_TUNNEL_END)
+        {
+            if (pInstance->GetData(TYPE_AMBUSH) != IN_PROGRESS)
+                return false;
+
+            pInstance->SetData(TYPE_AMBUSH, DONE);
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_pit_of_saron()
+{
+    Script* s;
+
+    s = new npc_ymirjar_deathbringer();
+    s->RegisterSelf();
+    s = new npc_collapsing_icicle();
+    s->RegisterSelf();
+
+    s = new spell_pos_summon_undead();
+    s->RegisterSelf();
+
+    s = new at_pit_of_saron();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ymirjar_deathbringer";
+    //pNewScript->GetAI = &GetAI_npc_ymirjar_deathbringer;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_summon_undead;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_collapsing_icicle";
+    //pNewScript->GetAI = &GetAI_npc_collapsing_icicle;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_pit_of_saron";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_pit_of_saron;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/pit_of_saron.h b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/pit_of_saron.h
new file mode 100644
index 000000000..592368046
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/pit_of_saron.h
@@ -0,0 +1,77 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_ICECROWN_PIT_H
+#define DEF_ICECROWN_PIT_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 4,
+    MAX_SPECIAL_ACHIEV_CRITS        = 2,
+
+    TYPE_GARFROST                   = 0,
+    TYPE_KRICK                      = 1,
+    TYPE_TYRANNUS                   = 2,
+    TYPE_AMBUSH                     = 3,
+    TYPE_DATA_PLAYER_TEAM           = MAX_ENCOUNTER,
+    TYPE_ACHIEV_DOESNT_GO_ELEVEN    = MAX_ENCOUNTER + 1,    //order to be met in ScriptedInstance
+    TYPE_ACHIEV_DONT_LOOK_UP        = MAX_ENCOUNTER + 2,
+
+    // Bosses
+    NPC_TYRANNUS_INTRO              = 36794,
+    NPC_GARFROST                    = 36494,
+    NPC_KRICK                       = 36477,
+    NPC_ICK                         = 36476,
+    NPC_TYRANNUS                    = 36658,
+    NPC_RIMEFANG                    = 36661,
+    NPC_SINDRAGOSA                  = 37755,
+
+    // Intro part npcs
+    NPC_SYLVANAS_PART1              = 36990,
+    NPC_SYLVANAS_PART2              = 38189,
+    NPC_JAINA_PART1                 = 36993,
+    NPC_JAINA_PART2                 = 38188,
+    NPC_KILARA                      = 37583,
+    NPC_ELANDRA                     = 37774,
+    NPC_LORALEN                     = 37779,
+    NPC_KORELN                      = 37582,
+    NPC_CHAMPION_1_HORDE            = 37584,
+    NPC_CHAMPION_2_HORDE            = 37587,
+    NPC_CHAMPION_3_HORDE            = 37588,
+    NPC_CHAMPION_1_ALLIANCE         = 37496,
+    NPC_CHAMPION_2_ALLIANCE         = 37497,
+    NPC_CHAMPION_3_ALLIANCE         = 37498,
+    NPC_CORRUPTED_CHAMPION          = 36796,
+
+    // Enslaved npcs
+    NPC_IRONSKULL_PART1             = 37592,
+    NPC_IRONSKULL_PART2             = 37581,
+    NPC_VICTUS_PART1                = 37591,
+    NPC_VICTUS_PART2                = 37580,
+    NPC_FREE_HORDE_SLAVE_1          = 37577,
+    NPC_FREE_HORDE_SLAVE_2          = 37578,
+    NPC_FREE_HORDE_SLAVE_3          = 37579,
+    NPC_FREE_ALLIANCE_SLAVE_1       = 37572,
+    NPC_FREE_ALLIANCE_SLAVE_2       = 37575,
+    NPC_FREE_ALLIANCE_SLAVE_3       = 37576,
+
+    // Ambush npcs
+    NPC_YMIRJAR_DEATHBRINGER        = 36892,
+    NPC_YMIRJAR_WRATHBRINGER        = 36840,
+    NPC_YMIRJAR_FLAMEBEARER         = 36893,
+    NPC_FALLEN_WARRIOR              = 36841,
+    NPC_COLDWRAITH                  = 36842,
+    NPC_STALKER                     = 32780,
+    NPC_GENERAL_BUNNY               = 24110,
+
+    GO_ICEWALL                      = 201885,               // open after gafrost/krick
+    GO_HALLS_OF_REFLECT_PORT        = 201848,               // unlocked by jaina/sylvanas at last outro
+
+    AREATRIGGER_ID_TUNNEL_START     = 5578,
+    AREATRIGGER_ID_TUNNEL_END       = 5581,
+
+    ACHIEV_CRIT_DOESNT_GO_ELEVEN    = 12993,                // Garfrost, achiev 4524
+    ACHIEV_CRIT_DONT_LOOK_UP        = 12994,                // Gauntlet, achiev 4525
+};
+#endif
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/blood_prince_council.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/blood_prince_council.cpp
new file mode 100644
index 000000000..f092e4db3
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/blood_prince_council.cpp
@@ -0,0 +1,971 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: blood_prince_council
+SD%Complete: 80%
+SDComment: Timers; Some details are not very clear about this encounter: spells 72087 and 73001 require additional research.
+SDCategory: Icecrown Citadel
+EndScriptData */
+
+#include "precompiled.h"
+#include "icecrown_citadel.h"
+
+enum
+{
+    // Yells
+    SAY_COUNCIL_INTRO_1         = -1631101,                 // Intro by Bloodqueen
+    SAY_COUNCIL_INTRO_2         = -1631102,
+
+    SAY_KELESETH_INVOCATION     = -1631103,
+    SAY_KELESETH_SPECIAL        = -1631104,
+    SAY_KELESETH_SLAY_1         = -1631105,
+    SAY_KELESETH_SLAY_2         = -1631106,
+    SAY_KELESETH_BERSERK        = -1631107,
+    SAY_KELESETH_DEATH          = -1631108,
+
+    SAY_TALDARAM_INVOCATION     = -1631109,
+    SAY_TALDARAM_SPECIAL        = -1631110,
+    SAY_TALDARAM_SLAY_1         = -1631111,
+    SAY_TALDARAM_SLAY_2         = -1631112,
+    SAY_TALDARAM_BERSERK        = -1631113,
+    SAY_TALDARAM_DEATH          = -1631114,
+
+    SAY_VALANAR_INVOCATION      = -1631115,
+    SAY_VALANAR_SPECIAL         = -1631116,
+    SAY_VALANAR_SLAY_1          = -1631117,
+    SAY_VALANAR_SLAY_2          = -1631118,
+    SAY_VALANAR_BERSERK         = -1631119,
+    SAY_VALANAR_DEATH           = -1631120,
+
+    EMOTE_INVOCATION            = -1631197,
+    EMOTE_SHOCK_VORTEX          = -1631198,
+    EMOTE_FLAMES                = -1631199,
+
+    // Generic spells
+    SPELL_BERSERK               = 26662,
+    SPELL_FEIGN_DEATH           = 71598,
+
+    SPELL_INVOCATION_BLOOD      = 70934,
+    SPELL_INVOCATION_BLOOD_2    = 71596,
+    SPELL_INVOCATION_V_MOVE     = 71075,
+    SPELL_INVOCATION_K_MOVE     = 71079,
+    SPELL_INVOCATION_T_MOVE     = 71082,
+
+    // Valanar spells
+    SPELL_INVOCATION_VALANAR    = 70952,
+    SPELL_KINETIC_BOMB_TARGET   = 72053,            // summons 38458 - the target of the bomb
+    SPELL_KINETIC_BOMB          = 72080,            // summons 38454
+    SPELL_SHOCK_VORTEX          = 72037,            // summons 38422
+    SPELL_EMP_SHOCK_VORTEX      = 72039,
+
+    NPC_KINETIC_BOMB            = 38454,
+    NPC_KINETIC_BOMB_TARGET     = 38458,
+
+    // shock vortex spells - in eventAI
+    // SPELL_SHOCK_VORTEX_AURA   = 71945,
+    // SPELL_SHOCK_VORTEX_VISUAL = 72633,
+
+    // kinetic bomb spells
+    SPELL_KINETIC_BOMB_DMG      = 72052,
+    SPELL_KINETIC_BOMB_VISUAL   = 72054,
+    SPELL_UNSTABLE              = 72059,            // procs 72087
+    SPELL_KINETIC_KNOCKBACK     = 72087,
+
+    // Keleseth spells
+    SPELL_INVOCATION_KELESETH   = 70981,
+    SPELL_SHADOW_LANCE          = 71405,
+    SPELL_EMP_SHADOW_LANCE      = 71815,
+    SPELL_SHADOW_RESONANCE      = 71943,            // summons 38369
+    // SPELL_SHADOW_PRISON       = 73001,            // on heroic - not sure how to use
+
+    // dark nucleus spells
+    SPELL_SHADOW_RESONANCE_AURA = 71911,            // purpose unk - maybe range check
+    SPELL_SHADOW_RESONANCE_BUFF = 71822,            // channeled from the dark nucleus
+    SPELL_SHADOW_RESONANCE_DMG  = 72980,            // self destruction spell
+
+    // Taldaram spells
+    SPELL_INVOCATION_TALDARAM   = 70982,
+    SPELL_GLITTERING_SPARKS     = 71806,            // triggers 71807
+    SPELL_CONJURE_FLAME         = 71718,            // triggers 71719 which summons 38332
+    SPELL_CONJURE_EMP_FLAME     = 72040,            // triggers 72041 which summons 38451
+
+    NPC_BALL_OF_FLAME           = 38332,
+    NPC_BALL_OF_INFERNO_FLAME   = 38451,
+
+    // ball of flame spells
+    SPELL_BALL_FLAMES_VISUAL    = 71706,
+    SPELL_FLAMES                = 71393,            // cast on the impact
+    SPELL_BALL_FLAMES_PERIODIC  = 71709,            // triggers 71708
+    SPELL_FLAMES_PROC           = 71756,
+
+    MAX_PRINCES                 = 3,
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {SAY_COUNCIL_INTRO_1,   NPC_LANATHEL_INTRO, 15000},
+    {SAY_COUNCIL_INTRO_2,   NPC_LANATHEL_INTRO, 10000},
+    {NPC_BLOOD_ORB_CONTROL, 0,                  0},
+    {0, 0, 0},
+};
+
+static const float aLanathelFlyPos[3] = {4660.49f, 2769.2f, 430.0f};
+
+/*######
+## npc_queen_lanathel_intro
+######*/
+
+struct npc_queen_lanathel_intro : public CreatureScript
+{
+    npc_queen_lanathel_intro() : CreatureScript("npc_queen_lanathel_intro") {}
+
+    struct npc_queen_lanathel_introAI : public ScriptedAI, private DialogueHelper
+    {
+        npc_queen_lanathel_introAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+            m_bEventStarted = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bEventStarted;
+
+        void Reset() override
+        {
+            // Flying animation
+            m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // The range distance is not sure
+            if (!m_bEventStarted && pWho->GetTypeId() == TYPEID_PLAYER && !((Player*)pWho)->isGameMaster() &&
+                pWho->IsWithinDistInMap(m_creature, 100.0f) && pWho->IsWithinLOSInMap(m_creature))
+            {
+                StartNextDialogueText(SAY_COUNCIL_INTRO_1);
+                m_bEventStarted = true;
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case SAY_COUNCIL_INTRO_2:
+                m_creature->GetMotionMaster()->MovePoint(1, aLanathelFlyPos[0], aLanathelFlyPos[1], aLanathelFlyPos[2]);
+                break;
+            case NPC_BLOOD_ORB_CONTROL:
+                if (m_pInstance)
+                {
+                    if (Creature* pTaldaram = m_pInstance->GetSingleCreatureFromStorage(NPC_TALDARAM))
+                    {
+                        pTaldaram->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                        pTaldaram->RemoveAurasDueToSpell(SPELL_FEIGN_DEATH);
+                        pTaldaram->SetHealth(1);
+                    }
+                    if (Creature* pKeleseth = m_pInstance->GetSingleCreatureFromStorage(NPC_KELESETH))
+                    {
+                        pKeleseth->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                        pKeleseth->RemoveAurasDueToSpell(SPELL_FEIGN_DEATH);
+                        pKeleseth->SetHealth(1);
+                    }
+                    if (Creature* pValanar = m_pInstance->GetSingleCreatureFromStorage(NPC_VALANAR))
+                    {
+                        pValanar->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                        pValanar->RemoveAurasDueToSpell(SPELL_FEIGN_DEATH);
+                        pValanar->SetHealth(1);
+                    }
+                }
+                break;
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            // Emote here, and force them to stand up - this needs to be done as a workaround for some core issues
+            if (m_pInstance)
+            {
+                // This should be casted when they stand up - but because of the workaround, it will be casted here
+                if (Creature* pOrb = m_pInstance->GetSingleCreatureFromStorage(NPC_BLOOD_ORB_CONTROL))
+                    pOrb->CastSpell(pOrb, SPELL_INVOCATION_VALANAR, false);
+                if (Creature* pTaldaram = m_pInstance->GetSingleCreatureFromStorage(NPC_TALDARAM))
+                    pTaldaram->HandleEmote(EMOTE_ONESHOT_ROAR);
+                if (Creature* pKeleseth = m_pInstance->GetSingleCreatureFromStorage(NPC_KELESETH))
+                    pKeleseth->HandleEmote(EMOTE_ONESHOT_ROAR);
+                if (Creature* pValanar = m_pInstance->GetSingleCreatureFromStorage(NPC_VALANAR))
+                    pValanar->HandleEmote(EMOTE_ONESHOT_ROAR);
+            }
+
+            // Despawn when reached point
+            m_creature->ForcedDespawn();
+        }
+
+        void UpdateAI(const uint32 uiDiff) { DialogueUpdate(uiDiff); }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_queen_lanathel_introAI(pCreature);
+    }
+};
+
+/*######
+## npc_ball_of_flame
+######*/
+
+struct npc_ball_of_flame : public CreatureScript
+{
+    npc_ball_of_flame() : CreatureScript("npc_ball_of_flame") {}
+
+    struct npc_ball_of_flameAI : public ScriptedAI
+    {
+        npc_ball_of_flameAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        bool m_bHasFlamesCasted;
+
+        uint32 m_uiTargetGuidLow;
+
+        void Reset() override
+        {
+            m_bHasFlamesCasted = false;
+
+            DoCastSpellIfCan(m_creature, SPELL_BALL_FLAMES_VISUAL, CAST_TRIGGERED);
+
+            // Empowered flame
+            if (m_creature->GetEntry() == NPC_BALL_OF_INFERNO_FLAME)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_BALL_FLAMES_PERIODIC, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_FLAMES_PROC, CAST_TRIGGERED);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature*, Unit*, uint32 uiGuid) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A)
+                m_uiTargetGuidLow = uiGuid;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasFlamesCasted && pWho->GetTypeId() == TYPEID_PLAYER && pWho->GetGUIDLow() == m_uiTargetGuidLow &&
+                pWho->IsWithinDist(m_creature, ATTACK_DISTANCE))
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FLAMES) == CAST_OK)
+                {
+                    m_bHasFlamesCasted = true;
+                    m_creature->GetMotionMaster()->MoveIdle();
+                    m_creature->ForcedDespawn(1000);
+                }
+            }
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ball_of_flameAI(pCreature);
+    }
+};
+
+/*######
+## npc_kinetic_bomb
+######*/
+
+struct npc_kinetic_bomb : public CreatureScript
+{
+    npc_kinetic_bomb() : CreatureScript("npc_kinetic_bomb") {}
+
+    struct npc_kinetic_bombAI : public ScriptedAI
+    {
+        npc_kinetic_bombAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_UNSTABLE, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_KINETIC_BOMB_VISUAL, CAST_TRIGGERED);
+        }
+
+        void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override
+        {
+            // Note: this npc shouldn't take any damage - however this has an issue in the core, because the Unstanble spell doesn't proc on 0 damage
+            uiDamage = 0;
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            DoCastSpellIfCan(m_creature, SPELL_KINETIC_BOMB_DMG);
+            m_creature->ForcedDespawn(1000);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kinetic_bombAI(pCreature);
+    }
+};
+
+/*######
+## npc_dark_nucleus
+######*/
+
+struct npc_dark_nucleus : public CreatureScript
+{
+    npc_dark_nucleus() : CreatureScript("npc_dark_nucleus") {}
+
+    struct npc_dark_nucleusAI : public ScriptedAI
+    {
+        npc_dark_nucleusAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiDistanceCheck;
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_SHADOW_RESONANCE_AURA, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_SHADOW_RESONANCE_DMG, CAST_TRIGGERED);
+
+            m_uiDistanceCheck = 1000;
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                DoStartMovement(pWho, 10.0f);
+            }
+        }
+
+        void DamageTaken(Unit* pDealer, uint32& /*uiDamage*/) override
+        {
+            if (m_creature->getVictim() && pDealer != m_creature->getVictim())
+            {
+                DoResetThreat();
+                m_creature->AddThreat(pDealer, 100000.0f);
+                m_creature->InterruptNonMeleeSpells(true);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiDistanceCheck < uiDiff)
+            {
+                if (m_creature->GetDistance(m_creature->getVictim()) < 15.0f)
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHADOW_RESONANCE_BUFF);
+
+                m_uiDistanceCheck = 1000;
+            }
+            else
+                m_uiDistanceCheck -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_dark_nucleusAI(pCreature);
+    }
+};
+
+/*######
+## npc_blood_orb_control
+######*/
+
+struct npc_blood_orb_control : public CreatureScript
+{
+    npc_blood_orb_control() : CreatureScript("npc_blood_orb_control") {}
+
+    struct npc_blood_orb_controlAI : public Scripted_NoMovementAI
+    {
+        npc_blood_orb_controlAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiLastResult;
+        uint32 m_uiInvocationTimer;
+
+        void Reset() override
+        {
+            m_uiInvocationTimer = 30000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_BLOOD_PRINCE_COUNCIL, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BLOOD_PRINCE_COUNCIL, DONE);
+
+                // Kill the 3 princes
+                if (Creature* pTmp = m_pInstance->GetSingleCreatureFromStorage(NPC_VALANAR))
+                    m_creature->DealDamage(pTmp, pTmp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+
+                if (Creature* pTmp = m_pInstance->GetSingleCreatureFromStorage(NPC_KELESETH))
+                    m_creature->DealDamage(pTmp, pTmp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+
+                if (Creature* pTmp = m_pInstance->GetSingleCreatureFromStorage(NPC_TALDARAM))
+                    m_creature->DealDamage(pTmp, pTmp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_BLOOD_PRINCE_COUNCIL, FAIL);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // every 30 seconds cast Invocation of Blood on random prince
+            if (m_uiInvocationTimer < uiDiff)
+            {
+                uint8 uiResult = urand(0, MAX_PRINCES - 1);
+                uiResult = uiResult == m_uiLastResult ? (uiResult + 1) % MAX_PRINCES : uiResult;
+                m_uiLastResult = uiResult;
+
+                switch (uiResult)
+                {
+                case 0:
+                    DoCastSpellIfCan(m_creature, SPELL_INVOCATION_V_MOVE, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_INVOCATION_VALANAR, CAST_TRIGGERED);
+                    break;
+                case 1:
+                    DoCastSpellIfCan(m_creature, SPELL_INVOCATION_K_MOVE, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_INVOCATION_KELESETH, CAST_TRIGGERED);
+                    break;
+                case 2:
+                    DoCastSpellIfCan(m_creature, SPELL_INVOCATION_T_MOVE, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_INVOCATION_TALDARAM, CAST_TRIGGERED);
+                    break;
+                }
+
+                m_uiInvocationTimer = 47000;
+            }
+            else
+                m_uiInvocationTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_blood_orb_controlAI(pCreature);
+    }
+};
+
+/*######
+## blood_prince_council_base
+######*/
+
+struct blood_prince_council_baseAI : public ScriptedAI
+{
+    blood_prince_council_baseAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        DoCastSpellIfCan(m_creature, SPELL_FEIGN_DEATH);
+        m_uiResetTimer = 0;
+        Reset();
+    }
+
+    ScriptedInstance* m_pInstance;
+
+    uint32 m_uiInvocationSpellEntry;
+    int32 m_iSayInvocationEntry;
+    int32 m_iSayBerserkEntry;
+
+    uint32 m_uiEmpowermentTimer;
+    uint32 m_uiResetTimer;
+    uint32 m_uiBerserkTimer;
+    uint32 m_uiSphereTimer;
+
+    bool m_bIsSaidSpecial;              // 1st spell cast after being empowered is followed by special say
+
+    void Reset() override
+    {
+        m_bIsSaidSpecial     = false;
+        m_uiEmpowermentTimer = 0;
+        m_uiSphereTimer      = urand(5000, 15000);
+        m_uiBerserkTimer     = 10 * MINUTE * IN_MILLISECONDS;
+    }
+
+    void EnterEvadeMode() override
+    {
+        // Reset the health to 1
+        m_creature->SetHealth(1);
+
+        // Reset blood orb
+        if (m_creature->GetEntry() == NPC_VALANAR)
+            m_uiResetTimer = 5000;
+
+        ScriptedAI::EnterEvadeMode();
+    }
+
+    void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override
+    {
+        // Damage is shared by the Blood Orb Control npc
+        if (!m_uiEmpowermentTimer)
+            uiDamage = 0;
+
+        // ##### Workaround for missing aura 300 - Remove when this is implemented in core #####
+        if (!m_pInstance || !uiDamage)
+            return;
+
+        if (Creature* pOrb = m_pInstance->GetSingleCreatureFromStorage(NPC_BLOOD_ORB_CONTROL))
+            pOrb->DealDamage(pOrb, uiDamage, NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+        // ##### End of workaround #####
+    }
+
+    void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+    {
+        // When hit by the Invocation spell, then set the health of the blood control npc
+        if (pSpell->Id == m_uiInvocationSpellEntry)
+        {
+            m_creature->SetHealth(pCaster->GetHealth());
+            DoScriptText(EMOTE_INVOCATION, m_creature);
+            DoScriptText(m_iSayInvocationEntry, m_creature);
+            m_uiEmpowermentTimer = 30000;
+        }
+    }
+
+    void UpdateAI(const uint32 uiDiff) override
+    {
+        // On evade, reset the blood orb on Valanar
+        if (m_uiResetTimer)
+        {
+            if (m_uiResetTimer <= uiDiff)
+            {
+                if (m_pInstance)
+                {
+                    if (Creature* pOrb = m_pInstance->GetSingleCreatureFromStorage(NPC_BLOOD_ORB_CONTROL))
+                        pOrb->CastSpell(pOrb, SPELL_INVOCATION_VALANAR, false);
+
+                    m_uiResetTimer = 0;
+                }
+            }
+            else
+                m_uiResetTimer -= uiDiff;
+        }
+
+        if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            return;
+
+        // Invocation of Blood
+        if (m_uiEmpowermentTimer)
+        {
+            if (m_uiEmpowermentTimer <= uiDiff)
+            {
+                m_creature->RemoveAurasDueToSpell(m_uiInvocationSpellEntry);
+                m_creature->SetHealth(1);
+                m_bIsSaidSpecial = false;
+                m_uiEmpowermentTimer = 00;
+            }
+            else
+                m_uiEmpowermentTimer -= uiDiff;
+        }
+
+        // Berserk
+        if (m_uiBerserkTimer)
+        {
+            if (m_uiBerserkTimer <= uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                {
+                    DoScriptText(m_iSayBerserkEntry, m_creature);
+                    m_uiBerserkTimer = 0;
+                }
+            }
+            else
+                m_uiBerserkTimer -= uiDiff;
+        }
+    }
+};
+
+/*######
+## boss_valanar_icc
+######*/
+
+struct boss_valanar_icc : public CreatureScript
+{
+    boss_valanar_icc() : CreatureScript("boss_valanar_icc") {}
+
+    struct boss_valanar_iccAI : public blood_prince_council_baseAI
+    {
+        boss_valanar_iccAI(Creature* pCreature) : blood_prince_council_baseAI(pCreature)
+        {
+            m_uiInvocationSpellEntry = SPELL_INVOCATION_VALANAR;
+            m_iSayInvocationEntry = SAY_VALANAR_INVOCATION;
+            m_iSayBerserkEntry = SAY_VALANAR_BERSERK;
+        }
+
+        uint32 m_uiVortexTimer;
+
+        void Reset() override
+        {
+            blood_prince_council_baseAI::Reset();
+
+            m_uiVortexTimer = urand(5000, 10000);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+                DoScriptText(urand(0, 1) ? SAY_VALANAR_SLAY_1 : SAY_VALANAR_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_VALANAR_DEATH, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_KINETIC_BOMB_TARGET)
+                pSummoned->CastSpell(pSummoned->GetPositionX(), pSummoned->GetPositionY(), pSummoned->GetPositionZ() + 20.0f, SPELL_KINETIC_BOMB, true, NULL, NULL, m_creature->GetObjectGuid());
+            else if (pSummoned->GetEntry() == NPC_KINETIC_BOMB)
+            {
+                // Handle Kinetic bomb movement
+                pSummoned->SetLevitate(true);
+                pSummoned->GetMotionMaster()->MovePoint(1, pSummoned->GetPositionX(), pSummoned->GetPositionY(), pSummoned->GetPositionZ() - 20.0f, false);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            blood_prince_council_baseAI::UpdateAI(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiSphereTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_KINETIC_BOMB_TARGET) == CAST_OK)
+                    m_uiSphereTimer = 27000;
+            }
+            else
+                m_uiSphereTimer -= uiDiff;
+
+            if (m_uiVortexTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_uiEmpowermentTimer ? SPELL_EMP_SHOCK_VORTEX : SPELL_SHOCK_VORTEX) == CAST_OK)
+                    {
+                        if (m_uiEmpowermentTimer)
+                            DoScriptText(EMOTE_SHOCK_VORTEX, m_creature);
+
+                        if (m_uiEmpowermentTimer && !m_bIsSaidSpecial)
+                        {
+                            DoScriptText(SAY_VALANAR_SPECIAL, m_creature);
+                            m_bIsSaidSpecial = false;
+                        }
+
+                        m_uiVortexTimer = 17000;
+                    }
+                }
+            }
+            else
+                m_uiVortexTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_valanar_iccAI(pCreature);
+    }
+};
+
+/*######
+## boss_keleseth_icc
+######*/
+
+struct boss_keleseth_icc : public CreatureScript
+{
+    boss_keleseth_icc() : CreatureScript("boss_keleseth_icc") {}
+
+    struct boss_keleseth_iccAI : public blood_prince_council_baseAI
+    {
+        boss_keleseth_iccAI(Creature* pCreature) : blood_prince_council_baseAI(pCreature)
+        {
+            m_uiInvocationSpellEntry = SPELL_INVOCATION_KELESETH;
+            m_iSayInvocationEntry = SAY_KELESETH_INVOCATION;
+            m_iSayBerserkEntry = SAY_KELESETH_BERSERK;
+        }
+
+        uint32 m_uiShadowLanceTimer;
+
+        void Reset() override
+        {
+            blood_prince_council_baseAI::Reset();
+
+            m_uiShadowLanceTimer = urand(2000, 3000);
+            m_uiSphereTimer = 4000;
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                DoStartMovement(pWho, 20.0f);
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+                DoScriptText(urand(0, 1) ? SAY_KELESETH_SLAY_1 : SAY_KELESETH_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_KELESETH_DEATH, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->SetInCombatWithZone();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            blood_prince_council_baseAI::UpdateAI(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiSphereTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_RESONANCE) == CAST_OK)
+                    m_uiSphereTimer = 25000;
+            }
+            else
+                m_uiSphereTimer -= uiDiff;
+
+            if (m_uiShadowLanceTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_uiEmpowermentTimer ? SPELL_EMP_SHADOW_LANCE : SPELL_SHADOW_LANCE) == CAST_OK)
+                {
+                    if (m_uiEmpowermentTimer && !m_bIsSaidSpecial)
+                    {
+                        DoScriptText(SAY_KELESETH_SPECIAL, m_creature);
+                        m_bIsSaidSpecial = true;
+                    }
+
+                    m_uiShadowLanceTimer = urand(2000, 3000);
+                }
+            }
+            else
+                m_uiShadowLanceTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_keleseth_iccAI(pCreature);
+    }
+};
+
+/*######
+## boss_taldaram_icc
+######*/
+
+struct boss_taldaram_icc : public CreatureScript
+{
+    boss_taldaram_icc() : CreatureScript("boss_taldaram_icc") {}
+
+    struct boss_taldaram_iccAI : public blood_prince_council_baseAI
+    {
+        boss_taldaram_iccAI(Creature* pCreature) : blood_prince_council_baseAI(pCreature)
+        {
+            m_uiInvocationSpellEntry = SPELL_INVOCATION_TALDARAM;
+            m_iSayInvocationEntry = SAY_TALDARAM_INVOCATION;
+            m_iSayBerserkEntry = SAY_TALDARAM_BERSERK;
+        }
+
+        uint32 m_uiSparksTimer;
+
+        void Reset() override
+        {
+            blood_prince_council_baseAI::Reset();
+
+            m_uiSparksTimer = urand(8000, 15000);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+                DoScriptText(urand(0, 1) ? SAY_TALDARAM_SLAY_1 : SAY_TALDARAM_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_TALDARAM_DEATH, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // We need to initialize the target which is the ball of flame should follow
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_NOT_IN_MELEE_RANGE | SELECT_FLAG_PLAYER))
+            {
+                if (CreatureAI* pBallAI = pSummoned->AI())
+                    pBallAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, (Creature*)NULL, (Unit*)NULL, pTarget->GetGUIDLow());
+
+                DoScriptText(EMOTE_FLAMES, pSummoned, pTarget);
+                pSummoned->GetMotionMaster()->MoveFollow(pTarget, 0, 0);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            blood_prince_council_baseAI::UpdateAI(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiSphereTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_uiEmpowermentTimer ? SPELL_CONJURE_EMP_FLAME : SPELL_CONJURE_FLAME) == CAST_OK)
+                {
+                    if (m_uiEmpowermentTimer && !m_bIsSaidSpecial)
+                    {
+                        DoScriptText(SAY_TALDARAM_SPECIAL, m_creature);
+                        m_bIsSaidSpecial = true;
+                    }
+
+                    m_uiSphereTimer = 20000;
+                }
+            }
+            else
+                m_uiSphereTimer -= uiDiff;
+
+            if (m_uiSparksTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_GLITTERING_SPARKS) == CAST_OK)
+                    m_uiSparksTimer = 30000;
+            }
+            else
+                m_uiSparksTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_taldaram_iccAI(pCreature);
+    }
+};
+
+void AddSC_blood_prince_council()
+{
+    Script* s;
+
+    s = new npc_queen_lanathel_intro();
+    s->RegisterSelf();
+    s = new npc_ball_of_flame();
+    s->RegisterSelf();
+    s = new npc_kinetic_bomb();
+    s->RegisterSelf();
+    s = new npc_dark_nucleus();
+    s->RegisterSelf();
+    s = new npc_blood_orb_control();
+    s->RegisterSelf();
+    s = new boss_taldaram_icc();
+    s->RegisterSelf();
+    s = new boss_keleseth_icc();
+    s->RegisterSelf();
+    s = new boss_valanar_icc();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_queen_lanathel_intro";
+    //pNewScript->GetAI = &GetAI_npc_queen_lanathel_intro;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ball_of_flame";
+    //pNewScript->GetAI = &GetAI_npc_ball_of_flame;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kinetic_bomb";
+    //pNewScript->GetAI = &GetAI_npc_kinetic_bomb;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_dark_nucleus";
+    //pNewScript->GetAI = &GetAI_npc_dark_nucleus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_blood_orb_control";
+    //pNewScript->GetAI = &GetAI_npc_blood_orb_control;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_taldaram_icc";
+    //pNewScript->GetAI = &GetAI_boss_taldaram_icc;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_keleseth_icc";
+    //pNewScript->GetAI = &GetAI_boss_keleseth_icc;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_valanar_icc";
+    //pNewScript->GetAI = &GetAI_boss_valanar_icc;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_blood_queen_lanathel.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_blood_queen_lanathel.cpp
new file mode 100644
index 000000000..afecd32c4
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_blood_queen_lanathel.cpp
@@ -0,0 +1,341 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_blood_queen_lanathel
+SD%Complete: 60%
+SDComment: Timers; Most spells are dummy targeting spells and need core support; Quest 24756 event NYI.
+SDCategory: Icecrown Citadel
+EndScriptData */
+
+#include "precompiled.h"
+#include "icecrown_citadel.h"
+
+enum
+{
+    SAY_AGGRO                   = -1631121,
+    SAY_BITE_1                  = -1631122,
+    SAY_BITE_2                  = -1631123,
+    SAY_SHADOWS                 = -1631124,
+    SAY_PACT                    = -1631125,
+    SAY_MC                      = -1631126,
+    SAY_AIR_PHASE               = -1631127,
+    SAY_BERSERK                 = -1631128,
+    SAY_DEATH                   = -1631129,
+    SAY_SLAY_1                  = -1631195,
+    SAY_SLAY_2                  = -1631196,
+
+    // all phases
+    SPELL_BERSERK                   = 26662,
+    SPELL_SHROUD_OF_SORROW          = 70986,
+
+    // ground phase
+    SPELL_BLOOD_MIRROR              = 70837,            // triggers 70445 and other similar spells
+    SPELL_SWARMING_SHADOWS          = 71861,            // triggers 71264 and 71267
+    SPELL_PACT_OF_THE_DARKFALLEN    = 71336,            // triggers 71340
+    SPELL_VAMPIRIC_BITE             = 71837,            // triggers 71726 and 70946
+    SPELL_TWILIGHT_BLOODBOLT        = 71445,            // triggers 72313, 71446 and 71818
+    SPELL_DELIRIOUS_SLASH           = 72261,            // heroic only - triggers 71623 and 72264
+    SPELL_PRESENCE_OF_DARKFALLEN    = 70994,            // heroic only - triggers 71958, 71959 and 71952
+    SPELL_THIRST_QUENCHED           = 72154,            // related to quest 24756
+
+    // air phase
+    SPELL_INCITE_TERROR             = 73070,
+    SPELL_BLOODBOLT_WHIRL           = 71772,
+
+    // others
+    // NPC_SWARMING_SHADOWS          = 38163,            // has aura 71267 (or 71277?)
+
+    // encounter phases
+    PHASE_GROUND                    = 1,
+    PHASE_RUNNING                   = 2,
+    PHASE_AIR                       = 3,
+    PHASE_FLYING                    = 4,
+
+    // movement points
+    POINT_CENTER_GROUND             = 1,
+    POINT_CENTER_AIR                = 2
+};
+
+static const float aQueenPosition[2][3] =
+{
+    {4595.64f, 2769.19f, 400.13f},
+    {4595.90f, 2769.31f, 421.83f},
+};
+
+struct boss_blood_queen_lanathel : public CreatureScript
+{
+    boss_blood_queen_lanathel() : CreatureScript("boss_blood_queen_lanathel") {}
+
+    struct boss_blood_queen_lanathelAI : public ScriptedAI
+    {
+        boss_blood_queen_lanathelAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+        uint32 m_uiPhaseTimer;
+
+        uint32 m_uiBloodMirrorTimer;
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiVampiricBiteTimer;
+        uint32 m_uiBloodboltTimer;
+        uint32 m_uiPactDarkfallenTimer;
+        uint32 m_uiSwarmingShadowsTimer;
+        uint32 m_uiDeliriousSlashTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_GROUND;
+            m_uiPhaseTimer = 120000;                  // 2 min
+
+            m_uiEnrageTimer = 330000;                  // 5 min and 30 secs
+            m_uiBloodMirrorTimer = 0;
+            m_uiDeliriousSlashTimer = 20000;
+            m_uiVampiricBiteTimer = 15000;
+            m_uiBloodboltTimer = urand(15000, 20000);
+            m_uiPactDarkfallenTimer = 15000;
+            m_uiSwarmingShadowsTimer = 30000;
+
+            m_creature->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_QUEEN_LANATHEL, FAIL);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_SHROUD_OF_SORROW, CAST_TRIGGERED);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_QUEEN_LANATHEL, IN_PROGRESS);
+
+                if (m_pInstance->GetData(TYPE_DATA_IS_HEROIC))
+                    DoCastSpellIfCan(m_creature, SPELL_PRESENCE_OF_DARKFALLEN, CAST_TRIGGERED);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_QUEEN_LANATHEL, DONE);
+        }
+
+        void MovementInform(uint32 uiMovementType, uint32 uiPointId) override
+        {
+            if (uiMovementType != POINT_MOTION_TYPE)
+                return;
+
+            if (uiPointId == POINT_CENTER_GROUND)
+            {
+                if (m_uiPhase == PHASE_RUNNING)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_INCITE_TERROR) == CAST_OK)
+                    {
+                        m_uiPhase = PHASE_FLYING;
+
+                        m_creature->SetLevitate(true);
+                        m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MovePoint(POINT_CENTER_AIR, aQueenPosition[1][0], aQueenPosition[1][1], aQueenPosition[1][2], false);
+                    }
+                }
+                else if (m_uiPhase == PHASE_FLYING)
+                {
+                    m_uiPhase = PHASE_GROUND;
+                    m_uiPhaseTimer = 120000;
+                    SetCombatMovement(true);
+
+                    m_creature->SetLevitate(false);
+                    m_creature->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+
+                    m_creature->GetMotionMaster()->Clear();
+                    if (m_creature->getVictim())
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                }
+            }
+            else if (uiPointId == POINT_CENTER_AIR)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BLOODBOLT_WHIRL) == CAST_OK)
+                {
+                    DoScriptText(SAY_AIR_PHASE, m_creature);
+                    m_uiPhase = PHASE_AIR;
+                    m_uiPhaseTimer = 7000;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiEnrageTimer)
+            {
+                if (m_uiEnrageTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiEnrageTimer = 0;
+                    }
+                }
+                else
+                    m_uiEnrageTimer -= uiDiff;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_GROUND:
+                // Air phase change timer
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    SetCombatMovement(false);
+                    m_creature->GetMotionMaster()->Clear();
+                    m_creature->GetMotionMaster()->MovePoint(POINT_CENTER_GROUND, aQueenPosition[0][0], aQueenPosition[0][1], aQueenPosition[0][2]);
+
+                    m_uiPhase = PHASE_RUNNING;
+                    m_uiPhaseTimer = 0;
+                }
+                else
+                    m_uiPhaseTimer -= uiDiff;
+
+                // Only one bite per fight
+                if (m_uiVampiricBiteTimer)
+                {
+                    if (m_uiVampiricBiteTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_VAMPIRIC_BITE) == CAST_OK)
+                        {
+                            DoScriptText(urand(0, 1) ? SAY_BITE_1 : SAY_BITE_2, m_creature);
+                            m_uiVampiricBiteTimer = 0;
+                        }
+                    }
+                    else
+                        m_uiVampiricBiteTimer -= uiDiff;
+                }
+
+                if (m_uiBloodMirrorTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BLOOD_MIRROR) == CAST_OK)
+                        m_uiBloodMirrorTimer = 5000;
+                }
+                else
+                    m_uiBloodMirrorTimer -= uiDiff;
+
+                if (m_uiBloodboltTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TWILIGHT_BLOODBOLT) == CAST_OK)
+                        m_uiBloodboltTimer = urand(15000, 20000);
+                }
+                else
+                    m_uiBloodboltTimer -= uiDiff;
+
+                if (m_uiPactDarkfallenTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_PACT_OF_THE_DARKFALLEN) == CAST_OK)
+                    {
+                        DoScriptText(SAY_PACT, m_creature);
+                        m_uiPactDarkfallenTimer = urand(20000, 25000);
+                    }
+                }
+                else
+                    m_uiPactDarkfallenTimer -= uiDiff;
+
+                if (m_uiSwarmingShadowsTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SWARMING_SHADOWS) == CAST_OK)
+                    {
+                        DoScriptText(SAY_SHADOWS, m_creature);
+                        m_uiSwarmingShadowsTimer = urand(30000, 35000);
+                    }
+                }
+                else
+                    m_uiSwarmingShadowsTimer -= uiDiff;
+
+                // Heroic spells
+                if (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC))
+                {
+                    if (m_uiDeliriousSlashTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_DELIRIOUS_SLASH) == CAST_OK)
+                            m_uiDeliriousSlashTimer = 15000;
+                    }
+                    else
+                        m_uiDeliriousSlashTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+
+                break;
+            case PHASE_RUNNING:
+            case PHASE_FLYING:
+                // Nothing here. Wait for arriving at the point
+                break;
+            case PHASE_AIR:
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    m_uiPhase = PHASE_FLYING;
+                    m_uiPhaseTimer = 0;
+
+                    m_creature->GetMotionMaster()->Clear();
+                    m_creature->GetMotionMaster()->MovePoint(POINT_CENTER_GROUND, aQueenPosition[0][0], aQueenPosition[0][1], aQueenPosition[0][2]);
+                }
+                else
+                    m_uiPhaseTimer -= uiDiff;
+
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_blood_queen_lanathelAI(pCreature);
+    }
+};
+
+void AddSC_boss_blood_queen_lanathel()
+{
+    Script* s;
+
+    s = new boss_blood_queen_lanathel();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_blood_queen_lanathel";
+    //pNewScript->GetAI = &GetAI_boss_blood_queen_lanathel;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_deathbringer_saurfang.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_deathbringer_saurfang.cpp
new file mode 100644
index 000000000..9d35eede0
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_deathbringer_saurfang.cpp
@@ -0,0 +1,413 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_deathbringer_saurfang
+SD%Complete: 60%
+SDComment: Blood Power and all the related spells require core support; Intro and Outro event NYI.
+SDCategory: Icecrown Citadel
+EndScriptData */
+
+#include "precompiled.h"
+#include "icecrown_citadel.h"
+
+enum
+{
+    SAY_AGGRO                   = -1631028,
+    SAY_FALLENCHAMPION          = -1631029,
+    SAY_BLOODBEASTS             = -1631030,
+    SAY_SLAY_1                  = -1631031,
+    SAY_SLAY_2                  = -1631032,
+    SAY_BERSERK                 = -1631033,
+    SAY_DEATH                   = -1631034,
+    EMOTE_FRENZY                = -1631193,
+    EMOTE_SCENT                 = -1631194,
+
+    SAY_INTRO_ALLY_0            = -1631035,
+    SAY_INTRO_ALLY_1            = -1631036,
+    SAY_INTRO_ALLY_2            = -1631037,
+    SAY_INTRO_ALLY_3            = -1631038,
+    SAY_INTRO_ALLY_4            = -1631039,
+    SAY_INTRO_ALLY_5            = -1631040,
+    SAY_INTRO_HORDE_1           = -1631041,
+    SAY_INTRO_HORDE_2           = -1631042,
+    SAY_INTRO_HORDE_3           = -1631043,
+    SAY_INTRO_HORDE_4           = -1631044,
+    SAY_INTRO_HORDE_5           = -1631045,
+    SAY_INTRO_HORDE_6           = -1631046,
+    SAY_INTRO_HORDE_7           = -1631047,
+    SAY_INTRO_HORDE_8           = -1631048,
+    SAY_INTRO_HORDE_9           = -1631049,
+    SAY_OUTRO_ALLY_1            = -1631050,
+    SAY_OUTRO_ALLY_2            = -1631051,
+    SAY_OUTRO_ALLY_3            = -1631052,
+    SAY_OUTRO_ALLY_4            = -1631053,
+    SAY_OUTRO_ALLY_5            = -1631054,
+    SAY_OUTRO_ALLY_6            = -1631055,
+    SAY_OUTRO_ALLY_7            = -1631056,
+    SAY_OUTRO_ALLY_8            = -1631057,
+    SAY_OUTRO_ALLY_9            = -1631058,
+    SAY_OUTRO_ALLY_10           = -1631059,
+    SAY_OUTRO_ALLY_11           = -1631060,
+    SAY_OUTRO_ALLY_12           = -1631061,
+    SAY_OUTRO_ALLY_13           = -1631062,
+    SAY_OUTRO_ALLY_14           = -1631063,
+    SAY_OUTRO_ALLY_15           = -1631064,
+    SAY_OUTRO_ALLY_16           = -1631065,
+    SAY_OUTRO_HORDE_1           = -1631066,
+    SAY_OUTRO_HORDE_2           = -1631067,
+    SAY_OUTRO_HORDE_3           = -1631068,
+    SAY_OUTRO_HORDE_4           = -1631069,
+
+    // intro event related
+    // SPELL_GRIP_OF_AGONY       = 70572,
+    // SPELL_VEHICLE_HARDCODED   = 46598,
+
+    // combat spells
+    SPELL_BLOOD_POWER           = 72371,
+    // SPELL_BLOOD_POWER_SCALE   = 72370,            // included in creature_template_addon
+    // SPELL_ZERO_POWER          = 72242,            // included in creature_template_addon
+
+    // SPELL_MARK_FALLEN_DAMAGE  = 72256,            // procs on Saurfang melee attack - 72255 - included in creature_template_addon
+    SPELL_MARK_FALLEN_CHAMPION  = 72293,            // procs on target death - 72260
+    SPELL_REMOVE_MARKS          = 72257,
+
+    // SPELL_RUNE_OF_BLOOD_PROC  = 72408,            // procs on Saurfang mele attack - 72409 - included in creature_template_addon
+    SPELL_RUNE_OF_BLOOD         = 72410,
+
+    SPELL_BLOOD_NOVA            = 72378,
+    SPELL_BOILING_BLOOD         = 72385,
+
+    SPELL_CALL_BLOOD_BEAST_1    = 72172,            // summons 38508
+    SPELL_CALL_BLOOD_BEAST_2    = 72173,
+    SPELL_CALL_BLOOD_BEAST_3    = 72356,
+    SPELL_CALL_BLOOD_BEAST_4    = 72357,
+    SPELL_CALL_BLOOD_BEAST_5    = 72358,
+    SPELL_SCENT_OF_BLOOD        = 72769,            // triggers 72771 on the blood beasts
+
+    SPELL_BERSERK               = 26662,
+    SPELL_FRENZY                = 72737,
+
+    // Summoned spells
+    SPELL_RESISTANT_SKIN        = 72723,
+    SPELL_BLOOD_LINK_BEAST      = 72176,
+
+    FACTION_ID_UNDEAD           = 974,
+
+    POINT_ID_INTRO              = 1,
+    POINT_ID_EVADE              = 2,
+};
+
+static const float fIntroPosition[4] = { -491.30f, 2211.35f, 541.11f, 3.16f};
+
+struct boss_deathbringer_saurfang : public CreatureScript
+{
+    boss_deathbringer_saurfang() : CreatureScript("boss_deathbringer_saurfang") {}
+
+    struct boss_deathbringer_saurfangAI : public ScriptedAI
+    {
+        boss_deathbringer_saurfangAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_powerBloodPower = m_creature->GetPowerType();
+            m_bIsIntroDone = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiRuneOfBloodTimer;
+        uint32 m_uiBoilingBloodTimer;
+        uint32 m_uiBloodNovaTimer;
+        uint32 m_uiBloodBeastsTimer;
+        uint32 m_uiScentOfBloodTimer;
+        uint32 m_uiBerserkTimer;
+
+        bool m_bIsFrenzied;
+        bool m_bIsIntroDone;
+
+        Powers m_powerBloodPower;
+
+        void Reset() override
+        {
+            m_uiRuneOfBloodTimer = 25000;
+            m_uiBoilingBloodTimer = 19000;
+            m_uiBloodNovaTimer = 20000;
+            m_uiBloodBeastsTimer = 40000;
+            m_uiScentOfBloodTimer = 47000;
+            m_uiBerserkTimer = 8 * MINUTE * IN_MILLISECONDS;
+
+            if (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC))
+                m_uiBerserkTimer = 6 * MINUTE * IN_MILLISECONDS;
+
+            m_bIsFrenzied = false;
+
+            m_creature->SetPower(m_powerBloodPower, 0);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_BLOOD_POWER, CAST_TRIGGERED);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_DEATHBRINGER_SAURFANG, IN_PROGRESS);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bIsIntroDone && pWho->GetTypeId() == TYPEID_PLAYER && !((Player*)pWho)->isGameMaster() && m_creature->GetDistance2d(pWho) < 50.0f)
+            {
+                m_creature->GetMotionMaster()->MovePoint(POINT_ID_INTRO, fIntroPosition[0], fIntroPosition[1], fIntroPosition[2]);
+                if (m_pInstance)
+                    m_pInstance->DoUseDoorOrButton(GO_SAURFANG_DOOR);
+                m_bIsIntroDone = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            if (urand(0, 1))
+                DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_REMOVE_MARKS, CAST_TRIGGERED);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_DEATHBRINGER_SAURFANG, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_DEATHBRINGER_SAURFANG, FAIL);
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+
+            // Boss needs to evade to the point in front of the door
+            if (m_creature->IsAlive())
+                m_creature->GetMotionMaster()->MovePoint(POINT_ID_EVADE, fIntroPosition[0], fIntroPosition[1], fIntroPosition[2]);
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE)
+                return;
+
+            if (uiPointId == POINT_ID_EVADE)
+            {
+                m_creature->SetFacingTo(fIntroPosition[3]);
+
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_DEATHBRINGER_SAURFANG, FAIL);
+            }
+            else if (uiPointId == POINT_ID_INTRO)
+            {
+                if (m_pInstance)
+                    m_pInstance->DoUseDoorOrButton(GO_SAURFANG_DOOR);
+
+                // Note: this should be done only after the intro event is finished
+                // ToDo: move this to the proper place after the intro will be implemented
+                // Also the faction needs to be checked if it should be handled in database
+                m_creature->setFaction(FACTION_ID_UNDEAD);
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PASSIVE);
+                m_creature->SetInCombatWithZone();
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->CastSpell(pSummoned, SPELL_RESISTANT_SKIN, true);
+            pSummoned->CastSpell(pSummoned, SPELL_BLOOD_LINK_BEAST, true);
+
+            // Note: the summoned should be activated only after 2-3 seconds after summon - can be done in eventAI
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                pSummoned->AI()->AttackStart(pTarget);
+        }
+
+        // Wrapper to help get a random player for the Mark of the Fallen Champion
+        Unit* SelectRandomPlayerForMark()
+        {
+            // Search only for players which are not within 18 yards of the boss
+            std::vector<Unit*> suitableTargets;
+            ThreatList const& threatList = m_creature->GetThreatManager().getThreatList();
+
+            for (ThreatList::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
+            {
+                if (Unit* pTarget = m_creature->GetMap()->GetUnit((*itr)->getUnitGuid()))
+                {
+                    if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget != m_creature->getVictim() && !pTarget->HasAura(SPELL_MARK_FALLEN_CHAMPION))
+                        suitableTargets.push_back(pTarget);
+                }
+            }
+
+            if (suitableTargets.empty())
+                return m_creature->getVictim();
+            else
+                return suitableTargets[urand(0, suitableTargets.size() - 1)];
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Mark of the Fallen Champion
+            // ToDo: enable this when blood power is fully supported by the core
+            /*if (m_creature->GetPower(m_powerBloodPower) >= 100)
+            {
+            if (Unit* pTarget = SelectRandomPlayerForMark())
+            {
+            if (DoCastSpellIfCan(pTarget, SPELL_MARK_FALLEN_CHAMPION) == CAST_OK)
+            {
+            DoScriptText(SAY_FALLENCHAMPION, m_creature);
+            m_creature->SetPower(m_powerBloodPower, 0);
+            }
+            }
+            }*/
+
+            // Frenzy (soft enrage)
+            if (!m_bIsFrenzied)
+            {
+                if (m_creature->GetHealthPercent() <= 30.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_FRENZY, m_creature);
+                        m_bIsFrenzied = true;
+                    }
+                }
+            }
+
+            // Berserk (hard enrage)
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            // Rune of Blood
+            if (m_uiRuneOfBloodTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_RUNE_OF_BLOOD) == CAST_OK)
+                    m_uiRuneOfBloodTimer = 25000;
+            }
+            else
+                m_uiRuneOfBloodTimer -= uiDiff;
+
+            // Boiling Blood
+            if (m_uiBoilingBloodTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BOILING_BLOOD) == CAST_OK)
+                    m_uiBoilingBloodTimer = 15000;
+            }
+            else
+                m_uiBoilingBloodTimer -= uiDiff;
+
+            // Blood Nova
+            if (m_uiBloodNovaTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BLOOD_NOVA) == CAST_OK)
+                    m_uiBloodNovaTimer = 20000;
+            }
+            else
+                m_uiBloodNovaTimer -= uiDiff;
+
+            // Call Blood Beasts
+            if (m_uiBloodBeastsTimer < uiDiff)
+            {
+                DoScriptText(SAY_BLOODBEASTS, m_creature);
+
+                DoCastSpellIfCan(m_creature, SPELL_CALL_BLOOD_BEAST_1, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_CALL_BLOOD_BEAST_2, CAST_TRIGGERED);
+
+                if (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_25MAN))
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_CALL_BLOOD_BEAST_3, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_CALL_BLOOD_BEAST_4, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_CALL_BLOOD_BEAST_5, CAST_TRIGGERED);
+                }
+
+                m_uiBloodBeastsTimer = 40000;
+                m_uiScentOfBloodTimer = 7000;
+            }
+            else
+                m_uiBloodBeastsTimer -= uiDiff;
+
+            // Scent of Blood
+            if (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC))
+            {
+                if (m_uiScentOfBloodTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SCENT_OF_BLOOD) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_SCENT, m_creature);
+                        m_uiScentOfBloodTimer = 40000;
+                    }
+                }
+                else
+                    m_uiScentOfBloodTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_deathbringer_saurfangAI(pCreature);
+    }
+};
+
+void AddSC_boss_deathbringer_saurfang()
+{
+    Script* s;
+
+    s = new boss_deathbringer_saurfang();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_deathbringer_saurfang";
+    //pNewScript->GetAI = &GetAI_boss_deathbringer_saurfang;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_festergut.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_festergut.cpp
new file mode 100644
index 000000000..c7a6dc0b7
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_festergut.cpp
@@ -0,0 +1,237 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_festergut
+SD%Complete: 90%
+SDComment:
+SDCategory: Icecrown Citadel
+EndScriptData */
+
+#include "precompiled.h"
+#include "icecrown_citadel.h"
+
+enum
+{
+    SPELL_BERSERK               = 47008,
+
+    // Gastric Bloat
+    SPELL_GASTRIC_BLOAT         = 72214, // proc aura, ~8 sec cooldown, cooldown for Creature requires implementation in core
+
+    // Inhale Blight
+    SPELL_INHALE_BLIGHT         = 69165,
+    SPELL_INHALED_BLIGHT_10     = 69166,
+    SPELL_INHALED_BLIGHT_25     = 71912,
+
+    // Pungent Blight
+    SPELL_PUNGENT_BLIGHT        = 69195,
+
+    // Gaseous Blight
+    SPELL_GASEUS_BLIGHT_DUMMY   = 69125, // gas is spread into the room on aggro
+    // periodic auras spells
+    SPELL_GASEOUS_BLIGHT_1      = 69157,
+    SPELL_GASEOUS_BLIGHT_2      = 69162,
+    SPELL_GASEOUS_BLIGHT_3      = 69164,
+
+    // visual gas dummy auras
+    SPELL_GASEOUS_BLIGHT_DUMMY1 = 69126,
+    SPELL_GASEOUS_BLIGHT_DUMMY2 = 69152,
+    SPELL_GASEOUS_BLIGHT_DUMMY3 = 69154,
+
+    // Inoculent
+    SPELL_REMOVE_INOCULENT      = 69298,
+
+    // Gas Spore
+    SPELL_GAS_SPORE             = 69278,
+
+    // Vile Gas
+    SPELL_VILE_GAS_SUMMON       = 72288,
+    SPELL_VILE_GAS              = 71307
+};
+
+enum
+{
+    SAY_AGGRO                   = -1631082,
+    SAY_BLIGHT                  = -1631083,
+    SAY_SPORE                   = -1631084,
+    SAY_PUNGUENT_BLIGHT         = -1631085,
+    SAY_PUNGUENT_BLIGHT_EMOTE   = -1631086,
+    SAY_SLAY_1                  = -1631087,
+    SAY_SLAY_2                  = -1631088,
+    SAY_BERSERK                 = -1631089,
+    SAY_DEATH                   = -1631090,
+    SAY_FESTERGUT_DEATH         = -1631091,
+};
+
+struct boss_festergut : public CreatureScript
+{
+    boss_festergut() : CreatureScript("boss_festergut") {}
+
+    struct boss_festergutAI : public ScriptedAI
+    {
+        boss_festergutAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetMap()->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiGastricBloatTimer;
+        uint32 m_uiInhaleBlightTimer;
+        uint32 m_uiGasSporeTimer;
+        uint32 m_uiVileGasTimer;
+
+        void Reset() override
+        {
+            m_uiBerserkTimer = 5 * MINUTE * IN_MILLISECONDS;
+            m_uiGastricBloatTimer = 10000;
+            m_uiInhaleBlightTimer = 30000;
+            m_uiGasSporeTimer = 20000;
+            m_uiVileGasTimer = 10000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            DoCastSpellIfCan(m_creature, SPELL_GASTRIC_BLOAT, CAST_TRIGGERED); // not working as intended currently
+            DoCastSpellIfCan(m_creature, SPELL_GASEOUS_BLIGHT_1, CAST_TRIGGERED); // DoT aura
+            DoCastSpellIfCan(m_creature, SPELL_GASEUS_BLIGHT_DUMMY, CAST_TRIGGERED); // visual cast on dummy npc
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FESTERGUT, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FESTERGUT, FAIL);
+
+            DoCastSpellIfCan(m_creature, SPELL_REMOVE_INOCULENT, CAST_TRIGGERED);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FESTERGUT, DONE);
+
+            DoScriptText(SAY_DEATH, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_REMOVE_INOCULENT, CAST_TRIGGERED);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Berserk
+            if (m_uiBerserkTimer <= uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                {
+                    DoScriptText(SAY_BERSERK, m_creature);
+                    m_uiBerserkTimer = 5 * MINUTE * IN_MILLISECONDS;
+                }
+            }
+            else
+                m_uiBerserkTimer -= uiDiff;
+
+            // Inhale Blight and Pungent Blight
+            if (m_uiInhaleBlightTimer <= uiDiff)
+            {
+                SpellAuraHolder* holder = m_creature->GetSpellAuraHolder(SPELL_INHALED_BLIGHT_10);
+
+                if (!holder)
+                    holder = m_creature->GetSpellAuraHolder(SPELL_INHALED_BLIGHT_25);
+
+                // inhale the gas or if already have 3 stacks - release it
+                if (holder && holder->GetStackAmount() >= 3)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_PUNGENT_BLIGHT) == CAST_OK)
+                    {
+                        DoScriptText(SAY_PUNGUENT_BLIGHT_EMOTE, m_creature);
+                        DoScriptText(SAY_PUNGUENT_BLIGHT, m_creature);
+                        m_uiInhaleBlightTimer = 35000;
+                    }
+                }
+                else if (DoCastSpellIfCan(m_creature, SPELL_INHALE_BLIGHT) == CAST_OK)
+                {
+                    if (m_pInstance)
+                    {
+                        if (Creature* pProfessor = m_pInstance->GetSingleCreatureFromStorage(NPC_PROFESSOR_PUTRICIDE))
+                            DoScriptText(SAY_BLIGHT, pProfessor);
+                    }
+                    m_uiInhaleBlightTimer = 30000;
+                }
+            }
+            else
+                m_uiInhaleBlightTimer -= uiDiff;
+
+            // Gas Spore
+            if (m_uiGasSporeTimer <= uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_GAS_SPORE) == CAST_OK)
+                {
+                    DoScriptText(SAY_SPORE, m_creature);
+                    m_uiGasSporeTimer = 40000;
+                }
+            }
+            else
+                m_uiGasSporeTimer -= uiDiff;
+
+            // Vile Gas
+            if (m_uiVileGasTimer <= uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_VILE_GAS_SUMMON, CAST_TRIGGERED) == CAST_OK)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_VILE_GAS) == CAST_OK)
+                        m_uiVileGasTimer = 30000;
+                }
+            }
+            else
+                m_uiVileGasTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_festergutAI(pCreature);
+    }
+};
+
+void AddSC_boss_festergut()
+{
+    Script* s;
+
+    s = new boss_festergut();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_festergut";
+    //pNewScript->GetAI = &GetAI_boss_festergut;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_lady_deathwhisper.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_lady_deathwhisper.cpp
new file mode 100644
index 000000000..1a327b357
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_lady_deathwhisper.cpp
@@ -0,0 +1,439 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_lady_deathwhisper
+SD%Complete: 95%
+SDComment: Minor adjustments may be required
+SDCategory: Icecrown Citadel
+EndScriptData */
+
+#include "precompiled.h"
+#include "icecrown_citadel.h"
+
+enum
+{
+    // yells
+    SAY_AGGRO                   = -1631018,
+    SAY_PHASE_TWO               = -1631019,
+    SAY_DARK_EMPOWERMENT        = -1631020,
+    SAY_DARK_TRANSFORMATION     = -1631021,
+    SAY_ANIMATE_DEAD            = -1631022,
+    SAY_DOMINATE_MIND           = -1631023,
+    SAY_BERSERK                 = -1631024,
+    SAY_DEATH                   = -1631025,
+    SAY_SLAY_1                  = -1631026,
+    SAY_SLAY_2                  = -1631027,
+
+    // spells - phase 1
+    SPELL_SHADOW_CHANNELING     = 43897,
+    SPELL_MANA_BARRIER          = 70842,
+    SPELL_SHADOW_BOLT           = 71254,
+
+    // phase 2
+    SPELL_INSIGNIFICANCE        = 71204,
+    SPELL_FROSTBOLT             = 71420,
+    SPELL_FROSTBOLT_VOLLEY      = 72905,
+    SPELL_SUMMON_SPIRIT         = 71363,            // triggers 71426
+
+    // common
+    SPELL_BERSERK               = 26662,
+    SPELL_DOMINATE_MIND         = 71289,
+    SPELL_DEATH_AND_DECAY       = 71001,
+    SPELL_DARK_EMPOWERMENT      = 70896,            // dummy - triggers 70901 - only on Adherents - transforms target into 38136
+    SPELL_DARK_TRANSFORMATION   = 70895,            // dummy - triggers 70900 - only on Fanatics - transforms target into 38135
+    SPELL_DARK_MARTYRDOM        = 70897,            // dummy - triggers 70903 on Adherents or 71236 on Fanatics
+    // SPELL_SUMMON_ADHERENT     = 70820,            // cast by the stalkers - only server side
+    // SPELL_SUMMON_FANATIC      = 70819,            // cast by the stalkers - only server side
+
+    // npcs
+    NPC_VENGEFUL_SHADE          = 38222,            // has aura 71494
+};
+
+struct boss_lady_deathwhisper : public CreatureScript
+{
+    boss_lady_deathwhisper() : CreatureScript("boss_lady_deathwhisper") {}
+
+    struct boss_lady_deathwhisperAI : public ScriptedAI
+    {
+        boss_lady_deathwhisperAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bIsPhaseOne;
+        bool m_bIsLeftSideSummon;
+
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiSummonWaveTimer;
+        uint32 m_uiCultistBuffTimer;
+        uint32 m_uiDarkMartyrdomTimer;
+        uint32 m_uiTouchOfInsignificanceTimer;
+        uint32 m_uiShadowBoltTimer;
+        uint32 m_uiDeathAndDecayTimer;
+        uint32 m_uiFrostboltTimer;
+        uint32 m_uiFrostboltVolleyTimer;
+        uint32 m_uiDominateMindTimer;
+        uint32 m_uiVengefulShadeTimer;
+
+        uint8 m_uiMindControlCount;
+
+        GuidList m_lCultistSpawnedGuidList;
+
+        void Reset() override
+        {
+            m_bIsPhaseOne = true;
+            m_bIsLeftSideSummon = roll_chance_i(50) ? true : false;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+            m_uiSummonWaveTimer = 10000;
+            m_uiCultistBuffTimer = 0;
+            m_uiDarkMartyrdomTimer = 30000;
+            m_uiTouchOfInsignificanceTimer = 7000;
+            m_uiShadowBoltTimer = 2000;
+            m_uiDeathAndDecayTimer = urand(10000, 15000);
+            m_uiFrostboltTimer = urand(5000, 10000);
+            m_uiFrostboltVolleyTimer = 5000;
+            m_uiDominateMindTimer = urand(30000, 45000);
+            m_uiVengefulShadeTimer = 10000;
+            m_uiMindControlCount = 0;
+
+            SetCombatMovement(false);
+            DoCastSpellIfCan(m_creature, SPELL_SHADOW_CHANNELING);
+
+            // Set the max allowed mind control targets
+            if (m_pInstance)
+            {
+                if (m_pInstance->GetData(TYPE_DATA_IS_25MAN))
+                    m_uiMindControlCount = m_pInstance->GetData(TYPE_DATA_IS_HEROIC) ? 3 : 1;
+                else
+                    m_uiMindControlCount = m_pInstance->GetData(TYPE_DATA_IS_HEROIC) ? 1 : 0;
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_MANA_BARRIER, CAST_TRIGGERED);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LADY_DEATHWHISPER, IN_PROGRESS);
+
+                // Sort the summoning stalkers: now in SetData(IN_PROGRESS)
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            if (urand(0, 1))
+                DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_LADY_DEATHWHISPER, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_LADY_DEATHWHISPER, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_CULT_ADHERENT:
+            case NPC_CULT_FANATIC:
+                m_lCultistSpawnedGuidList.push_back(pSummoned->GetObjectGuid());
+                break;
+            }
+
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                pSummoned->AI()->AttackStart(pTarget);
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() != NPC_VENGEFUL_SHADE)
+                m_lCultistSpawnedGuidList.remove(pSummoned->GetObjectGuid());
+        }
+
+        // Wrapper to select a random cultist
+        Creature* DoSelectRandomCultist(uint32 uiEntry = 0)
+        {
+            std::vector<Creature*> vCultists;
+            vCultists.reserve(m_lCultistSpawnedGuidList.size());
+
+            for (GuidList::const_iterator itr = m_lCultistSpawnedGuidList.begin(); itr != m_lCultistSpawnedGuidList.end(); ++itr)
+            {
+                if (Creature* pCultist = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    // Allow to be sorted them by entry
+                    if (!uiEntry)
+                        vCultists.push_back(pCultist);
+                    else if (pCultist->GetEntry() == uiEntry)
+                        vCultists.push_back(pCultist);
+                }
+            }
+
+            if (vCultists.empty())
+                return NULL;
+
+            return vCultists[urand(0, vCultists.size() - 1)];
+        }
+
+        // Wrapper to handle the second phase start
+        void ReceiveAIEvent(AIEventType eventType, Creature*, Unit*, uint32) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                DoScriptText(SAY_PHASE_TWO, m_creature);
+                SetCombatMovement(true);
+                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                m_bIsPhaseOne = false;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            if (m_uiDeathAndDecayTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_DEATH_AND_DECAY) == CAST_OK)
+                        m_uiDeathAndDecayTimer = 20000;
+                }
+            }
+            else
+                m_uiDeathAndDecayTimer -= uiDiff;
+
+            if (m_uiMindControlCount)
+            {
+                if (m_uiDominateMindTimer < uiDiff)
+                {
+                    for (uint8 i = 0; i < m_uiMindControlCount; ++i)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_DOMINATE_MIND, SELECT_FLAG_PLAYER))
+                            DoCastSpellIfCan(pTarget, SPELL_DOMINATE_MIND, CAST_TRIGGERED);
+                    }
+
+                    DoScriptText(SAY_DOMINATE_MIND, m_creature);
+                    m_uiDominateMindTimer = 40000;
+                }
+                else
+                    m_uiDominateMindTimer -= uiDiff;
+            }
+
+            // Summon waves - in phase 1 or on heroic
+            if (m_pInstance && (m_pInstance->GetData(TYPE_DATA_IS_HEROIC) || m_bIsPhaseOne))
+            {
+                if (m_uiSummonWaveTimer < uiDiff)
+                {
+                    m_pInstance->SetData(TYPE_DO_SUMMON_CULTIST_WAVE, uint32(m_bIsPhaseOne));
+                    m_uiCultistBuffTimer = 10000;
+                    m_uiDarkMartyrdomTimer = 40000;
+                    m_uiSummonWaveTimer = m_pInstance->GetData(TYPE_DATA_IS_HEROIC) ? 45000 : 60000;
+                }
+                else
+                    m_uiSummonWaveTimer -= uiDiff;
+
+                if (m_uiCultistBuffTimer)
+                {
+                    if (m_uiCultistBuffTimer <= uiDiff)
+                    {
+                        // Choose a random of Fanatic or Adherent
+                        bool bIsFanatic = roll_chance_i(50) ? true : false;
+                        uint32 uiNpcEntry = bIsFanatic ? NPC_CULT_FANATIC : NPC_CULT_ADHERENT;
+                        uint32 uiSpellEntry = bIsFanatic ? SPELL_DARK_TRANSFORMATION : SPELL_DARK_EMPOWERMENT;
+                        int32 iTextEntry = bIsFanatic ? SAY_DARK_TRANSFORMATION : SAY_DARK_EMPOWERMENT;
+
+                        Creature* pTarget = DoSelectRandomCultist(uiNpcEntry);
+                        if (pTarget && DoCastSpellIfCan(pTarget, uiSpellEntry) == CAST_OK)
+                        {
+                            // Remove the selected cultist from the list because we don't want it selected twice
+                            m_lCultistSpawnedGuidList.remove(pTarget->GetObjectGuid());
+                            DoScriptText(iTextEntry, m_creature);
+                            m_uiCultistBuffTimer = 0;
+                        }
+                    }
+                    else
+                        m_uiCultistBuffTimer -= uiDiff;
+                }
+
+                if (m_uiDarkMartyrdomTimer)
+                {
+                    if (m_uiDarkMartyrdomTimer <= uiDiff)
+                    {
+                        // Try to get a target on which to cast Martyrdom
+                        if (Creature* pTarget = DoSelectRandomCultist())
+                        {
+                            if (DoCastSpellIfCan(pTarget, SPELL_DARK_MARTYRDOM) == CAST_OK)
+                            {
+                                DoScriptText(SAY_ANIMATE_DEAD, m_creature);
+                                m_uiDarkMartyrdomTimer = 0;
+                            }
+                        }
+                        else
+                            m_uiDarkMartyrdomTimer = 0;
+                    }
+                    else
+                        m_uiDarkMartyrdomTimer -= uiDiff;
+                }
+            }
+
+            // Phase 1 specific spells
+            if (m_bIsPhaseOne)
+            {
+                if (m_uiShadowBoltTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_BOLT) == CAST_OK)
+                            m_uiShadowBoltTimer = 2000;
+                    }
+                }
+                else
+                    m_uiShadowBoltTimer -= uiDiff;
+            }
+            // Phase 2 specific spells
+            else
+            {
+                if (m_uiTouchOfInsignificanceTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_INSIGNIFICANCE) == CAST_OK)
+                        m_uiTouchOfInsignificanceTimer = 7000;
+                }
+                else
+                    m_uiTouchOfInsignificanceTimer -= uiDiff;
+
+                if (m_uiFrostboltTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_FROSTBOLT) == CAST_OK)
+                            m_uiFrostboltTimer = urand(2000, 4000);
+                    }
+                }
+                else
+                    m_uiFrostboltTimer -= uiDiff;
+
+                if (m_uiFrostboltVolleyTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FROSTBOLT_VOLLEY) == CAST_OK)
+                        m_uiFrostboltVolleyTimer = urand(15000, 20000);
+                }
+                else
+                    m_uiFrostboltVolleyTimer -= uiDiff;
+
+                if (m_uiVengefulShadeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_SPIRIT) == CAST_OK)
+                        m_uiVengefulShadeTimer = 10000;
+                }
+                else
+                    m_uiVengefulShadeTimer -= uiDiff;
+
+                DoMeleeAttackIfReady();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_lady_deathwhisperAI(pCreature);
+    }
+};
+
+struct spell_mana_barrier : public SpellScript
+{
+    spell_mana_barrier() : SpellScript("spell_mana_barrier") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_MANA_BARRIER && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+            uint32 uiDamage = pCreatureTarget->GetMaxHealth() - pCreatureTarget->GetHealth();
+            if (!uiDamage)
+                return true;
+
+            if (pCreatureTarget->GetPower(POWER_MANA) < uiDamage)
+            {
+                uiDamage = pCreatureTarget->GetPower(POWER_MANA);
+                pCreatureTarget->RemoveAurasDueToSpell(SPELL_MANA_BARRIER);
+
+                if (CreatureAI* pBossAI = pCreatureTarget->AI())
+                    pBossAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, (Creature*)NULL, (Unit*)NULL, 0);
+            }
+
+            pCreatureTarget->DealHeal(pCreatureTarget, uiDamage, GetSpellStore()->LookupEntry(SPELL_MANA_BARRIER));
+            pCreatureTarget->ModifyPower(POWER_MANA, -int32(uiDamage));
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_lady_deathwhisper()
+{
+    Script* s;
+
+    s = new boss_lady_deathwhisper();
+    s->RegisterSelf();
+
+    s = new spell_mana_barrier();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_lady_deathwhisper";
+    //pNewScript->GetAI = &GetAI_boss_lady_deathwhisper;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_mana_barrier;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_lord_marrowgar.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_lord_marrowgar.cpp
new file mode 100644
index 000000000..a015795dc
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_lord_marrowgar.cpp
@@ -0,0 +1,319 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_lord_marrowgar
+SD%Complete: 75%
+SDComment: Bone Spike Spell requires vehicle support
+SDCategory: Icecrown Citadel
+EndScriptData */
+
+#include "precompiled.h"
+#include "icecrown_citadel.h"
+
+enum
+{
+    SAY_AGGRO                   = -1631002,
+    SAY_BONE_STORM              = -1631003,
+    SAY_BONE_SPIKE_1            = -1631004,
+    SAY_BONE_SPIKE_2            = -1631005,
+    SAY_BONE_SPIKE_3            = -1631006,
+    SAY_SLAY_1                  = -1631007,
+    SAY_SLAY_2                  = -1631008,
+    SAY_DEATH                   = -1631009,
+    SAY_BERSERK                 = -1631010,
+
+    // spells
+    SPELL_BERSERK               = 47008,
+    SPELL_BONE_SLICE            = 69055,
+    SPELL_BONE_STORM            = 69076,
+    SPELL_COLDFLAME             = 69140,
+    SPELL_COLDFLAME_STORM       = 72705,
+    SPELL_BONE_SPIKE            = 69057,
+    SPELL_BONE_SPIKE_STORM      = 73142,
+
+    // summoned spells
+    SPELL_COLDFLAME_AURA        = 69145,
+    SPELL_IMPALED               = 69065,
+
+    // npcs
+    NPC_BONE_SPIKE              = 38711,
+    NPC_COLDFLAME               = 36672,
+
+    // phases and max cold flame charges
+    PHASE_NORMAL                = 1,
+    PHASE_BONE_STORM_CHARGE     = 2,
+    PHASE_BONE_STORM_CHARGING   = 3,
+    PHASE_BONE_STORM_COLDFLAME  = 4,
+
+    MAX_CHARGES_NORMAL          = 4,
+    MAX_CHARGES_HEROIC          = 5,
+};
+
+struct boss_lord_marrowgar : public CreatureScript
+{
+    boss_lord_marrowgar() : CreatureScript("boss_lord_marrowgar") {}
+
+    struct boss_lord_marrowgarAI : public ScriptedAI
+    {
+        boss_lord_marrowgarAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            // on heroic, there is 1 more Bone Storm charge
+            m_uiMaxCharges = (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC)) ? MAX_CHARGES_HEROIC : MAX_CHARGES_NORMAL;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+        uint8 m_uiChargesCount;
+        uint8 m_uiMaxCharges;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiBoneSliceTimer;
+        uint32 m_uiColdflameTimer;
+        uint32 m_uiBoneSpikeTimer;
+        uint32 m_uiBoneStormTimer;
+        uint32 m_uiBoneStormChargeTimer;
+        uint32 m_uiBoneStormColdflameTimer;
+
+        void Reset() override
+        {
+            SetCombatMovement(true);
+
+            m_uiPhase = PHASE_NORMAL;
+            m_uiChargesCount = 0;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+            m_uiBoneSliceTimer = 1000;
+            m_uiColdflameTimer = 5000;
+            m_uiBoneSpikeTimer = 15000;
+            m_uiBoneStormTimer = 45000;
+            m_uiBoneStormChargeTimer = 3000;
+            m_uiBoneStormColdflameTimer = 1000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MARROWGAR, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            if (urand(0, 1))
+                DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MARROWGAR, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MARROWGAR, FAIL);
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE)
+                return;
+
+            if (uiPointId)
+            {
+                m_uiPhase = PHASE_BONE_STORM_COLDFLAME;
+                ++m_uiChargesCount;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_COLDFLAME)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_COLDFLAME_AURA, true);
+
+                float fX, fY;
+                float fZ = pSummoned->GetPositionZ();
+                // Note: the NearPoint2D function may not be correct here, because we may use a wrong Z value
+                m_creature->GetNearPoint2D(fX, fY, 80.0f, m_creature->GetAngle(pSummoned));
+                pSummoned->GetMotionMaster()->MovePoint(0, fX, fY, fZ, false);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            switch (m_uiPhase)
+            {
+            case PHASE_NORMAL:
+
+                // Coldflame
+                if (m_uiColdflameTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_COLDFLAME) == CAST_OK)
+                        m_uiColdflameTimer = 5000;
+                }
+                else
+                    m_uiColdflameTimer -= uiDiff;
+
+                // Bone Storm
+                if (m_uiBoneStormTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BONE_STORM) == CAST_OK)
+                    {
+                        // ToDo: research if we need to increase the speed here
+                        DoScriptText(SAY_BONE_STORM, m_creature);
+                        m_uiPhase = PHASE_BONE_STORM_CHARGE;
+                        SetCombatMovement(false);
+                        m_creature->GetMotionMaster()->MoveIdle();
+                        m_uiBoneStormTimer = 90000;
+                    }
+                }
+                else
+                    m_uiBoneStormTimer -= uiDiff;
+
+                // Bone Slice
+                if (m_uiBoneSliceTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_BONE_SLICE) == CAST_OK)
+                        m_uiBoneSliceTimer = 1000;
+                }
+                else
+                    m_uiBoneSliceTimer -= uiDiff;
+
+                DoMeleeAttackIfReady();
+
+                break;
+            case PHASE_BONE_STORM_CHARGE:
+
+                // next charge to random enemy
+                if (m_uiBoneStormChargeTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_PLAYER))
+                    {
+                        float fX, fY, fZ;
+                        pTarget->GetPosition(fX, fY, fZ);
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                        m_uiBoneStormChargeTimer = 3000;
+                        m_uiPhase = PHASE_BONE_STORM_CHARGING;
+                    }
+                }
+                else
+                    m_uiBoneStormChargeTimer -= uiDiff;
+
+                break;
+            case PHASE_BONE_STORM_CHARGING:
+                // waiting to arrive at target position
+                break;
+            case PHASE_BONE_STORM_COLDFLAME:
+
+                if (m_uiBoneStormColdflameTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_COLDFLAME_STORM) == CAST_OK)
+                    {
+                        // When the max cold flame charges are reached, remove Bone storm aura
+                        if (m_uiChargesCount == m_uiMaxCharges)
+                        {
+                            m_creature->RemoveAurasDueToSpell(SPELL_BONE_STORM);
+                            m_uiBoneStormTimer = 60000;
+                            m_uiBoneSliceTimer = 10000;
+                            SetCombatMovement(true);
+                            m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                            m_uiChargesCount = 0;
+                            m_uiPhase = PHASE_NORMAL;
+                        }
+                        else
+                            m_uiPhase = PHASE_BONE_STORM_CHARGE;
+
+                        m_uiBoneStormColdflameTimer = 1000;
+                    }
+                }
+                else
+                    m_uiBoneStormColdflameTimer -= uiDiff;
+
+                break;
+            }
+
+            // Bone spike - different spells for the normal phase or storm phase
+            // ToDo: uncommnet this when vehicles and the Bone spike spells are properly supported by core
+            /*if (m_pInstance && (m_pInstance->IsHeroicDifficulty() || m_uiPhase == PHASE_NORMAL))
+            {
+            if (m_uiBoneSpikeTimer < uiDiff)
+            {
+            if (DoCastSpellIfCan(m_creature, m_uiPhase == PHASE_NORMAL ? SPELL_BONE_SPIKE : SPELL_BONE_SPIKE_STORM) == CAST_OK)
+            {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_BONE_SPIKE_1, m_creature); break;
+            case 1: DoScriptText(SAY_BONE_SPIKE_2, m_creature); break;
+            case 2: DoScriptText(SAY_BONE_SPIKE_3, m_creature); break;
+            }
+            m_uiBoneSpikeTimer = 18000;
+            }
+            }
+            else
+            m_uiBoneSpikeTimer -= uiDiff;
+            }*/
+
+            // Berserk
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK))
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_lord_marrowgarAI(pCreature);
+    }
+};
+
+void AddSC_boss_lord_marrowgar()
+{
+    Script* s;
+
+    s = new boss_lord_marrowgar();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_lord_marrowgar";
+    //pNewScript->GetAI = &GetAI_boss_lord_marrowgar;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_professor_putricide.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_professor_putricide.cpp
new file mode 100644
index 000000000..e1637cb52
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_professor_putricide.cpp
@@ -0,0 +1,498 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_professor_putricide
+SD%Complete: 70%
+SDComment: NYI: Abomination and table handling, Malleable Goo,
+           possibly Green Ooze and Orange Gas scripts require handling in SD3, but need further research on their spells
+SDCategory: Icecrown Citadel
+EndScriptData */
+
+#include "precompiled.h"
+#include "icecrown_citadel.h"
+
+enum
+{
+    SAY_AGGRO                   = -1631092,
+    SAY_AIRLOCK                 = -1631093,
+    SAY_PHASE_CHANGE            = -1631094,
+    SAY_TRANSFORM_1             = -1631095,
+    SAY_TRANSFORM_2             = -1631096,
+    SAY_SLAY_1                  = -1631097,
+    SAY_SLAY_2                  = -1631098,
+    SAY_BERSERK                 = -1631099,
+    SAY_DEATH                   = -1631100,
+};
+
+enum
+{
+    SPELL_BERSERK                   = 47008,
+
+    // controlled abomination
+    SPELL_MUTATED_TRANSFORMATION    = 70308,
+    SPELL_EAT_OOZE                  = 72527,
+    SPELL_REGURGITATED_OOZE         = 70539,
+    SPELL_MUTATED_SLASH             = 70542,
+    SPELL_MUTATED_AURA              = 70405,
+    SPELL_ABOMINATION_POWER_DRAIN   = 70385, // prevents normal regen of abomination's power
+
+    SPELL_UNSTABLE_EXPERIMENT       = 70351, // ooze and gas summoning spells in basepoints of effects of this spell suggest that they should be handled in core
+
+    // Volatile Experiment on heroic difficulties
+    SPELL_VOLATILE_EXPERIMENT       = 72840, // single target dummy effect
+    SPELL_VOLATILE_EXPERIMENT_2     = 72841, // single target dummy effect
+    SPELL_VOLATILE_EXPERIMENT_3     = 72842, // radius target dummy effect
+    SPELL_VOLATILE_EXPERIMENT_4     = 72843, // radius target dummy effect
+
+    SPELL_GREEN_OOZE_SUMMON         = 71412,
+    SPELL_ORANGE_OOZE_SUMMON        = 71415,
+
+    SPELL_OOZE_ADHESIVE             = 70447,
+    SPELL_OOZE_ERUPTION             = 70492,
+
+    SPELL_GASEOUS_BLOAT             = 70672,
+    SPELL_EXPUNGED_GAS              = 70701,
+    SPELL_GASEOUS_BLOAT_VISUAL      = 70215,
+
+    SPELL_SLIME_PUDDLE              = 70341,
+    SPELL_SLIME_PUDDLE_SUMMON       = 70342,
+    SPELL_SLIME_PUDDLE_AURA         = 70343,
+// SPELL_SLIME_PUDDLE_TRIGGER      = 71424, // trigger summon spell from target?
+// SPELL_SLIME_PUDDLE_SUMMON_TRIG  = 71425,
+    SPELL_GROW_STACKER              = 70345,
+    SPELL_GROW_STACKER_GROW_AURA    = 70347,
+
+    SPELL_MALLEABLE_GOO_MISSILE     = 70852,
+
+    SPELL_CHOKING_GAS_BOMB          = 71255,
+    SPELL_CHOKING_GAS_BOMB_AURA     = 71259,
+    SPELL_CHOKING_GAS_BOMB_EXPL_AUR = 71280,
+    SPELL_CHOKING_GAS_EXPLOSION     = 71279,
+
+    // phase transitions
+    SPELL_TEAR_GAS                  = 71617, // stuns players
+    SPELL_TEAR_GAS_PERIODIC_AURA    = 73170, // stuns summoned creatures?
+    SPELL_TEAR_GAS_CANCEL           = 71620,
+
+    SPELL_CREATE_CONCOCTION         = 71621,
+    SPELL_GUZZLE_POTIONS            = 71893,
+
+    SPELL_MUTATED_PLAGUE            = 72451,
+
+    // heroic
+    SPELL_UNBOUND_PLAGUE            = 70911,
+    SPELL_OOZE_VARIABLE             = 70352, // aura 303 - dont allow taking damage from attacker with linked aura303?
+    SPELL_OOZE_VARIABLE_OOZE        = 74118, // anyway, implemented as hardcoded in script
+    SPELL_GAS_VARIABLE              = 70353,
+    SPELL_GAS_VARIABLE_GAS          = 74119,
+
+    SPELL_OOZE_TANK_PROTECTION      = 71770
+};
+
+enum Phase
+{
+    PHASE_ONE               = 1,
+    PHASE_RUNNING_ONE       = 2,
+    PHASE_TRANSITION_ONE    = 3,
+    PHASE_TWO               = 4,
+    PHASE_RUNNING_TWO       = 5,
+    PHASE_TRANSITION_TWO    = 6,
+    PHASE_THREE             = 7
+};
+
+enum Waypoint
+{
+    POINT_PUTRICIDE_SPAWN = 1
+};
+
+static const float fPutricidePosition[1][3] =
+{
+    {4356.78f, 3263.51f, 389.40f}   // 0 Putricide spawn point
+};
+
+struct boss_professor_putricide : public CreatureScript
+{
+    boss_professor_putricide() : CreatureScript("boss_professor_putricide") {}
+
+    struct boss_professor_putricideAI : public ScriptedAI
+    {
+        boss_professor_putricideAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiPhase;
+
+        uint32 m_uiHealthCheckTimer;
+        uint32 m_uiTransitionTimer;
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiPuddleTimer;
+        uint32 m_uiUnstableExperimentTimer;
+        uint32 m_uiUnboundPlagueTimer;
+        uint32 m_uiChokingGasBombTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_ONE;
+            m_uiHealthCheckTimer = 1000;
+            m_uiEnrageTimer = 10 * MINUTE * IN_MILLISECONDS;
+            m_uiPuddleTimer = 10000;
+            m_uiUnstableExperimentTimer = 20000;
+            m_uiUnboundPlagueTimer = 10000;
+            m_uiChokingGasBombTimer = urand(10000, 15000);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_PROFESSOR_PUTRICIDE, IN_PROGRESS);
+
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_PROFESSOR_PUTRICIDE, DONE);
+
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_PROFESSOR_PUTRICIDE, FAIL);
+        }
+
+        void MovementInform(uint32 uiMovementType, uint32 uiData) override
+        {
+            if (uiMovementType != POINT_MOTION_TYPE)
+                return;
+
+            if (uiData == POINT_PUTRICIDE_SPAWN)
+            {
+                if (m_uiPhase == PHASE_RUNNING_ONE)
+                {
+                    if (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC))
+                    {
+                        DoScriptText(SAY_PHASE_CHANGE, m_creature);
+                        m_uiTransitionTimer = 30000;
+                    }
+                    else
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_CREATE_CONCOCTION);
+                        DoScriptText(SAY_TRANSFORM_1, m_creature);
+                        m_uiTransitionTimer = 15000;
+                    }
+
+                    m_uiPhase = PHASE_TRANSITION_ONE;           // waiting for entering phase 2
+                }
+                else if (m_uiPhase == PHASE_RUNNING_TWO)
+                {
+                    if (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC))
+                    {
+                        DoScriptText(SAY_PHASE_CHANGE, m_creature);
+                        m_uiTransitionTimer = 30000;
+                    }
+                    else
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_GUZZLE_POTIONS);
+                        DoScriptText(SAY_TRANSFORM_2, m_creature);
+                        m_uiTransitionTimer = 15000;
+                    }
+
+                    m_uiPhase = PHASE_TRANSITION_TWO;           // waiting for entering phase 3
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Enrage
+            if (m_uiEnrageTimer)
+            {
+                if (m_uiEnrageTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiEnrageTimer = 0;
+                    }
+                }
+                else
+                    m_uiEnrageTimer -= uiDiff;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_ONE:
+                // health check
+                if (m_uiHealthCheckTimer <= uiDiff)
+                {
+                    if (m_creature->GetHealthPercent() <= 80.0f)
+                    {
+                        uint32 spellId = (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC) ? SPELL_VOLATILE_EXPERIMENT : SPELL_TEAR_GAS);
+
+                        if (DoCastSpellIfCan(m_creature, spellId) == CAST_OK)
+                        {
+                            m_creature->GetMotionMaster()->Clear();
+                            SetCombatMovement(false);
+                            m_creature->GetMotionMaster()->MovePoint(POINT_PUTRICIDE_SPAWN, fPutricidePosition[0][0], fPutricidePosition[0][1], fPutricidePosition[0][2]);
+                            m_uiPhase = PHASE_RUNNING_ONE;
+                            return;
+                        }
+                    }
+                    m_uiHealthCheckTimer = 1000;
+                }
+                else
+                    m_uiHealthCheckTimer -= uiDiff;
+
+                // Unbound Plague
+                if (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC))
+                {
+                    if (m_uiUnboundPlagueTimer <= uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_UNBOUND_PLAGUE, SELECT_FLAG_PLAYER))
+                        {
+                            if (DoCastSpellIfCan(pTarget, SPELL_UNBOUND_PLAGUE) == CAST_OK)
+                                m_uiUnboundPlagueTimer = 70000;
+                        }
+                    }
+                    else
+                        m_uiUnboundPlagueTimer -= uiDiff;
+                }
+
+                // Slime Puddle
+                if (m_uiPuddleTimer <= uiDiff)
+                {
+                    for (int i = 0; i < 2; ++i)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_SLIME_PUDDLE_SUMMON, SELECT_FLAG_PLAYER))
+                            DoCastSpellIfCan(pTarget, SPELL_SLIME_PUDDLE, CAST_TRIGGERED);
+                    }
+                    m_uiPuddleTimer = 30000;
+                }
+                else
+                    m_uiPuddleTimer -= uiDiff;
+
+                // Unstable Experiment
+                if (m_uiUnstableExperimentTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_UNSTABLE_EXPERIMENT) == CAST_OK)
+                        m_uiUnstableExperimentTimer = 30000;
+                }
+                else
+                    m_uiUnstableExperimentTimer -= uiDiff;
+
+                break;
+            case PHASE_TRANSITION_ONE:
+                if (m_uiTransitionTimer <= uiDiff)
+                {
+                    m_creature->GetMotionMaster()->Clear();
+                    SetCombatMovement(true);
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    m_uiPhase = PHASE_TWO;
+
+                    if (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC))
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_CREATE_CONCOCTION);
+                        DoScriptText(SAY_TRANSFORM_1, m_creature);
+                    }
+                    else
+                        DoCastSpellIfCan(m_creature, SPELL_TEAR_GAS_CANCEL, CAST_INTERRUPT_PREVIOUS);
+                }
+                else
+                    m_uiTransitionTimer -= uiDiff;
+
+                return;
+            case PHASE_TWO:
+                // health check
+                if (m_uiHealthCheckTimer <= uiDiff)
+                {
+                    if (m_creature->GetHealthPercent() <= 35.0f)
+                    {
+                        uint32 spellId = (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC) ? SPELL_VOLATILE_EXPERIMENT : SPELL_TEAR_GAS);
+
+                        if (DoCastSpellIfCan(m_creature, spellId) == CAST_OK)
+                        {
+                            m_creature->GetMotionMaster()->Clear();
+                            SetCombatMovement(false);
+                            m_creature->GetMotionMaster()->MovePoint(POINT_PUTRICIDE_SPAWN, fPutricidePosition[0][0], fPutricidePosition[0][1], fPutricidePosition[0][2]);
+                            m_uiPhase = PHASE_RUNNING_TWO;
+
+                            // TODO: remove Mutated Abomination
+
+                            return;
+                        }
+                    }
+                    m_uiHealthCheckTimer = 1000;
+                }
+                else
+                    m_uiHealthCheckTimer -= uiDiff;
+
+                // Unbound Plague
+                if (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC))
+                {
+                    if (m_uiUnboundPlagueTimer <= uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_UNBOUND_PLAGUE, SELECT_FLAG_PLAYER))
+                        {
+                            if (DoCastSpellIfCan(pTarget, SPELL_UNBOUND_PLAGUE) == CAST_OK)
+                                m_uiUnboundPlagueTimer = 70000;
+                        }
+                    }
+                    else
+                        m_uiUnboundPlagueTimer -= uiDiff;
+                }
+
+                // Slime Puddle
+                if (m_uiPuddleTimer <= uiDiff)
+                {
+                    for (int i = 0; i < 2; ++i)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_SLIME_PUDDLE_SUMMON, SELECT_FLAG_PLAYER))
+                            DoCastSpellIfCan(pTarget, SPELL_SLIME_PUDDLE, CAST_TRIGGERED);
+                    }
+
+                    m_uiPuddleTimer = 30000;
+                }
+                else
+                    m_uiPuddleTimer -= uiDiff;
+
+                // Unstable Experiment
+                if (m_uiUnstableExperimentTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_UNSTABLE_EXPERIMENT) == CAST_OK)
+                        m_uiUnstableExperimentTimer = 30000;
+                }
+                else
+                    m_uiUnstableExperimentTimer -= uiDiff;
+
+                // Choking Gas
+                if (m_uiChokingGasBombTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_CHOKING_GAS_BOMB) == CAST_OK)
+                        m_uiChokingGasBombTimer = urand(25000, 30000);
+                }
+                else
+                    m_uiChokingGasBombTimer -= uiDiff;
+
+                // TODO: Malleable Goo
+
+                break;
+            case PHASE_TRANSITION_TWO:
+                if (m_uiTransitionTimer <= uiDiff)
+                {
+                    m_creature->GetMotionMaster()->Clear();
+                    SetCombatMovement(true);
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    m_uiPhase = PHASE_THREE;
+
+                    if (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC))
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_GUZZLE_POTIONS);
+                        DoScriptText(SAY_TRANSFORM_2, m_creature);
+                    }
+                    else
+                        DoCastSpellIfCan(m_creature, SPELL_TEAR_GAS_CANCEL, CAST_INTERRUPT_PREVIOUS);
+                }
+                else
+                    m_uiTransitionTimer -= uiDiff;
+
+                return;
+            case PHASE_THREE:
+                // Unbound Plague
+                if (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC))
+                {
+                    if (m_uiUnboundPlagueTimer <= uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_UNBOUND_PLAGUE, SELECT_FLAG_PLAYER))
+                        {
+                            if (DoCastSpellIfCan(pTarget, SPELL_UNBOUND_PLAGUE) == CAST_OK)
+                                m_uiUnboundPlagueTimer = 70000;
+                        }
+                    }
+                    else
+                        m_uiUnboundPlagueTimer -= uiDiff;
+                }
+
+                // Slime Puddle
+                if (m_uiPuddleTimer <= uiDiff)
+                {
+                    for (int i = 0; i < 2; ++i)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_SLIME_PUDDLE_SUMMON, SELECT_FLAG_PLAYER))
+                            DoCastSpellIfCan(pTarget, SPELL_SLIME_PUDDLE, CAST_TRIGGERED);
+                    }
+                    m_uiPuddleTimer = 30000;
+                }
+                else
+                    m_uiPuddleTimer -= uiDiff;
+
+                // Choking Gas
+                if (m_uiChokingGasBombTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_CHOKING_GAS_BOMB) == CAST_OK)
+                        m_uiChokingGasBombTimer = urand(25000, 30000);
+                }
+                else
+                    m_uiChokingGasBombTimer -= uiDiff;
+
+                // TODO: Malleable Goo
+
+                break;
+            case PHASE_RUNNING_ONE:
+            case PHASE_RUNNING_TWO:
+                // wait for arriving at the table (during phase transition)
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_professor_putricideAI(pCreature);
+    }
+};
+
+void AddSC_boss_professor_putricide()
+{
+    Script* s;
+
+    s = new boss_professor_putricide();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_professor_putricide";
+    //pNewScript->GetAI = &GetAI_boss_professor_putricide;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_rotface.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_rotface.cpp
new file mode 100644
index 000000000..8a3d92588
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_rotface.cpp
@@ -0,0 +1,363 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_rotface
+SD%Complete: 70%
+SDComment:
+SDCategory: Icecrown Citadel
+EndScriptData */
+
+#include "precompiled.h"
+#include "icecrown_citadel.h"
+
+enum
+{
+    SAY_AGGRO                   = -1631071,
+    SAY_SLIME_SPRAY             = -1631072,
+    SAY_OOZE_EXPLODE            = -1631073,
+    SAY_SLIME_FLOW_1            = -1631074,
+    SAY_SLIME_FLOW_2            = -1631075,
+    SAY_SLAY_1                  = -1631076,
+    SAY_SLAY_2                  = -1631077,
+    SAY_BERSERK                 = -1631078,
+    SAY_DEATH                   = -1631079,
+    SAY_ROTFACE_DEATH           = -1631080,
+};
+
+enum
+{
+    // Mutated Infection
+    SPELL_MUTATED_INFECTION_1   = 70090, // periodic trigger auras
+    SPELL_MUTATED_INFECTION_2   = 70003,
+    SPELL_MUTATED_INFECTION_3   = 70004,
+    SPELL_MUTATED_INFECTION_4   = 70005,
+    SPELL_MUTATED_INFECTION_5   = 70006,
+
+    // Slime Spray
+// SPELL_SLIME_SPRAY_SUMMON    = 70882, // precast of Slime Spray dmg spell
+    SPELL_SLIME_SPRAY           = 69508,
+
+    // Ooze Flood
+    SPELL_OOZE_FLOOD_PERIODIC   = 70069, // periodically trigger ooze flood
+    SPELL_OOZE_FLOOD_REMOVE     = 70079,
+
+    // Little Ooze
+    SPELL_STICKY_OOZE           = 69774,
+    SPELL_STICKY_AURA           = 69776, // aura on dummy Sticky Ooze NPC
+    SPELL_WEAK_RADIATING_OOZE   = 69750,
+    SPELL_LITTLE_OOZE_COMBINE   = 69537, // periodic check
+// SPELL_MERGE                 = 69889,
+
+    // Big Ooze
+    SPELL_UNSTABLE_OOZE         = 69558, // stacking buff
+    SPELL_RADIATING_OOZE        = 69760,
+    SPELL_BIG_OOZE_COMBINE      = 69552, // periodic check
+    SPELL_BIG_OOZE_BUFF_COMB    = 69611, // periodic check
+    SPELL_UNSTABLE_EXPLOSION    = 69839,
+
+    MAX_MUTATE_INFACTION_STEPS  = 5,
+};
+
+static const uint32 uiMutatedInfections[MAX_MUTATE_INFACTION_STEPS] =
+{
+    SPELL_MUTATED_INFECTION_1,
+    SPELL_MUTATED_INFECTION_2,
+    SPELL_MUTATED_INFECTION_3,
+    SPELL_MUTATED_INFECTION_4,
+    SPELL_MUTATED_INFECTION_5
+};
+
+struct boss_rotface : public CreatureScript
+{
+    boss_rotface() : CreatureScript("boss_rotface") {}
+
+    struct boss_rotfaceAI : public ScriptedAI
+    {
+        boss_rotfaceAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiSlimeSprayTimer;
+        uint32 m_uiSlimeFlowTimer;
+        uint32 m_uiMutatedInfectionTimer;
+        uint32 m_uiInfectionsRate;
+
+        void Reset() override
+        {
+            m_uiSlimeSprayTimer = urand(17000, 23000);
+            m_uiSlimeFlowTimer = 20000;
+            m_uiMutatedInfectionTimer = 60000;
+            m_uiInfectionsRate = 1;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ROTFACE, IN_PROGRESS);
+
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            DoCastSpellIfCan(m_creature, SPELL_MUTATED_INFECTION_1, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_OOZE_FLOOD_PERIODIC, CAST_TRIGGERED);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ROTFACE, FAIL);
+
+            DoCastSpellIfCan(m_creature, SPELL_OOZE_FLOOD_REMOVE, CAST_TRIGGERED);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+                DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature, pVictim);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ROTFACE, DONE);
+
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Slime Spray
+            if (m_uiSlimeSprayTimer <= uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SLIME_SPRAY) == CAST_OK)
+                {
+                    DoScriptText(SAY_SLIME_SPRAY, m_creature);
+                    m_uiSlimeSprayTimer = urand(17000, 23000);
+                }
+            }
+            else
+                m_uiSlimeSprayTimer -= uiDiff;
+
+            // Mutated Infection - faster with time
+            // implemented this instead of phases
+            if (m_uiInfectionsRate < MAX_MUTATE_INFACTION_STEPS)
+            {
+                if (m_uiMutatedInfectionTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, uiMutatedInfections[m_uiInfectionsRate], CAST_TRIGGERED) == CAST_OK)
+                    {
+                        m_creature->RemoveAurasDueToSpell(uiMutatedInfections[m_uiInfectionsRate - 1]);
+                        // every next 15 seconds faster
+                        m_uiMutatedInfectionTimer = 60000 - m_uiInfectionsRate * 15000;
+                        ++m_uiInfectionsRate;
+                    }
+                }
+                else
+                    m_uiMutatedInfectionTimer -= uiDiff;
+            }
+
+            // Slime Flow
+            if (m_uiSlimeFlowTimer <= uiDiff)
+            {
+                if (Creature* pProfessor = m_pInstance->GetSingleCreatureFromStorage(NPC_PROFESSOR_PUTRICIDE))
+                    DoScriptText(urand(0, 1) ? SAY_SLIME_FLOW_1 : SAY_SLIME_FLOW_2, pProfessor);
+
+                m_uiSlimeFlowTimer = 20000;
+            }
+            else
+                m_uiSlimeFlowTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_rotfaceAI(pCreature);
+    }
+};
+
+struct mob_little_ooze : public CreatureScript
+{
+    mob_little_ooze() : CreatureScript("mob_little_ooze") {}
+
+    struct mob_little_oozeAI : public ScriptedAI
+    {
+        mob_little_oozeAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+        uint32 m_uiStickyOozeTimer;
+
+        void Reset() override
+        {
+            m_uiStickyOozeTimer = 5000;
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->ForcedDespawn();
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            m_creature->AddThreat(pWho, 500000.0f); // not sure about the threat amount but should be very high
+            DoCastSpellIfCan(m_creature, SPELL_WEAK_RADIATING_OOZE, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_LITTLE_OOZE_COMBINE, CAST_TRIGGERED);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiStickyOozeTimer <= uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_STICKY_OOZE) == CAST_OK)
+                    m_uiStickyOozeTimer = urand(10000, 15000);
+            }
+            else
+                m_uiStickyOozeTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_little_oozeAI(pCreature);
+    }
+};
+
+struct mob_big_ooze : public CreatureScript
+{
+    mob_big_ooze() : CreatureScript("mob_big_ooze") {}
+
+    struct mob_big_oozeAI : public ScriptedAI
+    {
+        mob_big_oozeAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+        uint32 m_uiStickyOozeTimer;
+        uint32 m_uiUnstableExplosionCheckTimer;
+
+        void Reset() override
+        {
+            m_uiStickyOozeTimer = 5000;
+            m_uiUnstableExplosionCheckTimer = 1000;
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->ForcedDespawn();
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            m_creature->AddThreat(pWho, 500000.0f);
+            DoCastSpellIfCan(m_creature, SPELL_RADIATING_OOZE, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_BIG_OOZE_COMBINE, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_BIG_OOZE_BUFF_COMB, CAST_TRIGGERED);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Unstable Ooze
+            if (m_uiUnstableExplosionCheckTimer)
+            {
+                if (m_uiUnstableExplosionCheckTimer <= uiDiff)
+                {
+                    m_uiUnstableExplosionCheckTimer = 1000;
+
+                    SpellAuraHolder* holder = m_creature->GetSpellAuraHolder(SPELL_UNSTABLE_OOZE);
+                    if (holder && holder->GetStackAmount() >= 5)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_UNSTABLE_EXPLOSION) == CAST_OK)
+                        {
+                            if (m_pInstance)
+                            {
+                                if (Creature* pRotface = m_pInstance->GetSingleCreatureFromStorage(NPC_ROTFACE))
+                                    DoScriptText(SAY_OOZE_EXPLODE, pRotface);
+                            }
+                        }
+                    }
+                }
+                else
+                    m_uiUnstableExplosionCheckTimer -= uiDiff;
+            }
+
+            // Sticky Ooze
+            if (m_uiStickyOozeTimer <= uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_STICKY_OOZE) == CAST_OK)
+                    m_uiStickyOozeTimer = urand(10000, 15000);
+            }
+            else
+                m_uiStickyOozeTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_big_oozeAI(pCreature);
+    }
+};
+
+void AddSC_boss_rotface()
+{
+    Script* s;
+
+    s = new boss_rotface();
+    s->RegisterSelf();
+    s = new mob_little_ooze();
+    s->RegisterSelf();
+    s = new mob_big_ooze();
+    s->RegisterSelf();
+
+    //pNewscript = new Script;
+    //pNewscript->Name = "boss_rotface";
+    //pNewscript->GetAI = &GetAI_boss_rotface;
+    //pNewscript->RegisterSelf();
+
+    //pNewscript = new Script;
+    //pNewscript->Name = "mob_little_ooze";
+    //pNewscript->GetAI = &GetAI_mob_little_ooze;
+    //pNewscript->RegisterSelf();
+
+    //pNewscript = new Script;
+    //pNewscript->Name = "mob_big_ooze";
+    //pNewscript->GetAI = &GetAI_mob_big_ooze;
+    //pNewscript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_sindragosa.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_sindragosa.cpp
new file mode 100644
index 000000000..73174366e
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_sindragosa.cpp
@@ -0,0 +1,895 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_sindragosa
+SD%Complete: 80%
+SDComment: requires core support for ice blocks (spells and GO in LoS checking)
+SDCategory: Icecrown Citadel
+EndScriptData */
+
+#include "precompiled.h"
+#include "icecrown_citadel.h"
+
+enum
+{
+    SAY_AGGRO                   = -1631148,
+    SAY_UNCHAINED_MAGIC         = -1631149,
+    SAY_BLISTERING_COLD         = -1631150,
+    SAY_RESPIRE                 = -1631151,
+    SAY_TAKEOFF                 = -1631152,
+    SAY_PHASE_3                 = -1631153,
+    SAY_SLAY_1                  = -1631154,
+    SAY_SLAY_2                  = -1631155,
+    SAY_BERSERK                 = -1631156,
+    SAY_DEATH                   = -1631157,
+
+    // Spells
+
+    // Sindragosa
+
+    // all phases
+    SPELL_BERSERK               = 26662,
+
+    // Phase 1 and 3
+    SPELL_TAIL_SMASH            = 71077,
+    SPELL_CLEAVE                = 19983,
+    SPELL_FROST_AURA            = 70084,
+    SPELL_FROST_BREATH          = 69649,
+    SPELL_ICY_GRIP              = 70117,
+    SPELL_PERMEATING_CHILL      = 70109,
+    SPELL_UNCHAINED_MAGIC       = 69762,
+
+    // Phase 2
+    SPELL_ICE_TOMB              = 69712, // triggers Frost Beacon on random targets, which triggers actual Ice Tomb after 7 sec.
+    SPELL_ICE_TOMB_PROTECTION   = 69700, // protects from taking dmg while in Ice Tomb, should be triggered by Ice Tomb stunning spell
+    // Frost Bomb related
+    SPELL_FROST_BOMB            = 69846, // summons dummy target npc
+    SPELL_FROST_BOMB_DMG        = 69845,
+    SPELL_FROST_BOMB_VISUAL     = 70022, // circle mark
+// SPELL_FROST_BOMB_OTHER      = 70521, // no idea where it is used, wowhead says it is used by some other Sindragosa (37755)
+
+    // Phase 3
+    SPELL_MYSTIC_BUFFET         = 70128,
+    SPELL_ICE_TOMB_SINGLE       = 69675,
+
+    // Rimefang
+    SPELL_RIMEFANG_FROST_AURA   = 71387,
+    SPELL_RIMEFANG_FROST_BREATH = 71386,
+    SPELL_RIMEFANG_ICY_BLAST    = 71376,
+
+    // Spinestalker
+    SPELL_SPINESTALKER_BELLOWING_ROAR   = 36922,
+    SPELL_SPINESTALKER_CLEAVE           = 40505,
+    SPELL_SPINESTALKER_TAIL_SWEEP       = 71369
+};
+
+enum SindragosaPhase
+{
+    SINDRAGOSA_PHASE_OOC                = 0,
+    SINDRAGOSA_PHASE_AGGRO              = 1,
+    SINDRAGOSA_PHASE_GROUND             = 2,
+    SINDRAGOSA_PHASE_FLYING_TO_AIR      = 3,
+    SINDRAGOSA_PHASE_AIR                = 4,
+    SINDRAGOSA_PHASE_FLYING_TO_GROUND   = 5,
+    SINDRAGOSA_PHASE_THREE              = 6
+};
+
+enum SindragosaPoint
+{
+    SINDRAGOSA_POINT_GROUND_CENTER      = 0,
+    SINDRAGOSA_POINT_AIR_CENTER         = 1,
+    SINDRAGOSA_POINT_AIR_PHASE_2        = 2,
+    SINDRAGOSA_POINT_AIR_EAST           = 3,
+    SINDRAGOSA_POINT_AIR_WEST           = 4
+};
+
+enum RimefangPhase
+{
+    RIMEFANG_PHASE_GROUND               = 0,
+    RIMEFANG_PHASE_FLYING               = 1,
+    RIMEFANG_PHASE_AIR                  = 2
+};
+
+enum RimefangPoint
+{
+    RIMEFANG_POINT_GROUND               = 0,
+    RIMEFANG_POINT_AIR                  = 1,
+    RIMEFANG_POINT_INITIAL_LAND_AIR     = 2,
+    RIMEFANG_POINT_INITIAL_LAND         = 3
+};
+
+enum SpinestalkerPoint
+{
+    SPINESTALKER_POINT_INITIAL_LAND_AIR = 0,
+    SPINESTALKER_POINT_INITIAL_LAND     = 1
+};
+
+#define FROST_BOMB_MIN_X 4367.0f
+#define FROST_BOMB_MAX_X 4424.0f
+#define FROST_BOMB_MIN_Y 2437.0f
+#define FROST_BOMB_MAX_Y 2527.0f
+
+static const float SindragosaPosition[10][3] =
+{
+    {4407.44f, 2484.37f, 203.37f},      // 0 center, ground
+    {4407.44f, 2484.37f, 235.37f},      // 1 center, air
+    {4470.00f, 2484.37f, 235.37f},      // 2 Sindragosa air phase point
+    {4414.32f, 2456.94f, 203.37f},      // 3 Rimefang landing point
+    {4414.32f, 2456.94f, 228.37f},      // 4 Rimefang above landing point
+    {4414.32f, 2512.73f, 203.37f},      // 5 Spinestalker landing point
+    {4414.32f, 2512.73f, 228.37f},      // 6 Spinestalker above landing point
+    {4505.00f, 2484.37f, 235.37f},      // 7 Sindragosa spawn point
+    {4505.00f, 2444.37f, 235.37f},      // 8 Sindragosa east flying point
+    {4505.00f, 2524.37f, 235.37f},      // 9 Sindragosa west flying point
+};
+
+struct boss_sindragosa : public CreatureScript
+{
+    boss_sindragosa() : CreatureScript("boss_sindragosa") {}
+
+    struct boss_sindragosaAI : public ScriptedAI
+    {
+        boss_sindragosaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiPhase;
+        uint32 m_uiPhaseTimer;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiFrostBreathTimer;
+        uint32 m_uiTailSmashTimer;
+        uint32 m_uiIcyGripTimer;
+        uint32 m_uiUnchainedMagicTimer;
+        uint32 m_uiFrostBombTimer;
+        uint32 m_uiIceTombSingleTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = SINDRAGOSA_PHASE_OOC;
+            m_uiPhaseTimer = 45000;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+            m_uiCleaveTimer = urand(5000, 15000);
+            m_uiTailSmashTimer = 20000;
+            m_uiFrostBreathTimer = 5000;
+            m_uiIcyGripTimer = 35000;
+            m_uiIceTombSingleTimer = 15000;
+            m_uiUnchainedMagicTimer = urand(15000, 30000);
+        }
+
+        void SetFlying(bool bIsFlying)
+        {
+            if (bIsFlying)
+                m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_FLY_ANIM);
+            else
+                m_creature->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_FLY_ANIM);
+
+            m_creature->SetLevitate(bIsFlying);
+            m_creature->SetWalk(bIsFlying);
+        }
+
+        void EnterEvadeMode() override
+        {
+            SetFlying(true);
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SINDRAGOSA, FAIL);
+
+            m_creature->GetMotionMaster()->MovePoint(SINDRAGOSA_POINT_AIR_EAST, SindragosaPosition[8][0], SindragosaPosition[8][1], SindragosaPosition[8][2], false);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            ScriptedAI::AttackStart(pWho);
+
+            // on aggro: land first, then start the encounter
+            if (m_uiPhase == SINDRAGOSA_PHASE_OOC)
+            {
+                m_uiPhase = SINDRAGOSA_PHASE_AGGRO;
+                SetCombatMovement(false);
+                m_creature->SetWalk(true);
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MovePoint(SINDRAGOSA_POINT_AIR_CENTER, SindragosaPosition[1][0], SindragosaPosition[1][1], SindragosaPosition[1][2], false);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+            // instance data set when sindragosa lands
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SINDRAGOSA, DONE);
+        }
+
+        void MovementInform(uint32 uiMovementType, uint32 uiPointId) override
+        {
+            if (uiMovementType != POINT_MOTION_TYPE)
+                return;
+
+            if (uiPointId == SINDRAGOSA_POINT_AIR_EAST)
+            {
+                m_creature->GetMotionMaster()->MovePoint(SINDRAGOSA_POINT_AIR_WEST, SindragosaPosition[9][0], SindragosaPosition[9][1], SindragosaPosition[9][2], false);
+            }
+            else if (uiPointId == SINDRAGOSA_POINT_AIR_WEST)
+            {
+                m_creature->GetMotionMaster()->MovePoint(SINDRAGOSA_POINT_AIR_EAST, SindragosaPosition[8][0], SindragosaPosition[8][1], SindragosaPosition[8][2], false);
+            }
+            else if (uiPointId == SINDRAGOSA_POINT_GROUND_CENTER)
+            {
+                // fly up
+                if (m_uiPhase == SINDRAGOSA_PHASE_GROUND)
+                {
+                    m_uiPhase = SINDRAGOSA_PHASE_FLYING_TO_AIR;
+                    SetFlying(true);
+                    m_creature->GetMotionMaster()->MovePoint(SINDRAGOSA_POINT_AIR_CENTER, SindragosaPosition[1][0], SindragosaPosition[1][1], SindragosaPosition[1][2], false);
+                }
+                else // land and attack
+                {
+                    // on aggro, after landing: set instance data and cast initial spells
+                    if (m_uiPhase == SINDRAGOSA_PHASE_AGGRO)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_FROST_AURA, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_PERMEATING_CHILL, CAST_TRIGGERED);
+
+                        if (m_pInstance)
+                            m_pInstance->SetData(TYPE_SINDRAGOSA, IN_PROGRESS);
+                    }
+
+                    m_uiPhase = SINDRAGOSA_PHASE_GROUND;
+                    SetFlying(false);
+                    SetCombatMovement(true);
+
+                    if (Unit* pVictim = m_creature->getVictim())
+                        m_creature->GetMotionMaster()->MoveChase(pVictim);
+                }
+            }
+            else if (uiPointId == SINDRAGOSA_POINT_AIR_CENTER)
+            {
+                if (m_uiPhase == SINDRAGOSA_PHASE_AGGRO || m_uiPhase == SINDRAGOSA_PHASE_FLYING_TO_GROUND)
+                {
+                    // land
+                    m_creature->GetMotionMaster()->MovePoint(SINDRAGOSA_POINT_GROUND_CENTER, SindragosaPosition[0][0], SindragosaPosition[0][1], SindragosaPosition[0][2], false);
+                }
+                else if (m_uiPhase == SINDRAGOSA_PHASE_FLYING_TO_AIR)
+                {
+                    // fly up (air phase)
+                    m_creature->GetMotionMaster()->MovePoint(SINDRAGOSA_POINT_AIR_PHASE_2, SindragosaPosition[2][0], SindragosaPosition[2][1], SindragosaPosition[2][2], false);
+                }
+            }
+            else if (uiPointId == SINDRAGOSA_POINT_AIR_PHASE_2)
+            {
+                m_creature->SetOrientation(M_PI_F); // face the platform
+                m_uiFrostBombTimer = 10000; // set initial Frost Bomb timer
+                DoCastSpellIfCan(m_creature, SPELL_ICE_TOMB);
+                m_uiPhase = SINDRAGOSA_PHASE_AIR;
+            }
+        }
+
+        void DoFrostBomb()
+        {
+            float x, y, z;
+            x = frand(FROST_BOMB_MIN_X, FROST_BOMB_MAX_X);
+            y = frand(FROST_BOMB_MIN_Y, FROST_BOMB_MAX_Y);
+            z = SindragosaPosition[0][2]; // platform height
+
+            m_creature->CastSpell(x, y, z, SPELL_FROST_BOMB, false);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Berserk
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            switch (m_uiPhase)
+            {
+            case SINDRAGOSA_PHASE_THREE:
+                // Ice Tomb
+                if (m_uiIceTombSingleTimer <= uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_ICE_TOMB_SINGLE, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_ICE_TOMB) == CAST_OK)
+                            m_uiIceTombSingleTimer = 15000;
+                    }
+                }
+                else
+                    m_uiIceTombSingleTimer -= uiDiff;
+
+                // no break
+            case SINDRAGOSA_PHASE_GROUND:
+                // Phase 1 only
+                if (m_uiPhase == SINDRAGOSA_PHASE_GROUND)
+                {
+                    // Health Check
+                    if (m_creature->GetHealthPercent() <= 30.0f)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_MYSTIC_BUFFET) == CAST_OK)
+                        {
+                            m_uiPhase = SINDRAGOSA_PHASE_THREE;
+                            DoScriptText(SAY_PHASE_3, m_creature);
+                        }
+                    }
+
+                    // Phase 2 (air)
+                    if (m_uiPhaseTimer <= uiDiff)
+                    {
+                        m_uiPhaseTimer = 33000;
+                        DoScriptText(SAY_TAKEOFF, m_creature);
+                        SetCombatMovement(false);
+                        m_creature->GetMotionMaster()->MovePoint(SINDRAGOSA_POINT_GROUND_CENTER, SindragosaPosition[0][0], SindragosaPosition[0][1], SindragosaPosition[0][2], false);
+                    }
+                    else
+                        m_uiPhaseTimer -= uiDiff;
+                }
+
+                // Cleave
+                if (m_uiCleaveTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                        m_uiCleaveTimer = urand(5000, 15000);
+                }
+                else
+                    m_uiCleaveTimer -= uiDiff;
+
+                // Tail Smash
+                if (m_uiTailSmashTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TAIL_SMASH) == CAST_OK)
+                        m_uiTailSmashTimer = urand(10000, 20000);
+                }
+                else
+                    m_uiTailSmashTimer -= uiDiff;
+
+                // Frost Breath
+                if (m_uiFrostBreathTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROST_BREATH) == CAST_OK)
+                        m_uiFrostBreathTimer = urand(15000, 20000);
+                }
+                else
+                    m_uiFrostBreathTimer -= uiDiff;
+
+                // Unchained Magic
+                if (m_uiUnchainedMagicTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_UNCHAINED_MAGIC) == CAST_OK)
+                    {
+                        m_uiUnchainedMagicTimer = urand(40000, 60000);
+                        DoScriptText(SAY_UNCHAINED_MAGIC, m_creature);
+                    }
+                }
+                else
+                    m_uiUnchainedMagicTimer -= uiDiff;
+
+                // Icy Grip and Blistering Cold
+                if (m_uiIcyGripTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ICY_GRIP) == CAST_OK)
+                    {
+                        m_uiIcyGripTimer = 70000;
+                        DoScriptText(SAY_BLISTERING_COLD, m_creature);
+                    }
+                }
+                else
+                    m_uiIcyGripTimer -= uiDiff;
+
+                DoMeleeAttackIfReady();
+                break;
+            case SINDRAGOSA_PHASE_FLYING_TO_GROUND:
+            case SINDRAGOSA_PHASE_FLYING_TO_AIR:
+                break;
+            case SINDRAGOSA_PHASE_AIR:
+                // Phase One (ground)
+                if (m_uiPhaseTimer <= uiDiff)
+                {
+                    m_uiPhase = SINDRAGOSA_PHASE_FLYING_TO_GROUND;
+                    m_uiPhaseTimer = 42000;
+                    m_creature->GetMotionMaster()->MovePoint(SINDRAGOSA_POINT_AIR_CENTER, SindragosaPosition[1][0], SindragosaPosition[1][1], SindragosaPosition[1][2], false);
+                }
+                else
+                    m_uiPhaseTimer -= uiDiff;
+
+                // Frost Bomb
+                if (m_uiFrostBombTimer <= uiDiff)
+                {
+                    DoFrostBomb();
+                    m_uiFrostBombTimer = 6000;
+                }
+                else
+                    m_uiFrostBombTimer -= uiDiff;
+
+                break;
+            }
+
+            // evade on top of the stairs
+            EnterEvadeIfOutOfCombatArea(uiDiff);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_sindragosaAI(pCreature);
+    }
+};
+
+struct npc_rimefang_icc : public CreatureScript
+{
+    npc_rimefang_icc() : CreatureScript("npc_rimefang_icc") {}
+
+    struct npc_rimefang_iccAI : public ScriptedAI
+    {
+        npc_rimefang_iccAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+            // Icy Blast - 3 casts on 10man, 6 on 25man
+            m_uiIcyBlastMaxCount = 3;
+            if (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_25MAN))
+                m_uiIcyBlastMaxCount = 6;
+
+            m_bHasLanded = false;
+            m_bIsReady = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiPhase;
+        uint32 m_uiPhaseTimer;
+        uint32 m_uiFrostBreathTimer;
+        uint32 m_uiIcyBlastCounter;
+        uint32 m_uiIcyBlastMaxCount;
+        uint32 m_uiIcyBlastTimer;
+        bool m_bHasLanded; // landed after player entered areatrigger
+        bool m_bIsReady;
+
+        void Reset() override
+        {
+            m_uiPhase = RIMEFANG_PHASE_GROUND;
+            m_uiPhaseTimer = 25000;
+            m_uiFrostBreathTimer = urand(5000, 8000);
+            m_uiIcyBlastTimer = 0;
+            m_uiIcyBlastCounter = 0;
+
+            SetCombatMovement(true);
+        }
+
+        void SetFlying(bool bIsFlying)
+        {
+            if (bIsFlying)
+                m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_FLY_ANIM);
+            else
+                m_creature->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_FLY_ANIM);
+
+            m_creature->SetLevitate(bIsFlying);
+            m_creature->SetWalk(bIsFlying);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_RIMEFANG_FROST_AURA, CAST_TRIGGERED);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (!m_bIsReady)
+            {
+                if (!m_bHasLanded)
+                {
+                    m_bHasLanded = true;
+                    m_creature->GetMotionMaster()->MovePoint(RIMEFANG_POINT_INITIAL_LAND_AIR, SindragosaPosition[4][0], SindragosaPosition[4][1], SindragosaPosition[4][2], false);
+                }
+
+                return;
+            }
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (!m_pInstance)
+                return;
+
+            Creature* pSpinestalker = m_pInstance->GetSingleCreatureFromStorage(NPC_SPINESTALKER);
+            if (!pSpinestalker || !pSpinestalker->IsAlive())
+            {
+                if (Creature* pSindragosa = m_creature->SummonCreature(NPC_SINDRAGOSA, SindragosaPosition[7][0], SindragosaPosition[7][1], SindragosaPosition[7][2], 0.0f, TEMPSUMMON_MANUAL_DESPAWN, 0))
+                    pSindragosa->SetInCombatWithZone();
+            }
+        }
+
+        // evade to point on platform
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+
+            if (m_creature->IsAlive())
+                m_creature->GetMotionMaster()->MovePoint(RIMEFANG_POINT_INITIAL_LAND, SindragosaPosition[3][0], SindragosaPosition[3][1], SindragosaPosition[3][2], false);
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void MovementInform(uint32 uiMovementType, uint32 uiPointId) override
+        {
+            if (uiMovementType != POINT_MOTION_TYPE)
+                return;
+
+            if (uiPointId == RIMEFANG_POINT_INITIAL_LAND_AIR)
+            {
+                m_creature->GetMotionMaster()->MovePoint(RIMEFANG_POINT_INITIAL_LAND, SindragosaPosition[3][0], SindragosaPosition[3][1], SindragosaPosition[3][2], false);
+            }
+            else if (uiPointId == RIMEFANG_POINT_INITIAL_LAND)
+            {
+                m_creature->GetMotionMaster()->MoveIdle();
+                m_creature->SetFacingTo(M_PI_F);
+                m_bIsReady = true;
+                SetFlying(false);
+            }
+            else if (uiPointId == RIMEFANG_POINT_GROUND)
+            {
+                m_uiPhase = RIMEFANG_PHASE_GROUND;
+                SetFlying(false);
+                SetCombatMovement(true);
+
+                if (Unit* pVictim = m_creature->getVictim())
+                    m_creature->GetMotionMaster()->MoveChase(pVictim);
+            }
+            else if (uiPointId == RIMEFANG_POINT_AIR)
+            {
+                m_uiPhase = RIMEFANG_PHASE_AIR;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiPhase == RIMEFANG_PHASE_GROUND)
+            {
+                // Frost Breath
+                if (m_uiFrostBreathTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_RIMEFANG_FROST_BREATH) == CAST_OK)
+                        m_uiFrostBreathTimer = urand(5000, 8000);
+                }
+                else
+                    m_uiFrostBreathTimer -= uiDiff;
+
+                // Icy Blast - air phase
+                if (m_uiPhaseTimer <= uiDiff)
+                {
+                    m_uiPhaseTimer = 40000;
+                    m_uiPhase = RIMEFANG_PHASE_FLYING;
+                    SetFlying(true);
+                    SetCombatMovement(false);
+                    m_creature->GetMotionMaster()->MovePoint(RIMEFANG_POINT_AIR, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() + 20.0f, false);
+                    return;
+                }
+                else
+                    m_uiPhaseTimer -= uiDiff;
+
+                DoMeleeAttackIfReady();
+            }
+            else if (m_uiPhase == RIMEFANG_PHASE_AIR)
+            {
+                // Icy Blast
+                if (m_uiIcyBlastTimer <= uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_RIMEFANG_ICY_BLAST, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_RIMEFANG_ICY_BLAST) == CAST_OK)
+                        {
+                            m_uiIcyBlastTimer = 3000;
+                            ++m_uiIcyBlastCounter;
+
+                            // phase end
+                            if (m_uiIcyBlastCounter >= m_uiIcyBlastMaxCount)
+                            {
+                                m_uiIcyBlastCounter = 0;
+                                m_uiIcyBlastTimer = 0;
+                                m_uiPhase = RIMEFANG_PHASE_FLYING;
+                                m_creature->GetMotionMaster()->MovePoint(RIMEFANG_POINT_GROUND, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() - 20.0f, false);
+                            }
+                        }
+                    }
+                }
+                else
+                    m_uiIcyBlastTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_rimefang_iccAI(pCreature);
+    }
+};
+
+struct npc_spinestalker_icc : public CreatureScript
+{
+    npc_spinestalker_icc() : CreatureScript("npc_spinestalker_icc") {}
+
+    struct npc_spinestalker_iccAI : public ScriptedAI
+    {
+        npc_spinestalker_iccAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bHasLanded = false;
+            m_bIsReady = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiBellowingRoarTimer;
+        uint32 m_uiTailSweepTimer;
+        uint32 m_uiCleaveTimer;
+        bool m_bHasLanded;
+        bool m_bIsReady;
+
+        void Reset() override
+        {
+            m_uiBellowingRoarTimer = urand(8000, 24000);
+            m_uiTailSweepTimer = urand(4000, 8000);
+            m_uiCleaveTimer = urand(5000, 8000);
+        }
+
+        void SetFlying(bool bIsFlying)
+        {
+            if (bIsFlying)
+                m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_FLY_ANIM);
+            else
+                m_creature->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_FLY_ANIM);
+
+            m_creature->SetLevitate(bIsFlying);
+            m_creature->SetWalk(bIsFlying);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (!m_pInstance)
+                return;
+
+            Creature* pRimefang = m_pInstance->GetSingleCreatureFromStorage(NPC_RIMEFANG);
+            if (!pRimefang || !pRimefang->IsAlive())
+            {
+                if (Creature* pSindragosa = m_creature->SummonCreature(NPC_SINDRAGOSA, SindragosaPosition[7][0], SindragosaPosition[7][1], SindragosaPosition[7][2], 0.0f, TEMPSUMMON_MANUAL_DESPAWN, 0))
+                    pSindragosa->SetInCombatWithZone();
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (!m_bIsReady)
+            {
+                if (!m_bHasLanded)
+                {
+                    m_bHasLanded = true;
+                    m_creature->GetMotionMaster()->MovePoint(SPINESTALKER_POINT_INITIAL_LAND_AIR, SindragosaPosition[6][0], SindragosaPosition[6][1], SindragosaPosition[6][2], false);
+                }
+
+                return;
+            }
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+
+            if (m_creature->IsAlive())
+                m_creature->GetMotionMaster()->MovePoint(SPINESTALKER_POINT_INITIAL_LAND, SindragosaPosition[5][0], SindragosaPosition[5][1], SindragosaPosition[5][2]);
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void MovementInform(uint32 uiMovementType, uint32 uiPointId) override
+        {
+            if (uiMovementType != POINT_MOTION_TYPE)
+                return;
+
+            if (uiPointId == SPINESTALKER_POINT_INITIAL_LAND_AIR)
+            {
+                m_creature->GetMotionMaster()->MovePoint(SPINESTALKER_POINT_INITIAL_LAND, SindragosaPosition[5][0], SindragosaPosition[5][1], SindragosaPosition[5][2], false);
+            }
+            else if (uiPointId == SPINESTALKER_POINT_INITIAL_LAND)
+            {
+                m_creature->GetMotionMaster()->MoveIdle();
+                m_creature->SetFacingTo(M_PI_F);
+                m_bIsReady = true;
+                SetFlying(false);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Cleave
+            if (m_uiCleaveTimer <= uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SPINESTALKER_CLEAVE) == CAST_OK)
+                    m_uiCleaveTimer = urand(5000, 8000);
+            }
+            else
+                m_uiCleaveTimer -= uiDiff;
+
+            // Tail Sweep
+            if (m_uiTailSweepTimer <= uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SPINESTALKER_TAIL_SWEEP) == CAST_OK)
+                    m_uiTailSweepTimer = urand(4000, 8000);
+            }
+            else
+                m_uiTailSweepTimer -= uiDiff;
+
+            // Bellowing Roar
+            if (m_uiBellowingRoarTimer <= uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SPINESTALKER_BELLOWING_ROAR) == CAST_OK)
+                    m_uiBellowingRoarTimer = urand(8000, 24000);
+            }
+            else
+                m_uiBellowingRoarTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_spinestalker_iccAI(pCreature);
+    }
+};
+
+/**
+ * Frost Bomb - npc marking the target of Frost Bomb
+ */
+struct mob_frost_bomb : public CreatureScript
+{
+    mob_frost_bomb() : CreatureScript("mob_frost_bomb") {}
+
+    struct mob_frost_bombAI : public ScriptedAI
+    {
+        mob_frost_bombAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+        uint32 m_uiFrostBombTimer;
+
+        void Reset() override
+        {
+            SetCombatMovement(false);
+            DoCastSpellIfCan(m_creature, SPELL_FROST_BOMB_VISUAL, CAST_TRIGGERED);
+            m_uiFrostBombTimer = 6000;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override {}
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Frost Bomb (dmg)
+            if (m_uiFrostBombTimer)
+            {
+                if (m_uiFrostBombTimer <= uiDiff)
+                {
+                    if (m_pInstance)
+                    {
+                        if (Creature* pSindragosa = m_pInstance->GetSingleCreatureFromStorage(NPC_SINDRAGOSA))
+                        {
+                            if (pSindragosa->AI()->DoCastSpellIfCan(m_creature, SPELL_FROST_BOMB_DMG) == CAST_OK)
+                            {
+                                m_creature->RemoveAurasDueToSpell(SPELL_FROST_BOMB_VISUAL);
+                                m_creature->ForcedDespawn(2000);
+                                m_uiFrostBombTimer = 0;
+                            }
+                        }
+                    }
+                }
+                else
+                    m_uiFrostBombTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_frost_bombAI(pCreature);
+    }
+};
+
+void AddSC_boss_sindragosa()
+{
+    Script* s;
+
+    s = new boss_sindragosa();
+    s->RegisterSelf();
+    s = new npc_rimefang_icc();
+    s->RegisterSelf();
+    s = new npc_spinestalker_icc();
+    s->RegisterSelf();
+    s = new mob_frost_bomb();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_sindragosa";
+    //pNewScript->GetAI = &GetAI_boss_sindragosa;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_rimefang_icc";
+    //pNewScript->GetAI = &GetAI_npc_rimefang_icc;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_spinestalker_icc";
+    //pNewScript->GetAI = &GetAI_npc_spinestalker_icc;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_frost_bomb";
+    //pNewScript->GetAI = &GetAI_mob_frost_bomb;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_the_lich_king.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_the_lich_king.cpp
new file mode 100644
index 000000000..4fbe3e4f1
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_the_lich_king.cpp
@@ -0,0 +1,710 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_the_lich_king
+SD%Complete: 5%
+SDComment:
+SDCategory: Icecrown Citadel
+EndScriptData */
+
+#include "precompiled.h"
+#include "icecrown_citadel.h"
+
+enum
+{
+    SAY_INTRO_1                 = -1631158,
+    SAY_INTRO_2                 = -1631159,
+    SAY_INTRO_3                 = -1631160,
+    SAY_INTRO_4                 = -1631161,
+    SAY_INTRO_5                 = -1631162,
+    SAY_AGGRO                   = -1631163,
+    SAY_REMORSELESS_WINTER      = -1631164,
+    SAY_SHATTER_ARENA           = -1631165,
+    SAY_SUMMON_VALKYR           = -1631166,
+    SAY_HARVEST_SOUL            = -1631167,
+    SAY_FM_TERENAS_AID_1        = -1631168,
+    SAY_FM_TERENAS_AID_2        = -1631169,
+    SAY_FM_TERENAS_AID_3        = -1631170,
+    SAY_FM_PLAYER_ESCAPE        = -1631171,
+    SAY_FM_PLAYER_DEATH         = -1631172,
+    SAY_SPECIAL_1               = -1631173,
+    SAY_SPECIAL_2               = -1631174,
+    SAY_LAST_PHASE              = -1631175,
+    SAY_SLAY_1                  = -1631176,
+    SAY_SLAY_2                  = -1631177,
+    SAY_ENRAGE                  = -1631178,
+    SAY_OUTRO_1                 = -1631179,
+    SAY_OUTRO_2                 = -1631180,
+    SAY_OUTRO_3                 = -1631181,
+    SAY_OUTRO_4                 = -1631182,
+    SAY_OUTRO_5                 = -1631183,
+    SAY_OUTRO_6                 = -1631184,
+    SAY_OUTRO_7                 = -1631185,
+    SAY_OUTRO_8                 = -1631186,
+    SAY_OUTRO_9                 = -1631187,
+    SAY_OUTRO_10                = -1631188,
+    SAY_OUTRO_11                = -1631189,
+    SAY_OUTRO_12                = -1631190,
+    SAY_OUTRO_13                = -1631191,
+    SAY_OUTRO_14                = -1631192,
+};
+
+enum
+{
+    SPELL_BERSERK               = 47008,
+    SPELL_SIT_EMOTE_NO_SHEATH   = 73220,
+    SPELL_PLAGUE_AVOIDANCE      = 72846,
+
+    // Intro
+    SPELL_ICE_LOCK              = 71614,
+
+    // Outro
+    SPELL_FURY_OF_FROSTMOURNE   = 72350,
+    SPELL_FURY_OF_FROSTMOURNE2  = 72351, // cannot resurect aura
+    SPELL_RAISE_DEAD            = 71769,
+    SPELL_THROW_FROSTMOURNE     = 73017, // 1
+    SPELL_BROKEN_FROSTMOURNE    = 72398, // 2
+    SPELL_SUMMON_FROSTMOURNE    = 72407, // 3 summon npc which casts 4 and 5 and LK enters this npc as vehicle
+    SPELL_FROSTMOURNE_DESPAWN   = 72726, // 4
+    SPELL_FROSTMOURNE_SPIRITS   = 72405, // 5
+    SPELL_SOUL_BARRAGE          = 72305, // strangulation and sounds
+    SPELL_LK_CINEMATIC          = 73159,
+
+    // Tirion
+    SPELL_LIGHTS_BLESSING       = 71797, // after 5secs smashes Ice Lock
+
+    // Terenas Menethil
+    SPELL_MASS_RESURRECTION     = 72429, // dummy
+    SPELL_MASS_RESURRECTION2    = 72423, // actual res
+
+    // Phase One
+    SPELL_NECROTIC_PLAGUE       = 70337,
+    SPELL_NECROTIC_PLAGUE_STACK = 70338,
+    SPELL_INFEST                = 70541,
+    SPELL_SUMMON_GHOULS         = 70358,
+    SPELL_SUMMON_HORROR         = 70372,
+    SPELL_SHADOW_TRAP           = 73539,
+
+    // Phase transition
+    SPELL_REMORSELESS_WINTER_1  = 68981, // rooting caster and with Activate Object effect
+    SPELL_REMORSELESS_WINTER_2  = 72259, // rooting caster and with Send Script Event (23507) effect
+    SPELL_QUAKE                 = 72262,
+    SPELL_PAIN_AND_SUFFERING    = 72133,
+    SPELL_RAGING_SPIRIT         = 69200,
+    SPELL_SUMMON_RAGING_SPIRIT  = 69201,
+    SPELL_SUMMON_ICE_SPHERE     = 69103,
+    SPELL_ICE_SPHERE            = 69104, // missile and summon effect
+
+    // Phase Two
+    SPELL_SUMMON_VALKYR         = 69037,
+    SPELL_SUMMON_VALKYRS        = 74361, // 25man
+    SPELL_SOUL_REAPER           = 69409,
+    SPELL_DEFILE                = 72762,
+
+    // Phase Three
+    SPELL_VILE_SPIRITS          = 70498,
+    SPELL_HARVEST_SOUL          = 68980, // stun aura and periodic damage, triggers summoning of vehicle
+    SPELL_HARVEST_SOUL_TP_FM_N  = 72546, // teleports to Frostmourne Room and applies 60sec dummy aura (normal)
+    SPELL_HARVEST_SOUL_TP_FM_H  = 73655, // teleports to Frostmourne Room and applies 60sec DoT aura (heroic)
+    SPELL_HARVEST_SOUL_CLONE    = 71372,
+    SPELL_HARVEST_SOULS         = 74296,
+    SPELL_HARVESTED_SOUL_1      = 73028,
+    SPELL_HARVESTED_SOUL_2      = 74321,
+    SPELL_HARVESTED_SOUL_3      = 74322,
+    SPELL_HARVESTED_SOUL_4      = 74323,
+
+    SPELL_FROSTMOURNE_TP_VISUAL = 73078,
+
+    // Shambling Horror
+    SPELL_FRENZY                = 28747,
+    SPELL_ENRAGE                = 72143,
+    SPELL_SHOCKWAVE             = 72149,
+
+    // Shadow Trap
+    SPELL_SHADOW_TRAP_VISUAL    = 73530,
+    SPELL_SHADOW_TRAP_AURA      = 73525,
+
+    // Raging Spirit
+    SPELL_SOUL_SHRIEK           = 69242,
+    SPELL_RAGING_SPIRIT_VISUAL  = 69198, // clone effect (clone of player)
+
+    // Ice Sphere
+    SPELL_ICE_SPHERE_VISUAL     = 69090,
+    SPELL_ICE_BURST_AURA        = 69109,
+    SPELL_ICE_BURST             = 69108,
+    SPELL_ICE_PULSE             = 69091,
+
+    // Val'kyr Shadowguard
+    SPELL_LIFE_SIPHON           = 73783,
+    SPELL_VALKYR_CHARGE         = 74399,
+    SPELL_HARVEST_SOUL_VEHICLE  = 68985,
+    SPELL_EJECT_PASSENGERS      = 68576,
+    SPELL_WINGS_OF_THE_DAMNED   = 74352,
+
+    // Defile
+    SPELL_DEFILE_AURA           = 72743,
+    SPELL_DEFILE_GROW           = 72756,
+
+    // Vile Spirit and Wicked Spirit
+    SPELL_SPIRIT_BURST_AURA     = 70502,
+
+    // Spirit Warden
+    SPELL_DARK_HUNGER           = 69383,
+    SPELL_DESTROY_SOUL          = 74086,
+    SPELL_SOUL_RIP              = 69397, // 3500, each next one x2 (maybe based on HP of target?)
+
+    // Terenas in Frostmourne
+    SPELL_RESTORE_SOUL          = 72595,
+    SPELL_RESTORE_SOUL_HEROIC   = 73650,
+    SPELL_LIGHTS_FAVOR          = 69382,
+    SPELL_SUMMON_SPIRIT_BOMBS_1 = 73581, // heroic only, summons Spirit Bomb every 1 sec
+    SPELL_SUMMON_SPIRIT_BOMBS_2 = 74299, // 2 secs interval
+    SPELL_SUMMON_SPIRIT_BOMB    = 74300, // aura doesnt work somehow, so we will use manual summoning
+
+    // Spirit Bomb
+    SPELL_SPIRIT_BOMB_VISUAL    = 73572,
+    SPELL_EXPLOSION             = 73804,
+
+    // NPCs
+    NPC_SHADOW_TRAP             = 39137,
+    NPC_FROSTMOURNE             = 38584,
+    NPC_ICE_SPHERE              = 36633,
+    NPC_RAGING_SPIRIT           = 36701,
+    NPC_DEFILE                  = 38757,
+    NPC_SPIRIT_WARDEN           = 36824,
+    NPC_TERENAS_FM_NORMAL       = 36823,
+    NPC_TERENAS_FM_HEROIC       = 39217,
+    NPC_WICKED_SPIRIT           = 39190,
+    NPC_SPIRIT_BOMB             = 39189,
+};
+
+enum Phase
+{
+    PHASE_INTRO                 = 0,    // intro
+    PHASE_ONE                   = 1,    // phase one
+    PHASE_RUNNING_WINTER_ONE    = 2,    // running to center of platform to cast Remorseless Winter
+    PHASE_TRANSITION_ONE        = 3,    // Remorseless Winter aura and casting spells, summoning orbs and spirits
+    PHASE_QUAKE_ONE             = 4,    // casting Quake
+    PHASE_TWO                   = 5,    // phase two with val'kyrs and some more spells
+    PHASE_RUNNING_WINTER_TWO    = 6,    // running to center of platform to cast Remorseless Winter again
+    PHASE_TRANSITION_TWO        = 7,    // second Remorseless Winter phase
+    PHASE_QUAKE_TWO             = 8,    // second Quake casting
+    PHASE_THREE                 = 9,    // phase three, casting Soul Harvest (Frostmourne phase)
+    PHASE_IN_FROSTMOURNE        = 10,   // phase three, waiting untill whole raid leaves Frostmourne
+    PHASE_CUTSCENE              = 11,   // phase when LK kills raid, Terenas comes etc.
+    PHASE_DEATH_AWAITS          = 12,   // strangulating Lich King, raid group finishing him
+};
+
+enum Point
+{
+    POINT_CENTER_LAND           = 1,
+    POINT_CENTER_LAND_TIRION    = 2,
+    POINT_TELEPORTER_TIRION     = 3,
+    POINT_VALKYR_THROW          = 4,
+    POINT_VALKYR_CENTER         = 5,
+    POINT_TP_TO_FM              = 6, // point where strangulate vehicle moves, after reaching player is teleported into frostmourne
+    POINT_SPIRIT_BOMB           = 7, // Spirit Bomb moving down
+};
+
+static const float fLichKingPosition[11][3] =
+{
+    {458.59f, -2122.71f, 1040.86f},    // 0 Lich King Intro
+    {503.16f, -2124.52f, 1040.86f},    // 1 Center of the platform
+    {500.16f, -2124.52f, 1040.86f},    // 2 Tirion strikes Lich King
+    {481.70f, -2124.64f, 1040.86f},    // 3 Tirion 2
+    {498.00f, -2201.57f, 1046.09f},    // 4 Valkyrs?
+    {517.48f, -2124.91f, 1040.86f},    // 5 Tirion?
+    {529.85f, -2124.71f, 1040.86f},    // 6 Lich king final, o=3.1146
+    {520.31f, -2124.71f, 1040.86f},    // 7 Frostmourne
+    {453.80f, -2088.20f, 1040.86f},    // 8 Val'kyr drop point right to Frozen Throne
+    {457.03f, -2155.08f, 1040.86f},    // 9 Val'kyr drop point left to Frozen Throne
+    {494.31f, -2523.08f, 1249.87f},    // 10 center of platform inside Frostmourne
+};
+
+struct boss_the_lich_king_icc : public CreatureScript
+{
+    boss_the_lich_king_icc() : CreatureScript("boss_the_lich_king_icc") {}
+
+    struct boss_the_lich_king_iccAI : public ScriptedAI
+    {
+        boss_the_lich_king_iccAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiPhase;
+        uint32 m_uiPhaseTimer;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiGhoulsTimer;
+        uint32 m_uiHorrorTimer;
+        uint32 m_uiNecroticPlagueTimer;
+        uint32 m_uiInfestTimer;
+        uint32 m_uiShadowTrapTimer;
+        uint32 m_uiPainSufferingTimer;
+        uint32 m_uiRagingSpiritTimer;
+        uint32 m_uiIceSphereTimer;
+        uint32 m_uiValkyrTimer;
+        uint32 m_uiDefileTimer;
+        uint32 m_uiSoulReaperTimer;
+        uint32 m_uiHarvestSoulTimer;
+        uint32 m_uiFrostmournePhaseTimer;
+        uint32 m_uiVileSpiritsTimer;
+
+        void Reset() override
+        {
+            // TODO: handling phases "intro" and "one" and aggroing depending on resetting encounter
+            m_uiPhase = PHASE_INTRO;
+
+            m_uiBerserkTimer = 15 * MINUTE * IN_MILLISECONDS;
+            m_uiGhoulsTimer = 13000;
+            m_uiHorrorTimer = 21000;
+            m_uiInfestTimer = 20000;
+            m_uiNecroticPlagueTimer = 23000;
+            m_uiShadowTrapTimer = 15000;
+            m_uiPainSufferingTimer = 6000;
+            m_uiRagingSpiritTimer = 20000;
+            m_uiIceSphereTimer = 6000;
+            m_uiValkyrTimer = 10000;
+            m_uiDefileTimer = 30000;
+            m_uiSoulReaperTimer = 25000;
+            m_uiHarvestSoulTimer = 5000;
+            m_uiVileSpiritsTimer = 20000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_LICH_KING, IN_PROGRESS);
+
+            DoScriptText(SAY_AGGRO, m_creature);
+            m_uiPhase = PHASE_ONE;
+        }
+
+        void KilledUnit(Unit* pWho) override
+        {
+            if (pWho->GetTypeId() == TYPEID_PLAYER)
+                DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_LICH_KING, DONE);
+
+            DoScriptText(SAY_OUTRO_14, m_creature);
+
+            // TODO: finish event, after around 8 seconds play cinematic
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_LICH_KING, FAIL);
+        }
+
+        void MovementInform(uint32 uiMovementType, uint32 uiData) override
+        {
+            if (uiMovementType != POINT_MOTION_TYPE)
+                return;
+
+            switch (uiData)
+            {
+            case POINT_CENTER_LAND:
+                if (m_uiPhase == PHASE_RUNNING_WINTER_ONE)
+                {
+                    DoScriptText(SAY_REMORSELESS_WINTER, m_creature);
+
+                    // TODO: not sure which spell in which phase
+                    // DoCastSpellIfCan(m_creature, SPELL_REMORSELESS_WINTER_1);
+
+                    m_uiPhase = PHASE_TRANSITION_ONE;
+                    m_uiPhaseTimer = 62000;
+
+                    // TODO: set phase initial timers
+                    // TODO: on heroic despawn Shadow Traps
+                }
+                else if (m_uiPhase == PHASE_RUNNING_WINTER_TWO)
+                {
+                    DoScriptText(SAY_REMORSELESS_WINTER, m_creature);
+
+                    // TODO: not sure which spell in which phase
+                    // DoCastSpellIfCan(m_creature, SPELL_REMORSELESS_WINTER_2);
+
+                    m_uiPhase = PHASE_TRANSITION_TWO;
+                    m_uiPhaseTimer = 62000;
+
+                    // TODO: set phase initial timers
+                }
+                else if (m_uiPhase == PHASE_DEATH_AWAITS)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_RAISE_DEAD);
+                }
+
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiPhase != PHASE_INTRO && m_uiPhase != PHASE_DEATH_AWAITS)
+            {
+                // check evade
+                if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                    return;
+
+                // Berserk
+                if (m_uiBerserkTimer)
+                {
+                    if (m_uiBerserkTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                        {
+                            DoScriptText(SAY_ENRAGE, m_creature);
+                            m_uiBerserkTimer = 0;
+                        }
+                    }
+                    else
+                        m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_INTRO:
+                // wait until set in combat
+                return;
+            case PHASE_ONE:
+                // check HP
+                if (m_creature->GetHealthPercent() <= 70.0f)
+                {
+                    // phase transition
+                    m_creature->GetMotionMaster()->Clear();
+                    m_creature->GetMotionMaster()->MovePoint(POINT_CENTER_LAND, fLichKingPosition[1][0], fLichKingPosition[1][1], fLichKingPosition[1][2]);
+                    m_uiPhase = PHASE_RUNNING_WINTER_ONE;
+                    return;
+                }
+
+                // Necrotic Plague
+                if (m_uiNecroticPlagueTimer < uiDiff)
+                {
+                    // shouldn't be targeting players who already have Necrotic Plague on them
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_NECROTIC_PLAGUE, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_NECROTIC_PLAGUE) == CAST_OK)
+                            m_uiNecroticPlagueTimer = 30000;
+                    }
+                }
+                else
+                    m_uiNecroticPlagueTimer -= uiDiff;
+
+                // Infest
+                if (m_uiInfestTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_INFEST) == CAST_OK)
+                        m_uiInfestTimer = urand(20000, 25000);
+                }
+                else
+                    m_uiInfestTimer -= uiDiff;
+
+                // Summon Ghouls
+                if (m_uiGhoulsTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_GHOULS) == CAST_OK)
+                        m_uiGhoulsTimer = 32000;
+                }
+                else
+                    m_uiGhoulsTimer -= uiDiff;
+
+                // Summon Shambling Horror
+                if (m_uiHorrorTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_HORROR) == CAST_OK)
+                        m_uiHorrorTimer = 60000;
+                }
+                else
+                    m_uiHorrorTimer -= uiDiff;
+
+                // Shadow Trap (heroic)
+                if (m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC))
+                {
+                    if (m_uiShadowTrapTimer < uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_SHADOW_TRAP, SELECT_FLAG_PLAYER))
+                        {
+                            if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_TRAP) == CAST_OK)
+                                m_uiShadowTrapTimer = 15000;
+                        }
+                    }
+                    else
+                        m_uiShadowTrapTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+
+                break;
+            case PHASE_RUNNING_WINTER_ONE:
+            case PHASE_RUNNING_WINTER_TWO:
+                // wait for waypoint arrival
+                break;
+            case PHASE_TRANSITION_ONE:
+            case PHASE_TRANSITION_TWO:
+                // phase end timer
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_QUAKE) == CAST_OK)
+                    {
+                        DoScriptText(SAY_SHATTER_ARENA, m_creature);
+                        m_uiPhase = (m_uiPhase == PHASE_TRANSITION_ONE ? PHASE_QUAKE_ONE : PHASE_QUAKE_TWO);
+                        m_uiPhaseTimer = 6500;
+                    }
+                }
+                else
+                    m_uiPhaseTimer -= uiDiff;
+
+                // Pain and Suffering
+                if (m_uiPainSufferingTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_PAIN_AND_SUFFERING, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_PAIN_AND_SUFFERING) == CAST_OK)
+                            m_uiPainSufferingTimer = urand(1500, 3000);
+                    }
+                }
+                else
+                    m_uiPainSufferingTimer -= uiDiff;
+
+                // Summon Ice Sphere
+                if (m_uiIceSphereTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ICE_SPHERE) == CAST_OK)
+                        m_uiIceSphereTimer = 6000;
+                }
+                else
+                    m_uiIceSphereTimer -= uiDiff;
+
+                // Summon Raging Spirit
+                if (m_uiRagingSpiritTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_RAGING_SPIRIT, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_RAGING_SPIRIT, CAST_TRIGGERED) == CAST_OK)
+                            m_uiRagingSpiritTimer = (m_uiPhase == PHASE_TRANSITION_ONE ? 20000 : 15000);
+                    }
+                }
+                else
+                    m_uiRagingSpiritTimer -= uiDiff;
+
+                break;
+            case PHASE_QUAKE_ONE:
+            case PHASE_QUAKE_TWO:
+                // Casting Quake spell - phase end timer
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    // TODO: destroy platform
+
+                    m_uiPhase = (m_uiPhase == PHASE_QUAKE_ONE ? PHASE_TWO : PHASE_THREE);
+                    m_creature->GetMotionMaster()->Clear();
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    return;
+                }
+                else
+                    m_uiPhaseTimer -= uiDiff;
+
+                break;
+            case PHASE_TWO:
+                // check HP
+                if (m_creature->GetHealthPercent() <= 40.0f)
+                {
+                    // phase transition
+                    m_creature->GetMotionMaster()->Clear();
+                    m_creature->GetMotionMaster()->MovePoint(POINT_CENTER_LAND, fLichKingPosition[1][0], fLichKingPosition[1][1], fLichKingPosition[1][2]);
+                    m_uiPhaseTimer = 60000;
+                    m_uiPhase = PHASE_RUNNING_WINTER_TWO;
+                }
+
+                // Soul Reaper
+                if (m_uiSoulReaperTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SOUL_REAPER) == CAST_OK)
+                        m_uiSoulReaperTimer = 30000;
+                }
+                else
+                    m_uiSoulReaperTimer -= uiDiff;
+
+                // Infest
+                if (m_uiInfestTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_INFEST) == CAST_OK)
+                        m_uiInfestTimer = urand(20000, 25000);
+                }
+                else
+                    m_uiInfestTimer -= uiDiff;
+
+                // Defile
+                if (m_uiDefileTimer < uiDiff)
+                {
+                    // shouldn't be targeting players in vehicles
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_DEFILE, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_DEFILE) == CAST_OK)
+                            m_uiDefileTimer = 30000;
+                    }
+                }
+                else
+                    m_uiDefileTimer -= uiDiff;
+
+                // Summon Val'kyr
+                if (m_uiValkyrTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_VALKYR) == CAST_OK)
+                    {
+                        DoScriptText(SAY_SUMMON_VALKYR, m_creature);
+                        m_uiValkyrTimer = 50000;
+                    }
+                }
+                else
+                    m_uiValkyrTimer -= uiDiff;
+
+                DoMeleeAttackIfReady();
+
+                break;
+            case PHASE_THREE:
+                // check HP
+                if (m_creature->GetHealthPercent() <= 10.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FURY_OF_FROSTMOURNE) == CAST_OK)
+                    {
+                        DoScriptText(SAY_LAST_PHASE, m_creature);
+                        m_uiPhase = PHASE_DEATH_AWAITS;
+
+                        // TODO: start ending event
+
+                        return;
+                    }
+                }
+
+                // Soul Reaper
+                if (m_uiSoulReaperTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SOUL_REAPER) == CAST_OK)
+                        m_uiSoulReaperTimer = 30000;
+                }
+                else
+                    m_uiSoulReaperTimer -= uiDiff;
+
+                // Defile
+                if (m_uiDefileTimer < uiDiff)
+                {
+                    // shouldn't be targeting players in vehicles
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_DEFILE, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_DEFILE) == CAST_OK)
+                            m_uiDefileTimer = 30000;
+                    }
+                }
+                else
+                    m_uiDefileTimer -= uiDiff;
+
+                // Harvest Soul
+                if (m_uiHarvestSoulTimer < uiDiff)
+                {
+                    Unit* pTarget = NULL;
+                    bool m_bIsHeroic = m_pInstance && m_pInstance->GetData(TYPE_DATA_IS_HEROIC);
+                    if (m_bIsHeroic)
+                        pTarget = m_creature;
+                    else
+                        pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_HARVEST_SOUL, SELECT_FLAG_PLAYER);
+
+                    if (pTarget)
+                    {
+                        if (DoCastSpellIfCan(pTarget, m_bIsHeroic ? SPELL_HARVEST_SOULS : SPELL_HARVEST_SOUL) == CAST_OK)
+                        {
+                            DoScriptText(SAY_HARVEST_SOUL, m_creature);
+                            m_uiHarvestSoulTimer = m_bIsHeroic ? 120000 : 70000;
+
+                            // TODO: prepare Frostmourne room - summon bombs and Tirion, or Tirion and the "bad spirit-guy"
+
+                            if (m_bIsHeroic)
+                            {
+                                m_uiPhase = PHASE_IN_FROSTMOURNE;
+                                SetCombatMovement(false);
+                                m_creature->StopMoving();
+                                m_uiFrostmournePhaseTimer = 47000;
+                                m_uiDefileTimer = 1000;
+                            }
+                        }
+                    }
+                }
+                else
+                    m_uiHarvestSoulTimer -= uiDiff;
+
+                // Vile Spirits
+                if (m_uiVileSpiritsTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_VILE_SPIRITS) == CAST_OK)
+                        m_uiVileSpiritsTimer = 30000;
+                }
+                else
+                    m_uiVileSpiritsTimer -= uiDiff;
+
+                DoMeleeAttackIfReady();
+
+                break;
+            case PHASE_IN_FROSTMOURNE:
+                // check if players are alive before entering evade mode?
+                // wait until they leave Frostmourne
+                if (m_uiFrostmournePhaseTimer < uiDiff)
+                {
+                    m_uiPhase = PHASE_THREE;
+                    if (m_creature->getVictim())
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    return;
+                }
+                else
+                    m_uiFrostmournePhaseTimer -= uiDiff;
+
+                break;
+            case PHASE_DEATH_AWAITS:
+                // wait for swift death
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_the_lich_king_iccAI(pCreature);
+    }
+};
+
+void AddSC_boss_the_lich_king()
+{
+    Script* s;
+
+    s = new boss_the_lich_king_icc();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_the_lich_king_icc";
+    //pNewScript->GetAI = &GetAI_boss_the_lich_king_icc;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_valithria_dreamwalker.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_valithria_dreamwalker.cpp
new file mode 100644
index 000000000..82e7acfbc
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_valithria_dreamwalker.cpp
@@ -0,0 +1,168 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_valithria
+SD%Complete: 5%
+SDComment:
+SDCategory: Icecrown Citadel
+EndScriptData */
+
+#include "precompiled.h"
+#include "icecrown_citadel.h"
+
+enum SvalnaTexts                                            // TODO Maybe need own file?
+{
+    SAY_SVALNA_EVENT_1          = -1631130,
+    SAY_SVALNA_EVENT_2          = -1631131,
+    SAY_SVALNA_EVENT_3          = -1631132,
+    SAY_SVALNA_EVENT_4          = -1631133,
+    SAY_KILLING_CRUSADERS       = -1631134,
+    SAY_RESSURECT               = -1631135,
+    SAY_SVALNA_AGGRO            = -1631136,
+    SAY_KILL_CAPTAIN            = -1631137,
+    SAY_KILL_PLAYER             = -1631138,
+    SAY_DEATH                   = -1631139,
+};
+
+enum
+{
+    SAY_AGGRO                   = -1631140,
+    SAY_PORTAL                  = -1631141,
+    SAY_75_HEALTH               = -1631142,
+    SAY_25_HEALTH               = -1631143,
+    SAY_0_HEALTH                = -1631144,
+    SAY_PLAYER_DIES             = -1631145,
+    SAY_BERSERK                 = -1631146,
+    SAY_VICTORY                 = -1631147,
+};
+
+// Valithria
+enum
+{
+    SPELL_NIGHTMARE_PORTAL_PRE      = 71977,
+    SPELL_NIGHTMARE_PORTAL          = 71987,
+    SPELL_TWISTED_NIGHTMARES        = 71941,
+    SPELL_TWISTED_NIGHTMARES_DOT    = 71940,
+    SPELL_NIGHTMARE_CLOUD           = 71970, // Nightmare Clouds cast this on dreaming Valithria - then she deals this dmg to Real Valithria(?)
+    SPELL_NIGHTMARE_CLOUD_VISUAL    = 71939,
+
+    SPELL_DREAM_PORTAL_PRE          = 71301,
+    SPELL_DREAM_PORTAL              = 71305,
+    SPELL_EMERALD_VIGOR             = 70873,
+    SPELL_DREAM_CLOUD_VISUAL        = 70876,
+
+    SPELL_DREAM_STATE               = 70766,
+
+    SPELL_DREAMWALKER_RAGE          = 71189,
+    SPELL_IMMUNITY                  = 72724,
+    SPELL_CORRUPTION                = 70904,
+    SPELL_DREAM_SLIP                = 71196,
+    SPELL_ICE_SPIKE                 = 70702,
+
+    SPELL_CLEAR_DREAMS_NIGHTMARES   = 75863, // script effect removes Emerald Vigor and Nightmare auras
+
+    // summons
+    // TODO:
+    // these spells should be applied to dummy npcs in gates
+    // they should apply these auras once the encounter has started
+    // but how to apply this, which spell on which npc and when?
+    // how to handle summon timers speedup?
+    SPELL_SUMMON_TIMER_SUPPRESSER   = 70912,
+    SPELL_SUMMON_TIMER_SKELETON     = 70913,
+    SPELL_SUMMON_TIMER_ZOMBIE       = 70914,
+    SPELL_SUMMON_TIMER_ABOMIN       = 70915,
+    SPELL_SUMMON_TIMER_ARCHMAGE     = 70916,
+
+    // entries
+    NPC_NIGHTMARE_PORTAL_PRE        = 38429,
+    NPC_NIGHTMARE_PORTAL            = 38430,
+    NPC_NIGHTMARE_CLOUD             = 38421,
+    NPC_DREAM_PORTAL_PRE            = 38186,
+    NPC_DREAM_PORTAL                = 37945,
+    NPC_DREAM_CLOUD                 = 37985,
+
+    // Achievements
+    SPELL_ACHIEVEMENT_CREDIT        = 72706,
+
+    // other
+    SUMMON_TYPES_NUMBER             = 4
+};
+
+struct boss_valithria_dreamwalker : public CreatureScript
+{
+    boss_valithria_dreamwalker() : CreatureScript("boss_valithria_dreamwalker") {}
+
+    struct boss_valithria_dreamwalkerAI : public ScriptedAI
+    {
+        boss_valithria_dreamwalkerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override
+        {
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_VALITHRIA, FAIL);
+        }
+
+        // actually, when summoned creature kills a player
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+                DoScriptText(SAY_PLAYER_DIES, m_creature, pVictim);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_0_HEALTH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_VALITHRIA, FAIL);
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_valithria_dreamwalkerAI(pCreature);
+    }
+};
+
+void AddSC_boss_valithria_dreamwalker()
+{
+    Script* s;
+
+    s = new boss_valithria_dreamwalker();
+    s->RegisterSelf();
+
+    //pNewscript = new Script;
+    //pNewscript->Name = "boss_valithria_dreamwalker";
+    //pNewscript->GetAI = &GetAI_boss_valithria_dreamwalker;
+    //pNewscript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/gunship_battle.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/gunship_battle.cpp
new file mode 100644
index 000000000..dde1e1ae8
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/gunship_battle.cpp
@@ -0,0 +1,31 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: gunship_battle
+SD%Complete: 0%
+SDComment:
+SDCategory: Icecrown Citadel
+EndScriptData */
+
+#include "precompiled.h"
+
+void AddSC_gunship_battle()
+{
+}
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/icecrown_citadel.h b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/icecrown_citadel.h
new file mode 100644
index 000000000..863c8397f
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/icecrown_citadel.h
@@ -0,0 +1,213 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_ICECROWN_CITADEL_H
+#define DEF_ICECROWN_CITADEL_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 12,
+
+    TYPE_MARROWGAR                  = 0,
+    TYPE_LADY_DEATHWHISPER          = 1,
+    TYPE_GUNSHIP_BATTLE             = 2,
+    TYPE_DEATHBRINGER_SAURFANG      = 3,
+    TYPE_FESTERGUT                  = 4,
+    TYPE_ROTFACE                    = 5,
+    TYPE_PROFESSOR_PUTRICIDE        = 6,
+    TYPE_BLOOD_PRINCE_COUNCIL       = 7,
+    TYPE_QUEEN_LANATHEL             = 8,
+    TYPE_VALITHRIA                  = 9,
+    TYPE_SINDRAGOSA                 = 10,
+    TYPE_LICH_KING                  = 11,
+
+    TYPE_DATA_AREATRIGGERS          = MAX_ENCOUNTER,
+    TYPE_DO_PREPARE_PROF_DOOR       = MAX_ENCOUNTER + 1,
+    TYPE_DATA_IS_HEROIC             = MAX_ENCOUNTER + 2,
+    TYPE_DATA_IS_25MAN              = MAX_ENCOUNTER + 3,
+    TYPE_DO_SUMMON_CULTIST_WAVE     = MAX_ENCOUNTER + 4,
+
+    // NPC entries
+    NPC_LORD_MARROWGAR              = 36612,
+    NPC_LADY_DEATHWHISPER           = 36855,
+    NPC_DEATHBRINGER_SAURFANG       = 37813,
+    NPC_FESTERGUT                   = 36626,
+    NPC_ROTFACE                     = 36627,
+    NPC_PROFESSOR_PUTRICIDE         = 36678,
+    NPC_TALDARAM                    = 37973,
+    NPC_VALANAR                     = 37970,
+    NPC_KELESETH                    = 37972,
+    NPC_QUEEN_LANATHEL              = 37955,
+    NPC_VALITHRIA                   = 36789,
+    NPC_SINDRAGOSA                  = 36853,
+    NPC_LICH_KING                   = 36597,
+
+    // boss-related and other NPCs
+    NPC_DEATHWHISPER_SPAWN_STALKER  = 37947,
+    NPC_DEATHWHISPER_CONTROLLER     = 37948,
+    NPC_OVERLORD_SAURFANG           = 37187,
+    NPC_KORKRON_REAVER              = 37920,
+    NPC_MURADIN_BRONZEBEARD         = 37200,        // Saurfang's encounter and at the instance entrance
+    NPC_SKYBREAKER_MARINE           = 37380,
+    NPC_ALLIANCE_MARINE             = 37830,
+    NPC_BLOOD_ORB_CONTROL           = 38008,
+    NPC_LANATHEL_INTRO              = 38004,
+    NPC_VALITHRIA_QUEST             = 38589,
+    NPC_VALITHRIA_COMBAT_TRIGGER    = 38752,
+    NPC_MURADIN                     = 36948,        // Gunship Battle's encounter(?)
+    NPC_TIRION                      = 38995,
+    NPC_MENETHIL                    = 38579,
+    NPC_FROSTMOURNE_TRIGGER         = 38584,
+    NPC_FROSTMOURNE_HOLDER          = 27880,
+    NPC_STINKY                      = 37025,
+    NPC_PRECIOUS                    = 37217,
+    NPC_PUDDLE_STALKER              = 37013,        // related to Festergut and Rotface
+    NPC_RIMEFANG                    = 37533,
+    NPC_SPINESTALKER                = 37534,
+    NPC_CULT_ADHERENT               = 37949,
+    NPC_CULT_FANATIC                = 37890,
+
+    // GameObjects entries
+    GO_ICEWALL_1                    = 201911,
+    GO_ICEWALL_2                    = 201910,
+    GO_MARROWGAR_DOOR               = 201857,       // Marrowgar combat door
+
+    GO_ORATORY_DOOR                 = 201563,
+    GO_DEATHWHISPER_ELEVATOR        = 202220,
+
+    GO_SAURFANG_DOOR                = 201825,
+
+    GO_GREEN_PLAGUE                 = 201370,       // Rotface combat door
+    GO_ORANGE_PLAGUE                = 201371,       // Festergut combat door
+    GO_SCIENTIST_DOOR               = 201372,       // Putricide combat door
+    GO_SCIENTIST_DOOR_COLLISION     = 201612,       // Putricide pathway doors
+    GO_SCIENTIST_DOOR_ORANGE        = 201613,
+    GO_SCIENTIST_DOOR_GREEN         = 201614,
+    GO_GREEN_VALVE                  = 201615,       // Valves used to release the Gas / Oozes in order to open the pathway to Putricide - triggers event 23426
+    GO_ORANGE_VALVE                 = 201616,       // triggers event 23438
+    GO_ORANGE_TUBE                  = 201617,
+    GO_GREEN_TUBE                   = 201618,
+
+    // GO_BLOODWING_DOOR             = 201920,       // not used
+    GO_CRIMSON_HALL_DOOR            = 201376,       // Council combat door
+    GO_COUNCIL_DOOR_1               = 201377,
+    GO_COUNCIL_DOOR_2               = 201378,
+    GO_BLOODPRINCE_DOOR             = 201746,       // Lanathel combat door
+    GO_ICECROWN_GRATE               = 201755,       // Lanathel trap door
+
+    // GO_FROSTWING_DOOR             = 201919,       // not used
+    GO_GREEN_DRAGON_ENTRANCE        = 201375,       // Valithria combat door
+    GO_GREEN_DRAGON_EXIT            = 201374,
+    GO_VALITHRIA_DOOR_1             = 201381,       // Valithria event doors
+    GO_VALITHRIA_DOOR_2             = 201382,
+    GO_VALITHRIA_DOOR_3             = 201383,
+    GO_VALITHRIA_DOOR_4             = 201380,
+    GO_SINDRAGOSA_SHORTCUT_ENTRANCE = 201369,       // Shortcut doors are opened only after the trash before Sindragosa is cleared
+    GO_SINDRAGOSA_SHORTCUT_EXIT     = 201379,
+    GO_SINDRAGOSA_ENTRANCE          = 201373,
+
+    GO_FROZENTRONE_TRANSPORTER      = 202223,
+    GO_ICESHARD_1                   = 202142,
+    GO_ICESHARD_2                   = 202141,
+    GO_ICESHARD_3                   = 202143,
+    GO_ICESHARD_4                   = 202144,
+    GO_FROSTY_WIND                  = 202188,
+    GO_FROSTY_EDGE                  = 202189,
+    GO_SNOW_EDGE                    = 202190,
+    GO_ARTHAS_PLATFORM              = 202161,
+    GO_ARTHAS_PRECIPICE             = 202078,
+
+    GO_PLAGUE_SIGIL                 = 202182,       // Possible used after each wing is cleared
+    GO_FROSTWING_SIGIL              = 202181,
+    GO_BLOODWING_SIGIL              = 202183,
+
+    // Loot chests
+    GO_SAURFANG_CACHE               = 202239,
+    GO_SAURFANG_CACHE_25            = 202240,
+    GO_SAURFANG_CACHE_10_H          = 202238,
+    GO_SAURFANG_CACHE_25_H          = 202241,
+
+    GO_GUNSHIP_ARMORY_A             = 201872,
+    GO_GUNSHIP_ARMORY_A_25          = 201873,
+    GO_GUNSHIP_ARMORY_A_10H         = 201874,
+    GO_GUNSHIP_ARMORY_A_25H         = 201875,
+
+    GO_GUNSHIP_ARMORY_H             = 202177,
+    GO_GUNSHIP_ARMORY_H_25          = 202178,
+    GO_GUNSHIP_ARMORY_H_10H         = 202179,
+    GO_GUNSHIP_ARMORY_H_25H         = 202180,
+
+    GO_DREAMWALKER_CACHE            = 201959,
+    GO_DREAMWALKER_CACHE_25         = 202339,
+    GO_DREAMWALKER_CACHE_10_H       = 202338,
+    GO_DREAMWALKER_CACHE_25_H       = 202340,
+
+    // Area triggers
+    AREATRIGGER_MARROWGAR_INTRO     = 5732,
+    AREATRIGGER_DEATHWHISPER_INTRO  = 5709,
+    AREATRIGGER_SINDRAGOSA_PLATFORM = 5604,
+
+    // Achievement criterias
+    ACHIEV_CRIT_BONED_10N                  = 12775,     // Lord Marrowgar, achievs 4534, 4610
+    ACHIEV_CRIT_BONED_25N                  = 12962,
+    ACHIEV_CRIT_BONED_10H                  = 13393,
+    ACHIEV_CRIT_BONED_25H                  = 13394,
+
+    ACHIEV_CRIT_HOUSE_10N                  = 12776,     // Lady Deathwhisper, achievs 4535, 4611
+    ACHIEV_CRIT_HOUSE_25N                  = 12997,
+    ACHIEV_CRIT_HOUSE_10H                  = 12995,
+    ACHIEV_CRIT_HOUSE_25H                  = 12998,
+
+    ACHIEV_CRIT_IM_ON_A_BOAT_10N           = 12777,     // Gunship Battle, achievs 4536, 4612
+    ACHIEV_CRIT_IM_ON_A_BOAT_25N           = 13080,
+    ACHIEV_CRIT_IM_ON_A_BOAT_10H           = 13079,
+    ACHIEV_CRIT_IM_ON_A_BOAT_25H           = 13081,
+
+    ACHIEV_CRIT_MADE_A_MESS_10N            = 12778,     // Deathbringer Saurfang, achievs 4537, 4613
+    ACHIEV_CRIT_MADE_A_MESS_25N            = 13036,
+    ACHIEV_CRIT_MADE_A_MESS_10H            = 13035,
+    ACHIEV_CRIT_MADE_A_MESS_25H            = 13037,
+
+    ACHIEV_CRIT_FLU_SHOT_SHORTAGE_10N      = 12977,     // Festergut, achievs 4615, 4577
+    ACHIEV_CRIT_FLU_SHOT_SHORTAGE_25N      = 12982,
+    ACHIEV_CRIT_FLU_SHOT_SHORTAGE_10H      = 12986,
+    ACHIEV_CRIT_FLU_SHOT_SHORTAGE_25H      = 12967,
+
+    ACHIEV_CRIT_DANCES_WITH_OOZES_10N      = 12984,     // Rotface, achievs 4538, 4614
+    ACHIEV_CRIT_DANCES_WITH_OOZES_25N      = 12966,
+    ACHIEV_CRIT_DANCES_WITH_OOZES_10H      = 12985,
+    ACHIEV_CRIT_DANCES_WITH_OOZES_25H      = 12983,
+
+    ACHIEV_CRIT_NAUSEA_10N                 = 12987,     // Professor Putricide, achievs 4578, 4616
+    ACHIEV_CRIT_NAUSEA_25N                 = 12968,
+    ACHIEV_CRIT_NAUSEA_10H                 = 12988,
+    ACHIEV_CRIT_NAUSEA_25H                 = 12981,
+
+    ACHIEV_CRIT_ORB_WHISPERER_10N          = 13033,     // Blood Prince Council, achievs 4582, 4617
+    ACHIEV_CRIT_ORB_WHISPERER_25N          = 12969,
+    ACHIEV_CRIT_ORB_WHISPERER_10H          = 13034,
+    ACHIEV_CRIT_ORB_WHISPERER_25H          = 13032,
+
+    ACHIEV_CRIT_ONCE_BITTEN_TWICE_SHY_10N  = 12780,     // Blood-Queen Lana'thel, achievs 4539, 4618
+    ACHIEV_CRIT_ONCE_BITTEN_TWICE_SHY_25N  = 13012,
+    ACHIEV_CRIT_ONCE_BITTEN_TWICE_SHY_10V  = 13011,
+    ACHIEV_CRIT_ONCE_BITTEN_TWICE_SHY_25V  = 13013,
+
+    ACHIEV_CRIT_PORTAL_JOCKEY_10N          = 12978,    // Valithria, achievs 4579, 4619
+    ACHIEV_CRIT_PORTAL_JOCKEY_25N          = 12971,
+    ACHIEV_CRIT_PORTAL_JOCKEY_10H          = 12979,
+    ACHIEV_CRIT_PORTAL_JOCKEY_25H          = 12980,
+
+    ACHIEV_CRIT_ALL_YOU_CAN_EAT_10N        = 12822,    // Sindragosa, achievs 4580, 4620
+    ACHIEV_CRIT_ALL_YOU_CAN_EAT_25N        = 12972,
+    ACHIEV_CRIT_ALL_YOU_CAN_EAT_10V        = 12996,
+    ACHIEV_CRIT_ALL_YOU_CAN_EAT_25V        = 12989,
+
+    ACHIEV_CRIT_WAITING_A_LONG_TIME_10N    = 13246,    // Lich King, achievs 4601, 4621
+    ACHIEV_CRIT_WAITING_A_LONG_TIME_25N    = 13244,
+    ACHIEV_CRIT_WAITING_A_LONG_TIME_10H    = 13247,
+    ACHIEV_CRIT_WAITING_A_LONG_TIME_25H    = 13245,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/instance_icecrown_citadel.cpp b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/instance_icecrown_citadel.cpp
new file mode 100644
index 000000000..b2aa65b72
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/icecrown_citadel/icecrown_citadel/instance_icecrown_citadel.cpp
@@ -0,0 +1,692 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: instance_icecrown_citadel
+SD%Complete: 20%
+SDComment: Just basic stuff
+SDCategory: Icecrown Citadel
+EndScriptData */
+
+#include "precompiled.h"
+#include "icecrown_citadel.h"
+
+enum
+{
+    // Marrowgar
+    SAY_MARROWGAR_INTRO             = -1631001,
+
+    // Deathwhisper
+    SAY_DEATHWHISPER_SPEECH_1       = -1631011,
+    SAY_DEATHWHISPER_SPEECH_2       = -1631012,
+    SAY_DEATHWHISPER_SPEECH_3       = -1631013,
+    SAY_DEATHWHISPER_SPEECH_4       = -1631014,
+    SAY_DEATHWHISPER_SPEECH_5       = -1631015,
+    SAY_DEATHWHISPER_SPEECH_6       = -1631016,
+    SAY_DEATHWHISPER_SPEECH_7       = -1631017,
+
+    // Festergut
+    SAY_STINKY_DIES                 = -1631081,
+    // Rotface
+    SAY_PRECIOUS_DIES               = -1631070,
+};
+
+static const DialogueEntry aCitadelDialogue[] =
+{
+    {SAY_DEATHWHISPER_SPEECH_1,  NPC_LADY_DEATHWHISPER,  12000},
+    {SAY_DEATHWHISPER_SPEECH_2,  NPC_LADY_DEATHWHISPER,  11000},
+    {SAY_DEATHWHISPER_SPEECH_3,  NPC_LADY_DEATHWHISPER,  10000},
+    {SAY_DEATHWHISPER_SPEECH_4,  NPC_LADY_DEATHWHISPER,  9000},
+    {SAY_DEATHWHISPER_SPEECH_5,  NPC_LADY_DEATHWHISPER,  10000},
+    {SAY_DEATHWHISPER_SPEECH_6,  NPC_LADY_DEATHWHISPER,  10000},
+    {SAY_DEATHWHISPER_SPEECH_7,  NPC_LADY_DEATHWHISPER,  0},
+    {0, 0, 0},
+};
+
+struct sortFromNorthToSouth
+{
+    sortFromNorthToSouth(Map *pMap) : _map(pMap) {}
+
+    bool operator()(ObjectGuid uiLeft, ObjectGuid uiRight)
+    {
+        Unit *pFirst = _map->GetUnit(uiLeft);
+        Unit *pSecond = _map->GetUnit(uiRight);
+        return pFirst && pSecond && pFirst->GetPositionX() < pSecond->GetPositionX();
+    }
+private:
+    Map *_map;
+};
+
+static const uint32 aLeftSummonedCultists[3] = { NPC_CULT_ADHERENT, NPC_CULT_FANATIC, NPC_CULT_ADHERENT };
+static const uint32 aRightSummonedCultists[3] = { NPC_CULT_FANATIC, NPC_CULT_ADHERENT, NPC_CULT_FANATIC };
+
+struct is_icecrown_citadel : public InstanceScript
+{
+    is_icecrown_citadel() : InstanceScript("instance_icecrown_citadel") {}
+
+    class instance_icecrown_citadel : public ScriptedInstance, private DialogueHelper
+    {
+    public:
+        instance_icecrown_citadel(Map* pMap) : ScriptedInstance(pMap), DialogueHelper(aCitadelDialogue),
+            m_uiTeam(0),
+            m_uiPutricideValveTimer(0),
+            m_bHasMarrowgarIntroYelled(false),
+            m_bHasDeathwhisperIntroYelled(false),
+            m_bHasRimefangLanded(false),
+            m_bHasSpinestalkerLanded(false),
+            m_uiAreaTriggerId(0)
+        {
+            m_bIsLeftSideSummon = roll_chance_i(50);
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            InitializeDialogueHelper(this);
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    return true;
+            }
+
+            return false;
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            if (!m_uiTeam)                                          // very first player to enter
+                m_uiTeam = pPlayer->GetTeam();
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_LORD_MARROWGAR:
+            case NPC_LADY_DEATHWHISPER:
+            case NPC_DEATHBRINGER_SAURFANG:
+            case NPC_FESTERGUT:
+            case NPC_ROTFACE:
+            case NPC_PROFESSOR_PUTRICIDE:
+            case NPC_TALDARAM:
+            case NPC_VALANAR:
+            case NPC_KELESETH:
+            case NPC_LANATHEL_INTRO:
+            case NPC_VALITHRIA:
+            case NPC_SINDRAGOSA:
+            case NPC_LICH_KING:
+            case NPC_TIRION:
+            case NPC_RIMEFANG:
+            case NPC_SPINESTALKER:
+            case NPC_VALITHRIA_COMBAT_TRIGGER:
+            case NPC_BLOOD_ORB_CONTROL:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_DEATHWHISPER_SPAWN_STALKER:
+                if (pCreature->GetPositionZ() > 60.0f)
+                    m_middleStalkerGuid = pCreature->GetObjectGuid();
+                else if (pCreature->GetPositionY() < 2215.0f)
+                    m_lRightStalkers.push_back(pCreature->GetObjectGuid());
+                else
+                    m_lLeftStalkers.push_back(pCreature->GetObjectGuid());
+                return;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_ICEWALL_1:
+            case GO_ICEWALL_2:
+            case GO_ORATORY_DOOR:
+                if (m_auiEncounter[TYPE_MARROWGAR] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_DEATHWHISPER_ELEVATOR:
+                // ToDo: set in motion when TYPE_LADY_DEATHWHISPER == DONE
+                break;
+            case GO_SAURFANG_DOOR:
+            case GO_SCIENTIST_DOOR:
+            case GO_CRIMSON_HALL_DOOR:
+            case GO_GREEN_DRAGON_ENTRANCE:
+                if (m_auiEncounter[TYPE_DEATHBRINGER_SAURFANG] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_ORANGE_TUBE:
+                if (m_auiEncounter[TYPE_FESTERGUT] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_GREEN_TUBE:
+                if (m_auiEncounter[TYPE_ROTFACE] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_SCIENTIST_DOOR_GREEN:
+                // If both Festergut and Rotface are DONE, set as ACTIVE_ALTERNATIVE
+                if (m_auiEncounter[TYPE_FESTERGUT] == DONE && m_auiEncounter[TYPE_ROTFACE] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
+                else if (m_auiEncounter[TYPE_ROTFACE] == DONE)
+                    pGo->SetGoState(GO_STATE_READY);
+                break;
+            case GO_SCIENTIST_DOOR_ORANGE:
+                // If both Festergut and Rotface are DONE, set as ACTIVE_ALTERNATIVE
+                if (m_auiEncounter[TYPE_FESTERGUT] == DONE && m_auiEncounter[TYPE_ROTFACE] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
+                else if (m_auiEncounter[TYPE_FESTERGUT] == DONE)
+                    pGo->SetGoState(GO_STATE_READY);
+                break;
+            case GO_SCIENTIST_DOOR_COLLISION:
+                if (m_auiEncounter[TYPE_FESTERGUT] == DONE && m_auiEncounter[TYPE_ROTFACE] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_COUNCIL_DOOR_1:
+            case GO_COUNCIL_DOOR_2:
+                if (m_auiEncounter[TYPE_BLOOD_PRINCE_COUNCIL] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_GREEN_DRAGON_EXIT:
+                if (m_auiEncounter[TYPE_VALITHRIA] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_SAURFANG_CACHE:
+            case GO_SAURFANG_CACHE_25:
+            case GO_SAURFANG_CACHE_10_H:
+            case GO_SAURFANG_CACHE_25_H:
+                m_mGoEntryGuidStore[GO_SAURFANG_CACHE] = pGo->GetObjectGuid();
+                return;
+            case GO_GUNSHIP_ARMORY_A:
+            case GO_GUNSHIP_ARMORY_A_25:
+            case GO_GUNSHIP_ARMORY_A_10H:
+            case GO_GUNSHIP_ARMORY_A_25H:
+                m_mGoEntryGuidStore[GO_GUNSHIP_ARMORY_A] = pGo->GetObjectGuid();
+                return;
+            case GO_GUNSHIP_ARMORY_H:
+            case GO_GUNSHIP_ARMORY_H_25:
+            case GO_GUNSHIP_ARMORY_H_10H:
+            case GO_GUNSHIP_ARMORY_H_25H:
+                m_mGoEntryGuidStore[GO_GUNSHIP_ARMORY_H] = pGo->GetObjectGuid();
+                return;
+            case GO_DREAMWALKER_CACHE:
+            case GO_DREAMWALKER_CACHE_25:
+            case GO_DREAMWALKER_CACHE_10_H:
+            case GO_DREAMWALKER_CACHE_25_H:
+                m_mGoEntryGuidStore[GO_DREAMWALKER_CACHE] = pGo->GetObjectGuid();
+                return;
+            case GO_ICESHARD_1:
+            case GO_ICESHARD_2:
+            case GO_ICESHARD_3:
+            case GO_ICESHARD_4:
+            case GO_FROSTY_WIND:
+            case GO_FROSTY_EDGE:
+            case GO_SNOW_EDGE:
+            case GO_ARTHAS_PLATFORM:
+            case GO_ARTHAS_PRECIPICE:
+            case GO_MARROWGAR_DOOR:
+            case GO_BLOODPRINCE_DOOR:
+            case GO_SINDRAGOSA_ENTRANCE:
+            case GO_VALITHRIA_DOOR_1:
+            case GO_VALITHRIA_DOOR_2:
+            case GO_VALITHRIA_DOOR_3:
+            case GO_VALITHRIA_DOOR_4:
+            case GO_ICECROWN_GRATE:
+            case GO_SINDRAGOSA_SHORTCUT_ENTRANCE:
+            case GO_SINDRAGOSA_SHORTCUT_EXIT:
+            case GO_ORANGE_PLAGUE:
+            case GO_GREEN_PLAGUE:
+            case GO_ORANGE_VALVE:
+            case GO_GREEN_VALVE:
+                break;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_STINKY:
+                if (Creature* pFestergut = GetSingleCreatureFromStorage(NPC_FESTERGUT))
+                {
+                    if (pFestergut->IsAlive())
+                        DoScriptText(SAY_STINKY_DIES, pFestergut);
+                }
+                break;
+            case NPC_PRECIOUS:
+                if (Creature* pRotface = GetSingleCreatureFromStorage(NPC_ROTFACE))
+                {
+                    if (pRotface->IsAlive())
+                        DoScriptText(SAY_PRECIOUS_DIES, pRotface);
+                }
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_MARROWGAR:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_MARROWGAR_DOOR);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_ICEWALL_1);
+                    DoUseDoorOrButton(GO_ICEWALL_2);
+
+                    // Note: this door use may not be correct. In theory the door should be already opened
+                    DoUseDoorOrButton(GO_ORATORY_DOOR);
+                }
+                break;
+            case TYPE_LADY_DEATHWHISPER:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_ORATORY_DOOR);
+                if (uiData == IN_PROGRESS)
+                {
+                    m_lRightStalkers.sort(sortFromNorthToSouth(instance));
+                    m_lLeftStalkers.sort(sortFromNorthToSouth(instance));
+                }
+                // ToDo: set the elevateor in motion when TYPE_LADY_DEATHWHISPER == DONE
+                break;
+            case TYPE_GUNSHIP_BATTLE:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                    DoRespawnGameObject(m_uiTeam == ALLIANCE ? GO_GUNSHIP_ARMORY_A : GO_GUNSHIP_ARMORY_H, 60 * MINUTE);
+                break;
+            case TYPE_DEATHBRINGER_SAURFANG:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_SAURFANG_DOOR);
+                    DoRespawnGameObject(GO_SAURFANG_CACHE, 60 * MINUTE);
+
+                    // Note: these doors may not be correct. In theory the doors should be already opened
+                    DoUseDoorOrButton(GO_SCIENTIST_DOOR);
+                    DoUseDoorOrButton(GO_CRIMSON_HALL_DOOR);
+                    DoUseDoorOrButton(GO_GREEN_DRAGON_ENTRANCE);
+                }
+                break;
+            case TYPE_FESTERGUT:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_ORANGE_PLAGUE);
+                if (uiData == DONE)
+                    DoToggleGameObjectFlags(GO_ORANGE_VALVE, GO_FLAG_NO_INTERACT, false);
+                break;
+            case TYPE_ROTFACE:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_GREEN_PLAGUE);
+                if (uiData == DONE)
+                    DoToggleGameObjectFlags(GO_GREEN_VALVE, GO_FLAG_NO_INTERACT, false);
+                break;
+            case TYPE_PROFESSOR_PUTRICIDE:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_SCIENTIST_DOOR);
+                break;
+            case TYPE_BLOOD_PRINCE_COUNCIL:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_CRIMSON_HALL_DOOR);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_COUNCIL_DOOR_1);
+                    DoUseDoorOrButton(GO_COUNCIL_DOOR_2);
+                }
+                break;
+            case TYPE_QUEEN_LANATHEL:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_BLOODPRINCE_DOOR);
+                if (uiData == DONE)
+                    DoUseDoorOrButton(GO_ICECROWN_GRATE);
+                break;
+            case TYPE_VALITHRIA:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_GREEN_DRAGON_ENTRANCE);
+                // Side doors
+                DoUseDoorOrButton(GO_VALITHRIA_DOOR_1);
+                DoUseDoorOrButton(GO_VALITHRIA_DOOR_2);
+                // Some doors are used only in 25 man mode
+                if (instance->GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL || instance->GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC)
+                {
+                    DoUseDoorOrButton(GO_VALITHRIA_DOOR_3);
+                    DoUseDoorOrButton(GO_VALITHRIA_DOOR_4);
+                }
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_GREEN_DRAGON_EXIT);
+                    DoUseDoorOrButton(GO_SINDRAGOSA_ENTRANCE);
+                    DoRespawnGameObject(GO_DREAMWALKER_CACHE, 60 * MINUTE);
+                }
+                break;
+            case TYPE_SINDRAGOSA:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_SINDRAGOSA_ENTRANCE);
+                break;
+            case TYPE_LICH_KING:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_DATA_AREATRIGGERS:
+                m_uiAreaTriggerId = uiData;
+                return;
+            case TYPE_DO_PREPARE_PROF_DOOR:
+                DoPreparePutricideDoor();
+                return;
+            case TYPE_DO_SUMMON_CULTIST_WAVE:
+                DoSummonCultistWave(bool(uiData));
+                return;
+            default:
+                script_error_log("Instance Icecrown Citadel: ERROR SetData = %u for type %u does not exist/not implemented.", uiType, uiData);
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6] << " " << m_auiEncounter[7] << " " << m_auiEncounter[8] << " "
+                    << m_auiEncounter[9] << " " << m_auiEncounter[10] << " " << m_auiEncounter[11];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            // Difficulty wrappers
+            switch (uiType)
+            {
+            case TYPE_DATA_IS_HEROIC:
+                return uint32(instance->GetDifficulty() == RAID_DIFFICULTY_10MAN_HEROIC || instance->GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC);
+            case TYPE_DATA_IS_25MAN:
+                return uint32(instance->GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL || instance->GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC);
+            default:
+                break;
+            }
+            return 0;
+        }
+
+        void SetData64(uint32 uiType, uint64 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_DATA_AREATRIGGERS:
+                DoHandleCitadelAreaTrigger(instance->GetPlayer(ObjectGuid(uiData)));
+                break;
+            default:
+                break;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* strIn) override
+        {
+            if (!strIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(strIn);
+
+            std::istringstream loadStream(strIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7] >> m_auiEncounter[8]
+                >> m_auiEncounter[9] >> m_auiEncounter[10] >> m_auiEncounter[11];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget = NULL, uint32 uiMiscvalue1 = 0) const override
+        {
+            // @ToDo:
+            return false;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (m_uiPutricideValveTimer)
+            {
+                if (m_uiPutricideValveTimer <= uiDiff)
+                {
+                    // Open the pathway to Putricide when the timer expires
+                    DoUseDoorOrButton(GO_SCIENTIST_DOOR_COLLISION);
+                    if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_SCIENTIST_DOOR_GREEN))
+                        pDoor->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
+                    if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_SCIENTIST_DOOR_ORANGE))
+                        pDoor->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
+
+                    m_uiPutricideValveTimer = 0;
+                }
+                else
+                    m_uiPutricideValveTimer -= uiDiff;
+            }
+        }
+
+    private:
+        // Wrapper to handle the adds summmoning by Lady Deathwhisper
+        void DoSummonCultistWave(bool isPhaseOne)
+        {
+            Creature* lady = instance->GetCreature(ObjectGuid(m_mNpcEntryGuidStore[NPC_LADY_DEATHWHISPER]));
+            if (!lady || lady->IsDead())
+                return;
+
+            // On 25 man mode we need to summon on all points
+            if (GetData(TYPE_DATA_IS_25MAN))
+            {
+                GuidList::const_iterator rcit = m_lRightStalkers.begin();
+                GuidList::const_iterator lcit = m_lLeftStalkers.begin();
+                for (uint8 i = 0; i < 3; ++i, ++rcit, ++lcit)
+                {
+                    if (Creature* pStalker = instance->GetCreature(*lcit))
+                        lady->SummonCreature(aLeftSummonedCultists[i], pStalker->GetPositionX(), pStalker->GetPositionY(), pStalker->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                    if (Creature* pStalker = instance->GetCreature(*rcit))
+                        lady->SummonCreature(aRightSummonedCultists[i], pStalker->GetPositionX(), pStalker->GetPositionY(), pStalker->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+
+                if (Creature* pStalker = instance->GetCreature(m_middleStalkerGuid))
+                    lady->SummonCreature(roll_chance_i(50) ? NPC_CULT_FANATIC : NPC_CULT_ADHERENT, pStalker->GetPositionX(), pStalker->GetPositionY(), pStalker->GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+            }
+            // On 10 man mode we summon on the left or on the right
+            else
+            {
+                // Summon just 1 add in phase 2 heroic
+                if (GetData(TYPE_DATA_IS_HEROIC) && !isPhaseOne)
+                {
+                    if (Creature* pStalker = instance->GetCreature(m_middleStalkerGuid))
+                        lady->SummonCreature(roll_chance_i(50) ? NPC_CULT_FANATIC : NPC_CULT_ADHERENT, pStalker->GetPositionX(), pStalker->GetPositionY(), pStalker->GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                }
+                else
+                {
+                    GuidList::const_iterator cit = m_bIsLeftSideSummon ? m_lLeftStalkers.begin() : m_lRightStalkers.begin();
+                    for (uint8 i = 0; i < 3; ++i, ++cit)
+                    {
+                        if (Creature* pStalker = instance->GetCreature(*cit))
+                            lady->SummonCreature(m_bIsLeftSideSummon ? aLeftSummonedCultists[i] : aRightSummonedCultists[i], pStalker->GetPositionX(), pStalker->GetPositionY(), pStalker->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                    }
+
+                    // change sides for next summoning
+                    m_bIsLeftSideSummon = !m_bIsLeftSideSummon;
+                }
+            }
+        }
+
+        // Open Putricide door in a few seconds
+        void DoPreparePutricideDoor() { m_uiPutricideValveTimer = 15000; }
+
+        void DoHandleCitadelAreaTrigger(Player* pPlayer)
+        {
+            if (m_uiAreaTriggerId == AREATRIGGER_MARROWGAR_INTRO && !m_bHasMarrowgarIntroYelled)
+            {
+                if (Creature* pMarrowgar = GetSingleCreatureFromStorage(NPC_LORD_MARROWGAR))
+                {
+                    DoScriptText(SAY_MARROWGAR_INTRO, pMarrowgar);
+                    m_bHasMarrowgarIntroYelled = true;
+                }
+            }
+            else if (m_uiAreaTriggerId == AREATRIGGER_DEATHWHISPER_INTRO && !m_bHasDeathwhisperIntroYelled)
+            {
+                StartNextDialogueText(SAY_DEATHWHISPER_SPEECH_1);
+                m_bHasDeathwhisperIntroYelled = true;
+            }
+            else if (m_uiAreaTriggerId == AREATRIGGER_SINDRAGOSA_PLATFORM)
+            {
+                if (Creature* pSindragosa = GetSingleCreatureFromStorage(NPC_SINDRAGOSA))
+                {
+                    if (pSindragosa->IsAlive() && !pSindragosa->IsInCombat())
+                        pSindragosa->SetInCombatWithZone();
+                }
+                else
+                {
+                    if (!m_bHasRimefangLanded)
+                    {
+                        if (Creature* pRimefang = GetSingleCreatureFromStorage(NPC_RIMEFANG))
+                        {
+                            pRimefang->AI()->AttackStart(pPlayer);
+                            m_bHasRimefangLanded = true;
+                        }
+                    }
+
+                    if (!m_bHasSpinestalkerLanded)
+                    {
+                        if (Creature* pSpinestalker = GetSingleCreatureFromStorage(NPC_SPINESTALKER))
+                        {
+                            pSpinestalker->AI()->AttackStart(pPlayer);
+                            m_bHasSpinestalkerLanded = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        std::string m_strInstData;
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+
+        uint32 m_uiTeam;                                    // Team of first entered player, used on the Gunship event
+        uint32 m_uiPutricideValveTimer;
+        uint32 m_uiAreaTriggerId;
+
+        bool m_bHasMarrowgarIntroYelled;
+        bool m_bHasDeathwhisperIntroYelled;
+        bool m_bHasRimefangLanded;
+        bool m_bHasSpinestalkerLanded;
+        bool m_bIsLeftSideSummon;
+
+        GuidList m_lRightStalkers;
+        GuidList m_lLeftStalkers;
+        ObjectGuid m_middleStalkerGuid;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_icecrown_citadel(pMap);
+    }
+};
+
+struct at_icecrown_citadel : public AreaTriggerScript
+{
+    at_icecrown_citadel() : AreaTriggerScript("at_icecrown_citadel") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (pAt->id == AREATRIGGER_MARROWGAR_INTRO || pAt->id == AREATRIGGER_DEATHWHISPER_INTRO ||
+            pAt->id == AREATRIGGER_SINDRAGOSA_PLATFORM)
+        {
+            if (pPlayer->isGameMaster() || pPlayer->IsDead())
+                return false;
+
+            if (InstanceData* pInstance = pPlayer->GetInstanceData())
+            {
+                pInstance->SetData(TYPE_DATA_AREATRIGGERS, pAt->id);
+                pInstance->SetData64(TYPE_DATA_AREATRIGGERS, pPlayer->GetObjectGuid().GetRawValue());
+            }
+        }
+
+        return true;
+    }
+};
+
+struct event_gameobject_citadel_valve : public MapEventScript
+{
+    event_gameobject_citadel_valve() : MapEventScript("event_gameobject_citadel_valve") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* /*pTarget*/, bool bIsStart) override
+    {
+        if (bIsStart && pSource->GetTypeId() == TYPEID_PLAYER)
+        {
+            if (InstanceData* pInstance = ((Player*)pSource)->GetInstanceData())
+            {
+                // Note: the Tubes and doors are activated by DB script
+                if (pInstance->GetData(TYPE_FESTERGUT) == DONE && pInstance->GetData(TYPE_ROTFACE) == DONE)
+                    pInstance->SetData(TYPE_DO_PREPARE_PROF_DOOR, 0);
+
+                return false;
+            }
+        }
+        return false;
+    }
+};
+
+void AddSC_instance_icecrown_citadel()
+{
+    Script* s;
+
+    s = new is_icecrown_citadel();
+    s->RegisterSelf();
+
+    s = new at_icecrown_citadel();
+    s->RegisterSelf();
+
+    s = new event_gameobject_citadel_valve();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_icecrown_citadel";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_icecrown_citadel;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_icecrown_citadel";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_icecrown_citadel;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_gameobject_citadel_valve";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_gameobject_citadel_valve;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_anubrekhan.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_anubrekhan.cpp
new file mode 100644
index 000000000..ea1b18888
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_anubrekhan.cpp
@@ -0,0 +1,245 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Anubrekhan
+SD%Complete: 95
+SDComment: Intro text usage is not very clear. Requires additional research.
+SDCategory: Naxxramas
+EndScriptData */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    SAY_GREET                   = -1533000,
+    SAY_AGGRO1                  = -1533001,
+    SAY_AGGRO2                  = -1533002,
+    SAY_AGGRO3                  = -1533003,
+    SAY_TAUNT1                  = -1533004,
+    SAY_TAUNT2                  = -1533005,
+    SAY_TAUNT3                  = -1533006,
+    SAY_TAUNT4                  = -1533007,
+    SAY_SLAY                    = -1533008,
+
+    EMOTE_CRYPT_GUARD           = -1533153,
+    EMOTE_INSECT_SWARM          = -1533154,
+    EMOTE_CORPSE_SCARABS        = -1533155,
+
+    SPELL_IMPALE                = 28783,                    // May be wrong spell id. Causes more dmg than I expect
+    SPELL_IMPALE_H              = 56090,
+    SPELL_LOCUSTSWARM           = 28785,                    // This is a self buff that triggers the dmg debuff
+    SPELL_LOCUSTSWARM_H         = 54021,
+
+    // spellId invalid
+    // SPELL_SUMMONGUARD         = 29508,                   // Summons 1 crypt guard at targeted location - spell doesn't exist in 3.x.x
+
+    SPELL_SELF_SPAWN_5          = 29105,                    // This spawns 5 corpse scarabs ontop of us (most likely the pPlayer casts this on death)
+    SPELL_SELF_SPAWN_10         = 28864,                    // This is used by the crypt guards when they die
+
+    NPC_CRYPT_GUARD             = 16573
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {SAY_GREET,   NPC_ANUB_REKHAN,  7000},
+    {SAY_TAUNT1,  NPC_ANUB_REKHAN,  13000},
+    {SAY_TAUNT2,  NPC_ANUB_REKHAN,  11000},
+    {SAY_TAUNT3,  NPC_ANUB_REKHAN,  10000},
+    {SAY_TAUNT4,  NPC_ANUB_REKHAN,  0},
+    {0, 0, 0}
+};
+
+static const float aCryptGuardLoc[4] = {3333.5f, -3475.9f, 287.1f, 3.17f};
+
+struct boss_anubrekhan : public CreatureScript
+{
+    boss_anubrekhan() : CreatureScript("boss_anubrekhan") {}
+
+    struct boss_anubrekhanAI : public ScriptedAI
+    {
+        boss_anubrekhanAI(Creature* pCreature) : ScriptedAI(pCreature),
+        m_introDialogue(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_introDialogue.InitializeDialogueHelper(m_pInstance);
+            m_bHasTaunted = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        DialogueHelper m_introDialogue;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiImpaleTimer;
+        uint32 m_uiLocustSwarmTimer;
+        uint32 m_uiSummonTimer;
+        bool   m_bHasTaunted;
+
+        void Reset() override
+        {
+            m_uiImpaleTimer = 15000;
+            m_uiLocustSwarmTimer = 90000;
+            m_uiSummonTimer = m_bIsRegularMode ? 20000 : 0;// spawn a guardian only after 20 seconds in normal mode; in heroic there are already 2 Guards spawned
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            // Force the player to spawn corpse scarabs via spell
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+                pVictim->CastSpell(pVictim, SPELL_SELF_SPAWN_5, true, NULL, NULL, m_creature->GetObjectGuid());
+
+            if (urand(0, 4))
+                return;
+
+            DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
+            }
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ANUB_REKHAN, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ANUB_REKHAN, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ANUB_REKHAN, FAIL);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasTaunted && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 110.0f) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                m_introDialogue.StartNextDialogueText(SAY_GREET);
+                m_bHasTaunted = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_CRYPT_GUARD)
+                DoScriptText(EMOTE_CRYPT_GUARD, pSummoned);
+
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                pSummoned->AI()->AttackStart(pTarget);
+        }
+
+        void SummonedCreatureDespawn(Creature* pSummoned) override
+        {
+            // If creature despawns on out of combat, skip this
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (pSummoned->GetEntry() == NPC_CRYPT_GUARD)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_SELF_SPAWN_10, true, NULL, NULL, m_creature->GetObjectGuid());
+                DoScriptText(EMOTE_CORPSE_SCARABS, pSummoned);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            m_introDialogue.DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Impale
+            if (m_uiImpaleTimer < uiDiff)
+            {
+                // Cast Impale on a random target
+                // Do NOT cast it when we are afflicted by locust swarm
+                if (!m_creature->HasAura(SPELL_LOCUSTSWARM) && !m_creature->HasAura(SPELL_LOCUSTSWARM_H))
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_IMPALE : SPELL_IMPALE_H);
+                }
+
+                m_uiImpaleTimer = 15000;
+            }
+            else
+                m_uiImpaleTimer -= uiDiff;
+
+            // Locust Swarm
+            if (m_uiLocustSwarmTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_LOCUSTSWARM : SPELL_LOCUSTSWARM_H) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_INSECT_SWARM, m_creature);
+
+                    // Summon a crypt guard
+                    m_uiSummonTimer = 3000;
+                    m_uiLocustSwarmTimer = 100000;
+                }
+            }
+            else
+                m_uiLocustSwarmTimer -= uiDiff;
+
+            // Summon
+            if (m_uiSummonTimer)
+            {
+                if (m_uiSummonTimer <= uiDiff)
+                {
+                    // Workaround for the not existing spell
+                    m_creature->SummonCreature(NPC_CRYPT_GUARD, aCryptGuardLoc[0], aCryptGuardLoc[1], aCryptGuardLoc[2], aCryptGuardLoc[3], TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                    m_uiSummonTimer = 0;
+                }
+                else
+                    m_uiSummonTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_anubrekhanAI(pCreature);
+    }
+};
+
+void AddSC_boss_anubrekhan()
+{
+    Script* s;
+
+    s = new boss_anubrekhan();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_anubrekhan";
+    //pNewScript->GetAI = &GetAI_boss_anubrekhan;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_faerlina.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_faerlina.cpp
new file mode 100644
index 000000000..aa2a34a6d
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_faerlina.cpp
@@ -0,0 +1,215 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Faerlina
+SD%Complete: 100
+SDComment:
+SDCategory: Naxxramas
+EndScriptData */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    SAY_GREET                   = -1533009,
+    SAY_AGGRO_1                 = -1533010,
+    SAY_AGGRO_2                 = -1533011,
+    SAY_AGGRO_3                 = -1533012,
+    SAY_AGGRO_4                 = -1533013,
+    SAY_SLAY_1                  = -1533014,
+    SAY_SLAY_2                  = -1533015,
+    SAY_DEATH                   = -1533016,
+
+    EMOTE_BOSS_GENERIC_FRENZY   = -1000005,
+
+    // SOUND_RANDOM_AGGRO       = 8955,                     // soundId containing the 4 aggro sounds, we not using this
+
+    SPELL_POSIONBOLT_VOLLEY     = 28796,
+    SPELL_POSIONBOLT_VOLLEY_H   = 54098,
+    SPELL_ENRAGE                = 28798,
+    SPELL_ENRAGE_H              = 54100,
+    SPELL_RAIN_OF_FIRE          = 28794,
+    SPELL_RAIN_OF_FIRE_H        = 54099,
+    SPELL_WIDOWS_EMBRACE        = 28732,
+    SPELL_WIDOWS_EMBRACE_H      = 54097,
+};
+
+struct boss_faerlina : public CreatureScript
+{
+    boss_faerlina() : CreatureScript("boss_faerlina") {}
+
+    struct boss_faerlinaAI : public ScriptedAI
+    {
+        boss_faerlinaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_bHasTaunted = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiPoisonBoltVolleyTimer;
+        uint32 m_uiRainOfFireTimer;
+        uint32 m_uiEnrageTimer;
+        bool   m_bHasTaunted;
+
+        void Reset() override
+        {
+            m_uiPoisonBoltVolleyTimer = 8000;
+            m_uiRainOfFireTimer = 16000;
+            m_uiEnrageTimer = 60000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 3))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            case 3: DoScriptText(SAY_AGGRO_4, m_creature); break;
+            }
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FAERLINA, IN_PROGRESS);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasTaunted && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 80.0f) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                DoScriptText(SAY_GREET, m_creature);
+                m_bHasTaunted = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FAERLINA, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FAERLINA, FAIL);
+        }
+
+        // Widow's Embrace prevents frenzy and poison bolt, if it removes frenzy, next frenzy is sceduled in 60s
+        // It is likely that this _should_ be handled with some dummy aura(s) - but couldn't find any
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpellEntry) override
+        {
+            // Check if we hit with Widow's Embrave
+            if (pSpellEntry->Id == SPELL_WIDOWS_EMBRACE || pSpellEntry->Id == SPELL_WIDOWS_EMBRACE_H)
+            {
+                bool bIsFrenzyRemove = false;
+
+                // If we remove the Frenzy, the Enrage Timer is reseted to 60s
+                if (m_creature->HasAura(m_bIsRegularMode ? SPELL_ENRAGE : SPELL_ENRAGE_H))
+                {
+                    m_uiEnrageTimer = 60000;
+                    m_creature->RemoveAurasDueToSpell(m_bIsRegularMode ? SPELL_ENRAGE : SPELL_ENRAGE_H);
+
+                    bIsFrenzyRemove = true;
+                }
+
+                // Achievement 'Momma said Knock you out': If we removed OR delayed the frenzy, the criteria is failed
+                if ((bIsFrenzyRemove || m_uiEnrageTimer < 30000) && m_pInstance)
+                    m_pInstance->SetData(TYPE_ACHIEV_KNOCK_YOU_OUT, uint32(false));
+
+                // In any case we prevent Frenzy and Poison Bolt Volley for Widow's Embrace Duration (30s)
+                // We do this be setting the timers to at least bigger than 30s
+                m_uiEnrageTimer = std::max(m_uiEnrageTimer, (uint32)30000);
+                m_uiPoisonBoltVolleyTimer = std::max(m_uiPoisonBoltVolleyTimer, urand(33000, 38000));
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Poison Bolt Volley
+            if (m_uiPoisonBoltVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_POSIONBOLT_VOLLEY : SPELL_POSIONBOLT_VOLLEY_H) == CAST_OK)
+                    m_uiPoisonBoltVolleyTimer = 11000;
+            }
+            else
+                m_uiPoisonBoltVolleyTimer -= uiDiff;
+
+            // Rain Of Fire
+            if (m_uiRainOfFireTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_RAIN_OF_FIRE : SPELL_RAIN_OF_FIRE_H) == CAST_OK)
+                        m_uiRainOfFireTimer = 16000;
+                }
+            }
+            else
+                m_uiRainOfFireTimer -= uiDiff;
+
+            // Enrage Timer
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ENRAGE : SPELL_ENRAGE_H) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_BOSS_GENERIC_FRENZY, m_creature);
+                    m_uiEnrageTimer = 60000;
+                }
+            }
+            else
+                m_uiEnrageTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_faerlinaAI(pCreature);
+    }
+};
+
+void AddSC_boss_faerlina()
+{
+    Script* s;
+
+    s = new boss_faerlina();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_faerlina";
+    //pNewScript->GetAI = &GetAI_boss_faerlina;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_four_horsemen.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_four_horsemen.cpp
new file mode 100644
index 000000000..69f0436c3
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_four_horsemen.cpp
@@ -0,0 +1,624 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Four_Horsemen
+SD%Complete: 90
+SDComment: Lady Blaumeux, Thane Korthazz, Sir Zeliek, Baron Rivendare; Berserk NYI.
+SDCategory: Naxxramas
+EndScriptData */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    // ***** Yells *****
+    // lady blaumeux
+    SAY_BLAU_AGGRO          = -1533044,
+    SAY_BLAU_SPECIAL        = -1533048,
+    SAY_BLAU_SLAY           = -1533049,
+    SAY_BLAU_DEATH          = -1533050,
+    EMOTE_UNYIELDING_PAIN   = -1533156,
+
+    // baron rivendare
+    SAY_RIVE_AGGRO1         = -1533065,
+    SAY_RIVE_AGGRO2         = -1533066,
+    SAY_RIVE_AGGRO3         = -1533067,
+    SAY_RIVE_SLAY1          = -1533068,
+    SAY_RIVE_SLAY2          = -1533069,
+    SAY_RIVE_SPECIAL        = -1533070,
+    SAY_RIVE_DEATH          = -1533074,
+
+    // thane korthazz
+    SAY_KORT_AGGRO          = -1533051,
+    SAY_KORT_SPECIAL        = -1533055,
+    SAY_KORT_SLAY           = -1533056,
+    SAY_KORT_DEATH          = -1533057,
+
+    // sir zeliek
+    SAY_ZELI_AGGRO          = -1533058,
+    SAY_ZELI_SPECIAL        = -1533062,
+    SAY_ZELI_SLAY           = -1533063,
+    SAY_ZELI_DEATH          = -1533064,
+    EMOTE_CONDEMATION       = -1533157,
+
+    // ***** Spells *****
+    // all horsemen
+    // SPELL_SHIELDWALL     = 29061,            // not used in 3.x.x
+    SPELL_BESERK            = 26662,
+    SPELL_ACHIEV_CHECK      = 59450,
+    // Note: Berserk should be applied once 100 marks are casted.
+
+    // lady blaumeux
+    SPELL_MARK_OF_BLAUMEUX  = 28833,
+    SPELL_VOID_ZONE         = 28863,
+    SPELL_VOID_ZONE_H       = 57463,
+    SPELL_SHADOW_BOLT       = 57374,
+    SPELL_SHADOW_BOLT_H     = 57464,
+    SPELL_UNYILDING_PAIN    = 57381,
+
+    // baron rivendare
+    SPELL_MARK_OF_RIVENDARE = 28834,
+    SPELL_UNHOLY_SHADOW     = 28882,
+    SPELL_UNHOLY_SHADOW_H   = 57369,
+
+    // thane korthazz
+    SPELL_MARK_OF_KORTHAZZ  = 28832,
+    SPELL_METEOR            = 28884,
+    SPELL_METEOR_H          = 57467,
+
+    // sir zeliek
+    SPELL_MARK_OF_ZELIEK    = 28835,
+    SPELL_HOLY_WRATH        = 28883,
+    SPELL_HOLY_WRATH_H      = 57466,
+    SPELL_HOLY_BOLT         = 57376,
+    SPELL_HOLY_BOLT_H       = 57465,
+    SPELL_CONDEMNATION      = 57377,
+
+    // horseman spirits (not used in 3.x.x)
+    // NPC_SPIRIT_OF_BLAUMEUX = 16776,
+    // NPC_SPIRIT_OF_MOGRAINE = 16775,
+    // NPC_SPIRIT_OF_KORTHAZZ = 16778,
+    // NPC_SPIRIT_OF_ZELIREK  = 16777
+};
+
+static const float aHorseMenMoveCoords[4][3] =
+{
+    {2469.4f, -2947.6f,  241.28f},         // lady blaumeux
+    {2583.9f, -2971.67f, 241.35f},         // baron rivendare
+    {2542.9f, -3015.0f,  241.35f},         // thane korthazz
+    {2517.8f, -2896.6f,  241.28f},         // sir zeliek
+};
+
+struct boss_lady_blaumeux : CreatureScript
+{
+    boss_lady_blaumeux() : CreatureScript("boss_lady_blaumeux") {}
+
+    struct boss_lady_blaumeuxAI : public ScriptedAI
+    {
+        boss_lady_blaumeuxAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bIsCornerMovement;
+        uint32 m_uiMarkTimer;
+        uint32 m_uiVoidZoneTimer;
+        uint32 m_uiShadowBoltTimer;
+
+        void Reset() override
+        {
+            m_uiMarkTimer = 20000;
+            m_uiVoidZoneTimer = 15000;
+            m_uiShadowBoltTimer = 10000;
+            m_bIsCornerMovement = true;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_BLAU_AGGRO, m_creature);
+
+            SetCombatMovement(false);
+            m_creature->SetWalk(false);
+            m_creature->GetMotionMaster()->MovePoint(1, aHorseMenMoveCoords[0][0], aHorseMenMoveCoords[0][1], aHorseMenMoveCoords[0][2]);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_BLAU_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_BLAU_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, SPECIAL);
+
+                // Cast achiev check for last boss killed
+                if (m_pInstance->GetData(TYPE_FOUR_HORSEMEN) == DONE)
+                    m_creature->CastSpell(m_creature, SPELL_ACHIEV_CHECK, true);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, FAIL);
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            // Stop moving when it reaches the corner
+            m_bIsCornerMovement = false;
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MoveIdle();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Don't attack while moving
+            if (m_bIsCornerMovement)
+                return;
+
+            if (m_uiMarkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MARK_OF_BLAUMEUX) == CAST_OK)
+                    m_uiMarkTimer = 12000;
+            }
+            else
+                m_uiMarkTimer -= uiDiff;
+
+            if (m_uiVoidZoneTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_VOID_ZONE : SPELL_VOID_ZONE_H) == CAST_OK)
+                    m_uiVoidZoneTimer = 15000;
+            }
+            else
+                m_uiVoidZoneTimer -= uiDiff;
+
+            if (m_uiShadowBoltTimer < uiDiff)
+            {
+                // If we can find a target in range of 45.0f, then cast Shadowbolt
+                if (m_creature->IsWithinDist(m_creature->getVictim(), 45.0f))
+                    DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_SHADOW_BOLT : SPELL_SHADOW_BOLT_H);
+                else
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_UNYILDING_PAIN);
+                    DoScriptText(EMOTE_UNYIELDING_PAIN, m_creature);
+                }
+                m_uiShadowBoltTimer = urand(2000, 3000);
+            }
+            else
+                m_uiShadowBoltTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_lady_blaumeuxAI(pCreature);
+    }
+};
+
+struct boss_rivendare_naxx : public CreatureScript
+{
+    boss_rivendare_naxx() : CreatureScript("boss_rivendare_naxx") {}
+
+    struct boss_rivendare_naxxAI : public ScriptedAI
+    {
+        boss_rivendare_naxxAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bIsCornerMovement;
+        uint32 m_uiMarkTimer;
+        uint32 m_uiUnholyShadowTimer;
+
+        void Reset() override
+        {
+            m_uiMarkTimer = 20000;
+            m_uiUnholyShadowTimer = 15000;
+            m_bIsCornerMovement = true;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_RIVE_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_RIVE_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_RIVE_AGGRO3, m_creature); break;
+            }
+
+            SetCombatMovement(false);
+            m_creature->SetWalk(false);
+            m_creature->GetMotionMaster()->MovePoint(1, aHorseMenMoveCoords[1][0], aHorseMenMoveCoords[1][1], aHorseMenMoveCoords[1][2]);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_RIVE_SLAY1 : SAY_RIVE_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_RIVE_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, SPECIAL);
+
+                // Cast achiev check for last boss killed
+                if (m_pInstance->GetData(TYPE_FOUR_HORSEMEN) == DONE)
+                    m_creature->CastSpell(m_creature, SPELL_ACHIEV_CHECK, true);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, FAIL);
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            // Start moving when it reaches the corner
+            SetCombatMovement(true);
+            m_bIsCornerMovement = false;
+            m_creature->GetMotionMaster()->Clear();
+            if (m_creature->getVictim())
+                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Don't attack while moving
+            if (m_bIsCornerMovement)
+                return;
+
+            if (m_uiMarkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MARK_OF_RIVENDARE) == CAST_OK)
+                    m_uiMarkTimer = 12000;
+            }
+            else
+                m_uiMarkTimer -= uiDiff;
+
+            if (m_uiUnholyShadowTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_UNHOLY_SHADOW : SPELL_UNHOLY_SHADOW_H) == CAST_OK)
+                    m_uiUnholyShadowTimer = 15000;
+            }
+            else
+                m_uiUnholyShadowTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_rivendare_naxxAI(pCreature);
+    }
+};
+
+struct boss_thane_korthazz : public CreatureScript
+{
+    boss_thane_korthazz() : CreatureScript("boss_thane_korthazz") {}
+
+    struct boss_thane_korthazzAI : public ScriptedAI
+    {
+        boss_thane_korthazzAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bIsCornerMovement;
+        uint32 m_uiMarkTimer;
+        uint32 m_uiMeteorTimer;
+
+        void Reset() override
+        {
+            m_uiMarkTimer = 20000;
+            m_uiMeteorTimer = 30000;
+            m_bIsCornerMovement = true;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_KORT_AGGRO, m_creature);
+
+            SetCombatMovement(false);
+            m_creature->SetWalk(false);
+            m_creature->GetMotionMaster()->MovePoint(1, aHorseMenMoveCoords[2][0], aHorseMenMoveCoords[2][1], aHorseMenMoveCoords[2][2]);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_KORT_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_KORT_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, SPECIAL);
+
+                // Cast achiev check for last boss killed
+                if (m_pInstance->GetData(TYPE_FOUR_HORSEMEN) == DONE)
+                    m_creature->CastSpell(m_creature, SPELL_ACHIEV_CHECK, true);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, FAIL);
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            // Start moving when it reaches the corner
+            SetCombatMovement(true);
+            m_bIsCornerMovement = false;
+            m_creature->GetMotionMaster()->Clear();
+            if (m_creature->getVictim())
+                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Don't attack while moving
+            if (m_bIsCornerMovement)
+                return;
+
+            if (m_uiMarkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MARK_OF_KORTHAZZ) == CAST_OK)
+                    m_uiMarkTimer = 12000;
+            }
+            else
+                m_uiMarkTimer -= uiDiff;
+
+            if (m_uiMeteorTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_METEOR : SPELL_METEOR_H) == CAST_OK)
+                    m_uiMeteorTimer = 20000;
+            }
+            else
+                m_uiMeteorTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_thane_korthazzAI(pCreature);
+    }
+};
+
+struct boss_sir_zeliek :CreatureScript
+{
+    boss_sir_zeliek() : CreatureScript("boss_sir_zeliek") {}
+
+    struct boss_sir_zeliekAI : public ScriptedAI
+    {
+        boss_sir_zeliekAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bIsCornerMovement;
+        uint32 m_uiMarkTimer;
+        uint32 m_uiHolyWrathTimer;
+        uint32 m_uiHolyBoltTimer;
+
+        void Reset() override
+        {
+            m_uiMarkTimer = 20000;
+            m_uiHolyWrathTimer = 12000;
+            m_uiHolyBoltTimer = 10000;
+            m_bIsCornerMovement = true;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_ZELI_AGGRO, m_creature);
+
+            SetCombatMovement(false);
+            m_creature->SetWalk(false);
+            m_creature->GetMotionMaster()->MovePoint(1, aHorseMenMoveCoords[3][0], aHorseMenMoveCoords[3][1], aHorseMenMoveCoords[3][2]);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_ZELI_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_ZELI_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, SPECIAL);
+
+                // Cast achiev check for last boss killed
+                if (m_pInstance->GetData(TYPE_FOUR_HORSEMEN) == DONE)
+                    m_creature->CastSpell(m_creature, SPELL_ACHIEV_CHECK, true);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FOUR_HORSEMEN, FAIL);
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            // Stop moving when it reaches the corner
+            m_bIsCornerMovement = false;
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MoveIdle();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Don't attack while moving
+            if (m_bIsCornerMovement)
+                return;
+
+            if (m_uiMarkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MARK_OF_ZELIEK) == CAST_OK)
+                    m_uiMarkTimer = 12000;
+            }
+            else
+                m_uiMarkTimer -= uiDiff;
+
+            if (m_uiHolyWrathTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_HOLY_WRATH) == CAST_OK)
+                        m_uiHolyWrathTimer = 15000;
+                }
+            }
+            else
+                m_uiHolyWrathTimer -= uiDiff;
+
+            if (m_uiHolyBoltTimer < uiDiff)
+            {
+                // If we can find a target in range of 45.0f, then cast Holy Bolt
+                if (m_creature->IsWithinDist(m_creature->getVictim(), 45.0f))
+                    DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_HOLY_BOLT : SPELL_HOLY_BOLT_H);
+                else
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_CONDEMNATION);
+                    DoScriptText(EMOTE_CONDEMATION, m_creature);
+                }
+                m_uiHolyBoltTimer = urand(2000, 3000);
+            }
+            else
+                m_uiHolyBoltTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_sir_zeliekAI(pCreature);
+    }
+};
+
+void AddSC_boss_four_horsemen()
+{
+    Script* s;
+
+    s = new boss_lady_blaumeux();
+    s->RegisterSelf();
+    s = new boss_rivendare_naxx();
+    s->RegisterSelf();
+    s = new boss_thane_korthazz();
+    s->RegisterSelf();
+    s = new boss_sir_zeliek();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_lady_blaumeux";
+    //pNewScript->GetAI = &GetAI_boss_lady_blaumeux;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_rivendare_naxx";
+    //pNewScript->GetAI = &GetAI_boss_rivendare_naxx;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_thane_korthazz";
+    //pNewScript->GetAI = &GetAI_boss_thane_korthazz;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_sir_zeliek";
+    //pNewScript->GetAI = &GetAI_boss_sir_zeliek;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_gluth.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_gluth.cpp
new file mode 100644
index 000000000..debab90fc
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_gluth.cpp
@@ -0,0 +1,255 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Gluth
+SD%Complete: 95
+SDComment: Gluth should turn around to face the victim when he devours a Zombie
+SDCategory: Naxxramas
+EndScriptData */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    EMOTE_ZOMBIE                    = -1533119,
+    EMOTE_BOSS_GENERIC_ENRAGED      = -1000006,
+    EMOTE_DECIMATE                  = -1533152,
+
+    SPELL_MORTALWOUND               = 54378,                // old vanilla spell was 25646,
+    SPELL_DECIMATE                  = 28374,
+    SPELL_DECIMATE_H                = 54426,
+    SPELL_ENRAGE                    = 28371,
+    SPELL_ENRAGE_H                  = 54427,
+    SPELL_BERSERK                   = 26662,
+    // SPELL_TERRIFYING_ROAR         = 29685,               // no longer used in 3.x.x
+    // SPELL_SUMMON_ZOMBIE_CHOW      = 28216,               // removed from dbc: triggers 28217 every 6 secs
+    // SPELL_CALL_ALL_ZOMBIE_CHOW    = 29681,               // removed from dbc: triggers 29682
+    // SPELL_ZOMBIE_CHOW_SEARCH      = 28235,               // removed from dbc: triggers 28236 every 3 secs
+
+    NPC_ZOMBIE_CHOW                 = 16360,                // old vanilla summoning spell 28217
+
+    MAX_ZOMBIE_LOCATIONS            = 3,
+};
+
+static const float aZombieSummonLoc[MAX_ZOMBIE_LOCATIONS][3] =
+{
+    {3267.9f, -3172.1f, 297.42f},
+    {3253.2f, -3132.3f, 297.42f},
+    {3308.3f, -3185.8f, 297.42f},
+};
+
+struct boss_gluth : public CreatureScript
+{
+    boss_gluth() : CreatureScript("boss_gluth") {}
+
+    struct boss_gluthAI : public ScriptedAI
+    {
+        boss_gluthAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiMortalWoundTimer;
+        uint32 m_uiDecimateTimer;
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiSummonTimer;
+        uint32 m_uiZombieSearchTimer;
+
+        uint32 m_uiBerserkTimer;
+
+        GuidList m_lZombieChowGuidList;
+
+        void Reset() override
+        {
+            m_uiMortalWoundTimer = 10000;
+            m_uiDecimateTimer = 110000;
+            m_uiEnrageTimer = 25000;
+            m_uiSummonTimer = 15000;
+            m_uiZombieSearchTimer = 3000;
+
+            m_uiBerserkTimer = MINUTE * 8 * IN_MILLISECONDS;
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GLUTH, DONE);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GLUTH, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            // Restore 5% hp when killing a zombie
+            if (pVictim->GetEntry() == NPC_ZOMBIE_CHOW)
+            {
+                DoScriptText(EMOTE_ZOMBIE, m_creature);
+                m_creature->SetHealth(m_creature->GetHealth() + m_creature->GetMaxHealth() * 0.05f);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GLUTH, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->GetMotionMaster()->MoveFollow(m_creature, ATTACK_DISTANCE, 0);
+            m_lZombieChowGuidList.push_back(pSummoned->GetObjectGuid());
+        }
+
+        void SummonedCreatureDespawn(Creature* pSummoned) override
+        {
+            m_lZombieChowGuidList.remove(pSummoned->GetObjectGuid());
+        }
+
+        // Replaces missing spell 29682
+        void DoCallAllZombieChow()
+        {
+            for (GuidList::const_iterator itr = m_lZombieChowGuidList.begin(); itr != m_lZombieChowGuidList.end(); ++itr)
+            {
+                if (Creature* pZombie = m_creature->GetMap()->GetCreature(*itr))
+                    pZombie->GetMotionMaster()->MoveFollow(m_creature, ATTACK_DISTANCE, 0);
+            }
+        }
+
+        // Replaces missing spell 28236
+        void DoSearchZombieChow()
+        {
+            for (GuidList::const_iterator itr = m_lZombieChowGuidList.begin(); itr != m_lZombieChowGuidList.end(); ++itr)
+            {
+                if (Creature* pZombie = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    if (!pZombie->IsAlive())
+                        continue;
+
+                    // Devour a Zombie
+                    if (pZombie->IsWithinDistInMap(m_creature, 15.0f))
+                        m_creature->DealDamage(pZombie, pZombie->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiZombieSearchTimer < uiDiff)
+            {
+                DoSearchZombieChow();
+                m_uiZombieSearchTimer = 3000;
+            }
+            else
+                m_uiZombieSearchTimer -= uiDiff;
+
+            // Mortal Wound
+            if (m_uiMortalWoundTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MORTALWOUND) == CAST_OK)
+                    m_uiMortalWoundTimer = 10000;
+            }
+            else
+                m_uiMortalWoundTimer -= uiDiff;
+
+            // Decimate
+            if (m_uiDecimateTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_DECIMATE : SPELL_DECIMATE_H) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_DECIMATE, m_creature);
+                    DoCallAllZombieChow();
+                    m_uiDecimateTimer = 100000;
+                }
+            }
+            else
+                m_uiDecimateTimer -= uiDiff;
+
+            // Enrage
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ENRAGE : SPELL_ENRAGE_H) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_BOSS_GENERIC_ENRAGED, m_creature);
+                    m_uiEnrageTimer = urand(20000, 30000);
+                }
+            }
+            else
+                m_uiEnrageTimer -= uiDiff;
+
+            // Summon
+            if (m_uiSummonTimer < uiDiff)
+            {
+                uint8 uiPos1 = urand(0, MAX_ZOMBIE_LOCATIONS - 1);
+                m_creature->SummonCreature(NPC_ZOMBIE_CHOW, aZombieSummonLoc[uiPos1][0], aZombieSummonLoc[uiPos1][1], aZombieSummonLoc[uiPos1][2], 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                if (!m_bIsRegularMode)
+                {
+                    uint8 uiPos2 = (uiPos1 + urand(1, MAX_ZOMBIE_LOCATIONS - 1)) % MAX_ZOMBIE_LOCATIONS;
+                    m_creature->SummonCreature(NPC_ZOMBIE_CHOW, aZombieSummonLoc[uiPos2][0], aZombieSummonLoc[uiPos2][1], aZombieSummonLoc[uiPos2][2], 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+
+                m_uiSummonTimer = 10000;
+            }
+            else
+                m_uiSummonTimer -= uiDiff;
+
+            // Berserk
+            if (m_uiBerserkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    m_uiBerserkTimer = MINUTE * 5 * IN_MILLISECONDS;
+            }
+            else
+                m_uiBerserkTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_gluthAI(pCreature);
+    }
+};
+
+void AddSC_boss_gluth()
+{
+    Script* s;
+
+    s = new boss_gluth();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_gluth";
+    //pNewScript->GetAI = &GetAI_boss_gluth;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_gothik.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_gothik.cpp
new file mode 100644
index 000000000..dfd5a9d54
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_gothik.cpp
@@ -0,0 +1,530 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Gothik
+SD%Complete: 95
+SDComment: Prevent Gothik from turning and "in combat state" while on balcony
+SDCategory: Naxxramas
+EndScriptData */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    SAY_SPEECH_1                = -1533040,
+    SAY_SPEECH_2                = -1533140,
+    SAY_SPEECH_3                = -1533141,
+    SAY_SPEECH_4                = -1533142,
+
+    SAY_KILL                    = -1533041,
+    SAY_DEATH                   = -1533042,
+    SAY_TELEPORT                = -1533043,
+
+    EMOTE_TO_FRAY               = -1533138,
+    EMOTE_GATE                  = -1533139,
+
+    PHASE_SPEECH                = 0,
+    PHASE_BALCONY               = 1,
+    PHASE_STOP_SUMMONING        = 2,
+    PHASE_TELEPORTING           = 3,
+    PHASE_STOP_TELEPORTING      = 4,
+
+    // Right is right side from gothik (eastern)
+    SPELL_TELEPORT_RIGHT        = 28025,
+    SPELL_TELEPORT_LEFT         = 28026,
+
+    SPELL_HARVESTSOUL           = 28679,
+    SPELL_SHADOWBOLT            = 29317,
+    SPELL_SHADOWBOLT_H          = 56405,
+};
+
+enum eSpellDummy
+{
+    SPELL_A_TO_ANCHOR_1     = 27892,
+    SPELL_B_TO_ANCHOR_1     = 27928,
+    SPELL_C_TO_ANCHOR_1     = 27935,
+
+    SPELL_A_TO_ANCHOR_2     = 27893,
+    SPELL_B_TO_ANCHOR_2     = 27929,
+    SPELL_C_TO_ANCHOR_2     = 27936,
+
+    SPELL_A_TO_SKULL        = 27915,
+    SPELL_B_TO_SKULL        = 27931,
+    SPELL_C_TO_SKULL        = 27937
+};
+
+struct boss_gothik : public CreatureScript
+{
+    boss_gothik() : CreatureScript("boss_gothik") {}
+
+    struct boss_gothikAI : public ScriptedAI
+    {
+        boss_gothikAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            SetCombatMovement(false);
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        GuidList m_lSummonedAddGuids;
+
+        uint8 m_uiPhase;
+        uint8 m_uiSpeech;
+
+        uint32 m_uiTraineeTimer;
+        uint32 m_uiDeathKnightTimer;
+        uint32 m_uiRiderTimer;
+        uint32 m_uiTeleportTimer;
+        uint32 m_uiShadowboltTimer;
+        uint32 m_uiHarvestSoulTimer;
+        uint32 m_uiPhaseTimer;
+        uint32 m_uiControlZoneTimer;
+        uint32 m_uiSpeechTimer;
+
+        void Reset() override
+        {
+            // Remove immunity
+            m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ALL, false);
+
+            m_uiPhase = PHASE_SPEECH;
+            m_uiSpeech = 1;
+
+            m_uiTraineeTimer = 24 * IN_MILLISECONDS;
+            m_uiDeathKnightTimer = 74 * IN_MILLISECONDS;
+            m_uiRiderTimer = 134 * IN_MILLISECONDS;
+            m_uiTeleportTimer = 20 * IN_MILLISECONDS;
+            m_uiShadowboltTimer = 2 * IN_MILLISECONDS;
+            m_uiHarvestSoulTimer = 2500;
+            m_uiPhaseTimer = 4 * MINUTE * IN_MILLISECONDS + 7 * IN_MILLISECONDS; // last summon at 4:04, next would be 4:09
+            m_uiControlZoneTimer = urand(120 * IN_MILLISECONDS, 150 * IN_MILLISECONDS);
+            m_uiSpeechTimer = 1 * IN_MILLISECONDS;
+
+            // Despawn Adds
+            for (GuidList::const_iterator itr = m_lSummonedAddGuids.begin(); itr != m_lSummonedAddGuids.end(); itr++)
+            {
+                if (Creature* pCreature = m_creature->GetMap()->GetCreature(*itr))
+                    pCreature->ForcedDespawn();
+            }
+
+            m_lSummonedAddGuids.clear();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (!m_pInstance)
+                return;
+
+            m_pInstance->SetData(TYPE_GOTHIK, IN_PROGRESS); //here the triggers also are setted up
+
+            // Make immune
+            m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ALL, true);
+        }
+
+        bool IsCentralDoorClosed()
+        {
+            return m_pInstance && m_pInstance->GetData(TYPE_GOTHIK) != SPECIAL;
+        }
+
+        void ProcessCentralDoor()
+        {
+            if (IsCentralDoorClosed())
+            {
+                m_pInstance->SetData(TYPE_GOTHIK, SPECIAL);
+                DoScriptText(EMOTE_GATE, m_creature);
+            }
+        }
+
+        bool HasPlayersInLeftSide()
+        {
+            Map::PlayerList const& lPlayers = m_pInstance->instance->GetPlayers();
+
+            if (lPlayers.isEmpty())
+                return false;
+
+            for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
+            {
+                if (Player* pPlayer = itr->getSource())
+                {
+                    if (!IsInRightSideGothArea(pPlayer) && pPlayer->IsAlive())
+                        return true;
+                }
+            }
+
+            return false;
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+                DoScriptText(SAY_KILL, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GOTHIK, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GOTHIK, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            m_lSummonedAddGuids.push_back(pSummoned->GetObjectGuid());
+            if (!IsCentralDoorClosed())
+                pSummoned->SetInCombatWithZone();
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            m_lSummonedAddGuids.remove(pSummoned->GetObjectGuid());
+
+            if (!m_pInstance)
+                return;
+
+            m_pInstance->SetData64(DATA64_GOTH_RIGHT_ANCHOR, pSummoned->GetObjectGuid().GetRawValue());
+            if (Creature* pAnchor = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_GOTH_RIGHT_ANCHOR))))
+            {
+                switch (pSummoned->GetEntry())
+                {
+                    // Wrong caster, it expected to be pSummoned.
+                    // Mangos deletes the spell event at caster death, so for delayed spell like this
+                    // it's just a workaround. Does not affect other than the visual though (+ spell takes longer to "travel")
+                case NPC_UNREL_TRAINEE:         m_creature->CastSpell(pAnchor, SPELL_A_TO_ANCHOR_1, true, NULL, NULL, pSummoned->GetObjectGuid()); break;
+                case NPC_UNREL_DEATH_KNIGHT:    m_creature->CastSpell(pAnchor, SPELL_B_TO_ANCHOR_1, true, NULL, NULL, pSummoned->GetObjectGuid()); break;
+                case NPC_UNREL_RIDER:           m_creature->CastSpell(pAnchor, SPELL_C_TO_ANCHOR_1, true, NULL, NULL, pSummoned->GetObjectGuid()); break;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            switch (m_uiPhase)
+            {
+            case PHASE_SPEECH:
+                if (m_uiSpeechTimer < uiDiff)
+                {
+                    switch (m_uiSpeech)
+                    {
+                    case 1: DoScriptText(SAY_SPEECH_1, m_creature); m_uiSpeechTimer = 4 * IN_MILLISECONDS; break;
+                    case 2: DoScriptText(SAY_SPEECH_2, m_creature); m_uiSpeechTimer = 6 * IN_MILLISECONDS; break;
+                    case 3: DoScriptText(SAY_SPEECH_3, m_creature); m_uiSpeechTimer = 5 * IN_MILLISECONDS; break;
+                    case 4: DoScriptText(SAY_SPEECH_4, m_creature); m_uiPhase = PHASE_BALCONY; break;
+                    }
+                    m_uiSpeech++;
+                }
+                else
+                    m_uiSpeechTimer -= uiDiff;
+
+                // No break here
+
+            case PHASE_BALCONY:                            // Do summoning
+                if (m_uiTraineeTimer < uiDiff)
+                {
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_GOTH_SUMMON, NPC_UNREL_TRAINEE);
+                    m_uiTraineeTimer = 20 * IN_MILLISECONDS;
+                }
+                else
+                    m_uiTraineeTimer -= uiDiff;
+                if (m_uiDeathKnightTimer < uiDiff)
+                {
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_GOTH_SUMMON, NPC_UNREL_DEATH_KNIGHT);
+                    m_uiDeathKnightTimer = 25 * IN_MILLISECONDS;
+                }
+                else
+                    m_uiDeathKnightTimer -= uiDiff;
+                if (m_uiRiderTimer < uiDiff)
+                {
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_GOTH_SUMMON, NPC_UNREL_RIDER);
+                    m_uiRiderTimer = 30 * IN_MILLISECONDS;
+                }
+                else
+                    m_uiRiderTimer -= uiDiff;
+
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    m_uiPhase = PHASE_STOP_SUMMONING;
+                    m_uiPhaseTimer = 27 * IN_MILLISECONDS;
+                }
+                else
+                    m_uiPhaseTimer -= uiDiff;
+
+                break;
+
+            case PHASE_STOP_SUMMONING:
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT_RIGHT, CAST_TRIGGERED) == CAST_OK)
+                    {
+                        m_uiPhase = m_pInstance ? PHASE_TELEPORTING : PHASE_STOP_TELEPORTING;
+
+                        DoScriptText(SAY_TELEPORT, m_creature);
+                        DoScriptText(EMOTE_TO_FRAY, m_creature);
+
+                        // Remove Immunity
+                        m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ALL, false);
+
+                        DoResetThreat();
+                        m_creature->SetInCombatWithZone();
+                    }
+                }
+                else
+                    m_uiPhaseTimer -= uiDiff;
+
+                break;
+
+            case PHASE_TELEPORTING:                         // Phase is only reached if m_pInstance is valid
+                if (m_uiTeleportTimer < uiDiff)
+                {
+                    uint32 uiTeleportSpell = IsInRightSideGothArea(m_creature) ? SPELL_TELEPORT_LEFT : SPELL_TELEPORT_RIGHT;
+                    if (DoCastSpellIfCan(m_creature, uiTeleportSpell) == CAST_OK)
+                    {
+                        m_uiTeleportTimer = 20 * IN_MILLISECONDS;
+                        m_uiShadowboltTimer = 2 * IN_MILLISECONDS;
+                    }
+                }
+                else
+                    m_uiTeleportTimer -= uiDiff;
+
+                if (m_creature->GetHealthPercent() <= 30.0f)
+                {
+                    m_uiPhase = PHASE_STOP_TELEPORTING;
+                    ProcessCentralDoor();
+                    // as the doors now open, recheck whether mobs are standing around
+                    m_uiControlZoneTimer = 1;
+                }
+                // no break here
+
+            case PHASE_STOP_TELEPORTING:
+                if (m_uiHarvestSoulTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_HARVESTSOUL) == CAST_OK)
+                        m_uiHarvestSoulTimer = 15 * IN_MILLISECONDS;
+                }
+                else
+                    m_uiHarvestSoulTimer -= uiDiff;
+
+                if (m_uiShadowboltTimer)
+                {
+                    if (m_uiShadowboltTimer <= uiDiff)
+                        m_uiShadowboltTimer = 0;
+                    else
+                        m_uiShadowboltTimer -= uiDiff;
+                }
+                // Shadowbold cooldown finished, cast when ready
+                else if (!m_creature->IsNonMeleeSpellCasted(true))
+                {
+                    // Select valid target
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0, SPELL_SHADOWBOLT, SELECT_FLAG_IN_LOS))
+                        DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_SHADOWBOLT : SPELL_SHADOWBOLT_H);
+                }
+
+                break;
+            }
+
+            // Control Check, if Death zone empty
+            if (m_uiControlZoneTimer)
+            {
+                if (m_uiControlZoneTimer <= uiDiff)
+                {
+                    m_uiControlZoneTimer = 0;
+
+                    if (m_pInstance && !HasPlayersInLeftSide())
+                    {
+                        ProcessCentralDoor();
+                        for (GuidList::const_iterator itr = m_lSummonedAddGuids.begin(); itr != m_lSummonedAddGuids.end(); itr++)
+                        {
+                            if (Creature* pCreature = m_pInstance->instance->GetCreature(*itr))
+                            {
+                                if (!pCreature->IsInCombat())
+                                    pCreature->SetInCombatWithZone();
+                            }
+                        }
+                    }
+                }
+                else
+                    m_uiControlZoneTimer -= uiDiff;
+            }
+        }
+        private:
+        // Right is right side from gothik (eastern)
+        bool IsInRightSideGothArea(Unit* pUnit)
+        {
+            if (m_pInstance)
+                if (GameObject* pCombatGate = m_pInstance->GetSingleGameObjectFromStorage(GO_MILI_GOTH_COMBAT_GATE))
+                    return (pCombatGate->GetPositionY() >= pUnit->GetPositionY());
+
+            script_error_log("left/right side check, Gothik combat area failed.");
+            return true;
+        }
+
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_gothikAI(pCreature);
+    }
+};
+
+struct spell_x_to_anchor1 : public SpellScript
+{
+    spell_x_to_anchor1() : SpellScript("spell_x_to_anchor1") {}
+        //case SPELL_A_TO_ANCHOR_1:                           // trigger mobs at high right side
+        //case SPELL_B_TO_ANCHOR_1:
+        //case SPELL_C_TO_ANCHOR_1:
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        Creature* pCreatureTarget = pTarget->ToCreature();
+        if (uiEffIndex != EFFECT_INDEX_0 || pCreatureTarget->GetEntry() != NPC_SUB_BOSS_TRIGGER)
+            return true;
+
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreatureTarget->GetInstanceData();
+
+        if (!pInstance)
+            return true;
+
+        pInstance->SetData64(DATA64_GOTH_LEFT_ANCHOR, pCreatureTarget->GetObjectGuid().GetRawValue());
+        if (Creature* pAnchor2 = pCreatureTarget->GetMap()->GetCreature(ObjectGuid(pInstance->GetData64(DATA64_GOTH_LEFT_ANCHOR))))
+        {
+            uint32 uiTriggered = SPELL_A_TO_ANCHOR_2;
+
+            if (uiSpellId == SPELL_B_TO_ANCHOR_1)
+                uiTriggered = SPELL_B_TO_ANCHOR_2;
+            else if (uiSpellId == SPELL_C_TO_ANCHOR_1)
+                uiTriggered = SPELL_C_TO_ANCHOR_2;
+
+            pCreatureTarget->CastSpell(pAnchor2, uiTriggered, true);
+        }
+
+        return true;
+    }
+};
+
+struct spell_x_to_anchor2 : public SpellScript
+{
+    spell_x_to_anchor2() : SpellScript("spell_x_to_anchor2") {}
+
+        //case SPELL_A_TO_ANCHOR_2:                           // trigger mobs at high left side
+        //case SPELL_B_TO_ANCHOR_2:
+        //case SPELL_C_TO_ANCHOR_2:
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        Creature* pCreatureTarget = pTarget->ToCreature();
+        if (uiEffIndex != EFFECT_INDEX_0 || pCreatureTarget->GetEntry() != NPC_SUB_BOSS_TRIGGER)
+            return true;
+
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreatureTarget->GetInstanceData();
+
+        if (!pInstance)
+            return true;
+
+        if (Creature* ptarget = pCreatureTarget->GetMap()->GetCreature(ObjectGuid(pInstance->GetData64(DATA64_GOTH_RANDOM_LEFT))))
+        {
+            uint32 uiTriggered = SPELL_A_TO_SKULL;
+
+            if (uiSpellId == SPELL_B_TO_ANCHOR_2)
+                uiTriggered = SPELL_B_TO_SKULL;
+            else if (uiSpellId == SPELL_C_TO_ANCHOR_2)
+                uiTriggered = SPELL_C_TO_SKULL;
+
+            pCreatureTarget->CastSpell(ptarget, uiTriggered, true);
+        }
+        return true;
+    }
+};
+
+struct spell_x_to_skull : public SpellScript
+{
+    spell_x_to_skull() : SpellScript("spell_x_to_skull") {}
+
+        //case SPELL_A_TO_SKULL:                              // final destination trigger mob
+        //case SPELL_B_TO_SKULL:
+        //case SPELL_C_TO_SKULL:
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        Creature* pCreatureTarget = pTarget->ToCreature();
+        if (uiEffIndex != EFFECT_INDEX_0 || pCreatureTarget->GetEntry() != NPC_SUB_BOSS_TRIGGER)
+            return true;
+
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreatureTarget->GetInstanceData();
+
+        if (!pInstance)
+            return true;
+
+        if (Creature* pGoth = pInstance->GetSingleCreatureFromStorage(NPC_GOTHIK))
+        {
+            uint32 uiNpcEntry = NPC_SPECT_TRAINEE;
+
+            if (uiSpellId == SPELL_B_TO_SKULL)
+                uiNpcEntry = NPC_SPECT_DEATH_KNIGHT;
+            else if (uiSpellId == SPELL_C_TO_SKULL)
+                uiNpcEntry = NPC_SPECT_RIDER;
+
+            pGoth->SummonCreature(uiNpcEntry, pCreatureTarget->GetPositionX(), pCreatureTarget->GetPositionY(), pCreatureTarget->GetPositionZ(), pCreatureTarget->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 0);
+
+            if (uiNpcEntry == NPC_SPECT_RIDER)
+                pGoth->SummonCreature(NPC_SPECT_HORSE, pCreatureTarget->GetPositionX(), pCreatureTarget->GetPositionY(), pCreatureTarget->GetPositionZ(), pCreatureTarget->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+        return true;
+    }
+};
+
+void AddSC_boss_gothik()
+{
+    Script* s;
+
+    s = new boss_gothik();
+    s->RegisterSelf();
+
+    s = new spell_x_to_anchor1();
+    s->RegisterSelf();
+    s = new spell_x_to_anchor2();
+    s->RegisterSelf();
+    s = new spell_x_to_skull();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_gothik";
+    //pNewScript->GetAI = &GetAI_boss_gothik;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "spell_anchor";
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_anchor;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_grobbulus.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_grobbulus.cpp
new file mode 100644
index 000000000..f66c3bd79
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_grobbulus.cpp
@@ -0,0 +1,230 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Grobbulus
+SD%Complete: 80
+SDComment: Timer need more care; Spells of Adds (Posion Cloud) need Mangos Fixes, and further handling
+SDCategory: Naxxramas
+EndScriptData */
+
+/*Poison Cloud 26590
+Slime Spray 28157
+Fallout slime 28218
+Mutating Injection 28169
+Enrages 26527*/
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    EMOTE_SPRAY_SLIME               = -1533021,
+    EMOTE_INJECTION                 = -1533158,
+
+    SPELL_SLIME_STREAM              = 28137,
+    SPELL_MUTATING_INJECTION        = 28169,
+    SPELL_POISON_CLOUD              = 28240,
+    SPELL_SLIME_SPRAY               = 28157,
+    SPELL_SLIME_SPRAY_H             = 54364,
+    SPELL_BERSERK                   = 26662,
+
+    NPC_FALLOUT_SLIME               = 16290
+};
+
+struct boss_grobbulus : public CreatureScript
+{
+    boss_grobbulus() : CreatureScript("boss_grobbulus") {}
+
+    struct boss_grobbulusAI : public ScriptedAI
+    {
+        boss_grobbulusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiInjectionTimer;
+        uint32 m_uiPoisonCloudTimer;
+        uint32 m_uiSlimeSprayTimer;
+        uint32 m_uiBerserkTimeSecs;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiSlimeStreamTimer;
+
+        void Reset() override
+        {
+            m_uiInjectionTimer = 12 * IN_MILLISECONDS;
+            m_uiPoisonCloudTimer = urand(20 * IN_MILLISECONDS, 25 * IN_MILLISECONDS);
+            m_uiSlimeSprayTimer = urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS);
+            m_uiBerserkTimeSecs = m_bIsRegularMode ? 12 * MINUTE : 9 * MINUTE;
+            m_uiBerserkTimer = m_uiBerserkTimeSecs * IN_MILLISECONDS;
+            m_uiSlimeStreamTimer = 5 * IN_MILLISECONDS;         // The first few secs it is ok to be out of range
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GROBBULUS, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GROBBULUS, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GROBBULUS, FAIL);
+        }
+
+        // This custom selecting function, because we only want to select players without mutagen aura
+        bool DoCastMutagenInjection()
+        {
+            if (m_creature->IsNonMeleeSpellCasted(true))
+                return false;
+
+            std::vector<Unit*> suitableTargets;
+            ThreatList const& threatList = m_creature->GetThreatManager().getThreatList();
+
+            for (ThreatList::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
+            {
+                if (Unit* pTarget = m_creature->GetMap()->GetUnit((*itr)->getUnitGuid()))
+                {
+                    if (pTarget->GetTypeId() == TYPEID_PLAYER && !pTarget->HasAura(SPELL_MUTATING_INJECTION))
+                        suitableTargets.push_back(pTarget);
+                }
+            }
+
+            if (suitableTargets.empty())
+                return false;
+
+            Unit* pTarget = suitableTargets[urand(0, suitableTargets.size() - 1)];
+            if (DoCastSpellIfCan(pTarget, SPELL_MUTATING_INJECTION) == CAST_OK)
+            {
+                DoScriptText(EMOTE_INJECTION, m_creature, pTarget);
+                return true;
+            }
+            else
+                return false;
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            if ((pSpell->Id == SPELL_SLIME_SPRAY || pSpell->Id == SPELL_SLIME_SPRAY_H) && pTarget->GetTypeId() == TYPEID_PLAYER)
+                m_creature->SummonCreature(NPC_FALLOUT_SLIME, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 10 * IN_MILLISECONDS);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Slime Stream
+            if (!m_uiSlimeStreamTimer)
+            {
+                if (!m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SLIME_STREAM) == CAST_OK)
+                        // Give some time, to re-reach grobbulus
+                        m_uiSlimeStreamTimer = 3 * IN_MILLISECONDS;
+                }
+            }
+            else
+            {
+                if (m_uiSlimeStreamTimer < uiDiff)
+                    m_uiSlimeStreamTimer = 0;
+                else
+                    m_uiSlimeStreamTimer -= uiDiff;
+            }
+
+            // Berserk
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                        m_uiBerserkTimer = 0;
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            // SlimeSpray
+            if (m_uiSlimeSprayTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_SLIME_SPRAY : SPELL_SLIME_SPRAY_H) == CAST_OK)
+                {
+                    m_uiSlimeSprayTimer = urand(30 * IN_MILLISECONDS, 60 * IN_MILLISECONDS);
+                    DoScriptText(EMOTE_SPRAY_SLIME, m_creature);
+                }
+            }
+            else
+                m_uiSlimeSprayTimer -= uiDiff;
+
+            // Mutagen Injection
+            if (m_uiInjectionTimer < uiDiff)
+            {
+                if (DoCastMutagenInjection())
+                {
+                    // Timer dependend on time of encounter  - on enrage time between 5-8s, heroic 2-5s (TODO no reliable source for heroic)
+                    if (m_bIsRegularMode)
+                        m_uiInjectionTimer = urand(10 * IN_MILLISECONDS, 13 * IN_MILLISECONDS) - 5 * (m_uiBerserkTimeSecs * IN_MILLISECONDS - m_uiBerserkTimer) / m_uiBerserkTimeSecs;
+                    else
+                        m_uiInjectionTimer = urand(10 * IN_MILLISECONDS, 13 * IN_MILLISECONDS) - 8 * (m_uiBerserkTimeSecs * IN_MILLISECONDS - m_uiBerserkTimer) / m_uiBerserkTimeSecs;
+                }
+            }
+            else
+                m_uiInjectionTimer -= uiDiff;
+
+            // Poison Cloud
+            if (m_uiPoisonCloudTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_POISON_CLOUD) == CAST_OK)
+                    m_uiPoisonCloudTimer = 15 * IN_MILLISECONDS;
+            }
+            else
+                m_uiPoisonCloudTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_grobbulusAI(pCreature);
+    }
+};
+
+void AddSC_boss_grobbulus()
+{
+    Script* s;
+
+    s = new boss_grobbulus();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_grobbulus";
+    //pNewScript->GetAI = &GetAI_boss_grobbulus;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_heigan.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_heigan.cpp
new file mode 100644
index 000000000..8e982331d
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_heigan.cpp
@@ -0,0 +1,257 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Heigan
+SD%Complete: 65
+SDComment: Missing traps dance
+SDCategory: Naxxramas
+EndScriptData */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    PHASE_GROUND            = 1,
+    PHASE_PLATFORM          = 2,
+
+    SAY_AGGRO1              = -1533109,
+    SAY_AGGRO2              = -1533110,
+    SAY_AGGRO3              = -1533111,
+    SAY_SLAY                = -1533112,
+    SAY_TAUNT1              = -1533113,
+    SAY_TAUNT2              = -1533114,
+    SAY_TAUNT3              = -1533115,
+    SAY_TAUNT4              = -1533117,
+    SAY_CHANNELING          = -1533116,
+    SAY_DEATH               = -1533118,
+    EMOTE_TELEPORT          = -1533136,
+    EMOTE_RETURN            = -1533137,
+
+    // Spells by boss
+    SPELL_DECREPIT_FEVER    = 29998,
+    SPELL_DECREPIT_FEVER_H  = 55011,
+    SPELL_DISRUPTION        = 29310,
+    SPELL_TELEPORT          = 30211,
+    SPELL_PLAGUE_CLOUD      = 29350
+};
+
+struct boss_heigan : public CreatureScript
+{
+    boss_heigan() : CreatureScript("boss_heigan") {}
+
+    struct boss_heiganAI : public ScriptedAI
+    {
+        boss_heiganAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiPhase;
+        uint8 m_uiPhaseEruption;
+
+        uint32 m_uiFeverTimer;
+        uint32 m_uiDisruptionTimer;
+        uint32 m_uiEruptionTimer;
+        uint32 m_uiPhaseTimer;
+        uint32 m_uiTauntTimer;
+        uint32 m_uiStartChannelingTimer;
+
+        void ResetPhase()
+        {
+            m_uiPhaseEruption = 0;
+            m_uiFeverTimer = 4000;
+            m_uiEruptionTimer = m_uiPhase == PHASE_GROUND ? 15000 : 7500;
+            m_uiDisruptionTimer = 5000;
+            m_uiStartChannelingTimer = 1000;
+            m_uiPhaseTimer = m_uiPhase == PHASE_GROUND ? 90000 : 45000;
+        }
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_GROUND;
+            m_uiTauntTimer = urand(20000, 60000);               // TODO, find information
+            ResetPhase();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
+            }
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_HEIGAN, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_HEIGAN, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_HEIGAN, FAIL);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiPhase == PHASE_GROUND)
+            {
+                // Teleport to platform
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_TELEPORT, m_creature);
+                        m_creature->GetMotionMaster()->MoveIdle();
+
+                        m_uiPhase = PHASE_PLATFORM;
+                        ResetPhase();
+                        return;
+                    }
+                }
+                else
+                    m_uiPhaseTimer -= uiDiff;
+
+                // Fever
+                if (m_uiFeverTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_DECREPIT_FEVER : SPELL_DECREPIT_FEVER_H);
+                    m_uiFeverTimer = 21000;
+                }
+                else
+                    m_uiFeverTimer -= uiDiff;
+
+                // Disruption
+                if (m_uiDisruptionTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_DISRUPTION);
+                    m_uiDisruptionTimer = 10000;
+                }
+                else
+                    m_uiDisruptionTimer -= uiDiff;
+            }
+            else                                                // Platform Phase
+            {
+                if (m_uiPhaseTimer < uiDiff)                    // Return to fight
+                {
+                    m_creature->InterruptNonMeleeSpells(true);
+                    DoScriptText(EMOTE_RETURN, m_creature);
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+
+                    m_uiPhase = PHASE_GROUND;
+                    ResetPhase();
+                    return;
+                }
+                else
+                    m_uiPhaseTimer -= uiDiff;
+
+                if (m_uiStartChannelingTimer)
+                {
+                    if (m_uiStartChannelingTimer <= uiDiff)
+                    {
+                        DoScriptText(SAY_CHANNELING, m_creature);
+                        DoCastSpellIfCan(m_creature, SPELL_PLAGUE_CLOUD);
+                        m_uiStartChannelingTimer = 0;           // no more
+                    }
+                    else
+                        m_uiStartChannelingTimer -= uiDiff;
+                }
+            }
+
+            // Taunt
+            if (m_uiTauntTimer < uiDiff)
+            {
+                switch (urand(0, 3))
+                {
+                case 0: DoScriptText(SAY_TAUNT1, m_creature); break;
+                case 1: DoScriptText(SAY_TAUNT2, m_creature); break;
+                case 2: DoScriptText(SAY_TAUNT3, m_creature); break;
+                case 3: DoScriptText(SAY_TAUNT4, m_creature); break;
+                }
+                m_uiTauntTimer = urand(20000, 70000);
+            }
+            else
+                m_uiTauntTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+
+            // Handling of the erruptions, this is not related to melee attack or spell-casting
+            if (!m_pInstance)
+                return;
+
+            // Eruption
+            if (m_uiEruptionTimer < uiDiff)
+            {
+                for (uint8 uiArea = 0; uiArea < MAX_HEIGAN_TRAP_AREAS; ++uiArea)
+                {
+                    // Actually this is correct :P
+                    if (uiArea == (m_uiPhaseEruption % 6) || uiArea == 6 - (m_uiPhaseEruption % 6))
+                        continue;
+
+                    m_pInstance->SetData(TYPE_DO_HEIGAN_TRAPS, uiArea);
+                }
+
+                m_uiEruptionTimer = m_uiPhase == PHASE_GROUND ? 10000 : 3000;
+                ++m_uiPhaseEruption;
+            }
+            else
+                m_uiEruptionTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_heiganAI(pCreature);
+    }
+};
+
+void AddSC_boss_heigan()
+{
+    Script* s;
+
+    s = new boss_heigan();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_heigan";
+    //pNewScript->GetAI = &GetAI_boss_heigan;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_kelthuzad.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_kelthuzad.cpp
new file mode 100644
index 000000000..67de1f657
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_kelthuzad.cpp
@@ -0,0 +1,592 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_KelThuzad
+SD%Complete: 75
+SDComment: Timers will need adjustments, along with tweaking positions and amounts
+SDCategory: Naxxramas
+EndScriptData */
+
+// some not answered questions:
+// - will intro mobs, not sent to center, despawn when phase 2 start?
+// - what happens if raid fail, can they start the event as soon after as they want?
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    SAY_SUMMON_MINIONS                  = -1533105,         // start of phase 1
+
+    EMOTE_PHASE2                        = -1533135,         // start of phase 2
+    SAY_AGGRO1                          = -1533094,
+    SAY_AGGRO2                          = -1533095,
+    SAY_AGGRO3                          = -1533096,
+
+    SAY_SLAY1                           = -1533097,
+    SAY_SLAY2                           = -1533098,
+
+    SAY_DEATH                           = -1533099,
+
+    SAY_CHAIN1                          = -1533100,
+    SAY_CHAIN2                          = -1533101,
+    SAY_FROST_BLAST                     = -1533102,
+
+    SAY_REQUEST_AID                     = -1533103,         // start of phase 3
+    SAY_ANSWER_REQUEST                  = -1533104,         // lich king answer
+
+    SAY_SPECIAL1_MANA_DET               = -1533106,
+    SAY_SPECIAL3_MANA_DET               = -1533107,
+    SAY_SPECIAL2_DISPELL                = -1533108,
+
+    EMOTE_GUARDIAN                      = -1533134,         // at each guardian summon
+
+    // spells to be casted
+    SPELL_FROST_BOLT                    = 28478,
+    SPELL_FROST_BOLT_H                  = 55802,
+    SPELL_FROST_BOLT_NOVA               = 28479,
+    SPELL_FROST_BOLT_NOVA_H             = 55807,
+
+    SPELL_CHAINS_OF_KELTHUZAD           = 28408,            // 3.x, heroic only
+    SPELL_CHAINS_OF_KELTHUZAD_TARGET    = 28410,
+
+    SPELL_MANA_DETONATION               = 27819,
+    SPELL_SHADOW_FISSURE                = 27810,
+    SPELL_FROST_BLAST                   = 27808,
+
+    SPELL_CHANNEL_VISUAL                = 29423,
+
+    MAX_SOLDIER_COUNT                   = 71,
+    MAX_ABOMINATION_COUNT               = 8,
+    MAX_BANSHEE_COUNT                   = 8,
+
+    ACHIEV_REQ_KILLED_ABOMINATIONS      = 18,
+};
+
+static float M_F_ANGLE = 0.2f;                              // to adjust for map rotation
+static float M_F_HEIGHT = 2.0f;                             // adjust for height difference
+static float M_F_RANGE = 55.0f;                             // ~ range from center of chamber to center of alcove
+
+enum Phase
+{
+    PHASE_INTRO,
+    PHASE_NORMAL,
+    PHASE_GUARDIANS,
+};
+
+struct boss_kelthuzad : public CreatureScript
+{
+    boss_kelthuzad() : CreatureScript("boss_kelthuzad") {}
+
+    struct boss_kelthuzadAI : public ScriptedAI
+    {
+        boss_kelthuzadAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+
+            m_uiGuardiansCountMax = m_bIsRegularMode ? 2 : 4;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiGuardiansCount;
+        uint32 m_uiGuardiansCountMax;
+        uint32 m_uiGuardiansTimer;
+        uint32 m_uiLichKingAnswerTimer;
+        uint32 m_uiFrostBoltTimer;
+        uint32 m_uiFrostBoltNovaTimer;
+        uint32 m_uiChainsTimer;
+        uint32 m_uiManaDetonationTimer;
+        uint32 m_uiShadowFissureTimer;
+        uint32 m_uiFrostBlastTimer;
+
+        uint32 m_uiPhase1Timer;
+        uint32 m_uiSoldierTimer;
+        uint32 m_uiBansheeTimer;
+        uint32 m_uiAbominationTimer;
+        uint8  m_uiPhase;
+        uint32 m_uiSoldierCount;
+        uint32 m_uiBansheeCount;
+        uint32 m_uiAbominationCount;
+        uint32 m_uiSummonIntroTimer;
+        uint32 m_uiIntroPackCount;
+        uint32 m_uiKilledAbomination;
+
+        GuidSet m_lIntroMobsSet;
+        GuidSet m_lAddsSet;
+
+        void Reset() override
+        {
+            m_uiFrostBoltTimer = urand(1000, 60000);       // It won't be more than a minute without cast it
+            m_uiFrostBoltNovaTimer = 15000;                    // Cast every 15 seconds
+            m_uiChainsTimer = urand(30000, 60000);      // Cast no sooner than once every 30 seconds
+            m_uiManaDetonationTimer = 20000;                    // Seems to cast about every 20 seconds
+            m_uiShadowFissureTimer = 25000;                    // 25 seconds
+            m_uiFrostBlastTimer = urand(30000, 60000);      // Random time between 30-60 seconds
+            m_uiGuardiansTimer = 5000;                     // 5 seconds for summoning each Guardian of Icecrown in phase 3
+            m_uiLichKingAnswerTimer = 4000;
+            m_uiGuardiansCount = 0;
+            m_uiSummonIntroTimer = 0;
+            m_uiIntroPackCount = 0;
+
+            m_uiPhase1Timer = 228000;                   // Phase 1 lasts "3 minutes and 48 seconds"
+            m_uiSoldierTimer = 5000;
+            m_uiBansheeTimer = 5000;
+            m_uiAbominationTimer = 5000;
+            m_uiSoldierCount = 0;
+            m_uiBansheeCount = 0;
+            m_uiAbominationCount = 0;
+            m_uiKilledAbomination = 0;
+            m_uiPhase = PHASE_INTRO;
+
+            // it may be some spell should be used instead, to control the intro phase
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+            SetCombatMovement(false);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            if (urand(0, 1))
+                DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+            DespawnAdds();
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_KELTHUZAD, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            DespawnIntroCreatures();
+            DespawnAdds();
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_KELTHUZAD, NOT_STARTED);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_pInstance && m_pInstance->GetData(TYPE_KELTHUZAD) != IN_PROGRESS)
+                return;
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void DespawnIntroCreatures()
+        {
+            if (m_pInstance)
+            {
+                for (GuidSet::const_iterator itr = m_lIntroMobsSet.begin(); itr != m_lIntroMobsSet.end(); ++itr)
+                {
+                    if (Creature* pCreature = m_pInstance->instance->GetCreature(*itr))
+                        pCreature->ForcedDespawn();
+                }
+            }
+
+            m_lIntroMobsSet.clear();
+        }
+
+        void DespawnAdds()
+        {
+            if (m_pInstance)
+            {
+                for (GuidSet::const_iterator itr = m_lAddsSet.begin(); itr != m_lAddsSet.end(); ++itr)
+                {
+                    if (Creature* pCreature = m_pInstance->instance->GetCreature(*itr))
+                    {
+                        if (pCreature->IsAlive())
+                        {
+                            pCreature->AI()->EnterEvadeMode();
+                            pCreature->ForcedDespawn(15000);
+                        }
+                    }
+                }
+            }
+
+            m_lAddsSet.clear();
+        }
+
+        float GetLocationAngle(uint32 uiId)
+        {
+            switch (uiId)
+            {
+            case 1: return M_PI_F - M_F_ANGLE;              // south
+            case 2: return M_PI_F / 2 * 3 - M_F_ANGLE;      // east
+            case 3: return M_PI_F / 2 - M_F_ANGLE;          // west
+            case 4: return M_PI_F / 4 - M_F_ANGLE;          // north-west
+            case 5: return M_PI_F / 4 * 7 - M_F_ANGLE;      // north-east
+            case 6: return M_PI_F / 4 * 5 - M_F_ANGLE;      // south-east
+            case 7: return M_PI_F / 4 * 3 - M_F_ANGLE;      // south-west
+            }
+
+            return M_F_ANGLE;
+        }
+
+        void SummonIntroCreatures(uint32 packId)
+        {
+            if (!m_pInstance)
+                return;
+
+            float fAngle = GetLocationAngle(packId + 1);
+
+            float fX, fY, fZ;
+            GetChamberCenterCoords(fX, fY, fZ);
+
+            fX += M_F_RANGE * cos(fAngle);
+            fY += M_F_RANGE * sin(fAngle);
+            fZ += M_F_HEIGHT;
+
+            MaNGOS::NormalizeMapCoord(fX);
+            MaNGOS::NormalizeMapCoord(fY);
+
+            uint32 uiNpcEntry = NPC_SOUL_WEAVER;
+
+            for (uint8 uiI = 0; uiI < 14; ++uiI)
+            {
+                if (uiI > 0)
+                {
+                    if (uiI < 4)
+                        uiNpcEntry = NPC_UNSTOPPABLE_ABOM;
+                    else
+                        uiNpcEntry = NPC_SOLDIER_FROZEN;
+                }
+
+                float fNewX, fNewY, fNewZ;
+                m_creature->GetRandomPoint(fX, fY, fZ, 12.0f, fNewX, fNewY, fNewZ);
+
+                m_creature->SummonCreature(uiNpcEntry, fNewX, fNewY, fNewZ, fAngle + M_PI_F, TEMPSUMMON_CORPSE_DESPAWN, 5000);
+            }
+        }
+
+        void SummonMob(uint32 uiType)
+        {
+            if (!m_pInstance)
+                return;
+
+            float fAngle = GetLocationAngle(urand(1, 7));
+
+            float fX, fY, fZ;
+            GetChamberCenterCoords(fX, fY, fZ);
+
+            fX += M_F_RANGE * cos(fAngle);
+            fY += M_F_RANGE * sin(fAngle);
+            fZ += M_F_HEIGHT;
+
+            MaNGOS::NormalizeMapCoord(fX);
+            MaNGOS::NormalizeMapCoord(fY);
+
+            m_creature->SummonCreature(uiType, fX, fY, fZ, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 5000);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_GUARDIAN:
+                DoScriptText(EMOTE_GUARDIAN, m_creature);
+
+                m_lAddsSet.insert(pSummoned->GetObjectGuid());
+                ++m_uiGuardiansCount;
+
+                pSummoned->SetInCombatWithZone();
+                break;
+            case NPC_SOLDIER_FROZEN:
+            case NPC_UNSTOPPABLE_ABOM:
+            case NPC_SOUL_WEAVER:
+                if (m_uiIntroPackCount < 7)
+                    m_lIntroMobsSet.insert(pSummoned->GetObjectGuid());
+                else
+                {
+                    m_lAddsSet.insert(pSummoned->GetObjectGuid());
+
+                    if (m_pInstance)
+                    {
+                        float fX, fY, fZ;
+                        GetChamberCenterCoords(fX, fY, fZ);
+                        pSummoned->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                    }
+                }
+
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_GUARDIAN:
+            case NPC_SOLDIER_FROZEN:
+            case NPC_SOUL_WEAVER:
+                m_lAddsSet.erase(pSummoned->GetObjectGuid());
+                break;
+            case NPC_UNSTOPPABLE_ABOM:
+                m_lAddsSet.erase(pSummoned->GetObjectGuid());
+
+                ++m_uiKilledAbomination;
+                if (m_uiKilledAbomination >= ACHIEV_REQ_KILLED_ABOMINATIONS)
+                    m_pInstance->SetData(TYPE_ACHIEV_GET_ENOUGH, uint32(true));
+
+                break;
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType == POINT_MOTION_TYPE && uiPointId == 0)
+                pSummoned->SetInCombatWithZone();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (!m_pInstance || m_pInstance->GetData(TYPE_KELTHUZAD) != IN_PROGRESS)
+                return;
+
+            if (m_uiPhase == PHASE_INTRO)
+            {
+                if (m_uiIntroPackCount < 7)
+                {
+                    if (m_uiSummonIntroTimer < uiDiff)
+                    {
+                        if (!m_uiIntroPackCount)
+                            DoScriptText(SAY_SUMMON_MINIONS, m_creature);
+
+                        SummonIntroCreatures(m_uiIntroPackCount);
+                        ++m_uiIntroPackCount;
+                        m_uiSummonIntroTimer = 2000;
+                    }
+                    else
+                        m_uiSummonIntroTimer -= uiDiff;
+                }
+                else
+                {
+                    if (m_uiPhase1Timer < uiDiff)
+                    {
+                        m_uiPhase = PHASE_NORMAL;
+                        DespawnIntroCreatures();
+
+                        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                        SetCombatMovement(true);
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+
+                        DoScriptText(EMOTE_PHASE2, m_creature);
+
+                        switch (urand(0, 2))
+                        {
+                        case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+                        case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+                        case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
+                        };
+                    }
+                    else
+                        m_uiPhase1Timer -= uiDiff;
+
+                    if (m_uiSoldierCount < MAX_SOLDIER_COUNT)
+                    {
+                        if (m_uiSoldierTimer < uiDiff)
+                        {
+                            SummonMob(NPC_SOLDIER_FROZEN);
+                            ++m_uiSoldierCount;
+                            m_uiSoldierTimer = 3000;
+                        }
+                        else
+                            m_uiSoldierTimer -= uiDiff;
+                    }
+
+                    if (m_uiAbominationCount < MAX_ABOMINATION_COUNT)
+                    {
+                        if (m_uiAbominationTimer < uiDiff)
+                        {
+                            SummonMob(NPC_UNSTOPPABLE_ABOM);
+                            ++m_uiAbominationCount;
+                            m_uiAbominationTimer = 25000;
+                        }
+                        else
+                            m_uiAbominationTimer -= uiDiff;
+                    }
+
+                    if (m_uiBansheeCount < MAX_BANSHEE_COUNT)
+                    {
+                        if (m_uiBansheeTimer < uiDiff)
+                        {
+                            SummonMob(NPC_SOUL_WEAVER);
+                            ++m_uiBansheeCount;
+                            m_uiBansheeTimer = 25000;
+                        }
+                        else
+                            m_uiBansheeTimer -= uiDiff;
+                    }
+                }
+            }
+            else // normal or guardian phase
+            {
+                if (m_uiFrostBoltTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_FROST_BOLT : SPELL_FROST_BOLT_H) == CAST_OK)
+                        m_uiFrostBoltTimer = urand(1000, 60000);
+                }
+                else
+                    m_uiFrostBoltTimer -= uiDiff;
+
+                if (m_uiFrostBoltNovaTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_FROST_BOLT_NOVA : SPELL_FROST_BOLT_NOVA_H) == CAST_OK)
+                        m_uiFrostBoltNovaTimer = 15000;
+                }
+                else
+                    m_uiFrostBoltNovaTimer -= uiDiff;
+
+                if (m_uiManaDetonationTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_MANA_DETONATION, SELECT_FLAG_PLAYER | SELECT_FLAG_POWER_MANA))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_MANA_DETONATION) == CAST_OK)
+                        {
+                            if (urand(0, 1))
+                                DoScriptText(SAY_SPECIAL1_MANA_DET, m_creature);
+
+                            m_uiManaDetonationTimer = 20000;
+                        }
+                    }
+                }
+                else
+                    m_uiManaDetonationTimer -= uiDiff;
+
+                if (m_uiShadowFissureTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_FISSURE) == CAST_OK)
+                        {
+                            if (urand(0, 1))
+                                DoScriptText(SAY_SPECIAL3_MANA_DET, m_creature);
+
+                            m_uiShadowFissureTimer = 25000;
+                        }
+                    }
+                }
+                else
+                    m_uiShadowFissureTimer -= uiDiff;
+
+                if (m_uiFrostBlastTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROST_BLAST) == CAST_OK)
+                    {
+                        if (urand(0, 1))
+                            DoScriptText(SAY_FROST_BLAST, m_creature);
+
+                        m_uiFrostBlastTimer = urand(30000, 60000);
+                    }
+                }
+                else
+                    m_uiFrostBlastTimer -= uiDiff;
+
+                if (!m_bIsRegularMode)
+                {
+                    if (m_uiChainsTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CHAINS_OF_KELTHUZAD) == CAST_OK)
+                        {
+                            DoScriptText(urand(0, 1) ? SAY_CHAIN1 : SAY_CHAIN2, m_creature);
+
+                            m_uiChainsTimer = urand(30000, 60000);
+                        }
+                    }
+                    else
+                        m_uiChainsTimer -= uiDiff;
+                }
+
+                if (m_uiPhase == PHASE_NORMAL)
+                {
+                    if (m_creature->GetHealthPercent() < 45.0f)
+                    {
+                        m_uiPhase = PHASE_GUARDIANS;
+                        DoScriptText(SAY_REQUEST_AID, m_creature);
+                    }
+                }
+                else if (m_uiPhase == PHASE_GUARDIANS && m_uiGuardiansCount < m_uiGuardiansCountMax)
+                {
+                    if (m_uiGuardiansTimer < uiDiff)
+                    {
+                        // Summon a Guardian of Icecrown in a random alcove
+                        SummonMob(NPC_GUARDIAN);
+                        m_uiGuardiansTimer = 5000;
+                    }
+                    else
+                        m_uiGuardiansTimer -= uiDiff;
+
+                    if (m_uiLichKingAnswerTimer && m_pInstance)
+                    {
+                        if (m_uiLichKingAnswerTimer <= uiDiff)
+                        {
+                            if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_THE_LICHKING))
+                                DoScriptText(SAY_ANSWER_REQUEST, pLichKing);
+                            m_uiLichKingAnswerTimer = 0;
+                        }
+                        else
+                            m_uiLichKingAnswerTimer -= uiDiff;
+                    }
+                }
+
+                DoMeleeAttackIfReady();
+            }
+        }
+    private:
+        void GetChamberCenterCoords(float &x, float &y, float &z)
+        {
+            if (AreaTriggerEntry const* at = sAreaTriggerStore.LookupEntry(AREATRIGGER_KELTHUZAD))
+            {
+                x = at->x;
+                y = at->y;
+                z = at->z;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_kelthuzadAI(pCreature);
+    }
+};
+
+void AddSC_boss_kelthuzad()
+{
+    Script* s;
+
+    s = new boss_kelthuzad();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_kelthuzad";
+    //pNewScript->GetAI = &GetAI_boss_kelthuzad;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_loatheb.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_loatheb.cpp
new file mode 100644
index 000000000..cac7e964b
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_loatheb.cpp
@@ -0,0 +1,201 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Loatheb
+SD%Complete: 100
+SDComment:
+SDCategory: Naxxramas
+EndScriptData */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    EMOTE_AURA_BLOCKING     = -1533143,
+    EMOTE_AURA_WANE         = -1533144,
+    EMOTE_AURA_FADING       = -1533145,
+
+    SPELL_DEATHBLOOM        = 29865,
+    SPELL_DEATHBLOOM_H      = 55053,
+    SPELL_INEVITABLE_DOOM   = 29204,
+    SPELL_INEVITABLE_DOOM_H = 55052,
+    SPELL_NECROTIC_AURA     = 55593,
+    SPELL_SUMMON_SPORE      = 29234,
+    SPELL_BERSERK           = 26662,
+
+    NPC_SPORE               = 16286
+};
+
+struct boss_loatheb : public CreatureScript
+{
+    boss_loatheb() : CreatureScript("boss_loatheb") {}
+
+    struct boss_loathebAI : public ScriptedAI
+    {
+        boss_loathebAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiDeathbloomTimer;
+        uint32 m_uiNecroticAuraTimer;
+        uint32 m_uiInevitableDoomTimer;
+        uint32 m_uiSummonTimer;
+        uint32 m_uiBerserkTimer;
+        uint8  m_uiNecroticAuraCount;                           // Used for emotes, 5min check
+
+        void Reset() override
+        {
+            m_uiDeathbloomTimer = 5000;
+            m_uiNecroticAuraTimer = 12000;
+            m_uiInevitableDoomTimer = MINUTE * 2 * IN_MILLISECONDS;
+            m_uiSummonTimer = urand(10000, 15000);              // first seen in vid after approx 12s
+            m_uiBerserkTimer = MINUTE * 12 * IN_MILLISECONDS;   // only in heroic, after 12min
+            m_uiNecroticAuraCount = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_LOATHEB, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_LOATHEB, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_LOATHEB, NOT_STARTED);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() != NPC_SPORE)
+                return;
+
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                pSummoned->AddThreat(pTarget);
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SPORE && m_pInstance)
+                m_pInstance->SetData(TYPE_ACHIEV_SPORE_LOSER, uint32(false));
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Berserk (only heroic)
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiBerserkTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_BERSERK);
+                    m_uiBerserkTimer = 300000;
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            // Inevitable Doom
+            if (m_uiInevitableDoomTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_INEVITABLE_DOOM : SPELL_INEVITABLE_DOOM_H);
+                m_uiInevitableDoomTimer = (m_uiNecroticAuraCount <= 40) ? 30000 : 15000;
+            }
+            else
+                m_uiInevitableDoomTimer -= uiDiff;
+
+            // Necrotic Aura
+            if (m_uiNecroticAuraTimer < uiDiff)
+            {
+                switch (m_uiNecroticAuraCount % 3)
+                {
+                case 0:
+                    DoCastSpellIfCan(m_creature, SPELL_NECROTIC_AURA);
+                    DoScriptText(EMOTE_AURA_BLOCKING, m_creature);
+                    m_uiNecroticAuraTimer = 14000;
+                    break;
+                case 1:
+                    DoScriptText(EMOTE_AURA_WANE, m_creature);
+                    m_uiNecroticAuraTimer = 3000;
+                    break;
+                case 2:
+                    DoScriptText(EMOTE_AURA_FADING, m_creature);
+                    m_uiNecroticAuraTimer = 3000;
+                    break;
+                }
+                ++m_uiNecroticAuraCount;
+            }
+            else
+                m_uiNecroticAuraTimer -= uiDiff;
+
+            // Summon
+            if (m_uiSummonTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_SPORE);
+                m_uiSummonTimer = m_bIsRegularMode ? 36000 : 18000;
+            }
+            else
+                m_uiSummonTimer -= uiDiff;
+
+            // Deathbloom
+            if (m_uiDeathbloomTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_DEATHBLOOM : SPELL_DEATHBLOOM_H);
+                m_uiDeathbloomTimer = 30000;
+            }
+            else
+                m_uiDeathbloomTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_loathebAI(pCreature);
+    }
+};
+
+void AddSC_boss_loatheb()
+{
+    Script* s;
+
+    s = new boss_loatheb();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_loatheb";
+    //pNewScript->GetAI = &GetAI_boss_loatheb;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_maexxna.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_maexxna.cpp
new file mode 100644
index 000000000..ebcd5914d
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_maexxna.cpp
@@ -0,0 +1,345 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Maexxna
+SD%Complete: 90
+SDComment: Web wrap effect still needs more love and research.
+SDCategory: Naxxramas
+EndScriptData */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    EMOTE_SPIN_WEB              = -1533146,
+    EMOTE_SPIDERLING            = -1533147,
+    EMOTE_SPRAY                 = -1533148,
+    EMOTE_BOSS_GENERIC_FRENZY   = -1000005,
+
+    SPELL_WEBWRAP               = 28622,
+    SPELL_WEBWRAP_2             = 28673,                    // purpose unknown
+
+    SPELL_WEBSPRAY              = 29484,
+    SPELL_WEBSPRAY_H            = 54125,
+
+    SPELL_POISONSHOCK           = 28741,
+    SPELL_POISONSHOCK_H         = 54122,
+
+    SPELL_NECROTICPOISON        = 28776,
+    SPELL_NECROTICPOISON_H      = 54121,
+
+    SPELL_FRENZY                = 54123,
+    SPELL_FRENZY_H              = 54124,
+
+    // SPELL_SUMMON_SPIDERLING_1 = 29434,                   // removed from dbc. Summons 10 spiderlings
+    // SPELL_SUMMON_SPIDERLING_2 = 30076,                   // removed from dbc. Summons 3 spiderlings
+    // SPELL_SUMMON_WEB_WRAP     = 28627,                   // removed from dbc. Summons one web wrap and transforms it into creature 17286
+
+    NPC_WEB_WRAP                = 16486,
+    NPC_SPIDERLING              = 17055,
+
+    MAX_SPIDERLINGS             = 8,
+    MAX_WEB_WRAP_POSITIONS      = 3,
+};
+
+static const float aWebWrapLoc[MAX_WEB_WRAP_POSITIONS][3] =
+{
+    {3546.796f, -3869.082f, 296.450f},
+    {3531.271f, -3847.424f, 299.450f},
+    {3497.067f, -3843.384f, 302.384f}
+};
+
+struct npc_web_wrap : public CreatureScript
+{
+    npc_web_wrap() : CreatureScript("npc_web_wrap") {}
+
+    struct npc_web_wrapAI : public ScriptedAI
+    {
+        npc_web_wrapAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_victimGuid;
+        uint32 m_uiWebWrapTimer;
+
+        void Reset() override
+        {
+            m_uiWebWrapTimer = 0;
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+        void AttackStart(Unit* /*pWho*/) override {}
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*sender*/, Unit* pVictim, uint32 /**/) override
+        {
+            if (eventType != AI_EVENT_CUSTOM_A)
+                return;
+
+            if (pVictim)
+            {
+                // Vanilla spell 28618, 28619, 28620, 28621 had effect SPELL_EFFECT_PLAYER_PULL with EffectMiscValue = 200, 300, 400 and 500
+                // All these spells trigger 28622 after 1 or 2 seconds
+                // the EffectMiscValue may have been based on the distance between the victim and the target
+
+                // NOTE: This implementation may not be 100% correct, but it gets very close to the expected result
+
+                float fDist = m_creature->GetDistance2d(pVictim);
+                // Switch the speed multiplier based on the distance from the web wrap
+                uint32 uiEffectMiscValue = 500;
+                if (fDist < 25.0f)
+                    uiEffectMiscValue = 200;
+                else if (fDist < 50.0f)
+                    uiEffectMiscValue = 300;
+                else if (fDist < 75.0f)
+                    uiEffectMiscValue = 400;
+
+                // Note: normally we should use the Knockback effect to handle this, but because this doesn't behave as expected we'll just use Jump Movement
+                // pVictim->KnockBackFrom(m_creature, -fDist, uiEffectMiscValue * 0.1f);
+
+                float fSpeed = fDist * (uiEffectMiscValue * 0.01f);
+                pVictim->GetMotionMaster()->MoveJump(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), fSpeed, 0.0f);
+
+                m_victimGuid = pVictim->GetObjectGuid();
+                m_uiWebWrapTimer = uiEffectMiscValue == 200 ? 1000 : 2000;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_victimGuid)
+            {
+                if (Player* pVictim = m_creature->GetMap()->GetPlayer(m_victimGuid))
+                {
+                    if (pVictim->IsAlive())
+                        pVictim->RemoveAurasDueToSpell(SPELL_WEBWRAP);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiWebWrapTimer)
+            {
+                // Finally the player gets web wrapped and he should change the display id until the creature is killed
+                if (m_uiWebWrapTimer <= uiDiff)
+                {
+                    if (Player* pVictim = m_creature->GetMap()->GetPlayer(m_victimGuid))
+                        pVictim->CastSpell(pVictim, SPELL_WEBWRAP, true, NULL, NULL, m_creature->GetObjectGuid());
+
+                    m_uiWebWrapTimer = 0;
+                }
+                else
+                    m_uiWebWrapTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_web_wrapAI(pCreature);
+    }
+};
+
+struct boss_maexxna : public CreatureScript
+{
+    boss_maexxna() : CreatureScript("boss_maexxna") {}
+
+    struct boss_maexxnaAI : public ScriptedAI
+    {
+        boss_maexxnaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiWebWrapTimer;
+        uint32 m_uiWebSprayTimer;
+        uint32 m_uiPoisonShockTimer;
+        uint32 m_uiNecroticPoisonTimer;
+        uint32 m_uiSummonSpiderlingTimer;
+        bool   m_bEnraged;
+
+        void Reset() override
+        {
+            m_uiWebWrapTimer = 15000;
+            m_uiWebSprayTimer = 40000;
+            m_uiPoisonShockTimer = urand(10000, 20000);
+            m_uiNecroticPoisonTimer = urand(20000, 30000);
+            m_uiSummonSpiderlingTimer = 30000;
+            m_bEnraged = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MAEXXNA, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MAEXXNA, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MAEXXNA, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_WEB_WRAP)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_WEBWRAP, SELECT_FLAG_PLAYER))
+                {
+                    SendAIEvent(AI_EVENT_CUSTOM_A, pTarget, pSummoned);
+                }
+            }
+            else if (pSummoned->GetEntry() == NPC_SPIDERLING)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        bool DoCastWebWrap()
+        {
+            // If we can't select a player for web wrap then skip the summoning
+            if (!m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, uint32(0), SELECT_FLAG_PLAYER))
+                return false;
+
+            uint8 uiPos1 = urand(0, MAX_WEB_WRAP_POSITIONS - 1);
+            m_creature->SummonCreature(NPC_WEB_WRAP, aWebWrapLoc[uiPos1][0], aWebWrapLoc[uiPos1][1], aWebWrapLoc[uiPos1][2], 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+
+            // Summon a second web wrap on heroic
+            if (!m_bIsRegularMode)
+            {
+                uint8 uiPos2 = (uiPos1 + urand(1, MAX_WEB_WRAP_POSITIONS - 1)) % MAX_WEB_WRAP_POSITIONS;
+                m_creature->SummonCreature(NPC_WEB_WRAP, aWebWrapLoc[uiPos2][0], aWebWrapLoc[uiPos2][1], aWebWrapLoc[uiPos2][2], 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+            }
+
+            return true;
+        }
+
+        // Summons spiderlings around the boss
+        void SummonSpiderlings()
+        {
+            for (uint8 i = 0; i < MAX_SPIDERLINGS; ++i)
+                m_creature->SummonCreature(NPC_SPIDERLING, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Web Wrap
+            if (m_uiWebWrapTimer < uiDiff)
+            {
+                if (DoCastWebWrap())
+                    DoScriptText(EMOTE_SPIN_WEB, m_creature);
+
+                m_uiWebWrapTimer = 40000;
+            }
+            else
+                m_uiWebWrapTimer -= uiDiff;
+
+            // Web Spray
+            if (m_uiWebSprayTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_WEBSPRAY : SPELL_WEBSPRAY_H) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_SPRAY, m_creature);
+                    m_uiWebSprayTimer = 40000;
+                }
+            }
+            else
+                m_uiWebSprayTimer -= uiDiff;
+
+            // Poison Shock
+            if (m_uiPoisonShockTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_POISONSHOCK : SPELL_POISONSHOCK_H) == CAST_OK)
+                    m_uiPoisonShockTimer = urand(10000, 20000);
+            }
+            else
+                m_uiPoisonShockTimer -= uiDiff;
+
+            // Necrotic Poison
+            if (m_uiNecroticPoisonTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_NECROTICPOISON : SPELL_NECROTICPOISON_H) == CAST_OK)
+                    m_uiNecroticPoisonTimer = urand(20000, 30000);
+            }
+            else
+                m_uiNecroticPoisonTimer -= uiDiff;
+
+            // Summon Spiderling
+            if (m_uiSummonSpiderlingTimer < uiDiff)
+            {
+                SummonSpiderlings();
+                DoScriptText(EMOTE_SPIDERLING, m_creature);
+                m_uiSummonSpiderlingTimer = 30000;
+            }
+            else
+                m_uiSummonSpiderlingTimer -= uiDiff;
+
+            // Enrage if not already enraged and below 30%
+            if (!m_bEnraged && m_creature->GetHealthPercent() < 30.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_FRENZY : SPELL_FRENZY_H) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_BOSS_GENERIC_FRENZY, m_creature);
+                    m_bEnraged = true;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_maexxnaAI(pCreature);
+    }
+};
+
+void AddSC_boss_maexxna()
+{
+    Script* s;
+
+    s = new boss_maexxna();
+    s->RegisterSelf();
+    s = new npc_web_wrap();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_maexxna";
+    //pNewScript->GetAI = &GetAI_boss_maexxna;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_web_wrap";
+    //pNewScript->GetAI = &GetAI_npc_web_wrap;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_noth.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_noth.cpp
new file mode 100644
index 000000000..aafa1c120
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_noth.cpp
@@ -0,0 +1,349 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Noth
+SD%Complete: 80
+SDComment: Summons need verify, need better phase-switch support (unattackable?)
+SDCategory: Naxxramas
+EndScriptData */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    SAY_AGGRO1                          = -1533075,
+    SAY_AGGRO2                          = -1533076,
+    SAY_AGGRO3                          = -1533077,
+    SAY_SUMMON                          = -1533078,
+    SAY_SLAY1                           = -1533079,
+    SAY_SLAY2                           = -1533080,
+    SAY_DEATH                           = -1533081,
+
+    EMOTE_WARRIOR                       = -1533130,
+    EMOTE_SKELETON                      = -1533131,
+    EMOTE_TELEPORT                      = -1533132,
+    EMOTE_TELEPORT_RETURN               = -1533133,
+
+    SPELL_TELEPORT                      = 29216,
+    SPELL_TELEPORT_RETURN               = 29231,
+
+    SPELL_BLINK_1                       = 29208,
+    SPELL_BLINK_2                       = 29209,
+    SPELL_BLINK_3                       = 29210,
+    SPELL_BLINK_4                       = 29211,
+
+    SPELL_CRIPPLE                       = 29212,
+    SPELL_CRIPPLE_H                     = 54814,
+    SPELL_CURSE_PLAGUEBRINGER           = 29213,
+    SPELL_CURSE_PLAGUEBRINGER_H         = 54835,
+
+    SPELL_BERSERK                       = 26662,            // guesswork, but very common berserk spell in naxx
+
+    SPELL_SUMMON_WARRIOR_1              = 29247,
+    SPELL_SUMMON_WARRIOR_2              = 29248,
+    SPELL_SUMMON_WARRIOR_3              = 29249,
+
+    SPELL_SUMMON_WARRIOR_THREE          = 29237,
+
+    SPELL_SUMMON_CHAMP01                = 29217,
+    SPELL_SUMMON_CHAMP02                = 29224,
+    SPELL_SUMMON_CHAMP03                = 29225,
+    SPELL_SUMMON_CHAMP04                = 29227,
+    SPELL_SUMMON_CHAMP05                = 29238,
+    SPELL_SUMMON_CHAMP06                = 29255,
+    SPELL_SUMMON_CHAMP07                = 29257,
+    SPELL_SUMMON_CHAMP08                = 29258,
+    SPELL_SUMMON_CHAMP09                = 29262,
+    SPELL_SUMMON_CHAMP10                = 29267,
+
+    SPELL_SUMMON_GUARD01                = 29226,
+    SPELL_SUMMON_GUARD02                = 29239,
+    SPELL_SUMMON_GUARD03                = 29256,
+    SPELL_SUMMON_GUARD04                = 29268,
+
+    PHASE_GROUND                        = 0,
+    PHASE_BALCONY                       = 1,
+
+    PHASE_SKELETON_1                    = 1,
+    PHASE_SKELETON_2                    = 2,
+    PHASE_SKELETON_3                    = 3
+};
+
+struct boss_noth : public CreatureScript
+{
+    boss_noth() : CreatureScript("boss_noth") {}
+
+    struct boss_nothAI : public ScriptedAI
+    {
+        boss_nothAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiPhase;
+        uint8 m_uiPhaseSub;
+        uint32 m_uiPhaseTimer;
+
+        uint32 m_uiBlinkTimer;
+        uint32 m_uiCurseTimer;
+        uint32 m_uiSummonTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_GROUND;
+            m_uiPhaseSub = PHASE_GROUND;
+            m_uiPhaseTimer = 90000;
+
+            m_uiBlinkTimer = 25000;
+            m_uiCurseTimer = 4000;
+            m_uiSummonTimer = 12000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
+            }
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_NOTH, IN_PROGRESS);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->SetInCombatWithZone();
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_NOTH, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_NOTH, FAIL);
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+#if defined (CATA)
+            if (SpellEffectEntry const* pSpellEffect = pSpell->GetSpellEffect(EFFECT_INDEX_0))
+            {
+                if (pSpellEffect->Effect == SPELL_EFFECT_LEAP)
+                    DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_CRIPPLE : SPELL_CRIPPLE_H);
+            }
+#else
+            if (pCaster == m_creature && pSpell->Effect[EFFECT_INDEX_0] == SPELL_EFFECT_LEAP)
+            {
+                DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_CRIPPLE : SPELL_CRIPPLE_H);
+            }
+#endif
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiPhase == PHASE_GROUND)
+            {
+                if (m_uiPhaseTimer)                             // After PHASE_SKELETON_3 we won't have a balcony phase
+                {
+                    if (m_uiPhaseTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT) == CAST_OK)
+                        {
+                            DoScriptText(EMOTE_TELEPORT, m_creature);
+                            m_creature->GetMotionMaster()->MoveIdle();
+                            m_uiPhase = PHASE_BALCONY;
+                            ++m_uiPhaseSub;
+
+                            switch (m_uiPhaseSub)               // Set Duration of Skeleton phase
+                            {
+                            case PHASE_SKELETON_1: m_uiPhaseTimer = 70000;  break;
+                            case PHASE_SKELETON_2: m_uiPhaseTimer = 97000;  break;
+                            case PHASE_SKELETON_3: m_uiPhaseTimer = 120000; break;
+                            }
+                            return;
+                        }
+                    }
+                    else
+                        m_uiPhaseTimer -= uiDiff;
+                }
+
+                if (!m_bIsRegularMode)                          // Blink is used only in 25man
+                {
+                    if (m_uiBlinkTimer < uiDiff)
+                    {
+                        static uint32 const auiSpellBlink[4] =
+                        {
+                            SPELL_BLINK_1, SPELL_BLINK_2, SPELL_BLINK_3, SPELL_BLINK_4
+                        };
+
+                        if (DoCastSpellIfCan(m_creature, auiSpellBlink[urand(0, 3)]) == CAST_OK)
+                        {
+                            DoResetThreat();
+                            m_uiBlinkTimer = 25000;
+                        }
+                    }
+                    else
+                        m_uiBlinkTimer -= uiDiff;
+                }
+
+                if (m_uiCurseTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_CURSE_PLAGUEBRINGER : SPELL_CURSE_PLAGUEBRINGER_H);
+                    m_uiCurseTimer = 28000;
+                }
+                else
+                    m_uiCurseTimer -= uiDiff;
+
+                if (m_uiSummonTimer < uiDiff)
+                {
+                    DoScriptText(SAY_SUMMON, m_creature);
+                    DoScriptText(EMOTE_WARRIOR, m_creature);
+
+                    if (m_bIsRegularMode)
+                    {
+                        static uint32 const auiSpellSummonPlaguedWarrior[3] =
+                        {
+                            SPELL_SUMMON_WARRIOR_1, SPELL_SUMMON_WARRIOR_2, SPELL_SUMMON_WARRIOR_3
+                        };
+
+                        for (uint8 i = 0; i < 2; ++i)
+                            DoCastSpellIfCan(m_creature, auiSpellSummonPlaguedWarrior[urand(0, 2)], CAST_TRIGGERED);
+                    }
+                    else
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_WARRIOR_THREE, CAST_TRIGGERED);
+                    }
+
+                    m_uiSummonTimer = 30000;
+                }
+                else
+                    m_uiSummonTimer -= uiDiff;
+
+                DoMeleeAttackIfReady();
+            }
+            else                                                // PHASE_BALCONY
+            {
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT_RETURN) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_TELEPORT_RETURN, m_creature);
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                        switch (m_uiPhaseSub)
+                        {
+                        case PHASE_SKELETON_1: m_uiPhaseTimer = 110000; break;
+                        case PHASE_SKELETON_2: m_uiPhaseTimer = 180000; break;
+                        case PHASE_SKELETON_3:
+                            m_uiPhaseTimer = 0;
+                            // Go Berserk after third Balcony Phase
+                            DoCastSpellIfCan(m_creature, SPELL_BERSERK, CAST_TRIGGERED);
+                            break;
+                        }
+                        m_uiPhase = PHASE_GROUND;
+
+                        return;
+                    }
+                }
+                else
+                    m_uiPhaseTimer -= uiDiff;
+
+                if (m_uiSummonTimer < uiDiff)
+                {
+                    DoScriptText(EMOTE_SKELETON, m_creature);
+
+                    static uint32 const auiSpellSummonPlaguedChampion[10] =
+                    {
+                        SPELL_SUMMON_CHAMP01, SPELL_SUMMON_CHAMP02, SPELL_SUMMON_CHAMP03, SPELL_SUMMON_CHAMP04, SPELL_SUMMON_CHAMP05, SPELL_SUMMON_CHAMP06, SPELL_SUMMON_CHAMP07, SPELL_SUMMON_CHAMP08, SPELL_SUMMON_CHAMP09, SPELL_SUMMON_CHAMP10
+                    };
+
+                    static uint32 const auiSpellSummonPlaguedGuardian[4] =
+                    {
+                        SPELL_SUMMON_GUARD01, SPELL_SUMMON_GUARD02, SPELL_SUMMON_GUARD03, SPELL_SUMMON_GUARD04
+                    };
+
+                    // A bit unclear how many in each sub phase
+                    switch (m_uiPhaseSub)
+                    {
+                    case PHASE_SKELETON_1:
+                        for (uint8 i = 0; i < (m_bIsRegularMode ? 2 : 4); ++i)
+                            DoCastSpellIfCan(m_creature, auiSpellSummonPlaguedChampion[urand(0, 9)], CAST_TRIGGERED);
+
+                        break;
+                    case PHASE_SKELETON_2:
+                        for (uint8 i = 0; i < (m_bIsRegularMode ? 1 : 2); ++i)
+                        {
+                            DoCastSpellIfCan(m_creature, auiSpellSummonPlaguedChampion[urand(0, 9)], CAST_TRIGGERED);
+                            DoCastSpellIfCan(m_creature, auiSpellSummonPlaguedGuardian[urand(0, 3)], CAST_TRIGGERED);
+                        }
+                        break;
+                    case PHASE_SKELETON_3:
+                        for (uint8 i = 0; i < (m_bIsRegularMode ? 2 : 4); ++i)
+                            DoCastSpellIfCan(m_creature, auiSpellSummonPlaguedGuardian[urand(0, 3)], CAST_TRIGGERED);
+
+                        break;
+                    }
+
+                    m_uiSummonTimer = 30000;
+                }
+                else
+                    m_uiSummonTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_nothAI(pCreature);
+    }
+};
+
+void AddSC_boss_noth()
+{
+    Script* s;
+
+    s = new boss_noth();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_noth";
+    //pNewScript->GetAI = &GetAI_boss_noth;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_patchwerk.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_patchwerk.cpp
new file mode 100644
index 000000000..8e132f2c7
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_patchwerk.cpp
@@ -0,0 +1,220 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Patchwerk
+SD%Complete: 100
+SDComment:
+SDCategory: Naxxramas
+EndScriptData */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    SAY_AGGRO1            = -1533017,
+    SAY_AGGRO2            = -1533018,
+    SAY_SLAY              = -1533019,
+    SAY_DEATH             = -1533020,
+
+    EMOTE_GENERIC_BERSERK   = -1000004,
+    EMOTE_GENERIC_ENRAGED   = -1000003,
+
+    SPELL_HATEFULSTRIKE   = 28308,
+    SPELL_HATEFULSTRIKE_H = 59192,
+    SPELL_ENRAGE          = 28131,
+    SPELL_BERSERK         = 26662,
+    SPELL_SLIMEBOLT       = 32309
+};
+
+struct boss_patchwerk : public CreatureScript
+{
+    boss_patchwerk() : CreatureScript("boss_patchwerk") {}
+
+    struct boss_patchwerkAI : public ScriptedAI
+    {
+        boss_patchwerkAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiHatefulStrikeTimer;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiSlimeboltTimer;
+        bool   m_bEnraged;
+        bool   m_bBerserk;
+
+        void Reset() override
+        {
+            m_uiHatefulStrikeTimer = 1000;                      // 1 second
+            m_uiBerserkTimer = MINUTE * 6 * IN_MILLISECONDS;    // 6 minutes
+            m_uiSlimeboltTimer = 10000;
+            m_bEnraged = false;
+            m_bBerserk = false;
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (urand(0, 4))
+                return;
+
+            DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_PATCHWERK, DONE);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_AGGRO1 : SAY_AGGRO2, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_PATCHWERK, IN_PROGRESS);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_PATCHWERK, FAIL);
+        }
+
+        void DoHatefulStrike()
+        {
+            // The ability is used on highest HP target choosen of the top 2 (3 heroic) targets on threat list being in melee range
+            Unit* pTarget = NULL;
+            uint32 uiHighestHP = 0;
+            uint32 uiTargets = m_bIsRegularMode ? 1 : 2;
+
+            ThreatList const& tList = m_creature->GetThreatManager().getThreatList();
+            if (tList.size() > 1)                               // Check if more than two targets, and start loop with second-most aggro
+            {
+                ThreatList::const_iterator iter = tList.begin();
+                std::advance(iter, 1);
+                for (; iter != tList.end(); ++iter)
+                {
+                    if (!uiTargets)
+                        break;
+
+                    if (Unit* pTempTarget = m_creature->GetMap()->GetUnit((*iter)->getUnitGuid()))
+                    {
+                        if (m_creature->CanReachWithMeleeAttack(pTempTarget))
+                        {
+                            if (pTempTarget->GetHealth() > uiHighestHP)
+                            {
+                                uiHighestHP = pTempTarget->GetHealth();
+                                pTarget = pTempTarget;
+                            }
+                            --uiTargets;
+                        }
+                    }
+                }
+            }
+
+            if (!pTarget)
+                pTarget = m_creature->getVictim();
+
+            DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_HATEFULSTRIKE : SPELL_HATEFULSTRIKE_H);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Hateful Strike
+            if (m_uiHatefulStrikeTimer < uiDiff)
+            {
+                DoHatefulStrike();
+                m_uiHatefulStrikeTimer = 1000;
+            }
+            else
+                m_uiHatefulStrikeTimer -= uiDiff;
+
+            // Soft Enrage at 5%
+            if (!m_bEnraged)
+            {
+                if (m_creature->GetHealthPercent() < 5.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_GENERIC_ENRAGED, m_creature);
+                        m_bEnraged = true;
+                    }
+                }
+            }
+
+            // Berserk after 6 minutes
+            if (!m_bBerserk)
+            {
+                if (m_uiBerserkTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_GENERIC_BERSERK, m_creature);
+                        m_bBerserk = true;
+                    }
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+            else
+            {
+                // Slimebolt - casted only while Berserking to prevent kiting
+                if (m_uiSlimeboltTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_SLIMEBOLT);
+                    m_uiSlimeboltTimer = 5000;
+                }
+                else
+                    m_uiSlimeboltTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_patchwerkAI(pCreature);
+    }
+};
+
+void AddSC_boss_patchwerk()
+{
+    Script* s;
+
+    s = new boss_patchwerk();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_patchwerk";
+    //pNewScript->GetAI = &GetAI_boss_patchwerk;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_razuvious.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_razuvious.cpp
new file mode 100644
index 000000000..98d9e28ee
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_razuvious.cpp
@@ -0,0 +1,191 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Razuvious
+SD%Complete: 85%
+SDComment: TODO: Timers and sounds need confirmation - orb handling for normal-mode is missing
+SDCategory: Naxxramas
+EndScriptData */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    SAY_AGGRO1               = -1533120,
+    SAY_AGGRO2               = -1533121,
+    SAY_AGGRO3               = -1533122,
+    SAY_SLAY1                = -1533123,
+    SAY_SLAY2                = -1533124,
+    SAY_COMMAND1             = -1533125,
+    SAY_COMMAND2             = -1533126,
+    SAY_COMMAND3             = -1533127,
+    SAY_COMMAND4             = -1533128,
+    SAY_DEATH                = -1533129,
+
+    SPELL_UNBALANCING_STRIKE = 55470,
+    SPELL_DISRUPTING_SHOUT   = 55543,
+    SPELL_DISRUPTING_SHOUT_H = 29107,
+    SPELL_JAGGED_KNIFE       = 55550,
+    SPELL_HOPELESS           = 29125
+};
+
+struct boss_razuvious : public CreatureScript
+{
+    boss_razuvious() : CreatureScript("boss_razuvious") {}
+
+    struct boss_razuviousAI : public ScriptedAI
+    {
+        boss_razuviousAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiUnbalancingStrikeTimer;
+        uint32 m_uiDisruptingShoutTimer;
+        uint32 m_uiJaggedKnifeTimer;
+        uint32 m_uiCommandSoundTimer;
+
+        void Reset() override
+        {
+            m_uiUnbalancingStrikeTimer = 30000;                 // 30 seconds
+            m_uiDisruptingShoutTimer = 15000;                 // 15 seconds
+            m_uiJaggedKnifeTimer = urand(10000, 15000);
+            m_uiCommandSoundTimer = 40000;                 // 40 seconds
+        }
+
+        void KilledUnit(Unit* /*Victim*/) override
+        {
+            if (urand(0, 3))
+                return;
+
+            switch (urand(0, 1))
+            {
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            DoCastSpellIfCan(m_creature, SPELL_HOPELESS, CAST_TRIGGERED);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_RAZUVIOUS, DONE);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
+            }
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_RAZUVIOUS, IN_PROGRESS);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_RAZUVIOUS, FAIL);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Unbalancing Strike
+            if (m_uiUnbalancingStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_UNBALANCING_STRIKE) == CAST_OK)
+                    m_uiUnbalancingStrikeTimer = 30000;
+            }
+            else
+                m_uiUnbalancingStrikeTimer -= uiDiff;
+
+            // Disrupting Shout
+            if (m_uiDisruptingShoutTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_DISRUPTING_SHOUT : SPELL_DISRUPTING_SHOUT_H) == CAST_OK)
+                    m_uiDisruptingShoutTimer = 25000;
+            }
+            else
+                m_uiDisruptingShoutTimer -= uiDiff;
+
+            // Jagged Knife
+            if (m_uiJaggedKnifeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_JAGGED_KNIFE) == CAST_OK)
+                        m_uiJaggedKnifeTimer = 10000;
+                }
+            }
+            else
+                m_uiJaggedKnifeTimer -= uiDiff;
+
+            // Random say
+            if (m_uiCommandSoundTimer < uiDiff)
+            {
+                switch (urand(0, 3))
+                {
+                case 0: DoScriptText(SAY_COMMAND1, m_creature); break;
+                case 1: DoScriptText(SAY_COMMAND2, m_creature); break;
+                case 2: DoScriptText(SAY_COMMAND3, m_creature); break;
+                case 3: DoScriptText(SAY_COMMAND4, m_creature); break;
+                }
+
+                m_uiCommandSoundTimer = 40000;
+            }
+            else
+                m_uiCommandSoundTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_razuviousAI(pCreature);
+    }
+};
+
+void AddSC_boss_razuvious()
+{
+    Script* s;
+
+    s = new boss_razuvious();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_razuvious";
+    //pNewScript->GetAI = &GetAI_boss_razuvious;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_sapphiron.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_sapphiron.cpp
new file mode 100644
index 000000000..90d27d400
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_sapphiron.cpp
@@ -0,0 +1,375 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Sapphiron
+SD%Complete: 80
+SDComment: Some spells need core implementation
+SDCategory: Naxxramas
+EndScriptData */
+
+/* Additional comments:
+ * Bugged spells:   28560 (needs maxTarget = 1, Summon of 16474 implementation, TODO, 30s duration)
+ *                  28526 (needs ScriptEffect to cast 28522 onto random target)
+ *
+ * Achievement-criteria check needs implementation
+ *
+ * Frost-Breath ability: the dummy spell 30101 is self cast, so it won't take the needed delay of ~7s until it reaches its target
+ *                       As Sapphiron is displayed visually in hight (hovering), and the spell is cast with target=self-location
+ *                       which is still on the ground, the client shows a nice slow falling of the visual animation
+ *                       Insisting on using the Dummy-Effect to cast the breath-dmg spells, would require, to relocate Sapphi internally,
+ *                       and to hack the targeting to be "on the ground" - Hence the prefered way as it is now!
+ */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    EMOTE_BREATH                = -1533082,
+    EMOTE_GENERIC_ENRAGED       = -1000003,
+    EMOTE_FLY                   = -1533022,
+    EMOTE_GROUND                = -1533083,
+
+    SPELL_CLEAVE                = 19983,
+    SPELL_TAIL_SWEEP            = 55697,
+    SPELL_TAIL_SWEEP_H          = 55696,
+    SPELL_ICEBOLT               = 28526,
+    SPELL_FROST_BREATH_DUMMY    = 30101,
+    SPELL_FROST_BREATH_A        = 28524,
+    SPELL_FROST_BREATH_B        = 29318,
+    SPELL_FROST_AURA            = 28531,
+    SPELL_FROST_AURA_H          = 55799,
+    SPELL_LIFE_DRAIN            = 28542,
+    SPELL_LIFE_DRAIN_H          = 55665,
+    SPELL_CHILL                 = 28547,
+    SPELL_CHILL_H               = 55699,
+    SPELL_SUMMON_BLIZZARD       = 28560,
+    SPELL_BESERK                = 26662,
+    SPELL_ACHIEVEMENT_CHECK     = 60539,                    // unused
+
+    NPC_YOU_KNOW_WHO            = 16474,
+};
+
+static const float aLiftOffPosition[3] = {3522.386f, -5236.784f, 137.709f};
+
+enum Phases
+{
+    PHASE_GROUND        = 1,
+    PHASE_LIFT_OFF      = 2,
+    PHASE_AIR_BOLTS     = 3,
+    PHASE_AIR_BREATH    = 4,
+    PHASE_LANDING       = 5,
+};
+
+struct boss_sapphiron : public CreatureScript
+{
+    boss_sapphiron() : CreatureScript("boss_sapphiron") {}
+
+    struct boss_sapphironAI : public ScriptedAI
+    {
+        boss_sapphironAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiTailSweepTimer;
+        uint32 m_uiIceboltTimer;
+        uint32 m_uiFrostBreathTimer;
+        uint32 m_uiLifeDrainTimer;
+        uint32 m_uiBlizzardTimer;
+        uint32 m_uiFlyTimer;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiLandTimer;
+
+        uint32 m_uiIceboltCount;
+        Phases m_Phase;
+
+        void Reset() override
+        {
+            m_uiCleaveTimer = 5000;
+            m_uiTailSweepTimer = 12000;
+            m_uiFrostBreathTimer = 7000;
+            m_uiLifeDrainTimer = 11000;
+            m_uiBlizzardTimer = 15000;                          // "Once the encounter starts,based on your version of Naxx, this will be used x2 for normal and x6 on HC"
+            m_uiFlyTimer = 46000;
+            m_uiIceboltTimer = 5000;
+            m_uiLandTimer = 0;
+            m_uiBerserkTimer = 15 * MINUTE * IN_MILLISECONDS;
+            m_Phase = PHASE_GROUND;
+            m_uiIceboltCount = 0;
+
+            SetCombatMovement(true);
+            m_creature->SetLevitate(false);
+            // m_creature->ApplySpellMod(SPELL_FROST_AURA, SPELLMOD_DURATION, -1);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_FROST_AURA : SPELL_FROST_AURA_H);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SAPPHIRON, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SAPPHIRON, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SAPPHIRON, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_YOU_KNOW_WHO)
+            {
+                if (Unit* pEnemy = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    pSummoned->AI()->AttackStart(pEnemy);
+            }
+        }
+
+        void MovementInform(uint32 uiType, uint32 /*uiPointId*/) override
+        {
+            if (uiType == POINT_MOTION_TYPE && m_Phase == PHASE_LIFT_OFF)
+            {
+                DoScriptText(EMOTE_FLY, m_creature);
+                m_creature->HandleEmote(EMOTE_ONESHOT_LIFTOFF);
+                m_creature->SetLevitate(true);
+                m_Phase = PHASE_AIR_BOLTS;
+
+                m_uiFrostBreathTimer = 5000;
+                m_uiIceboltTimer = 5000;
+                m_uiIceboltCount = 0;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            switch (m_Phase)
+            {
+            case PHASE_GROUND:
+                if (m_uiCleaveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                        m_uiCleaveTimer = urand(5000, 10000);
+                }
+                else
+                    m_uiCleaveTimer -= uiDiff;
+
+                if (m_uiTailSweepTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_TAIL_SWEEP : SPELL_TAIL_SWEEP_H) == CAST_OK)
+                        m_uiTailSweepTimer = urand(7000, 10000);
+                }
+                else
+                    m_uiTailSweepTimer -= uiDiff;
+
+                if (m_uiLifeDrainTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_LIFE_DRAIN : SPELL_LIFE_DRAIN_H) == CAST_OK)
+                        m_uiLifeDrainTimer = 23000;
+                }
+                else
+                    m_uiLifeDrainTimer -= uiDiff;
+
+                if (m_uiBlizzardTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_BLIZZARD) == CAST_OK)
+                        m_uiBlizzardTimer = 20000;
+                }
+                else
+                    m_uiBlizzardTimer -= uiDiff;
+
+                if (m_creature->GetHealthPercent() > 10.0f)
+                {
+                    if (m_uiFlyTimer < uiDiff)
+                    {
+                        m_Phase = PHASE_LIFT_OFF;
+                        m_creature->InterruptNonMeleeSpells(false);
+                        SetCombatMovement(false);
+                        m_creature->GetMotionMaster()->Clear(false);
+                        m_creature->GetMotionMaster()->MovePoint(1, aLiftOffPosition[0], aLiftOffPosition[1], aLiftOffPosition[2]);
+                        // TODO This should clear the target, too
+
+                        return;
+                    }
+                    else
+                        m_uiFlyTimer -= uiDiff;
+                }
+
+                // Only Phase in which we have melee attack!
+                DoMeleeAttackIfReady();
+                break;
+            case PHASE_LIFT_OFF:
+                break;
+            case PHASE_AIR_BOLTS:
+                // WOTLK Changed, originally was 5
+                if (m_uiIceboltCount == (uint32)(m_bIsRegularMode ? 2 : 3))
+                {
+                    if (m_uiFrostBreathTimer < uiDiff)
+                    {
+                        m_Phase = PHASE_AIR_BREATH;
+                        DoScriptText(EMOTE_BREATH, m_creature);
+                        DoCastSpellIfCan(m_creature, SPELL_FROST_BREATH_DUMMY);
+                        m_uiFrostBreathTimer = 7000;
+                    }
+                    else
+                        m_uiFrostBreathTimer -= uiDiff;
+                }
+                else
+                {
+                    if (m_uiIceboltTimer < uiDiff)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_ICEBOLT);
+
+                        ++m_uiIceboltCount;
+                        m_uiIceboltTimer = 4000;
+                    }
+                    else
+                        m_uiIceboltTimer -= uiDiff;
+                }
+
+                break;
+            case PHASE_AIR_BREATH:
+                if (m_uiFrostBreathTimer)
+                {
+                    if (m_uiFrostBreathTimer <= uiDiff)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_FROST_BREATH_A, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_FROST_BREATH_B, CAST_TRIGGERED);
+                        m_uiFrostBreathTimer = 0;
+
+                        m_uiLandTimer = 4000;
+                    }
+                    else
+                        m_uiFrostBreathTimer -= uiDiff;
+                }
+
+                if (m_uiLandTimer)
+                {
+                    if (m_uiLandTimer <= uiDiff)
+                    {
+                        // Begin Landing
+                        DoScriptText(EMOTE_GROUND, m_creature);
+                        m_creature->HandleEmote(EMOTE_ONESHOT_LAND);
+                        m_creature->SetLevitate(false);
+
+                        m_Phase = PHASE_LANDING;
+                        m_uiLandTimer = 2000;
+                    }
+                    else
+                        m_uiLandTimer -= uiDiff;
+                }
+
+                break;
+            case PHASE_LANDING:
+                if (m_uiLandTimer < uiDiff)
+                {
+                    m_Phase = PHASE_GROUND;
+
+                    SetCombatMovement(true);
+                    m_creature->GetMotionMaster()->Clear(false);
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+
+                    m_uiFlyTimer = 67000;
+                    m_uiLandTimer = 0;
+                }
+                else
+                    m_uiLandTimer -= uiDiff;
+
+                break;
+            }
+
+            // Enrage can happen in any phase
+            if (m_uiBerserkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BESERK) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_GENERIC_ENRAGED, m_creature);
+                    m_uiBerserkTimer = 300000;
+                }
+            }
+            else
+                m_uiBerserkTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_sapphironAI(pCreature);
+    }
+};
+
+struct go_sapphiron_birth : public GameObjectScript
+{
+    go_sapphiron_birth() : GameObjectScript("go_sapphiron_birth") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+
+        if (!pInstance)
+            return true;
+
+        if (pInstance->GetData(TYPE_SAPPHIRON) != NOT_STARTED)
+            return true;
+
+        // If already summoned return (safety check)
+        if (pInstance->GetSingleCreatureFromStorage(NPC_SAPPHIRON, true))
+            return true;
+
+        // Set data to special and allow the Go animation to proceed
+        pInstance->SetData(TYPE_SAPPHIRON, SPECIAL);
+        return false;
+    }
+};
+
+void AddSC_boss_sapphiron()
+{
+    Script* s;
+
+    s = new boss_sapphiron();
+    s->RegisterSelf();
+
+    s = new go_sapphiron_birth();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_sapphiron";
+    //pNewScript->GetAI = &GetAI_boss_sapphiron;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_sapphiron_birth";
+    //pNewScript->pGOUse = &GOUse_go_sapphiron_birth;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/boss_thaddius.cpp b/src/modules/SD3/scripts/northrend/naxxramas/boss_thaddius.cpp
new file mode 100644
index 000000000..f5c7316f2
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/boss_thaddius.cpp
@@ -0,0 +1,810 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Thaddius
+SD%Complete: 85
+SDComment: Magnetic Pull, Tesla-Chains, Polaritiy-Shift missing (core!)
+SDCategory: Naxxramas
+EndScriptData */
+
+/* ContentData
+boss_thaddius
+npc_tesla_coil
+boss_stalagg
+boss_feugen
+EndContentData */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+enum
+{
+    // Stalagg
+    SAY_STAL_AGGRO                  = -1533023,
+    SAY_STAL_SLAY                   = -1533024,
+    SAY_STAL_DEATH                  = -1533025,
+
+    // Feugen
+    SAY_FEUG_AGGRO                  = -1533026,
+    SAY_FEUG_SLAY                   = -1533027,
+    SAY_FEUG_DEATH                  = -1533028,
+
+    // Tesla Coils
+    EMOTE_LOSING_LINK               = -1533149,
+    EMOTE_TESLA_OVERLOAD            = -1533150,
+
+    // Thaddus
+    SAY_AGGRO_1                     = -1533030,
+    SAY_AGGRO_2                     = -1533031,
+    SAY_AGGRO_3                     = -1533032,
+    SAY_SLAY                        = -1533033,
+    SAY_ELECT                       = -1533034,
+    SAY_DEATH                       = -1533035,
+    // Background screams in Instance if Thaddius still alive, needs general support most likely
+    SAY_SCREAM1                     = -1533036,
+    SAY_SCREAM2                     = -1533037,
+    SAY_SCREAM3                     = -1533038,
+    SAY_SCREAM4                     = -1533039,
+    EMOTE_POLARITY_SHIFT            = -1533151,
+
+    // Thaddius Spells
+    SPELL_THADIUS_SPAWN             = 28160,
+    SPELL_THADIUS_LIGHTNING_VISUAL  = 28136,
+    SPELL_BALL_LIGHTNING            = 28299,
+    SPELL_CHAIN_LIGHTNING           = 28167,
+    SPELL_CHAIN_LIGHTNING_H         = 54531,
+    SPELL_POLARITY_SHIFT            = 28089,
+    SPELL_BESERK                    = 27680,
+    SPELL_CLEAR_CHARGES             = 63133,                // TODO NYI, cast on death, most likely to remove remaining buffs
+
+    // Stalagg & Feugen Spells
+    // SPELL_WARSTOMP                  = 28125,             // Not used in Wotlk Version
+    SPELL_MAGNETIC_PULL_A           = 28338,
+    SPELL_MAGNETIC_PULL_B           = 54517,                // used by Feugen (wotlk)
+    SPELL_STATIC_FIELD              = 28135,
+    SPELL_STATIC_FIELD_H            = 54528,
+    SPELL_POWERSURGE_H              = 28134,
+    SPELL_POWERSURGE                = 54529,
+
+    // Tesla Spells
+    SPELL_FEUGEN_CHAIN              = 28111,
+    SPELL_STALAGG_CHAIN             = 28096,
+    SPELL_FEUGEN_TESLA_PASSIVE      = 28109,
+    SPELL_STALAGG_TESLA_PASSIVE     = 28097,
+    SPELL_SHOCK_OVERLOAD            = 28159,
+    SPELL_SHOCK                     = 28099,
+};
+
+/************
+** boss_thaddius
+************/
+
+// Actually this boss behaves like a NoMovement Boss (SPELL_BALL_LIGHTNING) - but there are some movement packages used, unknown what this means!
+struct boss_thaddius : public CreatureScript
+{
+    boss_thaddius() : CreatureScript("boss_thaddius") {}
+
+    struct boss_thaddiusAI : public Scripted_NoMovementAI
+    {
+        boss_thaddiusAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiPolarityShiftTimer;
+        uint32 m_uiChainLightningTimer;
+        uint32 m_uiBallLightningTimer;
+        uint32 m_uiBerserkTimer;
+
+        void Reset() override
+        {
+            m_uiPolarityShiftTimer = 15 * IN_MILLISECONDS;
+            m_uiChainLightningTimer = 8 * IN_MILLISECONDS;
+            m_uiBallLightningTimer = 1 * IN_MILLISECONDS;
+            m_uiBerserkTimer = 6 * MINUTE * IN_MILLISECONDS;
+
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            }
+
+            // Make Attackable
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THADDIUS, FAIL);
+
+                // Respawn Adds:
+                Creature* pFeugen = m_pInstance->GetSingleCreatureFromStorage(NPC_FEUGEN);
+                Creature* pStalagg = m_pInstance->GetSingleCreatureFromStorage(NPC_STALAGG);
+                if (pFeugen)
+                {
+                    pFeugen->ForcedDespawn();
+                    pFeugen->Respawn();
+                }
+                if (pStalagg)
+                {
+                    pStalagg->ForcedDespawn();
+                    pStalagg->Respawn();
+                }
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THADDIUS, DONE);
+
+                // Force Despawn of Adds
+                Creature* pFeugen = m_pInstance->GetSingleCreatureFromStorage(NPC_FEUGEN);
+                Creature* pStalagg = m_pInstance->GetSingleCreatureFromStorage(NPC_STALAGG);
+
+                if (pFeugen)
+                    pFeugen->ForcedDespawn();
+                if (pStalagg)
+                    pStalagg->ForcedDespawn();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_pInstance)
+                return;
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Berserk
+            if (m_uiBerserkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BESERK) == CAST_OK)                  // allow combat movement?
+                    m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+            }
+            else
+                m_uiBerserkTimer -= uiDiff;
+
+            // Polarity Shift
+            if (m_uiPolarityShiftTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_POLARITY_SHIFT, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                {
+                    DoScriptText(SAY_ELECT, m_creature);
+                    DoScriptText(EMOTE_POLARITY_SHIFT, m_creature);
+                    m_uiPolarityShiftTimer = 30 * IN_MILLISECONDS;
+                }
+            }
+            else
+                m_uiPolarityShiftTimer -= uiDiff;
+
+            // Chain Lightning
+            if (m_uiChainLightningTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0);
+                if (pTarget && DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_CHAIN_LIGHTNING : SPELL_CHAIN_LIGHTNING_H) == CAST_OK)
+                    m_uiChainLightningTimer = 15 * IN_MILLISECONDS;
+            }
+            else
+                m_uiChainLightningTimer -= uiDiff;
+
+            // Ball Lightning if target not in melee range
+            // TODO: Verify, likely that the boss should attack any enemy in melee range before starting to cast
+            if (!m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+            {
+                if (m_uiBallLightningTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_BALL_LIGHTNING) == CAST_OK)
+                        m_uiBallLightningTimer = 1 * IN_MILLISECONDS;
+                }
+                else
+                    m_uiBallLightningTimer -= uiDiff;
+            }
+            else
+                DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_thaddiusAI(pCreature);
+    }
+};
+
+struct spell_shock_overload : public SpellScript
+{
+    spell_shock_overload() : SpellScript("spell_shock_overload") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        Creature* pCreatureTarget = pTarget->ToCreature();
+        //case SPELL_SHOCK_OVERLOAD:
+        if (uiEffIndex == EFFECT_INDEX_0)
+        {
+            // Only do something to Thaddius, and on the first hit.
+            if (pCreatureTarget->GetEntry() != NPC_THADDIUS || !pCreatureTarget->HasAura(SPELL_THADIUS_SPAWN))
+                return true;
+            // remove Stun and then Cast
+            pCreatureTarget->RemoveAurasDueToSpell(SPELL_THADIUS_SPAWN);
+            pCreatureTarget->CastSpell(pCreatureTarget, SPELL_THADIUS_LIGHTNING_VISUAL, false);
+            return true;
+        }
+        return false;
+    }
+};
+
+struct spell_thad_lightning_visual : public SpellScript
+{
+    spell_thad_lightning_visual() : SpellScript("spell_thad_lightning_visual") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        //case SPELL_THADIUS_LIGHTNING_VISUAL:
+        Creature* pCreatureTarget = pTarget->ToCreature();
+        if (uiEffIndex == EFFECT_INDEX_0 && pCreatureTarget->GetEntry() == NPC_THADDIUS)
+        {
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreatureTarget->GetInstanceData())
+            {
+                if (Player* pPlayer = pInstance->GetPlayerInMap(true, false))
+                    pCreatureTarget->AI()->AttackStart(pPlayer);
+            }
+            return true;
+        }
+        return false;
+    }
+};
+
+/************
+** npc_tesla_coil
+************/
+
+struct npc_tesla_coil : public CreatureScript
+{
+    npc_tesla_coil() : CreatureScript("npc_tesla_coil") {}
+
+    struct npc_tesla_coilAI : public Scripted_NoMovementAI
+    {
+        npc_tesla_coilAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_uiSetupTimer = 1 * IN_MILLISECONDS;
+            m_uiOverloadTimer = 0;
+            m_bReapply = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bToFeugen;
+        bool m_bReapply;
+
+        uint32 m_uiSetupTimer;
+        uint32 m_uiOverloadTimer;
+
+        void Reset() override {}
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(EMOTE_LOSING_LINK, m_creature);
+        }
+
+        // Overwrite this function here to
+        // * Keep Chain spells casted when evading after useless EnterCombat caused by 'buffing' the add
+        // * To not remove the Passive spells when evading after ie killed a player
+        void EnterEvadeMode() override
+        {
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop();
+        }
+
+        bool SetupChain()
+        {
+            // Check, if instance_ script failed or encounter finished
+            if (!m_pInstance || m_pInstance->GetData(TYPE_THADDIUS) == DONE)
+                return true;
+
+            GameObject* pNoxTeslaFeugen = m_pInstance->GetSingleGameObjectFromStorage(GO_CONS_NOX_TESLA_FEUGEN);
+            GameObject* pNoxTeslaStalagg = m_pInstance->GetSingleGameObjectFromStorage(GO_CONS_NOX_TESLA_STALAGG);
+
+            // Try again, till Tesla GOs are spawned
+            if (!pNoxTeslaFeugen || !pNoxTeslaStalagg)
+                return false;
+
+            m_bToFeugen = m_creature->GetDistanceOrder(pNoxTeslaFeugen, pNoxTeslaStalagg);
+
+            if (DoCastSpellIfCan(m_creature, m_bToFeugen ? SPELL_FEUGEN_CHAIN : SPELL_STALAGG_CHAIN) == CAST_OK)
+                return true;
+
+            return false;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature*, Unit*, uint32 data) override
+        {
+            switch (eventType)
+            {
+            case AI_EVENT_CUSTOM_A:
+                SetOverloading();
+                break;
+            case AI_EVENT_CUSTOM_B:
+                ReApplyChain(data);
+                break;
+            default:
+                break;
+            }
+        }
+
+        void ReApplyChain(uint32 uiEntry)
+        {
+            if (uiEntry)                                        // called from Stalagg/Feugen with their entry
+            {
+                // Only apply chain to own add
+                if ((uiEntry == NPC_FEUGEN && !m_bToFeugen) || (uiEntry == NPC_STALAGG && m_bToFeugen))
+                    return;
+
+                m_bReapply = true;                              // Reapply Chains on next tick
+            }
+            else                                                // if called from next tick, needed because otherwise the spell doesn't bind
+            {
+                m_bReapply = false;
+                m_creature->InterruptNonMeleeSpells(true);
+                GameObject* pGo = m_pInstance->GetSingleGameObjectFromStorage(m_bToFeugen ? GO_CONS_NOX_TESLA_FEUGEN : GO_CONS_NOX_TESLA_STALAGG);
+
+                if (pGo && pGo->GetGoType() == GAMEOBJECT_TYPE_BUTTON && pGo->getLootState() == GO_ACTIVATED)
+                    pGo->ResetDoorOrButton();
+
+                DoCastSpellIfCan(m_creature, m_bToFeugen ? SPELL_FEUGEN_CHAIN : SPELL_STALAGG_CHAIN);
+            }
+        }
+
+        void SetOverloading()
+        {
+            m_uiOverloadTimer = 14 * IN_MILLISECONDS;           // it takes some time to overload and activate Thaddius
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            m_creature->SelectHostileTarget();
+
+            if (!m_uiOverloadTimer && !m_uiSetupTimer && !m_bReapply)
+                return;                                         // Nothing to do this tick
+
+            if (m_uiSetupTimer)
+            {
+                if (m_uiSetupTimer <= uiDiff)
+                {
+                    if (SetupChain())
+                        m_uiSetupTimer = 0;
+                    else
+                        m_uiSetupTimer = 5 * IN_MILLISECONDS;
+                }
+                else
+                    m_uiSetupTimer -= uiDiff;
+            }
+
+            if (m_uiOverloadTimer)
+            {
+                if (m_uiOverloadTimer <= uiDiff)
+                {
+                    m_uiOverloadTimer = 0;
+                    m_creature->RemoveAurasDueToSpell(m_bToFeugen ? SPELL_FEUGEN_TESLA_PASSIVE : SPELL_STALAGG_TESLA_PASSIVE);
+                    DoCastSpellIfCan(m_creature, SPELL_SHOCK_OVERLOAD, CAST_INTERRUPT_PREVIOUS);
+                    DoScriptText(EMOTE_TESLA_OVERLOAD, m_creature);
+                    m_pInstance->DoUseDoorOrButton(m_bToFeugen ? GO_CONS_NOX_TESLA_FEUGEN : GO_CONS_NOX_TESLA_STALAGG);
+                }
+                else
+                    m_uiOverloadTimer -= uiDiff;
+            }
+
+            if (m_bReapply)
+                ReApplyChain(0);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_tesla_coilAI(pCreature);
+    }
+};
+
+/************
+** boss_thaddiusAddsAI - Superclass for Feugen & Stalagg
+************/
+
+struct boss_thaddiusAddsAI : public ScriptedAI
+{
+    boss_thaddiusAddsAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+    }
+
+    ScriptedInstance* m_pInstance;
+    bool m_bIsRegularMode;
+
+    bool m_bFakeDeath;
+    bool m_bBothDead;
+
+    uint32 m_uiHoldTimer;
+    // uint32 m_uiWarStompTimer;
+    uint32 m_uiReviveTimer;
+
+    void Reset() override
+    {
+        m_bFakeDeath = false;
+        m_bBothDead = false;
+
+        m_uiReviveTimer = 5 * IN_MILLISECONDS;
+        m_uiHoldTimer = 2 * IN_MILLISECONDS;
+        // m_uiWarStompTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS);
+
+        // We might Reset while faking death, so undo this
+        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        m_creature->SetHealth(m_creature->GetMaxHealth());
+        m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+    }
+
+    Creature* GetOtherAdd()                                 // For Stalagg returns pFeugen, for Feugen returns pStalagg
+    {
+        switch (m_creature->GetEntry())
+        {
+            case NPC_FEUGEN:  return m_pInstance->GetSingleCreatureFromStorage(NPC_STALAGG);
+            case NPC_STALAGG: return m_pInstance->GetSingleCreatureFromStorage(NPC_FEUGEN);
+            default:
+                return NULL;
+        }
+    }
+
+    void Aggro(Unit* pWho) override
+    {
+        if (!m_pInstance)
+            return;
+
+        m_pInstance->SetData(TYPE_THADDIUS, IN_PROGRESS);
+
+        if (Creature* pOtherAdd = GetOtherAdd())
+        {
+            if (!pOtherAdd->IsInCombat())
+                pOtherAdd->AI()->AttackStart(pWho);
+        }
+    }
+
+    void JustRespawned() override
+    {
+        Reset();                                            // Needed to reset the flags properly
+
+        if (!m_pInstance)
+            return;
+
+        m_pInstance->SetData(TYPE_DO_THAD_CHAIN, m_creature->GetEntry());
+    }
+
+    void JustReachedHome() override
+    {
+        if (!m_pInstance)
+            return;
+
+        if (Creature* pOther = GetOtherAdd())
+        {
+            if (boss_thaddiusAddsAI* pOtherAI = dynamic_cast<boss_thaddiusAddsAI*>(pOther->AI()))
+            {
+                if (pOtherAI->IsCountingDead())
+                {
+                    pOther->ForcedDespawn();
+                    pOther->Respawn();
+                }
+            }
+        }
+
+        // Reapply Chains if needed
+        if (!m_creature->HasAura(SPELL_FEUGEN_CHAIN) && !m_creature->HasAura(SPELL_STALAGG_CHAIN))
+            JustRespawned();
+
+        m_pInstance->SetData(TYPE_THADDIUS, FAIL);
+    }
+
+    void Revive()
+    {
+        DoResetThreat();
+        PauseCombatMovement();
+        Reset();
+    }
+
+    bool IsCountingDead()
+    {
+        return m_bFakeDeath || m_creature->IsDead();
+    }
+
+    void PauseCombatMovement()
+    {
+        SetCombatMovement(false);
+        m_uiHoldTimer = 1500;
+    }
+
+    virtual void UpdateAddAI(const uint32 /*uiDiff*/) {}        // Used for Add-specific spells
+
+    void UpdateAI(const uint32 uiDiff) override
+    {
+        if (m_bBothDead)                                    // This is the case while fighting Thaddius
+            return;
+
+        if (m_bFakeDeath)
+        {
+            if (m_uiReviveTimer < uiDiff)
+            {
+                if (Creature* pOther = GetOtherAdd())
+                {
+                    if (boss_thaddiusAddsAI* pOtherAI = dynamic_cast<boss_thaddiusAddsAI*>(pOther->AI()))
+                    {
+                        if (!pOtherAI->IsCountingDead())    // Raid was to slow to kill the second add
+                            Revive();
+                        else
+                        {
+                            m_bBothDead = true;             // Now both adds are counting dead
+                            pOtherAI->m_bBothDead = true;
+                            // Set both Teslas to overload
+                            m_pInstance->SetData(TYPE_DO_THAD_OVERLOAD, 0);
+                        }
+                    }
+                }
+            }
+            else
+                m_uiReviveTimer -= uiDiff;
+            return;
+        }
+
+        if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            return;
+
+        if (m_uiHoldTimer)                                  // A short timer preventing combat movement after revive
+        {
+            if (m_uiHoldTimer <= uiDiff)
+            {
+                SetCombatMovement(true);
+                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                m_uiHoldTimer = 0;
+            }
+            else
+                m_uiHoldTimer -= uiDiff;
+        }
+
+        /*  Doesn't happen in wotlk version any more
+        if (m_uiWarStompTimer < uiDiff)
+        {
+            if (DoCastSpellIfCan(m_creature, SPELL_WARSTOMP) == CAST_OK)
+                m_uiWarStompTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS);
+        }
+        else
+            m_uiWarStompTimer -= uiDiff;*/
+
+        UpdateAddAI(uiDiff);                    // For Add Specific Abilities
+
+        DoMeleeAttackIfReady();
+    }
+
+    void DamageTaken(Unit* pKiller, uint32& uiDamage) override
+    {
+        if (uiDamage < m_creature->GetHealth())
+            return;
+
+        // Prevent glitch if in fake death
+        if (m_bFakeDeath)
+        {
+            uiDamage = 0;
+            return;
+        }
+
+        // prevent death
+        uiDamage = 0;
+        m_bFakeDeath = true;
+
+        m_creature->InterruptNonMeleeSpells(false);
+        m_creature->SetHealth(0);
+        m_creature->StopMoving();
+        m_creature->ClearComboPointHolders();
+        m_creature->RemoveAllAurasOnDeath();
+        m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+        m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        m_creature->ClearAllReactives();
+        m_creature->GetMotionMaster()->Clear();
+        m_creature->GetMotionMaster()->MoveIdle();
+        m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+
+        JustDied(pKiller);                                  // Texts
+    }
+};
+
+/************
+** boss_stalagg
+************/
+
+struct boss_stalagg : public CreatureScript
+{
+    boss_stalagg() : CreatureScript("boss_stalagg") {}
+
+    struct boss_stalaggAI : public boss_thaddiusAddsAI
+    {
+        boss_stalaggAI(Creature* pCreature) : boss_thaddiusAddsAI(pCreature)
+        {
+        }
+        uint32 m_uiPowerSurgeTimer;
+
+        void Reset() override
+        {
+            boss_thaddiusAddsAI::Reset();
+            m_uiPowerSurgeTimer = urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS);
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            DoScriptText(SAY_STAL_AGGRO, m_creature);
+            boss_thaddiusAddsAI::Aggro(pWho);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_STAL_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+                DoScriptText(SAY_STAL_SLAY, m_creature);
+        }
+
+        void UpdateAddAI(const uint32 uiDiff)
+        {
+            if (m_uiPowerSurgeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_POWERSURGE : SPELL_POWERSURGE_H) == CAST_OK)
+                    m_uiPowerSurgeTimer = urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS);
+            }
+            else
+                m_uiPowerSurgeTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_stalaggAI(pCreature);
+    }
+};
+
+/************
+** boss_feugen
+************/
+
+struct boss_feugen : public CreatureScript
+{
+    boss_feugen() : CreatureScript("boss_feugen") {}
+
+    struct boss_feugenAI : public boss_thaddiusAddsAI
+    {
+        boss_feugenAI(Creature* pCreature) : boss_thaddiusAddsAI(pCreature)
+        {
+        }
+        uint32 m_uiStaticFieldTimer;
+        uint32 m_uiMagneticPullTimer;                           // TODO, missing
+
+        void Reset() override
+        {
+            boss_thaddiusAddsAI::Reset();
+            m_uiStaticFieldTimer = urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS);
+            m_uiMagneticPullTimer = 20 * IN_MILLISECONDS;
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            DoScriptText(SAY_FEUG_AGGRO, m_creature);
+            boss_thaddiusAddsAI::Aggro(pWho);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_FEUG_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+                DoScriptText(SAY_FEUG_SLAY, m_creature);
+        }
+
+        void UpdateAddAI(const uint32 uiDiff)
+        {
+            if (m_uiStaticFieldTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_STATIC_FIELD : SPELL_STATIC_FIELD_H) == CAST_OK)
+                    m_uiStaticFieldTimer = urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS);
+            }
+            else
+                m_uiStaticFieldTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_feugenAI(pCreature);
+    }
+};
+
+void AddSC_boss_thaddius()
+{
+    Script* s;
+
+    s = new boss_thaddius();
+    s->RegisterSelf();
+    s = new boss_stalagg();
+    s->RegisterSelf();
+    s = new boss_feugen();
+    s->RegisterSelf();
+    s = new npc_tesla_coil();
+    s->RegisterSelf();
+
+    s = new spell_shock_overload();
+    s->RegisterSelf();
+    s = new spell_thad_lightning_visual();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_thaddius";
+    //pNewScript->GetAI = &GetAI_boss_thaddius;
+    //pNewScript->pEffectDummyNPC = &EffectDummyNPC_spell_thaddius_encounter;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_stalagg";
+    //pNewScript->GetAI = &GetAI_boss_stalagg;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_feugen";
+    //pNewScript->GetAI = &GetAI_boss_feugen;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_tesla_coil";
+    //pNewScript->GetAI = &GetAI_npc_tesla_coil;
+    //pNewScript->pEffectDummyNPC = &EffectDummyNPC_spell_thaddius_encounter;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/instance_naxxramas.cpp b/src/modules/SD3/scripts/northrend/naxxramas/instance_naxxramas.cpp
new file mode 100644
index 000000000..d94151cec
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/instance_naxxramas.cpp
@@ -0,0 +1,1005 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Naxxramas
+SD%Complete: 90%
+SDComment:
+SDCategory: Naxxramas
+EndScriptData */
+
+#include "precompiled.h"
+#include "naxxramas.h"
+
+static const DialogueEntry aNaxxDialogue[] =
+{
+    {NPC_KELTHUZAD,         0,                  10000},
+    {SAY_SAPP_DIALOG1,      NPC_KELTHUZAD,      8000},
+    {SAY_SAPP_DIALOG2_LICH, NPC_THE_LICHKING,   14000},
+    {SAY_SAPP_DIALOG3,      NPC_KELTHUZAD,      10000},
+    {SAY_SAPP_DIALOG4_LICH, NPC_THE_LICHKING,   12000},
+    {SAY_SAPP_DIALOG5,      NPC_KELTHUZAD,      0},
+    {NPC_THANE,             0,                  10000},
+    {SAY_KORT_TAUNT1,       NPC_THANE,          5000},
+    {SAY_ZELI_TAUNT1,       NPC_ZELIEK,         6000},
+    {SAY_BLAU_TAUNT1,       NPC_BLAUMEUX,       6000},
+    {SAY_RIVE_TAUNT1,       NPC_RIVENDARE,      6000},
+    {SAY_BLAU_TAUNT2,       NPC_BLAUMEUX,       6000},
+    {SAY_ZELI_TAUNT2,       NPC_ZELIEK,         5000},
+    {SAY_KORT_TAUNT2,       NPC_THANE,          7000},
+    {SAY_RIVE_TAUNT2,       NPC_RIVENDARE,      0},
+    {0, 0, 0}
+};
+
+struct GothTrigger
+{
+    bool bIsRightSide;
+    bool bIsAnchorHigh;
+};
+
+static const float aSapphPositions[4] = { 3521.48f, -5234.87f, 137.626f, 4.53329f };
+
+struct is_naxxramas : public InstanceScript
+{
+    is_naxxramas() : InstanceScript("instance_naxxramas") {}
+
+    class  instance_naxxramas : public ScriptedInstance
+    {
+    public:
+        instance_naxxramas(Map* pMap) : ScriptedInstance(pMap),
+            m_fChamberCenterX(0.0f),
+            m_fChamberCenterY(0.0f),
+            m_fChamberCenterZ(0.0f),
+            m_uiSapphSpawnTimer(0),
+            m_uiTauntTimer(0),
+            m_uiHorsemenAchievTimer(0),
+            m_uiHorseMenKilled(0),
+            m_dialogueHelper(aNaxxDialogue)
+        {
+            Initialize();
+        }
+
+        ~instance_naxxramas()
+        {
+            if (!m_mGothTriggerMap.empty()) //see SetGothTriggers
+            {
+                for (UNORDERED_MAP<ObjectGuid, GothTrigger>::iterator it = m_mGothTriggerMap.begin(); it != m_mGothTriggerMap.end(); ++it)
+                    delete &it->second;
+            }
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+
+            for (uint8 i = 0; i < MAX_SPECIAL_ACHIEV_CRITS; ++i)
+                m_abAchievCriteria[i] = false;
+
+            m_dialogueHelper.InitializeDialogueHelper(this, true);
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i <= TYPE_KELTHUZAD; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    return true;
+            }
+
+            // Some Encounters use SPECIAL while in progress
+            if (m_auiEncounter[TYPE_GOTHIK] == SPECIAL)
+                return true;
+
+            return false;
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            // Function only used to summon Sapphiron in case of server reload
+            if (GetData(TYPE_SAPPHIRON) != SPECIAL)
+                return;
+
+            // Check if already summoned
+            if (GetSingleCreatureFromStorage(NPC_SAPPHIRON, true))
+                return;
+
+            pPlayer->SummonCreature(NPC_SAPPHIRON, aSapphPositions[0], aSapphPositions[1], aSapphPositions[2], aSapphPositions[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_HEIGAN_THE_UNCLEAN:
+            case NPC_ANUB_REKHAN:
+            case NPC_FAERLINA:
+            case NPC_THADDIUS:
+            case NPC_STALAGG:
+            case NPC_FEUGEN:
+            case NPC_ZELIEK:
+            case NPC_THANE:
+            case NPC_BLAUMEUX:
+            case NPC_RIVENDARE:
+            case NPC_GOTHIK:
+            case NPC_SAPPHIRON:
+            case NPC_KELTHUZAD:
+            case NPC_THE_LICHKING:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+
+            case NPC_SUB_BOSS_TRIGGER:  m_lGothTriggerList.push_back(pCreature->GetObjectGuid()); break;
+            case NPC_TESLA_COIL:        m_lThadTeslaCoilList.push_back(pCreature->GetObjectGuid()); break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+                // Arachnid Quarter
+            case GO_ARAC_ANUB_DOOR:
+                break;
+            case GO_ARAC_ANUB_GATE:
+                if (m_auiEncounter[TYPE_ANUB_REKHAN] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_ARAC_FAER_WEB:
+                break;
+            case GO_ARAC_FAER_DOOR:
+                if (m_auiEncounter[TYPE_FAERLINA] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_ARAC_MAEX_INNER_DOOR:
+                break;
+            case GO_ARAC_MAEX_OUTER_DOOR:
+                if (m_auiEncounter[TYPE_FAERLINA] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+
+                // Plague Quarter
+            case GO_PLAG_NOTH_ENTRY_DOOR:
+                break;
+            case GO_PLAG_NOTH_EXIT_DOOR:
+                if (m_auiEncounter[TYPE_NOTH] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_PLAG_HEIG_ENTRY_DOOR:
+                if (m_auiEncounter[TYPE_NOTH] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_PLAG_HEIG_EXIT_DOOR:
+                if (m_auiEncounter[TYPE_HEIGAN] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_PLAG_LOAT_DOOR:
+                break;
+
+                // Military Quarter
+            case GO_MILI_GOTH_ENTRY_GATE:
+                break;
+            case GO_MILI_GOTH_EXIT_GATE:
+                if (m_auiEncounter[TYPE_GOTHIK] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_MILI_GOTH_COMBAT_GATE:
+                break;
+            case GO_MILI_HORSEMEN_DOOR:
+                if (m_auiEncounter[TYPE_GOTHIK] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_CHEST_HORSEMEN_NORM:
+            case GO_CHEST_HORSEMEN_HERO:
+                break;
+
+                // Construct Quarter
+            case GO_CONS_PATH_EXIT_DOOR:
+                if (m_auiEncounter[TYPE_PATCHWERK] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_CONS_GLUT_EXIT_DOOR:
+                if (m_auiEncounter[TYPE_GLUTH] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_CONS_THAD_DOOR:
+                if (m_auiEncounter[TYPE_GLUTH] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_CONS_NOX_TESLA_FEUGEN:
+                if (m_auiEncounter[TYPE_THADDIUS] == DONE)
+                    pGo->SetGoState(GO_STATE_READY);
+                break;
+            case GO_CONS_NOX_TESLA_STALAGG:
+                if (m_auiEncounter[TYPE_THADDIUS] == DONE)
+                    pGo->SetGoState(GO_STATE_READY);
+                break;
+
+                // Frostwyrm Lair
+            case GO_KELTHUZAD_WATERFALL_DOOR:
+                if (m_auiEncounter[TYPE_SAPPHIRON] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_KELTHUZAD_EXIT_DOOR:
+                break;
+
+                // Eyes
+            case GO_ARAC_EYE_RAMP:
+            case GO_ARAC_EYE_BOSS:
+                if (m_auiEncounter[TYPE_MAEXXNA] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_PLAG_EYE_RAMP:
+            case GO_PLAG_EYE_BOSS:
+                if (m_auiEncounter[TYPE_LOATHEB] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_MILI_EYE_RAMP:
+            case GO_MILI_EYE_BOSS:
+                if (m_auiEncounter[TYPE_FOUR_HORSEMEN] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_CONS_EYE_RAMP:
+            case GO_CONS_EYE_BOSS:
+                if (m_auiEncounter[TYPE_THADDIUS] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+
+                // Portals
+            case GO_ARAC_PORTAL:
+                if (m_auiEncounter[TYPE_MAEXXNA] == DONE)
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                break;
+            case GO_PLAG_PORTAL:
+                if (m_auiEncounter[TYPE_LOATHEB] == DONE)
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                break;
+            case GO_MILI_PORTAL:
+                if (m_auiEncounter[TYPE_FOUR_HORSEMEN] == DONE)
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                break;
+            case GO_CONS_PORTAL:
+                if (m_auiEncounter[TYPE_THADDIUS] == DONE)
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                break;
+
+            default:
+                // Heigan Traps - many different entries which are only required for sorting
+                if (pGo->GetGoType() == GAMEOBJECT_TYPE_TRAP)
+                {
+                    uint32 uiGoEntry = pGo->GetEntry();
+
+                    if ((uiGoEntry >= 181517 && uiGoEntry <= 181524) || uiGoEntry == 181678)
+                        m_alHeiganTrapGuids[0].push_back(pGo->GetObjectGuid());
+                    else if ((uiGoEntry >= 181510 && uiGoEntry <= 181516) || (uiGoEntry >= 181525 && uiGoEntry <= 181531) || uiGoEntry == 181533 || uiGoEntry == 181676)
+                        m_alHeiganTrapGuids[1].push_back(pGo->GetObjectGuid());
+                    else if ((uiGoEntry >= 181534 && uiGoEntry <= 181544) || uiGoEntry == 181532 || uiGoEntry == 181677)
+                        m_alHeiganTrapGuids[2].push_back(pGo->GetObjectGuid());
+                    else if ((uiGoEntry >= 181545 && uiGoEntry <= 181552) || uiGoEntry == 181695)
+                        m_alHeiganTrapGuids[3].push_back(pGo->GetObjectGuid());
+                }
+
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnPlayerDeath(Player* pPlayer) override
+        {
+            if (IsEncounterInProgress())
+                SetData(TYPE_UNDYING_FAILED, DONE);
+
+            if (GetData(TYPE_HEIGAN) == IN_PROGRESS)
+                SetSpecialAchievementCriteria(TYPE_ACHIEV_SAFETY_DANCE, false);
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_MR_BIGGLESWORTH && m_auiEncounter[TYPE_KELTHUZAD] != DONE)
+                DoOrSimulateScriptTextForThisInstance(SAY_KELTHUZAD_CAT_DIED, NPC_KELTHUZAD);
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_ANUB_REKHAN:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_ARAC_ANUB_DOOR);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_ARAC_ANUB_GATE);
+                    DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_MAEXXNA_ID);
+                }
+                break;
+            case TYPE_FAERLINA:
+                DoUseDoorOrButton(GO_ARAC_FAER_WEB);
+                if (uiData == IN_PROGRESS)
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_KNOCK_YOU_OUT, true);
+                else if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_ARAC_FAER_DOOR);
+                    DoUseDoorOrButton(GO_ARAC_MAEX_OUTER_DOOR);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_MAEXXNA:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_ARAC_MAEX_INNER_DOOR, uiData);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_ARAC_EYE_RAMP);
+                    DoUseDoorOrButton(GO_ARAC_EYE_BOSS);
+                    DoRespawnGameObject(GO_ARAC_PORTAL, 30 * MINUTE);
+                    DoToggleGameObjectFlags(GO_ARAC_PORTAL, GO_FLAG_NO_INTERACT, false);
+                    m_uiTauntTimer = 5000;
+                }
+                break;
+            case TYPE_NOTH:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_PLAG_NOTH_ENTRY_DOOR);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_PLAG_NOTH_EXIT_DOOR);
+                    DoUseDoorOrButton(GO_PLAG_HEIG_ENTRY_DOOR);
+                }
+                break;
+            case TYPE_HEIGAN:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_PLAG_HEIG_ENTRY_DOOR);
+                if (uiData == IN_PROGRESS)
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_SAFETY_DANCE, true);
+                else if (uiData == DONE)
+                    DoUseDoorOrButton(GO_PLAG_HEIG_EXIT_DOOR);
+                break;
+            case TYPE_LOATHEB:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_PLAG_LOAT_DOOR);
+                if (uiData == IN_PROGRESS)
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_SPORE_LOSER, true);
+                else if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_PLAG_EYE_RAMP);
+                    DoUseDoorOrButton(GO_PLAG_EYE_BOSS);
+                    DoRespawnGameObject(GO_PLAG_PORTAL, 30 * MINUTE);
+                    DoToggleGameObjectFlags(GO_PLAG_PORTAL, GO_FLAG_NO_INTERACT, false);
+                    m_uiTauntTimer = 5000;
+                }
+                break;
+            case TYPE_RAZUVIOUS:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_GOTHIK:
+                switch (uiData)
+                {
+                case IN_PROGRESS:
+                    DoUseDoorOrButton(GO_MILI_GOTH_ENTRY_GATE);
+                    DoUseDoorOrButton(GO_MILI_GOTH_COMBAT_GATE);
+                    SetGothTriggers();
+                    break;
+                case SPECIAL:
+                    DoUseDoorOrButton(GO_MILI_GOTH_COMBAT_GATE);
+                    break;
+                case FAIL:
+                    if (m_auiEncounter[uiType] == IN_PROGRESS)
+                        DoUseDoorOrButton(GO_MILI_GOTH_COMBAT_GATE);
+
+                    DoUseDoorOrButton(GO_MILI_GOTH_ENTRY_GATE);
+                    break;
+                case DONE:
+                    DoUseDoorOrButton(GO_MILI_GOTH_ENTRY_GATE);
+                    DoUseDoorOrButton(GO_MILI_GOTH_EXIT_GATE);
+                    DoUseDoorOrButton(GO_MILI_HORSEMEN_DOOR);
+
+                    m_dialogueHelper.StartNextDialogueText(NPC_THANE);
+                    break;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_FOUR_HORSEMEN:
+                // Skip if already set
+                if (m_auiEncounter[uiType] == uiData)
+                    return;
+
+                if (uiData == SPECIAL)
+                {
+                    // Start the achiev countdown
+                    if (!m_uiHorseMenKilled)
+                        m_uiHorsemenAchievTimer = 15000;
+
+                    ++m_uiHorseMenKilled;
+
+                    if (m_uiHorseMenKilled == 4)
+                        SetData(TYPE_FOUR_HORSEMEN, DONE);
+
+                    // Don't store special data
+                    return;
+                }
+                else if (uiData == FAIL)
+                    m_uiHorseMenKilled = 0;
+                else if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_MILI_EYE_RAMP);
+                    DoUseDoorOrButton(GO_MILI_EYE_BOSS);
+                    DoRespawnGameObject(GO_MILI_PORTAL, 30 * MINUTE);
+                    DoToggleGameObjectFlags(GO_MILI_PORTAL, GO_FLAG_NO_INTERACT, false);
+                    DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CHEST_HORSEMEN_NORM : GO_CHEST_HORSEMEN_HERO, 30 * MINUTE);
+                    m_uiTauntTimer = 5000;
+                }
+                DoUseDoorOrButton(GO_MILI_HORSEMEN_DOOR);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_PATCHWERK:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                    DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_PATCHWERK_ID);
+                else if (uiData == DONE)
+                    DoUseDoorOrButton(GO_CONS_PATH_EXIT_DOOR);
+                break;
+            case TYPE_GROBBULUS:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_GLUTH:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_CONS_GLUT_EXIT_DOOR);
+                    DoUseDoorOrButton(GO_CONS_THAD_DOOR);
+                }
+                break;
+            case TYPE_THADDIUS:
+                // Only process real changes here
+                if (m_auiEncounter[uiType] == uiData)
+                    return;
+
+                m_auiEncounter[uiType] = uiData;
+                if (uiData != SPECIAL)
+                    DoUseDoorOrButton(GO_CONS_THAD_DOOR, uiData);
+                // Uncomment when this achievement is implemented
+                // if (uiData == IN_PROGRESS)
+                //    SetSpecialAchievementCriteria(TYPE_ACHIEV_SHOCKING, true);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_CONS_EYE_RAMP);
+                    DoUseDoorOrButton(GO_CONS_EYE_BOSS);
+                    DoRespawnGameObject(GO_CONS_PORTAL, 30 * MINUTE);
+                    DoToggleGameObjectFlags(GO_CONS_PORTAL, GO_FLAG_NO_INTERACT, false);
+                    m_uiTauntTimer = 5000;
+                }
+                break;
+            case TYPE_SAPPHIRON:
+                m_auiEncounter[uiType] = uiData;
+                // Uncomment when achiev check implemented
+                // if (uiData == IN_PROGRESS)
+                //    SetSpecialAchievementCriteria(TYPE_ACHIEV_HUNDRED_CLUB, true);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_KELTHUZAD_WATERFALL_DOOR);
+                    m_dialogueHelper.StartNextDialogueText(NPC_KELTHUZAD);
+                }
+                // Start Sapph summoning process
+                if (uiData == SPECIAL)
+                    m_uiSapphSpawnTimer = 22000;
+                break;
+            case TYPE_KELTHUZAD:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_KELTHUZAD_EXIT_DOOR);
+                if (uiData == IN_PROGRESS)
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_GET_ENOUGH, false);
+                break;
+            case TYPE_UNDYING_FAILED:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            //case TYPE_DO_SET_CHAMBER_CENTER:
+            //    if (AreaTriggerEntry const* at = sAreaTriggerStore.LookupEntry(uiData))
+            //        SetChamberCenterCoords(at->x, at->y, at->z);
+            //    return;
+            case TYPE_ACHIEV_GET_ENOUGH:
+            case TYPE_ACHIEV_SPORE_LOSER:
+            case TYPE_ACHIEV_SHOCKING:
+            case TYPE_ACHIEV_HUNDRED_CLUB:
+            case TYPE_ACHIEV_KNOCK_YOU_OUT:
+            case TYPE_ACHIEV_SAFETY_DANCE:
+                SetSpecialAchievementCriteria(uiType - TYPE_ACHIEV_SAFETY_DANCE, bool(uiData));
+                return;
+            case TYPE_DO_GOTH_SUMMON:
+                SummonAdds(uiData);
+                return;
+            case TYPE_DO_HEIGAN_TRAPS:
+                DoTriggerHeiganTraps(uiData);
+                return;
+            case TYPE_DO_THAD_OVERLOAD:
+                for (GuidList::const_iterator itr = m_lThadTeslaCoilList.begin(); itr != m_lThadTeslaCoilList.end(); ++itr)
+                {
+                    if (Creature* pTesla = instance->GetCreature(*itr))
+                    {
+                        if (CreatureAI* pTeslaAI = pTesla->AI())
+                            pTeslaAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, (Creature*)NULL, (Unit*)NULL, 0);
+                    }
+                }
+                return;
+            case TYPE_DO_THAD_CHAIN:
+                for (GuidList::const_iterator itr = m_lThadTeslaCoilList.begin(); itr != m_lThadTeslaCoilList.end(); ++itr)
+                {
+                    if (Creature* pTesla = instance->GetCreature(*itr))
+                    {
+                        if (CreatureAI* pTeslaAI = pTesla->AI())
+                            pTeslaAI->ReceiveAIEvent(AI_EVENT_CUSTOM_B, (Creature*)NULL, (Unit*)NULL, uiData);
+                    }
+                }
+                return;
+            }
+
+            if (uiData == DONE || (uiData == SPECIAL && uiType == TYPE_SAPPHIRON))
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6] << " " << m_auiEncounter[7] << " " << m_auiEncounter[8] << " "
+                    << m_auiEncounter[9] << " " << m_auiEncounter[10] << " " << m_auiEncounter[11] << " "
+                    << m_auiEncounter[12] << " " << m_auiEncounter[13] << " " << m_auiEncounter[14] << " " << m_auiEncounter[15];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            return 0;
+        }
+
+        void SetData64(uint32 uiType, uint64 uiData) override
+        {
+            if (uiType == DATA64_GOTH_LEFT_ANCHOR || uiType == DATA64_GOTH_RIGHT_ANCHOR)
+                m_creatureGUID = ObjectGuid(uiData);
+        }
+
+        uint64 GetData64(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case DATA64_GOTH_LEFT_ANCHOR:
+            case DATA64_GOTH_RIGHT_ANCHOR:
+                return GetClosestAnchorForGoth(uiType == DATA64_GOTH_RIGHT_ANCHOR);
+            case DATA64_GOTH_RANDOM_LEFT:
+            case DATA64_GOTH_RANDOM_RIGHT:
+                return GetGothSummonPoint(uiType == DATA64_GOTH_RANDOM_RIGHT);
+            default:
+                break;
+            }
+            return 0;
+        }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+            case ACHIEV_CRIT_SAFETY_DANCE_N:
+            case ACHIEV_CRIT_SAFETY_DANCE_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_SAFETY_DANCE];
+            case ACHIEV_CRIT_KNOCK_YOU_OUT_N:
+            case ACHIEV_CRIT_KNOCK_YOU_OUT_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_KNOCK_YOU_OUT];
+            case ACHIEV_CRIT_HUNDRED_CLUB_N:
+            case ACHIEV_CRIT_HUNDRED_CLUB_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_HUNDRED_CLUB];
+            case ACHIEV_CRIT_SHOCKING_N:
+            case ACHIEV_CRIT_SHOCKING_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_SHOCKING];
+            case ACHIEV_CRIT_SPORE_LOSER_N:
+            case ACHIEV_CRIT_SPORE_LOSER_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_SPORE_LOSER];
+            case ACHIEV_CRIT_GET_ENOUGH_N:
+            case ACHIEV_CRIT_GET_ENOUGH_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_GET_ENOUGH];
+            case ACHIEV_CRIT_TOGETHER_N:
+            case ACHIEV_CRIT_TOGETHER_H:
+                return m_uiHorsemenAchievTimer > 0;
+                // 'The Immortal'(25m) or 'Undying'(10m) - (achievs 2186, 2187)
+            case ACHIEV_CRIT_IMMORTAL_KEL:
+            case ACHIEV_CRIT_IMMOORTAL_LOA:
+            case ACHIEV_CRIT_IMMOORTAL_THAD:
+            case ACHIEV_CRIT_IMMOORTAL_MAEX:
+            case ACHIEV_CRIT_IMMOORTAL_HORSE:
+            case ACHIEV_CRIT_UNDYING_KEL:
+            case ACHIEV_CRIT_UNDYING_HORSE:
+            case ACHIEV_CRIT_UNDYING_MAEX:
+            case ACHIEV_CRIT_UNDYING_LOA:
+            case ACHIEV_CRIT_UNDYING_THAD:
+            {
+                                             // First, check if all bosses are killed (except the last encounter)
+                                             uint8 uiEncounterDone = 0;
+                                             for (uint8 i = 0; i < TYPE_KELTHUZAD; ++i)
+                                             if (m_auiEncounter[i] == DONE)
+                                                 ++uiEncounterDone;
+
+                                             return uiEncounterDone >= 14 && GetData(TYPE_UNDYING_FAILED) != DONE;
+            }
+            default:
+                return false;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7]
+                >> m_auiEncounter[8] >> m_auiEncounter[9] >> m_auiEncounter[10] >> m_auiEncounter[11]
+                >> m_auiEncounter[12] >> m_auiEncounter[13] >> m_auiEncounter[14] >> m_auiEncounter[15];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_uiTauntTimer)
+            {
+                if (m_uiTauntTimer <= uiDiff)
+                {
+                    DoTaunt();
+                    m_uiTauntTimer = 0;
+                }
+                else
+                    m_uiTauntTimer -= uiDiff;
+            }
+
+            if (m_uiHorsemenAchievTimer)
+            {
+                if (m_uiHorsemenAchievTimer <= uiDiff)
+                    m_uiHorsemenAchievTimer = 0;
+                else
+                    m_uiHorsemenAchievTimer -= uiDiff;
+            }
+
+            if (m_uiSapphSpawnTimer)
+            {
+                if (m_uiSapphSpawnTimer <= uiDiff)
+                {
+                    if (Player* pPlayer = GetPlayerInMap())
+                        pPlayer->SummonCreature(NPC_SAPPHIRON, aSapphPositions[0], aSapphPositions[1], aSapphPositions[2], aSapphPositions[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                    m_uiSapphSpawnTimer = 0;
+                }
+                else
+                    m_uiSapphSpawnTimer -= uiDiff;
+            }
+
+            m_dialogueHelper.DialogueUpdate(uiDiff);
+        }
+
+        void DoTaunt()
+        {
+            if (m_auiEncounter[TYPE_KELTHUZAD] != DONE)
+            {
+                uint8 uiWingsCleared = 0;
+
+                if (m_auiEncounter[TYPE_MAEXXNA] == DONE)
+                    ++uiWingsCleared;
+
+                if (m_auiEncounter[TYPE_LOATHEB] == DONE)
+                    ++uiWingsCleared;
+
+                if (m_auiEncounter[TYPE_FOUR_HORSEMEN] == DONE)
+                    ++uiWingsCleared;
+
+                if (m_auiEncounter[TYPE_THADDIUS] == DONE)
+                    ++uiWingsCleared;
+
+                switch (uiWingsCleared)
+                {
+                case 1: DoOrSimulateScriptTextForThisInstance(SAY_KELTHUZAD_TAUNT1, NPC_KELTHUZAD); break;
+                case 2: DoOrSimulateScriptTextForThisInstance(SAY_KELTHUZAD_TAUNT2, NPC_KELTHUZAD); break;
+                case 3: DoOrSimulateScriptTextForThisInstance(SAY_KELTHUZAD_TAUNT3, NPC_KELTHUZAD); break;
+                case 4: DoOrSimulateScriptTextForThisInstance(SAY_KELTHUZAD_TAUNT4, NPC_KELTHUZAD); break;
+                }
+            }
+        }
+
+    private:
+        // Heigan
+        void DoTriggerHeiganTraps(uint32 uiAreaIndex)
+        {
+            Creature* pHeigan = GetSingleCreatureFromStorage(NPC_HEIGAN_THE_UNCLEAN);
+
+            if (!pHeigan || uiAreaIndex >= MAX_HEIGAN_TRAP_AREAS)
+                return;
+
+            for (GuidList::const_iterator itr = m_alHeiganTrapGuids[uiAreaIndex].begin(); itr != m_alHeiganTrapGuids[uiAreaIndex].end(); ++itr)
+            {
+                if (GameObject* pTrap = instance->GetGameObject(*itr))
+                    pTrap->Use(pHeigan);
+            }
+        }
+
+        // goth
+        uint64 GetClosestAnchorForGoth(bool bRightSide) const
+        {
+            std::list<Creature* > lList;
+
+            for (UNORDERED_MAP<ObjectGuid, GothTrigger>::const_iterator itr = m_mGothTriggerMap.begin(); itr != m_mGothTriggerMap.end(); ++itr)
+            {
+                if (!itr->second.bIsAnchorHigh)
+                    continue;
+
+                if (itr->second.bIsRightSide != bRightSide)
+                    continue;
+
+                if (Creature* pCreature = instance->GetCreature(itr->first))
+                    lList.push_back(pCreature);
+            }
+
+            if (!lList.empty())
+            {
+                lList.sort(ObjectDistanceOrder(instance->GetCreature(m_creatureGUID)));
+                return lList.front()->GetObjectGuid().GetRawValue();
+            }
+
+            return 0;
+        }
+
+        uint64 GetGothSummonPoint(bool bRightSide) const
+        {
+            std::list<Creature*> lList;
+            GetGothSummonPointCreatures(bRightSide, lList);
+
+            if (!lList.empty())
+            {
+                std::list<Creature*>::iterator itr = lList.begin();
+                uint32 uiPosition = urand(0, lList.size() - 1);
+                advance(itr, uiPosition);
+                return (*itr)->GetObjectGuid().GetRawValue();
+            }
+
+            return 0;
+        }
+
+        void GetGothSummonPointCreatures(bool bRightSide, std::list<Creature*> &lList) const
+        {
+            for (UNORDERED_MAP<ObjectGuid, GothTrigger>::const_iterator itr = m_mGothTriggerMap.begin(); itr != m_mGothTriggerMap.end(); ++itr)
+            {
+                if (itr->second.bIsAnchorHigh)
+                    continue;
+
+                if (itr->second.bIsRightSide != bRightSide)
+                    continue;
+
+                if (Creature* pCreature = instance->GetCreature(itr->first))
+                    lList.push_back(pCreature);
+            }
+        }
+
+        void SetGothTriggers()
+        {
+            Creature* pGoth = GetSingleCreatureFromStorage(NPC_GOTHIK);
+            GameObject* pCombatGate = GetSingleGameObjectFromStorage(GO_MILI_GOTH_COMBAT_GATE);
+
+            if (!pGoth || !pCombatGate)
+                return;
+
+            if (!m_mGothTriggerMap.empty())
+            {
+                for (GuidList::const_iterator itr = m_lGothTriggerList.begin(); itr != m_lGothTriggerList.end(); ++itr)
+                {
+                    if (Creature* pTrigger = instance->GetCreature(*itr))
+                    {
+                        GothTrigger pGt;
+                        pGt.bIsAnchorHigh = (pTrigger->GetPositionZ() >= (pGoth->GetPositionZ() - 5.0f));
+                        pGt.bIsRightSide = pCombatGate->GetPositionY() >= pTrigger->GetPositionY();
+
+                        m_mGothTriggerMap[pTrigger->GetObjectGuid()] = pGt;
+                    }
+                }
+            }
+
+            //PrepareSummonPlaces()
+            std::list<Creature*> lSummonList;
+            GetGothSummonPointCreatures(true, lSummonList);
+
+            if (lSummonList.empty())
+                return;
+
+            // Trainees and Rider
+            uint8 index = 0;
+            uint8 uiTraineeCount = instance->IsRegularDifficulty() ? 2 : 3;
+            lSummonList.sort(ObjectDistanceOrder(pGoth));
+            for (std::list<Creature*>::iterator itr = lSummonList.begin(); itr != lSummonList.end(); ++itr)
+            {
+                if (*itr)
+                {
+                    if (uiTraineeCount == 0)
+                        break;
+                    if (index == 1)
+                        m_lRiderSummonPosGuids.push_back((*itr)->GetObjectGuid());
+                    else
+                    {
+                        m_lTraineeSummonPosGuids.push_back((*itr)->GetObjectGuid());
+                        --uiTraineeCount;
+                    }
+                    index++;
+                }
+            }
+
+            // DeathKnights
+            uint8 uiDeathKnightCount = instance->IsRegularDifficulty() ? 1 : 2;
+            lSummonList.sort(ObjectDistanceOrderReversed(pGoth));
+            for (std::list<Creature*>::iterator itr = lSummonList.begin(); itr != lSummonList.end(); ++itr)
+            {
+                if (*itr)
+                {
+                    if (uiDeathKnightCount == 0)
+                        break;
+                    m_lDeathKnightSummonPosGuids.push_back((*itr)->GetObjectGuid());
+                    --uiDeathKnightCount;
+                }
+            }
+        }
+
+        void SummonAdds(uint32 uiSummonEntry)
+        {
+            Creature* pGoth = GetSingleCreatureFromStorage(NPC_GOTHIK);
+            if (!pGoth || pGoth->IsDead())
+                return;
+
+            GuidList* plSummonPosGuids;
+            switch (uiSummonEntry)
+            {
+            case NPC_UNREL_TRAINEE:      plSummonPosGuids = &m_lTraineeSummonPosGuids;     break;
+            case NPC_UNREL_DEATH_KNIGHT: plSummonPosGuids = &m_lDeathKnightSummonPosGuids; break;
+            case NPC_UNREL_RIDER:        plSummonPosGuids = &m_lRiderSummonPosGuids;       break;
+            default:
+                return;
+            }
+            if (plSummonPosGuids->empty())
+                return;
+
+            for (GuidList::iterator itr = plSummonPosGuids->begin(); itr != plSummonPosGuids->end(); ++itr)
+            {
+                if (Creature* pPos = instance->GetCreature(*itr))
+                    pGoth->SummonCreature(uiSummonEntry, pPos->GetPositionX(), pPos->GetPositionY(), pPos->GetPositionZ(), pPos->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        void SetSpecialAchievementCriteria(uint32 uiType, bool bIsMet)
+        {
+            if (uiType < MAX_SPECIAL_ACHIEV_CRITS)
+                m_abAchievCriteria[uiType] = bIsMet;
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        bool m_abAchievCriteria[MAX_SPECIAL_ACHIEV_CRITS];
+        std::string m_strInstData;
+
+        GuidList m_lThadTeslaCoilList;
+        GuidList m_lGothTriggerList;
+        GuidList m_lTraineeSummonPosGuids;
+        GuidList m_lDeathKnightSummonPosGuids;
+        GuidList m_lRiderSummonPosGuids;
+
+        UNORDERED_MAP<ObjectGuid, GothTrigger> m_mGothTriggerMap;
+        GuidList m_alHeiganTrapGuids[MAX_HEIGAN_TRAP_AREAS];
+        ObjectGuid m_creatureGUID;
+
+        float m_fChamberCenterX;
+        float m_fChamberCenterY;
+        float m_fChamberCenterZ;
+
+        uint32 m_uiSapphSpawnTimer;
+        uint32 m_uiTauntTimer;
+        uint32 m_uiHorsemenAchievTimer;
+        uint8 m_uiHorseMenKilled;
+
+        DialogueHelper m_dialogueHelper;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_naxxramas(pMap);
+    }
+};
+
+struct at_naxxramas : public AreaTriggerScript
+{
+    at_naxxramas() : AreaTriggerScript("at_naxxramas") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (pAt->id == AREATRIGGER_KELTHUZAD)
+        {
+            if (pPlayer->isGameMaster() || !pPlayer->IsAlive())
+                return false;
+
+            ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData();
+
+            if (!pInstance)
+                return false;
+
+            if (pInstance->GetData(TYPE_KELTHUZAD) == NOT_STARTED)
+            {
+                if (Creature* pKelthuzad = pInstance->GetSingleCreatureFromStorage(NPC_KELTHUZAD))
+                {
+                    if (pKelthuzad->IsAlive())
+                    {
+                        pInstance->SetData(TYPE_KELTHUZAD, IN_PROGRESS);
+                        pKelthuzad->SetInCombatWithZone();
+                    }
+                }
+            }
+        }
+
+        if (pAt->id == AREATRIGGER_THADDIUS_DOOR)
+        {
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
+            {
+                if (pInstance->GetData(TYPE_THADDIUS) == NOT_STARTED)
+                {
+                    if (Creature* pThaddius = pInstance->GetSingleCreatureFromStorage(NPC_THADDIUS))
+                    {
+                        pInstance->SetData(TYPE_THADDIUS, SPECIAL);
+                        DoScriptText(SAY_THADDIUS_GREET, pThaddius);
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_instance_naxxramas()
+{
+    Script* s;
+
+    s = new is_naxxramas();
+    s->RegisterSelf();
+
+    s = new at_naxxramas();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_naxxramas";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_naxxramas;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_naxxramas";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_naxxramas;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/naxxramas/naxxramas.h b/src/modules/SD3/scripts/northrend/naxxramas/naxxramas.h
new file mode 100644
index 000000000..4fed6958e
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/naxxramas/naxxramas.h
@@ -0,0 +1,213 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_NAXXRAMAS_H
+#define DEF_NAXXRAMAS_H
+
+enum
+{
+    MAX_ENCOUNTER               = 16,
+
+    // A few instance-script related texts
+    SAY_THADDIUS_GREET          = -1533029,
+
+    // Kel'Thuzad
+    SAY_KELTHUZAD_CAT_DIED      = -1533089,
+    // Kel'Thuzad's taunts after killing Wing Bosses
+    SAY_KELTHUZAD_TAUNT1        = -1533090,
+    SAY_KELTHUZAD_TAUNT2        = -1533091,
+    SAY_KELTHUZAD_TAUNT3        = -1533092,
+    SAY_KELTHUZAD_TAUNT4        = -1533093,
+    // Dialogues with Lich King
+    SAY_SAPP_DIALOG1            = -1533084,
+    SAY_SAPP_DIALOG2_LICH       = -1533085,
+    SAY_SAPP_DIALOG3            = -1533086,
+    SAY_SAPP_DIALOG4_LICH       = -1533087,
+    SAY_SAPP_DIALOG5            = -1533088,
+    // Horsemen dialogue texts
+    SAY_BLAU_TAUNT1             = -1533045,
+    SAY_BLAU_TAUNT2             = -1533046,
+    SAY_BLAU_TAUNT3             = -1533047,             // NYI - requires additiona research
+    SAY_RIVE_TAUNT1             = -1533071,
+    SAY_RIVE_TAUNT2             = -1533072,
+    SAY_RIVE_TAUNT3             = -1533073,             // NYI - requires additiona research
+    SAY_KORT_TAUNT1             = -1533052,
+    SAY_KORT_TAUNT2             = -1533053,
+    SAY_KORT_TAUNT3             = -1533054,             // NYI - requires additiona research
+    SAY_ZELI_TAUNT1             = -1533059,
+    SAY_ZELI_TAUNT2             = -1533060,
+    SAY_ZELI_TAUNT3             = -1533061,             // NYI - requires additiona research
+
+    TYPE_ANUB_REKHAN            = 0,
+    TYPE_FAERLINA               = 1,
+    TYPE_MAEXXNA                = 2,
+
+    TYPE_NOTH                   = 3,
+    TYPE_HEIGAN                 = 4,
+    TYPE_LOATHEB                = 5,
+
+    TYPE_RAZUVIOUS              = 6,
+    TYPE_GOTHIK                 = 7,
+    TYPE_FOUR_HORSEMEN          = 8,
+
+    TYPE_PATCHWERK              = 9,
+    TYPE_GROBBULUS              = 10,
+    TYPE_GLUTH                  = 11,
+    TYPE_THADDIUS               = 12,
+
+    TYPE_SAPPHIRON              = 13,
+    TYPE_KELTHUZAD              = 14,
+
+    TYPE_UNDYING_FAILED         = 15,                       // Achievements Undying and Immortal, needs to be saved to database
+
+    MAX_SPECIAL_ACHIEV_CRITS    = 22,
+
+    TYPE_ACHIEV_SAFETY_DANCE    = MAX_ENCOUNTER + 0,
+    TYPE_ACHIEV_KNOCK_YOU_OUT   = MAX_ENCOUNTER + 1,
+    TYPE_ACHIEV_HUNDRED_CLUB    = MAX_ENCOUNTER + 2,
+    TYPE_ACHIEV_SHOCKING        = MAX_ENCOUNTER + 3,
+    TYPE_ACHIEV_SPORE_LOSER     = MAX_ENCOUNTER + 4,
+    TYPE_ACHIEV_GET_ENOUGH      = MAX_ENCOUNTER + 5,
+
+    TYPE_DO_SET_CHAMBER_CENTER  = MAX_ENCOUNTER + 6,
+    TYPE_DO_GOTH_SUMMON         = MAX_ENCOUNTER + 7,
+    TYPE_DO_HEIGAN_TRAPS        = MAX_ENCOUNTER + 8,
+    TYPE_DO_THAD_OVERLOAD       = MAX_ENCOUNTER + 9,
+    TYPE_DO_THAD_CHAIN          = MAX_ENCOUNTER + 10,
+
+    DATA64_GOTH_LEFT_ANCHOR     = 0,
+    DATA64_GOTH_RIGHT_ANCHOR    = 1,
+    DATA64_GOTH_RANDOM_LEFT     = 2,
+    DATA64_GOTH_RANDOM_RIGHT    = 3,
+
+    MAX_HEIGAN_TRAP_AREAS       = 4,
+
+    NPC_ANUB_REKHAN             = 15956,
+    NPC_FAERLINA                = 15953,
+    NPC_HEIGAN_THE_UNCLEAN      = 15936,
+
+    NPC_THADDIUS                = 15928,
+    NPC_STALAGG                 = 15929,
+    NPC_FEUGEN                  = 15930,
+    NPC_TESLA_COIL              = 16218,
+
+    NPC_ZELIEK                  = 16063,
+    NPC_THANE                   = 16064,
+    NPC_BLAUMEUX                = 16065,
+    NPC_RIVENDARE               = 30549,
+
+    NPC_SAPPHIRON               = 15989,
+    NPC_KELTHUZAD               = 15990,
+    NPC_THE_LICHKING            = 16980,
+    NPC_MR_BIGGLESWORTH         = 16998,
+
+    // Gothik
+    NPC_GOTHIK                  = 16060,
+    NPC_SUB_BOSS_TRIGGER        = 16137,                    // summon locations
+    NPC_UNREL_TRAINEE           = 16124,
+    NPC_UNREL_DEATH_KNIGHT      = 16125,
+    NPC_UNREL_RIDER             = 16126,
+    NPC_SPECT_TRAINEE           = 16127,
+    NPC_SPECT_DEATH_KNIGHT      = 16148,
+    NPC_SPECT_RIDER             = 16150,
+    NPC_SPECT_HORSE             = 16149,
+
+    // Kel'Thuzad
+    NPC_SOLDIER_FROZEN          = 16427,
+    NPC_UNSTOPPABLE_ABOM        = 16428,
+    NPC_SOUL_WEAVER             = 16429,
+    NPC_GUARDIAN                = 16441,
+
+    // Arachnid Quarter
+    GO_ARAC_ANUB_DOOR           = 181126,                   // encounter door
+    GO_ARAC_ANUB_GATE           = 181195,                   // open after boss is dead
+    GO_ARAC_FAER_WEB            = 181235,                   // encounter door
+    GO_ARAC_FAER_DOOR           = 194022,                   // after faerlina, to outer ring
+    GO_ARAC_MAEX_INNER_DOOR     = 181197,                   // encounter door
+    GO_ARAC_MAEX_OUTER_DOOR     = 181209,                   // right before maex
+
+    // Plague Quarter
+    GO_PLAG_SLIME01_DOOR        = 181198,                   // not used
+    GO_PLAG_SLIME02_DOOR        = 181199,                   // not used
+    GO_PLAG_NOTH_ENTRY_DOOR     = 181200,                   // encounter door
+    GO_PLAG_NOTH_EXIT_DOOR      = 181201,                   // exit, open when boss dead
+    GO_PLAG_HEIG_ENTRY_DOOR     = 181202,
+    GO_PLAG_HEIG_EXIT_DOOR      = 181203,                   // exit, open when boss dead
+    GO_PLAG_LOAT_DOOR           = 181241,                   // encounter door
+
+    // Military Quarter
+    GO_MILI_GOTH_ENTRY_GATE     = 181124,                   // used while encounter is in progress
+    GO_MILI_GOTH_EXIT_GATE      = 181125,                   // exit, open at boss dead
+    GO_MILI_GOTH_COMBAT_GATE    = 181170,                   // used while encounter is in progress
+    GO_MILI_HORSEMEN_DOOR       = 181119,                   // encounter door
+
+    GO_CHEST_HORSEMEN_NORM      = 181366,                   // four horsemen event, DoRespawnGameObject() when event == DONE
+    GO_CHEST_HORSEMEN_HERO      = 193426,
+
+    // Construct Quarter
+    GO_CONS_PATH_EXIT_DOOR      = 181123,
+    GO_CONS_GLUT_EXIT_DOOR      = 181120,
+    GO_CONS_THAD_DOOR           = 181121,                   // Thaddius enc door
+    GO_CONS_NOX_TESLA_FEUGEN    = 181477,
+    GO_CONS_NOX_TESLA_STALAGG   = 181478,
+
+    // Frostwyrm Lair
+    GO_KELTHUZAD_WATERFALL_DOOR = 181225,                   // exit, open after sapphiron is dead
+    GO_KELTHUZAD_EXIT_DOOR      = 181228,
+
+    // Eyes
+    GO_ARAC_EYE_RAMP            = 181212,
+    GO_PLAG_EYE_RAMP            = 181211,
+    GO_MILI_EYE_RAMP            = 181210,
+    GO_CONS_EYE_RAMP            = 181213,
+
+    GO_ARAC_EYE_BOSS            = 181233,
+    GO_PLAG_EYE_BOSS            = 181231,
+    GO_MILI_EYE_BOSS            = 181230,
+    GO_CONS_EYE_BOSS            = 181232,
+
+    // Portals
+    GO_ARAC_PORTAL              = 181575,
+    GO_PLAG_PORTAL              = 181577,
+    GO_MILI_PORTAL              = 181578,
+    GO_CONS_PORTAL              = 181576,
+
+    AREATRIGGER_FROSTWYRM       = 4120,                     // not needed here, but AT to be scripted
+    AREATRIGGER_KELTHUZAD       = 4112,
+    AREATRIGGER_GOTHIK          = 4116,
+    AREATRIGGER_THADDIUS_DOOR   = 4113,
+
+    // Achievement related
+    ACHIEV_CRIT_SAFETY_DANCE_N  = 7264,                     // Heigan, achievs 1996, 2139
+    ACHIEV_CRIT_SAFETY_DANCE_H  = 7548,
+    ACHIEV_CRIT_KNOCK_YOU_OUT_N = 7265,                     // Faerlina, achievs 1997, 2140
+    ACHIEV_CRIT_KNOCK_YOU_OUT_H = 7549,
+    ACHIEV_CRIT_HUNDRED_CLUB_N  = 7567,                     // Sapphiron, achievs 2146, 2147
+    ACHIEV_CRIT_HUNDRED_CLUB_H  = 7568,
+    ACHIEV_CRIT_TOGETHER_N      = 7600,                     // Four Horsemen, achievs 2176, 2177
+    ACHIEV_CRIT_TOGETHER_H      = 7601,
+    ACHIEV_CRIT_SHOCKING_N      = 7604,                     // Thaddius, achievs 2178, 2179
+    ACHIEV_CRIT_SHOCKING_H      = 7605,
+    ACHIEV_CRIT_SPORE_LOSER_N   = 7612,                     // Loatheb, achievs 2182, 2183
+    ACHIEV_CRIT_SPORE_LOSER_H   = 7613,
+    ACHIEV_CRIT_GET_ENOUGH_N    = 7614,                     // Kel'Thuzad, achievs 2184, 2185
+    ACHIEV_CRIT_GET_ENOUGH_H    = 7615,
+
+    // 'The Immortal'(25m) or 'Undying'(10m) - (achievs 2186, 2187)
+    ACHIEV_CRIT_IMMORTAL_KEL    = 7616,
+    ACHIEV_CRIT_IMMOORTAL_LOA   = 13236,
+    ACHIEV_CRIT_IMMOORTAL_THAD  = 13235,
+    ACHIEV_CRIT_IMMOORTAL_MAEX  = 13234,
+    ACHIEV_CRIT_IMMOORTAL_HORSE = 13233,
+    ACHIEV_CRIT_UNDYING_KEL     = 7617,
+    ACHIEV_CRIT_UNDYING_HORSE   = 13237,
+    ACHIEV_CRIT_UNDYING_MAEX    = 13238,
+    ACHIEV_CRIT_UNDYING_LOA     = 13239,
+    ACHIEV_CRIT_UNDYING_THAD    = 13240,
+
+    // Timed achievement criterias
+    ACHIEV_START_PATCHWERK_ID   = 10286,
+    ACHIEV_START_MAEXXNA_ID     = 9891,
+};
+#endif
diff --git a/src/modules/SD3/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp b/src/modules/SD3/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp
new file mode 100644
index 000000000..30bce81ff
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp
@@ -0,0 +1,754 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_malygos
+SD%Complete: 80
+SDComment: Timers need adjustments; Vortex event NYI; Npc movement in Phase 2 NYI.
+SDCategory: Eye of Eternity
+EndScriptData */
+
+#include "precompiled.h"
+#include "eye_of_eternity.h"
+#include "TemporarySummon.h"
+
+enum
+{
+    SAY_INTRO_1             = -1616000,
+    SAY_INTRO_2             = -1616001,
+    SAY_INTRO_3             = -1616002,
+    SAY_INTRO_4             = -1616003,
+    SAY_INTRO_5             = -1616004,
+    SAY_AGGRO               = -1616005,
+    SAY_VORTEX              = -1616006,
+    SAY_SPARK_BUFF          = -1616007,
+    SAY_SLAY_1_A            = -1616008,
+    SAY_SLAY_1_B            = -1616009,
+    SAY_SLAY_1_C            = -1616010,
+    SAY_END_PHASE_1         = -1616011,
+    SAY_START_PHASE_2       = -1616012,
+    SAY_DEEP_BREATH         = -1616013,
+    SAY_SHELL               = -1616014,
+    SAY_SLAY_2_A            = -1616015,
+    SAY_SLAY_2_B            = -1616016,
+    SAY_SLAY_2_C            = -1616017,
+    SAY_END_PHASE_2         = -1616018,
+    SAY_INTRO_PHASE_3       = -1616019,
+    SAY_START_PHASE_3       = -1616020,
+    SAY_SLAY_3_A            = -1616021,
+    SAY_SLAY_3_B            = -1616022,
+    SAY_SLAY_3_C            = -1616023,
+    SAY_SURGE               = -1616024,
+    SAY_SPELL_1             = -1616025,
+    SAY_SPELL_2             = -1616026,
+    SAY_SPELL_3             = -1616027,
+    SAY_DEATH               = -1616028,
+
+    SAY_EMOTE_SPARK         = -1616033,
+    SAY_EMOTE_BREATH        = -1616034,
+
+    // phase 1 spells
+    SPELL_BERSERK                   = 26662,
+    SPELL_ARCANE_BREATH             = 56272,
+    SPELL_ARCANE_BREATH_H           = 60072,
+    SPELL_SUMMON_SPARK              = 56140,
+    SPELL_VORTEX                    = 56105,
+
+    // phase 2 spells
+    SPELL_ARCANE_STORM              = 57459,            // related to spell 61693
+    SPELL_ARCANE_STORM_H            = 61694,
+    SPELL_SUMMON_ARCANE_BOMB        = 56429,            // summons 30282
+    SPELL_ARCANE_BOMB               = 56430,            // triggers 56432 and 56431 on target hit
+    SPELL_SURGE_OF_POWER_PULSE      = 56505,            // deep breath spell
+    // SPELL_ARCANE_PULSE           = 57432,            // purpose unk
+
+    // transition spells
+    SPELL_DESTROY_PLATFORM_PRE      = 58842,
+    SPELL_DESTROY_PLATFORM_BOOM     = 59084,
+    SPELL_DESTROY_PLATFORM_EVENT    = 59099,
+    SPELL_SUMMON_RED_DRAGON         = 58846,
+
+    // phase 3 spells
+    SPELL_STATIC_FIELD_SUMMON       = 57430,            // cast on 1 or 3 targets based on difficulty
+    SPELL_SURGE_OF_POWER            = 57407,            // related to 60936 and 60939
+
+    // power spark
+    SPELL_POWER_SPARK_MALYGOS       = 56152,
+    SPELL_POWER_SPARK_PLAYERS       = 55852,
+    SPELL_POWER_SPARK_VISUAL        = 55845,
+
+    // vortex - thse spells require additional research
+    // related auras: 55853, 55883, 56263, 56264, 56265, 56266, 59666, 61071, 61072, 61073, 61074, 61075
+    SPELL_VORTEX_SPAWN              = 59670,
+    SPELL_VORTEX_VISUAL             = 55873,
+    SPELL_VORTEX_CHANNEL            = 56237,
+
+    // arcane overload - handled in core
+    // SPELL_ARCANE_OVERLOAD        = 56432,
+    // SPELL_ARCANE_BOMB_KNOCKBACK  = 56431,
+
+    // static field
+    SPELL_STATIC_FIELD              = 57428,
+
+    // vehicle related
+    SPELL_SUMMON_DISC               = 56378,            // summons npc 30234 for players
+    SPELL_RIDE_RED_DRAGON           = 56072,
+    SPELL_FLIGHT                    = 60534,            // ToDo: check if id is correct!
+
+    // summoned npcs
+    NPC_VORTEX                      = 30090,
+    NPC_POWER_SPARK                 = 30084,
+
+    NPC_NEXUS_LORD                  = 30245,
+    NPC_HOVER_DISK                  = 30248,
+    NPC_SCION_OF_ETERNITY           = 30249,
+    NPC_ARCANE_OVERLOAD             = 30282,
+
+    NPC_STATIC_FIELD                = 30592,
+
+    // phases
+    PHASE_FLOOR                     = 1,
+    PHASE_TRANSITION_1              = 2,
+    PHASE_DISCS                     = 3,
+    PHASE_TRANSITION_2              = 4,
+    PHASE_DRAGONS                   = 5,
+
+    POINT_ID_COMBAT                 = 1,
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    // Intro dialogue
+    {SAY_INTRO_1,   NPC_MALYGOS,    11000},
+    {SAY_INTRO_2,   NPC_MALYGOS,    13000},
+    {SAY_INTRO_3,   NPC_MALYGOS,    14000},
+    {SAY_INTRO_4,   NPC_MALYGOS,    12000},
+    {SAY_INTRO_5,   NPC_MALYGOS,    0},
+
+    // Phase transitions
+    {SAY_END_PHASE_1,             NPC_MALYGOS,  25000},
+    {PHASE_DISCS,                 0,            0},
+    {SAY_END_PHASE_2,             NPC_MALYGOS,  13000},
+    {SPELL_DESTROY_PLATFORM_BOOM, 0,            2000},
+    {SPELL_SUMMON_RED_DRAGON,     0,            5000},
+    {SAY_INTRO_PHASE_3,           NPC_MALYGOS,  0},
+    {0, 0, 0},
+};
+
+static const float aCenterMovePos[3] = {754.395f, 1301.270f, 266.253f};
+static const float aAlextraszaSpawnPos[4] = {700.354f, 1310.718f, 298.13f, 6.02f};
+static const float aAlextraszaMovePos[3] = {726.754f, 1307.259f, 282.679f};
+
+/*######
+## boss_malygos
+######*/
+
+struct boss_malygos : public CreatureScript
+{
+    boss_malygos() : CreatureScript("boss_malygos")  {}
+
+    struct boss_malygosAI : public ScriptedAI, private DialogueHelper
+    {
+        boss_malygosAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            InitializeDialogueHelper(m_pInstance);
+
+            m_uiMaxStaticFieldTargets = m_bIsRegularMode ? 1 : 3;
+            m_uiMaxNexusLords = m_bIsRegularMode ? 2 : 4;
+            m_uiMaxScions = m_bIsRegularMode ? 4 : 8;
+
+            m_bHasDoneIntro = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bHasDoneIntro;
+
+        uint8 m_uiPhase;
+        uint8 m_uiMaxNexusLords;
+        uint8 m_uiMaxScions;
+        uint8 m_uiAddsDeadCount;
+        uint8 m_uiMaxStaticFieldTargets;
+
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiVortexTimer;
+        uint32 m_uiArcaneBreathTimer;
+        uint32 m_uiPowerSparkTimer;
+
+        uint32 m_uiArcanePulseTimer;
+        uint32 m_uiOverloadTimer;
+        uint32 m_uiArcaneStormTimer;
+
+        uint32 m_uiStaticFieldTimer;
+        uint32 m_uiSurgeOfPowerTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_FLOOR;
+
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+            m_uiVortexTimer = 60000;
+            m_uiArcaneBreathTimer = 15000;
+            m_uiPowerSparkTimer = 30000;
+
+            m_uiArcanePulseTimer = 60000;
+            m_uiOverloadTimer = 1000;
+            m_uiArcaneStormTimer = 15000;
+            m_uiAddsDeadCount = 0;
+
+            m_uiStaticFieldTimer = 15000;
+            m_uiSurgeOfPowerTimer = 30000;
+
+            // reset flags
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+            m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+
+            SetCombatMovement(false);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MALYGOS, IN_PROGRESS);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasDoneIntro && pWho->GetTypeId() == TYPEID_PLAYER && !((Player*)pWho)->isGameMaster() && m_creature->IsWithinDistInMap(pWho, 110.0f))
+            {
+                StartNextDialogueText(SAY_INTRO_1);
+                m_bHasDoneIntro = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            uint8 uiTextId = 0;
+            switch (m_uiPhase)
+            {
+            case PHASE_FLOOR:   uiTextId = urand(0, 2); break;
+            case PHASE_DISCS:   uiTextId = urand(3, 5); break;
+            case PHASE_DRAGONS: uiTextId = urand(6, 8); break;
+            }
+
+            switch (uiTextId)
+            {
+            case 0: DoScriptText(SAY_SLAY_1_A, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_1_B, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_1_C, m_creature); break;
+
+            case 3: DoScriptText(SAY_SLAY_2_A, m_creature); break;
+            case 4: DoScriptText(SAY_SLAY_2_B, m_creature); break;
+            case 5: DoScriptText(SAY_SLAY_2_C, m_creature); break;
+
+            case 6: DoScriptText(SAY_SLAY_3_A, m_creature); break;
+            case 7: DoScriptText(SAY_SLAY_3_B, m_creature); break;
+            case 8: DoScriptText(SAY_SLAY_3_C, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+            m_creature->SummonCreature(NPC_ALEXSTRASZA, aAlextraszaSpawnPos[0], aAlextraszaSpawnPos[1], aAlextraszaSpawnPos[2], aAlextraszaSpawnPos[3], TEMPSUMMON_TIMED_DESPAWN, 5 * MINUTE * IN_MILLISECONDS);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MALYGOS, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MALYGOS, FAIL);
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE)
+                return;
+
+            if (uiPointId == POINT_ID_COMBAT)
+            {
+                m_creature->SetLevitate(false);
+                SetCombatMovement(true);
+                DoStartMovement(m_creature->getVictim());
+                m_creature->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_ALEXSTRASZA:
+                pSummoned->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+                pSummoned->GetMotionMaster()->MovePoint(0, aAlextraszaMovePos[0], aAlextraszaMovePos[1], aAlextraszaMovePos[2]);
+                break;
+            case NPC_POWER_SPARK:
+                pSummoned->GetMotionMaster()->MoveFollow(m_creature, 0, 0);
+                break;
+            case NPC_ARCANE_OVERLOAD:
+                DoCastSpellIfCan(pSummoned, SPELL_ARCANE_BOMB, CAST_TRIGGERED);
+                break;
+            case NPC_STATIC_FIELD:
+                pSummoned->CastSpell(pSummoned, SPELL_STATIC_FIELD, false);
+                break;
+            case NPC_NEXUS_LORD:
+            case NPC_SCION_OF_ETERNITY:
+                if (Creature* pDisk = GetClosestCreatureWithEntry(pSummoned, NPC_HOVER_DISK, 10.0f))
+                    pSummoned->CastSpell(pDisk, SPELL_RIDE_VEHICLE_HARDCODED, true);
+                pSummoned->SetInCombatWithZone();
+                break;
+            case NPC_HOVER_DISK:
+                pSummoned->CastSpell(pSummoned, SPELL_FLIGHT, true);
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_NEXUS_LORD || pSummoned->GetEntry() == NPC_SCION_OF_ETERNITY)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_SUMMON_DISC, true);
+                ++m_uiAddsDeadCount;
+
+                // When all adds are killed start phase 3
+                if (m_uiAddsDeadCount == m_uiMaxScions + m_uiMaxNexusLords)
+                {
+                    StartNextDialogueText(SAY_END_PHASE_2);
+                    m_uiPhase = PHASE_TRANSITION_2;
+
+                    // Start platform animation - not sure if this is cast by the right npc
+                    if (m_pInstance)
+                    {
+                        if (Creature* pTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_LARGE_TRIGGER))
+                            pTrigger->CastSpell(pTrigger, SPELL_DESTROY_PLATFORM_PRE, false);
+                    }
+                }
+            }
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            // Handle yell on Power Spark hit
+            if (pSpell->Id == SPELL_POWER_SPARK_MALYGOS && pCaster->GetEntry() == NPC_POWER_SPARK && m_uiPhase == PHASE_FLOOR)
+                DoScriptText(SAY_SPARK_BUFF, m_creature);
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case PHASE_DISCS:
+                // ToDo: start some movement over the platform
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                m_uiPhase = PHASE_DISCS;
+                DoSpawnAdds();
+                break;
+            case SPELL_DESTROY_PLATFORM_BOOM:
+                if (m_pInstance)
+                {
+                    if (Creature* pTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_LARGE_TRIGGER))
+                        pTrigger->CastSpell(pTrigger, SPELL_DESTROY_PLATFORM_BOOM, false);
+                }
+                break;
+            case SPELL_SUMMON_RED_DRAGON:
+                if (m_pInstance)
+                {
+                    // Destroy the platform
+                    if (GameObject* pPlatform = m_pInstance->GetSingleGameObjectFromStorage(GO_PLATFORM))
+                        pPlatform->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK_11);
+                }
+
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_RED_DRAGON);
+                break;
+            case SAY_INTRO_PHASE_3:
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                m_uiPhase = PHASE_DRAGONS;
+                break;
+            }
+        }
+
+        // Wrapper to spawn the adds in phase 2
+        void DoSpawnAdds()
+        {
+            float fX, fY, fZ;
+            for (uint8 i = 0; i < m_uiMaxNexusLords; ++i)
+            {
+                m_creature->GetRandomPoint(aCenterMovePos[0], aCenterMovePos[1], aCenterMovePos[2], 50.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_HOVER_DISK, fX, fY, fZ + 30.0f, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                m_creature->SummonCreature(NPC_NEXUS_LORD, fX, fY, fZ + 30.0f, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+
+            for (uint8 i = 0; i < m_uiMaxScions; ++i)
+            {
+                m_creature->GetRandomPoint(aCenterMovePos[0], aCenterMovePos[1], aCenterMovePos[2], 50.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_HOVER_DISK, fX, fY, fZ + 30.0f, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                m_creature->SummonCreature(NPC_SCION_OF_ETERNITY, fX, fY, fZ + 30.0f, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                        m_uiBerserkTimer = 0;
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_FLOOR:
+
+                /* ToDo: Enable this when the spells are properly supported in core
+                if (m_uiVortexTimer < uiDiff)
+                {
+                if (DoCastSpellIfCan(m_creature, SPELL_VORTEX) == CAST_OK)
+                {
+                DoScriptText(SAY_VORTEX, m_creature);
+                m_uiVortexTimer = 60000;
+                }
+                }
+                else
+                m_uiVortexTimer -= uiDiff;
+                */
+
+                if (m_uiArcaneBreathTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ARCANE_BREATH : SPELL_ARCANE_BREATH_H) == CAST_OK)
+                        m_uiArcaneBreathTimer = urand(13000, 16000);
+                }
+                else
+                    m_uiArcaneBreathTimer -= uiDiff;
+
+                if (m_uiPowerSparkTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_SPARK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_EMOTE_SPARK, m_creature);
+                        m_uiPowerSparkTimer = 30000;
+                    }
+                }
+                else
+                    m_uiPowerSparkTimer -= uiDiff;
+
+                if (m_creature->GetHealthPercent() < 50.0f)
+                {
+                    SetCombatMovement(false);
+                    m_creature->SetLevitate(true);
+                    m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+                    // Move idle first, so we can avoid evading, because of the waypoint movement
+                    m_creature->GetMotionMaster()->MoveIdle();
+                    m_creature->GetMotionMaster()->MovePoint(0, aCenterMovePos[0], aCenterMovePos[1], aCenterMovePos[2] + 30.0f);
+
+                    StartNextDialogueText(SAY_END_PHASE_1);
+                    m_uiPhase = PHASE_TRANSITION_1;
+                }
+
+                DoMeleeAttackIfReady();
+
+                break;
+            case PHASE_DISCS:
+
+                if (m_uiOverloadTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_ARCANE_BOMB) == CAST_OK)
+                    {
+                        if (!urand(0, 3))
+                            DoScriptText(SAY_SHELL, m_creature);
+
+                        m_uiOverloadTimer = urand(16000, 19000);
+                    }
+                }
+                else
+                    m_uiOverloadTimer -= uiDiff;
+
+                // Note: the boss should move in certain points before he does the breath ability
+                if (m_uiArcanePulseTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SURGE_OF_POWER_PULSE) == CAST_OK)
+                    {
+                        DoScriptText(SAY_DEEP_BREATH, m_creature);
+                        DoScriptText(SAY_EMOTE_BREATH, m_creature);
+                        m_uiArcanePulseTimer = 60000;
+                    }
+                }
+                else
+                    m_uiArcanePulseTimer -= uiDiff;
+
+                if (m_uiArcaneStormTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ARCANE_STORM : SPELL_ARCANE_STORM_H) == CAST_OK)
+                        m_uiArcaneStormTimer = urand(15000, 17000);
+                }
+                else
+                    m_uiArcaneStormTimer -= uiDiff;
+
+                break;
+            case PHASE_DRAGONS:
+
+                if (m_uiStaticFieldTimer < uiDiff)
+                {
+                    // Cast Static Field spell on a number of targets, based on difficulty
+                    for (uint8 i = 0; i < m_uiMaxStaticFieldTargets; ++i)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        {
+                            if (DoCastSpellIfCan(pTarget, SPELL_STATIC_FIELD_SUMMON, CAST_TRIGGERED) == CAST_OK)
+                            {
+                                switch (urand(0, 2))
+                                {
+                                case 0: DoScriptText(SAY_SPELL_1, m_creature); break;
+                                case 1: DoScriptText(SAY_SPELL_2, m_creature); break;
+                                case 2: DoScriptText(SAY_SPELL_3, m_creature); break;
+                                }
+                                m_uiStaticFieldTimer = urand(10000, 17000);
+                            }
+                        }
+                    }
+                }
+                else
+                    m_uiStaticFieldTimer -= uiDiff;
+
+                if (m_uiSurgeOfPowerTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SURGE_OF_POWER) == CAST_OK)
+                        {
+                            if (!urand(0, 3))
+                                DoScriptText(SAY_SURGE, m_creature);
+
+                            m_uiSurgeOfPowerTimer = urand(5000, 15000);
+                        }
+                    }
+                }
+                else
+                    m_uiSurgeOfPowerTimer -= uiDiff;
+
+                break;
+            case PHASE_TRANSITION_1:
+            case PHASE_TRANSITION_2:
+                // Nothing here - wait for transition to finish
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_malygosAI(pCreature);
+    }
+};
+
+/*######
+## npc_power_spark
+######*/
+
+struct npc_power_spark : public CreatureScript
+{
+    npc_power_spark() : CreatureScript("npc_power_spark") {}
+
+    struct npc_power_sparkAI : public ScriptedAI
+    {
+        npc_power_sparkAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_POWER_SPARK_VISUAL);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (pWho->GetEntry() == NPC_MALYGOS && m_creature->CanReachWithMeleeAttack(pWho))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_POWER_SPARK_MALYGOS, CAST_TRIGGERED);
+                m_creature->ForcedDespawn();
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_POWER_SPARK_PLAYERS, CAST_TRIGGERED);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_power_sparkAI(pCreature);
+    }
+};
+
+/*######
+## npc_wyrmrest_skytalon
+######*/
+
+struct npc_wyrmrest_skytalon : public CreatureScript
+{
+    npc_wyrmrest_skytalon() : CreatureScript("npc_wyrmrest_skytalon") {}
+
+    struct npc_wyrmrest_skytalonAI : public ScriptedAI
+    {
+        npc_wyrmrest_skytalonAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            SetCombatMovement(false);
+            m_bHasMounted = false;
+        }
+
+        bool m_bHasMounted;
+
+        void Reset() override { }
+
+        // TODO: Temporary workaround - please remove when the boarding wrappers are implemented in core
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pCaster->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            if (pSpell->Id == 56071)
+                DoCastSpellIfCan(m_creature, SPELL_FLIGHT, CAST_TRIGGERED);
+        }
+
+        // TODO: Enable the wrappers below, when they will be properly supported by the core
+        /*
+        void PassengerBoarded(Unit* pPassenger, uint8 uiSeat) override
+        {
+        if (pPassenger->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+        // Set vehicle auras
+        DoCastSpellIfCan(m_creature, SPELL_FLIGHT, CAST_TRIGGERED);
+        }
+        */
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_bHasMounted)
+            {
+                if (m_creature->IsTemporarySummon())
+                {
+                    TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+                    // Force player to mount
+                    if (Player* pSummoner = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                        pSummoner->CastSpell(m_creature, SPELL_RIDE_RED_DRAGON, true);
+                }
+
+                m_bHasMounted = true;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_wyrmrest_skytalonAI(pCreature);
+    }
+};
+
+/*######
+## event_go_focusing_iris
+######*/
+
+struct event_go_focusing_iris : public MapEventScript
+{
+    event_go_focusing_iris() : MapEventScript("event_go_focusing_iris") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* /*pTarget*/, bool /*bIsStart*/) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)((Creature*)pSource)->GetInstanceData())
+        {
+            if (pSource->GetTypeId() != TYPEID_PLAYER)
+                return false;
+
+            if (pInstance->GetData(TYPE_MALYGOS) == IN_PROGRESS || pInstance->GetData(TYPE_MALYGOS) == DONE)
+                return false;
+
+            Creature* pMalygos = pInstance->GetSingleCreatureFromStorage(NPC_MALYGOS);
+            Creature* pTrigger = pInstance->GetSingleCreatureFromStorage(NPC_LARGE_TRIGGER);
+            if (!pMalygos || !pTrigger)
+                return false;
+
+            // Enter combat area - Move to ground point first, then start chasing target
+            float fX, fY, fZ;
+            pTrigger->GetNearPoint(pTrigger, fX, fY, fZ, 0, 30.0f, pTrigger->GetAngle(pMalygos));
+            pMalygos->GetMotionMaster()->MovePoint(POINT_ID_COMBAT, fX, fY, fZ);
+            pMalygos->AI()->AttackStart((Player*)pSource);
+
+            return true;
+        }
+        return false;
+    }
+};
+
+void AddSC_boss_malygos()
+{
+    Script* s;
+
+    s = new boss_malygos();
+    s->RegisterSelf();
+    s = new npc_power_spark();
+    s->RegisterSelf();
+    s = new npc_wyrmrest_skytalon();
+    s->RegisterSelf();
+
+    s = new event_go_focusing_iris();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_malygos";
+    //pNewScript->GetAI = &GetAI_boss_malygos;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_power_spark";
+    //pNewScript->GetAI = &GetAI_npc_power_spark;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_wyrmrest_skytalon";
+    //pNewScript->GetAI = &GetAI_npc_wyrmrest_skytalon;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_go_focusing_iris";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_go_focusing_iris;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/nexus/eye_of_eternity/eye_of_eternity.h b/src/modules/SD3/scripts/northrend/nexus/eye_of_eternity/eye_of_eternity.h
new file mode 100644
index 000000000..5d982289e
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/eye_of_eternity/eye_of_eternity.h
@@ -0,0 +1,38 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_EYE_ETERNITY_H
+#define DEF_EYE_ETERNITY_H
+
+enum
+{
+    TYPE_MALYGOS                    = 0,
+
+    NPC_MALYGOS                     = 28859,
+    NPC_ALEXSTRASZA                 = 32295,
+    NPC_LARGE_TRIGGER               = 22517,
+    NPC_ALEXSTRASZAS_GIFT           = 32448,
+
+    GO_EXIT_PORTAL                  = 193908,
+    GO_PLATFORM                     = 193070,
+    GO_FOCUSING_IRIS                = 193958,
+    GO_FOCUSING_IRIS_H              = 193960,
+
+    GO_HEART_OF_MAGIC               = 194158,
+    GO_HEART_OF_MAGIC_H             = 194159,
+    GO_ALEXSTRASZAS_GIFT            = 193905,
+    GO_ALEXSTRASZAS_GIFT_H          = 193967,
+
+    ACHIEV_START_MALYGOS_ID         = 20387,
+
+    // epilogue related
+    SAY_OUTRO_1                     = -1616029,
+    SAY_OUTRO_2                     = -1616030,
+    SAY_OUTRO_3                     = -1616031,
+    SAY_OUTRO_4                     = -1616032,
+
+    SPELL_ALEXSTRASZAS_GIFT_BEAM    = 61028,
+    SPELL_ALEXSTRASZAS_GIFT_VISUAL  = 61023,
+};
+#endif
diff --git a/src/modules/SD3/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp b/src/modules/SD3/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
new file mode 100644
index 000000000..9819d850e
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
@@ -0,0 +1,170 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: instance_eye_of_eternity
+SD%Complete: 50
+SDComment:
+SDCategory: Eye of Eternity
+EndScriptData */
+
+#include "precompiled.h"
+#include "eye_of_eternity.h"
+
+static const DialogueEntry aEpilogueDialogue[] =
+{
+    {NPC_ALEXSTRASZA,               0,                  10000},
+    {SPELL_ALEXSTRASZAS_GIFT_BEAM,  0,                  3000},
+    {NPC_ALEXSTRASZAS_GIFT,         0,                  2000},
+    {SAY_OUTRO_1,                   NPC_ALEXSTRASZA,    6000},
+    {SAY_OUTRO_2,                   NPC_ALEXSTRASZA,    4000},
+    {SAY_OUTRO_3,                   NPC_ALEXSTRASZA,    23000},
+    {SAY_OUTRO_4,                   NPC_ALEXSTRASZA,    20000},
+    {GO_PLATFORM,                   0,                  0},
+    {0, 0, 0},
+};
+
+struct is_eye_of_eternity : public InstanceScript
+{
+    is_eye_of_eternity() : InstanceScript("instance_eye_of_eternity") {}
+
+    class  instance_eye_of_eternity : public ScriptedInstance, private DialogueHelper
+    {
+    public:
+        instance_eye_of_eternity(Map* pMap) : ScriptedInstance(pMap),
+            DialogueHelper(aEpilogueDialogue)
+        {
+            Initialize();
+        }
+
+        ~instance_eye_of_eternity() {}
+
+        void Initialize() override
+        {
+            m_uiEncounter = NOT_STARTED;
+            InitializeDialogueHelper(this);
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            return m_uiEncounter == IN_PROGRESS;
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_MALYGOS:
+            case NPC_ALEXSTRASZA:
+            case NPC_LARGE_TRIGGER:
+            case NPC_ALEXSTRASZAS_GIFT:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_EXIT_PORTAL:
+            case GO_PLATFORM:
+            case GO_FOCUSING_IRIS:
+            case GO_FOCUSING_IRIS_H:
+            case GO_HEART_OF_MAGIC:
+            case GO_HEART_OF_MAGIC_H:
+            case GO_ALEXSTRASZAS_GIFT:
+            case GO_ALEXSTRASZAS_GIFT_H:
+                m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            if (uiType != TYPE_MALYGOS)
+                return;
+
+            m_uiEncounter = uiData;
+            if (uiData == IN_PROGRESS)
+            {
+                // ToDo: Despawn the exit portal
+
+                DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_MALYGOS_ID);
+            }
+            else if (uiData == FAIL)
+            {
+                // ToDo: respawn the focus iris and the portal
+
+                if (GameObject* pPlatform = GetSingleGameObjectFromStorage(GO_PLATFORM))
+                    pPlatform->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK_11);
+            }
+            else if (uiData == DONE)
+                StartNextDialogueText(NPC_ALEXSTRASZA);
+
+            // Currently no reason to save anything
+        }
+
+        void Update(uint32 uiDiff) { DialogueUpdate(uiDiff); }
+
+    protected:
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case SPELL_ALEXSTRASZAS_GIFT_BEAM:
+                if (Creature* pAlextrasza = GetSingleCreatureFromStorage(NPC_ALEXSTRASZA))
+                    pAlextrasza->CastSpell(pAlextrasza, SPELL_ALEXSTRASZAS_GIFT_BEAM, false);
+                break;
+            case NPC_ALEXSTRASZAS_GIFT:
+                if (Creature* pGift = GetSingleCreatureFromStorage(NPC_ALEXSTRASZAS_GIFT))
+                    pGift->CastSpell(pGift, SPELL_ALEXSTRASZAS_GIFT_VISUAL, false);
+                DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_ALEXSTRASZAS_GIFT : GO_ALEXSTRASZAS_GIFT_H, 30 * MINUTE);
+                break;
+            case GO_PLATFORM:
+                // ToDo: respawn the portal
+                if (GameObject* pPlatform = GetSingleGameObjectFromStorage(GO_PLATFORM))
+                    pPlatform->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK_11);
+                // Spawn the Heart of Malygos
+                DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_HEART_OF_MAGIC : GO_HEART_OF_MAGIC_H, 30 * MINUTE);
+                break;
+            }
+        }
+
+        uint32 m_uiEncounter;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_eye_of_eternity(pMap);
+    }
+};
+
+void AddSC_instance_eye_of_eternity()
+{
+    Script* s;
+
+    s = new is_eye_of_eternity();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_eye_of_eternity";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_eye_of_eternity;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/nexus/nexus/boss_anomalus.cpp b/src/modules/SD3/scripts/northrend/nexus/nexus/boss_anomalus.cpp
new file mode 100644
index 000000000..6e03b18bd
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/nexus/boss_anomalus.cpp
@@ -0,0 +1,286 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Anomalus
+SD%Complete: 90%
+SDComment: Small adjustments required
+SDCategory: Nexus
+EndScriptData */
+
+#include "precompiled.h"
+#include "nexus.h"
+
+enum
+{
+    SAY_AGGRO                          = -1576006,
+    SAY_RIFT                           = -1576007,
+    SAY_SHIELD                         = -1576008,
+    SAY_KILL                           = -1576009,
+    SAY_DEATH                          = -1576010,
+    EMOTE_OPEN_RIFT                    = -1576021,
+    EMOTE_SHIELD                       = -1576022,
+
+    // Anomalus
+    SPELL_CREATE_RIFT                  = 47743,
+    SPELL_CHARGE_RIFT                  = 47747,
+    SPELL_RIFT_SHIELD                  = 47748,
+
+    SPELL_SPARK                        = 47751,
+    SPELL_SPARK_H                      = 57062,
+
+    // Chaotic Rift
+    SPELL_RIFT_AURA                    = 47687,
+    SPELL_RIFT_SUMMON_AURA             = 47732,
+
+    // Charged Chaotic Rift
+    SPELL_CHARGED_RIFT_AURA            = 47733,
+    SPELL_CHARGED_RIFT_SUMMON_AURA     = 47742,
+
+    NPC_CHAOTIC_RIFT                   = 26918,
+    NPC_CRAZED_MANA_WRAITH             = 26746
+};
+
+/*######
+## boss_anomalus
+######*/
+
+struct boss_anomalus : public CreatureScript
+{
+    boss_anomalus() : CreatureScript("boss_anomalus") {}
+
+    struct boss_anomalusAI : public ScriptedAI
+    {
+        boss_anomalusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool   m_bChaoticRift;
+        uint32 m_uiSparkTimer;
+        uint32 m_uiCreateRiftTimer;
+        uint8 m_uiChaoticRiftCount;
+
+        void Reset() override
+        {
+            m_bChaoticRift = false;
+            m_uiSparkTimer = 5000;
+            m_uiCreateRiftTimer = 25000;
+            m_uiChaoticRiftCount = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ANOMALUS, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ANOMALUS, DONE);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (urand(0, 1))
+                DoScriptText(SAY_KILL, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_CHAOTIC_RIFT)
+            {
+                ++m_uiChaoticRiftCount;
+
+                DoScriptText(SAY_RIFT, m_creature);
+
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_CHAOTIC_RIFT)
+            {
+                --m_uiChaoticRiftCount;
+
+                // If players kill the Chaotic Rifts then mark the achievement as false
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_ACHIEV_CHAOS_THEORY, uint32(false));
+
+                if (!m_uiChaoticRiftCount)
+                {
+                    if (m_creature->HasAura(SPELL_RIFT_SHIELD))
+                        m_creature->RemoveAurasDueToSpell(SPELL_RIFT_SHIELD);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim() || m_creature->HasAura(SPELL_RIFT_SHIELD))
+                return;
+
+            // Create additional Chaotic Rift at 50% HP
+            if (!m_bChaoticRift && m_creature->GetHealthPercent() < 50.0f)
+            {
+                // create a rift then set shield up and finally charge rift
+                if (DoCastSpellIfCan(m_creature, SPELL_CREATE_RIFT, CAST_TRIGGERED) == CAST_OK)
+                {
+                    // emotes are in this order
+                    DoScriptText(EMOTE_SHIELD, m_creature);
+                    DoScriptText(SAY_SHIELD, m_creature);
+                    DoScriptText(EMOTE_OPEN_RIFT, m_creature);
+
+                    DoCastSpellIfCan(m_creature, SPELL_RIFT_SHIELD, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_CHARGE_RIFT, CAST_TRIGGERED);
+                    m_bChaoticRift = true;
+                }
+                return;
+            }
+
+            if (m_uiCreateRiftTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CREATE_RIFT) == CAST_OK)
+                {
+                    DoScriptText(SAY_RIFT, m_creature);
+                    DoScriptText(EMOTE_OPEN_RIFT, m_creature);
+                    m_uiCreateRiftTimer = 25000;
+                }
+            }
+            else
+                m_uiCreateRiftTimer -= uiDiff;
+
+            if (m_uiSparkTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_SPARK : SPELL_SPARK_H);
+
+                m_uiSparkTimer = 5000;
+            }
+            else
+                m_uiSparkTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_anomalusAI(pCreature);
+    }
+};
+
+struct mob_chaotic_rift : public CreatureScript
+{
+    mob_chaotic_rift() : CreatureScript("mob_chaotic_rift") {}
+
+    struct mob_chaotic_riftAI : public Scripted_NoMovementAI
+    {
+        mob_chaotic_riftAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        uint32 m_uiChargedRemoveTimer;
+
+        void Reset() override
+        {
+            m_uiChargedRemoveTimer = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            // Auras are applied on aggro because there are many npcs with this entry in the instance
+            DoCastSpellIfCan(m_creature, SPELL_RIFT_AURA, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_RIFT_SUMMON_AURA, CAST_TRIGGERED);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_CRAZED_MANA_WRAITH)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            // When hit with Charge Rift cast the Charged Rift spells
+            if (pSpell->Id == SPELL_CHARGE_RIFT)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_CHARGED_RIFT_AURA, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_CHARGED_RIFT_SUMMON_AURA, CAST_TRIGGERED);
+                m_uiChargedRemoveTimer = 45000;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiChargedRemoveTimer)
+            {
+                // The charged spells need to be removed by casting the normal ones in case the npc isn't killed
+                if (m_uiChargedRemoveTimer <= uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_RIFT_AURA, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_RIFT_SUMMON_AURA, CAST_TRIGGERED);
+                    m_uiChargedRemoveTimer = 0;
+                }
+                else
+                    m_uiChargedRemoveTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_chaotic_riftAI(pCreature);
+    }
+};
+
+void AddSC_boss_anomalus()
+{
+    Script* s;
+
+    s = new boss_anomalus();
+    s->RegisterSelf();
+    s = new mob_chaotic_rift();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_anomalus";
+    //pNewScript->GetAI = &GetAI_boss_anomalus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_chaotic_rift";
+    //pNewScript->GetAI = &GetAI_mob_chaotic_rift;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/nexus/nexus/boss_keristrasza.cpp b/src/modules/SD3/scripts/northrend/nexus/nexus/boss_keristrasza.cpp
new file mode 100644
index 000000000..00657d864
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/nexus/boss_keristrasza.cpp
@@ -0,0 +1,265 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Keristrasza
+SD%Complete: 95%
+SDComment: timers tuning
+SDCategory: Nexus
+EndScriptData */
+
+#include "precompiled.h"
+#include "nexus.h"
+
+enum
+{
+    SAY_AGGRO                   = -1576016,
+    SAY_CRYSTAL_NOVA            = -1576017,
+    SAY_ENRAGE                  = -1576018,
+    SAY_KILL                    = -1576019,
+    SAY_DEATH                   = -1576020,
+
+    MAX_INTENSE_COLD_STACK      = 2,            // the max allowed stacks for the achiev to pass
+
+    SPELL_INTENSE_COLD          = 48094,
+    SPELL_INTENSE_COLD_AURA     = 48095,        // used for Intense cold achiev
+
+    SPELL_CRYSTALFIRE_BREATH    = 48096,
+    SPELL_CRYSTALFIRE_BREATH_H  = 57091,
+
+    SPELL_CRYSTALLIZE           = 48179,
+
+    SPELL_CRYSTAL_CHAINS        = 50997,
+
+    SPELL_TAIL_SWEEP            = 50155,
+
+    SPELL_ENRAGE                = 8599
+};
+
+/*######
+## boss_keristrasza
+######*/
+
+struct boss_keristrasza : public CreatureScript
+{
+    boss_keristrasza() : CreatureScript("boss_keristrasza") {}
+
+    struct boss_keristraszaAI : public ScriptedAI
+    {
+        boss_keristraszaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 uiCrystalChainTimer;
+        uint32 uiTailSweepTimer;
+        uint32 uiCrystalfireBreathTimer;
+        uint32 uiCrystallizeTimer;
+        uint32 uiCheckIntenseColdTimer;
+
+        bool m_bIsEnraged;
+
+        void Reset() override
+        {
+            uiCrystalChainTimer = 30000;
+            uiTailSweepTimer = urand(5000, 7500);
+            uiCrystalfireBreathTimer = urand(10000, 20000);
+            uiCrystallizeTimer = urand(20000, 30000);
+            uiCheckIntenseColdTimer = 2000;
+
+            m_bIsEnraged = false;
+
+            if (!m_pInstance)
+                return;
+
+            if (m_creature->IsAlive())
+            {
+                if (m_pInstance->GetData(TYPE_KERISTRASZA) != SPECIAL)
+                    DoCastSpellIfCan(m_creature, SPELL_FROZEN_PRISON, CAST_TRIGGERED);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            m_creature->CastSpell(m_creature, SPELL_INTENSE_COLD, true);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_KERISTRASZA, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_KERISTRASZA, DONE);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (urand(0, 1))
+                DoScriptText(SAY_KILL, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // This needs to be checked only on heroic
+            if (!m_bIsRegularMode)
+            {
+                if (uiCheckIntenseColdTimer < uiDiff)
+                {
+                    ThreatList playerList = m_creature->GetThreatManager().getThreatList();
+                    for (ThreatList::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr)
+                    {
+                        if (Player* pTarget = m_creature->GetMap()->GetPlayer((*itr)->getUnitGuid()))
+                        {
+                            Aura* pAuraIntenseCold = pTarget->GetAura(SPELL_INTENSE_COLD_AURA, EFFECT_INDEX_0);
+
+                            if (pAuraIntenseCold)
+                            {
+                                if (pAuraIntenseCold->GetStackAmount() > MAX_INTENSE_COLD_STACK)
+                                {
+                                    if (m_pInstance)
+                                        m_pInstance->SetData(TYPE_INTENSE_COLD_FAILED, pTarget->GetGUIDLow());
+                                }
+                            }
+                        }
+                    }
+                    uiCheckIntenseColdTimer = 1000;
+                }
+                else
+                    uiCheckIntenseColdTimer -= uiDiff;
+            }
+
+            if (!m_bIsEnraged && m_creature->GetHealthPercent() < 25.0f)
+            {
+                if (!m_creature->IsNonMeleeSpellCasted(false))
+                {
+                    m_bIsEnraged = true;
+                    DoScriptText(SAY_ENRAGE, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_ENRAGE);
+                }
+            }
+
+            if (uiCrystalChainTimer < uiDiff)
+            {
+                if (!m_creature->IsNonMeleeSpellCasted(false))
+                {
+                    if (m_bIsRegularMode)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                        {
+                            if (Player* pPlayer = pTarget->GetCharmerOrOwnerPlayerOrPlayerItself())
+                                DoCastSpellIfCan(pPlayer, SPELL_CRYSTAL_CHAINS);
+
+                            uiCrystalChainTimer = 30000;
+                        }
+                    }
+                    else
+                    {
+                        if (Unit* pSource = m_creature->getVictim())
+                        {
+                            uiCrystalChainTimer = 15000;
+
+                            Player* pPlayer = pSource->GetCharmerOrOwnerPlayerOrPlayerItself();
+
+                            if (!pPlayer)
+                                return;
+
+                            if (Group* pGroup = pPlayer->GetGroup())
+                            {
+                                for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
+                                {
+                                    if (Player* pMember = pRef->getSource())
+                                    {
+                                        if (pMember->IsAlive() && pMember->IsWithinDistInMap(m_creature, 50.0f))
+                                            m_creature->CastSpell(pMember, SPELL_CRYSTAL_CHAINS, true);
+                                    }
+                                }
+                            }
+                            else
+                                m_creature->CastSpell(pPlayer, SPELL_CRYSTAL_CHAINS, false);
+                        }
+                    }
+                }
+            }
+            else
+                uiCrystalChainTimer -= uiDiff;
+
+            if (uiTailSweepTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TAIL_SWEEP) == CAST_OK)
+                    uiTailSweepTimer = urand(2500, 7500);
+            }
+            else
+                uiCrystalChainTimer -= uiDiff;
+
+            if (uiCrystalfireBreathTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_CRYSTALFIRE_BREATH : SPELL_CRYSTALFIRE_BREATH_H) == CAST_OK)
+                    uiCrystalfireBreathTimer = urand(15000, 20000);
+            }
+            else
+                uiCrystalfireBreathTimer -= uiDiff;
+
+            if (!m_bIsRegularMode)
+            {
+                if (uiCrystallizeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_CRYSTALLIZE) == CAST_OK)
+                    {
+                        uiCrystallizeTimer = urand(15000, 25000);
+                        DoScriptText(SAY_CRYSTAL_NOVA, m_creature);
+                    }
+                }
+                else
+                    uiCrystallizeTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_keristraszaAI(pCreature);
+    }
+};
+
+void AddSC_boss_keristrasza()
+{
+    Script* s;
+
+    s = new boss_keristrasza();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_keristrasza";
+    //pNewScript->GetAI = &GetAI_boss_keristrasza;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/nexus/nexus/boss_ormorok.cpp b/src/modules/SD3/scripts/northrend/nexus/nexus/boss_ormorok.cpp
new file mode 100644
index 000000000..2963e88c4
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/nexus/boss_ormorok.cpp
@@ -0,0 +1,304 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Ormorok
+SD%Complete: 90%
+SDComment: Crystal spikes may need small adjustments.
+SDCategory: Nexus
+EndScriptData */
+
+#include "precompiled.h"
+#include "nexus.h"
+
+enum
+{
+    SAY_AGGRO                   = -1576011,
+    SAY_KILL                    = -1576012,
+    SAY_REFLECT                 = -1576013,
+    SAY_ICESPIKE                = -1576014,
+    SAY_DEATH                   = -1576015,
+    EMOTE_BOSS_GENERIC_FRENZY   = -1000005,
+
+    SPELL_REFLECTION            = 47981,
+    SPELL_CRYSTAL_SPIKES        = 47958,
+    SPELL_CRYSTAL_SPIKES_H1     = 57082,
+    SPELL_CRYSTAL_SPIKES_H2     = 57083,
+    SPELL_FRENZY                = 48017,
+    SPELL_FRENZY_H              = 57086,
+    SPELL_TRAMPLE               = 48016,
+    SPELL_TRAMPLE_H             = 57066,
+    SPELL_SUMMON_TANGLER_H      = 61564,
+
+    // crystal spike spells
+    SPELL_CRYSTAL_SPIKE_BACK    = 47936,
+    SPELL_CRYSTAL_SPIKE_LEFT    = 47942,
+    SPELL_CRYSTAL_SPIKE_RIGHT   = 47943,
+    SPELL_CRYSTAL_SPIKE_AURA    = 47941,
+    SPELL_CRYSTAL_SPIKE_PRE     = 50442,
+
+    //SPELL_CRYSTAL_SPIKE_DMG     = 47944,
+    //SPELL_CRYSTAL_SPIKE_DMG_H   = 57067,
+
+    // summons
+    NPC_CRYSTAL_SPIKE_INITIAL   = 27101,
+    NPC_CRYSTAL_SPIKE_TRIGGER   = 27079,
+    //NPC_CRYSTAL_SPIKE           = 27099,          // summoned by 47947 - handled in eventAI
+    NPC_CRYSTALLINE_TANGLER     = 32665,
+
+    GO_CRYSTAL_SPIKE            = 188537,
+
+    MAX_ALLOWED_SPIKES          = 28,               // this defines the maximum number of spikes summoned per turn
+};
+
+/*######
+## boss_ormorok
+######*/
+
+struct boss_ormorok : public CreatureScript
+{
+    boss_ormorok() : CreatureScript("boss_ormorok") {}
+
+    struct boss_ormorokAI : public ScriptedAI
+    {
+        boss_ormorokAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bIsEnraged;
+
+        uint32 m_uiTrampleTimer;
+        uint32 m_uiSpellReflectTimer;
+        uint32 m_uiCrystalSpikeTimer;
+        uint32 m_uiTanglerTimer;
+        uint8 m_uiSpikeCount;
+
+        void Reset() override
+        {
+            m_bIsEnraged = false;
+
+            m_uiTrampleTimer = urand(10000, 15000);
+            m_uiSpellReflectTimer = urand(20000, 23000);
+            m_uiCrystalSpikeTimer = urand(10000, 15000);
+            m_uiTanglerTimer = urand(17000, 20000);
+            m_uiSpikeCount = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ORMOROK, DONE);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (urand(0, 1))
+                DoScriptText(SAY_KILL, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_CRYSTALLINE_TANGLER:
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                    pSummoned->AI()->AttackStart(pTarget);
+                break;
+            case NPC_CRYSTAL_SPIKE_TRIGGER:
+                pSummoned->CastSpell(pSummoned, SPELL_CRYSTAL_SPIKE_PRE, true);
+                ++m_uiSpikeCount;
+                // no break;
+            case NPC_CRYSTAL_SPIKE_INITIAL:
+                // Update orientation so we can always face the boss
+                pSummoned->SetFacingToObject(m_creature);
+
+                // allow continuous summoning only until we reach the limit
+                if (m_uiSpikeCount < MAX_ALLOWED_SPIKES)
+                    pSummoned->CastSpell(pSummoned, SPELL_CRYSTAL_SPIKE_AURA, true);
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (!m_bIsEnraged && m_creature->GetHealthPercent() < 25.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_FRENZY : SPELL_FRENZY_H) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_BOSS_GENERIC_FRENZY, m_creature);
+                    m_bIsEnraged = true;
+                }
+            }
+
+            if (m_uiTrampleTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_TRAMPLE : SPELL_TRAMPLE_H) == CAST_OK)
+                    m_uiTrampleTimer = urand(20000, 25000);
+            }
+            else
+                m_uiTrampleTimer -= uiDiff;
+
+            if (m_uiSpellReflectTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_REFLECTION) == CAST_OK)
+                    m_uiSpellReflectTimer = urand(26000, 30000);
+            }
+            else
+                m_uiSpellReflectTimer -= uiDiff;
+
+            if (m_uiCrystalSpikeTimer < uiDiff)
+            {
+                uint32 uiSpikeSpell = SPELL_CRYSTAL_SPIKES;
+                if (!m_bIsRegularMode)
+                    uiSpikeSpell = urand(0, 1) ? SPELL_CRYSTAL_SPIKES_H1 : SPELL_CRYSTAL_SPIKES_H2;
+
+                if (DoCastSpellIfCan(m_creature, uiSpikeSpell) == CAST_OK)
+                {
+                    DoScriptText(SAY_ICESPIKE, m_creature);
+                    m_uiCrystalSpikeTimer = urand(13000, 15000);
+                    m_uiSpikeCount = 0;
+                }
+            }
+            else
+                m_uiCrystalSpikeTimer -= uiDiff;
+
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiTanglerTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_TANGLER_H) == CAST_OK)
+                        m_uiTanglerTimer = urand(15000, 25000);
+                }
+                else
+                    m_uiTanglerTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ormorokAI(pCreature);
+    }
+};
+
+struct spell_crystal_spike_aura : public SpellScript
+{
+    spell_crystal_spike_aura() : SpellScript("spell_crystal_spike_aura") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_CRYSTAL_SPIKE_AURA && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+            if (pCreatureTarget->GetEntry() == NPC_CRYSTAL_SPIKE_INITIAL || pCreatureTarget->GetEntry() == NPC_CRYSTAL_SPIKE_TRIGGER)
+            {
+                ScriptedInstance* pInstance = (ScriptedInstance*)pCreatureTarget->GetInstanceData();
+                if (!pInstance)
+                    return true;
+
+                Creature* pOrmorok = pInstance->GetSingleCreatureFromStorage(NPC_ORMOROK);
+                if (!pOrmorok)
+                    return true;
+
+                // The following spells define the direction of the spike line
+                // All of the spells are targeting the back of the caster, but some take a small turn to left or right
+                // The exact algorithm is unk but we know that the chances of getting a straight line are about 75%. The other two directions are about 12.5% each
+                uint32 uiSpellId = 0;
+                if (roll_chance_i(75))
+                    uiSpellId = SPELL_CRYSTAL_SPIKE_BACK;
+                else
+                    uiSpellId = urand(0, 1) ? SPELL_CRYSTAL_SPIKE_LEFT : SPELL_CRYSTAL_SPIKE_RIGHT;
+
+                pCreatureTarget->CastSpell(pCreatureTarget, uiSpellId, true, NULL, NULL, pOrmorok->GetObjectGuid());
+                // always return true when we are handling this spell and effect
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+struct aura_crystal_spike_pre : public AuraScript
+{
+    aura_crystal_spike_pre() : AuraScript("aura_crystal_spike_pre") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() == SPELL_CRYSTAL_SPIKE_PRE && pAura->GetEffIndex() == EFFECT_INDEX_0 && !bApply)
+        {
+            if (Creature* pTarget = (Creature*)pAura->GetTarget())
+            {
+                if (pTarget->GetEntry() != NPC_CRYSTAL_SPIKE_TRIGGER)
+                    return true;
+
+                // Use the Spike gameobject so we can summon the npc which actual does the damage
+                if (GameObject* pSpike = GetClosestGameObjectWithEntry(pTarget, GO_CRYSTAL_SPIKE, 10.0f))
+                {
+                    pSpike->Use(pTarget);
+                    // Note: the following command should be handled in core by the trap GO code
+                    pSpike->SetLootState(GO_JUST_DEACTIVATED);
+                }
+            }
+        }
+        return true;
+    }
+};
+
+void AddSC_boss_ormorok()
+{
+    Script* s;
+
+    s = new boss_ormorok();
+    s->RegisterSelf();
+
+    s = new spell_crystal_spike_aura();
+    s->RegisterSelf();
+    s = new aura_crystal_spike_pre();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ormorok";
+    //pNewScript->GetAI = &GetAI_boss_ormorok;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_crystal_spike_trigger";
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_crystal_spike_trigger;
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_spell_aura_dummy_crystal_spike_visual;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/nexus/nexus/boss_telestra.cpp b/src/modules/SD3/scripts/northrend/nexus/nexus/boss_telestra.cpp
new file mode 100644
index 000000000..6d001b107
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/nexus/boss_telestra.cpp
@@ -0,0 +1,291 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Telestra
+SD%Complete: 80%
+SDComment: script depend on database spell support and eventAi for clones. transition to phase 2 also not fully implemented
+SDCategory: Nexus
+EndScriptData */
+
+#include "precompiled.h"
+#include "nexus.h"
+
+enum
+{
+    SAY_AGGRO               = -1576000,
+    SAY_SPLIT_1             = -1576001,
+    SAY_SPLIT_2             = -1576002,
+    SAY_MERGE               = -1576003,
+    SAY_KILL                = -1576004,
+    SAY_DEATH               = -1576005,
+
+    SPELL_FIREBOMB          = 47773,
+    SPELL_FIREBOMB_H        = 56934,
+
+    SPELL_ICE_NOVA          = 47772,
+    SPELL_ICE_NOVA_H        = 56935,
+
+    SPELL_GRAVITY_WELL      = 47756,
+
+    SPELL_SUMMON_CLONES     = 47710,
+
+    SPELL_ARCANE_VISUAL     = 47704,
+    SPELL_FIRE_VISUAL       = 47705,
+    SPELL_FROST_VISUAL      = 47706,
+
+    SPELL_SUMMON_FIRE       = 47707,
+    SPELL_SUMMON_ARCANE     = 47708,
+    SPELL_SUMMON_FROST      = 47709,
+
+    SPELL_FIRE_DIES         = 47711,                        // cast by clones at their death
+    SPELL_ARCANE_DIES       = 47713,
+    SPELL_FROST_DIES        = 47712,
+
+    SPELL_SPAWN_BACK_IN     = 47714,
+
+    NPC_TELEST_FIRE         = 26928,
+    NPC_TELEST_ARCANE       = 26929,
+    NPC_TELEST_FROST        = 26930,
+
+    PHASE_1                 = 1,
+    PHASE_2                 = 2,
+    PHASE_3                 = 3,
+    PHASE_4                 = 4
+};
+
+/*######
+## boss_telestra
+######*/
+
+struct boss_telestra : public CreatureScript
+{
+    boss_telestra() : CreatureScript("boss_telestra") {}
+
+    struct boss_telestraAI : public ScriptedAI
+    {
+        boss_telestraAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiPhase;
+        uint8 m_uiCloneDeadCount;
+
+        uint32 m_uiPersonalityTimer;
+        uint32 m_uiFirebombTimer;
+        uint32 m_uiIceNovaTimer;
+        uint32 m_uiGravityWellTimer;
+
+        bool m_bCanCheckAchiev;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_1;
+            m_uiCloneDeadCount = 0;
+
+            m_uiPersonalityTimer = 0;
+            m_uiFirebombTimer = urand(2000, 4000);
+            m_uiIceNovaTimer = urand(8000, 12000);
+            m_uiGravityWellTimer = urand(15000, 25000);
+
+            m_bCanCheckAchiev = false;
+        }
+
+        void JustReachedHome() override
+        {
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+
+                m_creature->GetMotionMaster()->MoveChase(pWho, 15.0f);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_TELESTRA, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_TELESTRA, DONE);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (urand(0, 1))
+                DoScriptText(SAY_KILL, m_creature);
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            switch (pSpell->Id)
+            {
+                // eventAi must make sure clones cast spells when each of them die
+            case SPELL_FIRE_DIES:
+            case SPELL_ARCANE_DIES:
+            case SPELL_FROST_DIES:
+                ++m_uiCloneDeadCount;
+
+                // After the first clone from each split phase is dead start the achiev timer
+                if (m_uiCloneDeadCount == 1 || m_uiCloneDeadCount == 4)
+                {
+                    m_bCanCheckAchiev = true;
+                    m_uiPersonalityTimer = 0;
+                }
+
+                if (m_uiCloneDeadCount == 3 || m_uiCloneDeadCount == 6)
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_SUMMON_CLONES);
+                    m_creature->CastSpell(m_creature, SPELL_SPAWN_BACK_IN, false);
+
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+                    DoScriptText(SAY_MERGE, m_creature);
+
+                    // Check if it took longer than 5 sec
+                    if (m_uiPersonalityTimer > 5000)
+                    {
+                        if (m_pInstance)
+                            m_pInstance->SetData(TYPE_ACHIEV_SPLIT_PERSONALITY, uint32(false));
+                    }
+                    m_bCanCheckAchiev = false;
+
+                    m_uiPhase = m_uiCloneDeadCount == 3 ? PHASE_3 : PHASE_4;
+                }
+                break;
+            case SPELL_SUMMON_CLONES:
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_TELEST_FIRE: pSummoned->CastSpell(pSummoned, SPELL_FIRE_VISUAL, true); break;
+            case NPC_TELEST_ARCANE: pSummoned->CastSpell(pSummoned, SPELL_ARCANE_VISUAL, true); break;
+            case NPC_TELEST_FROST: pSummoned->CastSpell(pSummoned, SPELL_FROST_VISUAL, true); break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_bCanCheckAchiev)
+                m_uiPersonalityTimer += uiDiff;
+
+            switch (m_uiPhase)
+            {
+            case PHASE_1:
+            case PHASE_3:
+            case PHASE_4:
+                if (!m_creature->GetCurrentSpell(CURRENT_CHANNELED_SPELL))
+                {
+                    if (m_uiFirebombTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_FIREBOMB : SPELL_FIREBOMB_H) == CAST_OK)
+                            m_uiFirebombTimer = urand(4000, 6000);
+                    }
+                    else
+                        m_uiFirebombTimer -= uiDiff;
+
+                    if (m_uiIceNovaTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ICE_NOVA : SPELL_ICE_NOVA_H) == CAST_OK)
+                            m_uiIceNovaTimer = urand(10000, 15000);
+                    }
+                    else
+                        m_uiIceNovaTimer -= uiDiff;
+
+                    if (m_uiPhase == PHASE_1 && m_creature->GetHealthPercent() < 50.0f)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_CLONES, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                        {
+                            DoScriptText(urand(0, 1) ? SAY_SPLIT_1 : SAY_SPLIT_2, m_creature);
+                            m_uiPhase = PHASE_2;
+                        }
+                    }
+
+                    if (m_uiPhase == PHASE_3 && !m_bIsRegularMode && m_creature->GetHealthPercent() < 15.0f)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_CLONES, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                        {
+                            DoScriptText(urand(0, 1) ? SAY_SPLIT_1 : SAY_SPLIT_2, m_creature);
+                            m_uiPhase = PHASE_2;
+                        }
+                    }
+
+                    DoMeleeAttackIfReady();
+                }
+
+                if (m_uiGravityWellTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_GRAVITY_WELL) == CAST_OK)
+                        m_uiGravityWellTimer = urand(15000, 30000);
+                }
+                else
+                    m_uiGravityWellTimer -= uiDiff;
+
+                break;
+            case PHASE_2:
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_telestraAI(pCreature);
+    }
+};
+
+void AddSC_boss_telestra()
+{
+    Script* s;
+
+    s = new boss_telestra();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_telestra";
+    //pNewScript->GetAI = &GetAI_boss_telestra;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/nexus/nexus/instance_nexus.cpp b/src/modules/SD3/scripts/northrend/nexus/nexus/instance_nexus.cpp
new file mode 100644
index 000000000..8b4a5647c
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/nexus/instance_nexus.cpp
@@ -0,0 +1,265 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: instance_nexus
+SD%Complete: 75%
+SDComment:
+SDCategory: The Nexus
+EndScriptData */
+
+#include "precompiled.h"
+#include "nexus.h"
+
+struct is_nexus : public InstanceScript
+{
+    is_nexus() : InstanceScript("instance_nexus") {}
+
+    class instance_nexus : public ScriptedInstance
+    {
+    public:
+        instance_nexus(Map* pMap) : ScriptedInstance(pMap)
+        {
+            Initialize();
+
+            for (uint8 i = 0; i < MAX_SPECIAL_ACHIEV_CRITS; ++i)
+                m_abAchievCriteria[i] = false;
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_CONTAINMENT_SPHERE_TELESTRA:
+                if (m_auiEncounter[TYPE_TELESTRA] == DONE)
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                break;
+            case GO_CONTAINMENT_SPHERE_ANOMALUS:
+                if (m_auiEncounter[TYPE_ANOMALUS] == DONE)
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                break;
+            case GO_CONTAINMENT_SPHERE_ORMOROK:
+                if (m_auiEncounter[TYPE_ORMOROK] == DONE)
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_ORMOROK:
+            case NPC_KERISTRASZA:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            return 0;
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_TELESTRA:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_SPLIT_PERSONALITY, true);
+                if (uiData == DONE)
+                    DoToggleGameObjectFlags(GO_CONTAINMENT_SPHERE_TELESTRA, GO_FLAG_NO_INTERACT, false);
+                break;
+            case TYPE_ANOMALUS:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_CHAOS_THEORY, true);
+                if (uiData == DONE)
+                    DoToggleGameObjectFlags(GO_CONTAINMENT_SPHERE_ANOMALUS, GO_FLAG_NO_INTERACT, false);
+                break;
+            case TYPE_ORMOROK:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                    DoToggleGameObjectFlags(GO_CONTAINMENT_SPHERE_ORMOROK, GO_FLAG_NO_INTERACT, false);
+                break;
+            case TYPE_KERISTRASZA:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                    m_sIntenseColdFailPlayers.clear();
+                break;
+            case TYPE_INTENSE_COLD_FAILED:
+                // Insert the players who fail the achiev and haven't been already inserted in the set
+                if (m_sIntenseColdFailPlayers.find(uiData) == m_sIntenseColdFailPlayers.end())
+                    m_sIntenseColdFailPlayers.insert(uiData);
+                break;
+            case TYPE_ACHIEV_SPLIT_PERSONALITY:
+            case TYPE_ACHIEV_CHAOS_THEORY:
+                SetSpecialAchievementCriteria(uiType - TYPE_ACHIEV_CHAOS_THEORY, bool(uiData));
+                return;
+            default:
+                script_error_log("Instance Nexus: ERROR SetData = %u for type %u does not exist/not implemented.", uiType, uiData);
+                return;
+            }
+
+            if (m_auiEncounter[TYPE_TELESTRA] == SPECIAL && m_auiEncounter[TYPE_ANOMALUS] == SPECIAL && m_auiEncounter[TYPE_ORMOROK] == SPECIAL)
+            {
+                // release Keristrasza from her prison here
+                m_auiEncounter[TYPE_KERISTRASZA] = SPECIAL;
+
+                Creature* pCreature = GetSingleCreatureFromStorage(NPC_KERISTRASZA);
+                if (pCreature && pCreature->IsAlive())
+                {
+                    pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                    pCreature->RemoveAurasDueToSpell(SPELL_FROZEN_PRISON);
+                }
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+            case ACHIEV_CRIT_CHAOS_THEORY:
+                return m_abAchievCriteria[0];
+            case ACHIEV_CRIT_SPLIT_PERSONALITY:
+                return m_abAchievCriteria[1];
+            case ACHIEV_CRIT_INTENSE_COLD:
+                // Return true if not found in the set
+                return m_sIntenseColdFailPlayers.find(pSource->GetGUIDLow()) == m_sIntenseColdFailPlayers.end();
+
+            default:
+                return false;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        void SetSpecialAchievementCriteria(uint32 uiType, bool bIsMet)
+        {
+            if (uiType < MAX_SPECIAL_ACHIEV_CRITS)
+                m_abAchievCriteria[uiType] = bIsMet;
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        bool m_abAchievCriteria[MAX_SPECIAL_ACHIEV_CRITS];
+
+        std::set<uint32> m_sIntenseColdFailPlayers;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_nexus(pMap);
+    }
+};
+
+struct go_containment_sphere : public GameObjectScript
+{
+    go_containment_sphere() : GameObjectScript("go_containment_sphere") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+
+        if (!pInstance)
+            return false;
+
+        switch (pGo->GetEntry())
+        {
+        case GO_CONTAINMENT_SPHERE_TELESTRA: pInstance->SetData(TYPE_TELESTRA, SPECIAL); break;
+        case GO_CONTAINMENT_SPHERE_ANOMALUS: pInstance->SetData(TYPE_ANOMALUS, SPECIAL); break;
+        case GO_CONTAINMENT_SPHERE_ORMOROK:  pInstance->SetData(TYPE_ORMOROK, SPECIAL);  break;
+        }
+
+        pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+        return false;
+    }
+};
+
+void AddSC_instance_nexus()
+{
+    Script* s;
+
+    s = new is_nexus();
+    s->RegisterSelf();
+
+    s = new go_containment_sphere();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_nexus";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_nexus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_containment_sphere";
+    //pNewScript->pGOUse = &GOUse_go_containment_sphere;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/nexus/nexus/nexus.h b/src/modules/SD3/scripts/northrend/nexus/nexus/nexus.h
new file mode 100644
index 000000000..363ee2423
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/nexus/nexus.h
@@ -0,0 +1,37 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_NEXUS_H
+#define DEF_NEXUS_H
+
+enum
+{
+    MAX_ENCOUNTER                  = 4,
+    MAX_SPECIAL_ACHIEV_CRITS       = 2,
+
+    TYPE_TELESTRA                  = 0,
+    TYPE_ANOMALUS                  = 1,
+    TYPE_ORMOROK                   = 2,
+    TYPE_KERISTRASZA               = 3,
+    TYPE_INTENSE_COLD_FAILED       = 4,
+
+    TYPE_ACHIEV_CHAOS_THEORY       = 5,     //order to be met in ScriptedInstance
+    TYPE_ACHIEV_SPLIT_PERSONALITY  = 6,
+
+    NPC_TELESTRA                   = 26731,
+    NPC_ANOMALUS                   = 26763,
+    NPC_ORMOROK                    = 26794,
+    NPC_KERISTRASZA                = 26723,
+
+    GO_CONTAINMENT_SPHERE_TELESTRA = 188526,
+    GO_CONTAINMENT_SPHERE_ANOMALUS = 188527,
+    GO_CONTAINMENT_SPHERE_ORMOROK  = 188528,
+
+    SPELL_FROZEN_PRISON             = 47854,
+
+    ACHIEV_CRIT_CHAOS_THEORY        = 7316,                 // Anomalus, achiev 2037
+    ACHIEV_CRIT_INTENSE_COLD        = 7315,                 // Keristrasza, achiev 2036
+    ACHIEV_CRIT_SPLIT_PERSONALITY   = 7577,                 // Telestra, achiev 2150
+};
+#endif
diff --git a/src/modules/SD3/scripts/northrend/nexus/oculus/boss_eregos.cpp b/src/modules/SD3/scripts/northrend/nexus/oculus/boss_eregos.cpp
new file mode 100644
index 000000000..423488665
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/oculus/boss_eregos.cpp
@@ -0,0 +1,339 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_eregos
+SD%Complete: 90
+SDComment: Small adjustments may be required.
+SDCategory: Oculus
+EndScriptData */
+
+#include "precompiled.h"
+#include "oculus.h"
+
+enum
+{
+    SAY_AGGRO                       = -1578011,
+    SAY_ARCANE_SHIELD               = -1578012,
+    SAY_FIRE_SHIELD                 = -1578013,
+    SAY_NATURE_SHIELD               = -1578014,
+    SAY_FRENZY                      = -1578015,
+    SAY_KILL_1                      = -1578016,
+    SAY_KILL_2                      = -1578017,
+    SAY_KILL_3                      = -1578018,
+    SAY_DEATH                       = -1578019,
+    EMOTE_ASTRAL_PLANE              = -1578024,
+
+    SPELL_ARCANE_BARRAGE            = 50804,
+    SPELL_ARCANE_BARRAGE_H          = 59381,
+    SPELL_ARCANE_VOLLEY             = 51153,
+    SPELL_ARCANE_VOLLEY_H           = 59382,
+    SPELL_ENRAGED_ASSAULT           = 51170,
+    SPELL_PLANAR_ANOMALIES          = 57959,
+    SPELL_SUMMON_LEY_WHELP          = 51175,
+    SPELL_PLANAR_SHIFT              = 51162,
+
+    SPELL_PLANAR_ANOMALY_AGGRO      = 57971,
+    SPELL_PLANAR_BLAST              = 57976,
+
+    NPC_PLANAR_ANOMALY              = 30879,
+    NPC_GREATER_LEY_WHELP           = 28276,
+};
+
+/*######
+## boss_eregos
+######*/
+
+struct boss_eregos : public CreatureScript
+{
+    boss_eregos() : CreatureScript("boss_eregos") {}
+
+    struct boss_eregosAI : public ScriptedAI
+    {
+        boss_eregosAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiArcaneBarrageTimer;
+        uint32 m_uiArcaneVolleyTimer;
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiSummonWhelpsTimer;
+        float m_fHpPercent;
+
+        uint8 m_uiAnomalyTargetIndex;
+        GuidVector m_vAnomalyTargets;
+
+        void Reset() override
+        {
+            m_uiArcaneBarrageTimer = 0;
+            m_uiArcaneVolleyTimer = 20000;
+            m_uiEnrageTimer = 35000;
+            m_uiSummonWhelpsTimer = urand(15000, 20000);
+            m_fHpPercent = 60.0f;
+            m_uiAnomalyTargetIndex = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_EREGOS, IN_PROGRESS);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, false))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                DoStartMovement(pWho, 20.0f);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_KILL_1, m_creature); break;
+            case 1: DoScriptText(SAY_KILL_2, m_creature); break;
+            case 2: DoScriptText(SAY_KILL_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_EREGOS, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_EREGOS, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_PLANAR_ANOMALY)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_PLANAR_ANOMALY_AGGRO, true);
+
+                // If this happens then something is really wrong
+                if (m_vAnomalyTargets.empty())
+                    return;
+
+                if (Unit* pTarget = m_creature->GetMap()->GetUnit(m_vAnomalyTargets[m_uiAnomalyTargetIndex]))
+                    pSummoned->GetMotionMaster()->MoveFollow(pTarget, 0, 0);
+
+                if (m_uiAnomalyTargetIndex < m_vAnomalyTargets.size() - 1)
+                    ++m_uiAnomalyTargetIndex;
+            }
+            else if (pSummoned->GetEntry() == NPC_GREATER_LEY_WHELP)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_creature->HasAura(SPELL_PLANAR_SHIFT))
+                return;
+
+            if (m_creature->GetHealthPercent() < m_fHpPercent)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_PLANAR_SHIFT) == CAST_OK)
+                {
+                    // Get all the vehicle entries which are in combat with the boss
+                    m_vAnomalyTargets.clear();
+                    m_uiAnomalyTargetIndex = 0;
+
+                    ThreatList const& threatList = m_creature->GetThreatManager().getThreatList();
+                    for (ThreatList::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
+                    {
+                        if (Unit* pTarget = m_creature->GetMap()->GetUnit((*itr)->getUnitGuid()))
+                        {
+                            if (pTarget->GetEntry() == NPC_RUBY_DRAKE || pTarget->GetEntry() == NPC_AMBER_DRAKE || pTarget->GetEntry() == NPC_EMERALD_DRAKE)
+                                m_vAnomalyTargets.push_back(pTarget->GetObjectGuid());
+                        }
+                    }
+
+                    // This will summon an anomaly for each player (vehicle)
+                    DoCastSpellIfCan(m_creature, SPELL_PLANAR_ANOMALIES, CAST_TRIGGERED);
+
+                    switch (urand(0, 2))
+                    {
+                    case 0: DoScriptText(SAY_ARCANE_SHIELD, m_creature); break;
+                    case 1: DoScriptText(SAY_FIRE_SHIELD, m_creature); break;
+                    case 2: DoScriptText(SAY_NATURE_SHIELD, m_creature); break;
+                    }
+                    DoScriptText(EMOTE_ASTRAL_PLANE, m_creature);
+
+                    // set next phase to 20%
+                    m_fHpPercent -= 40;
+                }
+            }
+
+            if (m_uiArcaneBarrageTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_ARCANE_BARRAGE : SPELL_ARCANE_BARRAGE_H) == CAST_OK)
+                        m_uiArcaneBarrageTimer = urand(2000, 3000);
+                }
+            }
+            else
+                m_uiArcaneBarrageTimer -= uiDiff;
+
+            if (m_uiSummonWhelpsTimer < uiDiff)
+            {
+                // ToDo: the number of whelps summoned may be different based on difficulty. Needs research!
+                for (uint8 i = 0; i < 4; ++i)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_LEY_WHELP, CAST_TRIGGERED) == CAST_OK)
+                        m_uiSummonWhelpsTimer = 20000;
+                }
+            }
+            else
+                m_uiSummonWhelpsTimer -= uiDiff;
+
+            if (m_uiArcaneVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ARCANE_VOLLEY : SPELL_ARCANE_VOLLEY_H) == CAST_OK)
+                    m_uiArcaneVolleyTimer = urand(10000, 15000);
+            }
+            else
+                m_uiArcaneVolleyTimer -= uiDiff;
+
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ENRAGED_ASSAULT) == CAST_OK)
+                {
+                    DoScriptText(SAY_FRENZY, m_creature);
+                    m_uiEnrageTimer = urand(40000, 50000);
+                }
+            }
+            else
+                m_uiEnrageTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_eregosAI(pCreature);
+    }
+};
+
+/*######
+## npc_planar_anomaly
+######*/
+
+struct npc_planar_anomaly : public CreatureScript
+{
+    npc_planar_anomaly() : CreatureScript("npc_planar_anomaly") {}
+
+    struct npc_planar_anomalyAI : public ScriptedAI
+    {
+        npc_planar_anomalyAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiPlanarBlastTimer;
+        bool m_bHasBlastCasted;
+
+        void Reset() override
+        {
+            m_uiPlanarBlastTimer = 15000;
+            m_bHasBlastCasted = false;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_bHasBlastCasted)
+                return;
+
+            // Check for the players mounted on the vehicles
+            if (pWho->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (m_creature->IsWithinDistInMap(pWho, INTERACTION_DISTANCE))
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_PLANAR_BLAST) == CAST_OK)
+                    {
+                        m_bHasBlastCasted = true;
+                        m_creature->ForcedDespawn(1000);
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_bHasBlastCasted)
+                return;
+
+            if (m_uiPlanarBlastTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_PLANAR_BLAST) == CAST_OK)
+                {
+                    m_bHasBlastCasted = true;
+                    m_creature->ForcedDespawn(1000);
+                }
+            }
+            else
+                m_uiPlanarBlastTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_planar_anomalyAI(pCreature);
+    }
+};
+
+void AddSC_boss_eregos()
+{
+    Script* s;
+
+    s = new boss_eregos();
+    s->RegisterSelf();
+    s = new npc_planar_anomaly();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_eregos";
+    //pNewScript->GetAI = &GetAI_boss_eregos;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_planar_anomaly";
+    //pNewScript->GetAI = &GetAI_npc_planar_anomaly;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/nexus/oculus/boss_urom.cpp b/src/modules/SD3/scripts/northrend/nexus/oculus/boss_urom.cpp
new file mode 100644
index 000000000..02e126b7b
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/oculus/boss_urom.cpp
@@ -0,0 +1,383 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_urom
+SD%Complete: 90
+SDComment: Small adjustments may be required.
+SDCategory: Oculus
+EndScriptData */
+
+#include "precompiled.h"
+#include "oculus.h"
+
+enum
+{
+    SAY_SUMMON_1                    = -1578000,
+    SAY_SUMMON_2                    = -1578001,
+    SAY_SUMMON_3                    = -1578002,
+    SAY_AGGRO                       = -1578003,
+    SAY_EXPLOSION_1                 = -1578004,
+    SAY_EXPLOSION_2                 = -1578005,
+    SAY_KILL_1                      = -1578006,
+    SAY_KILL_2                      = -1578007,
+    SAY_KILL_3                      = -1578008,
+    SAY_DEATH                       = -1578009,
+    EMOTE_EXPLOSION                 = -1578025,
+
+    // spells
+    SPELL_ARCANE_SHIELD             = 53813,                // This spell id may be wrong. Needs research!
+    SPELL_ARCANE_EXPLOSION          = 51110,
+    SPELL_ARCANE_EXPLOSION_H        = 59377,
+    SPELL_FROSTBOMB                 = 51103,
+    SPELL_TIME_BOMB                 = 51121,
+    SPELL_TIME_BOMB_H               = 59376,
+    SPELL_SUMMON_MENAGERIE_1        = 50476,
+    SPELL_SUMMON_MENAGERIE_2        = 50495,
+    SPELL_SUMMON_MENAGERIE_3        = 50496,
+    SPELL_TELEPORT                  = 51112,
+
+    // npcs
+    NPC_PHANTASMAL_CLOUDSCRAPER     = 27645,
+    NPC_PHANTASMAL_MAMMOTH          = 27642,
+    NPC_PHANTASMAL_WOLF             = 27644,
+
+    NPC_PHANTASMAL_AIR              = 27650,
+    NPC_PHANTASMAL_FIRE             = 27651,
+    NPC_PHANTASMAL_WATER            = 27653,
+
+    NPC_PHANTASMAL_MURLOC           = 27649,
+    NPC_PHANTASMAL_NAGAL            = 27648,
+    NPC_PHANTASMAL_OGRE             = 27647,
+
+    MAX_PLATFORMS                   = 3,
+};
+
+static uint32 uiTrashPacks[MAX_PLATFORMS][MAX_PLATFORMS] =
+{
+    {NPC_PHANTASMAL_CLOUDSCRAPER,   NPC_PHANTASMAL_MAMMOTH, NPC_PHANTASMAL_WOLF},
+    {NPC_PHANTASMAL_AIR,            NPC_PHANTASMAL_FIRE,    NPC_PHANTASMAL_WATER},
+    {NPC_PHANTASMAL_MURLOC,         NPC_PHANTASMAL_NAGAL,   NPC_PHANTASMAL_OGRE},
+};
+
+struct boss_urom : public CreatureScript
+{
+    boss_urom() : CreatureScript("boss_urom") {}
+
+    struct boss_uromAI : public ScriptedAI
+    {
+        boss_uromAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+
+            // Randomize the trash mobs packs
+            for (uint8 i = 0; i < MAX_PLATFORMS; ++i)
+                m_vuiTrashPacksIds.push_back(i);
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bIsTeleporting;
+        bool m_bIsPlatformPhase;
+        uint8 m_uiPlatformPhase;
+        uint32 m_uiExplosionExpireTimer;
+        uint32 m_uiArcaneShieldTimer;
+        uint32 m_uiExplosionTimer;
+        uint32 m_uiTeleportTimer;
+        uint32 m_uiFrostBombTimer;
+        uint32 m_uiTimeBombTimer;
+
+        float m_fX, m_fY, m_fZ;
+
+        ObjectGuid m_attackTarget;
+
+        std::vector<uint32> m_vuiTrashPacksIds;
+
+        void Reset() override
+        {
+            m_bIsPlatformPhase = true;
+            m_uiPlatformPhase = 0;
+            m_uiExplosionTimer = 0;
+            m_uiExplosionExpireTimer = 0;
+            m_uiTeleportTimer = 20000;
+            m_uiFrostBombTimer = 5000;
+            m_uiTimeBombTimer = urand(10000, 15000);
+
+            ResetPlatformVariables();
+
+            std::random_shuffle(m_vuiTrashPacksIds.begin(), m_vuiTrashPacksIds.end());
+        }
+
+        void ResetPlatformVariables()
+        {
+            m_bIsTeleporting = false;
+            m_uiArcaneShieldTimer = 1000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_UROM, IN_PROGRESS);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_uiPlatformPhase < MAX_PLATFORMS)
+            {
+                if (m_bIsTeleporting)
+                    return;
+
+                // Summon the trash mobs pack
+                m_bIsTeleporting = true;
+                m_attackTarget = pWho->GetObjectGuid();
+                m_creature->InterruptNonMeleeSpells(false);
+                DoSpawnTrashPack();
+
+                // teleport to next platform and spawn adds
+                switch (m_uiPlatformPhase)
+                {
+                case 0:
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_MENAGERIE_1) == CAST_OK)
+                        DoScriptText(SAY_SUMMON_1, m_creature);
+                    break;
+                case 1:
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_MENAGERIE_2) == CAST_OK)
+                        DoScriptText(SAY_SUMMON_2, m_creature);
+                    break;
+                case 2:
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_MENAGERIE_3) == CAST_OK)
+                        DoScriptText(SAY_SUMMON_3, m_creature);
+                    break;
+                }
+            }
+            // Boss has teleported in the central ring - start normal combat
+            else if (m_bIsPlatformPhase)
+            {
+                DoScriptText(SAY_AGGRO, m_creature);
+                m_creature->InterruptNonMeleeSpells(false);
+                m_bIsPlatformPhase = false;
+
+                ScriptedAI::AttackStart(pWho);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_KILL_1, m_creature); break;
+            case 1: DoScriptText(SAY_KILL_2, m_creature); break;
+            case 2: DoScriptText(SAY_KILL_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_DEATH_SPELL, CAST_TRIGGERED);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_UROM, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_UROM, FAIL);
+        }
+
+        void EnterEvadeMode() override
+        {
+            // Don't evade while casting explosion
+            if (m_uiExplosionExpireTimer)
+                return;
+
+            if (m_bIsPlatformPhase)
+            {
+                m_creature->RemoveAllAurasOnEvade();
+                m_creature->DeleteThreatList();
+                m_creature->CombatStop(true);
+
+                m_creature->SetLootRecipient(NULL);
+
+                ResetPlatformVariables();
+            }
+            else
+            {
+                // Teleport to home position, in order to override the movemaps
+                m_creature->NearTeleportTo(aOculusBossSpawnLocs[0][0], aOculusBossSpawnLocs[0][1], aOculusBossSpawnLocs[0][2], aOculusBossSpawnLocs[0][3]);
+
+                ScriptedAI::EnterEvadeMode();
+            }
+        }
+
+        void JustSummoned(Creature* pSummon) override
+        {
+            if (Unit* pTarget = m_creature->GetMap()->GetUnit(m_attackTarget))
+                pSummon->AI()->AttackStart(pTarget);
+        }
+
+        void DoSpawnTrashPack()
+        {
+            float fX, fY, fZ;
+
+            // Summon the 3 mobs contained in the pack
+            for (uint8 i = 0; i < MAX_PLATFORMS; ++i)
+            {
+                m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 10.0f, M_PI_F / 2 * i);
+                m_creature->SummonCreature(uiTrashPacks[m_vuiTrashPacksIds[m_uiPlatformPhase]][i], fX, fY, fZ, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+            }
+
+            // Summon a fourth mob, which can be random
+            uint32 uiEntry = uiTrashPacks[m_vuiTrashPacksIds[m_uiPlatformPhase]][urand(0, 2)];
+            m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 10.0f, M_PI_F / 2 * 3);
+            m_creature->SummonCreature(uiEntry, fX, fY, fZ, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            switch (pSpell->Id)
+            {
+            case SPELL_SUMMON_MENAGERIE_3:
+            case SPELL_SUMMON_MENAGERIE_2:
+            case SPELL_SUMMON_MENAGERIE_1:
+                EnterEvadeMode();
+                ++m_uiPlatformPhase;
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Set the Arcane Shield on out of combat timer
+            if (m_uiArcaneShieldTimer)
+            {
+                if (m_uiArcaneShieldTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_SHIELD) == CAST_OK)
+                        m_uiArcaneShieldTimer = 0;
+                }
+                else
+                    m_uiArcaneShieldTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Don't use any combat abilities during the platform transition
+            if (m_bIsPlatformPhase)
+                return;
+
+            if (m_uiExplosionTimer)
+            {
+                if (m_uiExplosionTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ARCANE_EXPLOSION : SPELL_ARCANE_EXPLOSION_H) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_EXPLOSION, m_creature);
+                        m_uiExplosionTimer = 0;
+                    }
+                }
+                else
+                    m_uiExplosionTimer -= uiDiff;
+            }
+
+            if (m_uiExplosionExpireTimer)
+            {
+                if (m_uiExplosionExpireTimer <= uiDiff)
+                {
+                    // Teleport to the original location
+                    m_creature->NearTeleportTo(m_fX, m_fY, m_fZ, 0);
+
+                    // Resume combat movement
+                    SetCombatMovement(true);
+                    m_creature->GetMotionMaster()->Clear();
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    m_uiExplosionExpireTimer = 0;
+                }
+                else
+                    m_uiExplosionExpireTimer -= uiDiff;
+
+                // Don't decrease timers during the explosion event
+                return;
+            }
+
+            if (m_uiTeleportTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT) == CAST_OK)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_EXPLOSION_1 : SAY_EXPLOSION_2, m_creature);
+
+                    // Store the original position - boss needs to be teleported back
+                    m_creature->GetPosition(m_fX, m_fY, m_fZ);
+
+                    // Stop movement until he casts the arcane explosion
+                    SetCombatMovement(false);
+                    m_creature->GetMotionMaster()->MoveIdle();
+                    m_uiTeleportTimer = 20000;
+                    m_uiExplosionExpireTimer = m_bIsRegularMode ? 9500 : 7500;
+                    m_uiExplosionTimer = 1000;
+                }
+            }
+            else
+                m_uiTeleportTimer -= uiDiff;
+
+            if (m_uiFrostBombTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROSTBOMB) == CAST_OK)
+                    m_uiFrostBombTimer = urand(4000, 6000);
+            }
+            else
+                m_uiFrostBombTimer -= uiDiff;
+
+            if (m_uiTimeBombTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_TIME_BOMB : SPELL_TIME_BOMB_H) == CAST_OK)
+                        m_uiTimeBombTimer = urand(10000, 15000);
+                }
+            }
+            else
+                m_uiTimeBombTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_uromAI(pCreature);
+    }
+};
+
+void AddSC_boss_urom()
+{
+    Script* s;
+
+    s = new boss_urom();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_urom";
+    //pNewScript->GetAI = &GetAI_boss_urom;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/nexus/oculus/boss_varos.cpp b/src/modules/SD3/scripts/northrend/nexus/oculus/boss_varos.cpp
new file mode 100644
index 000000000..3b4a36b66
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/oculus/boss_varos.cpp
@@ -0,0 +1,428 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_varos
+SD%Complete: 90
+SDComment: Energize Cores spells requires additional research.
+SDCategory: Oculus
+EndScriptData */
+
+#include "precompiled.h"
+#include "oculus.h"
+#include "TemporarySummon.h"
+
+enum
+{
+    SAY_AGGRO                   = -1578020,
+    SAY_CALL_CAPTAIN_1          = -1578021,
+    SAY_CALL_CAPTAIN_2          = -1578022,
+    SAY_CALL_CAPTAIN_3          = -1578023,
+    SAY_KILL_1                  = -1578026,
+    SAY_KILL_2                  = -1578027,
+    SAY_DEATH                   = -1578028,
+    EMOTE_CAPTAIN               = -1578029,
+
+    // spells
+    SPELL_CENTRIFUGE_SHIELD     = 50053,
+    SPELL_AMPLIFY_MAGIC         = 51054,
+    SPELL_AMPLIFY_MAGIC_H       = 59371,
+    SPELL_ENERGIZE_CORES        = 50785,
+    SPELL_ENERGIZE_CORES_H      = 59372,
+    SPELL_CALL_CAPTAIN_1        = 51008,                // sends event 18455
+    SPELL_CALL_CAPTAIN_2        = 51002,                // sends event 12229
+    SPELL_CALL_CAPTAIN_3        = 51006,                // sends event 10665
+    SPELL_CALL_CAPTAIN_4        = 51007,                // sends event 18454
+
+    // events
+    EVENT_ID_CALL_CAPTAIN_1     = 18455,
+    EVENT_ID_CALL_CAPTAIN_2     = 12229,
+    EVENT_ID_CALL_CAPTAIN_3     = 10665,
+    EVENT_ID_CALL_CAPTAIN_4     = 18454,
+
+    MAX_CAPTAIN_EVENTS          = 4,
+
+    // other spells
+    SPELL_SUMMON_ARCANE_BEAM    = 51014,
+    SPELL_ARCANE_BEAM_PERIODIC  = 51019,
+    SPELL_ARCANE_BEAM_SPAWN     = 51022,
+
+    NPC_AZURE_RING_CAPTAIN      = 28236,
+    NPC_ARCANE_BEAM             = 28239,
+};
+
+struct CaptainData
+{
+    uint32 uiEventId;
+    float fX, fY, fZ, fO, fDestX, fDestY, fDestZ;
+};
+
+static const CaptainData aVarosCaptainData[4] =
+{
+    {EVENT_ID_CALL_CAPTAIN_1, 1205.74f,  1060.24f,  480.083f, 1.15f, 1239.198f, 1064.537f, 455.587f},
+    {EVENT_ID_CALL_CAPTAIN_2, 1273.78f,  1159.366f, 480.083f, 4.79f, 1278.488f, 1119.482f, 455.634f},       // this one is guesswork
+    {EVENT_ID_CALL_CAPTAIN_3, 1356.845f, 1077.118f, 480.083f, 3.28f, 1331.333f, 1076.381f, 455.69f},
+    {EVENT_ID_CALL_CAPTAIN_4, 1296.89f,  1002.76f,  480.083f, 1.71f, 1291.95f,  1024.354f, 455.739f},
+};
+
+/*######
+## boss_varos
+######*/
+
+struct boss_varos : public CreatureScript
+{
+    boss_varos() : CreatureScript("boss_varos") {}
+
+    struct boss_varosAI : public ScriptedAI
+    {
+        boss_varosAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiShieldTimer;
+        uint32 m_uiAmplifyMagicTimer;
+        uint32 m_uiEnergizeCoresTimer;
+        uint32 m_uiCallCaptainTimer;
+
+        void Reset() override
+        {
+            m_uiShieldTimer = 2000;
+            m_uiAmplifyMagicTimer = urand(8000, 15000);
+            m_uiEnergizeCoresTimer = urand(5000, 7000);
+            m_uiCallCaptainTimer = urand(10000, 15000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_VAROS, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL_1 : SAY_KILL_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_DEATH_SPELL, CAST_TRIGGERED);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_VAROS, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_VAROS, FAIL);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiShieldTimer)
+            {
+                if (m_uiShieldTimer <= uiDiff)
+                {
+                    if (!m_pInstance)
+                        return;
+
+                    // Check for shield first
+                    if (bool(m_pInstance->GetData(TYPE_DATA_SHIELD_BROKEN)))
+                    {
+                        m_uiShieldTimer = 0;
+                        return;
+                    }
+
+                    if (DoCastSpellIfCan(m_creature, SPELL_CENTRIFUGE_SHIELD) == CAST_OK)
+                    {
+                        m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ALL, true);
+                        m_uiShieldTimer = 0;
+                    }
+                }
+                else
+                    m_uiShieldTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiAmplifyMagicTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_AMPLIFY_MAGIC : SPELL_AMPLIFY_MAGIC_H) == CAST_OK)
+                        m_uiAmplifyMagicTimer = urand(15000, 20000);
+                }
+            }
+            else
+                m_uiAmplifyMagicTimer -= uiDiff;
+
+            if (m_uiEnergizeCoresTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ENERGIZE_CORES : SPELL_ENERGIZE_CORES_H) == CAST_OK)
+                    m_uiEnergizeCoresTimer = urand(5000, 7000);
+            }
+            else
+                m_uiEnergizeCoresTimer -= uiDiff;
+
+            if (m_uiCallCaptainTimer < uiDiff)
+            {
+                // choose a random captain spell
+                uint32 uiSpellId = 0;
+                switch (urand(0, 3))
+                {
+                case 0: uiSpellId = SPELL_CALL_CAPTAIN_1; break;
+                case 1: uiSpellId = SPELL_CALL_CAPTAIN_2; break;
+                case 2: uiSpellId = SPELL_CALL_CAPTAIN_3; break;
+                case 3: uiSpellId = SPELL_CALL_CAPTAIN_4; break;
+                }
+
+                if (DoCastSpellIfCan(m_creature, uiSpellId) == CAST_OK)
+                {
+                    switch (urand(0, 2))
+                    {
+                    case 0: DoScriptText(SAY_CALL_CAPTAIN_1, m_creature); break;
+                    case 1: DoScriptText(SAY_CALL_CAPTAIN_2, m_creature); break;
+                    case 2: DoScriptText(SAY_CALL_CAPTAIN_3, m_creature); break;
+                    }
+
+                    DoScriptText(EMOTE_CAPTAIN, m_creature);
+                    m_uiCallCaptainTimer = urand(13000, 23000);
+                }
+            }
+            else
+                m_uiCallCaptainTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_varosAI(pCreature);
+    }
+};
+
+/*######
+## event_spell_call_captain
+######*/
+
+struct event_spell_call_captain : public MapEventScript
+{
+    event_spell_call_captain() : MapEventScript("event_spell_call_captain") {}
+
+    bool OnReceived(uint32 uiEventId, Object* pSource, Object* /*pTarget*/, bool bIsStart) override
+    {
+        if (bIsStart && pSource->GetTypeId() == TYPEID_UNIT)
+        {
+            Creature* pVaros = (Creature*)pSource;
+            if (!pVaros)
+                return false;
+
+            // each guardian has it's own spawn position
+            for (uint8 i = 0; i < MAX_CAPTAIN_EVENTS; ++i)
+            {
+                if (uiEventId == aVarosCaptainData[i].uiEventId)
+                {
+                    if (Creature* pGuardian = pVaros->SummonCreature(NPC_AZURE_RING_CAPTAIN, aVarosCaptainData[i].fX, aVarosCaptainData[i].fY, aVarosCaptainData[i].fZ, aVarosCaptainData[i].fO, TEMPSUMMON_DEAD_DESPAWN, 0))
+                    {
+                        pGuardian->SetWalk(false);
+                        pGuardian->GetMotionMaster()->MovePoint(1, aVarosCaptainData[i].fDestX, aVarosCaptainData[i].fDestY, aVarosCaptainData[i].fDestZ);
+                    }
+
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_azure_ring_captain
+######*/
+
+struct npc_azure_ring_captain : public CreatureScript
+{
+    npc_azure_ring_captain() : CreatureScript("npc_azure_ring_captain") {}
+
+    struct npc_azure_ring_captainAI : public ScriptedAI
+    {
+        npc_azure_ring_captainAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            SetCombatMovement(false);
+        }
+
+        ObjectGuid m_arcaneBeamGuid;
+
+        void Reset() override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_ARCANE_BEAM)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_ARCANE_BEAM_PERIODIC, true);
+                pSummoned->CastSpell(pSummoned, SPELL_ARCANE_BEAM_SPAWN, true);
+                m_arcaneBeamGuid = pSummoned->GetObjectGuid();
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            // Despawn the arcane beam in case of getting killed
+            if (Creature* pTemp = m_creature->GetMap()->GetCreature(m_arcaneBeamGuid))
+                pTemp->ForcedDespawn();
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            // Spawn arcane beam when the position is reached. Also prepare to despawn after the beam event is finished
+            if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_ARCANE_BEAM) == CAST_OK)
+                m_creature->ForcedDespawn(11000);
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_azure_ring_captainAI(pCreature);
+    }
+};
+
+/*######
+## npc_arcane_beam
+######*/
+
+struct npc_arcane_beam : public CreatureScript
+{
+    npc_arcane_beam() : CreatureScript("npc_arcane_beam") {}
+
+    struct npc_arcane_beamAI : public ScriptedAI
+    {
+        npc_arcane_beamAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void Reset() override
+        {
+            // Start following the summoner (player)
+            if (m_creature->IsTemporarySummon())
+            {
+                TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+                if (Player* pSummoner = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                    m_creature->GetMotionMaster()->MoveFollow(pSummoner, 0, 0);
+            }
+
+            // despawn manually because of combat bug
+            m_creature->ForcedDespawn(10000);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_arcane_beamAI(pCreature);
+    }
+};
+
+/*######
+## npc_centrifuge_core
+######*/
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_centrifuge_core : public CreatureScript
+{
+    npc_centrifuge_core() : CreatureScript("npc_centrifuge_core") {}
+
+    struct npc_centrifuge_coreAI : public Scripted_NoMovementAI
+    {
+        npc_centrifuge_coreAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        // Note: visual already handled in creature_template_addon
+        void Reset() override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_centrifuge_coreAI(pCreature);
+    }
+};
+
+void AddSC_boss_varos()
+{
+    Script* s;
+
+    s = new boss_varos();
+    s->RegisterSelf();
+    s = new npc_azure_ring_captain();
+    s->RegisterSelf();
+    s = new npc_arcane_beam();
+    s->RegisterSelf();
+    s = new npc_centrifuge_core();
+    s->RegisterSelf();
+
+    s = new event_spell_call_captain();
+    s->RegisterSelf();
+
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_varos";
+    //pNewScript->GetAI = &GetAI_boss_varos;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_spell_call_captain";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_spell_call_captain;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_azure_ring_captain";
+    //pNewScript->GetAI = &GetAI_npc_azure_ring_captain;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_arcane_beam";
+    //pNewScript->GetAI = &GetAI_npc_arcane_beam;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_centrifuge_core";
+    //pNewScript->GetAI = &GetAI_npc_centrifuge_core;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/nexus/oculus/instance_oculus.cpp b/src/modules/SD3/scripts/northrend/nexus/oculus/instance_oculus.cpp
new file mode 100644
index 000000000..fa2f5d476
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/oculus/instance_oculus.cpp
@@ -0,0 +1,289 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: instance_oculus
+SD%Complete: 50
+SDComment: Spawn instance bosses and handle Varos pre event; Dialogue handled by DBScripts
+SDCategory: Oculus
+EndScriptData */
+
+#include "precompiled.h"
+#include "oculus.h"
+
+struct is_oculus : public InstanceScript
+{
+    is_oculus() : InstanceScript("instance_oculus") {}
+
+    class instance_oculus : public ScriptedInstance
+    {
+    public:
+        instance_oculus(Map* pMap) : ScriptedInstance(pMap)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            if (GetData(TYPE_EREGOS) == DONE)
+                return;
+
+            DoSpawnNextBossIfCan();
+
+            if (GetData(TYPE_DRAKOS) == DONE && GetData(TYPE_VAROS) == NOT_STARTED)
+            {
+                pPlayer->SendUpdateWorldState(WORLD_STATE_CONSTRUCTS, 1);
+                pPlayer->SendUpdateWorldState(WORLD_STATE_CONSTRUCTS_COUNT, m_sConstructsAliveGUIDSet.size());
+            }
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_VAROS:
+            case NPC_UROM:
+            case NPC_EREGOS:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_CACHE_EREGOS:
+            case GO_CACHE_EREGOS_H:
+                m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+                break;
+            case GO_DRAGON_CAGE_DOOR:
+                m_lCageDoorGUIDs.push_back(pGo->GetObjectGuid());
+                if (m_auiEncounter[TYPE_DRAKOS] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            }
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_DRAKOS)
+                SetData(TYPE_DRAKOS, IN_PROGRESS);
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_DRAKOS)
+                SetData(TYPE_DRAKOS, FAIL);
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_DRAKOS: SetData(TYPE_DRAKOS, DONE); break;
+            case NPC_CENTRIFUGE_CONSTRUCT:
+                m_sConstructsAliveGUIDSet.erase(pCreature->GetObjectGuid());
+                DoUpdateWorldState(WORLD_STATE_CONSTRUCTS_COUNT, m_sConstructsAliveGUIDSet.size());
+
+                if (m_sConstructsAliveGUIDSet.empty())
+                {
+                    if (Creature* pVaros = GetSingleCreatureFromStorage(NPC_VAROS))
+                    {
+                        pVaros->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ALL, false);
+                        pVaros->InterruptNonMeleeSpells(false);
+                    }
+                }
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_DRAKOS:
+                m_auiEncounter[TYPE_DRAKOS] = uiData;
+                if (uiData == DONE)
+                {
+                    // Open all cages
+                    for (GuidList::const_iterator itr = m_lCageDoorGUIDs.begin(); itr != m_lCageDoorGUIDs.end(); ++itr)
+                        DoUseDoorOrButton(*itr);
+
+                    // Notes: The dialogue is handled by DB script
+                    // Also the Centrifuge Constructs and the related npcs should be summoned - requires additional research
+
+                    // Activate the world state - the Centrifuge contructs should be loaded by now
+                    DoUpdateWorldState(WORLD_STATE_CONSTRUCTS, 1);
+                    DoUpdateWorldState(WORLD_STATE_CONSTRUCTS_COUNT, m_sConstructsAliveGUIDSet.size());
+
+                    DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_EREGOS_ID);
+                }
+                break;
+            case TYPE_VAROS:
+                m_auiEncounter[TYPE_VAROS] = uiData;
+                if (uiData == DONE)
+                {
+                    // Note: Image of Belgaristrasz dialogue is handled by DB script
+                    DoSpawnNextBossIfCan();
+                    DoUpdateWorldState(WORLD_STATE_CONSTRUCTS, 0);
+                }
+                break;
+            case TYPE_UROM:
+                m_auiEncounter[TYPE_UROM] = uiData;
+                // Note: Image of Belgaristrasz dialogue is handled by DB script
+                if (uiData == DONE)
+                    DoSpawnNextBossIfCan();
+                break;
+            case TYPE_EREGOS:
+                m_auiEncounter[TYPE_EREGOS] = uiData;
+                // Note: Image of Belgaristrasz teleports to the Cache location and does more dialogue - requires additional research
+                if (uiData == DONE)
+                {
+                    // The data about the cache isn't consistent, so it's better to handle both cases
+                    DoToggleGameObjectFlags(instance->IsRegularDifficulty() ? GO_CACHE_EREGOS : GO_CACHE_EREGOS_H, GO_FLAG_NO_INTERACT, false);
+                    DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_EREGOS : GO_CACHE_EREGOS_H, 30 * MINUTE);
+                }
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[TYPE_DRAKOS] << " " << m_auiEncounter[TYPE_VAROS] << " " << m_auiEncounter[TYPE_UROM] << " " << m_auiEncounter[TYPE_EREGOS];
+
+                strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            if (uiType == TYPE_DATA_SHIELD_BROKEN)
+                return uint32(m_sConstructsAliveGUIDSet.empty());
+
+            return 0;
+        }
+
+        void SetData64(uint32 uiType, uint64 uiGuid) override
+        {
+            // If Varos already completed, just ignore
+            if (GetData(TYPE_VAROS) == DONE)
+                return;
+
+            // Note: this is handled in Acid. The purpose is check which Centrifuge Construct is alive, in case of server reset
+            // The function is triggered by eventAI on generic timer
+            if (uiType == DATA_CONSTRUCTS_EVENT)
+            {
+                m_sConstructsAliveGUIDSet.insert(ObjectGuid(uiGuid));
+
+                // Update world state in case of server reset
+                if (GetData(TYPE_DRAKOS) == DONE)
+                    DoUpdateWorldState(WORLD_STATE_CONSTRUCTS_COUNT, m_sConstructsAliveGUIDSet.size());
+            }
+        }
+
+        const char* Save() const override { return strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[TYPE_DRAKOS] >> m_auiEncounter[TYPE_VAROS] >> m_auiEncounter[TYPE_UROM] >> m_auiEncounter[TYPE_EREGOS];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        // Check Varos' shield
+        //bool IsShieldBroken() { return ; }
+
+    protected:
+        void DoSpawnNextBossIfCan()
+        {
+            Player* pPlayer = GetPlayerInMap();
+            if (!pPlayer)
+                return;
+
+            if (GetData(TYPE_UROM) == DONE)
+            {
+                // return if already summoned
+                if (GetSingleCreatureFromStorage(NPC_EREGOS, true))
+                    return;
+
+                pPlayer->SummonCreature(NPC_EREGOS, aOculusBossSpawnLocs[1][0], aOculusBossSpawnLocs[1][1], aOculusBossSpawnLocs[1][2], aOculusBossSpawnLocs[1][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+            else if (GetData(TYPE_VAROS) == DONE)
+            {
+                // return if already summoned
+                if (GetSingleCreatureFromStorage(NPC_UROM, true))
+                    return;
+
+                pPlayer->SummonCreature(NPC_UROM, aOculusBossSpawnLocs[0][0], aOculusBossSpawnLocs[0][1], aOculusBossSpawnLocs[0][2], aOculusBossSpawnLocs[0][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string strInstData;
+
+        GuidList m_lCageDoorGUIDs;
+        GuidSet m_sConstructsAliveGUIDSet;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_oculus(pMap);
+    }
+};
+
+void AddSC_instance_oculus()
+{
+    Script* s;
+
+    s = new is_oculus();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_oculus";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_oculus;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/nexus/oculus/oculus.cpp b/src/modules/SD3/scripts/northrend/nexus/oculus/oculus.cpp
new file mode 100644
index 000000000..c4c88e261
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/oculus/oculus.cpp
@@ -0,0 +1,165 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Oculus
+SD%Complete: 80
+SDComment: Make use of the passenger boarding wrappers when supported by the core.
+SDCategory: Oculus
+EndScriptData */
+
+#include "precompiled.h"
+#include "oculus.h"
+#include "TemporarySummon.h"
+
+enum
+{
+    EMOTE_FLY_AWAY                          = -1578030,
+
+    SPELL_RIDE_RUBY_DRAKE_QUE               = 49463,
+    SPELL_RIDE_EMERAL_DRAKE_QUE             = 49427,
+    SPELL_RIDE_AMBER_DRAKE_QUE              = 49459,
+
+    SPELL_DRAKE_FLAG_VISUAL                 = 53797,
+    SPELL_PARACHUTE                         = 50550,                // triggers 50553
+    SPELL_FLIGHT                            = 50296,
+    SPELL_SOAR                              = 50325,
+    SPELL_EVASIVE_AURA                      = 50248,
+};
+
+/*######
+## npc_oculus_drake
+######*/
+
+struct npc_oculus_drake : public CreatureScript
+{
+    npc_oculus_drake() : CreatureScript("npc_oculus_drake") {}
+
+    struct npc_oculus_drakeAI : public ScriptedAI
+    {
+        npc_oculus_drakeAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            if (m_creature->IsTemporarySummon())
+            {
+                TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+                uint32 uiMountSpell = 0;
+                switch (m_creature->GetEntry())
+                {
+                case NPC_RUBY_DRAKE:    uiMountSpell = SPELL_RIDE_RUBY_DRAKE_QUE;   break;
+                case NPC_AMBER_DRAKE:   uiMountSpell = SPELL_RIDE_AMBER_DRAKE_QUE;  break;
+                case NPC_EMERALD_DRAKE: uiMountSpell = SPELL_RIDE_EMERAL_DRAKE_QUE; break;
+                }
+
+                // Force player to mount
+                if (Player* pSummoner = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                {
+                    pSummoner->CastSpell(pSummoner, uiMountSpell, true);
+
+                    // The dragon moves near the player after spawn
+                    float fX, fY, fZ;
+                    pSummoner->GetContactPoint(m_creature, fX, fY, fZ);
+                    m_creature->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                }
+            }
+
+            SetCombatMovement(false);
+        }
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_SOAR, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+
+            // Another aura for the Ruby drake
+            if (m_creature->GetEntry() == NPC_RUBY_DRAKE)
+                DoCastSpellIfCan(m_creature, SPELL_EVASIVE_AURA, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            // Handle player parachute
+            if (m_creature->IsTemporarySummon())
+            {
+                TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+                if (Player* pSummoner = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                {
+                    pSummoner->RemoveAurasDueToSpell(SPELL_DRAKE_FLAG_VISUAL);
+                    pSummoner->CastSpell(pSummoner, SPELL_PARACHUTE, true);
+                }
+            }
+        }
+
+        // TODO: Temporary workaround - please remove when the boarding wrappers are implemented in core
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pCaster->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            if (pSpell->Id == 49464 || pSpell->Id == 49346 || pSpell->Id == 49460)
+                DoCastSpellIfCan(m_creature, SPELL_FLIGHT, CAST_TRIGGERED);
+        }
+
+        // TODO: Enable the wrappers below, when they will be properly supported by the core
+        /*
+        void PassengerBoarded(Unit* pPassenger, uint8 uiSeat) override
+        {
+        if (pPassenger->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+        // Set vehicle auras
+        DoCastSpellIfCan(m_creature, SPELL_FLIGHT, CAST_TRIGGERED);
+
+        // Set passenger auras
+        pPassenger->CastSpell(pPassenger, SPELL_DRAKE_FLAG_VISUAL, true);
+        }
+
+        void PassengerUnBoarded(Unit* pPassenger) override
+        {
+        pPassenger->RemoveAurasDueToSpell(SPELL_DRAKE_FLAG_VISUAL);
+        pPassenger->CastSpell(pPassenger, SPELL_PARACHUTE, true);
+
+        DoScriptText(EMOTE_FLY_AWAY, m_creature);
+
+        // The dragon runs away and despawns
+        float fX, fY, fZ;
+        m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 20, frand(0, 2 * M_PI_F));
+        m_creature->GetMotionMaster()->MovePoint(0, fX, fY, fZ + 20.0f);
+        m_creature->ForcedDespawn(5000);
+        }
+        */
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_oculus_drakeAI(pCreature);
+    }
+};
+
+void AddSC_oculus()
+{
+    Script* s;
+
+    s = new npc_oculus_drake();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_oculus_drake";
+    //pNewScript->GetAI = &GetAI_npc_oculus_drake;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/nexus/oculus/oculus.h b/src/modules/SD3/scripts/northrend/nexus/oculus/oculus.h
new file mode 100644
index 000000000..5354ef993
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/nexus/oculus/oculus.h
@@ -0,0 +1,67 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_OCULUS_H
+#define DEF_OCULUS_H
+
+/* Encounters
+ * Drakos           = 0
+ * Varos            = 1
+ * Urom             = 2
+ * Eregos           = 3
+ */
+
+enum
+{
+    MAX_ENCOUNTER                   = 4,
+
+    TYPE_DRAKOS                     = 0,
+    TYPE_VAROS                      = 1,
+    TYPE_UROM                       = 2,
+    TYPE_EREGOS                     = 3,
+    TYPE_DATA_SHIELD_BROKEN         = MAX_ENCOUNTER,
+
+    DATA_CONSTRUCTS_EVENT           = 1,                // DO NOT CHANGE! Used by Acid. - used to check the Centrifuge Constructs alive
+
+    NPC_DRAKOS                      = 27654,
+    NPC_VAROS                       = 27447,
+    NPC_UROM                        = 27655,
+    NPC_EREGOS                      = 27656,
+    NPC_CENTRIFUGE_CONSTRUCT        = 27641,
+
+    NPC_ETERNOS                     = 27659,            // bronze
+    NPC_VERDISA                     = 27657,            // emerald
+    NPC_BELGARISTRASZ               = 27658,            // ruby
+    NPC_IMAGE_OF_BELGARISTRASZ      = 28012,
+
+    // Vehicle entries
+    NPC_EMERALD_DRAKE               = 27692,
+    NPC_AMBER_DRAKE                 = 27755,
+    NPC_RUBY_DRAKE                  = 27756,
+
+    // Cages in which the friendly dragons are hold
+    GO_DRAGON_CAGE_DOOR             = 193995,
+
+    // Loot
+    GO_CACHE_EREGOS                 = 191349,
+    GO_CACHE_EREGOS_H               = 193603,
+
+    SPELL_DEATH_SPELL               = 50415,            // summons 28012
+
+    // Instance event yells
+    SAY_EREGOS_SPAWN                = -1578010,
+
+    // world states to show how many constructs are still alive
+    WORLD_STATE_CONSTRUCTS          = 3524,
+    WORLD_STATE_CONSTRUCTS_COUNT    = 3486,
+
+    ACHIEV_START_EREGOS_ID          = 18153,            // eregos timed kill achiev
+};
+
+static const float aOculusBossSpawnLocs[2][4] =
+{
+    {1177.47f, 937.722f, 527.405f, 2.21657f},           // Urom
+    {1077.04f, 1086.21f, 655.497f, 4.18879f}            // Eregos
+};
+#endif
diff --git a/src/modules/SD3/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp b/src/modules/SD3/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp
new file mode 100644
index 000000000..e98a84ae3
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp
@@ -0,0 +1,1429 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss Sartharion
+SD%Complete: 95%
+SDComment: Portal event may be incomplete - additional reseach required.
+SDCategory: Obsidian Sanctum
+EndScriptData */
+
+#include "precompiled.h"
+#include "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,
+
+    EMOTE_LAVA_CHURN                            = -1615032,
+    EMOTE_SHADRON_DICIPLE                       = -1615008,
+    EMOTE_VESPERON_DICIPLE                      = -1615041,
+    EMOTE_HATCH_EGGS                            = -1615017,
+    EMOTE_OPEN_PORTAL                           = -1615042, // emote 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_TWILIGHT_REVENGE                      = 60639,
+
+    SPELL_PYROBUFFET                            = 56916,    // currently used for hard enrage after 15 minutes
+    SPELL_PYROBUFFET_RANGE                      = 58907,    // possibly used when player get too far away from dummy creatures (2x creature entry 30494)
+
+    // phase spells
+    // 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 (handled in core)
+
+    // 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
+    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
+
+    // Vesperon related npcs
+    NPC_DISCIPLE_OF_VESPERON                    = 30858,    // Disciple of Vesperon
+    NPC_ACOLYTE_OF_VESPERON                     = 31219,    // Acolyte of Vesperon - summoned during Sartharion event
+    // NPC_VESPERON_CONTROLLER                  = 30878,    // not clear how to use this; used only to cast 61190 to eject players to normal realm
+    // NPC_VESPERON_CONTROLLER_DEBUFF_CLEAR     = 32694,    // not used
+
+    // Shadron
+    // In portal is a disciple, when disciple killed remove Power_of_vesperon, portal open multiple times
+    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
+
+    // Shadron related npcs
+    NPC_DISCIPLE_OF_SHADRON                     = 30688,    // Disciple of Shadron
+    NPC_ACOLYTE_OF_SHADRON                      = 31218,    // Acolyte of Shadron - summoned during Sartharion event
+    // NPC_SHADRON_PORTAL                       = 30741,    // not used
+    // NPC_SHADRON_PORTAL_VISUAL                = 30650,    // not used
+
+    // 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%.
+    SPELL_HATCH_EGGS_MAIN                       = 58793,    // Tenebron's hatch eggs spell - not used because core can't target other phase creatures
+
+    // other hatch eggs spells - currently it's unknown how to use them
+    SPELL_HATCH_EGGS_H                          = 59189,
+    SPELL_HATCH_EGGS                            = 58542,
+    SPELL_HATCH_EGGS_EFFECT_H                   = 59190,
+    SPELL_HATCH_EGGS_EFFECT                     = 58685,
+
+    // Tenebron related npcs
+    NPC_TWILIGHT_EGG                            = 30882,    // Twilight Egg - summoned during Tenebron event
+    NPC_SARTHARION_TWILIGHT_EGG                 = 31204,    // Twilight Egg - summoned during Sartharion event
+    NPC_TWILIGHT_EGG_CONTROLLER                 = 31138,    // not clear how to use this; used only to eject players to normal realm
+
+    // Twilight eggs spells
+    SPELL_SUMMON_TWILIGHT_WHELP                 = 58035,    // will spawn 30890
+    SPELL_SUMMON_SARTHARION_TWILIGHT_WHELP      = 58826,    // will spawn 31214
+
+    NPC_TWILIGHT_WHELP                          = 30890,
+    NPC_SHARTHARION_TWILIGHT_WHELP              = 31214,
+
+    // 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
+
+    // Fire cyclone
+    // SPELL_LAVA_STRIKE                        = 57578,    // triggers 57571 then trigger visual missile, then summon Lava Blaze on impact(spell 57572)
+    SPELL_LAVA_STRIKE_IMPACT                    = 57591,
+    // SPELL_CYCLONE_AURA                       = 57560,    // in creature_template_addon
+    SPELL_CYCLONE_AURA_STRIKE                   = 57598,    // triggers 57578
+
+    NPC_FLAME_TSUNAMI                           = 30616,    // for the flame waves
+    NPC_LAVA_BLAZE                              = 30643,    // adds spawning from flame strike
+
+    // other
+    MAX_TWILIGHT_EGGS                           = 6,
+    PHASEMASK_TWILIGHT_REALM                    = 16,
+
+    // using these custom points for dragons start and end
+    POINT_ID_INIT                               = 100,
+    POINT_ID_LAND                               = 200
+};
+
+struct Waypoint
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+// each dragons special points. First where fly to before connect to connon, second where land point is.
+Waypoint m_aTene[] =
+{
+    {3212.854f, 575.597f, 109.856f, 0},                        // init
+    {3246.425f, 565.367f, 61.249f,  0}                         // end
+};
+
+Waypoint m_aShad[] =
+{
+    {3293.238f, 472.223f, 106.968f, 0},
+    {3271.669f, 526.907f, 61.931f,  0}
+};
+
+Waypoint m_aVesp[] =
+{
+    {3193.310f, 472.861f, 102.697f, 0},
+    {3227.268f, 533.238f, 59.995f,  0}
+};
+
+// points around raid "isle", counter clockwise. should probably be adjusted to be more alike
+Waypoint m_aDragonCommon[] =
+{
+    {3214.012f, 468.932f, 98.652f, 0},
+    {3244.950f, 468.427f, 98.652f, 0},
+    {3283.520f, 496.869f, 98.652f, 0},
+    {3287.316f, 555.875f, 98.652f, 0},
+    {3250.479f, 585.827f, 98.652f, 0},
+    {3209.969f, 566.523f, 98.652f, 0}
+};
+
+Waypoint m_aTsunamiLoc[] =
+{
+    // Note: this coords are guesswork, they might need to be updated.
+    {3201.0f, 481.82f, 58.6f, 6.23f},                       // left to right
+    {3201.0f, 524.50f, 58.6f, 6.23f},
+    {3201.0f, 566.64f, 58.6f, 6.23f},
+    {3287.5f, 545.50f, 58.6f, 3.19f},                       // right to left
+    {3287.5f, 503.00f, 58.6f, 3.19f},
+};
+
+/*######
+## Boss Sartharion
+######*/
+
+struct boss_sartharion : public CreatureScript
+{
+    boss_sartharion() : CreatureScript("boss_sartharion") {}
+
+    struct boss_sartharionAI : public ScriptedAI
+    {
+        boss_sartharionAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bIsBerserk;
+        bool m_bIsSoftEnraged;
+
+        uint32 m_uiEnrageTimer;
+        bool m_bIsHardEnraged;
+
+        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() override
+        {
+            m_bIsBerserk = false;
+            m_bIsSoftEnraged = false;
+
+            m_uiEnrageTimer = 15 * MINUTE * IN_MILLISECONDS;
+            m_bIsHardEnraged = false;
+
+            m_uiTenebronTimer = 30000;
+            m_uiShadronTimer = 75000;
+            m_uiVesperonTimer = 120000;
+
+            m_uiFlameTsunamiTimer = 30000;
+            m_uiFlameBreathTimer = 20000;
+            m_uiTailSweepTimer = 20000;
+            m_uiCleaveTimer = 7000;
+            m_uiLavaStrikeTimer = urand(20000, 30000);
+
+            m_bHasCalledTenebron = false;
+            m_bHasCalledShadron = false;
+            m_bHasCalledVesperon = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_SARTHARION_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SARTHARION_EVENT, IN_PROGRESS);
+                FetchDragons();
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_SARTHARION_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SARTHARION_EVENT, DONE);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            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 JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SARTHARION_EVENT, FAIL);
+
+            // Despawn portal
+            if (GameObject* pPortal = GetClosestGameObjectWithEntry(m_creature, GO_TWILIGHT_PORTAL, 50.0f))
+                pPortal->SetLootState(GO_JUST_DEACTIVATED);
+        }
+
+        void FetchDragons()
+        {
+            Creature* pTene = m_pInstance->GetSingleCreatureFromStorage(NPC_TENEBRON);
+            Creature* pShad = m_pInstance->GetSingleCreatureFromStorage(NPC_SHADRON);
+            Creature* pVesp = m_pInstance->GetSingleCreatureFromStorage(NPC_VESPERON);
+
+            // if at least one of the dragons are alive and are being called
+            uint8 uiCountFetchableDragons = 0;
+
+            if (pTene && pTene->IsAlive() && !pTene->getVictim())
+            {
+                ++uiCountFetchableDragons;
+                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())
+            {
+                ++uiCountFetchableDragons;
+                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())
+            {
+                ++uiCountFetchableDragons;
+                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);
+            }
+
+            if (uiCountFetchableDragons)
+                DoCastSpellIfCan(m_creature, SPELL_WILL_OF_SARTHARION);
+
+            m_pInstance->SetData(TYPE_ALIVE_DRAGONS, uiCountFetchableDragons);
+        }
+
+        void CallDragon(uint32 uiEntry)
+        {
+            if (m_pInstance)
+            {
+                Creature* pTemp = m_pInstance->GetSingleCreatureFromStorage(uiEntry);
+                if (pTemp && pTemp->IsAlive())
+                {
+                    if (pTemp->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+                        pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+                    if (pTemp->getVictim())
+                        return;
+
+                    pTemp->SetWalk(false);
+
+                    int32 iTextId = 0;
+
+                    switch (uiEntry)
+                    {
+                    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()
+        {
+            DoScriptText(EMOTE_LAVA_CHURN, m_creature);
+
+            uint8 uiTsunamiStartLoc = 0;
+            uint8 uiTsunamiEndLoc = 3;
+            if (urand(0, 1))
+            {
+                uiTsunamiStartLoc = 3;
+                uiTsunamiEndLoc = 5;
+            }
+
+            for (uint8 i = uiTsunamiStartLoc; i < uiTsunamiEndLoc; ++i)
+                m_creature->SummonCreature(NPC_FLAME_TSUNAMI, m_aTsunamiLoc[i].m_fX, m_aTsunamiLoc[i].m_fY, m_aTsunamiLoc[i].m_fZ, m_aTsunamiLoc[i].m_fO, TEMPSUMMON_TIMED_DESPAWN, 15000);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // spell will target dragons, if they are still alive at 35%
+            if (!m_bIsBerserk && m_creature->GetHealthPercent() < 35.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                {
+                    DoScriptText(SAY_SARTHARION_BERSERK, m_creature);
+                    m_bIsBerserk = true;
+                }
+            }
+
+            // soft enrage
+            if (!m_bIsSoftEnraged && m_creature->GetHealthPercent() <= 10.0f)
+            {
+                // TODO
+                m_bIsSoftEnraged = true;
+            }
+
+            // hard enrage
+            if (!m_bIsHardEnraged)
+            {
+                if (m_uiEnrageTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_PYROBUFFET, CAST_TRIGGERED) == CAST_OK)
+                        m_bIsHardEnraged = true;
+                }
+                else
+                    m_uiEnrageTimer -= uiDiff;
+            }
+
+            // flame tsunami
+            if (m_uiFlameTsunamiTimer < uiDiff)
+            {
+                SendFlameTsunami();
+                m_uiFlameTsunamiTimer = 30000;
+            }
+            else
+                m_uiFlameTsunamiTimer -= uiDiff;
+
+            // flame breath
+            if (m_uiFlameBreathTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_FLAME_BREATH : SPELL_FLAME_BREATH_H) == CAST_OK)
+                {
+                    DoScriptText(SAY_SARTHARION_BREATH, m_creature);
+                    m_uiFlameBreathTimer = urand(25000, 35000);
+                }
+            }
+            else
+                m_uiFlameBreathTimer -= uiDiff;
+
+            // Tail Sweep
+            if (m_uiTailSweepTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_TAIL_LASH : SPELL_TAIL_LASH_H) == CAST_OK)
+                    m_uiTailSweepTimer = urand(15000, 20000);
+            }
+            else
+                m_uiTailSweepTimer -= uiDiff;
+
+            // Cleave
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                    m_uiCleaveTimer = urand(7000, 10000);
+            }
+            else
+                m_uiCleaveTimer -= uiDiff;
+
+            // Lavas Strike
+            if (m_uiLavaStrikeTimer < uiDiff)
+            {
+                if (m_pInstance)
+                {
+                    if (Creature* pCyclone = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_FIRE_CYCLONE))))
+                        pCyclone->CastSpell(pCyclone, SPELL_CYCLONE_AURA_STRIKE, true);
+
+                    switch (urand(0, 5))
+                    {
+                    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;
+                    case 3: DoScriptText(SAY_SARTHARION_SPECIAL_4, m_creature); break;
+                    }
+                }
+                m_uiLavaStrikeTimer = 30000;
+            }
+            else
+                m_uiLavaStrikeTimer -= uiDiff;
+
+            // call tenebron
+            if (!m_bHasCalledTenebron)
+            {
+                if (m_uiTenebronTimer < uiDiff)
+                {
+                    CallDragon(NPC_TENEBRON);
+                    m_bHasCalledTenebron = true;
+                }
+                else
+                    m_uiTenebronTimer -= uiDiff;
+            }
+
+            // call shadron
+            if (!m_bHasCalledShadron)
+            {
+                if (m_uiShadronTimer < uiDiff)
+                {
+                    CallDragon(NPC_SHADRON);
+                    m_bHasCalledShadron = true;
+                }
+                else
+                    m_uiShadronTimer -= uiDiff;
+            }
+
+            // call vesperon
+            if (!m_bHasCalledVesperon)
+            {
+                if (m_uiVesperonTimer < uiDiff)
+                {
+                    CallDragon(NPC_VESPERON);
+                    m_bHasCalledVesperon = true;
+                }
+                else
+                    m_uiVesperonTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+
+            EnterEvadeIfOutOfCombatArea(uiDiff);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        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 dummy_dragonAI : public ScriptedAI
+{
+    dummy_dragonAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        Reset();
+    }
+
+    ScriptedInstance* m_pInstance;
+    bool m_bIsRegularMode;
+    uint8 m_uiPortalId;
+
+    uint32 m_uiWaypointId;
+    uint32 m_uiMoveNextTimer;
+    bool m_bCanMoveFree;
+
+    uint32 m_uiPortalRespawnTimer;
+    uint32 m_uiShadowBreathTimer;
+    uint32 m_uiShadowFissureTimer;
+
+    ObjectGuid m_portalOwnerGuid;
+
+    void Reset() override
+    {
+        m_uiWaypointId          = 0;
+        m_uiMoveNextTimer       = 500;
+        m_bCanMoveFree          = false;
+
+        m_uiPortalRespawnTimer  = 20000;
+        m_uiShadowBreathTimer   = 20000;
+        m_uiShadowFissureTimer  = 5000;
+    }
+
+    void JustReachedHome() override
+    {
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+        // Despawn portal
+        if (GameObject* pPortal = GetClosestGameObjectWithEntry(m_creature, GO_TWILIGHT_PORTAL, 50.0f))
+            pPortal->SetLootState(GO_JUST_DEACTIVATED);
+
+        // reset portal events (in case some remain active); summons cleanup handled by creature linking
+        if (m_pInstance)
+            m_pInstance->SetData(TYPE_DATA_PORTAL_OFF, m_uiPortalId);
+    }
+
+    void JustDied(Unit* /*pKiller*/) override
+    {
+        // despawn portal if Sartharion is not in combat
+        if (GameObject* pPortal = GetClosestGameObjectWithEntry(m_creature, GO_TWILIGHT_PORTAL, 50.0f))
+            pPortal->SetLootState(GO_JUST_DEACTIVATED);
+
+        // eject players and despawn portal owner
+        if (Creature* pTemp = m_creature->GetMap()->GetCreature(m_portalOwnerGuid))
+        {
+            pTemp->CastSpell(pTemp, SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true);
+            pTemp->ForcedDespawn(1000);
+        }
+    }
+
+    void MovementInform(uint32 uiType, uint32 uiPointId) override
+    {
+        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 the end (!)
+        if (uiPointId == POINT_ID_LAND)
+        {
+            m_creature->GetMotionMaster()->Clear();
+            m_bCanMoveFree = false;
+            m_creature->SetInCombatWithZone();
+            return;
+        }
+
+        // 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 >= countof(m_aDragonCommon))
+        {
+            if (!m_bCanMoveFree)
+                m_bCanMoveFree = true;
+
+            m_uiWaypointId = 0;
+        }
+
+        m_uiMoveNextTimer = 500;
+    }
+
+    //"opens" the portal and does the "opening" whisper
+    void DoOpenPortal()
+    {
+        // 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 = GetClosestGameObjectWithEntry(m_creature, GO_TWILIGHT_PORTAL, 50.0f);
+        DoScriptText(EMOTE_OPEN_PORTAL, m_creature);
+
+        // 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(HOUR * IN_MILLISECONDS);
+            pPortal->Refresh();
+        }
+
+        // set portal status as active when Sartharion is in progress
+        if (m_pInstance && m_pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+            m_pInstance->SetData(TYPE_DATA_PORTAL_ON, m_uiPortalId);
+
+        // 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);
+            }
+        }
+    }
+
+    // Eject players from Twilight realm if no other portal event is active
+    void DoEjectTwilightPlayersIfCan(Creature* pCreature)
+    {
+        if (!m_pInstance || !pCreature)
+            return;
+
+        if (m_pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS || !m_pInstance->GetData(TYPE_DATA_PORTAL_STATUS))
+        {
+            pCreature->CastSpell(pCreature, SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true);
+
+            if (GameObject* pPortal = GetClosestGameObjectWithEntry(m_creature, GO_TWILIGHT_PORTAL, 50.0f))
+                pPortal->SetLootState(GO_JUST_DEACTIVATED);
+        }
+    }
+
+    // Handle breath yell
+    virtual void DoHandleBreathYell() { }
+
+    // Handle special events for each dragon
+    virtual void UpdateDragonAI(const uint32 /*uiDiff*/) { }
+
+    void UpdateAI(const uint32 uiDiff) override
+    {
+        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;
+        }
+
+        // if no target return
+        if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            return;
+
+        // Call dragon specific virtual function
+        UpdateDragonAI(uiDiff);
+
+        // respawn portal
+        if (m_uiPortalRespawnTimer < uiDiff)
+        {
+            if (m_pInstance && m_pInstance->GetData(TYPE_DATA_PORTAL_STATUS))
+                m_uiPortalRespawnTimer = 10000;
+            else
+            {
+                m_uiPortalRespawnTimer = 60000;
+                DoOpenPortal();
+            }
+        }
+        else
+            m_uiPortalRespawnTimer -= uiDiff;
+
+        // shadow fissure
+        if (m_uiShadowFissureTimer < uiDiff)
+        {
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_SHADOW_FISSURE : SPELL_SHADOW_FISSURE_H) == CAST_OK)
+                    m_uiShadowFissureTimer = urand(15000, 20000);
+            }
+        }
+        else
+            m_uiShadowFissureTimer -= uiDiff;
+
+        // shadow breath
+        if (m_uiShadowBreathTimer < uiDiff)
+        {
+            if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SHADOW_BREATH : SPELL_SHADOW_BREATH_H) == CAST_OK)
+            {
+                DoHandleBreathYell();
+                m_uiShadowBreathTimer = urand(20000, 25000);
+            }
+        }
+        else
+            m_uiShadowBreathTimer -= uiDiff;
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+/*######
+## Mob Tenebron
+######*/
+
+struct mob_tenebron : public CreatureScript
+{
+    mob_tenebron() : CreatureScript("mob_tenebron") {}
+
+    struct mob_tenebronAI : public dummy_dragonAI
+    {
+        mob_tenebronAI(Creature* pCreature) : dummy_dragonAI(pCreature)
+        {
+            m_uiPortalId = TYPE_PORTAL_TENEBRON;
+        }
+
+        uint32 m_uiSpawnEggsTimer;
+
+        void Reset() override
+        {
+            m_uiSpawnEggsTimer = 20000;
+
+            dummy_dragonAI::Reset();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_TENEBRON_AGGRO, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_POWER_OF_TENEBRON);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_TENEBRON_SLAY_1 : SAY_TENEBRON_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            DoScriptText(SAY_TENEBRON_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                // Cast Twilight Revent - script target on Sartharion
+                if (m_pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+                    DoCastSpellIfCan(m_creature, SPELL_TWILIGHT_REVENGE, CAST_TRIGGERED);
+                else
+                    dummy_dragonAI::JustDied(pKiller);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_TWILIGHT_EGG_CONTROLLER)
+                m_portalOwnerGuid = pSummoned->GetObjectGuid();
+
+            // update phasemask manually
+            pSummoned->SetPhaseMask(PHASEMASK_TWILIGHT_REALM, true);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pInvoker->GetEntry() == NPC_TWILIGHT_EGG_CONTROLLER)
+            {
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_DATA_PORTAL_OFF, m_uiPortalId);
+
+                DoEjectTwilightPlayersIfCan((Creature*)pInvoker);
+            }
+        }
+
+        void DoHandleBreathYell()
+        {
+            DoScriptText(SAY_TENEBRON_BREATH, m_creature);
+        }
+
+        void UpdateDragonAI(const uint32 uiDiff)
+        {
+            if (m_uiSpawnEggsTimer < uiDiff)
+            {
+                uint32 uiSpawnEntry = NPC_TWILIGHT_EGG;
+                if (m_pInstance)
+                {
+                    if (m_pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+                        uiSpawnEntry = NPC_SARTHARION_TWILIGHT_EGG;
+                }
+
+                float fX, fY, fZ;
+                for (uint8 i = 0; i < MAX_TWILIGHT_EGGS; ++i)
+                {
+                    m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 20.0f, fX, fY, fZ);
+                    m_creature->SummonCreature(uiSpawnEntry, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+
+                // spawn the controller as well in order to eject players from twilight realm
+                m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 20.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_TWILIGHT_EGG_CONTROLLER, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                // used only for visual - the result is handled by the Twilight eggs script
+                if (DoCastSpellIfCan(m_creature, SPELL_HATCH_EGGS_MAIN) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_HATCH_EGGS, m_creature);
+                    if (urand(0, 1))
+                        DoScriptText(urand(0, 1) ? SAY_TENEBRON_SPECIAL_1 : SAY_TENEBRON_SPECIAL_2, m_creature);
+                }
+
+                m_uiSpawnEggsTimer = 60000;
+            }
+            else
+                m_uiSpawnEggsTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_tenebronAI(pCreature);
+    }
+};
+
+/*######
+## Mob Shadron
+######*/
+
+struct mob_shadron : public CreatureScript
+{
+    mob_shadron() : CreatureScript("mob_shadron") {}
+
+    struct mob_shadronAI : public dummy_dragonAI
+    {
+        mob_shadronAI(Creature* pCreature) : dummy_dragonAI(pCreature)
+        {
+            m_uiPortalId = TYPE_PORTAL_SHADRON;
+        }
+
+        uint32 m_uiAcolyteShadronTimer;
+
+        void Reset() override
+        {
+            m_uiAcolyteShadronTimer = 25000;
+
+            dummy_dragonAI::Reset();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_SHADRON_AGGRO, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_POWER_OF_SHADRON);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SHADRON_SLAY_1 : SAY_SHADRON_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            DoScriptText(SAY_SHADRON_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                // Cast Twilight Revent - script target on Sartharion
+                if (m_pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+                    DoCastSpellIfCan(m_creature, SPELL_TWILIGHT_REVENGE, CAST_TRIGGERED);
+                else
+                    dummy_dragonAI::JustDied(pKiller);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_DISCIPLE_OF_SHADRON)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_GIFT_OF_TWILIGTH_SHA, true);
+                m_portalOwnerGuid = pSummoned->GetObjectGuid();
+            }
+            else if (pSummoned->GetEntry() == NPC_ACOLYTE_OF_SHADRON)
+                pSummoned->CastSpell(pSummoned, SPELL_GIFT_OF_TWILIGTH_SAR, true);
+
+            // update phasemask manually
+            pSummoned->SetPhaseMask(PHASEMASK_TWILIGHT_REALM, true);
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_DATA_PORTAL_OFF, m_uiPortalId);
+
+                if (m_pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+                {
+                    if (Creature* pSartharion = m_pInstance->GetSingleCreatureFromStorage(NPC_SARTHARION))
+                        pSartharion->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SAR);
+                }
+                else
+                    m_creature->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SHA);
+            }
+
+            DoEjectTwilightPlayersIfCan(pSummoned);
+            m_uiAcolyteShadronTimer = m_uiPortalRespawnTimer + 5000;
+        }
+
+        void DoHandleBreathYell()
+        {
+            DoScriptText(SAY_SHADRON_BREATH, m_creature);
+        }
+
+        void UpdateDragonAI(const uint32 uiDiff)
+        {
+            if (m_uiAcolyteShadronTimer)
+            {
+                if (m_uiAcolyteShadronTimer <= uiDiff)
+                {
+                    DoScriptText(EMOTE_SHADRON_DICIPLE, m_creature);
+                    if (urand(0, 1))
+                        DoScriptText(urand(0, 1) ? SAY_SHADRON_SPECIAL_1 : SAY_SHADRON_SPECIAL_2, m_creature);
+
+                    uint32 uiSpawnEntry = NPC_DISCIPLE_OF_SHADRON;
+                    if (m_pInstance)
+                    {
+                        if (m_pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+                            uiSpawnEntry = NPC_ACOLYTE_OF_SHADRON;
+                    }
+
+                    float fX, fY, fZ;
+                    m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 20.0f, fX, fY, fZ);
+                    m_creature->SummonCreature(uiSpawnEntry, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                    m_uiAcolyteShadronTimer = 0;
+                }
+                else
+                    m_uiAcolyteShadronTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_shadronAI(pCreature);
+    }
+};
+
+/*######
+## Mob Vesperon
+######*/
+
+struct mob_vesperon : public CreatureScript
+{
+    mob_vesperon() : CreatureScript("mob_vesperon") {}
+
+    struct mob_vesperonAI : public dummy_dragonAI
+    {
+        mob_vesperonAI(Creature* pCreature) : dummy_dragonAI(pCreature)
+        {
+            m_uiPortalId = TYPE_PORTAL_VESPERON;
+        }
+
+        uint32 m_uiAcolyteVesperonTimer;
+
+        void Reset() override
+        {
+            m_uiAcolyteVesperonTimer = 25000;
+
+            dummy_dragonAI::Reset();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_VESPERON_AGGRO, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_POWER_OF_VESPERON);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_VESPERON_SLAY_1 : SAY_VESPERON_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            DoScriptText(SAY_VESPERON_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                // Cast Twilight Revent - script target on Sartharion
+                if (m_pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+                    DoCastSpellIfCan(m_creature, SPELL_TWILIGHT_REVENGE, CAST_TRIGGERED);
+                else
+                    dummy_dragonAI::JustDied(pKiller);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // ToDo: these spells may break the encounter and make it unplayable. More research is required!!!
+            if (pSummoned->GetEntry() == NPC_DISCIPLE_OF_VESPERON)
+            {
+                //pSummoned->CastSpell(pSummoned, SPELL_TWILIGHT_TORMENT_VESP, true);
+                m_portalOwnerGuid = pSummoned->GetObjectGuid();
+            }
+            //else if (pSummoned->GetEntry() == NPC_ACOLYTE_OF_VESPERON)
+            //    pSummoned->CastSpell(pSummoned, SPELL_TWILIGHT_TORMENT_VESP_ACO, true);
+
+            // update phasemask manually
+            pSummoned->SetPhaseMask(PHASEMASK_TWILIGHT_REALM, true);
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // ToDo: remove Twilight Torment debuff
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_DATA_PORTAL_OFF, m_uiPortalId);
+
+            DoEjectTwilightPlayersIfCan(pSummoned);
+            m_uiAcolyteVesperonTimer = m_uiPortalRespawnTimer + 5000;
+        }
+
+        void DoHandleBreathYell()
+        {
+            DoScriptText(SAY_VESPERON_BREATH, m_creature);
+        }
+
+        void UpdateDragonAI(const uint32 uiDiff)
+        {
+            if (m_uiAcolyteVesperonTimer)
+            {
+                if (m_uiAcolyteVesperonTimer <= uiDiff)
+                {
+                    DoScriptText(EMOTE_VESPERON_DICIPLE, m_creature);
+                    if (urand(0, 1))
+                        DoScriptText(urand(0, 1) ? SAY_VESPERON_SPECIAL_1 : SAY_VESPERON_SPECIAL_2, m_creature);
+
+                    uint32 uiSpawnEntry = NPC_DISCIPLE_OF_VESPERON;
+                    if (m_pInstance)
+                    {
+                        if (m_pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+                            uiSpawnEntry = NPC_ACOLYTE_OF_VESPERON;
+                    }
+
+                    float fX, fY, fZ;
+                    m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 20.0f, fX, fY, fZ);
+                    m_creature->SummonCreature(uiSpawnEntry, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                    m_uiAcolyteVesperonTimer = 0;
+                }
+                else
+                    m_uiAcolyteVesperonTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_vesperonAI(pCreature);
+    }
+};
+
+/*######
+## Mob Twilight Eggs
+######*/
+
+struct mob_twilight_eggs : public CreatureScript
+{
+    mob_twilight_eggs() : CreatureScript("mob_twilight_eggs") {}
+
+    struct mob_twilight_eggsAI : public Scripted_NoMovementAI
+    {
+        mob_twilight_eggsAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        uint32 m_uiHatchTimer;
+
+        void Reset() override
+        {
+            m_uiHatchTimer = 20000;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_TWILIGHT_WHELP || pSummoned->GetEntry() == NPC_SHARTHARION_TWILIGHT_WHELP)
+                pSummoned->SetInCombatWithZone();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiHatchTimer < uiDiff)
+            {
+                uint32 uiSpellEntry = 0;
+                switch (m_creature->GetEntry())
+                {
+                case NPC_TWILIGHT_EGG: uiSpellEntry = SPELL_SUMMON_TWILIGHT_WHELP; break;
+                case NPC_SARTHARION_TWILIGHT_EGG: uiSpellEntry = SPELL_SUMMON_SARTHARION_TWILIGHT_WHELP; break;
+                }
+
+                m_creature->SetPhaseMask(PHASEMASK_NORMAL, true);
+                DoCastSpellIfCan(m_creature, uiSpellEntry, CAST_TRIGGERED);
+
+                m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                m_uiHatchTimer = 0;
+            }
+            else
+                m_uiHatchTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_twilight_eggsAI(pCreature);
+    }
+};
+
+/*######
+## npc_tenebron_egg_controller
+######*/
+
+struct npc_tenebron_egg_controller : public CreatureScript
+{
+    npc_tenebron_egg_controller() : CreatureScript("npc_tenebron_egg_controller") {}
+
+    struct npc_tenebron_egg_controllerAI : public Scripted_NoMovementAI
+    {
+        npc_tenebron_egg_controllerAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiHatchTimer;
+
+        void Reset() override
+        {
+            m_uiHatchTimer = 20000;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiHatchTimer)
+            {
+                if (m_uiHatchTimer < uiDiff)
+                {
+                    if (m_pInstance)
+                    {
+                        // Inform Tenebron to hatch the eggs
+                        if (Creature* pTenebron = m_pInstance->GetSingleCreatureFromStorage(NPC_TENEBRON))
+                            m_creature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pTenebron);
+                    }
+                    m_creature->ForcedDespawn(1000);
+                    m_uiHatchTimer = 0;
+                }
+                else
+                    m_uiHatchTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_tenebron_egg_controllerAI(pCreature);
+    }
+};
+
+/*######
+## npc_flame_tsunami
+######*/
+
+struct npc_flame_tsunami : public CreatureScript
+{
+    npc_flame_tsunami() : CreatureScript("npc_flame_tsunami") {}
+
+    struct npc_flame_tsunamiAI : public ScriptedAI
+    {
+        npc_flame_tsunamiAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiTsunamiTimer;
+
+        void Reset() override
+        {
+            m_uiTsunamiTimer = 2000;
+
+            DoCastSpellIfCan(m_creature, SPELL_FLAME_TSUNAMI, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_FLAME_TSUNAMI_DMG_AURA, CAST_TRIGGERED);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            m_creature->RemoveAllAurasOnEvade();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiTsunamiTimer)
+            {
+                if (m_uiTsunamiTimer <= uiDiff)
+                {
+                    // Note: currently the way in which spell 60241 works is unk, so for the moment we'll use simple movement
+                    m_creature->SetWalk(false);
+                    m_creature->GetMotionMaster()->MovePoint(1, m_creature->GetPositionX() < 3250.0f ? m_creature->GetPositionX() + 86.5f : m_creature->GetPositionX() - 86.5f,
+                        m_creature->GetPositionY(), m_creature->GetPositionZ());
+
+                    m_uiTsunamiTimer = 0;
+                }
+                else
+                    m_uiTsunamiTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_flame_tsunamiAI(pCreature);
+    }
+};
+
+/*######
+## npc_fire_cyclone
+######*/
+
+struct npc_fire_cyclone : public CreatureScript
+{
+    npc_fire_cyclone() : CreatureScript("npc_fire_cyclone") {}
+
+    struct npc_fire_cycloneAI : public ScriptedAI
+    {
+        npc_fire_cycloneAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset()  override { }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            // Mark the achiev failed for the hit target
+            if (pSpell->Id == SPELL_LAVA_STRIKE_IMPACT && pTarget->GetTypeId() == TYPEID_PLAYER && m_pInstance)
+                m_pInstance->SetData(TYPE_VOLCANO_BLOW_FAILED, pTarget->GetGUIDLow());
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_LAVA_BLAZE)
+                pSummoned->SetInCombatWithZone();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_fire_cycloneAI(pCreature);
+    }
+};
+
+void AddSC_boss_sartharion()
+{
+    Script* s;
+
+    s = new boss_sartharion();
+    s->RegisterSelf();
+    s = new mob_vesperon();
+    s->RegisterSelf();
+    s = new mob_shadron();
+    s->RegisterSelf();
+    s = new mob_tenebron();
+    s->RegisterSelf();
+    s = new mob_twilight_eggs();
+    s->RegisterSelf();
+    s = new npc_tenebron_egg_controller();
+    s->RegisterSelf();
+    s = new npc_flame_tsunami();
+    s->RegisterSelf();
+    s = new npc_fire_cyclone();
+    s->RegisterSelf();
+
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_sartharion";
+    //pNewScript->GetAI = &GetAI_boss_sartharion;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_vesperon";
+    //pNewScript->GetAI = &GetAI_mob_vesperon;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_shadron";
+    //pNewScript->GetAI = &GetAI_mob_shadron;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_tenebron";
+    //pNewScript->GetAI = &GetAI_mob_tenebron;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_twilight_eggs";
+    //pNewScript->GetAI = &GetAI_mob_twilight_eggs;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_tenebron_egg_controller";
+    //pNewScript->GetAI = &GetAI_npc_tenebron_egg_controller;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_flame_tsunami";
+    //pNewScript->GetAI = &GetAI_npc_flame_tsunami;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_fire_cyclone";
+    //pNewScript->GetAI = &GetAI_npc_fire_cyclone;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp b/src/modules/SD3/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp
new file mode 100644
index 000000000..527f3afc1
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp
@@ -0,0 +1,209 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Obsidian_Sanctum
+SD%Complete: 80%
+SDComment:
+SDCategory: Obsidian Sanctum
+EndScriptData */
+
+#include "precompiled.h"
+#include "obsidian_sanctum.h"
+
+/* Obsidian Sanctum encounters:
+0 - Sartharion
+*/
+
+struct is_obsidian_sanctum : public InstanceScript
+{
+    is_obsidian_sanctum() : InstanceScript("instance_obsidian_sanctum") {}
+
+    class instance_obsidian_sanctum : public ScriptedInstance
+    {
+    public:
+        instance_obsidian_sanctum(Map* pMap) : ScriptedInstance(pMap),
+            m_uiAliveDragons(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+
+            for (uint8 i = 0; i < MAX_TWILIGHT_DRAGONS; ++i)
+                m_bPortalActive[i] = false;
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+                // The three dragons below set to active state once created.
+                // We must expect bigger raid to encounter main boss, and then three dragons must be active due to grid differences
+            case NPC_TENEBRON:
+            case NPC_SHADRON:
+            case NPC_VESPERON:
+                pCreature->SetActiveObjectState(true);
+            case NPC_SARTHARION:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_FIRE_CYCLONE:
+                m_lFireCycloneGuidList.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_SARTHARION_EVENT:
+                m_auiEncounter[0] = uiData;
+                if (uiData == IN_PROGRESS)
+                    m_sVolcanoBlowFailPlayers.clear();
+                break;
+            case TYPE_ALIVE_DRAGONS:
+                m_uiAliveDragons = uiData;
+                break;
+            case TYPE_VOLCANO_BLOW_FAILED:
+                // Insert the players who fail the achiev and haven't been already inserted in the set
+                if (m_sVolcanoBlowFailPlayers.find(uiData) == m_sVolcanoBlowFailPlayers.end())
+                    m_sVolcanoBlowFailPlayers.insert(uiData);
+                break;
+            case TYPE_DATA_PORTAL_OFF:
+            case TYPE_DATA_PORTAL_ON:
+                SetPortalStatus(uint8(uiData), uiType == TYPE_DATA_PORTAL_ON);
+                return;
+            default:
+                break;
+            }
+
+            // No need to save anything here
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType == TYPE_SARTHARION_EVENT)
+                return m_auiEncounter[0];
+
+            if (uiType == TYPE_DATA_PORTAL_STATUS)
+                return uint32(IsActivePortal());
+            return 0;
+        }
+
+        uint64 GetData64(uint32 uiType) const override
+        {
+            if (uiType == DATA64_FIRE_CYCLONE)
+                return SelectRandomFireCycloneGuid().GetRawValue();
+
+            return 0;
+        }
+
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+            case ACHIEV_DRAGONS_ALIVE_1_N:
+            case ACHIEV_DRAGONS_ALIVE_1_H:
+                return m_uiAliveDragons >= 1;
+            case ACHIEV_DRAGONS_ALIVE_2_N:
+            case ACHIEV_DRAGONS_ALIVE_2_H:
+                return m_uiAliveDragons >= 2;
+            case ACHIEV_DRAGONS_ALIVE_3_N:
+            case ACHIEV_DRAGONS_ALIVE_3_H:
+                return m_uiAliveDragons >= 3;
+            case ACHIEV_CRIT_VOLCANO_BLOW_N:
+            case ACHIEV_CRIT_VOLCANO_BLOW_H:
+                // Return true if not found in the set
+                return m_sVolcanoBlowFailPlayers.find(pSource->GetGUIDLow()) == m_sVolcanoBlowFailPlayers.end();
+            default:
+                return false;
+            }
+        }
+
+        bool CheckConditionCriteriaMeet(Player const* pPlayer, uint32 uiInstanceConditionId, WorldObject const* pConditionSource, uint32 conditionSourceType) const override
+        {
+            switch (uiInstanceConditionId)
+            {
+            case INSTANCE_CONDITION_ID_HARD_MODE:               // Exactly one dragon alive on event start
+            case INSTANCE_CONDITION_ID_HARD_MODE_2:             // Exactly two dragons alive on event start
+            case INSTANCE_CONDITION_ID_HARD_MODE_3:             // All three dragons alive on event start
+                return m_uiAliveDragons == uiInstanceConditionId;
+            }
+
+            script_error_log("instance_obsidian_sanctum::CheckConditionCriteriaMeet called with unsupported Id %u. Called with param plr %s, src %s, condition source type %u",
+                uiInstanceConditionId, pPlayer ? pPlayer->GetGuidStr().c_str() : "NULL", pConditionSource ? pConditionSource->GetGuidStr().c_str() : "NULL", conditionSourceType);
+            return false;
+        }
+
+    private:
+        void SetPortalStatus(uint8 uiType, bool bStatus) { m_bPortalActive[uiType] = bStatus; }
+        bool IsActivePortal() const
+        {
+            for (uint8 i = 0; i < MAX_TWILIGHT_DRAGONS; ++i)
+            {
+                if (m_bPortalActive[i])
+                    return true;
+            }
+
+            return false;
+        }
+
+        ObjectGuid SelectRandomFireCycloneGuid() const
+        {
+            if (m_lFireCycloneGuidList.empty())
+                return ObjectGuid();
+
+            GuidList::const_iterator iter = m_lFireCycloneGuidList.begin();
+            advance(iter, urand(0, m_lFireCycloneGuidList.size() - 1));
+
+            return *iter;
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        bool m_bPortalActive[MAX_TWILIGHT_DRAGONS];
+
+        uint8 m_uiAliveDragons;
+
+        std::set<uint32> m_sVolcanoBlowFailPlayers;
+
+        GuidList m_lFireCycloneGuidList;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_obsidian_sanctum(pMap);
+    }
+};
+
+void AddSC_instance_obsidian_sanctum()
+{
+    Script* s;
+
+    s = new is_obsidian_sanctum();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_obsidian_sanctum";
+    //pNewScript->GetInstanceData = GetInstanceData_instance_obsidian_sanctum;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/obsidian_sanctum/obsidian_sanctum.h b/src/modules/SD3/scripts/northrend/obsidian_sanctum/obsidian_sanctum.h
new file mode 100644
index 000000000..9c6b6fb4c
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/obsidian_sanctum/obsidian_sanctum.h
@@ -0,0 +1,49 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_OBSIDIAN_SANCTUM_H
+#define DEF_OBSIDIAN_SANCTUM_H
+
+enum
+{
+    MAX_ENCOUNTER               = 1,
+
+    TYPE_SARTHARION_EVENT       = 1,
+    // internal used types for achievement
+    TYPE_ALIVE_DRAGONS          = 2,
+    TYPE_VOLCANO_BLOW_FAILED    = 3,
+
+    TYPE_DATA_PORTAL_ON         = 4,
+    TYPE_DATA_PORTAL_OFF        = 5,
+    TYPE_DATA_PORTAL_STATUS     = 6,
+
+    DATA64_FIRE_CYCLONE         = 0,
+
+    MAX_TWILIGHT_DRAGONS        = 3,
+
+    TYPE_PORTAL_TENEBRON        = 0,
+    TYPE_PORTAL_SHADRON         = 1,
+    TYPE_PORTAL_VESPERON        = 2,
+
+    NPC_SARTHARION              = 28860,
+    NPC_TENEBRON                = 30452,
+    NPC_SHADRON                 = 30451,
+    NPC_VESPERON                = 30449,
+
+    NPC_FIRE_CYCLONE            = 30648,
+
+    GO_TWILIGHT_PORTAL          = 193988,
+
+    // Achievement related
+    ACHIEV_CRIT_VOLCANO_BLOW_N  = 7326,                     // achievs 2047, 2048 (Go When the Volcano Blows) -- This is individual achievement!
+    ACHIEV_CRIT_VOLCANO_BLOW_H  = 7327,
+    ACHIEV_DRAGONS_ALIVE_1_N    = 7328,                     // achievs 2049, 2052 (Twilight Assist)
+    ACHIEV_DRAGONS_ALIVE_1_H    = 7331,
+    ACHIEV_DRAGONS_ALIVE_2_N    = 7329,                     // achievs 2050, 2053 (Twilight Duo)
+    ACHIEV_DRAGONS_ALIVE_2_H    = 7332,
+    ACHIEV_DRAGONS_ALIVE_3_N    = 7330,                     // achievs 2051, 2054 (The Twilight Zone)
+    ACHIEV_DRAGONS_ALIVE_3_H    = 7333,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/northrend/ruby_sanctum/boss_baltharus.cpp b/src/modules/SD3/scripts/northrend/ruby_sanctum/boss_baltharus.cpp
new file mode 100644
index 000000000..044bc79c1
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ruby_sanctum/boss_baltharus.cpp
@@ -0,0 +1,335 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_baltharus
+SD%Complete: 90
+SDComment: intro channeled spell NYI.
+SDCategory: Ruby Sanctum
+EndScriptData */
+
+#include "precompiled.h"
+#include "ruby_sanctum.h"
+
+enum
+{
+    // Xerestrasza intro and outro texts
+    SAY_HELP                    = -1724000,
+    SAY_INTRO                   = -1724001,
+
+    SAY_THANKS                  = -1724002,
+    SAY_OUTRO_1                 = -1724003,
+    SAY_OUTRO_2                 = -1724004,
+    SAY_OUTRO_3                 = -1724005,
+    SAY_OUTRO_4                 = -1724006,
+    SAY_OUTRO_5                 = -1724007,
+    SAY_OUTRO_6                 = -1724008,
+    SAY_OUTRO_7                 = -1724009,
+
+    // Baltharus texts
+    SAY_AGGRO                   = -1724010,
+    SAY_SLAY_1                  = -1724011,
+    SAY_SLAY_2                  = -1724012,
+    SAY_DEATH                   = -1724013,
+    SAY_SPLIT                   = -1724014,
+
+    SPELL_BARRIER_CHANNEL       = 76221,            // channeled on the tree
+    SPELL_BLADE_TEMPEST         = 75125,
+    SPELL_CLEAVE                = 40504,
+    SPELL_ENERVATING_BRAND      = 74502,
+    SPELL_REPELLING_WAVE        = 74509,
+    SPELL_ENERVATING_BRAND_PL   = 74505,            // spell triggerd on players by 74502
+    SPELL_SIPHONED_MIGHT        = 74507,            // spell triggered on boss by 74505
+    SPELL_SUMMON_CLONE          = 74511,            // summons 39899
+    SPELL_SIMPLE_TELEPORT       = 64195,            // spell id not confirmed
+
+    NPC_BALTHARUS_CLONE         = 39899,
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {SAY_HELP,  NPC_XERESTRASZA,  7000},
+    {SAY_INTRO, NPC_BALTHARUS,    0},
+    {0, 0, 0},
+};
+
+/*######
+## boss_baltharus
+######*/
+
+struct boss_baltharus : public CreatureScript
+{
+    boss_baltharus() : CreatureScript("boss_baltharus") {}
+
+    struct boss_baltharusAI : public ScriptedAI
+    {
+        boss_baltharusAI(Creature* pCreature) : ScriptedAI(pCreature),
+        m_introDialogue(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_introDialogue.InitializeDialogueHelper(m_pInstance);
+
+            // Health check percent depends on difficulty
+            if (m_pInstance)
+                m_fHealthPercentCheck = m_pInstance->GetData(TYPE_DATA_IS_25MAN) ? 33.3f : 50.0f;
+            else
+                script_error_log("Instance Ruby Sanctum: ERROR Failed to load instance data for this instace.");
+
+            m_bHasDoneIntro = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        DialogueHelper m_introDialogue;
+
+        bool m_bHasDoneIntro;
+
+        uint8 m_uiPhase;
+        float m_fHealthPercentCheck;
+
+        uint32 m_uiBladeTempestTimer;
+        uint32 m_uiEnervatingBrandTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiSummonCloneTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = 1;
+            m_uiSummonCloneTimer = 0;
+            m_uiBladeTempestTimer = 15000;
+            m_uiEnervatingBrandTimer = 14000;
+            m_uiCleaveTimer = urand(10000, 12000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_BALTHARUS, IN_PROGRESS);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasDoneIntro && pWho->GetTypeId() == TYPEID_PLAYER && !((Player*)pWho)->isGameMaster())
+            {
+                m_introDialogue.StartNextDialogueText(SAY_HELP);
+                m_bHasDoneIntro = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            if (urand(0, 1))
+                DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_BALTHARUS, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_BALTHARUS, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned)
+        {
+            if (pSummoned->GetEntry() == NPC_BALTHARUS_CLONE)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_SIMPLE_TELEPORT, true);
+                pSummoned->SetInCombatWithZone();
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, SpellEntry const* pSpellEntry) override
+        {
+            if (pTarget->GetTypeId() == TYPEID_PLAYER && pSpellEntry->Id == SPELL_ENERVATING_BRAND_PL)
+                pTarget->CastSpell(m_creature, SPELL_SIPHONED_MIGHT, true);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            m_introDialogue.DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_creature->GetHealthPercent() < 100 - m_fHealthPercentCheck * m_uiPhase)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_REPELLING_WAVE, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                {
+                    m_uiSummonCloneTimer = 3000;
+                    ++m_uiPhase;
+                }
+            }
+
+            if (m_uiSummonCloneTimer)
+            {
+                if (m_uiSummonCloneTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_CLONE) == CAST_OK)
+                    {
+                        DoScriptText(SAY_SPLIT, m_creature);
+                        m_uiSummonCloneTimer = 0;
+                    }
+                }
+                else
+                    m_uiSummonCloneTimer -= uiDiff;
+
+                // no other actions
+                return;
+            }
+
+            if (m_uiBladeTempestTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BLADE_TEMPEST) == CAST_OK)
+                    m_uiBladeTempestTimer = 22000;
+            }
+            else
+                m_uiBladeTempestTimer -= uiDiff;
+
+            if (m_uiEnervatingBrandTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_ENERVATING_BRAND) == CAST_OK)
+                        m_uiEnervatingBrandTimer = 25000;
+                }
+            }
+            else
+                m_uiEnervatingBrandTimer -= uiDiff;
+
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CLEAVE) == CAST_OK)
+                    m_uiCleaveTimer = urand(17000, 20000);
+            }
+            else
+                m_uiCleaveTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_baltharusAI(pCreature);
+    }
+};
+
+/*######
+## npc_baltharus_clone
+######*/
+
+struct npc_baltharus_clone : public CreatureScript
+{
+    npc_baltharus_clone() : CreatureScript("npc_baltharus_clone") {}
+
+    struct npc_baltharus_cloneAI : public ScriptedAI
+    {
+        npc_baltharus_cloneAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiBladeTempestTimer;
+        uint32 m_uiEnervatingBrandTimer;
+        uint32 m_uiCleaveTimer;
+
+        void Reset() override
+        {
+            m_uiBladeTempestTimer = 15000;
+            m_uiEnervatingBrandTimer = 14000;
+            m_uiCleaveTimer = urand(10000, 12000);
+        }
+
+        void SpellHitTarget(Unit* pTarget, SpellEntry const* pSpellEntry) override
+        {
+            if (pTarget->GetTypeId() == TYPEID_PLAYER && pSpellEntry->Id == SPELL_ENERVATING_BRAND_PL)
+                pTarget->CastSpell(m_creature, SPELL_SIPHONED_MIGHT, true);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiBladeTempestTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BLADE_TEMPEST) == CAST_OK)
+                    m_uiBladeTempestTimer = 22000;
+            }
+            else
+                m_uiBladeTempestTimer -= uiDiff;
+
+            if (m_uiEnervatingBrandTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_ENERVATING_BRAND) == CAST_OK)
+                        m_uiEnervatingBrandTimer = 25000;
+                }
+            }
+            else
+                m_uiEnervatingBrandTimer -= uiDiff;
+
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CLEAVE) == CAST_OK)
+                    m_uiCleaveTimer = urand(17000, 20000);
+            }
+            else
+                m_uiCleaveTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_baltharus_cloneAI(pCreature);
+    }
+};
+
+void AddSC_boss_baltharus()
+{
+    Script* s;
+
+    s = new boss_baltharus();
+    s->RegisterSelf();
+    s = new npc_baltharus_clone();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_baltharus";
+    //pNewScript->GetAI = &GetAI_boss_baltharus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_baltharus_clone";
+    //pNewScript->GetAI = &GetAI_npc_baltharus_clone;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ruby_sanctum/boss_halion.cpp b/src/modules/SD3/scripts/northrend/ruby_sanctum/boss_halion.cpp
new file mode 100644
index 000000000..2c50dc61c
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ruby_sanctum/boss_halion.cpp
@@ -0,0 +1,559 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_halion
+SD%Complete: 50
+SDComment: Phase 3 and related transition NYI; Twilight portals NYI; Shadow Orbs NYI; Meteor Strikes NYI; Heroic abilities NYI.
+SDCategory: Ruby Sanctum
+EndScriptData */
+
+#include "precompiled.h"
+#include "ruby_sanctum.h"
+
+enum
+{
+    SAY_AGGRO                   = -1724025,
+    SAY_SLAY_1                  = -1724026,
+    SOUND_SLAY_2                = 17502,                    // not sure if this one has a text
+    SAY_DEATH                   = -1724027,
+    SAY_BERSERK                 = -1724028,
+    SAY_FIREBALL                = -1724029,
+    SAY_SPHERES                 = -1724030,
+    SAY_PHASE_2                 = -1724031,
+    SAY_PHASE_3                 = -1724032,
+
+    EMOTE_SPHERES               = -1724033,
+    EMOTE_OUT_OF_TWILLIGHT      = -1724034,
+    EMOTE_OUT_OF_PHYSICAL       = -1724035,
+    EMOTE_INTO_TWILLIGHT        = -1724036,
+    EMOTE_INTO_PHYSICAL         = -1724037,
+    EMOTE_REGENERATE            = -1724038,
+
+    // *** Spells ***
+    // General
+    SPELL_TWILIGHT_PRECISION    = 78243,
+    SPELL_CLEAVE                = 74524,
+    SPELL_TAIL_LASH             = 74531,
+    SPELL_BERSERK               = 26662,
+
+    // Transitions
+    SPELL_TWILIGHT_PHASING      = 74808,                    // Start phase 2
+    SPELL_SUMMON_PORTAL         = 74809,
+    SPELL_TWILIGHT_DIVISION     = 75063,
+    SPELL_TWILIGHT_REALM        = 74807,
+    SPELL_TWILIGHT_MENDING      = 75509,
+    SPELL_LEAVE_TWILIGHT_REALM  = 74812,                    // handled by GO 202796
+    //share damage spell: 74810 - serverside spell
+
+    // Real
+    SPELL_FLAME_BREATH          = 74525,
+    SPELL_METEOR_SUMMON         = 74637,                    // summons 40029
+    SPELL_FIERY_COMBUSTION      = 74562,                    // curse - triggers 74567 on self (player); on dispell triggers 74607 and 74610
+
+    // Twilight
+    SPELL_DARK_BREATH           = 74806,
+    SPELL_DUSK_SHROUD           = 75476,
+    SPELL_SOUL_CONSUMPTION      = 74792,                    // curse - triggers 74795 on self (player); on dispell triggers 74799 and 74800
+
+    // Corporeality
+    SPELL_CORPOREALITY_EVEN     = 74826,                    // Deals & receives normal damage
+    SPELL_CORPOREALITY_20I      = 74827,                    // Damage dealt increased by 10%  - Damage taken increased by 15%
+    SPELL_CORPOREALITY_40I      = 74828,                    // Damage dealt increased by 30%  - Damage taken increased by 50%
+    SPELL_CORPOREALITY_60I      = 74829,                    // Damage dealt increased by 60%  - Damage taken increased by 100%
+    SPELL_CORPOREALITY_80I      = 74830,                    // Damage dealt increased by 100% - Damage taken increased by 200%
+    SPELL_CORPOREALITY_100I     = 74831,                    // Damage dealt increased by 200% - Damage taken increased by 400%
+    SPELL_CORPOREALITY_20D      = 74832,                    // Damage dealt reduced by 10%    - Damage taken reduced by 15%
+    SPELL_CORPOREALITY_40D      = 74833,                    // Damage dealt reduced by 30%    - Damage taken reduced by 50%
+    SPELL_CORPOREALITY_60D      = 74834,                    // Damage dealt reduced by 60%    - Damage taken reduced by 100%
+    SPELL_CORPOREALITY_80D      = 74835,                    // Damage dealt reduced by 100%   - Damage taken reduced by 200%
+    SPELL_CORPOREALITY_100D     = 74836,                    // Damage dealt reduced by 200%   - Damage taken reduced by 400%
+
+    // *** Other spells ***
+    //Combustion
+    SPELL_COMBUSTION_PERIODIC   = 74629,                    // cast by npc 40001
+
+    // Consumption
+    SPELL_CONSUMPTION_PERIODIC  = 74803,                    // cast by npc 40135
+
+    // Meteor
+    SPELL_METEOR_VISUAL         = 74641,                    // cast by npc 40029 (all meteor spells)
+    SPELL_METEOR_IMPACT         = 74648,                    // cast on visual aura expire
+    SPELL_METEOR_FLAME          = 74713,
+    SPELL_METEOR_FLAME2         = 74718,                    // cast by the secondary strike npcs
+    SPELL_BIRTH                 = 40031,                    // cast by the meteor strike npcs
+
+    // Cutter
+    SPELL_TWILIGHT_CUTTER       = 74768,
+    SEPLL_TWILIGHT_PULSE        = 78861,
+    SPELL_TRACK_ROTATION        = 74758,                    // cast by 40081 on 40091
+
+    // Living Inferno
+    SPELL_BLAZING_AURA          = 75885,                    // cast by 40681
+
+    // Living Ember
+    SPELL_AWAKEN_FLAMES         = 75889,                    // cast by 40683
+
+    // Npcs
+    NPC_COMBUSTION              = 40001,
+    NPC_METEOR_STRIKE_MAIN      = 40029,                    // summons the other meteor strikes using serverside spells like 74680, 74681, 74682, 74683
+    NPC_CONSUMPTION             = 40135,
+    NPC_ORB_CARRIER             = 40081,                    // vehicle for shadow orbs
+    NPC_ORB_ROTATION_FOCUS      = 40091,
+
+    NPC_METEOR_STRIKE_1         = 40041,                    // Npc 40029 summons the first 4 secondary meteor strike npcs, then each of them summons one 40055 npc using serverside spells 74687, 74688
+    NPC_METEOR_STRIKE_2         = 40042,
+    NPC_METEOR_STRIKE_3         = 40043,
+    NPC_METEOR_STRIKE_4         = 40044,
+    NPC_METEOR_STRIKE_FLAME     = 40055,                    // Each npc 40055 summons other 10 40055 npcs resulting in a total spawns of 40 40055 npcs.
+
+    // Heroic npcs
+    NPC_LIVING_INFERNO          = 40681,                    // summoned by 75879 (heroic version spell)
+    NPC_LIVING_EMBER            = 40683,
+
+    // *** Phases ***
+    PHASE_PHISYCAL_REALM        = 1,
+    PHASE_TWILIGHT_REALM        = 2,
+    PHASE_BOTH_REALMS           = 3,
+};
+
+static const uint32 aShadowOrbs[4] = { NPC_SHADOW_ORB_1, NPC_SHADOW_ORB_2, NPC_SHADOW_ORB_3, NPC_SHADOW_ORB_4 };
+static const uint32 aMeteorStrikes[4] = { NPC_METEOR_STRIKE_1, NPC_METEOR_STRIKE_2, NPC_METEOR_STRIKE_3, NPC_METEOR_STRIKE_4 };
+
+static const float aRotationFocusPosition[4] = {3113.711f, 533.5382f, 72.96f, 1.93f};
+static const float aOrbCarrierPosition1[3] = {3153.75f, 579.1875f, 70.47f};
+static const float aOrbCarrierPosition2[3] = {3153.75f, 487.1875f, 70.47f};
+
+/*######
+## boss_halion_real
+######*/
+
+struct boss_halion_real : public CreatureScript
+{
+    boss_halion_real() : CreatureScript("boss_halion_real") {}
+
+    struct boss_halion_realAI : public ScriptedAI
+    {
+        boss_halion_realAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+
+        uint32 m_uiTailLashTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiFieryCombustionTimer;
+        uint32 m_uiMeteorTimer;
+        uint32 m_uiFlameBreathTimer;
+        uint32 m_uiBerserkTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_PHISYCAL_REALM;
+
+            m_uiTailLashTimer = 10000;
+            m_uiCleaveTimer = urand(5000, 10000);
+            m_uiFieryCombustionTimer = 15000;
+            m_uiMeteorTimer = 20000;
+            m_uiBerserkTimer = 8 * MINUTE * IN_MILLISECONDS;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_HALION, IN_PROGRESS);
+
+            DoScriptText(SAY_AGGRO, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_TWILIGHT_PRECISION, CAST_TRIGGERED);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                switch (urand(0, 1))
+                {
+                case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+                case 1: DoPlaySoundToSet(m_creature, SOUND_SLAY_2); break;
+                }
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_HALION, DONE);
+
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_HALION, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_COMBUSTION:
+                pSummoned->CastSpell(pSummoned, SPELL_COMBUSTION_PERIODIC, true);
+                break;
+            case NPC_METEOR_STRIKE_MAIN:
+                // ToDo: summon the other meteor strikes around this one
+                pSummoned->CastSpell(pSummoned, SPELL_BIRTH, true);
+                pSummoned->CastSpell(pSummoned, SPELL_METEOR_VISUAL, true);
+                break;
+            }
+        }
+
+        void DoPrepareTwilightPhase()
+        {
+            if (!m_pInstance)
+                return;
+
+            // Spawn the orbs and the carriers. Use the twilight Halion version to preserve the phase
+            if (Creature* pHalion = m_pInstance->GetSingleCreatureFromStorage(NPC_HALION_TWILIGHT))
+            {
+                // Set current Halion hp
+                pHalion->SetHealth(m_creature->GetHealth());
+
+                // NOTE: the spawn coords seem to be totally off, compared to the actual map layout - requires additional research!!!
+
+                // Spawn the rotation focus first
+                // pHalion->SummonCreature(NPC_ORB_ROTATION_FOCUS, aRotationFocusPosition[0], aRotationFocusPosition[1], aRotationFocusPosition[2], aRotationFocusPosition[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                // Then spawn the orb carriers and the shadow orbs. ToDo: research if it's possible to make this dynamic
+                // pHalion->SummonCreature(NPC_ORB_CARRIER, aOrbCarrierPosition1[0], aOrbCarrierPosition1[1], aOrbCarrierPosition1[2], 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                // pHalion->SummonCreature(NPC_ORB_CARRIER, aOrbCarrierPosition2[0], aOrbCarrierPosition2[1], aOrbCarrierPosition2[2], 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                // pHalion->SummonCreature(NPC_SHADOW_ORB_1, aOrbCarrierPosition1[0], aOrbCarrierPosition1[1], aOrbCarrierPosition1[2], 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                // pHalion->SummonCreature(NPC_SHADOW_ORB_2, aOrbCarrierPosition2[0], aOrbCarrierPosition2[1], aOrbCarrierPosition2[2], 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        // Do the same for the Twilight halion
+                        if (m_pInstance)
+                        {
+                            if (Creature* pHalion = m_pInstance->GetSingleCreatureFromStorage(NPC_HALION_TWILIGHT, true))
+                                pHalion->CastSpell(pHalion, SPELL_BERSERK, true);
+                        }
+
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_BOTH_REALMS:
+                // ToDo: handle corporeality
+                // no break;
+            case PHASE_PHISYCAL_REALM:
+
+                if (m_uiTailLashTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TAIL_LASH) == CAST_OK)
+                        m_uiTailLashTimer = urand(15000, 25000);
+                }
+                else
+                    m_uiTailLashTimer -= uiDiff;
+
+                if (m_uiCleaveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                        m_uiCleaveTimer = urand(10000, 15000);
+                }
+                else
+                    m_uiCleaveTimer -= uiDiff;
+
+                if (m_uiFlameBreathTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FLAME_BREATH) == CAST_OK)
+                        m_uiFlameBreathTimer = urand(15000, 20000);
+                }
+                else
+                    m_uiFlameBreathTimer -= uiDiff;
+
+                if (m_uiFieryCombustionTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_FIERY_COMBUSTION, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_FIERY_COMBUSTION) == CAST_OK)
+                            m_uiFieryCombustionTimer = 25000;
+                    }
+                }
+                else
+                    m_uiFieryCombustionTimer -= uiDiff;
+
+                if (m_uiMeteorTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_METEOR_SUMMON) == CAST_OK)
+                        {
+                            DoScriptText(SAY_FIREBALL, m_creature);
+                            m_uiMeteorTimer = 40000;
+                        }
+                    }
+                }
+                else
+                    m_uiMeteorTimer -= uiDiff;
+
+                // Switch to phase 2
+                if (m_creature->GetHealthPercent() < 75.0f && m_uiPhase == PHASE_PHISYCAL_REALM)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TWILIGHT_PHASING, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_PORTAL, CAST_TRIGGERED);
+                        DoScriptText(SAY_PHASE_2, m_creature);
+                        DoPrepareTwilightPhase();
+                        m_uiPhase = PHASE_TWILIGHT_REALM;
+                    }
+                }
+
+                break;
+            case PHASE_TWILIGHT_REALM:
+
+                // Switch to phase 3
+                if (m_creature->GetHealthPercent() < 50.0f)
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_TWILIGHT_PHASING);
+                    DoScriptText(SAY_PHASE_3, m_creature);
+                    m_uiPhase = PHASE_BOTH_REALMS;
+                }
+
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_halion_realAI(pCreature);
+    }
+};
+
+/*######
+## boss_halion_twilight
+######*/
+
+struct boss_halion_twilight : public CreatureScript
+{
+    boss_halion_twilight() : CreatureScript("boss_halion_twilight") {}
+
+    struct boss_halion_twilightAI : public ScriptedAI
+    {
+        boss_halion_twilightAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+        uint32 m_uiTailLashTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiDarkBreathTimer;
+        uint32 m_uiSoulConsumptionTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_TWILIGHT_REALM;
+            m_uiTailLashTimer = 10000;
+            m_uiCleaveTimer = urand(5000, 10000);
+            m_uiDarkBreathTimer = 15000;
+            m_uiSoulConsumptionTimer = 20000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_DUSK_SHROUD, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_TWILIGHT_PRECISION, CAST_TRIGGERED);
+        }
+
+        void JustReachedHome() override
+        {
+            // Allow real Halion to evade
+            if (m_pInstance)
+            {
+                if (Creature* pHalion = m_pInstance->GetSingleCreatureFromStorage(NPC_HALION_REAL))
+                    pHalion->AI()->EnterEvadeMode();
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            // ToDo: handle the damage sharing!
+
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                switch (urand(0, 1))
+                {
+                case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+                case 1: DoPlaySoundToSet(m_creature, SOUND_SLAY_2); break;
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_CONSUMPTION:
+                pSummoned->CastSpell(pSummoned, SPELL_CONSUMPTION_PERIODIC, true);
+                break;
+            case NPC_SHADOW_ORB_1:
+            case NPC_SHADOW_ORB_2:
+            case NPC_SHADOW_ORB_3:
+            case NPC_SHADOW_ORB_4:
+                if (Creature* pCarrier = GetClosestCreatureWithEntry(pSummoned, NPC_ORB_CARRIER, 5.0f))
+                    pSummoned->CastSpell(pCarrier, SPELL_RIDE_VEHICLE_HARDCODED, true);
+                break;
+            case NPC_ORB_CARRIER:
+                pSummoned->CastSpell(pSummoned, SPELL_TRACK_ROTATION, true);
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            switch (m_uiPhase)
+            {
+            case PHASE_PHISYCAL_REALM:
+                // nothing here - phase not handled by this npc
+                break;
+            case PHASE_BOTH_REALMS:
+                // ToDo: handle corporeality
+                // no break;
+            case PHASE_TWILIGHT_REALM:
+
+                if (m_uiTailLashTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TAIL_LASH) == CAST_OK)
+                        m_uiTailLashTimer = urand(15000, 25000);
+                }
+                else
+                    m_uiTailLashTimer -= uiDiff;
+
+                if (m_uiCleaveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                        m_uiCleaveTimer = urand(10000, 15000);
+                }
+                else
+                    m_uiCleaveTimer -= uiDiff;
+
+                if (m_uiDarkBreathTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DARK_BREATH) == CAST_OK)
+                        m_uiDarkBreathTimer = urand(15000, 20000);
+                }
+                else
+                    m_uiDarkBreathTimer -= uiDiff;
+
+                if (m_uiSoulConsumptionTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_SOUL_CONSUMPTION, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SOUL_CONSUMPTION) == CAST_OK)
+                            m_uiSoulConsumptionTimer = 25000;
+                    }
+                }
+                else
+                    m_uiSoulConsumptionTimer -= uiDiff;
+
+                // Switch to phase 3
+                if (m_creature->GetHealthPercent() < 50.0f && m_uiPhase == PHASE_TWILIGHT_REALM)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TWILIGHT_DIVISION, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        if (m_pInstance)
+                        {
+                            // ToDo: Update world states and spawn the exit portals
+
+                            // Set the real Halion health, so it can also begin phase 3
+                            if (Creature* pHalion = m_pInstance->GetSingleCreatureFromStorage(NPC_HALION_REAL))
+                                pHalion->SetHealth(m_creature->GetHealth());
+                        }
+
+                        DoScriptText(SAY_PHASE_3, m_creature);
+                        m_uiPhase = PHASE_BOTH_REALMS;
+                    }
+                }
+
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_halion_twilightAI(pCreature);
+    }
+};
+
+void AddSC_boss_halion()
+{
+    Script* s;
+
+    s = new boss_halion_real();
+    s->RegisterSelf();
+    s = new boss_halion_twilight();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_halion_real";
+    //pNewScript->GetAI = &GetAI_boss_halion_real;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_halion_twilight";
+    //pNewScript->GetAI = &GetAI_boss_halion_twilight;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ruby_sanctum/boss_saviana.cpp b/src/modules/SD3/scripts/northrend/ruby_sanctum/boss_saviana.cpp
new file mode 100644
index 000000000..25c4b5873
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ruby_sanctum/boss_saviana.cpp
@@ -0,0 +1,232 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_saviana
+SD%Complete: 100
+SDComment:
+SDCategory: Ruby Sanctum
+EndScriptData */
+
+#include "precompiled.h"
+#include "ruby_sanctum.h"
+
+enum
+{
+    SAY_AGGRO                   = -1724015,
+    SAY_SLAY_1                  = -1724016,
+    SAY_SLAY_2                  = -1724017,
+    SAY_SPECIAL                 = -1724018,
+    SOUND_DEATH                 = 17531,                    // On death it has only a screaming sound
+    EMOTE_ENRAGE                = -1000003,
+
+    SPELL_ENRAGE                = 78722,
+    SPELL_FLAME_BREATH          = 74403,
+    SPELL_CONFLAGRATION         = 74452,                    // dummy targeting spell - effect handled in core
+
+    PHASE_GROUND                = 1,
+    PHASE_AIR                   = 2,
+    PHASE_TRANSITION            = 3,
+
+    POINT_AIR                   = 1,
+    POINT_GROUND                = 2
+};
+
+static const float aAirPositions[3] = {3155.51f, 683.844f, 90.50f};
+
+struct boss_saviana : public CreatureScript
+{
+    boss_saviana() : CreatureScript("boss_saviana") {}
+
+    struct boss_savianaAI : public ScriptedAI
+    {
+        boss_savianaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+        uint32 m_uiPhaseSwitchTimer;
+        uint32 m_uiFlameBreathTimer;
+        uint32 m_uiEnrageTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_GROUND;
+            m_uiPhaseSwitchTimer = 28000;
+            m_uiEnrageTimer = urand(10000, 15000);
+            m_uiFlameBreathTimer = 10000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SAVIANA, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            if (urand(0, 1))
+                DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoPlaySoundToSet(m_creature, SOUND_DEATH);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SAVIANA, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            SetCombatMovement(true);
+            m_creature->SetLevitate(false);
+            m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SAVIANA, FAIL);
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE)
+                return;
+
+            switch (uiPointId)
+            {
+            case POINT_AIR:
+                if (DoCastSpellIfCan(m_creature, SPELL_CONFLAGRATION) == CAST_OK)
+                {
+                    DoScriptText(SAY_SPECIAL, m_creature);
+                    m_uiPhaseSwitchTimer = 6000;
+                    m_uiPhase = PHASE_AIR;
+                }
+
+                break;
+            case POINT_GROUND:
+                m_uiPhase = PHASE_GROUND;
+                m_uiPhaseSwitchTimer = 38000;
+
+                SetCombatMovement(true);
+                m_creature->SetLevitate(false);
+                m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0);
+
+                if (m_creature->getVictim())
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            switch (m_uiPhase)
+            {
+            case PHASE_GROUND:
+
+                if (m_uiFlameBreathTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FLAME_BREATH) == CAST_OK)
+                        m_uiFlameBreathTimer = urand(20000, 25000);
+                }
+                else
+                    m_uiFlameBreathTimer -= uiDiff;
+
+                if (m_uiEnrageTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_ENRAGE, m_creature);
+                        m_uiEnrageTimer = urand(20000, 25000);
+                    }
+                }
+                else
+                    m_uiEnrageTimer -= uiDiff;
+
+                if (m_uiPhaseSwitchTimer < uiDiff)
+                {
+                    m_uiPhaseSwitchTimer = 0;
+                    m_uiPhase = PHASE_TRANSITION;
+
+                    SetCombatMovement(false);
+                    m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+                    m_creature->SetLevitate(true);
+
+                    m_creature->GetMotionMaster()->Clear();
+                    m_creature->GetMotionMaster()->MovePoint(POINT_AIR, aAirPositions[0], aAirPositions[1], aAirPositions[2]);
+                }
+                else
+                    m_uiPhaseSwitchTimer -= uiDiff;
+
+                DoMeleeAttackIfReady();
+
+                break;
+            case PHASE_AIR:
+                if (m_uiPhaseSwitchTimer)
+                {
+                    if (m_uiPhaseSwitchTimer <= uiDiff)
+                    {
+                        m_uiPhase = PHASE_TRANSITION;
+                        m_uiPhaseSwitchTimer = 0;
+
+                        float fX, fY, fZ;
+                        m_creature->GetRespawnCoord(fX, fY, fZ);
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MovePoint(POINT_GROUND, fX, fY, fZ);
+                    }
+                    else
+                        m_uiPhaseSwitchTimer -= uiDiff;
+                }
+                break;
+            case PHASE_TRANSITION:
+                // nothing here
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_savianaAI(pCreature);
+    }
+};
+
+void AddSC_boss_saviana()
+{
+    Script* s;
+
+    s = new boss_saviana();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_saviana";
+    //pNewScript->GetAI = &GetAI_boss_saviana;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ruby_sanctum/boss_zarithrian.cpp b/src/modules/SD3/scripts/northrend/ruby_sanctum/boss_zarithrian.cpp
new file mode 100644
index 000000000..455c6cc25
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ruby_sanctum/boss_zarithrian.cpp
@@ -0,0 +1,165 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_zarithrian
+SD%Complete: 100
+SDComment:
+SDCategory: Ruby Sanctum
+EndScriptData */
+
+#include "precompiled.h"
+#include "ruby_sanctum.h"
+
+enum
+{
+    SAY_AGGRO           = -1724019,
+    SAY_SLAY_1          = -1724020,
+    SAY_SLAY_2          = -1724021,
+    SAY_DEATH           = -1724022,
+    SAY_SUMMON          = -1724023,
+
+    SPELL_CLEAVE_ARMOR          = 74367,
+    SPELL_INTIMIDATING_ROAR     = 74384,
+
+    NPC_ONYX_FLAMECALLER        = 39814,                // handled in ACID
+};
+
+struct boss_zarithrian : public CreatureScript
+{
+    boss_zarithrian() : CreatureScript("boss_zarithrian") {}
+
+    struct boss_zarithrianAI : public ScriptedAI
+    {
+        boss_zarithrianAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiCleaveArmorTimer;
+        uint32 m_uiIntimidatingRoarTimer;
+        uint32 m_uiCallFlamecallerTimer;
+
+        void Reset() override
+        {
+            m_uiCleaveArmorTimer = 15000;
+            m_uiIntimidatingRoarTimer = 14000;
+            m_uiCallFlamecallerTimer = 15000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ZARITHRIAN, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            if (urand(0, 1))
+                DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ZARITHRIAN, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ZARITHRIAN, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_ONYX_FLAMECALLER)
+                pSummoned->SetInCombatWithZone();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiCleaveArmorTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE_ARMOR) == CAST_OK)
+                    m_uiCleaveArmorTimer = 15000;
+            }
+            else
+                m_uiCleaveArmorTimer -= uiDiff;
+
+            if (m_uiIntimidatingRoarTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_INTIMIDATING_ROAR) == CAST_OK)
+                    m_uiIntimidatingRoarTimer = 32000;
+            }
+            else
+                m_uiIntimidatingRoarTimer -= uiDiff;
+
+            if (m_uiCallFlamecallerTimer < uiDiff)
+            {
+                if (!m_pInstance)
+                {
+                    script_error_log("Instance Ruby Sanctum: ERROR Failed to load instance data for this instace.");
+                    return;
+                }
+
+                m_pInstance->SetData64(DATA64_SUMMON_FLAMECALLERS, m_creature->GetObjectGuid().GetRawValue());
+
+                DoScriptText(SAY_SUMMON, m_creature);
+                m_uiCallFlamecallerTimer = 45000;
+            }
+            else
+                m_uiCallFlamecallerTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+
+            EnterEvadeIfOutOfCombatArea(uiDiff);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_zarithrianAI(pCreature);
+    }
+};
+
+void AddSC_boss_zarithrian()
+{
+    Script* s;
+
+    s = new boss_zarithrian();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_zarithrian";
+    //pNewScript->GetAI = &GetAI_boss_zarithrian;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ruby_sanctum/instance_ruby_sanctum.cpp b/src/modules/SD3/scripts/northrend/ruby_sanctum/instance_ruby_sanctum.cpp
new file mode 100644
index 000000000..60dca94e4
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ruby_sanctum/instance_ruby_sanctum.cpp
@@ -0,0 +1,362 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: instance_ruby_sanctum
+SD%Complete: 30%
+SDComment: Basic instance script
+SDCategory: Ruby Sanctum
+EndScriptData */
+
+#include "precompiled.h"
+#include "ruby_sanctum.h"
+
+struct is_ruby_sanctum : public InstanceScript
+{
+    is_ruby_sanctum() : InstanceScript("instance_ruby_sanctum") {}
+
+    class instance_ruby_sanctum : public ScriptedInstance
+    {
+    public:
+        instance_ruby_sanctum(Map* pMap) : ScriptedInstance(pMap),
+            m_uiHalionSummonTimer(0),
+            m_uiHalionSummonStage(0),
+            m_uiHalionResetTimer(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 1; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    return true;
+            }
+
+            return false;
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            // Return if Halion already dead, or Zarithrian alive
+            if (m_auiEncounter[TYPE_ZARITHRIAN] != DONE || m_auiEncounter[TYPE_HALION] == DONE)
+                return;
+
+            // Return if already summoned
+            if (GetSingleCreatureFromStorage(NPC_HALION_REAL, true))
+                return;
+
+            if (Creature* pSummoner = GetSingleCreatureFromStorage(NPC_HALION_CONTROLLER))
+                pSummoner->SummonCreature(NPC_HALION_REAL, pSummoner->GetPositionX(), pSummoner->GetPositionY(), pSummoner->GetPositionZ(), 3.159f, TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_XERESTRASZA:
+                // Special case for Xerestrasza: she only needs to have questgiver flag if Baltharus is killed
+                if (m_auiEncounter[TYPE_BALTHARUS] != DONE)
+                    pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_ZARITHRIAN:
+                if (m_auiEncounter[TYPE_SAVIANA] == DONE && m_auiEncounter[TYPE_BALTHARUS] == DONE)
+                    pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                // no break;
+            case NPC_BALTHARUS:
+            case NPC_HALION_REAL:
+            case NPC_HALION_TWILIGHT:
+            case NPC_HALION_CONTROLLER:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_ZARITHRIAN_SPAWN_STALKER:
+                m_lSpawnStalkersGuidList.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_FLAME_WALLS:
+                if (m_auiEncounter[TYPE_SAVIANA] == DONE && m_auiEncounter[TYPE_BALTHARUS] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_FIRE_FIELD:
+                if (m_auiEncounter[TYPE_BALTHARUS] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_FLAME_RING:
+                break;
+            case GO_BURNING_TREE_1:
+            case GO_BURNING_TREE_2:
+            case GO_BURNING_TREE_3:
+            case GO_BURNING_TREE_4:
+                if (m_auiEncounter[TYPE_ZARITHRIAN] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_TWILIGHT_PORTAL_ENTER_1:
+            case GO_TWILIGHT_PORTAL_ENTER_2:
+            case GO_TWILIGHT_PORTAL_LEAVE:
+                break;
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_SAVIANA:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                    DoHandleZarithrianDoor();
+                break;
+            case TYPE_BALTHARUS:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoHandleZarithrianDoor();
+                    DoUseDoorOrButton(GO_FIRE_FIELD);
+
+                    // Start outro event by DB script
+                    if (Creature* pXerestrasza = GetSingleCreatureFromStorage(NPC_XERESTRASZA))
+                        pXerestrasza->GetMotionMaster()->MoveWaypoint();
+                }
+                break;
+            case TYPE_ZARITHRIAN:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_FLAME_WALLS);
+                if (uiData == DONE)
+                {
+                    // Start Halion summoning process
+                    if (Creature* pSummoner = GetSingleCreatureFromStorage(NPC_HALION_CONTROLLER))
+                    {
+                        pSummoner->CastSpell(pSummoner, SPELL_FIRE_PILLAR, false);
+                        m_uiHalionSummonTimer = 5000;
+                    }
+                }
+                break;
+            case TYPE_HALION:
+                // Don't set the same data twice
+                if (m_auiEncounter[uiType] == uiData)
+                    return;
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_FLAME_RING);
+                switch (uiData)
+                {
+                case FAIL:
+                    // Despawn the boss
+                    if (Creature* pHalion = GetSingleCreatureFromStorage(NPC_HALION_REAL))
+                        pHalion->ForcedDespawn();
+                    if (Creature* pHalion = GetSingleCreatureFromStorage(NPC_HALION_TWILIGHT))
+                        pHalion->ForcedDespawn();
+                    // Note: rest of the cleanup is handled by creature_linking
+
+                    m_uiHalionResetTimer = 30000;
+                    // no break;
+                case DONE:
+                    // clear debuffs
+                    if (Creature* pController = GetSingleCreatureFromStorage(NPC_HALION_CONTROLLER))
+                        pController->CastSpell(pController, SPELL_CLEAR_DEBUFFS, true);
+
+                    // Despawn the portals
+                    if (GameObject* pPortal = GetSingleGameObjectFromStorage(GO_TWILIGHT_PORTAL_ENTER_1))
+                        pPortal->SetLootState(GO_JUST_DEACTIVATED);
+
+                    // ToDo: despawn the other portals as well, and disable world state
+                    break;
+                }
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3];
+
+                strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            if (uiType == TYPE_DATA_IS_25MAN)
+                return uint32(instance->GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL || instance->GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC);
+
+            return 0;
+        }
+
+        void SetData64(uint32 uiType, uint64 uiData) override
+        {
+            if (uiType == DATA64_SUMMON_FLAMECALLERS)
+            {
+                for (GuidList::const_iterator itr = m_lSpawnStalkersGuidList.begin(); itr != m_lSpawnStalkersGuidList.end(); ++itr)
+                {
+                    if (Creature* pStalker = instance->GetCreature(*itr))
+                        pStalker->CastSpell(pStalker, SPELL_SUMMON_FLAMECALLER, true, NULL, NULL, ObjectGuid(uiData));
+                }
+            }
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_uiHalionSummonTimer)
+            {
+                if (m_uiHalionSummonTimer <= uiDiff)
+                {
+                    switch (m_uiHalionSummonStage)
+                    {
+                    case 0:
+                        // Burn the first line of trees
+                        DoUseDoorOrButton(GO_BURNING_TREE_1);
+                        DoUseDoorOrButton(GO_BURNING_TREE_2);
+                        m_uiHalionSummonTimer = 5000;
+                        break;
+                    case 1:
+                        // Burn the second line of trees
+                        DoUseDoorOrButton(GO_BURNING_TREE_3);
+                        DoUseDoorOrButton(GO_BURNING_TREE_4);
+                        m_uiHalionSummonTimer = 4000;
+                        break;
+                    case 2:
+                        // Cast Fiery explosion
+                        if (Creature* pSummoner = GetSingleCreatureFromStorage(NPC_HALION_CONTROLLER))
+                            pSummoner->CastSpell(pSummoner, SPELL_FIERY_EXPLOSION, true);
+                        m_uiHalionSummonTimer = 2000;
+                    case 3:
+                        // Spawn Halion
+                        if (Creature* pSummoner = GetSingleCreatureFromStorage(NPC_HALION_CONTROLLER))
+                        {
+                            if (Creature* pHalion = pSummoner->SummonCreature(NPC_HALION_REAL, pSummoner->GetPositionX(), pSummoner->GetPositionY(), pSummoner->GetPositionZ(), 3.159f, TEMPSUMMON_DEAD_DESPAWN, 0))
+                                DoScriptText(SAY_HALION_SPAWN, pHalion);
+                        }
+                        m_uiHalionSummonTimer = 0;
+                        break;
+                    }
+                    ++m_uiHalionSummonStage;
+                }
+                else
+                    m_uiHalionSummonTimer -= uiDiff;
+            }
+
+            // Resummon Halion if the encounter resets
+            if (m_uiHalionResetTimer)
+            {
+                if (m_uiHalionResetTimer <= uiDiff)
+                {
+                    if (Creature* pSummoner = GetSingleCreatureFromStorage(NPC_HALION_CONTROLLER))
+                        pSummoner->SummonCreature(NPC_HALION_REAL, pSummoner->GetPositionX(), pSummoner->GetPositionY(), pSummoner->GetPositionZ(), 3.159f, TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                    if (Creature* pHalion = GetSingleCreatureFromStorage(NPC_HALION_TWILIGHT))
+                        pHalion->Respawn();
+
+                    m_uiHalionResetTimer = 0;
+                }
+                else
+                    m_uiHalionResetTimer -= uiDiff;
+            }
+        }
+
+        const char* Save() const override { return strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        // Difficulty wrappers
+        //bool IsHeroicDifficulty() const { return instance->GetDifficulty() == RAID_DIFFICULTY_10MAN_HEROIC || instance->GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC; }
+        //bool Is25ManDifficulty() const { return instance->GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL || instance->GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC; }
+
+    protected:
+        void DoHandleZarithrianDoor()
+        {
+            if (m_auiEncounter[TYPE_SAVIANA] == DONE && m_auiEncounter[TYPE_BALTHARUS] == DONE)
+            {
+                DoUseDoorOrButton(GO_FLAME_WALLS);
+
+                // Also remove not_selectable unit flag
+                if (Creature* pZarithrian = GetSingleCreatureFromStorage(NPC_ZARITHRIAN))
+                    pZarithrian->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            }
+        }
+
+        std::string strInstData;
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+
+        uint32 m_uiHalionSummonTimer;
+        uint32 m_uiHalionSummonStage;
+        uint32 m_uiHalionResetTimer;
+
+        GuidList m_lSpawnStalkersGuidList;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_ruby_sanctum(pMap);
+    }
+};
+
+void AddSC_instance_ruby_sanctum()
+{
+    Script* s;
+
+    s = new is_ruby_sanctum();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_ruby_sanctum";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_ruby_sanctum;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ruby_sanctum/ruby_sanctum.h b/src/modules/SD3/scripts/northrend/ruby_sanctum/ruby_sanctum.h
new file mode 100644
index 000000000..8f08fa16e
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ruby_sanctum/ruby_sanctum.h
@@ -0,0 +1,66 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_RUBY_SANCTUM_H
+#define DEF_RUBY_SANCTUM_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 4,
+
+    TYPE_SAVIANA                    = 0,
+    TYPE_BALTHARUS                  = 1,
+    TYPE_ZARITHRIAN                 = 2,
+    TYPE_HALION                     = 3,
+
+    TYPE_DATA_IS_25MAN              = MAX_ENCOUNTER,
+
+    DATA64_SUMMON_FLAMECALLERS      = 0,
+
+    NPC_HALION_REAL                 = 39863,            // Halion - Physical Realm NPC
+    NPC_HALION_TWILIGHT             = 40142,            // Halion - Twilight Realm NPC
+    NPC_HALION_CONTROLLER           = 40146,
+
+    NPC_SHADOW_ORB_1                = 40083,            // shadow orbs for Halion encounter
+    NPC_SHADOW_ORB_2                = 40100,
+    NPC_SHADOW_ORB_3                = 40468,            // heroic only
+    NPC_SHADOW_ORB_4                = 40469,            // heroic only
+
+    NPC_SAVIANA                     = 39747,            // minibosses
+    NPC_BALTHARUS                   = 39751,
+    NPC_ZARITHRIAN                  = 39746,
+
+    NPC_XERESTRASZA                 = 40429,            // friendly npc, used for some cinematic and quest
+    NPC_ZARITHRIAN_SPAWN_STALKER    = 39794,
+
+    GO_TWILIGHT_PORTAL_ENTER_1      = 202794,           // Portals used in the Halion encounter
+    GO_TWILIGHT_PORTAL_ENTER_2      = 202795,
+    GO_TWILIGHT_PORTAL_LEAVE        = 202796,
+
+    GO_FIRE_FIELD                   = 203005,           // Xerestrasza flame door
+    GO_FLAME_WALLS                  = 203006,           // Zarithrian flame walls
+    GO_FLAME_RING                   = 203007,           // Halion flame ring
+    GO_TWILIGHT_FLAME_RING          = 203624,           // Halion flame ring - twilight version
+
+    GO_BURNING_TREE_1               = 203036,           // Trees which burn when Halion appears
+    GO_BURNING_TREE_2               = 203037,
+    GO_BURNING_TREE_3               = 203035,
+    GO_BURNING_TREE_4               = 203034,
+
+    // Spells used to summon Halion
+    SPELL_FIRE_PILLAR               = 76006,
+    SPELL_FIERY_EXPLOSION           = 76010,
+    SPELL_CLEAR_DEBUFFS             = 75396,            // cast by the controller on encounter reset
+
+    SAY_HALION_SPAWN                = -1724024,
+
+    // world state to show corporeality in Halion encounter - phase 3
+    WORLD_STATE_CORP_PHYSICAL       = 5049,
+    WORLD_STATE_CORP_TWILIGHT       = 5050,
+    WORLD_STATE_CORPOREALITY        = 5051,
+
+    SPELL_SUMMON_FLAMECALLER        = 74398,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/northrend/sholazar_basin.cpp b/src/modules/SD3/scripts/northrend/sholazar_basin.cpp
new file mode 100644
index 000000000..a215af898
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/sholazar_basin.cpp
@@ -0,0 +1,773 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Sholazar_Basin
+SD%Complete: 100
+SDComment: Quest support: 12570, 12580, 12644, 12688
+SDCategory: Sholazar Basin
+EndScriptData */
+
+/* ContentData
+npc_helice
+npc_injured_rainspeaker
+npc_mosswalker_victim
+npc_tipsy_mcmanus
+npc_wants_fruit_credit
+go_quest_still_at_it_credit
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_helice
+######*/
+
+enum
+{
+    QUEST_ENGINEERING_DISASTER          = 12688,
+
+    SAY_HELICE_ACCEPT                   = -1000657,
+    SAY_HELICE_EXPLOSIVES_1             = -1000658,
+    SAY_HELICE_EXPLODE_1                = -1000659,
+    SAY_HELICE_MOVE_ON                  = -1000660,
+    SAY_HELICE_EXPLOSIVES_2             = -1000661,
+    SAY_HELICE_EXPLODE_2                = -1000662,
+    SAY_HELICE_COMPLETE                 = -1000663,
+
+    SPELL_DETONATE_EXPLOSIVES_1         = 52369,            // first "barrel"
+    SPELL_DETONATE_EXPLOSIVES_2         = 52371,            // second "barrel"
+};
+
+struct npc_helice : public CreatureScript
+{
+    npc_helice() : CreatureScript("npc_helice") {}
+
+    struct npc_heliceAI : public npc_escortAI
+    {
+        npc_heliceAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_uiExplodeTimer = 5000;
+            m_uiExplodePhase = 0;
+            m_bFirstBarrel = true;
+        }
+
+        uint32 m_uiExplodeTimer;
+        uint32 m_uiExplodePhase;
+        bool m_bFirstBarrel;
+
+        void Reset() override
+        {
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 2:
+            {
+                      if (Player* pPlayer = GetPlayerForEscort())
+                      {
+                          DoScriptText(SAY_HELICE_EXPLOSIVES_1, m_creature, pPlayer);
+                          SetEscortPaused(true);
+                      }
+                      break;
+            }
+            case 13:
+            {
+                       if (Player* pPlayer = GetPlayerForEscort())
+                       {
+                           DoScriptText(SAY_HELICE_EXPLOSIVES_2, m_creature, pPlayer);
+                           SetEscortPaused(true);
+                       }
+                       break;
+            }
+            case 22:
+            {
+                       if (Player* pPlayer = GetPlayerForEscort())
+                       {
+                           DoScriptText(SAY_HELICE_COMPLETE, m_creature, pPlayer);
+                           pPlayer->GroupEventHappens(QUEST_ENGINEERING_DISASTER, m_creature);
+                       }
+                       break;
+            }
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (!HasEscortState(STATE_ESCORT_ESCORTING))
+                    return;
+
+                if (HasEscortState(STATE_ESCORT_PAUSED))
+                {
+                    if (m_uiExplodeTimer < uiDiff)
+                    {
+                        if (m_bFirstBarrel)
+                        {
+                            switch (m_uiExplodePhase)
+                            {
+                            case 0:
+                                DoCastSpellIfCan(m_creature, SPELL_DETONATE_EXPLOSIVES_1);
+
+                                if (Player* pPlayer = GetPlayerForEscort())
+                                    DoScriptText(SAY_HELICE_EXPLODE_1, m_creature, pPlayer);
+
+                                m_uiExplodeTimer = 2500;
+                                ++m_uiExplodePhase;
+                                break;
+                            case 1:
+                                if (Player* pPlayer = GetPlayerForEscort())
+                                    DoScriptText(SAY_HELICE_MOVE_ON, m_creature, pPlayer);
+
+                                m_uiExplodeTimer = 2500;
+                                ++m_uiExplodePhase;
+                                break;
+                            case 2:
+                                SetEscortPaused(false);
+                                m_uiExplodePhase = 0;
+                                m_uiExplodeTimer = 5000;
+                                m_bFirstBarrel = false;
+                                break;
+                            }
+                        }
+                        else
+                        {
+                            switch (m_uiExplodePhase)
+                            {
+                            case 0:
+                                DoCastSpellIfCan(m_creature, SPELL_DETONATE_EXPLOSIVES_2);
+
+                                if (Player* pPlayer = GetPlayerForEscort())
+                                    DoScriptText(SAY_HELICE_EXPLODE_2, m_creature, pPlayer);
+
+                                m_uiExplodeTimer = 2500;
+                                ++m_uiExplodePhase;
+                                break;
+                            case 1:
+                                SetEscortPaused(false);
+                                m_uiExplodePhase = 0;
+                                m_uiExplodeTimer = 5000;
+                                m_bFirstBarrel = true;
+                                break;
+                            }
+                        }
+                    }
+                    else
+                        m_uiExplodeTimer -= uiDiff;
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_heliceAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ENGINEERING_DISASTER)
+        {
+            DoScriptText(SAY_HELICE_ACCEPT, pCreature, pPlayer);
+
+            if (npc_heliceAI* pEscortAI = dynamic_cast<npc_heliceAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+                pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+            }
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_injured_rainspeaker
+######*/
+
+enum
+{
+    QUEST_FORTUNATE_MISUNDERSTAND       = 12570,
+
+    GOSSIP_ITEM_READY                   = -3000103,
+
+    SAY_ACCEPT                          = -1000605,
+    SAY_START                           = -1000606,
+    SAY_END_1                           = -1000607,
+    SAY_END_2                           = -1000608,
+    SAY_TRACKER                         = -1000609,         // not used in escort (aggro text for trackers? something for vekjik?)
+
+    NPC_FRENZYHEART_TRACKER             = 28077,
+
+    SPELL_ORACLE_ESCORT_START           = 51341,            // unknown purpose
+    SPELL_FEIGN_DEATH                   = 51329,
+    SPELL_ORACLE_INTRO                  = 51448,
+};
+
+struct npc_injured_rainspeaker : public CreatureScript
+{
+    npc_injured_rainspeaker() : CreatureScript("npc_injured_rainspeaker") {}
+
+    struct npc_injured_rainspeakerAI : public npc_escortAI
+    {
+        npc_injured_rainspeakerAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void Reset() override { }
+
+        void JustStartedEscort() override
+        {
+            if (Player* pPlayer = GetPlayerForEscort())
+            {
+                DoScriptText(SAY_START, m_creature, pPlayer);
+                DoCastSpellIfCan(m_creature, SPELL_ORACLE_ESCORT_START);
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 22:
+            {
+                       if (Player* pPlayer = GetPlayerForEscort())
+                       {
+                           DoScriptText(SAY_END_1, m_creature, pPlayer);
+                           DoCastSpellIfCan(m_creature, SPELL_ORACLE_INTRO);
+                       }
+                       break;
+            }
+            case 23:
+            {
+                       DoScriptText(SAY_END_2, m_creature);
+
+                       // location behind
+                       float fAngle = m_creature->GetOrientation();
+                       fAngle += M_PI_F;
+
+                       float fX, fY, fZ;
+                       m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0.0f, 15.0f, fAngle);
+
+                       m_creature->SummonCreature(NPC_FRENZYHEART_TRACKER, fX, fY, fZ, m_creature->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000);
+                       break;
+            }
+            }
+        }
+
+        void UpdateEscortAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_injured_rainspeakerAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_FORTUNATE_MISUNDERSTAND)
+        {
+            pCreature->RemoveAurasDueToSpell(SPELL_FEIGN_DEATH);
+            DoScriptText(SAY_ACCEPT, pCreature, pPlayer);
+
+            // Workaround, GossipHello/GossipSelect doesn't work well when object already has gossip from database
+            if (npc_injured_rainspeakerAI* pEscortAI = dynamic_cast<npc_injured_rainspeakerAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(true, pPlayer, pQuest);
+                pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+            }
+        }
+
+        return false;
+    }
+};
+
+/*
+bool GossipHello_npc_injured_rainspeaker(Player* pPlayer, Creature* pCreature)
+{
+    if (pPlayer->GetQuestStatus(QUEST_FORTUNATE_MISUNDERSTAND) == QUEST_STATUS_INCOMPLETE)
+    {
+        pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_READY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+
+    return false;
+}
+
+bool GossipSelect_npc_injured_rainspeaker(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
+{
+    if (uiAction == GOSSIP_ACTION_INFO_DEF)
+    {
+        pPlayer->CLOSE_GOSSIP_MENU();
+
+        if (npc_injured_rainspeakerAI* pEscortAI = dynamic_cast<npc_injured_rainspeakerAI*>(pCreature->AI()))
+            pEscortAI->Start(true, pPlayer);
+    }
+
+    return false;
+}
+*/
+
+/*######
+## npc_mosswalker_victim
+######*/
+
+enum
+{
+    QUEST_MOSSWALKER_SAVIOR         = 12580,
+    SPELL_DEAD_SOLDIER              = 45801,                // not clear what this does, but looks like all have it
+    SPELL_MOSSWALKER_QUEST_CREDIT   = 52157,
+
+    GOSSIP_ITEM_PULSE               = -3000104,
+    TEXT_ID_INJURED                 = 13318,
+
+    EMOTE_PAIN                      = -1000610,
+
+    SAY_RESCUE_1                    = -1000611,
+    SAY_RESCUE_2                    = -1000612,
+    SAY_RESCUE_3                    = -1000613,
+    SAY_RESCUE_4                    = -1000614,
+
+    SAY_DIE_1                       = -1000615,
+    SAY_DIE_2                       = -1000616,
+    SAY_DIE_3                       = -1000617,
+    SAY_DIE_4                       = -1000618,
+    SAY_DIE_5                       = -1000619,
+    SAY_DIE_6                       = -1000620,
+};
+
+struct npc_mosswalker_victim : public CreatureScript
+{
+    npc_mosswalker_victim() : CreatureScript("npc_mosswalker_victim") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_MOSSWALKER_SAVIOR) == QUEST_STATUS_INCOMPLETE)
+        {
+            // doesn't appear they always emote
+            if (urand(0, 3) == 0)
+                DoScriptText(EMOTE_PAIN, pCreature);
+
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_PULSE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(TEXT_ID_INJURED, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        if (uiAction == GOSSIP_ACTION_INFO_DEF)
+        {
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+            // just to prevent double credit
+            if (pCreature->GetLootRecipient())
+                return true;
+            else
+                pCreature->SetLootRecipient(pPlayer);
+
+            if (urand(0, 2))                                    // die
+            {
+                switch (urand(0, 5))
+                {
+                case 0: DoScriptText(SAY_DIE_1, pCreature, pPlayer); break;
+                case 1: DoScriptText(SAY_DIE_2, pCreature, pPlayer); break;
+                case 2: DoScriptText(SAY_DIE_3, pCreature, pPlayer); break;
+                case 3: DoScriptText(SAY_DIE_4, pCreature, pPlayer); break;
+                case 4: DoScriptText(SAY_DIE_5, pCreature, pPlayer); break;
+                case 5: DoScriptText(SAY_DIE_6, pCreature, pPlayer); break;
+                }
+            }
+            else                                                // survive
+            {
+                switch (urand(0, 3))
+                {
+                case 0: DoScriptText(SAY_RESCUE_1, pCreature, pPlayer); break;
+                case 1: DoScriptText(SAY_RESCUE_2, pCreature, pPlayer); break;
+                case 2: DoScriptText(SAY_RESCUE_3, pCreature, pPlayer); break;
+                case 3: DoScriptText(SAY_RESCUE_4, pCreature, pPlayer); break;
+                }
+
+                pCreature->CastSpell(pPlayer, SPELL_MOSSWALKER_QUEST_CREDIT, true);
+            }
+
+            // more details may apply, instead of just despawn
+            pCreature->ForcedDespawn(5000);
+        }
+        return true;
+    }
+};
+
+/*######
+## npc_tipsy_mcmanus
+######*/
+
+enum
+{
+    SAY_DISTILLATION_START          = -1001125,
+    SAY_ADD_ORANGE                  = -1001126,
+    SAY_ADD_BANANAS                 = -1001127,
+    SAY_ADD_PAPAYA                  = -1001128,
+    SAY_LIGHT_BRAZIER               = -1001129,
+    SAY_OPEN_VALVE                  = -1001130,
+    SAY_ACTION_COMPLETE_1           = -1001131,
+    SAY_ACTION_COMPLETE_2           = -1001132,
+    SAY_ACTION_COMPLETE_3           = -1001133,
+    SAY_ACTION_COMPLETE_4           = -1001134,
+    SAY_DISTILLATION_FAIL           = -1001135,
+    SAY_DISTILLATION_COMPLETE       = -1001136,
+
+    GOSSIP_ITEM_TIPSY_MCMANUS       = -3000114,
+    TEXT_ID_READY                   = 13288,
+    QUEST_ID_STILL_AT_IT            = 12644,
+
+    SPELL_TOSS_ORANGE               = 51931,
+    SPELL_TOSS_BANANA               = 51932,
+    SPELL_TOSS_PAPAYA               = 51933,
+
+    NPC_WANTS_ORANGE_TRIGGER        = 28535,
+    NPC_WANTS_PAPAYA_TRIGGER        = 28536,
+    NPC_WANTS_BANANA_TRIGGER        = 28537,
+    // NPC_STEAMING_VALVE_TRIGGER   = 28539,
+    // NPC_WANTS_FIRE_TRIGGER       = 28540,
+    NPC_TIPSY_MCMANUS               = 28566,
+
+    GO_THUNDERBREW_JUNGLE_PUNCH     = 190643,
+    GO_PRESSURE_VALVE               = 190635,
+    GO_BRAZIER                      = 190636,
+};
+
+struct StillAtItData
+{
+    int32 iText;
+    uint32 uiOwnerEntry;
+};
+
+static const StillAtItData aStillAtItFruits[3] =
+{
+    {SAY_ADD_ORANGE,     NPC_WANTS_ORANGE_TRIGGER},
+    {SAY_ADD_BANANAS,    NPC_WANTS_BANANA_TRIGGER},
+    {SAY_ADD_PAPAYA,     NPC_WANTS_PAPAYA_TRIGGER},
+};
+
+static const StillAtItData aStillAtItMachines[2] =
+{
+    {SAY_LIGHT_BRAZIER,  GO_BRAZIER},
+    {SAY_OPEN_VALVE,     GO_PRESSURE_VALVE},
+};
+
+struct npc_tipsy_mcmanus : public CreatureScript
+{
+    npc_tipsy_mcmanus() : CreatureScript("npc_tipsy_mcmanus") {}
+
+    struct npc_tipsy_mcmanusAI : public ScriptedAI
+    {
+        npc_tipsy_mcmanusAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint8 m_uiTaskIndex;
+        uint32 m_uiTaskOwnerEntry;
+        uint32 m_uiTaskTimer;
+        uint32 m_uiActionTimer;
+
+        void Reset() override
+        {
+            m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+
+            m_uiTaskIndex = 0;
+            m_uiTaskOwnerEntry = 0;
+            m_uiTaskTimer = 0;
+            m_uiActionTimer = 0;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (pInvoker->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            // start event
+            if (eventType == AI_EVENT_START_EVENT)
+            {
+                m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                DoScriptText(SAY_DISTILLATION_START, m_creature);
+                m_uiTaskTimer = 5000;
+            }
+            // check fruit tasks
+            else if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                for (uint8 i = 0; i < 3; ++i)
+                {
+                    if (aStillAtItFruits[i].uiOwnerEntry == uiMiscValue)
+                        DoCheckDistillationTask(uiMiscValue);
+                }
+            }
+            // check machine tasks
+            else if (eventType == AI_EVENT_CUSTOM_B)
+            {
+                for (uint8 i = 0; i < 2; ++i)
+                {
+                    if (aStillAtItMachines[i].uiOwnerEntry == uiMiscValue)
+                        DoCheckDistillationTask(uiMiscValue);
+                }
+            }
+        }
+
+        // wrapper to complete a distillation task
+        void DoCheckDistillationTask(uint32 uiOwnerEntry)
+        {
+            // check if the given entry matches the expected one
+            if (uiOwnerEntry == m_uiTaskOwnerEntry)
+            {
+                switch (urand(0, 3))
+                {
+                case 0: DoScriptText(SAY_ACTION_COMPLETE_1, m_creature); break;
+                case 1: DoScriptText(SAY_ACTION_COMPLETE_2, m_creature); break;
+                case 2: DoScriptText(SAY_ACTION_COMPLETE_3, m_creature); break;
+                case 3: DoScriptText(SAY_ACTION_COMPLETE_4, m_creature); break;
+                }
+
+                m_uiTaskTimer = 6000;
+                m_uiActionTimer = 0;
+            }
+            // reset if failed
+            else
+            {
+                DoScriptText(SAY_DISTILLATION_FAIL, m_creature);
+                EnterEvadeMode();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiTaskTimer)
+            {
+                if (m_uiTaskTimer <= uiDiff)
+                {
+                    switch (m_uiTaskIndex)
+                    {
+                        // fruit tasks
+                    case 0:
+                    case 1:
+                    case 3:
+                    case 6:
+                    case 7:
+                    {
+                              uint8 uiIndex = urand(0, 2);
+                              DoScriptText(aStillAtItFruits[uiIndex].iText, m_creature);
+                              m_uiTaskOwnerEntry = aStillAtItFruits[uiIndex].uiOwnerEntry;
+
+                              m_uiTaskTimer = 0;
+                              m_uiActionTimer = 5000;
+                              break;
+                    }
+                        // valve or fire task
+                    case 2:
+                    case 4:
+                    case 5:
+                    case 8:
+                    {
+                              uint8 uiIndex = urand(0, 1);
+                              DoScriptText(aStillAtItMachines[uiIndex].iText, m_creature);
+                              m_uiTaskOwnerEntry = aStillAtItMachines[uiIndex].uiOwnerEntry;
+
+                              m_uiTaskTimer = 0;
+                              m_uiActionTimer = 5000;
+                              break;
+                    }
+                        // complete event
+                    case 9:
+                        DoScriptText(SAY_DISTILLATION_COMPLETE, m_creature);
+                        if (GameObject* pPunch = GetClosestGameObjectWithEntry(m_creature, GO_THUNDERBREW_JUNGLE_PUNCH, 10.0f))
+                        {
+                            pPunch->SetRespawnTime(30);
+                            pPunch->Refresh();
+                        }
+                        m_uiTaskTimer = 20000;
+                        break;
+                    case 10:
+                        EnterEvadeMode();
+                        m_uiTaskTimer = 0;
+                        break;
+                    }
+                    ++m_uiTaskIndex;
+                }
+                else
+                    m_uiTaskTimer -= uiDiff;
+            }
+
+            // timer delay to allow player to complete the task
+            if (m_uiActionTimer)
+            {
+                if (m_uiActionTimer <= uiDiff)
+                {
+                    DoScriptText(SAY_DISTILLATION_FAIL, m_creature);
+                    EnterEvadeMode();
+                    m_uiActionTimer = 0;
+                }
+                else
+                    m_uiActionTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_tipsy_mcmanusAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_ID_STILL_AT_IT) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TIPSY_MCMANUS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+
+        pPlayer->SEND_GOSSIP_MENU(TEXT_ID_READY, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        if (uiAction != GOSSIP_ACTION_INFO_DEF + 1)
+            return false;
+
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pCreature->AI()->SendAIEvent(AI_EVENT_START_EVENT, pPlayer, pCreature);
+        return true;
+    }
+};
+
+/*######
+## npc_wants_fruit_credit
+######*/
+
+struct spell_toss_fruit : public SpellScript
+{
+    spell_toss_fruit() : SpellScript("spell_toss_fruit") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if ((uiSpellId == SPELL_TOSS_ORANGE || uiSpellId == SPELL_TOSS_BANANA || uiSpellId == SPELL_TOSS_PAPAYA) && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+            if (pCaster->GetTypeId() == TYPEID_PLAYER && ((Player*)pCaster)->GetQuestStatus(QUEST_ID_STILL_AT_IT) == QUEST_STATUS_INCOMPLETE)
+            {
+                if (Creature* pTipsyMcmanus = GetClosestCreatureWithEntry(pCaster, NPC_TIPSY_MCMANUS, 2 * INTERACTION_DISTANCE))
+                {
+                    pCreatureTarget->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pTipsyMcmanus, pCreatureTarget->GetEntry());
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+};
+
+/*######
+## go_quest_still_at_it_credit
+######*/
+
+struct go_quest_still_at_it_credit : public GameObjectScript
+{
+    go_quest_still_at_it_credit() : GameObjectScript("go_quest_still_at_it_credit") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_ID_STILL_AT_IT) != QUEST_STATUS_INCOMPLETE)
+            return true;
+
+        if (Creature* pTipsyMcmanus = GetClosestCreatureWithEntry(pPlayer, NPC_TIPSY_MCMANUS, 2 * INTERACTION_DISTANCE))
+            pTipsyMcmanus->AI()->SendAIEvent(AI_EVENT_CUSTOM_B, pPlayer, pTipsyMcmanus, pGo->GetEntry());
+
+        return false;
+    }
+};
+
+void AddSC_sholazar_basin()
+{
+    Script* s;
+
+    s = new npc_helice();
+    s->RegisterSelf();
+    s = new npc_injured_rainspeaker();
+    s->RegisterSelf();
+    s = new npc_mosswalker_victim();
+    s->RegisterSelf();
+    s = new npc_tipsy_mcmanus();
+    s->RegisterSelf();
+
+    s = new go_quest_still_at_it_credit();
+    s->RegisterSelf();
+
+    s = new spell_toss_fruit();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_helice";
+    //pNewScript->GetAI = &GetAI_npc_helice;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_helice;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_injured_rainspeaker";
+    //pNewScript->GetAI = &GetAI_npc_injured_rainspeaker;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_injured_rainspeaker;
+    //// pNewScript->pGossipHello = &GossipHello_npc_injured_rainspeaker;
+    //// pNewScript->pGossipSelect = &GossipSelect_npc_injured_rainspeaker;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_mosswalker_victim";
+    //pNewScript->pGossipHello = &GossipHello_npc_mosswalker_victim;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_mosswalker_victim;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_tipsy_mcmanus";
+    //pNewScript->GetAI = &GetAI_npc_tipsy_mcmanus;
+    //pNewScript->pGossipHello = &GossipHello_npc_tipsy_mcmanus;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_tipsy_mcmanus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_wants_fruit_credit";
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_wants_fruit_credit;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_quest_still_at_it_credit";
+    //pNewScript->pGOUse = &GOUse_go_quest_still_at_it_credit;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/storm_peaks.cpp b/src/modules/SD3/scripts/northrend/storm_peaks.cpp
new file mode 100644
index 000000000..1220b0bdd
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/storm_peaks.cpp
@@ -0,0 +1,274 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Storm_Peaks
+SD%Complete: 100
+SDComment: Quest support: 12831, 12977.
+SDCategory: Storm Peaks
+EndScriptData */
+
+/* ContentData
+npc_floating_spirit
+npc_restless_frostborn
+npc_injured_miner
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_floating_spirit
+######*/
+
+enum
+{
+    SPELL_BLOW_HODIRS_HORN              = 55983,
+    SPELL_SUMMON_FROST_GIANG_SPIRIT     = 55986,
+    SPELL_SUMMON_FROST_WARRIOR_SPIRIT   = 55991,
+    SPELL_SUMMON_FROST_GHOST_SPIRIT     = 55992,
+
+    NPC_FROST_GIANT_GHOST_KC            = 30138,
+    NPC_FROST_DWARF_GHOST_KC            = 30139,
+
+    NPC_NIFFELEM_FOREFATHER             = 29974,
+    NPC_FROSTBORN_WARRIOR               = 30135,
+    NPC_FROSTBORN_GHOST                 = 30144,
+};
+
+struct npc_floating_spirit : public CreatureScript
+{
+    npc_floating_spirit() : CreatureScript("npc_floating_spirit") {}
+
+    struct npc_floating_spiritAI : public ScriptedAI
+    {
+        npc_floating_spiritAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void Reset() override
+        {
+            // Simple animation for the floating spirit
+            m_creature->SetLevitate(true);
+            m_creature->ForcedDespawn(5000);
+
+            m_creature->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() + 50.0f);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_floating_spiritAI(pCreature);
+    }
+};
+
+/*######
+## npc_restless_frostborn
+######*/
+
+struct spell_blow_hodir_horn : public SpellScript
+{
+    spell_blow_hodir_horn() : SpellScript("spell_blow_hodir_horn") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        Creature* pCreatureTarget = pTarget->ToCreature();
+        if (uiSpellId == SPELL_BLOW_HODIRS_HORN && uiEffIndex == EFFECT_INDEX_0 && !pCreatureTarget->IsAlive() && pCaster->GetTypeId() == TYPEID_PLAYER)
+        {
+            uint32 uiCredit = 0;
+            uint32 uiSpawnSpell = 0;
+            switch (pCreatureTarget->GetEntry())
+            {
+            case NPC_NIFFELEM_FOREFATHER:
+                uiCredit = NPC_FROST_GIANT_GHOST_KC;
+                uiSpawnSpell = SPELL_SUMMON_FROST_GIANG_SPIRIT;
+                break;
+            case NPC_FROSTBORN_WARRIOR:
+                uiCredit = NPC_FROST_DWARF_GHOST_KC;
+                uiSpawnSpell = SPELL_SUMMON_FROST_WARRIOR_SPIRIT;
+                break;
+            case NPC_FROSTBORN_GHOST:
+                uiCredit = NPC_FROST_DWARF_GHOST_KC;
+                uiSpawnSpell = SPELL_SUMMON_FROST_GHOST_SPIRIT;
+                break;
+            }
+
+            // spawn the spirit and give the credit; spirit animation is handled by the script above
+            pCaster->CastSpell(pCaster, uiSpawnSpell, true);
+            ((Player*)pCaster)->KilledMonsterCredit(uiCredit);
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_injured_miner
+######*/
+
+enum
+{
+    // yells
+    SAY_MINER_READY                     = -1001051,
+    SAY_MINER_COMPLETE                  = -1001052,
+
+    // gossip
+    GOSSIP_ITEM_ID_READY                = -3000112,
+    TEXT_ID_POISONED                    = 13650,
+    TEXT_ID_READY                       = 13651,
+
+    // misc
+    SPELL_FEIGN_DEATH                   = 51329,
+    QUEST_ID_BITTER_DEPARTURE           = 12832,
+};
+
+struct npc_injured_miner : public CreatureScript
+{
+    npc_injured_miner() : CreatureScript("npc_injured_miner") {}
+
+    struct npc_injured_minerAI : public npc_escortAI
+    {
+        npc_injured_minerAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void Reset() override { }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                Start(true, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+                SetEscortPaused(true);
+
+                // set alternative waypoints if required
+                if (m_creature->GetPositionX() > 6650.0f)
+                    SetCurrentWaypoint(7);
+                else if (m_creature->GetPositionX() > 6635.0f)
+                    SetCurrentWaypoint(35);
+
+                DoScriptText(SAY_MINER_READY, m_creature);
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                m_creature->RemoveAurasDueToSpell(SPELL_FEIGN_DEATH);
+                m_creature->SetFactionTemporary(FACTION_ESCORT_N_FRIEND_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+            }
+            else if (eventType == AI_EVENT_CUSTOM_A && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                SetEscortPaused(false);
+                m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 33:
+                DoScriptText(SAY_MINER_COMPLETE, m_creature);
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_ID_BITTER_DEPARTURE, m_creature);
+                    m_creature->SetFacingToObject(pPlayer);
+                }
+                break;
+            case 34:
+                m_creature->ForcedDespawn();
+                break;
+            case 46:
+                // merge with the other wp path
+                SetEscortPaused(true);
+                SetCurrentWaypoint(13);
+                SetEscortPaused(false);
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_injured_minerAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+
+        if (!pCreature->HasAura(SPELL_FEIGN_DEATH))
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ID_READY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_READY, pCreature->GetObjectGuid());
+            return true;
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(TEXT_ID_POISONED, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pCreature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pPlayer, pCreature);
+        }
+
+        return true;
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_BITTER_DEPARTURE)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_storm_peaks()
+{
+    Script* s;
+
+    s = new npc_floating_spirit();
+    s->RegisterSelf();
+    s = new npc_injured_miner();
+    s->RegisterSelf();
+
+    s = new spell_blow_hodir_horn();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_floating_spirit";
+    //pNewScript->GetAI = &GetAI_npc_floating_spirit;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_restless_frostborn";
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_restless_frostborn;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_injured_miner";
+    //pNewScript->GetAI = &GetAI_npc_injured_miner;
+    //pNewScript->pGossipHello = &GossipHello_npc_injured_miner;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_injured_miner;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_injured_miner;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp b/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp
new file mode 100644
index 000000000..a90e7800f
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp
@@ -0,0 +1,403 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss General Bjarngrim
+SD%Complete: 90%
+SDComment: Waypoint needed, we expect boss to always have 2x Stormforged Lieutenant following
+SDCategory: Halls of Lightning
+EndScriptData */
+
+#include "precompiled.h"
+#include "halls_of_lightning.h"
+
+enum
+{
+    // Yell
+    SAY_AGGRO                               = -1602000,
+    SAY_SLAY_1                              = -1602001,
+    SAY_SLAY_2                              = -1602002,
+    SAY_SLAY_3                              = -1602003,
+    SAY_DEATH                               = -1602004,
+    SAY_BATTLE_STANCE                       = -1602005,
+    EMOTE_BATTLE_STANCE                     = -1602006,
+    SAY_BERSEKER_STANCE                     = -1602007,
+    EMOTE_BERSEKER_STANCE                   = -1602008,
+    SAY_DEFENSIVE_STANCE                    = -1602009,
+    EMOTE_DEFENSIVE_STANCE                  = -1602010,
+
+    SPELL_DEFENSIVE_STANCE                  = 53790,
+    SPELL_SPELL_REFLECTION                  = 36096,
+    SPELL_PUMMEL                            = 12555,
+    SPELL_KNOCK_AWAY                        = 52029,
+    SPELL_IRONFORM                          = 52022,
+
+    SPELL_BERSEKER_STANCE                   = 53791,
+    SPELL_INTERCEPT                         = 58769,
+    SPELL_WHIRLWIND                         = 52027,
+    SPELL_CLEAVE                            = 15284,
+
+    SPELL_BATTLE_STANCE                     = 53792,
+    SPELL_MORTAL_STRIKE                     = 16856,
+    SPELL_SLAM                              = 52026,
+
+    // Other spells - handled by DB wp movement script
+    // SPELL_CHARGE_UP                      = 52098,        // only used when starting walk from one platform to the other
+    SPELL_TEMPORARY_ELECTRICAL_CHARGE       = 52092,        // triggered part of above
+
+    NPC_STORMFORGED_LIEUTENANT              = 29240,
+    SPELL_ARC_WELD                          = 59085,
+    SPELL_RENEW_STEEL_N                     = 52774,
+    SPELL_RENEW_STEEL_H                     = 59160,
+
+    STANCE_DEFENSIVE                        = 0,
+    STANCE_BERSERKER                        = 1,
+    STANCE_BATTLE                           = 2
+};
+
+/*######
+## boss_bjarngrim
+######*/
+
+struct boss_bjarngrim : public CreatureScript
+{
+    boss_bjarngrim() : CreatureScript("boss_bjarngrim") {}
+
+    struct boss_bjarngrimAI : public ScriptedAI
+    {
+        boss_bjarngrimAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_uiStance = STANCE_DEFENSIVE;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bIsRegularMode;
+        bool m_bIsChangingStance;
+
+        uint8 m_uiChargingStatus;
+        uint8 m_uiStance;
+
+        uint32 m_uiChargeTimer;
+        uint32 m_uiChangeStanceTimer;
+
+        uint32 m_uiReflectionTimer;
+        uint32 m_uiKnockAwayTimer;
+        uint32 m_uiPummelTimer;
+        uint32 m_uiIronformTimer;
+
+        uint32 m_uiInterceptTimer;
+        uint32 m_uiWhirlwindTimer;
+        uint32 m_uiCleaveTimer;
+
+        uint32 m_uiMortalStrikeTimer;
+        uint32 m_uiSlamTimer;
+
+        void Reset() override
+        {
+            m_bIsChangingStance = false;
+
+            m_uiChargingStatus = 0;
+            m_uiChargeTimer = 1000;
+
+            m_uiChangeStanceTimer = urand(20000, 25000);
+
+            m_uiReflectionTimer = 8000;
+            m_uiKnockAwayTimer = 20000;
+            m_uiPummelTimer = 10000;
+            m_uiIronformTimer = 25000;
+
+            m_uiInterceptTimer = 5000;
+            m_uiWhirlwindTimer = 10000;
+            m_uiCleaveTimer = 8000;
+
+            m_uiMortalStrikeTimer = 8000;
+            m_uiSlamTimer = 10000;
+
+            if (m_uiStance != STANCE_DEFENSIVE)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_DEFENSIVE_STANCE);
+                m_uiStance = STANCE_DEFENSIVE;
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                // Set the achiev in progress
+                if (m_creature->HasAura(SPELL_TEMPORARY_ELECTRICAL_CHARGE))
+                    m_pInstance->SetData(TYPE_BJARNGRIM, SPECIAL);
+
+                m_pInstance->SetData(TYPE_BJARNGRIM, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_BJARNGRIM, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_BJARNGRIM, FAIL);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Change stance
+            if (m_uiChangeStanceTimer < uiDiff)
+            {
+                // wait for current spell to finish before change stance
+                if (m_creature->IsNonMeleeSpellCasted(false))
+                    return;
+
+                int uiTempStance = rand() % (3 - 1);
+
+                if (uiTempStance >= m_uiStance)
+                    ++uiTempStance;
+
+                m_uiStance = uiTempStance;
+
+                switch (m_uiStance)
+                {
+                case STANCE_DEFENSIVE:
+                    DoScriptText(SAY_DEFENSIVE_STANCE, m_creature);
+                    DoScriptText(EMOTE_DEFENSIVE_STANCE, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_DEFENSIVE_STANCE);
+                    break;
+                case STANCE_BERSERKER:
+                    DoScriptText(SAY_BERSEKER_STANCE, m_creature);
+                    DoScriptText(EMOTE_BERSEKER_STANCE, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_BERSEKER_STANCE);
+                    break;
+                case STANCE_BATTLE:
+                    DoScriptText(SAY_BATTLE_STANCE, m_creature);
+                    DoScriptText(EMOTE_BATTLE_STANCE, m_creature);
+                    DoCastSpellIfCan(m_creature, SPELL_BATTLE_STANCE);
+                    break;
+                }
+
+                m_uiChangeStanceTimer = urand(20000, 25000);
+                return;
+            }
+            else
+                m_uiChangeStanceTimer -= uiDiff;
+
+            switch (m_uiStance)
+            {
+            case STANCE_DEFENSIVE:
+                if (m_uiReflectionTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SPELL_REFLECTION) == CAST_OK)
+                        m_uiReflectionTimer = urand(8000, 9000);
+                }
+                else
+                    m_uiReflectionTimer -= uiDiff;
+
+                if (m_uiKnockAwayTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_KNOCK_AWAY) == CAST_OK)
+                        m_uiKnockAwayTimer = urand(20000, 21000);
+                }
+                else
+                    m_uiKnockAwayTimer -= uiDiff;
+
+                if (m_uiPummelTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_PUMMEL) == CAST_OK)
+                        m_uiPummelTimer = urand(10000, 11000);
+                }
+                else
+                    m_uiPummelTimer -= uiDiff;
+
+                if (m_uiIronformTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_IRONFORM) == CAST_OK)
+                        m_uiIronformTimer = urand(25000, 26000);
+                }
+                else
+                    m_uiIronformTimer -= uiDiff;
+
+                break;
+            case STANCE_BERSERKER:
+                if (m_uiInterceptTimer < uiDiff)
+                {
+                    // not much point is this, better random target and more often?
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_INTERCEPT) == CAST_OK)
+                        m_uiInterceptTimer = urand(45000, 46000);
+                }
+                else
+                    m_uiInterceptTimer -= uiDiff;
+
+                if (m_uiWhirlwindTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_WHIRLWIND) == CAST_OK)
+                        m_uiWhirlwindTimer = urand(10000, 11000);
+                }
+                else
+                    m_uiWhirlwindTimer -= uiDiff;
+
+                if (m_uiCleaveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                        m_uiCleaveTimer = urand(8000, 9000);
+                }
+                else
+                    m_uiCleaveTimer -= uiDiff;
+
+                break;
+            case STANCE_BATTLE:
+                if (m_uiMortalStrikeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MORTAL_STRIKE) == CAST_OK)
+                        m_uiMortalStrikeTimer = urand(20000, 21000);
+                }
+                else
+                    m_uiMortalStrikeTimer -= uiDiff;
+
+                if (m_uiSlamTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SLAM) == CAST_OK)
+                        m_uiSlamTimer = urand(15000, 16000);
+                }
+                else
+                    m_uiSlamTimer -= uiDiff;
+
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_bjarngrimAI(pCreature);
+    }
+};
+
+/*######
+## mob_stormforged_lieutenant
+######*/
+
+struct mob_stormforged_lieutenant : public CreatureScript
+{
+    mob_stormforged_lieutenant() : CreatureScript("mob_stormforged_lieutenant") {}
+
+    struct mob_stormforged_lieutenantAI : public ScriptedAI
+    {
+        mob_stormforged_lieutenantAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiArcWeldTimer;
+        uint32 m_uiRenewSteelTimer;
+
+        void Reset() override
+        {
+            m_uiArcWeldTimer = urand(20000, 21000);
+            m_uiRenewSteelTimer = urand(10000, 11000);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiArcWeldTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ARC_WELD) == CAST_OK)
+                    m_uiArcWeldTimer = urand(20000, 21000);
+            }
+            else
+                m_uiArcWeldTimer -= uiDiff;
+
+            if (m_uiRenewSteelTimer < uiDiff)
+            {
+                if (m_pInstance)
+                {
+                    if (Creature* pBjarngrim = m_pInstance->GetSingleCreatureFromStorage(NPC_BJARNGRIM))
+                    {
+                        if (pBjarngrim->IsAlive())
+                            DoCastSpellIfCan(pBjarngrim, m_bIsRegularMode ? SPELL_RENEW_STEEL_N : SPELL_RENEW_STEEL_H);
+                    }
+                }
+                m_uiRenewSteelTimer = urand(10000, 14000);
+            }
+            else
+                m_uiRenewSteelTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_stormforged_lieutenantAI(pCreature);
+    }
+};
+
+void AddSC_boss_bjarngrim()
+{
+    Script* s;
+
+    s = new boss_bjarngrim();
+    s->RegisterSelf();
+    s = new mob_stormforged_lieutenant();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_bjarngrim";
+    //pNewScript->GetAI = &GetAI_boss_bjarngrim;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_stormforged_lieutenant";
+    //pNewScript->GetAI = &GetAI_mob_stormforged_lieutenant;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp b/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp
new file mode 100644
index 000000000..cf749117b
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp
@@ -0,0 +1,432 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss Ionar
+SD%Complete: 80%
+SDComment: Timer check
+SDCategory: Halls of Lightning
+EndScriptData */
+
+#include "precompiled.h"
+#include "halls_of_lightning.h"
+
+enum
+{
+    SAY_AGGRO                               = -1602011,
+    SAY_SLAY_1                              = -1602012,
+    SAY_SLAY_2                              = -1602013,
+    SAY_SLAY_3                              = -1602014,
+    SAY_DEATH                               = -1602015,
+    SAY_SPLIT_1                             = -1602016,
+    SAY_SPLIT_2                             = -1602017,
+
+    SPELL_BALL_LIGHTNING_N                  = 52780,
+    SPELL_BALL_LIGHTNING_H                  = 59800,
+    SPELL_STATIC_OVERLOAD_N                 = 52658,
+    SPELL_STATIC_OVERLOAD_H                 = 59795,
+
+    SPELL_DISPERSE                          = 52770,
+    SPELL_SUMMON_SPARK                      = 52746,
+    SPELL_SPARK_DESPAWN                     = 52776,
+
+    // Spark of Ionar
+    SPELL_SPARK_VISUAL_TRIGGER_N            = 52667,
+    SPELL_SPARK_VISUAL_TRIGGER_H            = 59833,
+
+    NPC_SPARK_OF_IONAR                      = 28926,
+
+    MAX_SPARKS                              = 5,
+    POINT_CALLBACK                          = 0
+};
+
+/*######
+## Boss Ionar
+######*/
+
+struct boss_ionar : public CreatureScript
+{
+    boss_ionar() : CreatureScript("boss_ionar") {}
+
+    struct boss_ionarAI : public ScriptedAI
+    {
+        boss_ionarAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        GuidList m_lSparkGUIDList;
+
+        bool m_bIsRegularMode;
+
+        bool m_bIsDesperseCasting;
+        bool m_bIsSplitPhase;
+        uint32 m_uiSplitTimer;
+        uint32 m_uiSparkAtHomeCount;
+
+        uint32 m_uiStaticOverloadTimer;
+        uint32 m_uiBallLightningTimer;
+
+        uint32 m_uiHealthAmountModifier;
+
+        void Reset() override
+        {
+            m_bIsSplitPhase = true;
+            m_bIsDesperseCasting = false;
+            m_uiSplitTimer = 25000;
+            m_uiSparkAtHomeCount = 0;
+
+            m_uiStaticOverloadTimer = urand(5000, 6000);
+            m_uiBallLightningTimer = urand(10000, 11000);
+
+            m_uiHealthAmountModifier = 1;
+
+            if (m_creature->GetVisibility() == VISIBILITY_OFF)
+                m_creature->SetVisibility(VISIBILITY_ON);
+        }
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            if (m_creature->getVictim())
+                return;
+
+            if (m_creature->GetVisibility() == VISIBILITY_OFF)
+                return;
+
+            AttackStart(pAttacker);
+        }
+
+        void Aggro(Unit* /*who*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_IONAR, IN_PROGRESS);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_IONAR, FAIL);
+
+            DespawnSpark();
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+
+                if (m_creature->GetVisibility() != VISIBILITY_OFF)
+                    m_creature->GetMotionMaster()->MoveChase(pWho);
+            }
+        }
+
+        void JustDied(Unit* /*killer*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+            DespawnSpark();
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_IONAR, DONE);
+        }
+
+        void KilledUnit(Unit* /*victim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* sender, Unit* invoker, uint32 /**/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && sender == invoker)
+                DespawnSpark();
+            else if (eventType == AI_EVENT_CUSTOM_B && sender != invoker)
+                RegisterSparkAtHome();
+        }
+
+        void DespawnSpark()
+        {
+            for (GuidList::const_iterator itr = m_lSparkGUIDList.begin(); itr != m_lSparkGUIDList.end(); ++itr)
+            {
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    if (pTemp->IsAlive())
+                        pTemp->ForcedDespawn();
+                }
+            }
+
+            m_lSparkGUIDList.clear();
+        }
+
+        // make sparks come back
+        void CallBackSparks()
+        {
+            for (GuidList::const_iterator itr = m_lSparkGUIDList.begin(); itr != m_lSparkGUIDList.end(); ++itr)
+            {
+                if (Creature* pSpark = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    if (pSpark->IsAlive())
+                    {
+                        // Required to prevent combat movement, elsewise they might switch movement on aggro-change
+                        if (ScriptedAI* pSparkAI = dynamic_cast<ScriptedAI*>(pSpark->AI()))
+                            pSparkAI->SetCombatMovement(false);
+
+                        pSpark->GetMotionMaster()->MovePoint(POINT_CALLBACK, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+                    }
+                }
+            }
+        }
+
+        void RegisterSparkAtHome()
+        {
+            ++m_uiSparkAtHomeCount;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SPARK_OF_IONAR)
+            {
+                pSummoned->CastSpell(pSummoned, m_bIsRegularMode ? SPELL_SPARK_VISUAL_TRIGGER_N : SPELL_SPARK_VISUAL_TRIGGER_H, true);
+
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    pSummoned->AI()->AttackStart(pTarget);
+
+                m_lSparkGUIDList.push_back(pSummoned->GetObjectGuid());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // Splitted
+            if (m_creature->GetVisibility() == VISIBILITY_OFF)
+            {
+                if (m_uiSplitTimer < uiDiff)
+                {
+                    m_uiSplitTimer = 2500;
+
+                    // Return sparks to where Ionar splitted
+                    if (m_bIsSplitPhase)
+                    {
+                        CallBackSparks();
+                        m_bIsSplitPhase = false;
+                    }
+                    // Lightning effect and restore Ionar
+                    else if (m_uiSparkAtHomeCount == MAX_SPARKS)
+                    {
+                        m_creature->SetVisibility(VISIBILITY_ON);
+                        DoCastSpellIfCan(m_creature, SPELL_SPARK_DESPAWN);
+
+                        m_uiSparkAtHomeCount = 0;
+                        m_uiSplitTimer = 25000;
+                        m_bIsSplitPhase = true;
+                        m_bIsDesperseCasting = false;
+
+                        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
+                        {
+                            if (m_creature->getVictim())
+                                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                        }
+                    }
+                }
+                else
+                    m_uiSplitTimer -= uiDiff;
+
+                return;
+            }
+
+            if (m_uiStaticOverloadTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_STATIC_OVERLOAD_N : SPELL_STATIC_OVERLOAD_H) == CAST_OK)
+                        m_uiStaticOverloadTimer = urand(5000, 6000);
+                }
+            }
+            else
+                m_uiStaticOverloadTimer -= uiDiff;
+
+            if (m_uiBallLightningTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_BALL_LIGHTNING_N : SPELL_BALL_LIGHTNING_H) == CAST_OK)
+                        m_uiBallLightningTimer = urand(10000, 11000);
+                }
+            }
+            else
+                m_uiBallLightningTimer -= uiDiff;
+
+            // Health check
+            if (m_creature->GetHealthPercent() < float(100 - 20 * m_uiHealthAmountModifier))
+            {
+                ++m_uiHealthAmountModifier;
+
+                if (!m_bIsDesperseCasting && DoCastSpellIfCan(m_creature, SPELL_DISPERSE, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_SPLIT_1 : SAY_SPLIT_2, m_creature);
+                    m_bIsDesperseCasting = true;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ionarAI(pCreature);
+    }
+};
+
+struct spell_ionar_disperse : public SpellScript
+{
+    spell_ionar_disperse() : SpellScript("spell_ionar_disperse") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_DISPERSE && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+            if (pCreatureTarget->GetEntry() != NPC_IONAR)
+                return true;
+
+            for (uint8 i = 0; i < MAX_SPARKS; ++i)
+                pCreatureTarget->CastSpell(pCreatureTarget, SPELL_SUMMON_SPARK, true);
+
+            pCreatureTarget->AttackStop();
+            pCreatureTarget->SetVisibility(VISIBILITY_OFF);
+
+            if (pCreatureTarget->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
+                pCreatureTarget->GetMotionMaster()->MovementExpired();
+
+            return true;
+        }
+        return false;
+    }
+};
+
+struct spell_ionar_spark_despawn : public SpellScript
+{
+    spell_ionar_spark_despawn() : SpellScript("spell_ionar_spark_despawn") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_SPARK_DESPAWN && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+            if (pCreatureTarget->GetEntry() != NPC_IONAR)
+                return true;
+
+            if (CreatureAI* pIonarAI = pCreatureTarget->AI())
+                pIonarAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pCreatureTarget, pCreatureTarget, 0);
+
+            return true;
+        }
+    return false;
+    }
+};
+
+/*######
+## mob_spark_of_ionar
+######*/
+
+struct mob_spark_of_ionar : public CreatureScript
+{
+    mob_spark_of_ionar() : CreatureScript("mob_spark_of_ionar") {}
+
+    struct mob_spark_of_ionarAI : public ScriptedAI
+    {
+        mob_spark_of_ionarAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override { }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || !m_pInstance)
+                return;
+
+            if (uiPointId == POINT_CALLBACK)
+            {
+                if (Creature* pIonar = m_pInstance->GetSingleCreatureFromStorage(NPC_IONAR))
+                {
+                    if (!pIonar->IsAlive())
+                    {
+                        m_creature->ForcedDespawn();
+                        return;
+                    }
+
+                    if (CreatureAI* pIonarAI = pIonar->AI())
+                        pIonarAI->ReceiveAIEvent(AI_EVENT_CUSTOM_B, pIonar, m_creature, 0);
+                }
+                else
+                    m_creature->ForcedDespawn();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_spark_of_ionarAI(pCreature);
+    }
+};
+
+void AddSC_boss_ionar()
+{
+    Script* s;
+
+    s = new boss_ionar();
+    s->RegisterSelf();
+    s = new mob_spark_of_ionar();
+    s->RegisterSelf();
+
+    s = new spell_ionar_disperse();
+    s->RegisterSelf();
+    s = new spell_ionar_spark_despawn();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ionar";
+    //pNewScript->GetAI = &GetAI_boss_ionar;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_boss_ionar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_spark_of_ionar";
+    //pNewScript->GetAI = &GetAI_mob_spark_of_ionar;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp b/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp
new file mode 100644
index 000000000..7dbcad918
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp
@@ -0,0 +1,192 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss Loken
+SD%Complete: 80%
+SDComment: Missing intro.
+SDCategory: Halls of Lightning
+EndScriptData */
+
+#include "precompiled.h"
+#include "halls_of_lightning.h"
+
+enum
+{
+    SAY_AGGRO                           = -1602018,
+    SAY_INTRO_1                         = -1602019,
+    SAY_INTRO_2                         = -1602020,
+    SAY_SLAY_1                          = -1602021,
+    SAY_SLAY_2                          = -1602022,
+    SAY_SLAY_3                          = -1602023,
+    SAY_DEATH                           = -1602024,
+    SAY_NOVA_1                          = -1602025,
+    SAY_NOVA_2                          = -1602026,
+    SAY_NOVA_3                          = -1602027,
+    SAY_75HEALTH                        = -1602028,
+    SAY_50HEALTH                        = -1602029,
+    SAY_25HEALTH                        = -1602030,
+    EMOTE_NOVA                          = -1602031,
+
+    SPELL_ARC_LIGHTNING                 = 52921,
+    SPELL_LIGHTNING_NOVA                = 52960,
+    SPELL_LIGHTNING_NOVA_H              = 59835,
+
+    SPELL_PULSING_SHOCKWAVE             = 52961,
+    SPELL_PULSING_SHOCKWAVE_H           = 59836,
+    SPELL_PULSING_SHOCKWAVE_AURA        = 59414
+};
+
+/*######
+## Boss Loken
+######*/
+
+struct boss_loken : public CreatureScript
+{
+    boss_loken() : CreatureScript("boss_loken") {}
+
+    struct boss_lokenAI : public ScriptedAI
+    {
+        boss_lokenAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bIsRegularMode;
+
+        uint32 m_uiArcLightningTimer;
+        uint32 m_uiLightningNovaTimer;
+
+        uint32 m_uiHealthAmountModifier;
+
+        void Reset() override
+        {
+            m_uiArcLightningTimer = 15000;
+            m_uiLightningNovaTimer = 20000;
+
+            m_uiHealthAmountModifier = 1;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_LOKEN, IN_PROGRESS);
+
+            // Cast Pulsing Shockwave at aggro - ToDo: enable this when the core will properly support this spell
+            // DoCastSpellIfCan(m_creature, SPELL_PULSING_SHOCKWAVE_AURA, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            // DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_PULSING_SHOCKWAVE : SPELL_PULSING_SHOCKWAVE_H, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_LOKEN, DONE);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_LOKEN, FAIL);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiArcLightningTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_ARC_LIGHTNING) == CAST_OK)
+                        m_uiArcLightningTimer = urand(15000, 16000);
+                }
+            }
+            else
+                m_uiArcLightningTimer -= uiDiff;
+
+            if (m_uiLightningNovaTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_LIGHTNING_NOVA : SPELL_LIGHTNING_NOVA_H) == CAST_OK)
+                {
+                    switch (urand(0, 2))
+                    {
+                    case 0: DoScriptText(SAY_NOVA_1, m_creature); break;
+                    case 1: DoScriptText(SAY_NOVA_2, m_creature); break;
+                    case 2: DoScriptText(SAY_NOVA_3, m_creature); break;
+                    }
+                    m_uiLightningNovaTimer = urand(20000, 21000);
+                }
+            }
+            else
+                m_uiLightningNovaTimer -= uiDiff;
+
+            // Health check
+            if (m_creature->GetHealthPercent() < float(100 - 25 * m_uiHealthAmountModifier))
+            {
+                switch (m_uiHealthAmountModifier)
+                {
+                case 1: DoScriptText(SAY_75HEALTH, m_creature); break;
+                case 2: DoScriptText(SAY_50HEALTH, m_creature); break;
+                case 3: DoScriptText(SAY_25HEALTH, m_creature); break;
+                }
+
+                ++m_uiHealthAmountModifier;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_lokenAI(pCreature);
+    }
+};
+
+void AddSC_boss_loken()
+{
+    Script* s;
+
+    s = new boss_loken();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_loken";
+    //pNewScript->GetAI = &GetAI_boss_loken;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp b/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
new file mode 100644
index 000000000..5665be300
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
@@ -0,0 +1,466 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss Volkhan
+SD%Complete: 80%
+SDComment: The dummy spells need more research and should be handled in core
+SDCategory: Halls of Lightning
+EndScriptData */
+
+#include "precompiled.h"
+#include "halls_of_lightning.h"
+
+enum
+{
+    SAY_AGGRO                               = -1602032,
+    SAY_SLAY_1                              = -1602033,
+    SAY_SLAY_2                              = -1602034,
+    SAY_SLAY_3                              = -1602035,
+    SAY_DEATH                               = -1602036,
+    SAY_STOMP_1                             = -1602037,
+    SAY_STOMP_2                             = -1602038,
+    SAY_FORGE_1                             = -1602039,
+    SAY_FORGE_2                             = -1602040,
+    EMOTE_TO_ANVIL                          = -1602041,
+    EMOTE_SHATTER                           = -1602042,
+
+    SPELL_HEAT                              = 52387,
+    SPELL_HEAT_H                            = 59528,
+    SPELL_SHATTERING_STOMP                  = 52237,
+    SPELL_SHATTERING_STOMP_H                = 59529,
+
+    // unclear how "directions" of spells must be. Last, summoning GO, what is it for? Script depend on:
+    SPELL_TEMPER                            = 52238,        // TARGET_SCRIPT boss->anvil
+    SPELL_TEMPER_DUMMY                      = 52654,        // TARGET_SCRIPT anvil->boss
+    // SPELL_TEMPER_VISUAL                   = 52661,       // summons GO
+
+    SPELL_SUMMON_MOLTEN_GOLEM               = 52405,
+
+    // Molten Golem
+    SPELL_BLAST_WAVE                        = 23113,
+    SPELL_IMMOLATION_STRIKE                 = 52433,
+    SPELL_IMMOLATION_STRIKE_H               = 59530,
+    SPELL_SHATTER                           = 52429,
+    SPELL_SHATTER_H                         = 59527,
+
+    NPC_MOLTEN_GOLEM                        = 28695,
+    NPC_BRITTLE_GOLEM                       = 28681,
+
+    MAX_GOLEM                               = 2,
+    MAX_ACHIEV_GOLEMS                       = 4
+};
+
+/*######
+## Boss Volkhan
+######*/
+
+struct boss_volkhan : public CreatureScript
+{
+    boss_volkhan() : CreatureScript("boss_volkhan") {}
+
+    struct boss_volkhanAI : public ScriptedAI
+    {
+        boss_volkhanAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        GuidList m_lGolemGUIDList;
+
+        bool m_bIsRegularMode;
+        bool m_bHasShattered;
+
+        uint32 m_uiShatterTimer;
+        uint32 m_uiHeatTimer;
+        uint32 m_uiTemperTimer;
+
+        void Reset() override
+        {
+            m_bHasShattered = false;
+
+            m_uiShatterTimer = 3000;
+            m_uiHeatTimer = 30000;
+            m_uiTemperTimer = 10000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_VOLKHAN, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+            DespawnGolems();
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_VOLKHAN, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            DespawnGolems();
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_VOLKHAN, FAIL);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        void DespawnGolems()
+        {
+            if (m_lGolemGUIDList.empty())
+                return;
+
+            for (GuidList::const_iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr)
+            {
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    if (pTemp->IsAlive())
+                        pTemp->ForcedDespawn();
+                }
+            }
+        }
+
+        void ShatterGolems()
+        {
+            if (m_lGolemGUIDList.empty())
+                return;
+
+            uint8 m_uiBrittleGolemsCount = 0;
+
+            for (GuidList::const_iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr)
+            {
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    // only shatter brittle golems
+                    if (pTemp->GetEntry() == NPC_BRITTLE_GOLEM)
+                    {
+                        pTemp->CastSpell(pTemp, m_bIsRegularMode ? SPELL_SHATTER : SPELL_SHATTER_H, true);
+                        ++m_uiBrittleGolemsCount;
+                    }
+                }
+            }
+
+            // If shattered more than 4 golems mark achiev as failed
+            if (m_uiBrittleGolemsCount > MAX_ACHIEV_GOLEMS)
+            {
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_VOLKHAN, SPECIAL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_MOLTEN_GOLEM)
+            {
+                m_lGolemGUIDList.push_back(pSummoned->GetObjectGuid());
+
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            DoCastSpellIfCan(m_creature, SPELL_TEMPER);
+            SetCombatMovement(true);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // he shatters only one time, at 25%
+            if (m_creature->GetHealthPercent() <= 25.0f && !m_bHasShattered)
+            {
+                // should he stomp even if he has no brittle golem to shatter? <-yes!
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SHATTERING_STOMP : SPELL_SHATTERING_STOMP_H) == CAST_OK)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_STOMP_1 : SAY_STOMP_2, m_creature);
+                    DoScriptText(EMOTE_SHATTER, m_creature);
+                    m_uiShatterTimer = 3000;
+                    m_bHasShattered = true;
+                }
+            }
+
+            // Shatter Golems 3 seconds after Shattering Stomp
+            if (m_uiShatterTimer)
+            {
+                if (m_uiShatterTimer <= uiDiff)
+                {
+                    ShatterGolems();
+                    m_uiShatterTimer = 0;
+                }
+                else
+                    m_uiShatterTimer -= uiDiff;
+            }
+
+            // Summon Golems only when over 25% hp
+            if (m_creature->GetHealthPercent() > 25.0f)
+            {
+                if (m_uiTemperTimer < uiDiff)
+                {
+                    DoScriptText(EMOTE_TO_ANVIL, m_creature);
+                    DoScriptText(urand(0, 1) ? SAY_FORGE_1 : SAY_FORGE_2, m_creature);
+                    SetCombatMovement(false);
+
+                    if (m_pInstance)
+                    {
+                        if (Creature* pAnvil = m_pInstance->GetSingleCreatureFromStorage(NPC_VOLKHAN_ANVIL))
+                        {
+                            float fX, fY, fZ;
+                            pAnvil->GetContactPoint(m_creature, fX, fY, fZ, INTERACTION_DISTANCE);
+                            m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                        }
+                        else
+                            script_error_log("Npc %u couldn't be found or something really bad happened.", NPC_VOLKHAN_ANVIL);
+                    }
+                    m_uiTemperTimer = 30000;
+                }
+                else
+                    m_uiTemperTimer -= uiDiff;
+            }
+
+            if (m_uiHeatTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_HEAT : SPELL_HEAT_H) == CAST_OK)
+                    m_uiHeatTimer = urand(10000, 15000);
+            }
+            else
+                m_uiHeatTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_volkhanAI(pCreature);
+    }
+};
+
+struct spell_volkhan_temper_dummy : public SpellScript
+{
+    spell_volkhan_temper_dummy() : SpellScript("spell_volkhan_temper_dummy") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_TEMPER_DUMMY && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+            if (pCaster->GetEntry() != NPC_VOLKHAN_ANVIL || pCreatureTarget->GetEntry() != NPC_VOLKHAN)
+                return true;
+
+            for (uint8 i = 0; i < MAX_GOLEM; ++i)
+                pCreatureTarget->CastSpell(pCaster, SPELL_SUMMON_MOLTEN_GOLEM, true);
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_volkhan_anvil
+######*/
+
+struct spell_volkhan_temper : public SpellScript
+{
+    spell_volkhan_temper() : SpellScript("spell_volkhan_temper") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_TEMPER && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+            if (pCaster->GetEntry() != NPC_VOLKHAN || pCreatureTarget->GetEntry() != NPC_VOLKHAN_ANVIL)
+                return true;
+
+            pCreatureTarget->CastSpell(pCaster, SPELL_TEMPER_DUMMY, false);
+            // ToDo: research how the visual spell is used
+
+            if (pCaster->getVictim())
+            {
+                pCaster->GetMotionMaster()->Clear();
+                pCaster->GetMotionMaster()->MoveChase(pCaster->getVictim());
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## mob_molten_golem
+######*/
+
+struct mob_molten_golem : public CreatureScript
+{
+    mob_molten_golem() : CreatureScript("mob_molten_golem") {}
+
+    struct mob_molten_golemAI : public ScriptedAI
+    {
+        mob_molten_golemAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bIsRegularMode;
+
+        uint32 m_uiBlastTimer;
+        uint32 m_uiImmolationTimer;
+
+        void Reset() override
+        {
+            m_uiBlastTimer = 20000;
+            m_uiImmolationTimer = 5000;
+        }
+
+        void EnterEvadeMode() override
+        {
+            // Evade but keep the current location
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            m_creature->SetLootRecipient(NULL);
+
+            // Update creature to Brittle Golem
+            // Note: the npc has the proper flags in DB and won't engate in combat anymore
+            m_creature->UpdateEntry(NPC_BRITTLE_GOLEM);
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            // Transform intro Brittle when damaged to 0 HP
+            if (uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                if (m_creature->IsNonMeleeSpellCasted(false))
+                    m_creature->InterruptNonMeleeSpells(false);
+
+                EnterEvadeMode();
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            // This is the dummy effect of the spells - Note: should be handled as a dummy effect in core
+            if (pSpell->Id == SPELL_SHATTER || pSpell->Id == SPELL_SHATTER_H)
+            {
+                if (m_creature->GetEntry() == NPC_BRITTLE_GOLEM)
+                    m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target or if we are frozen
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiBlastTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BLAST_WAVE) == CAST_OK)
+                    m_uiBlastTimer = 20000;
+            }
+            else
+                m_uiBlastTimer -= uiDiff;
+
+            if (m_uiImmolationTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_IMMOLATION_STRIKE : SPELL_IMMOLATION_STRIKE_H) == CAST_OK)
+                    m_uiImmolationTimer = 5000;
+            }
+            else
+                m_uiImmolationTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_molten_golemAI(pCreature);
+    }
+};
+
+void AddSC_boss_volkhan()
+{
+    Script* s;
+
+    s = new boss_volkhan();
+    s->RegisterSelf();
+    s = new mob_molten_golem();
+    s->RegisterSelf();
+
+    s = new spell_volkhan_temper_dummy();
+    s->RegisterSelf();
+    s = new spell_volkhan_temper();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_volkhan";
+    //pNewScript->GetAI = &GetAI_boss_volkhan;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_boss_volkhan;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_volkhan_anvil";
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_volkhan_anvil;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_molten_golem";
+    //pNewScript->GetAI = &GetAI_mob_molten_golem;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h b/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h
new file mode 100644
index 000000000..999de8aa0
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h
@@ -0,0 +1,33 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_HALLS_OF_LIGHTNING_H
+#define DEF_HALLS_OF_LIGHTNING_H
+
+enum
+{
+    MAX_ENCOUNTER           = 4,
+
+    TYPE_BJARNGRIM          = 0,
+    TYPE_VOLKHAN            = 1,
+    TYPE_IONAR              = 2,
+    TYPE_LOKEN              = 3,
+
+    NPC_BJARNGRIM           = 28586,
+    NPC_VOLKHAN             = 28587,
+    NPC_IONAR               = 28546,
+    NPC_LOKEN               = 28923,
+    NPC_VOLKHAN_ANVIL       = 28823,
+
+    GO_VOLKHAN_DOOR         = 191325,                       //_doors07
+    GO_IONAR_DOOR           = 191326,                       //_doors05
+    // GO_LOKEN_DOOR         = 191324,                      //_doors02
+    GO_LOKEN_THRONE         = 192654,
+
+    ACHIEV_START_LOKEN_ID   = 20384,
+
+    ACHIEV_CRIT_LIGHTNING   = 6835,                         // Bjarngrim, achiev 1834
+    ACHIEV_CRIT_RESISTANT   = 7321,                         // Volkhan, achiev 2042
+};
+#endif
diff --git a/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp b/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
new file mode 100644
index 000000000..95b1c5e49
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
@@ -0,0 +1,209 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Halls_of_Lightning
+SD%Complete: 90%
+SDComment: All ready.
+SDCategory: Halls of Lightning
+EndScriptData */
+
+#include "precompiled.h"
+#include "halls_of_lightning.h"
+
+/* Halls of Lightning encounters:
+0 - General Bjarngrim
+1 - Volkhan
+2 - Ionar
+3 - Loken
+*/
+
+struct is_halls_of_lightning : public InstanceScript
+{
+    is_halls_of_lightning() : InstanceScript("instance_halls_of_lightning") {}
+
+    class instance_halls_of_lightning : public ScriptedInstance
+    {
+    public:
+        instance_halls_of_lightning(Map* pMap) : ScriptedInstance(pMap),
+            m_bLightningStruck(false),
+            m_bIsShatterResistant(false)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_BJARNGRIM:
+            case NPC_IONAR:
+            case NPC_VOLKHAN_ANVIL:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_VOLKHAN_DOOR:
+                if (m_auiEncounter[TYPE_VOLKHAN] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_IONAR_DOOR:
+                if (m_auiEncounter[TYPE_IONAR] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_LOKEN_THRONE:
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_BJARNGRIM:
+                if (uiData == SPECIAL)
+                    m_bLightningStruck = true;
+                else if (uiData == FAIL)
+                    m_bLightningStruck = false;
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_VOLKHAN:
+                if (uiData == DONE)
+                    DoUseDoorOrButton(GO_VOLKHAN_DOOR);
+                else if (uiData == IN_PROGRESS)
+                    m_bIsShatterResistant = true;
+                else if (uiData == SPECIAL)
+                    m_bIsShatterResistant = false;
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_IONAR:
+                if (uiData == DONE)
+                    DoUseDoorOrButton(GO_IONAR_DOOR);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_LOKEN:
+                if (uiData == IN_PROGRESS)
+                    DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_LOKEN_ID);
+                else if (uiData == DONE)
+                {
+                    if (GameObject* pGlobe = GetSingleGameObjectFromStorage(GO_LOKEN_THRONE))
+                        pGlobe->SendGameObjectCustomAnim(pGlobe->GetObjectGuid());
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            return 0;
+        }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+            case ACHIEV_CRIT_LIGHTNING:
+                return m_bLightningStruck;
+            case ACHIEV_CRIT_RESISTANT:
+                return m_bIsShatterResistant;
+            }
+
+            return false;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        bool m_bLightningStruck;
+        bool m_bIsShatterResistant;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_halls_of_lightning(pMap);
+    }
+};
+
+void AddSC_instance_halls_of_lightning()
+{
+    Script* s;
+
+    s = new is_halls_of_lightning();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_halls_of_lightning";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_halls_of_lightning;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
new file mode 100644
index 000000000..2ff9101a3
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
@@ -0,0 +1,184 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Maiden_of_Grief
+SD%Complete: 60%
+SDComment:
+SDCategory: Halls of Stone
+EndScriptData */
+
+#include "precompiled.h"
+#include "halls_of_stone.h"
+
+enum
+{
+    SAY_AGGRO                   = -1599005,
+    SAY_SLAY_1                  = -1599006,
+    SAY_SLAY_2                  = -1599007,
+    SAY_SLAY_3                  = -1599008,
+    SAY_SLAY_4                  = -1599009,
+    SAY_STUN                    = -1599010,
+    SAY_DEATH                   = -1599011,
+
+    SPELL_STORM_OF_GRIEF        = 50752,
+    SPELL_STORM_OF_GRIEF_H      = 59772,
+
+    SPELL_SHOCK_OF_SORROW       = 50760,
+    SPELL_SHOCK_OF_SORROW_H     = 59726,
+
+    SPELL_PILLAR_OF_WOE         = 50761,
+    SPELL_PILLAR_OF_WOE_H       = 59727,
+
+    SPELL_PARTING_SORROW        = 59723
+};
+
+/*######
+## boss_maiden_of_grief
+######*/
+
+struct boss_maiden_of_grief : public CreatureScript
+{
+    boss_maiden_of_grief() : CreatureScript("boss_maiden_of_grief") {}
+
+    struct boss_maiden_of_griefAI : public ScriptedAI
+    {
+        boss_maiden_of_griefAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiStormTimer;
+        uint32 m_uiShockTimer;
+        uint32 m_uiPillarTimer;
+        uint32 m_uiPartingSorrowTimer;
+
+        void Reset() override
+        {
+            m_uiStormTimer = 5000;
+            m_uiShockTimer = 10000;
+            m_uiPillarTimer = 15000;
+            m_uiPartingSorrowTimer = 12000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MAIDEN, IN_PROGRESS);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MAIDEN, FAIL);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 3))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            case 3: DoScriptText(SAY_SLAY_4, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MAIDEN, DONE);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiPartingSorrowTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_PARTING_SORROW, SELECT_FLAG_PLAYER | SELECT_FLAG_POWER_MANA))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_PARTING_SORROW) == CAST_OK)
+                        m_uiPartingSorrowTimer = 12000 + rand() % 5000;
+                }
+            }
+            else
+                m_uiPartingSorrowTimer -= uiDiff;
+
+            if (m_uiStormTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_STORM_OF_GRIEF : SPELL_STORM_OF_GRIEF_H) == CAST_OK)
+                    m_uiStormTimer = 20000;
+            }
+            else
+                m_uiStormTimer -= uiDiff;
+
+            if (m_uiPillarTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, m_bIsRegularMode ? SPELL_PILLAR_OF_WOE_H : SPELL_PILLAR_OF_WOE, SELECT_FLAG_PLAYER))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_PILLAR_OF_WOE : SPELL_PILLAR_OF_WOE_H) == CAST_OK)
+                        m_uiPillarTimer = 10000;
+                }
+            }
+            else
+                m_uiPillarTimer -= uiDiff;
+
+            if (m_uiShockTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SHOCK_OF_SORROW : SPELL_SHOCK_OF_SORROW_H) == CAST_OK)
+                {
+                    DoScriptText(SAY_STUN, m_creature);
+                    m_uiShockTimer = 35000;
+                }
+            }
+            else
+                m_uiShockTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_maiden_of_griefAI(pCreature);
+    }
+};
+
+void AddSC_boss_maiden_of_grief()
+{
+    Script* s;
+
+    s = new boss_maiden_of_grief();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_maiden_of_grief";
+    //pNewScript->GetAI = &GetAI_boss_maiden_of_grief;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp b/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
new file mode 100644
index 000000000..f077781ae
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
@@ -0,0 +1,295 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Sjonnir
+SD%Complete: 60%
+SDComment: Brann Event missing, no proper source for timers
+SDCategory: Halls of Stone
+EndScriptData */
+
+#include "precompiled.h"
+#include "halls_of_stone.h"
+
+enum
+{
+    SAY_AGGRO                       = -1599000,
+    SAY_SLAY_1                      = -1599001,
+    SAY_SLAY_2                      = -1599002,
+    SAY_SLAY_3                      = -1599003,
+    SAY_DEATH                       = -1599004,
+    EMOTE_GENERIC_FRENZY            = -1000002,
+
+    SPELL_FRENZY                    = 28747,
+
+    SPELL_CHAIN_LIGHTNING           = 50830,
+    SPELL_CHAIN_LIGHTNING_H         = 59844,
+
+    SPELL_STATIC_CHARGE             = 50834,
+    SPELL_STATIC_CHARGE_H           = 59846,
+
+    SPELL_LIGHTNING_SHIELD          = 50831,
+    SPELL_LIGHTNING_SHIELD_H        = 59845,
+
+    SPELL_LIGHTNING_RING            = 50840,
+    SPELL_LIGHTNING_RING_H          = 59848,
+
+    // Cast on aggro
+    SPELL_SUMMON_IRON_DWARF         = 50789,                // periodic dummy aura, tick each 30sec or each 20sec in heroic
+    SPELL_SUMMON_IRON_DWARF_H       = 59860,                // left/right 50790,50791
+
+    // Cast at 75% hp (also Brann has some yells at that point)
+    SPELL_SUMMON_IRON_TROGG         = 50792,                // periodic dummy aura, tick each 10sec or each 7sec in heroic
+    SPELL_SUMMON_IRON_TROGG_H       = 59859,                // left/right 50793,50794
+
+    // Cast at 50% hp
+    SPELL_SUMMON_MALFORMED_OOZE     = 50801,                // periodic dummy aura, tick each 5sec or each 3sec in heroic
+    SPELL_SUMMON_MALFORMED_OOZE_H   = 59858,                // left/right 50802,50803
+
+    // Cast at 15% hp when Bran repairs the machine
+    SPELL_SUMMON_EARTHEN_DWARF      = 50824,                // left/right 50825, 50826
+
+    // Ooze and Sludge spells
+    SPELL_OOZE_COMBINE              = 50741,                // periodic aura - cast by 27981
+    // SPELL_SUMMON_IRON_SLUDGE        = 50747,             // instakill TARGET_SCRIPT
+    // SPELL_IRON_SLUDGE_SPAWN_VISUAL  = 50777,
+
+    NPC_IRON_TROGG                  = 27979,
+    NPC_IRON_DWARF                  = 27982,
+    NPC_MALFORMED_OOZE              = 27981,
+    NPC_EARTHEN_DWARF               = 27980,
+};
+
+/*######
+## boss_sjonnir
+######*/
+
+struct boss_sjonnir : public CreatureScript
+{
+    boss_sjonnir() : CreatureScript("boss_sjonnir") {}
+
+    struct boss_sjonnirAI : public ScriptedAI
+    {
+        boss_sjonnirAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiChainLightningTimer;
+        uint32 m_uiLightningShieldTimer;
+        uint32 m_uiStaticChargeTimer;
+        uint32 m_uiLightningRingTimer;
+        uint32 m_uiFrenzyTimer;
+
+        uint8 m_uiHpCheck;
+
+        void Reset() override
+        {
+            m_uiChainLightningTimer = urand(3000, 8000);    // TODO timers weak
+            m_uiLightningShieldTimer = urand(20000, 25000);
+            m_uiStaticChargeTimer = urand(20000, 25000);
+            m_uiLightningRingTimer = urand(30000, 35000);
+            m_uiFrenzyTimer = 4 * MINUTE * IN_MILLISECONDS; // TODO no proper source for this "long"
+
+            m_uiHpCheck = 75;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_LIGHTNING_SHIELD : SPELL_LIGHTNING_SHIELD_H, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SUMMON_IRON_DWARF : SPELL_SUMMON_IRON_DWARF_H, CAST_TRIGGERED);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SJONNIR, IN_PROGRESS);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SJONNIR, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SJONNIR, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_EARTHEN_DWARF:
+                pSummoned->AI()->AttackStart(m_creature);
+                break;
+            case NPC_MALFORMED_OOZE:
+            {
+                                       pSummoned->CastSpell(pSummoned, SPELL_OOZE_COMBINE, true);
+
+                                       // Always move to the center of the room
+                                       float fX, fY, fZ;
+                                       m_creature->GetRespawnCoord(fX, fY, fZ);
+
+                                       pSummoned->SetWalk(false);
+                                       pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                                       break;
+            }
+            case NPC_IRON_TROGG:
+            case NPC_IRON_DWARF:
+            {
+                                   // Move to a random point around the room in order to start the attack
+                                   float fX, fY, fZ;
+                                   pSummoned->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 10.0f, fX, fY, fZ);
+
+                                   pSummoned->SetWalk(false);
+                                   pSummoned->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                                   break;
+            }
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || pSummoned->GetEntry() != NPC_MALFORMED_OOZE || !uiPointId)
+                return;
+
+            pSummoned->GetMotionMaster()->MoveRandomAroundPoint(pSummoned->GetPositionX(), pSummoned->GetPositionY(), pSummoned->GetPositionZ(), 10.0f);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        bool DoFrenzyIfCan()
+        {
+            if (!m_uiFrenzyTimer)
+                return true;
+
+            if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_EARTHEN_DWARF, CAST_TRIGGERED);
+                m_uiFrenzyTimer = 0;
+
+                return true;
+            }
+
+            return false;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_creature->GetHealthPercent() <= (float)m_uiHpCheck)
+            {
+                switch (m_uiHpCheck)
+                {
+                case 75:
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SUMMON_IRON_TROGG : SPELL_SUMMON_IRON_TROGG_H, CAST_TRIGGERED) == CAST_OK)
+                        m_uiHpCheck = 50;
+                    break;
+                case 50:
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SUMMON_MALFORMED_OOZE : SPELL_SUMMON_MALFORMED_OOZE_H, CAST_TRIGGERED) == CAST_OK)
+                        m_uiHpCheck = 15;
+                    break;
+                case 15:
+                    if (DoFrenzyIfCan())
+                        m_uiHpCheck = 0;
+
+                    break;
+                }
+            }
+
+            if (m_uiChainLightningTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_CHAIN_LIGHTNING : SPELL_CHAIN_LIGHTNING_H) == CAST_OK)
+                        m_uiChainLightningTimer = urand(10000, 15000);
+                }
+            }
+            else
+                m_uiChainLightningTimer -= uiDiff;
+
+            if (m_uiLightningShieldTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_LIGHTNING_SHIELD : SPELL_LIGHTNING_SHIELD_H) == CAST_OK)
+                    m_uiLightningShieldTimer = urand(20000, 25000);
+            }
+            else
+                m_uiLightningShieldTimer -= uiDiff;
+
+            if (m_uiStaticChargeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_STATIC_CHARGE : SPELL_STATIC_CHARGE_H) == CAST_OK)
+                    m_uiStaticChargeTimer = urand(20000, 25000);
+            }
+            else
+                m_uiStaticChargeTimer -= uiDiff;
+
+            if (m_uiLightningRingTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_LIGHTNING_RING : SPELL_LIGHTNING_RING_H) == CAST_OK)
+                    m_uiLightningRingTimer = urand(30000, 35000);
+            }
+            else
+                m_uiLightningRingTimer -= uiDiff;
+
+            if (m_uiFrenzyTimer <= uiDiff)
+                DoFrenzyIfCan();
+            else
+                m_uiFrenzyTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_sjonnirAI(pCreature);
+    }
+};
+
+void AddSC_boss_sjonnir()
+{
+    Script* s;
+
+    s = new boss_sjonnir();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_sjonnir";
+    //pNewScript->GetAI = &GetAI_boss_sjonnir;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp b/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp
new file mode 100644
index 000000000..499d489ad
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp
@@ -0,0 +1,774 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Halls_of_Stone
+SD%Complete: 50%
+SDComment: Just base mechanics in script, timers and stuff is very uncertain, event-spells are not working
+SDCategory: Halls of Stone
+EndScriptData */
+
+#include "precompiled.h"
+#include "halls_of_stone.h"
+#include "escort_ai.h"
+
+/* Notes
+ * The timers and handling of texts is not confirmed, but should also not be too far off
+ * The spells "of the statues" (handled in instance script), need quite much of core support
+ */
+
+enum
+{
+    SAY_KILL_1                          = -1599012,
+    SAY_KILL_2                          = -1599013,
+    SAY_KILL_3                          = -1599014,
+    SAY_LOW_HEALTH                      = -1599015,
+    SAY_DEATH                           = -1599016,
+    SAY_PLAYER_DEATH_1                  = -1599017,
+    SAY_PLAYER_DEATH_2                  = -1599018,
+    SAY_PLAYER_DEATH_3                  = -1599019,
+    SAY_ESCORT_START                    = -1599020,
+
+    SAY_SPAWN_DWARF                     = -1599021,
+    SAY_SPAWN_TROGG                     = -1599022,
+    SAY_SPAWN_OOZE                      = -1599023,
+    SAY_SPAWN_EARTHEN                   = -1599024,
+
+    SAY_EVENT_INTRO_1                   = -1599025,
+    SAY_EVENT_INTRO_2                   = -1599026,
+    SAY_EVENT_INTRO_3_ABED              = -1599027,
+
+    SAY_EVENT_A_1                       = -1599028,
+    SAY_EVENT_A_2_KADD                  = -1599029,
+    SAY_EVENT_A_3                       = -1599030,
+
+    SAY_EVENT_B_1                       = -1599031,
+    SAY_EVENT_B_2_MARN                  = -1599032,
+    SAY_EVENT_B_3                       = -1599033,
+
+    SAY_EVENT_C_1                       = -1599034,
+    SAY_EVENT_C_2_ABED                  = -1599035,
+    SAY_EVENT_C_3                       = -1599036,
+
+    SAY_EVENT_D_1                       = -1599037,
+    SAY_EVENT_D_2_ABED                  = -1599038,
+    SAY_EVENT_D_3                       = -1599039,
+    SAY_EVENT_D_4_ABED                  = -1599040,
+
+    SAY_EVENT_END_01                    = -1599041,
+    SAY_EVENT_END_02                    = -1599042,
+    SAY_EVENT_END_03_ABED               = -1599043,
+    SAY_EVENT_END_04                    = -1599044,
+    SAY_EVENT_END_05_ABED               = -1599045,
+    SAY_EVENT_END_06                    = -1599046,
+    SAY_EVENT_END_07_ABED               = -1599047,
+    SAY_EVENT_END_08                    = -1599048,
+    SAY_EVENT_END_09_KADD               = -1599049,
+    SAY_EVENT_END_10                    = -1599050,
+    SAY_EVENT_END_11_KADD               = -1599051,
+    SAY_EVENT_END_12                    = -1599052,
+    SAY_EVENT_END_13_KADD               = -1599053,
+    SAY_EVENT_END_14                    = -1599054,
+    SAY_EVENT_END_15_MARN               = -1599055,
+    SAY_EVENT_END_16                    = -1599056,
+    SAY_EVENT_END_17_MARN               = -1599057,
+    SAY_EVENT_END_18                    = -1599058,
+    SAY_EVENT_END_19_MARN               = -1599059,
+    SAY_EVENT_END_20                    = -1599060,
+    SAY_EVENT_END_21_ABED               = -1599061,
+
+    SAY_VICTORY_SJONNIR_1               = -1599062,
+    SAY_VICTORY_SJONNIR_2               = -1599063,
+
+    SAY_ENTRANCE_MEET                   = -1599064,
+
+    GOSSIP_ITEM_ID_START                = -3599000,
+    GOSSIP_ITEM_ID_PROGRESS             = -3599001,
+
+    TEXT_ID_START                       = 13100,
+    TEXT_ID_PROGRESS                    = 13101,
+
+    SPELL_STEALTH                       = 58506,
+
+    QUEST_HALLS_OF_STONE                = 13207,
+};
+
+/*######
+## npc_brann_hos
+######*/
+
+struct npc_brann_hos : public CreatureScript
+{
+    npc_brann_hos() : CreatureScript("npc_brann_hos") {}
+
+    struct npc_brann_hosAI : public npc_escortAI
+    {
+        npc_brann_hosAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bHasContinued;
+        bool m_bIsBattle;
+        bool m_bIsLowHP;
+
+        uint32 m_uiStep;
+        uint32 m_uiPhaseTimer;
+
+        GuidList m_luiDwarfGUIDs;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_bIsLowHP = false;
+                m_bIsBattle = false;
+                m_bHasContinued = false;
+
+                m_uiStep = 0;
+                m_uiPhaseTimer = 0;
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override                          // TODO - possible better as SummonedJustDied
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_KILL_1, m_creature); break;
+            case 1: DoScriptText(SAY_KILL_2, m_creature); break;
+            case 2: DoScriptText(SAY_KILL_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_TRIBUNAL, FAIL);
+                // Continue at right state after respawn
+                if (m_bHasContinued)
+                    m_pInstance->SetData(TYPE_TRIBUNAL, IN_PROGRESS);
+            }
+
+            for (GuidList::const_iterator itr = m_luiDwarfGUIDs.begin(); itr != m_luiDwarfGUIDs.end(); ++itr)
+            {
+                if (Creature* pDwarf = m_creature->GetMap()->GetCreature(*itr))
+                    pDwarf->ForcedDespawn();
+            }
+            m_luiDwarfGUIDs.clear();
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (!pWho || !m_bIsBattle)
+                return;
+
+            npc_escortAI::AttackStart(pWho);
+        }
+
+        void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override
+        {
+            // If Brann takes damage, mark the achiev as failed
+            if (uiDamage && m_pInstance)
+                m_pInstance->SetData(TYPE_ACHIEV_BRANN_SPANKIN, uint32(false));
+        }
+
+        void ContinueEvent()
+        {
+            if (!m_pInstance || m_pInstance->GetData(TYPE_TRIBUNAL) != IN_PROGRESS)
+                return;
+
+            // Set the achiev in progress
+            m_pInstance->SetData(TYPE_ACHIEV_BRANN_SPANKIN, uint32(true));
+
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            SetRun(true);
+            SetEscortPaused(false);
+            m_bHasContinued = true;
+        }
+
+        void JustStartedEscort() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_TRIBUNAL, IN_PROGRESS);
+
+            DoScriptText(SAY_ESCORT_START, m_creature);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 13:                                        // Before Tribunal Event, Continue with Gossip Interaction
+                DoScriptText(SAY_EVENT_INTRO_1, m_creature);
+                SetEscortPaused(true);
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                break;
+            case 17:                                        // Reach Tribunal
+                SetEscortPaused(true);
+                m_uiPhaseTimer = 500;
+                break;
+            case 18:                                        // Reach Floor Event
+                SetEscortPaused(true);
+                if (m_pInstance)
+                {
+                    if (GameObject* pKonsole = m_pInstance->GetSingleGameObjectFromStorage(GO_TRIBUNAL_CONSOLE))
+                        m_creature->SetFacingToObject(pKonsole);
+                    m_pInstance->DoUseDoorOrButton(GO_TRIBUNAL_FLOOR);
+                }
+                m_uiPhaseTimer = 1000;
+                break;
+            }
+        }
+
+        void SpawnDwarf(uint32 uEntry)
+        {
+            if (!m_pInstance)
+                return;
+            m_pInstance->SetData(TYPE_DO_SPAWN_DWARF, uEntry);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            m_luiDwarfGUIDs.push_back(pSummoned->GetObjectGuid());
+
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (m_uiPhaseTimer && m_uiPhaseTimer <= uiDiff)
+            {
+                switch (m_uiStep)
+                {
+                    // Begin Event
+                case 0:
+                    // TODO, this is wrong, must be "using or similar"
+                    m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                    m_uiPhaseTimer = 1500;
+                    break;
+                case 1:
+                    DoScriptText(SAY_EVENT_INTRO_2, m_creature);
+                    m_uiPhaseTimer = 2500;
+                    break;
+                case 2:
+                    if (m_pInstance)
+                        m_pInstance->DoUseDoorOrButton(GO_TRIBUNAL_CONSOLE);
+                    m_uiPhaseTimer = 6500;
+                    break;
+                case 3:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_ABEDNEUM_SPEAK, -SAY_EVENT_INTRO_3_ABED);
+                    m_uiPhaseTimer = 8500;
+                    break;
+
+                    // Activate Kaddrak
+                case 4:
+                    DoScriptText(SAY_EVENT_A_1, m_creature);
+                    m_uiPhaseTimer = 6500;
+                    break;
+                case 5:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_KADDRAK_SPEAK, -SAY_EVENT_A_2_KADD);
+                    m_uiPhaseTimer = 12500;
+                    break;
+                case 6:
+                    DoScriptText(SAY_EVENT_A_3, m_creature);
+                    m_uiPhaseTimer = 6000;
+                    break;
+                case 7:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_KADDRAK_ACTIVATE, uint32(false));
+                    m_uiPhaseTimer = 5000;
+                    break;
+                case 8:
+                    SpawnDwarf(NPC_DARK_RUNE_PROTECTOR);
+                    m_uiPhaseTimer = 20000;
+                    break;
+
+                    // Activate Marnak
+                case 9:
+                    DoScriptText(SAY_EVENT_B_1, m_creature);
+                    m_uiPhaseTimer = 6000;
+                    break;
+                case 10:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_MARNAK_SPEAK, -SAY_EVENT_B_2_MARN);
+                    SpawnDwarf(NPC_DARK_RUNE_PROTECTOR);
+                    m_uiPhaseTimer = 20000;
+                    break;
+                case 11:
+                    DoScriptText(SAY_EVENT_B_3, m_creature);
+                    m_uiPhaseTimer = 5000;
+                    break;
+                case 12:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_MARNAK_ACTIVATE, uint32(false));
+                    m_uiPhaseTimer = 10000;
+                    break;
+                case 13:
+                    SpawnDwarf(NPC_DARK_RUNE_PROTECTOR);
+                    m_uiPhaseTimer = 10000;
+                    break;
+                case 14:
+                    SpawnDwarf(NPC_DARK_RUNE_STORMCALLER);
+                    m_uiPhaseTimer = (20000);
+                    break;
+                case 15:
+                    DoScriptText(SAY_EVENT_C_1, m_creature);
+                    SpawnDwarf(NPC_DARK_RUNE_PROTECTOR);
+                    m_uiPhaseTimer = 10000;
+                    break;
+                case 16:
+                    SpawnDwarf(NPC_DARK_RUNE_STORMCALLER);
+                    m_uiPhaseTimer = 20000;
+                    break;
+
+                    // Activate Abedneum
+                case 17:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_ABEDNEUM_SPEAK, -SAY_EVENT_C_2_ABED);
+                    SpawnDwarf(NPC_DARK_RUNE_PROTECTOR);
+                    m_uiPhaseTimer = 20000;
+                    break;
+                case 18:
+                    DoScriptText(SAY_EVENT_C_3, m_creature);
+                    m_uiPhaseTimer = 5000;
+                    break;
+                case 19:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_ABEDNEUM_ACTIVATE, uint32(false));
+                    m_uiPhaseTimer = 5000;
+                    break;
+                case 20:
+                    SpawnDwarf(NPC_DARK_RUNE_STORMCALLER);
+                    m_uiPhaseTimer = 10000;
+                    break;
+                case 21:
+                    SpawnDwarf(NPC_DARK_RUNE_PROTECTOR);
+                    m_uiPhaseTimer = 15000;
+                    break;
+
+                case 22:
+                    DoScriptText(SAY_EVENT_D_1, m_creature);
+                    SpawnDwarf(NPC_IRON_GOLEM_CUSTODIAN);
+                    m_uiPhaseTimer = 20000;
+                    break;
+                case 23:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_ABEDNEUM_SPEAK, -SAY_EVENT_D_2_ABED);
+                    SpawnDwarf(NPC_DARK_RUNE_PROTECTOR);
+                    m_uiPhaseTimer = 5000;
+                    break;
+                case 24:
+                    SpawnDwarf(NPC_DARK_RUNE_STORMCALLER);
+                    m_uiPhaseTimer = 15000;
+                    break;
+                case 25:
+                    DoScriptText(SAY_EVENT_D_3, m_creature);
+                    SpawnDwarf(NPC_IRON_GOLEM_CUSTODIAN);
+                    m_uiPhaseTimer = 5000;
+                    break;
+                case 26:
+                    SpawnDwarf(NPC_DARK_RUNE_PROTECTOR);
+                    m_uiPhaseTimer = 5000;
+                    break;
+                case 27:
+                    SpawnDwarf(NPC_DARK_RUNE_STORMCALLER);
+                    m_uiPhaseTimer = 10000;
+                    break;
+                case 28:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_ABEDNEUM_SPEAK, -SAY_EVENT_D_4_ABED);
+                    SpawnDwarf(NPC_DARK_RUNE_PROTECTOR);
+                    m_uiPhaseTimer = 10000;
+                    break;
+
+                    // End Event
+                case 29:
+                    DoScriptText(SAY_EVENT_END_01, m_creature);
+                    m_creature->SetStandState(UNIT_STAND_STATE_STAND);// TODO TODO
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_TRIBUNAL, SPECIAL); // Kill remaining npcs
+
+                    // ToDo: the loot and the achiev should be triggered at this point
+                    // Brann should get the gossip option "There will be plenty of time for this later Brann, we need to get moving!"
+                    // This will allow Brann to continue the escort to the last encounter
+                    // When reaching the last door he has the gossip "We're with you Brann! Open it!"
+
+                    SetEscortPaused(false);
+                    m_uiPhaseTimer = 3000;
+                    // break;
+                    // case 30:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_ABEDNEUM_ACTIVATE, uint32(true));
+                    m_uiPhaseTimer = 0;
+                    break;
+                case 30:
+                    DoScriptText(SAY_EVENT_END_02, m_creature);
+                    m_uiPhaseTimer = 5500;
+                    break;
+                case 31:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_ABEDNEUM_SPEAK, -SAY_EVENT_END_03_ABED);
+                    m_uiPhaseTimer = 8500;
+                    break;
+                case 32:
+                    DoScriptText(SAY_EVENT_END_04, m_creature);
+                    m_uiPhaseTimer = 11500;
+                    break;
+                case 33:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_ABEDNEUM_SPEAK, -SAY_EVENT_END_05_ABED);
+                    m_uiPhaseTimer = 11500;
+                    break;
+                case 34:
+                    DoScriptText(SAY_EVENT_END_06, m_creature);
+                    m_uiPhaseTimer = 4500;
+                    break;
+                case 35:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_ABEDNEUM_SPEAK, -SAY_EVENT_END_07_ABED);
+                    m_uiPhaseTimer = 22500;
+                    break;
+                case 36:
+                    DoScriptText(SAY_EVENT_END_08, m_creature);
+                    m_uiPhaseTimer = 7500;
+                    break;
+                case 37:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_KADDRAK_SPEAK, -SAY_EVENT_END_09_KADD);
+                    m_uiPhaseTimer = 18500;
+                    break;
+                case 38:
+                    DoScriptText(SAY_EVENT_END_10, m_creature);
+                    m_uiPhaseTimer = 5500;
+                    break;
+                case 39:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_KADDRAK_SPEAK, -SAY_EVENT_END_11_KADD);
+                    m_uiPhaseTimer = 20500;
+                    break;
+                case 40:
+                    DoScriptText(SAY_EVENT_END_12, m_creature);
+                    m_uiPhaseTimer = 2500;
+                    break;
+                case 41:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_KADDRAK_SPEAK, -SAY_EVENT_END_13_KADD);
+                    m_uiPhaseTimer = 19500;
+                    break;
+                case 42:
+                    DoScriptText(SAY_EVENT_END_14, m_creature);
+                    m_uiPhaseTimer = 10500;
+                    break;
+                case 43:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_MARNAK_SPEAK, -SAY_EVENT_END_15_MARN);
+                    m_uiPhaseTimer = 6500;
+                    break;
+                case 44:
+                    DoScriptText(SAY_EVENT_END_16, m_creature);
+                    m_uiPhaseTimer = 6500;
+                    break;
+                case 45:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_MARNAK_SPEAK, -SAY_EVENT_END_17_MARN);
+                    m_uiPhaseTimer = 25500;
+                    break;
+                case 46:
+                    DoScriptText(SAY_EVENT_END_18, m_creature);
+                    m_uiPhaseTimer = 23500;
+                    break;
+                case 47:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_MARNAK_SPEAK, -SAY_EVENT_END_19_MARN);
+                    m_uiPhaseTimer = 3500;
+                    break;
+                case 48:
+                    DoScriptText(SAY_EVENT_END_20, m_creature);
+                    m_uiPhaseTimer = 8500;
+                    break;
+                case 49:
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_ABEDNEUM_SPEAK, -SAY_EVENT_END_21_ABED);
+                    m_uiPhaseTimer = 5500;
+                    break;
+                case 50:
+                    if (m_pInstance)
+                    {
+                        m_pInstance->DoUseDoorOrButton(GO_TRIBUNAL_FLOOR);
+                        m_pInstance->SetData(TYPE_TRIBUNAL, DONE);
+                    }
+
+                    if (Player* pPlayer = GetPlayerForEscort())
+                        pPlayer->GroupEventHappens(QUEST_HALLS_OF_STONE, m_creature);
+
+                    m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER);
+
+                    m_uiPhaseTimer = 180000;
+                    break;
+                case 51:
+                    SetEscortPaused(false);
+                    break;
+                }
+                ++m_uiStep;
+            }
+            else if (m_uiPhaseTimer)
+                m_uiPhaseTimer -= uiDiff;
+
+            if (!m_bIsLowHP && m_creature->GetHealthPercent() < 30)
+            {
+                DoScriptText(SAY_LOW_HEALTH, m_creature);
+                m_bIsLowHP = true;
+            }
+            else if (m_bIsLowHP && m_creature->GetHealthPercent() > 30)
+                m_bIsLowHP = false;
+
+            // No Combat abilities needed here
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+        }
+
+        // Respawn Handling: Relocate and Set Escort to WP 13
+        void JustRespawned() override
+        {
+            if (!m_pInstance)
+                return;
+
+            Reset();
+
+            if (m_pInstance->GetData(TYPE_TRIBUNAL) == IN_PROGRESS)
+            {
+                SetEscortPaused(true);
+
+                m_uiStep = 0;
+                m_uiPhaseTimer = 0;
+
+                m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+
+                // Relocate to position of WP 13
+                m_creature->GetMap()->CreatureRelocation(m_creature, 941.101563f, 377.373413f, 207.421f, 3.85f);
+
+                SetCurrentWaypoint(13);
+            }
+        }
+    };
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+
+        if (InstanceData* pInstance = (pCreature->GetInstanceData()))
+        {
+            if (pInstance->GetData(TYPE_TRIBUNAL) == NOT_STARTED || pInstance->GetData(TYPE_TRIBUNAL) == FAIL)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ID_START, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_START, pCreature->GetObjectGuid());
+            }
+            else if (pInstance->GetData(TYPE_TRIBUNAL) == IN_PROGRESS)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ID_PROGRESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+                pPlayer->SEND_GOSSIP_MENU(TEXT_ID_PROGRESS, pCreature->GetObjectGuid());
+            }
+        }
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            if (npc_brann_hosAI* pBrannAi = dynamic_cast<npc_brann_hosAI*>(pCreature->AI()))
+                pBrannAi->Start(false, pPlayer);
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            if (npc_brann_hosAI* pBrannAi = dynamic_cast<npc_brann_hosAI*>(pCreature->AI()))
+                pBrannAi->ContinueEvent();
+            break;
+        }
+        pPlayer->CLOSE_GOSSIP_MENU();
+
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_brann_hosAI(pCreature);
+    }
+};
+
+enum
+{
+    SPELL_SUMMON_DARK_MATTER_TARGET     = 51003,
+    SPELL_DARK_MATTER                   = 51012,
+    SPELL_DARK_MATTER_H                 = 59868,
+    NPC_DARK_MATTER_TARGET              = 28237,
+
+    SPELL_SEARING_GAZE                  = 51136,
+    SPELL_SEARING_GAZE_H                = 59867,
+    // NPC_SEARING_GAZE_TARGET          = 28265,
+};
+
+/*######
+## npc_dark_matter
+######*/
+
+struct npc_dark_matter : public CreatureScript
+{
+    npc_dark_matter() : CreatureScript("npc_dark_matter") {}
+
+    struct npc_dark_matterAI : public ScriptedAI
+    {
+        npc_dark_matterAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+
+        uint32 m_uiSummonTimer;
+
+        void Reset() override
+        {
+            m_uiSummonTimer = 0;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_DARK_MATTER_START)
+                m_uiSummonTimer = 5000;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_DARK_MATTER_TARGET)
+                m_creature->GetMotionMaster()->MovePoint(1, pSummoned->GetPositionX(), pSummoned->GetPositionY(), pSummoned->GetPositionZ());
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            // Cast the Dark Matter spell and despawn for reset
+            if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_DARK_MATTER : SPELL_DARK_MATTER_H) == CAST_OK)
+            {
+                m_creature->SetRespawnDelay(3);
+                m_creature->ForcedDespawn(1000);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiSummonTimer)
+            {
+                if (m_uiSummonTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_DARK_MATTER_TARGET) == CAST_OK)
+                        m_uiSummonTimer = 0;
+                }
+                else
+                    m_uiSummonTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_dark_matterAI(pCreature);
+    }
+};
+
+/*######
+## npc_searing_gaze
+######*/
+
+// TODO Move this 'script' to eventAI when combat can be proper prevented from core-side
+struct npc_searing_gaze : public CreatureScript
+{
+    npc_searing_gaze() : CreatureScript("npc_searing_gaze") {}
+
+    struct  npc_searing_gazeAI : public Scripted_NoMovementAI
+    {
+        npc_searing_gazeAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SEARING_GAZE : SPELL_SEARING_GAZE_H);
+            // despawn manually because of combat bug
+            m_creature->ForcedDespawn(30000);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_searing_gazeAI(pCreature);
+    }
+};
+
+void AddSC_halls_of_stone()
+{
+    Script* s;
+
+    s = new npc_brann_hos();
+    s->RegisterSelf();
+    s = new npc_dark_matter();
+    s->RegisterSelf();
+    s = new npc_searing_gaze();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_brann_hos";
+    //pNewScript->GetAI = &GetAI_npc_brann_hos;
+    //pNewScript->pGossipHello = &GossipHello_npc_brann_hos;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_brann_hos;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_dark_matter";
+    //pNewScript->GetAI = &GetAI_npc_dark_matter;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_searing_gaze";
+    //pNewScript->GetAI = &GetAI_npc_searing_gaze;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h b/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
new file mode 100644
index 000000000..a68787729
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
@@ -0,0 +1,72 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_HALLS_OF_STONE_H
+#define DEF_HALLS_OF_STONE_H
+
+enum
+{
+    MAX_ENCOUNTER           = 4,
+
+    TYPE_TRIBUNAL           = 0,
+    TYPE_MAIDEN             = 1,
+    TYPE_KRYSTALLUS         = 2,
+    TYPE_SJONNIR            = 3,
+    TYPE_ACHIEV_BRANN_SPANKIN   = MAX_ENCOUNTER,
+    TYPE_DO_SPAWN_DWARF         = MAX_ENCOUNTER + 1,
+    TYPE_DO_MARNAK_SPEAK        = MAX_ENCOUNTER + 2,    //order should be met in ScriptedInstance
+    TYPE_DO_ABEDNEUM_SPEAK      = MAX_ENCOUNTER + 3,
+    TYPE_DO_KADDRAK_SPEAK       = MAX_ENCOUNTER + 4,
+    TYPE_DO_MARNAK_ACTIVATE     = MAX_ENCOUNTER + 5,    //order: here too
+    TYPE_DO_ABEDNEUM_ACTIVATE   = MAX_ENCOUNTER + 6,
+    TYPE_DO_KADDRAK_ACTIVATE    = MAX_ENCOUNTER + 7,
+
+    NPC_BRANN_HOS           = 28070,
+
+    NPC_KADDRAK             = 30898,
+    NPC_ABEDNEUM            = 30899,
+    NPC_MARNAK              = 30897,
+    NPC_TRIBUNAL_OF_AGES    = 28234,
+    NPC_WORLDTRIGGER        = 22515,
+    NPC_DARK_MATTER         = 28235,                        // used by the Tribunal event
+    NPC_LIGHTNING_STALKER   = 28130,                        // used by the Tribunal event as spawn point for the dwarfs
+    NPC_IRON_SLUDGE         = 28165,                        // checked in the Sjonnir achiev
+    NPC_SJONNIR             = 27978,
+
+    NPC_DARK_RUNE_PROTECTOR     = 27983,
+    NPC_DARK_RUNE_STORMCALLER   = 27984,
+    NPC_IRON_GOLEM_CUSTODIAN    = 27985,
+
+    GO_DOOR_MAIDEN          = 191292,
+    GO_DOOR_TRIBUNAL        = 191294,                       // possibly closed during event?
+    GO_DOOR_TO_TRIBUNAL     = 191295,
+    GO_DOOR_SJONNIR         = 191296,
+
+    GO_TRIBUNAL_CHEST       = 190586,
+    GO_TRIBUNAL_CHEST_H     = 193996,
+
+    GO_TRIBUNAL_HEAD_RIGHT  = 191670,                       // marnak
+    GO_TRIBUNAL_HEAD_CENTER = 191669,                       // abedneum
+    GO_TRIBUNAL_HEAD_LEFT   = 191671,                       // kaddrak
+
+    GO_TRIBUNAL_CONSOLE     = 193907,
+    GO_TRIBUNAL_FLOOR       = 191527,
+
+    GO_SJONNIR_CONSOLE      = 193906,
+
+    SPELL_DARK_MATTER_START = 51001,                        // Channeled spells used by the Tribunal event
+
+    MAX_FACES               = 3,
+    FACE_MARNAK             = 0,
+    FACE_ABEDNEUM           = 1,
+    FACE_KADDRAK            = 2,
+
+    MAX_ACHIEV_SLUDGES      = 5,
+
+    ACHIEV_START_MAIDEN_ID  = 20383,
+
+    ACHIEV_CRIT_BRANN       = 7590,                         // Brann, achiev 2154
+    ACHIEV_CRIT_ABUSE_OOZE  = 7593,                         // Snonnir, achiev 2155
+};
+#endif
diff --git a/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp b/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
new file mode 100644
index 000000000..d685c78d9
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
@@ -0,0 +1,520 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Halls_of_Stone
+SD%Complete: 50%
+SDComment:
+SDCategory: Halls of Stone
+EndScriptData */
+
+#include "precompiled.h"
+#include "halls_of_stone.h"
+
+enum
+{
+    // KADDRAK
+    SPELL_GLARE_OF_THE_TRIBUNAL         = 50988,
+    SPELL_GLARE_OF_THE_TRIBUNAL_H       = 59870,
+
+    // MARNAK
+    // Spells are handled in individual script
+
+    // ABEDNEUM
+    SPELL_SUMMON_SEARING_GAZE_TARGET    = 51146,                // The other spells are handled in individual script
+
+    SPELL_KILL_TRIBUNAL_ADD             = 51288,                // Cleanup event on finish
+    SPELL_ACHIEVEMENT_CHECK             = 59046,                // Doesn't exist in client dbc - added in spell_template
+
+    SPELL_SUMMON_PROTECTOR              = 51780,                // all spells are casted by stalker npcs 28130
+    SPELL_SUMMON_STORMCALLER            = 51050,
+    SPELL_SUMMON_CUSTODIAN              = 51051,
+};
+
+struct Face
+{
+    Face() : m_bIsActive(false), m_uiTimer(1000) {}
+
+    ObjectGuid m_leftEyeGuid;
+    ObjectGuid m_rightEyeGuid;
+    ObjectGuid m_goFaceGuid;
+    ObjectGuid m_speakerGuid;
+    bool m_bIsActive;
+    uint32 m_uiTimer;
+};
+
+// Small Helper-function
+static void GetValidNPCsOfList(Map* pMap, GuidList& lGUIDs, std::list<Creature*>& lNPCs)
+{
+    lNPCs.clear();
+    for (GuidList::const_iterator itr = lGUIDs.begin(); itr != lGUIDs.end(); ++itr)
+    {
+        if (Creature* pMob = pMap->GetCreature(*itr))
+            lNPCs.push_back(pMob);
+    }
+}
+
+struct is_halls_of_stone : public InstanceScript
+{
+    is_halls_of_stone() : InstanceScript("instance_halls_of_stone") {}
+
+    class  instance_halls_of_stone : public ScriptedInstance
+    {
+    public:
+        instance_halls_of_stone(Map* pMap) : ScriptedInstance(pMap),
+            m_uiIronSludgeKilled(0),
+            m_bIsBrannSpankin(false)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_KADDRAK:          m_lKaddrakGUIDs.push_back(pCreature->GetObjectGuid());      break;
+            case NPC_ABEDNEUM:         m_lAbedneumGUIDs.push_back(pCreature->GetObjectGuid());     break;
+            case NPC_MARNAK:           m_lMarnakGUIDs.push_back(pCreature->GetObjectGuid());       break;
+            case NPC_TRIBUNAL_OF_AGES: m_lTribunalGUIDs.push_back(pCreature->GetObjectGuid());     break;
+            case NPC_WORLDTRIGGER:     m_lWorldtriggerGUIDs.push_back(pCreature->GetObjectGuid()); break;
+            case NPC_LIGHTNING_STALKER:
+                // Sort the dwarf summoning stalkers
+                if (pCreature->GetPositionY() > 400.0f)
+                    m_protectorStalkerGuid = pCreature->GetObjectGuid();
+                else if (pCreature->GetPositionY() > 380.0f)
+                    m_stormcallerStalkerGuid = pCreature->GetObjectGuid();
+                else
+                    m_custodianStalkerGuid = pCreature->GetObjectGuid();
+                break;
+            case NPC_DARK_MATTER:
+            case NPC_SJONNIR:
+            case NPC_BRANN_HOS:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_TRIBUNAL_CHEST:
+            case GO_TRIBUNAL_CHEST_H:
+                if (m_auiEncounter[TYPE_TRIBUNAL] == DONE)
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                break;
+            case GO_TRIBUNAL_HEAD_RIGHT:
+                m_aFaces[FACE_MARNAK].m_goFaceGuid = pGo->GetObjectGuid();
+                return;
+            case GO_TRIBUNAL_HEAD_CENTER:
+                m_aFaces[FACE_ABEDNEUM].m_goFaceGuid = pGo->GetObjectGuid();
+                return;
+            case GO_TRIBUNAL_HEAD_LEFT:
+                m_aFaces[FACE_KADDRAK].m_goFaceGuid = pGo->GetObjectGuid();
+                return;
+            case GO_DOOR_TO_TRIBUNAL:
+            case GO_DOOR_MAIDEN:
+            case GO_DOOR_SJONNIR:
+            case GO_DOOR_TRIBUNAL:
+            case GO_TRIBUNAL_CONSOLE:
+            case GO_TRIBUNAL_FLOOR:
+            case GO_SJONNIR_CONSOLE:
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_IRON_SLUDGE && GetData(TYPE_SJONNIR) == IN_PROGRESS)
+                ++m_uiIronSludgeKilled;
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_TRIBUNAL:
+                m_auiEncounter[uiType] = uiData;
+                switch (uiData)
+                {
+                case IN_PROGRESS:
+                    SortFaces();
+                    break;
+                case DONE:
+                    // Cast achiev check spell - Note: it's not clear who casts this spell, but for the moment we'll use Abedneum
+                    if (Creature* pEye = instance->GetCreature(m_aFaces[1].m_leftEyeGuid))
+                        pEye->CastSpell(pEye, SPELL_ACHIEVEMENT_CHECK, true);
+                    // Spawn the loot
+                    DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_TRIBUNAL_CHEST : GO_TRIBUNAL_CHEST_H, 30 * MINUTE);
+                    DoToggleGameObjectFlags(instance->IsRegularDifficulty() ? GO_TRIBUNAL_CHEST : GO_TRIBUNAL_CHEST_H, GO_FLAG_NO_INTERACT, false);
+                    // Door workaround because of the missing Bran event
+                    DoUseDoorOrButton(GO_DOOR_SJONNIR);
+                    break;
+                case FAIL:
+                    for (uint8 i = 0; i < MAX_FACES; ++i)
+                    {
+                        // Shut down the faces
+                        if (m_aFaces[i].m_bIsActive)
+                            DoUseDoorOrButton(m_aFaces[i].m_goFaceGuid);
+                        m_aFaces[i].m_bIsActive = false;
+                        m_aFaces[i].m_uiTimer = 1000;
+                    }
+                    break;
+                case SPECIAL:
+                    for (uint8 i = 0; i < MAX_FACES; ++i)
+                    {
+                        m_aFaces[i].m_bIsActive = false;
+                        m_aFaces[i].m_uiTimer = 1000;
+                        // TODO - Check which stay red and how long (also find out how they get red..)
+
+                        // Cleanup when finished
+                        if (Creature* pEye = instance->GetCreature(m_aFaces[i].m_leftEyeGuid))
+                            pEye->CastSpell(pEye, SPELL_KILL_TRIBUNAL_ADD, true);
+                        if (Creature* pEye = instance->GetCreature(m_aFaces[i].m_rightEyeGuid))
+                            pEye->CastSpell(pEye, SPELL_KILL_TRIBUNAL_ADD, true);
+                    }
+                    break;
+                }
+                break;
+            case TYPE_MAIDEN:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                    DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_MAIDEN_ID);
+                break;
+            case TYPE_KRYSTALLUS:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_SJONNIR:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_DOOR_SJONNIR);
+                if (uiData == IN_PROGRESS)
+                    m_uiIronSludgeKilled = 0;
+                break;
+            case TYPE_ACHIEV_BRANN_SPANKIN:
+                m_bIsBrannSpankin = bool(uiData);
+                return;
+            case TYPE_DO_SPAWN_DWARF:
+                // each case has an individual spawn stalker
+                switch (uiData)
+                {
+                case NPC_DARK_RUNE_PROTECTOR:
+                    if (Creature* pStalker = instance->GetCreature(m_protectorStalkerGuid))
+                    {
+                        uint32 uiSpawnNumber = (instance->IsRegularDifficulty() ? 2 : 3);
+                        for (uint8 i = 0; i < uiSpawnNumber; ++i)
+                            pStalker->CastSpell(pStalker, SPELL_SUMMON_PROTECTOR, true, NULL, NULL, m_mNpcEntryGuidStore[NPC_BRANN_HOS]);
+                        pStalker->CastSpell(pStalker, SPELL_SUMMON_STORMCALLER, true, NULL, NULL, m_mNpcEntryGuidStore[NPC_BRANN_HOS]);
+                    }
+                    break;
+                case NPC_DARK_RUNE_STORMCALLER:
+                    if (Creature* pStalker = instance->GetCreature(m_stormcallerStalkerGuid))
+                    {
+                        for (uint8 i = 0; i < 2; ++i)
+                            pStalker->CastSpell(pStalker, SPELL_SUMMON_STORMCALLER, true, NULL, NULL, m_mNpcEntryGuidStore[NPC_BRANN_HOS]);
+                    }
+                    break;
+                case NPC_IRON_GOLEM_CUSTODIAN:
+                    if (Creature* pStalker = instance->GetCreature(m_custodianStalkerGuid))
+                        pStalker->CastSpell(pStalker, SPELL_SUMMON_CUSTODIAN, true, NULL, NULL, m_mNpcEntryGuidStore[NPC_BRANN_HOS]);
+                    break;
+                }
+                return;
+            case TYPE_DO_ABEDNEUM_SPEAK:
+            case TYPE_DO_KADDRAK_SPEAK:
+            case TYPE_DO_MARNAK_SPEAK:
+                DoFaceSpeak(uiType - TYPE_DO_MARNAK_SPEAK, -int32(uiData));
+                return;
+            case TYPE_DO_KADDRAK_ACTIVATE:
+            case TYPE_DO_ABEDNEUM_ACTIVATE:
+            case TYPE_DO_MARNAK_ACTIVATE:
+                ActivateFace(uiType - TYPE_DO_MARNAK_ACTIVATE, bool(uiData));
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_auiEncounter[TYPE_TRIBUNAL] == IN_PROGRESS)
+            {
+                for (uint8 i = 0; i < MAX_FACES; ++i)
+                {
+                    if (!m_aFaces[i].m_bIsActive)
+                        continue;
+
+                    if (m_aFaces[i].m_uiTimer < uiDiff)
+                        ProcessFace(i);
+                    else
+                        m_aFaces[i].m_uiTimer -= uiDiff;
+                }
+            }
+        }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+            case ACHIEV_CRIT_BRANN:
+                return m_bIsBrannSpankin;
+            case ACHIEV_CRIT_ABUSE_OOZE:
+                return m_uiIronSludgeKilled >= MAX_ACHIEV_SLUDGES;
+
+            default:
+                return false;
+            }
+        }
+
+    private:
+        void ActivateFace(uint8 uiFace, bool bAfterEvent)   //@TODO get rid of the method
+        {
+            if (uiFace >= MAX_FACES)
+                return;
+
+            if (bAfterEvent)
+                DoUseDoorOrButton(m_aFaces[uiFace].m_goFaceGuid);
+            else
+            {
+                // TODO: How to get them red?
+                DoUseDoorOrButton(m_aFaces[uiFace].m_goFaceGuid);
+                m_aFaces[uiFace].m_bIsActive = true;
+            }
+        }
+
+        void DoFaceSpeak(uint8 uiFace, int32 iTextId)   //@TODO get rid of the method
+        {
+            if (uiFace >= MAX_FACES)
+                return;
+
+            if (Creature* pSpeaker = instance->GetCreature(m_aFaces[uiFace].m_speakerGuid))
+                DoScriptText(iTextId, pSpeaker);
+        }
+
+        void SortFaces()
+        {
+            std::list<Creature*> lPossibleEyes;
+
+            // FACE_MARNAK
+            if (GameObject* pFace = instance->GetGameObject(m_aFaces[FACE_MARNAK].m_goFaceGuid))
+            {
+                // Find Marnak NPCs
+                GetValidNPCsOfList(instance, m_lMarnakGUIDs, lPossibleEyes);
+                if (lPossibleEyes.size() > 1)
+                {
+                    lPossibleEyes.sort(SortHelper(pFace));
+                    std::list<Creature*>::const_iterator itr = lPossibleEyes.begin();
+                    m_aFaces[FACE_MARNAK].m_leftEyeGuid = (*itr)->GetObjectGuid();
+                    ++itr;
+                    m_aFaces[FACE_MARNAK].m_speakerGuid = (*itr)->GetObjectGuid();
+                }
+                // Find Worldtrigger NPC
+                GetValidNPCsOfList(instance, m_lWorldtriggerGUIDs, lPossibleEyes);
+                if (!lPossibleEyes.empty())
+                {
+                    lPossibleEyes.sort(SortHelper(pFace));
+                    m_aFaces[FACE_MARNAK].m_rightEyeGuid = (*lPossibleEyes.begin())->GetObjectGuid();
+                }
+            }
+
+            // FACE_ABEDNEUM
+            if (GameObject* pFace = instance->GetGameObject(m_aFaces[FACE_ABEDNEUM].m_goFaceGuid))
+            {
+                // Find Abedneum NPCs
+                GetValidNPCsOfList(instance, m_lAbedneumGUIDs, lPossibleEyes);
+                if (lPossibleEyes.size() > 1)
+                {
+                    lPossibleEyes.sort(SortHelper(pFace));
+                    std::list<Creature*>::const_iterator itr = lPossibleEyes.begin();
+                    m_aFaces[FACE_ABEDNEUM].m_leftEyeGuid = (*itr)->GetObjectGuid();
+                    ++itr;
+                    m_aFaces[FACE_ABEDNEUM].m_speakerGuid = (*itr)->GetObjectGuid();
+                }
+                // Find Worldtrigger NPC
+                GetValidNPCsOfList(instance, m_lWorldtriggerGUIDs, lPossibleEyes);
+                if (!lPossibleEyes.empty())
+                {
+                    lPossibleEyes.sort(SortHelper(pFace));
+                    m_aFaces[FACE_ABEDNEUM].m_rightEyeGuid = (*lPossibleEyes.begin())->GetObjectGuid();
+                }
+            }
+
+            // FACE_KADDRAK
+            if (GameObject* pFace = instance->GetGameObject(m_aFaces[FACE_KADDRAK].m_goFaceGuid))
+            {
+                // Find Marnak NPCs
+                GetValidNPCsOfList(instance, m_lKaddrakGUIDs, lPossibleEyes);
+                if (lPossibleEyes.size() > 1)
+                {
+                    lPossibleEyes.sort(SortHelper(pFace));
+                    std::list<Creature*>::const_iterator itr = lPossibleEyes.begin();
+                    m_aFaces[FACE_KADDRAK].m_leftEyeGuid = (*itr)->GetObjectGuid();
+                    ++itr;
+                    m_aFaces[FACE_KADDRAK].m_speakerGuid = (*itr)->GetObjectGuid();
+                }
+                // Find Tribunal NPC
+                GetValidNPCsOfList(instance, m_lTribunalGUIDs, lPossibleEyes);
+                if (!lPossibleEyes.empty())
+                {
+                    lPossibleEyes.sort(SortHelper(pFace));
+                    m_aFaces[FACE_KADDRAK].m_rightEyeGuid = (*lPossibleEyes.begin())->GetObjectGuid();
+                }
+            }
+
+            // Clear GUIDs
+            m_lKaddrakGUIDs.clear();
+            m_lAbedneumGUIDs.clear();
+            m_lMarnakGUIDs.clear();
+            m_lTribunalGUIDs.clear();
+            m_lWorldtriggerGUIDs.clear();
+        }
+
+        void ProcessFace(uint8 uiFace)
+        {
+            // Cast dmg spell from face eyes, and reset timer for face
+            switch (uiFace)
+            {
+            case FACE_KADDRAK:
+                if (Creature* pEye = instance->GetCreature(m_aFaces[uiFace].m_leftEyeGuid))
+                    pEye->CastSpell(pEye, instance->IsRegularDifficulty() ? SPELL_GLARE_OF_THE_TRIBUNAL : SPELL_GLARE_OF_THE_TRIBUNAL_H, true);
+                if (Creature* pEye = instance->GetCreature(m_aFaces[uiFace].m_rightEyeGuid))
+                    pEye->CastSpell(pEye, instance->IsRegularDifficulty() ? SPELL_GLARE_OF_THE_TRIBUNAL : SPELL_GLARE_OF_THE_TRIBUNAL_H, true, NULL, NULL, m_aFaces[uiFace].m_leftEyeGuid);
+                m_aFaces[uiFace].m_uiTimer = urand(1000, 2000);
+                break;
+            case FACE_MARNAK:
+                if (Creature* pDarkMatter = GetSingleCreatureFromStorage(NPC_DARK_MATTER))
+                    pDarkMatter->CastSpell(pDarkMatter, SPELL_DARK_MATTER_START, true);
+                // Note: Marnak doesn't cast anything directly. Keep this code for reference only.
+                // if (Creature* pEye = instance->GetCreature(m_aFaces[uiFace].m_leftEyeGuid))
+                //    pEye->CastSpell(pEye, SPELL_SUMMON_DARK_MATTER_TARGET, true);
+                // One should be enough..
+                // if (Creature* pEye = instance->GetCreature(m_aFaces[uiFace].m_rightEyeGuid))
+                //    pEye->CastSpell(pEye, SPELL_SUMMON_DARK_MATTER_TARGET, true);
+                m_aFaces[uiFace].m_uiTimer = urand(21000, 30000);
+                break;
+            case FACE_ABEDNEUM:
+                if (Creature* pEye = instance->GetCreature(m_aFaces[uiFace].m_leftEyeGuid))
+                    pEye->CastSpell(pEye, SPELL_SUMMON_SEARING_GAZE_TARGET, true);
+                // One should be enough..
+                // if (Creature* pEye = instance->GetCreature(m_aFaces[uiFace].m_rightEyeGuid))
+                //    pEye->CastSpell(pEye, SPELL_SUMMON_SEARING_GAZE_TARGET, true);
+                m_aFaces[uiFace].m_uiTimer = urand(15000, 20000);
+                break;
+            default:
+                return;
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        Face m_aFaces[MAX_FACES];
+        std::string m_strInstData;
+
+        uint8 m_uiIronSludgeKilled;
+        bool m_bIsBrannSpankin;
+
+        ObjectGuid m_protectorStalkerGuid;
+        ObjectGuid m_stormcallerStalkerGuid;
+        ObjectGuid m_custodianStalkerGuid;
+
+        GuidList m_lKaddrakGUIDs;
+        GuidList m_lAbedneumGUIDs;
+        GuidList m_lMarnakGUIDs;
+        GuidList m_lTribunalGUIDs;
+        GuidList m_lWorldtriggerGUIDs;
+
+        struct SortHelper
+        {
+            SortHelper(WorldObject const* pRef) : m_pRef(pRef) {}
+            bool operator()(WorldObject* pLeft, WorldObject* pRight)
+            {
+                return m_pRef->GetDistanceOrder(pLeft, pRight);
+            }
+            WorldObject const* m_pRef;
+        };
+
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_halls_of_stone(pMap);
+    }
+};
+
+void AddSC_instance_halls_of_stone()
+{
+    Script* s;
+
+    s = new is_halls_of_stone();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_halls_of_stone";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_halls_of_stone;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/assembly_of_iron.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/assembly_of_iron.cpp
new file mode 100644
index 000000000..351d966ad
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/assembly_of_iron.cpp
@@ -0,0 +1,800 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: assembly_of_iron
+SD%Complete: 90%
+SDComment: Lightning Tendrils target following could use some love from the core side
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+
+enum
+{
+    SAY_BRUNDIR_AGGRO                   = -1603056,
+    SAY_BRUNDIR_WHIRL                   = -1603057,
+    SAY_BRUNDIR_DEATH_1                 = -1603058,
+    SAY_BRUNDIR_DEATH_2                 = -1603059,
+    SAY_BRUNDIR_SLAY_1                  = -1603060,
+    SAY_BRUNDIR_SLAY_2                  = -1603061,
+    SAY_BRUNDIR_BERSERK                 = -1603062,
+    SAY_BRUNDIR_FLY                     = -1603063,
+
+    SAY_MOLGEIM_AGGRO                   = -1603064,
+    SAY_MOLGEIM_DEATH_1                 = -1603065,
+    SAY_MOLGEIM_DEATH_2                 = -1603066,
+    SAY_MOLGEIM_DEATH_RUNE              = -1603067,
+    SAY_MOLGEIM_SURGE                   = -1603068,
+    SAY_MOLGEIM_SLAY_1                  = -1603069,
+    SAY_MOLGEIM_SLAY_2                  = -1603070,
+    SAY_MOLGEIM_BERSERK                 = -1603071,
+
+    SAY_STEEL_AGGRO                     = -1603072,
+    SAY_STEEL_DEATH_1                   = -1603073,
+    SAY_STEEL_DEATH_2                   = -1603074,
+    SAY_STEEL_SLAY_1                    = -1603075,
+    SAY_STEEL_SLAY_2                    = -1603076,
+    SAY_STEEL_OVERWHELM                 = -1603077,
+    SAY_STEEL_BERSERK                   = -1603078,
+
+    // Common spells
+    SPELL_BERSERK                       = 62535,        // triggers 47008 after 15 min
+    SPELL_SUPERCHARGE                   = 61920,
+    SPELL_LIGHTNING_CHANNEL_PREFIGHT    = 61942,        // cast by Brundir on Steelbreaker
+    SPELL_RUNE_OF_POWER_PREFIGHT        = 61975,        // cast by Molgeim on Stellbreaker
+    SPELL_COUNCIL_KILL_CREDIT           = 65195,        // currently missing from DBC
+
+    // Steelbreaker
+    SPELL_HIGH_VOLTAGE                  = 61890,        // phase 1 spells
+    SPELL_HIGH_VOLTAGE_H                = 63498,        // probably related to 61892 - couldn't find any info regarding this one
+    SPELL_FUSION_PUNCH                  = 61903,
+    SPELL_FUSION_PUNCH_H                = 63493,
+    SPELL_STATIC_DISRUPTION             = 61911,        // phase 2 spells
+    SPELL_STATIC_DISRUPTION_H           = 63495,        // should be triggered by 64641
+    SPELL_OVERWHELMING_POWER            = 61888,        // phase 3 spells
+    SPELL_OVERWHELMING_POWER_H          = 64637,
+    SPELL_ELECTRICAL_CHARGE             = 61900,        // triggers 61901 when target dies
+
+    // Runemaster Molgeim
+    SPELL_SHIELD                        = 62274,        // phase 1 spells
+    SPELL_SHIELD_H                      = 63489,
+    SPELL_RUNE_OF_POWER                 = 61973,
+    SPELL_RUNE_OF_DEATH                 = 62269,        // phase 2 spells
+    SPELL_RUNE_OF_DEATH_H               = 63490,
+    SPELL_RUNE_OF_SUMMONING             = 62273,        // phase 3 spells
+
+    // Stormcaller Brundir
+    SPELL_CHAIN_LIGHTNING               = 61879,        // phase 1 spells
+    SPELL_CHAIN_LIGHTNING_H             = 63479,
+    SPELL_OVERLOAD                      = 61869,
+    SPELL_LIGHTNING_WHIRL               = 61915,        // phase 2 spells
+    SPELL_LIGHTNING_WHIRL_H             = 63483,
+    SPELL_LIGHTNING_WHIRL_DAMAGE        = 61916,        // used to check achiev criterias
+    SPELL_LIGHTNING_WHIRL_DAMAGE_H      = 63482,
+    SPELL_STORMSHIELD                   = 64187,        // phase 3 spells
+    SPELL_LIGHTNING_TENDRILS            = 61887,
+    SPELL_LIGHTNING_TENDRILS_H          = 63486,
+    SPELL_TENDRILS_VISUAL               = 61883,
+
+    // Summoned spells
+    SPELL_OVERLOAD_AURA                 = 61877,
+    SPELL_RUNE_OF_POWER_AURA            = 61974,
+    SPELL_RUNE_OF_SUMMONING_AURA        = 62019,        // triggers 62020 which summons 32958
+    SPELL_LIGHTNING_ELEMENTAL_PASSIVE   = 62052,
+    SPELL_LIGHTNING_ELEMENTAL_PASSIVE_H = 63492,
+
+    // summoned npcs
+    NPC_OVERLOAD_VISUAL                 = 32866,
+    NPC_RUNE_OF_POWER                   = 33705,
+    NPC_RUNE_OF_SUMMONING               = 33051,
+    NPC_LIGHTNING_ELEMENTAL             = 32958,
+
+    PHASE_NO_CHARGE                     = 0,
+    PHASE_CHARGE_ONE                    = 1,
+    PHASE_CHARGE_TWO                    = 2,
+
+    POINT_ID_LIFT_OFF                   = 1,
+    POINT_ID_LAND                       = 2,
+};
+
+struct boss_brundir : public CreatureScript
+{
+    boss_brundir() : CreatureScript("boss_brundir") {}
+
+    struct boss_brundirAI : public ScriptedAI
+    {
+        boss_brundirAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiPhase;
+        uint32 m_uiVisualTimer;
+        uint32 m_uiChainLightningTimer;
+        uint32 m_uiOverloadTimer;
+        uint32 m_uiWhirlTimer;
+        uint32 m_uiTendrilsTimer;
+        uint32 m_uiTendrilsTargetTimer;
+        uint32 m_uiTendrilsEndTimer;
+        uint32 m_uiTendrilsFollowTimer;
+
+        ObjectGuid m_followTargetGuid;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_NO_CHARGE;
+            m_uiVisualTimer = 5000;
+            m_uiChainLightningTimer = 0;
+            m_uiOverloadTimer = 35000;
+            m_uiWhirlTimer = 10000;
+            m_uiTendrilsTimer = 60000;
+            m_uiTendrilsEndTimer = 0;
+            m_uiTendrilsTargetTimer = 0;
+            m_uiTendrilsFollowTimer = 500;
+
+            m_creature->SetLevitate(false);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (!m_pInstance)
+                return;
+
+            // If we are not on the last phase then cast Supercharge and set as unlootable
+            if (m_uiPhase != PHASE_CHARGE_TWO)
+            {
+                m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+                DoCastSpellIfCan(m_creature, SPELL_SUPERCHARGE, CAST_TRIGGERED);
+                m_pInstance->SetData(TYPE_ACHIEV_BRUNDIR, uint32(false));
+            }
+            else
+            {
+                m_pInstance->SetData(TYPE_ASSEMBLY, DONE);
+                m_creature->CastSpell(m_creature, SPELL_COUNCIL_KILL_CREDIT, true);
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_BRUNDIR_DEATH_1 : SAY_BRUNDIR_DEATH_2, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_BRUNDIR_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ASSEMBLY, IN_PROGRESS);
+
+            m_creature->InterruptNonMeleeSpells(false);
+            DoCastSpellIfCan(m_creature, SPELL_BERSERK, CAST_TRIGGERED);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_BRUNDIR_SLAY_1 : SAY_BRUNDIR_SLAY_2, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ASSEMBLY, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_OVERLOAD_VISUAL)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_OVERLOAD_AURA, true);
+                // Visual npc- shouldn't move and should despawn in 6 sec
+                pSummoned->GetMotionMaster()->MoveIdle();
+                pSummoned->ForcedDespawn(6000);
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            // Increase the phase when hit with the supercharge spell by his brothers
+            if (pSpell->Id == SPELL_SUPERCHARGE)
+            {
+                // Not sure if there is a spell for this, so we are doing it here
+                m_creature->SetHealth(m_creature->GetMaxHealth());
+                ++m_uiPhase;
+            }
+
+            if (m_uiPhase == PHASE_CHARGE_TWO)
+            {
+                // Cast stormshield in the last phase
+                DoCastSpellIfCan(m_creature, SPELL_STORMSHIELD, CAST_TRIGGERED);
+
+                // set the instace data to special in order to mark the last phase - this is used to check the achiev criteria
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_ASSEMBLY, SPECIAL);
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            if (pTarget->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            if (!m_pInstance)
+                return;
+
+            // Check achiev criterias
+            switch (pSpell->Id)
+            {
+            case SPELL_CHAIN_LIGHTNING:
+            case SPELL_CHAIN_LIGHTNING_H:
+            case SPELL_LIGHTNING_WHIRL_DAMAGE:
+            case SPELL_LIGHTNING_WHIRL_DAMAGE_H:
+                m_pInstance->SetData(TYPE_ACHIEV_STUNNED, uint32(false));
+                break;
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            switch (uiPointId)
+            {
+                // After lift up follow a target and set the target change timer
+            case POINT_ID_LIFT_OFF:
+                // TODO: the boss should follow without changing his Z position - missing core feature
+                // Current implementation with move point is wrong
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_PLAYER | SELECT_FLAG_NOT_IN_MELEE_RANGE))
+                {
+                    DoMoveToTarget(pTarget);
+                    m_followTargetGuid = pTarget->GetObjectGuid();
+                }
+                m_uiTendrilsTargetTimer = 5000;
+                m_uiTendrilsFollowTimer = 500;
+                break;
+                // After reached the land remove all the auras and resume basic combat
+            case POINT_ID_LAND:
+                m_creature->SetLevitate(false);
+                SetCombatMovement(true);
+                if (m_creature->getVictim())
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+
+                m_creature->RemoveAurasDueToSpell(SPELL_TENDRILS_VISUAL);
+                m_creature->RemoveAurasDueToSpell(m_bIsRegularMode ? SPELL_LIGHTNING_TENDRILS : SPELL_LIGHTNING_TENDRILS_H);
+                break;
+            }
+        }
+
+        // Wrapper for target movement
+        void DoMoveToTarget(Unit* pTarget)
+        {
+            if (pTarget)
+            {
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MovePoint(0, pTarget->GetPositionX(), pTarget->GetPositionY(), m_creature->GetPositionZ());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Pre fight visual spell
+            if (m_uiVisualTimer)
+            {
+                if (m_uiVisualTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_LIGHTNING_CHANNEL_PREFIGHT) == CAST_OK)
+                        m_uiVisualTimer = 0;
+                }
+                else
+                    m_uiVisualTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            switch (m_uiPhase)
+            {
+            case PHASE_CHARGE_TWO:
+
+                if (m_uiTendrilsTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_LIGHTNING_TENDRILS : SPELL_LIGHTNING_TENDRILS_H) == CAST_OK)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_TENDRILS_VISUAL, CAST_TRIGGERED);
+                        DoScriptText(SAY_BRUNDIR_FLY, m_creature);
+                        SetCombatMovement(false);
+                        m_creature->SetLevitate(true);
+                        m_creature->GetMotionMaster()->MovePoint(POINT_ID_LIFT_OFF, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() + 15.0f);
+                        m_uiTendrilsTimer = 90000;
+                        m_uiTendrilsEndTimer = 25000;
+                    }
+                }
+                else
+                    m_uiTendrilsTimer -= uiDiff;
+
+                if (m_uiTendrilsEndTimer)
+                {
+                    if (m_uiTendrilsEndTimer <= uiDiff)
+                    {
+                        // Get proper Z position and land
+                        float fZ = m_creature->GetTerrain()->GetWaterOrGroundLevel(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+                        m_creature->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_creature->GetPositionX(), m_creature->GetPositionY(), fZ);
+                        m_uiOverloadTimer = 40000;
+                        m_uiWhirlTimer = 15000;
+                        m_uiChainLightningTimer = 3000;
+                        m_uiTendrilsEndTimer = 0;
+                        m_uiTendrilsTargetTimer = 0;
+                    }
+                    else
+                        m_uiTendrilsEndTimer -= uiDiff;
+
+                    // Change follow target every 5 seconds
+                    if (m_uiTendrilsTargetTimer)
+                    {
+                        if (m_uiTendrilsTargetTimer <= uiDiff)
+                        {
+                            // TODO: the boss should follow without changing his Z position - missing core feature
+                            // Current implementation with move point is wrong
+                            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_PLAYER | SELECT_FLAG_NOT_IN_MELEE_RANGE))
+                            {
+                                DoMoveToTarget(pTarget);
+                                m_followTargetGuid = pTarget->GetObjectGuid();
+                            }
+                            m_uiTendrilsTargetTimer = 5000;
+                            m_uiTendrilsFollowTimer = 500;
+                        }
+                        else
+                            m_uiTendrilsTargetTimer -= uiDiff;
+
+                        // Workaround to follow the target
+                        if (m_uiTendrilsFollowTimer < uiDiff)
+                        {
+                            if (Unit* pTarget = m_creature->GetMap()->GetUnit(m_followTargetGuid))
+                                DoMoveToTarget(pTarget);
+                            m_uiTendrilsFollowTimer = 500;
+                        }
+                        else
+                            m_uiTendrilsFollowTimer -= uiDiff;
+                    }
+
+                    // no other spells during tendrils
+                    return;
+                }
+
+                // no break here; he uses the other spells as well
+            case PHASE_CHARGE_ONE:
+
+                if (m_uiWhirlTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_LIGHTNING_WHIRL : SPELL_LIGHTNING_WHIRL_H) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BRUNDIR_WHIRL, m_creature);
+                        m_uiWhirlTimer = 30000;
+                    }
+                }
+                else
+                    m_uiWhirlTimer -= uiDiff;
+
+                // no break here; he uses the other spells as well
+            case PHASE_NO_CHARGE:
+
+                if (m_uiChainLightningTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_CHAIN_LIGHTNING : SPELL_CHAIN_LIGHTNING_H) == CAST_OK)
+                            m_uiChainLightningTimer = 2000;
+                    }
+                }
+                else
+                    m_uiChainLightningTimer -= uiDiff;
+
+                if (m_uiOverloadTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_OVERLOAD) == CAST_OK)
+                        m_uiOverloadTimer = 80000;
+                }
+                else
+                    m_uiOverloadTimer -= uiDiff;
+
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_brundirAI(pCreature);
+    }
+};
+
+struct boss_molgeim : public CreatureScript
+{
+    boss_molgeim() : CreatureScript("boss_molgeim") {}
+
+    struct boss_molgeimAI : public ScriptedAI
+    {
+        boss_molgeimAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiPhase;
+        uint32 m_uiVisualTimer;
+        uint32 m_uiShieldTimer;
+        uint32 m_uiRunePowerTimer;
+        uint32 m_uiRuneDeathTimer;
+        uint32 m_uiRuneSummonTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_NO_CHARGE;
+            m_uiVisualTimer = 5000;
+            m_uiShieldTimer = 25000;
+            m_uiRunePowerTimer = 15000;
+            m_uiRuneSummonTimer = 10000;
+            m_uiRuneDeathTimer = 30000;
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (!m_pInstance)
+                return;
+
+            // If we are not on the last phase then cast Supercharge and set as unlootable
+            if (m_uiPhase != PHASE_CHARGE_TWO)
+            {
+                m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+                DoCastSpellIfCan(m_creature, SPELL_SUPERCHARGE, CAST_TRIGGERED);
+                m_pInstance->SetData(TYPE_ACHIEV_MOLGEIM, uint32(false));
+            }
+            else
+            {
+                m_pInstance->SetData(TYPE_ASSEMBLY, DONE);
+                m_creature->CastSpell(m_creature, SPELL_COUNCIL_KILL_CREDIT, true);
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_MOLGEIM_DEATH_1 : SAY_MOLGEIM_DEATH_2, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_MOLGEIM_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ASSEMBLY, IN_PROGRESS);
+
+            m_creature->InterruptNonMeleeSpells(false);
+            DoCastSpellIfCan(m_creature, SPELL_BERSERK, CAST_TRIGGERED);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_MOLGEIM_SLAY_1 : SAY_MOLGEIM_SLAY_2, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ASSEMBLY, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_RUNE_OF_SUMMONING)
+                pSummoned->CastSpell(pSummoned, SPELL_RUNE_OF_SUMMONING_AURA, true, NULL, NULL, m_creature->GetObjectGuid());
+            else if (pSummoned->GetEntry() == NPC_RUNE_OF_POWER)
+                pSummoned->CastSpell(pSummoned, SPELL_RUNE_OF_POWER_AURA, true);
+            else if (pSummoned->GetEntry() == NPC_LIGHTNING_ELEMENTAL)
+            {
+                pSummoned->CastSpell(pSummoned, m_bIsRegularMode ? SPELL_LIGHTNING_ELEMENTAL_PASSIVE : SPELL_LIGHTNING_ELEMENTAL_PASSIVE_H, true);
+
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            // Increase the phase when hit with the supercharge spell by his brothers
+            if (pSpell->Id == SPELL_SUPERCHARGE)
+            {
+                // Not sure if there is a spell for this, so we are doing it here
+                m_creature->SetHealth(m_creature->GetMaxHealth());
+                ++m_uiPhase;
+            }
+
+            if (m_uiPhase == PHASE_CHARGE_TWO)
+            {
+                // set the instace data to special in order to mark the last phase - this is used to check the achiev criteria
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_ASSEMBLY, SPECIAL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Pre fight visual spell
+            if (m_uiVisualTimer)
+            {
+                if (m_uiVisualTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_RUNE_OF_POWER_PREFIGHT) == CAST_OK)
+                        m_uiVisualTimer = 0;
+                }
+                else
+                    m_uiVisualTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            switch (m_uiPhase)
+            {
+            case PHASE_CHARGE_TWO:
+
+                if (m_uiRuneSummonTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_RUNE_OF_SUMMONING) == CAST_OK)
+                    {
+                        DoScriptText(SAY_MOLGEIM_SURGE, m_creature);
+                        m_uiRuneSummonTimer = 30000;
+                    }
+                }
+                else
+                    m_uiRuneSummonTimer -= uiDiff;
+
+                // no break here; he uses the other spells as well
+            case PHASE_CHARGE_ONE:
+
+                if (m_uiRuneDeathTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_RUNE_OF_DEATH : SPELL_RUNE_OF_DEATH_H) == CAST_OK)
+                        {
+                            DoScriptText(SAY_MOLGEIM_DEATH_RUNE, m_creature);
+                            m_uiRuneDeathTimer = 30000;
+                        }
+                    }
+                }
+                else
+                    m_uiRuneDeathTimer -= uiDiff;
+
+                // no break here; he uses the other spells as well
+            case PHASE_NO_CHARGE:
+
+                if (m_uiShieldTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SHIELD : SPELL_SHIELD_H) == CAST_OK)
+                        m_uiShieldTimer = 40000;
+                }
+                else
+                    m_uiShieldTimer -= uiDiff;
+
+                if (m_uiRunePowerTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_RUNE_OF_POWER) == CAST_OK)
+                        m_uiRunePowerTimer = 45000;
+                }
+                else
+                    m_uiRunePowerTimer -= uiDiff;
+
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_molgeimAI(pCreature);
+    }
+};
+
+struct boss_steelbreaker : public CreatureScript
+{
+    boss_steelbreaker() : CreatureScript("boss_steelbreaker") {}
+
+    struct boss_steelbreakerAI : public ScriptedAI
+    {
+        boss_steelbreakerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiPhase;
+        uint32 m_uiFusionPunchTimer;
+        uint32 m_uiDisruptionTimer;
+        uint32 m_uiPowerTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_NO_CHARGE;
+            m_uiFusionPunchTimer = 15000;
+            m_uiDisruptionTimer = 15000;
+            m_uiPowerTimer = 10000;
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (!m_pInstance)
+                return;
+
+            // If we are not on the last phase then cast Supercharge and set as unlootable
+            if (m_uiPhase != PHASE_CHARGE_TWO)
+            {
+                m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+                DoCastSpellIfCan(m_creature, SPELL_SUPERCHARGE, CAST_TRIGGERED);
+                m_pInstance->SetData(TYPE_ACHIEV_STEELBREAKER, uint32(false));
+            }
+            else
+            {
+                m_pInstance->SetData(TYPE_ASSEMBLY, DONE);
+                m_creature->CastSpell(m_creature, SPELL_COUNCIL_KILL_CREDIT, true);
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_STEEL_DEATH_1 : SAY_STEEL_DEATH_2, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_STEEL_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ASSEMBLY, IN_PROGRESS);
+
+            DoCastSpellIfCan(m_creature, SPELL_BERSERK, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_HIGH_VOLTAGE : SPELL_HIGH_VOLTAGE_H, CAST_TRIGGERED);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_STEEL_SLAY_1 : SAY_STEEL_SLAY_2, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ASSEMBLY, FAIL);
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            // Increase the phase when hit with the supercharge spell by his brothers
+            if (pSpell->Id == SPELL_SUPERCHARGE)
+            {
+                // Not sure if there is a spell for this, so we are doing it here
+                m_creature->SetHealth(m_creature->GetMaxHealth());
+                ++m_uiPhase;
+            }
+
+            if (m_uiPhase == PHASE_CHARGE_TWO)
+            {
+                // Cast electrical charge aura on all players - this will proc when player dies
+                DoCastSpellIfCan(m_creature, SPELL_ELECTRICAL_CHARGE, CAST_TRIGGERED);
+
+                // set the instace data to special in order to mark the last phase - this is used to check the achiev criteria
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_ASSEMBLY, SPECIAL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            switch (m_uiPhase)
+            {
+            case PHASE_CHARGE_TWO:
+
+                if (m_uiPowerTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_OVERWHELMING_POWER : SPELL_OVERWHELMING_POWER_H) == CAST_OK)
+                    {
+                        DoScriptText(SAY_STEEL_OVERWHELM, m_creature);
+                        m_uiPowerTimer = m_bIsRegularMode ? 60000 : 35000;
+                    }
+                }
+                else
+                    m_uiPowerTimer -= uiDiff;
+
+                // no break here; he uses the other spells as well
+            case PHASE_CHARGE_ONE:
+
+                if (m_uiDisruptionTimer < uiDiff)
+                {
+                    // NOTE: This spell is not cast right: Normally it should be triggered by 64641 in core
+                    // Because of the poor target selection in core we'll implement it here with select flag targeting
+                    Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, uint32(0), SELECT_FLAG_NOT_IN_MELEE_RANGE);
+
+                    if (!pTarget)
+                        pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0);
+
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_STATIC_DISRUPTION : SPELL_STATIC_DISRUPTION_H) == CAST_OK)
+                        m_uiDisruptionTimer = urand(10000, 15000);
+                }
+                else
+                    m_uiDisruptionTimer -= uiDiff;
+
+                // no break here; he uses the other spells as well
+            case PHASE_NO_CHARGE:
+
+                if (m_uiFusionPunchTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_FUSION_PUNCH : SPELL_FUSION_PUNCH_H) == CAST_OK)
+                        m_uiFusionPunchTimer = 15000;
+                }
+                else
+                    m_uiFusionPunchTimer -= uiDiff;
+
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_steelbreakerAI(pCreature);
+    }
+};
+
+void AddSC_boss_assembly_of_iron()
+{
+    Script* s;
+
+    s = new boss_brundir();
+    s->RegisterSelf();
+    s = new boss_molgeim();
+    s->RegisterSelf();
+    s = new boss_steelbreaker();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_brundir";
+    //pNewScript->GetAI = GetAI_boss_brundir;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_molgeim";
+    //pNewScript->GetAI = GetAI_boss_molgeim;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_steelbreaker";
+    //pNewScript->GetAI = GetAI_boss_steelbreaker;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_algalon.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_algalon.cpp
new file mode 100644
index 000000000..754f5bab9
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_algalon.cpp
@@ -0,0 +1,868 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_algalon
+SD%Complete: 85%
+SDComment: Achievements NYI; Some details might need some fine tunning.
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+
+enum
+{
+    SAY_INTRO_1                         = -1603106,
+    SAY_INTRO_2                         = -1603107,
+    SAY_INTRO_3                         = -1603108,
+
+    SAY_ENGAGE                          = -1603109,
+    SAY_AGGRO                           = -1603110,
+    SAY_SLAY_1                          = -1603111,
+    SAY_SLAY_2                          = -1603112,
+    SAY_SUMMON_STAR                     = -1603113,
+    SAY_BIG_BANG_1                      = -1603114,
+    SAY_BIG_BANG_2                      = -1603115,
+    SAY_PHASE_2                         = -1603116,
+    SAY_BERSERK                         = -1603117,
+
+    SAY_DESPAWN_1                       = -1603118,
+    SAY_DESPAWN_2                       = -1603119,
+    SAY_DESPAWN_3                       = -1603120,
+
+    SAY_OUTRO_1                         = -1603121,
+    SAY_OUTRO_2                         = -1603122,
+    SAY_OUTRO_3                         = -1603123,
+    SAY_OUTRO_4                         = -1603124,
+    SAY_OUTRO_5                         = -1603125,
+    SAY_BRANN_OUTRO                     = -1603246,
+
+    // intro spells
+    SPELL_ARRIVAL                       = 64997,                // intro animation spells
+    SPELL_RIDE_LIGHTNING                = 64986,
+    SPELL_SUMMON_AZEROTH                = 64994,                // summons npc 34246
+    SPELL_REORIGINATION                 = 64996,                // channeled animation on Azeroth globe
+
+    // generic spells
+    // SPELL_ALGALON_EVENT_BEAM         = 64367,                // puspose unk
+    // SPELL_ALGALON_EVENT_CLIMAX       = 64580,
+    SPELL_KILL_CREDIT                   = 65184,                // achiev check spell
+    SPELL_SUPERMASSIVE_FAIL             = 65311,                // related to the Supermassive achievements
+    SPELL_BERSERK                       = 47008,
+    SPELL_ASCEND_HEAVENS                = 64487,                // cast when time's up
+    SPELL_TELEPORT                      = 62940,
+
+    // combat spells
+    SPELL_QUANTUM_STRIKE                = 64395,
+    SPELL_QUANTUM_STRIKE_H              = 64592,
+    SPELL_PHASE_PUNCH                   = 64412,
+    SPELL_PHASE_PUNCH_SHIFT             = 64417,
+    SPELL_COSMIC_SMASH_SUMMON           = 62301,                // triggers the spells which summon 33104 and 33105
+    SPELL_COSMIC_SMASH_SUMMON_H         = 64598,
+    SPELL_BIG_BANG                      = 64443,                // removes players from phase
+    SPELL_BIG_BANG_H                    = 64584,
+
+    // cosmic smash spells
+    SPELL_COSMIC_SMASH_STATE            = 62300,                // visual spell; cast by 33104
+    // SPELL_COSMIC_SMASH               = 62304,                // damage spells; cast by 33105 after 5 secs from spawn
+    // SPELL_COSMIC_SMASH_H             = 64597,
+
+    // collapsing star spells
+    SPELL_COLLAPSE                      = 62018,                // cast by npc 32955
+    SPELL_BLACK_HOLE_EXPLOSION          = 64122,                // cast on death
+    SPELL_BLACK_HOLE_EXPLOSION_H        = 65108,
+    SPELL_SUMMON_BLACK_HOLE             = 62189,                // summon npc 32953; cast on death
+
+    // black hole spells
+    SPELL_BLACK_HOLE_SPAWN_VISUAL       = 62003,                // spawn visual spell
+    SPELL_BLACK_HOLE_STATE              = 64135,                // visual spell
+    SPELL_BLACK_HOLE_TRIGG              = 62185,                // apply aoe phase aura
+    SPELL_BLACK_HOLE_PHASE              = 62168,
+    SPELL_BLACK_HOLE_DMG                = 62169,                // damage aura applied to players in phase realm
+    SPELL_BLACK_HOLE_CREDIT             = 65312,                // dummy aoe spell; related to the Supermassive achievements
+    SPELL_BLACK_HOLE_DESPAWN            = 64391,                // purpose unk
+
+    // living constellation spells
+    // SPELL_CONSTELATION_PHASE         = 65508,                // shift phase - use unk
+    SPELL_ARCANE_BARRAGE                = 64599,
+    SPELL_ARCANE_BARRAGE_H              = 64607,
+
+    // worm hole spells
+    SPELL_WORM_HOLE_TRIGGER             = 65251,                // apply aoe phase aura
+    SPELL_WORM_HOLE_PHASE               = 65250,
+    SPELL_SUMMON_UNLEASHED_DARK_MATTER  = 64450,                // summon npc 34097
+    SPELL_SUMMON_VOID_ZONE_VISUAL       = 64470,                // summon npc 34100
+
+    // void zone visual
+    SPELL_VOID_ZONE_VISUAL              = 64469,
+
+    // npcs
+    NPC_AZEROTH                         = 34246,
+    NPC_ASTEROID_STALKER_1              = 33104,
+    // NPC_ASTEROID_STALKER_2           = 33105,                // cast 62304 : 64597 on timer; handled in eventAI
+    NPC_COLLAPSING_STAR                 = 32955,
+    NPC_BLACK_HOLE                      = 32953,
+    NPC_VOID_ZONE_VISUAL                = 34100,
+    NPC_LIVING_CONSTELLATION            = 33052,
+    // NPC_DARK_MATTER                  = 33089,                // found in phaseMask 16
+    NPC_WORM_HOLE                       = 34099,                // spawned when below 20% hp
+    NPC_UNLEASHED_DARK_MATTER           = 34097,
+
+    // other
+    FACTION_ID_FRIENDLY                 = 35,
+    MAX_CONSTELATIONS                   = 11,
+    MAX_ACTIVE_CONSTELATIONS            = 3,
+    MAX_BLACK_HOLES                     = 4,
+    MAX_WORM_HOLES                      = 4,
+};
+
+static const DialogueEntry aAlgalonDialogue[] =
+{
+    {SAY_INTRO_1,           NPC_ALGALON,        6000},
+    {SPELL_SUMMON_AZEROTH,  0,                  5000},
+    {SAY_INTRO_2,           NPC_ALGALON,        8000},
+    {SAY_INTRO_3,           NPC_ALGALON,        0},
+    {SAY_AGGRO,             NPC_ALGALON,        14000},
+    {SAY_ENGAGE,            NPC_ALGALON,        0},
+    {SPELL_ASCEND_HEAVENS,  0,                  3000},
+    {SPELL_BERSERK,         0,                  0},
+    {SAY_DESPAWN_1,         NPC_ALGALON,        15000},
+    {SAY_DESPAWN_2,         NPC_ALGALON,        8000},
+    {SAY_DESPAWN_3,         NPC_ALGALON,        10000},
+    {SPELL_TELEPORT,        0,                  0},
+    {NPC_ALGALON,           0,                  12000},
+    {SAY_OUTRO_1,           NPC_ALGALON,        39000},
+    {SAY_OUTRO_2,           NPC_ALGALON,        18000},
+    {SAY_OUTRO_3,           NPC_ALGALON,        12000},
+    {SAY_OUTRO_4,           NPC_ALGALON,        12000},
+    {SAY_BRANN_OUTRO,       NPC_BRANN_ALGALON,  11000},
+    {SAY_OUTRO_5,           NPC_ALGALON,        0},
+    {0, 0, 0},
+};
+
+static const float afWormHoles[MAX_WORM_HOLES][3] =
+{
+    {1649.364f, -328.4229f, 417.4044f},
+    {1615.728f, -320.9379f, 417.4044f},
+    {1618.209f, -292.0328f, 417.4044f},
+    {1646.932f, -296.028f, 417.4044f},
+};
+
+static const float afConstellations[MAX_CONSTELATIONS][4] =
+{
+    {1678.677f, -276.328f, 427.7531f, 3.97f},
+    {1685.613f, -300.1219f, 443.2366f, 3.38f},
+    {1668.317f, -324.7676f, 457.9394f, 3.21f},
+    {1635.821f, -363.3442f, 424.3459f, 1.46f},
+    {1672.188f, -357.2484f, 436.7337f, 2.33f},
+    {1593.389f, -299.4325f, 432.4636f, 6.07f},
+    {1591.706f, -263.8201f, 441.4153f, 5.25f},
+    {1658.279f, -262.549f, 441.9073f, 4.18f},
+    {1592.242f, -325.5323f, 446.9508f, 0.22f},
+    {1625.208f, -267.2771f, 446.4296f, 5.04f},
+    {1615.8f, -348.0065f, 442.9586f, 1.13f},
+};
+
+/*######
+## boss_algalon
+######*/
+
+struct boss_algalon : public CreatureScript
+{
+    boss_algalon() : CreatureScript("boss_algalon") {}
+
+    struct boss_algalonAI : public ScriptedAI, private DialogueHelper
+    {
+        boss_algalonAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aAlgalonDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            InitializeDialogueHelper(m_pInstance);
+            m_bEventFinished = false;
+
+            // start intro event on first spawn
+            if (pCreature->GetPositionZ() > 450.0f)
+                DoStartIntroEvent();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bEventFinished;
+        bool m_bIsLowHealth;
+
+        uint32 m_uiBerserkTimer;
+        uint8 m_uiActiveConstelations;
+        uint8 m_uiActiveStars;
+
+        uint32 m_uiBigBangTimer;
+        uint32 m_uiCosmicSmashTimer;
+        uint32 m_uiPhasePunchTimer;
+        uint32 m_uiQuantumStrikeTimer;
+        uint32 m_uiCollapsingStarTimer;
+        uint32 m_uiConstellationTimer;
+
+        GuidList m_lSummonedGuids;
+        GuidList m_lConstellationsGuids;
+
+        void Reset() override
+        {
+            m_uiBerserkTimer = 6 * MINUTE * IN_MILLISECONDS;
+            m_bIsLowHealth = false;
+            m_uiActiveConstelations = 0;
+            m_uiActiveStars = 0;
+
+            m_uiQuantumStrikeTimer = 4000;
+            m_uiCollapsingStarTimer = 20000;
+            m_uiConstellationTimer = 60000;
+            m_uiBigBangTimer = 90000;
+            m_uiPhasePunchTimer = 15000;
+            m_uiCosmicSmashTimer = 30000;
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                // start the counter at the first aggro
+                if (m_pInstance->GetData(TYPE_ALGALON) == SPECIAL)
+                {
+                    m_pInstance->DoUpdateWorldState(WORLD_STATE_TIMER, 1);
+                    m_pInstance->SetData(TYPE_ALGALON_TIMER, 60);
+                }
+
+                m_pInstance->SetData(TYPE_ALGALON, IN_PROGRESS);
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_SUPERMASSIVE_FAIL, CAST_TRIGGERED);
+            // Note: it's not clear wether these texts should be yelled on every aggro
+            StartNextDialogueText(SAY_AGGRO);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            // don't attack again after being defeated
+            if (m_bEventFinished)
+                return;
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                if (!m_bEventFinished)
+                {
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_ALGALON, DONE);
+
+                    m_creature->setFaction(FACTION_ID_FRIENDLY);
+                    m_bEventFinished = true;
+                    EnterEvadeMode();
+                }
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (!m_pInstance)
+                return;
+
+            if (m_bEventFinished)
+            {
+                if (m_pInstance->GetData(TYPE_ALGALON) == DONE)
+                {
+                    // complete the achiev and start outro dialogue
+                    DoCastSpellIfCan(m_creature, SPELL_KILL_CREDIT, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_SUPERMASSIVE_FAIL, CAST_TRIGGERED);
+                    StartNextDialogueText(NPC_ALGALON);
+                }
+                else
+                    StartNextDialogueText(SAY_DESPAWN_1);
+            }
+            else
+                m_pInstance->SetData(TYPE_ALGALON, FAIL);
+
+            // despawn everything
+            for (GuidList::const_iterator itr = m_lSummonedGuids.begin(); itr != m_lSummonedGuids.end(); ++itr)
+            {
+                if (Creature* pSummoned = m_creature->GetMap()->GetCreature(*itr))
+                    pSummoned->ForcedDespawn();
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+                // move Brann to the center of the platform (and override pathfinding because of missing GO support)
+            case NPC_BRANN_ALGALON:
+                pSummoned->SetWalk(false);
+                pSummoned->GetMotionMaster()->MovePoint(0, 1631.986f, -297.7831f, 417.321f, false);
+                break;
+            case NPC_AZEROTH:
+                pSummoned->ForcedDespawn(30000);
+                break;
+            case NPC_ASTEROID_STALKER_1:
+                // visual impact point for Cosmic Smash
+                pSummoned->CastSpell(pSummoned, SPELL_COSMIC_SMASH_STATE, true);
+                break;
+            case NPC_COLLAPSING_STAR:
+                // cast Collapse and move around spawn point
+                pSummoned->CastSpell(pSummoned, SPELL_COLLAPSE, true);
+                pSummoned->GetMotionMaster()->MoveRandomAroundPoint(pSummoned->GetPositionX(), pSummoned->GetPositionY(), pSummoned->GetPositionZ(), 30.0f);
+                ++m_uiActiveStars;
+                m_lSummonedGuids.push_back(pSummoned->GetObjectGuid());
+                break;
+            case NPC_LIVING_CONSTELLATION:
+                m_lConstellationsGuids.push_back(pSummoned->GetObjectGuid());
+                m_lSummonedGuids.push_back(pSummoned->GetObjectGuid());
+                break;
+            case NPC_BLACK_HOLE:
+                // cast Black Hole visuals
+                pSummoned->CastSpell(pSummoned, SPELL_BLACK_HOLE_SPAWN_VISUAL, true);
+                pSummoned->CastSpell(pSummoned, SPELL_BLACK_HOLE_STATE, true);
+                pSummoned->CastSpell(pSummoned, SPELL_BLACK_HOLE_TRIGG, true);
+                pSummoned->CastSpell(pSummoned, SPELL_SUMMON_VOID_ZONE_VISUAL, true, NULL, NULL, m_creature->GetObjectGuid());
+                m_lSummonedGuids.push_back(pSummoned->GetObjectGuid());
+                break;
+            case NPC_WORM_HOLE:
+                pSummoned->CastSpell(pSummoned, SPELL_WORM_HOLE_TRIGGER, true);
+                pSummoned->CastSpell(pSummoned, SPELL_SUMMON_VOID_ZONE_VISUAL, true, NULL, NULL, m_creature->GetObjectGuid());
+                m_lSummonedGuids.push_back(pSummoned->GetObjectGuid());
+                break;
+            case NPC_VOID_ZONE_VISUAL:
+                pSummoned->CastSpell(pSummoned, SPELL_VOID_ZONE_VISUAL, true);
+                m_lSummonedGuids.push_back(pSummoned->GetObjectGuid());
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_COLLAPSING_STAR)
+            {
+                pSummoned->CastSpell(pSummoned, m_bIsRegularMode ? SPELL_BLACK_HOLE_EXPLOSION : SPELL_BLACK_HOLE_EXPLOSION_H, true);
+                pSummoned->CastSpell(pSummoned, SPELL_SUMMON_BLACK_HOLE, true, NULL, NULL, m_creature->GetObjectGuid());
+                --m_uiActiveStars;
+                // Note: there should be some emote here informing the players how many Black Holes are spawned
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            // start intro and reset home position
+            StartNextDialogueText(SAY_INTRO_1);
+            m_creature->SetLevitate(false);
+            m_creature->RemoveAurasDueToSpell(SPELL_RIDE_LIGHTNING);
+            m_creature->SetRespawnCoord(afAlgalonMovePos[0], afAlgalonMovePos[1], afAlgalonMovePos[2], afAlgalonMovePos[3]);
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            if (!m_pInstance)
+                return;
+
+            switch (iEntry)
+            {
+            case SPELL_SUMMON_AZEROTH:
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_AZEROTH, CAST_TRIGGERED);
+                break;
+            case SAY_INTRO_2:
+                DoCastSpellIfCan(m_creature, SPELL_REORIGINATION);
+                break;
+            case SAY_ENGAGE:
+                // summon Living Constellations at this point
+                DoSpawnConstellations();
+                break;
+            case SPELL_BERSERK:
+                EnterEvadeMode();
+                break;
+            case SPELL_TELEPORT:
+                // despawn when time has run out
+                DoCastSpellIfCan(m_creature, SPELL_TELEPORT, CAST_TRIGGERED);
+                m_creature->ForcedDespawn(2000);
+                break;
+            case NPC_ALGALON:
+                // spawn Brann for epilogue dialogue
+                m_creature->SummonCreature(NPC_BRANN_ALGALON, 1631.962f, -208.6464f, 420.8867f, 4.71f, TEMPSUMMON_DEAD_DESPAWN, 0);
+                break;
+            case SAY_OUTRO_1:
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                break;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            // notify boss that time is over
+            // this will trigger the wipe spell and make the boss evade and finally despawn
+            if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                m_bEventFinished = true;
+                DoCastSpellIfCan(m_creature, SPELL_ASCEND_HEAVENS, CAST_INTERRUPT_PREVIOUS);
+                StartNextDialogueText(SPELL_ASCEND_HEAVENS);
+            }
+        }
+
+        // function to start the intro part on first spawn
+        void DoStartIntroEvent()
+        {
+            m_creature->SetLevitate(true);
+            DoCastSpellIfCan(m_creature, SPELL_ARRIVAL, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_RIDE_LIGHTNING, CAST_TRIGGERED);
+            m_creature->GetMotionMaster()->MovePoint(1, afAlgalonMovePos[0], afAlgalonMovePos[1], afAlgalonMovePos[2]);
+        }
+
+        // function which summons constellations
+        void DoSpawnConstellations()
+        {
+            for (uint8 i = 0; i < MAX_CONSTELATIONS; ++i)
+                m_creature->SummonCreature(NPC_LIVING_CONSTELLATION, afConstellations[i][0], afConstellations[i][1], afConstellations[i][2], afConstellations[i][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        // Activate a random Constellation
+        void ActivateRandomConstellation()
+        {
+            // spawn a new set of constellations if empty
+            if (m_lConstellationsGuids.empty())
+            {
+                DoSpawnConstellations();
+                m_uiConstellationTimer = 5000;
+                return;
+            }
+
+            GuidList::iterator iter = m_lConstellationsGuids.begin();
+            advance(iter, urand(0, m_lConstellationsGuids.size() - 1));
+
+            if (Creature* pConstellation = m_creature->GetMap()->GetCreature(*iter))
+            {
+                // follow second top aggro player
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, uint32(0), SELECT_FLAG_PLAYER))
+                {
+                    pConstellation->GetMotionMaster()->MoveFollow(pTarget, CONTACT_DISTANCE, 0);
+                    SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pConstellation);
+                    ++m_uiActiveConstelations;
+                }
+            }
+
+            m_lConstellationsGuids.remove(*iter);
+        }
+
+        // spawn a collapsing star
+        void DoSpawnCollapsingStar()
+        {
+            float fX, fY, fZ;
+            m_creature->GetRandomPoint(afAlgalonMovePos[0], afAlgalonMovePos[1], afAlgalonMovePos[2], 30.0f, fX, fY, fZ);
+            m_creature->SummonCreature(NPC_COLLAPSING_STAR, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    // it's unclear wether it casts Berserk or Ascend to Heavens
+                    if (DoCastSpellIfCan(m_creature, SPELL_ASCEND_HEAVENS, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            if (m_uiQuantumStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_QUANTUM_STRIKE : SPELL_QUANTUM_STRIKE_H) == CAST_OK)
+                    m_uiQuantumStrikeTimer = 4000;
+            }
+            else
+                m_uiQuantumStrikeTimer -= uiDiff;
+
+            if (m_uiBigBangTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_BIG_BANG : SPELL_BIG_BANG_H) == CAST_OK)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_BIG_BANG_1 : SAY_BIG_BANG_2, m_creature);
+                    m_uiBigBangTimer = 90000;
+                }
+            }
+            else
+                m_uiBigBangTimer -= uiDiff;
+
+            if (m_uiCosmicSmashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_COSMIC_SMASH_SUMMON : SPELL_COSMIC_SMASH_SUMMON_H) == CAST_OK)
+                    m_uiCosmicSmashTimer = urand(40000, 50000);
+            }
+            else
+                m_uiCosmicSmashTimer -= uiDiff;
+
+            if (m_uiPhasePunchTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_PHASE_PUNCH) == CAST_OK)
+                    m_uiPhasePunchTimer = 15000;
+            }
+            else
+                m_uiPhasePunchTimer -= uiDiff;
+
+            // summons are happening only above 20% hp
+            if (!m_bIsLowHealth)
+            {
+                if (m_uiCollapsingStarTimer < uiDiff)
+                {
+                    // spawn as many stars as it's needed to a max of 4
+                    uint8 uiMaxStars = MAX_BLACK_HOLES - m_uiActiveStars;
+                    if (uiMaxStars)
+                    {
+                        for (uint8 i = 0; i < uiMaxStars; ++i)
+                            DoSpawnCollapsingStar();
+
+                        DoScriptText(SAY_SUMMON_STAR, m_creature);
+                        m_uiCollapsingStarTimer = 60000;
+                    }
+                    else
+                        m_uiCollapsingStarTimer = 10000;
+                }
+                else
+                    m_uiCollapsingStarTimer -= uiDiff;
+
+                if (m_uiConstellationTimer < uiDiff)
+                {
+                    // activate as many constelations as it's needed to a max of 3
+                    uint8 uiMaxConstellations = MAX_ACTIVE_CONSTELATIONS - m_uiActiveConstelations;
+                    if (uiMaxConstellations)
+                    {
+                        m_uiConstellationTimer = 50000;
+
+                        for (uint8 i = 0; i < uiMaxConstellations; ++i)
+                            ActivateRandomConstellation();
+                    }
+                    else
+                        m_uiConstellationTimer = 10000;
+                }
+                else
+                    m_uiConstellationTimer -= uiDiff;
+            }
+
+            // switch to second phase
+            if (!m_bIsLowHealth && m_creature->GetHealthPercent() < 20.0f)
+            {
+                DoScriptText(SAY_PHASE_2, m_creature);
+                m_bIsLowHealth = true;
+
+                // despawn all remaining blackholes and collapsing stars
+                for (GuidList::const_iterator itr = m_lSummonedGuids.begin(); itr != m_lSummonedGuids.end(); ++itr)
+                {
+                    if (Creature* pBlackHole = m_creature->GetMap()->GetCreature(*itr))
+                        pBlackHole->ForcedDespawn();
+                }
+
+                // spawn new worm holes
+                for (uint8 i = 0; i < MAX_WORM_HOLES; ++i)
+                    m_creature->SummonCreature(NPC_WORM_HOLE, afWormHoles[i][0], afWormHoles[i][1], afWormHoles[i][2], 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_algalonAI(pCreature);
+    }
+};
+
+/*######
+## npc_living_constellation
+######*/
+
+struct npc_living_constellation : public CreatureScript
+{
+    npc_living_constellation() : CreatureScript("npc_living_constellation") {}
+
+    struct npc_living_constellationAI : public ScriptedAI
+    {
+        npc_living_constellationAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+        uint32 m_uiArcaneBarrageTimer;
+
+        void Reset() override
+        {
+            m_uiArcaneBarrageTimer = 0;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            // start casting Arcane Barrage
+            if (eventType == AI_EVENT_CUSTOM_A)
+                m_uiArcaneBarrageTimer = urand(5000, 7000);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiArcaneBarrageTimer)
+            {
+                if (m_uiArcaneBarrageTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ARCANE_BARRAGE : SPELL_ARCANE_BARRAGE_H) == CAST_OK)
+                        m_uiArcaneBarrageTimer = urand(5000, 7000);
+                }
+                else
+                    m_uiArcaneBarrageTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_living_constellationAI(pCreature);
+    }
+};
+
+/*######
+## npc_worm_hole
+######*/
+
+struct npc_worm_hole : public CreatureScript
+{
+    npc_worm_hole() : CreatureScript("npc_worm_hole") {}
+
+    struct npc_worm_holeAI : public Scripted_NoMovementAI
+    {
+        npc_worm_holeAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        uint32 m_uiDarkMatterTimer;
+
+        void Reset() override
+        {
+            m_uiDarkMatterTimer = urand(1000, 3000);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_UNLEASHED_DARK_MATTER)
+                pSummoned->SetInCombatWithZone();
+        }
+
+        void SpellHitTarget(Unit* pTarget, SpellEntry const* pSpellEntry) override
+        {
+            if (pTarget->GetTypeId() == TYPEID_PLAYER && pSpellEntry->Id == SPELL_WORM_HOLE_PHASE)
+                pTarget->CastSpell(pTarget, SPELL_BLACK_HOLE_DMG, true, NULL, NULL, m_creature->GetObjectGuid());
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiDarkMatterTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_UNLEASHED_DARK_MATTER) == CAST_OK)
+                    m_uiDarkMatterTimer = urand(10000, 15000);
+            }
+            else
+                m_uiDarkMatterTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_worm_holeAI(pCreature);
+    }
+};
+
+/*######
+## npc_black_hole
+######*/
+
+struct npc_black_hole : public CreatureScript
+{
+    npc_black_hole() : CreatureScript("npc_black_hole") {}
+
+    struct npc_black_holeAI : public Scripted_NoMovementAI
+    {
+        npc_black_holeAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        bool m_bIsDespawned;
+
+        void Reset() override
+        {
+            m_bIsDespawned = false;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // despawn when a Living Constellation is nearby
+            if (!m_bIsDespawned && pWho->GetEntry() == NPC_LIVING_CONSTELLATION && pWho->IsWithinDistInMap(m_creature, 6.0f))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_BLACK_HOLE_CREDIT, CAST_TRIGGERED);
+                pWho->CastSpell(m_creature, SPELL_BLACK_HOLE_DESPAWN, true);
+                m_bIsDespawned = true;
+
+                // despawn everything
+                ((Creature*)pWho)->ForcedDespawn(1000);
+                m_creature->ForcedDespawn(1000);
+                if (Creature* pVoidZone = GetClosestCreatureWithEntry(m_creature, NPC_VOID_ZONE_VISUAL, 5.0f))
+                    pVoidZone->ForcedDespawn(1000);
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, SpellEntry const* pSpellEntry) override
+        {
+            if (pTarget->GetTypeId() == TYPEID_PLAYER && pSpellEntry->Id == SPELL_BLACK_HOLE_PHASE)
+                pTarget->CastSpell(pTarget, SPELL_BLACK_HOLE_DMG, true, NULL, NULL, m_creature->GetObjectGuid());
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_black_holeAI(pCreature);
+    }
+};
+
+/*######
+## npc_collapsing_star
+######*/
+
+struct npc_collapsing_star : public CreatureScript
+{
+    npc_collapsing_star() : CreatureScript("npc_collapsing_star") {}
+
+    struct npc_collapsing_starAI : public ScriptedAI
+    {
+        npc_collapsing_starAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void Reset() override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_collapsing_starAI(pCreature);
+    }
+};
+
+/*######
+## go_celestial_access
+######*/
+
+struct go_celestial_access : public GameObjectScript
+{
+    go_celestial_access() : GameObjectScript("go_celestial_access") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+        if (!pInstance)
+            return true;
+
+        if (pInstance->GetData(TYPE_ALGALON) != NOT_STARTED)
+            return true;
+
+        // Set instance data and allow DB scripts to continue the event
+        pInstance->SetData(TYPE_ALGALON, SPECIAL);
+        return false;
+    }
+};
+
+void AddSC_boss_algalon()
+{
+    Script* s;
+
+    s = new boss_algalon();
+    s->RegisterSelf();
+    s = new npc_living_constellation();
+    s->RegisterSelf();
+    s = new npc_worm_hole();
+    s->RegisterSelf();
+    s = new npc_black_hole();
+    s->RegisterSelf();
+    s = new npc_collapsing_star();
+    s->RegisterSelf();
+
+    s = new go_celestial_access();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_algalon";
+    //pNewScript->GetAI = GetAI_boss_algalon;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_living_constellation";
+    //pNewScript->GetAI = GetAI_npc_living_constellation;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_worm_hole";
+    //pNewScript->GetAI = GetAI_npc_worm_hole;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_black_hole";
+    //pNewScript->GetAI = GetAI_npc_black_hole;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_collapsing_star";
+    //pNewScript->GetAI = GetAI_npc_collapsing_star;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_celestial_access";
+    //pNewScript->pGOUse = &GOUse_go_celestial_access;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp
new file mode 100644
index 000000000..f8734376b
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp
@@ -0,0 +1,409 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_auriaya
+SD%Complete: 100%
+SDComment:
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+
+enum
+{
+    SAY_AGGRO                           = -1603079,
+    SAY_SLAY_1                          = -1603080,
+    SAY_SLAY_2                          = -1603081,
+    SAY_BERSERK                         = -1603082,
+    SAY_DEATH                           = -1603083,
+    EMOTE_SCREECH                       = -1603084,
+    EMOTE_DEFENDER                      = -1603085,
+
+    // Auriaya
+    SPELL_BERSERK                       = 47008,
+    SPELL_GUARDIAN_SWARM                = 64396,            // triggers 64397
+    SPELL_SENTINEL_BLAST                = 64389,            // triggers 64392
+    SPELL_SENTINEL_BLAST_H              = 64678,            // triggers 64679
+    SPELL_SONIC_SCREECH                 = 64422,
+    SPELL_SONIC_SCREECH_H               = 64688,
+    SPELL_TERRIFYING_SCREECH            = 64386,
+    SPELL_ACTIVATE_FERAL_DEFENDER       = 64449,            // triggers 64447
+    SPELL_ACTIVATE_FERAL_DEFENDER_TRIGG = 64448,
+
+    // Feral Defender spells
+    SPELL_FERAL_ESSENCE                 = 64455,
+    SPELL_FERAL_ESSENCE_REMOVAL         = 64456,            // remove 1 stack of 64455
+    SPELL_FERAL_POUNCE                  = 64478,
+    SPELL_FERAL_POUNCE_H                = 64669,
+    SPELL_FERAL_RUSH                    = 64489,            // triggers 64496
+    SPELL_FERAL_RUSH_H                  = 64673,            // triggers 64674
+    SPELL_SEEPING_FERAL_ESSENCE_SUMMON  = 64457,
+    SPELL_FEIGN_DEATH                   = 64461,            // related to the feral defender feign death
+    SPELL_FULL_HEAL                     = 64460,            // on feign death remove
+
+    // Seeping Feral Essence
+    SPELL_SEEPING_FERAL_ESSENCE         = 64458,
+    SPELL_SEEPING_FERAL_ESSENCE_H       = 64676,
+
+    NPC_SEEPING_FERAL_ESSENCE           = 34098,            // summoned by the feral defender on feign death
+    // NPC_GUARDIAN_SWARN               = 34034,            // summoned by spell
+    NPC_FERAL_DEFENDER_STALKER          = 34096,
+};
+
+/*######
+## boss_auriaya
+######*/
+
+struct boss_auriaya : public CreatureScript
+{
+    boss_auriaya() : CreatureScript("boss_auriaya") {}
+
+    struct boss_auriayaAI : public ScriptedAI
+    {
+        boss_auriayaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiSwarmTimer;
+        uint32 m_uiSonicScreechTimer;
+        uint32 m_uiSentinelBlastTimer;
+        uint32 m_uiTerrifyingScreechTimer;
+        uint32 m_uiDefenderTimer;
+
+        void Reset() override
+        {
+            m_uiEnrageTimer = 10 * MINUTE * IN_MILLISECONDS;
+            m_uiSwarmTimer = 50000;
+            m_uiSonicScreechTimer = 58000;
+            m_uiSentinelBlastTimer = 40000;
+            m_uiTerrifyingScreechTimer = 38000;
+            m_uiDefenderTimer = 1 * MINUTE * IN_MILLISECONDS;
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_AURIAYA, DONE);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_AURIAYA, IN_PROGRESS);
+
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_AURIAYA, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Summon the feral defender
+            if (pSummoned->GetEntry() == NPC_FERAL_DEFENDER_STALKER)
+                DoCastSpellIfCan(pSummoned, SPELL_ACTIVATE_FERAL_DEFENDER, CAST_INTERRUPT_PREVIOUS);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiTerrifyingScreechTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TERRIFYING_SCREECH) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_SCREECH, m_creature);
+                    m_uiTerrifyingScreechTimer = 35000;
+                    m_uiSentinelBlastTimer = 2000;
+                }
+            }
+            else
+                m_uiTerrifyingScreechTimer -= uiDiff;
+
+            if (m_uiSentinelBlastTimer < uiDiff)
+            {
+                // Cast Sentinel blast right after terrifying screech
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SENTINEL_BLAST : SPELL_SENTINEL_BLAST_H) == CAST_OK)
+                    m_uiSentinelBlastTimer = 35000;
+            }
+            else
+                m_uiSentinelBlastTimer -= uiDiff;
+
+            if (m_uiDefenderTimer)
+            {
+                if (m_uiDefenderTimer <= uiDiff)
+                {
+                    // Summon the feral defender trigger
+                    if (DoCastSpellIfCan(m_creature, SPELL_ACTIVATE_FERAL_DEFENDER_TRIGG) == CAST_OK)
+                        m_uiDefenderTimer = 0;
+                }
+                else
+                    m_uiDefenderTimer -= uiDiff;
+            }
+
+            if (m_uiSonicScreechTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SONIC_SCREECH : SPELL_SONIC_SCREECH_H) == CAST_OK)
+                    m_uiSonicScreechTimer = 27000;
+            }
+            else
+                m_uiSonicScreechTimer -= uiDiff;
+
+            if (m_uiSwarmTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_GUARDIAN_SWARM) == CAST_OK)
+                        m_uiSwarmTimer = 37000;
+                }
+            }
+            else
+                m_uiSwarmTimer -= uiDiff;
+
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                {
+                    DoScriptText(SAY_BERSERK, m_creature);
+                    m_uiEnrageTimer = 10 * MINUTE * IN_MILLISECONDS;
+                }
+            }
+            else
+                m_uiEnrageTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_auriayaAI(pCreature);
+    }
+};
+
+/*######
+## boss_feral_defender
+######*/
+
+struct boss_feral_defender : public CreatureScript
+{
+    boss_feral_defender() : CreatureScript("boss_feral_defender") {}
+
+    struct boss_feral_defenderAI : public ScriptedAI
+    {
+        boss_feral_defenderAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_uiMaxFeralRush = m_bIsRegularMode ? 6 : 10;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiFeralRushCount;
+        uint8 m_uiMaxFeralRush;
+        uint32 m_uiPounceTimer;
+        uint32 m_uiFeralRushTimer;
+        uint32 m_uiReviveDelayTimer;
+        uint32 m_uiAttackDelayTimer;
+        uint32 m_uiKilledCount;
+
+        void Reset() override
+        {
+            m_uiFeralRushCount = 0;
+            m_uiReviveDelayTimer = 0;
+            m_uiAttackDelayTimer = 0;
+            m_uiPounceTimer = urand(9000, 12000);
+            m_uiFeralRushTimer = urand(3000, 5000);
+            m_uiKilledCount = 0;
+
+            DoCastSpellIfCan(m_creature, SPELL_FERAL_ESSENCE);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            // Set achiev criteria to true
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ACHIEV_NINE_LIVES, uint32(true));
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            // If we don't have the feral essence anymore then ignore this
+            if (m_uiKilledCount >= 8)                           // 9-1 == 8
+                return;
+
+            if (m_uiReviveDelayTimer)                           // Already faking
+            {
+                uiDamage = 0;
+                return;
+            }
+
+            if (uiDamage > m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                // Set Feign death, remove one aura stack and summon a feral essence
+                DoCastSpellIfCan(m_creature, SPELL_FEIGN_DEATH, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_FERAL_ESSENCE_REMOVAL, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SEEPING_FERAL_ESSENCE_SUMMON, CAST_TRIGGERED);
+
+                // the feign death aura doesn't do everything, so keep the following here as well
+                m_creature->SetHealth(0);
+                m_creature->ClearComboPointHolders();
+                m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+                m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->ClearAllReactives();
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MoveIdle();
+                m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+
+                m_uiReviveDelayTimer = 30000;
+                ++m_uiKilledCount;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Cast seeping feral essence on the summoned
+            if (pSummoned->GetEntry() == NPC_SEEPING_FERAL_ESSENCE)
+                pSummoned->CastSpell(pSummoned, m_bIsRegularMode ? SPELL_SEEPING_FERAL_ESSENCE : SPELL_SEEPING_FERAL_ESSENCE_H, true, NULL, NULL, m_creature->GetObjectGuid());
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiReviveDelayTimer)
+            {
+                if (m_uiReviveDelayTimer <= uiDiff)
+                {
+                    // ToDo: figure out how to enable the ressurrect animation
+                    DoCastSpellIfCan(m_creature, SPELL_FULL_HEAL, CAST_TRIGGERED);
+                    m_uiReviveDelayTimer = 0;
+                    m_uiAttackDelayTimer = 3000;
+                }
+                else
+                    m_uiReviveDelayTimer -= uiDiff;
+
+                // No Further action while faking
+                return;
+            }
+
+            if (m_uiAttackDelayTimer)
+            {
+                if (m_uiAttackDelayTimer <= uiDiff)
+                {
+                    DoResetThreat();
+                    m_creature->RemoveAurasDueToSpell(SPELL_FEIGN_DEATH);
+                    m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                    m_uiPounceTimer = urand(9000, 10000);
+                    m_uiFeralRushCount = 0;
+                    m_uiFeralRushTimer = 1000;
+                    m_uiAttackDelayTimer = 0;
+                }
+                else
+                    m_uiAttackDelayTimer -= uiDiff;
+
+                // No Further action while faking
+                return;
+            }
+
+            if (m_uiPounceTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_FERAL_POUNCE : SPELL_FERAL_POUNCE_H) == CAST_OK)
+                        m_uiPounceTimer = urand(13000, 16000);
+                }
+            }
+            else
+                m_uiPounceTimer -= uiDiff;
+
+            if (m_uiFeralRushTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_FERAL_RUSH : SPELL_FERAL_RUSH_H) == CAST_OK)
+                {
+                    ++m_uiFeralRushCount;
+
+                    if (m_uiFeralRushCount == m_uiMaxFeralRush)
+                    {
+                        m_uiFeralRushCount = 0;
+                        m_uiFeralRushTimer = 12000;
+                    }
+                    else
+                        m_uiFeralRushTimer = 400;
+                }
+            }
+            else
+                m_uiFeralRushTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_feral_defenderAI(pCreature);
+    }
+};
+
+void AddSC_boss_auriaya()
+{
+    Script* s;
+
+    s = new boss_auriaya();
+    s->RegisterSelf();
+    s = new boss_feral_defender();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_auriaya";
+    //pNewScript->GetAI = GetAI_boss_auriaya;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_feral_defender";
+    //pNewScript->GetAI = &GetAI_boss_feral_defender;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp
new file mode 100644
index 000000000..40816dbea
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp
@@ -0,0 +1,797 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_flame_leviathan
+SD%Complete: 75%
+SDComment: Defense turret AI and related event NYI.
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+
+enum
+{
+    SAY_AGGRO                               = -1603159,
+    SAY_SLAY                                = -1603160,
+    SAY_DEATH                               = -1603161,
+    SAY_CHANGE_1                            = -1603162,
+    SAY_CHANGE_2                            = -1603163,
+    SAY_CHANGE_3                            = -1603164,
+
+    SAY_PLAYER_RIDE                         = -1603165,
+    SAY_OVERLOAD_1                          = -1603166,
+    SAY_OVERLOAD_2                          = -1603167,
+    SAY_OVERLOAD_3                          = -1603168,
+
+    SAY_HARD_MODE                           = -1603169,
+    SAY_TOWER_FROST                         = -1603170,
+    SAY_TOWER_FIRE                          = -1603171,
+    SAY_TOWER_ENERGY                        = -1603172,
+    SAY_TOWER_NATURE                        = -1603173,
+    SAY_TOWER_DOWN                          = -1603174,
+
+    EMOTE_PURSUE                            = -1603175,
+    EMOTE_HODIR_FURY                        = -1603242,
+    EMOTE_FREYA_WARD                        = -1603243,
+    EMOTE_MIMIRON_INFERNO                   = -1603244,
+    EMOTE_THORIM_HAMMER                     = -1603245,
+
+    // Leviathan spells
+    SPELL_INVISIBILITY_DETECTION            = 18950,
+    SPELL_PURSUED                           = 62374,
+    SPELL_MISSILE_BARRAGE_TARGET            = 62401,                    // triggers 62400 on target
+    SPELL_MISSILE_BARRAGE                   = 62400,                    // has radius of 5k; requires core update
+    SPELL_FLAME_VENTS                       = 62396,
+    SPELL_BATTERING_RAM                     = 62376,
+    SPELL_GATHERING_SPEED                   = 62375,
+
+    // leviathan turret spells - handled in eventAI
+    // SPELL_FLAME_CANNON                   = 62395,
+
+    // defense turret spells
+    SPELL_OVERLOAD_CIRCUIT                  = 62399,
+    SPELL_SEARING_FLAME                     = 62402,
+    SPELL_SYSTEMS_SHUTDOWN                  = 62475,                    // sends event 21605 for achiev check
+    // Leviathan seat has missing aura 62421
+
+    // leviathan other spells - for the moment these are not used
+    // SPELL_SMOKE_TRAIL                    = 63575,
+    // SPELL_EJECT_ALL_PASSENGERS           = 50630,                    // used by vehicles on death; currently handled by DB linking
+    // SPELL_EJECT_PASSENGER_4              = 64614,
+    // SPELL_EJECT_PASSENGER_1              = 60603,
+
+    // tower buffs to Leviathan (applied on combat start if the towers are alive)
+    SPELL_TOWER_OF_FROST                    = 65077,
+    // SPELL_TOWER_OF_FROST_DEBUFF          = 65079,                    // removed by hotfix
+    SPELL_TOWER_OF_LIFE                     = 64482,
+    SPELL_TOWER_OF_STORMS                   = 65076,
+    SPELL_TOWER_OF_FLAMES                   = 65075,
+
+    // tower beacon abilities
+    SPELL_HODIR_FURY                        = 62533,                    // tower of frost
+    SPELL_FREYA_WARD                        = 62906,                    // tower of life
+    SPELL_THORIM_HAMMER                     = 62911,                    // tower of storms
+    SPELL_MIMIRON_INFERNO                   = 62909,                    // tower of flames
+
+    // beacon vehicles visuals
+    SPELL_LIGHTNING_SKYBEAM                 = 62897,                    // storm beacon
+    SPELL_RED_SKYBEAM                       = 63772,                    // flames beacon
+    SPELL_BLUE_SKYBEAM                      = 63769,                    // frost beacon
+    SPELL_GREEN_SKYBEAM                     = 62895,                    // life beacon
+
+    // other beacon vehicles spells
+    // SPELL_TARGET_SEARCH_A                = 63761,                    // cast by npc 33369 and targets missing npc 33835
+    // SPELL_TARGET_SEARCH_B                = 63762,                    // moves the caster to the target location
+    // SPELL_TARGET_SEARCH_C                = 63763,                    // these are not used since we are doing this by waypoint movement
+    // SPELL_TARGET_SEARCH_D                = 63764,
+    // SPELL_BEAM_TARGET_STATE              = 62898,                    // cast by all tower reticles; purpose unk
+    // SPELL_BIRTH                          = 40031,                    // not used; purpose unk
+
+    // vehicle accessories
+    // NPC_LEVIATHAN_SEAT                   = 33114,
+    // NPC_LEVIATHAN_TURRET                 = 33139,
+    // NPC_DEFENSE_TURRET                   = 33142,
+    // NPC_OVERLOAD_DEVICE                  = 33143,
+
+    // hard mode beacons - they cast the actual damage spells
+    NPC_HODIR_FURY                          = 33212,
+    // NPC_FREYA_WARD                       = 33367,
+    // NPC_THORIM_HAMMER                    = 33365,                    // handled in eventAI
+    // NPC_MIMIRON_INFERNO                  = 33370,
+
+    // beacon vehicles
+    NPC_THORIM_HAMMER_VEHICLE               = 33364,                    // has accessory 33365
+    NPC_MIMIRON_INFERNO_VEHICLE             = 33369,                    // has accessory 33370
+    NPC_HODIR_FURY_VEHICLE                  = 33108,                    // has accessory 33212
+    NPC_FREYA_WARD_VEHICLE                  = 33366,                    // has accessory 33367
+
+    // freya's ward summons - handled by eventAI
+    NPC_WRITHING_LASHER                     = 33387,                    // both spam spell 65062 on target
+    NPC_WARD_OF_LIFE                        = 34275,
+
+    // other npcs (spawned at epilogue)
+    SPELL_RIDE_VEHICLE                      = 43671,
+    NPC_BRANN_FLYING_MACHINE                = 34120,
+    NPC_BRANN_BRONZEBEARD_LEVIATHAN         = 34119,
+    NPC_ARCHMANGE_RHYDIAN                   = 33696,
+
+    MAX_FREYA_WARD                          = 4,
+    MAX_HODIR_FURY                          = 2,
+    // Mimiron inferno is only one
+    MAX_THORIM_HAMMER                       = 22,
+
+    TOWER_ID_HODIR                          = 0,
+    TOWER_ID_FREYA                          = 1,
+    TOWER_ID_MIMIRON                        = 2,
+    TOWER_ID_THORIM                         = 3,
+};
+
+static const int32 aLeviathanTowerYell[KEEPER_ENCOUNTER] = { SAY_TOWER_FROST, SAY_TOWER_NATURE, SAY_TOWER_FIRE, SAY_TOWER_ENERGY };
+static const int32 aLeviathanTowerEmote[KEEPER_ENCOUNTER] = { EMOTE_HODIR_FURY, EMOTE_FREYA_WARD, EMOTE_MIMIRON_INFERNO, EMOTE_THORIM_HAMMER };
+
+static const float afFreyaWard[MAX_FREYA_WARD][4] =
+{
+    {156.9291f, 61.52306f, 409.887f, 5.68f},
+    {376.641f, 68.61361f, 411.2287f, 3.85f},
+    {383.6206f, -130.8576f, 410.7088f, 2.26f},
+    {154.9095f, -137.4339f, 409.887f, 0.79f},
+};
+
+static const float afHodirFury[MAX_HODIR_FURY][3] =
+{
+    {219.9013f, 7.913357f, 409.7861f},
+    {326.0777f, -74.99034f, 409.887f},
+};
+
+static const float afMimironInferno[3] = {329.1809f, 8.02577f, 409.887f};
+
+/*######
+## boss_flame_leviathan
+######*/
+
+struct boss_flame_leviathan : public CreatureScript
+{
+    boss_flame_leviathan() : CreatureScript("boss_flame_leviathan") {}
+
+    struct boss_flame_leviathanAI : public ScriptedAI
+    {
+        boss_flame_leviathanAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_bInitTowers = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+        bool m_bInitTowers;
+        bool m_bUlduarTower[KEEPER_ENCOUNTER];
+
+        uint32 m_uiBatteringRamTimer;
+        uint32 m_uiFlameVentsTimer;
+        uint32 m_uiMissileBarrageTimer;
+        uint32 m_uiPursueTimer;
+        uint32 m_uiGatheringSpeedTimer;
+
+        uint32 m_uiHardModeTimer;
+        uint8 m_uiHardModeStep;
+
+        uint8 m_uiThorimHammerCount;
+        uint32 m_uiThorimHammerTimer;
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_INVISIBILITY_DETECTION, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+
+            for (uint8 i = 0; i < KEEPER_ENCOUNTER; ++i)
+                m_bUlduarTower[i] = false;
+
+            m_uiBatteringRamTimer = 10000;
+            m_uiFlameVentsTimer = 30000;
+            m_uiMissileBarrageTimer = 1000;
+            m_uiPursueTimer = 1000;
+            m_uiGatheringSpeedTimer = 10000;
+
+            m_uiHardModeTimer = 10000;
+            m_uiHardModeStep = 0;
+            m_uiThorimHammerCount = 0;
+            m_uiThorimHammerTimer = 0;
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LEVIATHAN, DONE);
+
+                // clear hard mode auras
+                if (Creature* pOrbital = m_pInstance->GetSingleCreatureFromStorage(NPC_ORBITAL_SUPPORT))
+                    pOrbital->RemoveAllAuras();
+            }
+
+            DoScriptText(SAY_DEATH, m_creature);
+
+            // start epilogue event
+            if (Creature* pFlyMachine = m_creature->SummonCreature(NPC_BRANN_FLYING_MACHINE, 175.2838f, -210.4325f, 501.2375f, 1.42f, TEMPSUMMON_CORPSE_DESPAWN, 0))
+            {
+                if (Creature* pBrann = m_creature->SummonCreature(NPC_BRANN_BRONZEBEARD_LEVIATHAN, 175.2554f, -210.6305f, 500.7375f, 1.42f, TEMPSUMMON_CORPSE_DESPAWN, 0))
+                    pBrann->CastSpell(pFlyMachine, SPELL_RIDE_VEHICLE, true);
+
+                pFlyMachine->SetWalk(false);
+                pFlyMachine->GetMotionMaster()->MovePoint(1, 229.9419f, -130.3764f, 409.5681f);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            // check the towers again to make sure that some of them were not destroyed in the meanwhile
+            FetchTowers();
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_LEVIATHAN, IN_PROGRESS);
+
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (urand(0, 1))
+                DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_LEVIATHAN, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_THORIM_HAMMER_VEHICLE:
+                pSummoned->CastSpell(pSummoned, SPELL_LIGHTNING_SKYBEAM, true);
+                break;
+            case NPC_MIMIRON_INFERNO_VEHICLE:
+                pSummoned->CastSpell(pSummoned, SPELL_RED_SKYBEAM, true);
+                break;
+            case NPC_HODIR_FURY_VEHICLE:
+                pSummoned->CastSpell(pSummoned, SPELL_BLUE_SKYBEAM, true);
+                break;
+            case NPC_FREYA_WARD_VEHICLE:
+                pSummoned->CastSpell(pSummoned, SPELL_GREEN_SKYBEAM, true);
+                break;
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            if (pSummoned->GetEntry() == NPC_BRANN_FLYING_MACHINE)
+            {
+                // spawn the Archmange and eject Brann
+                if (Creature* pArchmage = m_creature->SummonCreature(NPC_ARCHMANGE_RHYDIAN, 235.5596f, -136.1876f, 409.6508f, 1.78f, TEMPSUMMON_CORPSE_DESPAWN, 0))
+                {
+                    pArchmage->SetWalk(false);
+                    pArchmage->GetMotionMaster()->MovePoint(1, 239.3158f, -123.6443f, 409.8174f);
+                }
+
+                pSummoned->RemoveAllAuras();
+            }
+            else if (pSummoned->GetEntry() == NPC_ARCHMANGE_RHYDIAN)
+            {
+                if (Creature* pBrann = GetClosestCreatureWithEntry(pSummoned, NPC_BRANN_BRONZEBEARD_LEVIATHAN, 30.0f))
+                {
+                    // rest will be handled by DB scripts
+                    pBrann->SetWalk(false);
+                    pBrann->GetMotionMaster()->MoveWaypoint();
+                }
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            // set boss in combat (if not already)
+            m_creature->SetInCombatWithZone();
+        }
+
+        void SpellHitTarget(Unit* pTarget, SpellEntry const* pSpellEntry) override
+        {
+            if (pTarget->IsVehicle() && pSpellEntry->Id == SPELL_PURSUED)
+            {
+                m_creature->FixateTarget(pTarget);
+
+                if (Player* pPlayer = pTarget->GetCharmerOrOwnerPlayerOrPlayerItself())
+                    DoScriptText(EMOTE_PURSUE, m_creature, pPlayer);
+            }
+        }
+
+        // check for all active towers
+        void FetchTowers()
+        {
+            if (!m_pInstance)
+                return;
+
+            // the orbital support applies the tower auras
+            Creature* pOrbital = m_pInstance->GetSingleCreatureFromStorage(NPC_ORBITAL_SUPPORT);
+            if (!pOrbital)
+                return;
+
+            uint8 uiActiveTowers = 0;
+
+            // check the states twice: at reset and at aggro to make sure that some towers were not destroyed in the meanwhile
+            if (m_pInstance->GetData(TYPE_TOWER_HODIR) == DONE)
+            {
+                pOrbital->CastSpell(pOrbital, SPELL_TOWER_OF_FROST, true);
+                ++uiActiveTowers;
+                m_bUlduarTower[TOWER_ID_HODIR] = true;
+            }
+            else
+                pOrbital->RemoveAurasDueToSpell(SPELL_TOWER_OF_FROST);
+            if (m_pInstance->GetData(TYPE_TOWER_FREYA) == DONE)
+            {
+                pOrbital->CastSpell(pOrbital, SPELL_TOWER_OF_LIFE, true);
+                ++uiActiveTowers;
+                m_bUlduarTower[TOWER_ID_FREYA] = true;
+            }
+            else
+                pOrbital->RemoveAurasDueToSpell(SPELL_TOWER_OF_LIFE);
+            if (m_pInstance->GetData(TYPE_TOWER_MIMIRON) == DONE)
+            {
+                pOrbital->CastSpell(pOrbital, SPELL_TOWER_OF_FLAMES, true);
+                ++uiActiveTowers;
+                m_bUlduarTower[TOWER_ID_MIMIRON] = true;
+            }
+            else
+                pOrbital->RemoveAurasDueToSpell(SPELL_TOWER_OF_FLAMES);
+            if (m_pInstance->GetData(TYPE_TOWER_THORIM) == DONE)
+            {
+                pOrbital->CastSpell(pOrbital, SPELL_TOWER_OF_STORMS, true);
+                ++uiActiveTowers;
+                m_bUlduarTower[TOWER_ID_THORIM] = true;
+            }
+            else
+                pOrbital->RemoveAurasDueToSpell(SPELL_TOWER_OF_STORMS);
+
+            // inform instance about all active towers for future use in achievements and hard mode loot
+            m_pInstance->SetData(TYPE_LEVIATHAN_HARD, uiActiveTowers);
+        }
+
+        // Functions which handle the spawn of each type of add
+        void DoSpawnHodirFury()
+        {
+            for (uint8 i = 0; i < MAX_HODIR_FURY; ++i)
+                m_creature->SummonCreature(NPC_HODIR_FURY_VEHICLE, afHodirFury[i][0], afHodirFury[i][1], afHodirFury[i][2], 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        void DoSpawnFreyaWard()
+        {
+            for (uint8 i = 0; i < MAX_FREYA_WARD; ++i)
+                m_creature->SummonCreature(NPC_FREYA_WARD_VEHICLE, afFreyaWard[i][0], afFreyaWard[i][1], afFreyaWard[i][2], afFreyaWard[i][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        void DoSpawnMimironInferno()
+        {
+            // Mimiron inferno has waypoint movement
+            m_creature->SummonCreature(NPC_MIMIRON_INFERNO_VEHICLE, afMimironInferno[0], afMimironInferno[1], afMimironInferno[2], 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        void DoSpawnThorimHammer()
+        {
+            if (!m_pInstance)
+                return;
+
+            // get a random point compared to the center and spawn the npcs
+            if (Creature* pOrbital = m_pInstance->GetSingleCreatureFromStorage(NPC_ORBITAL_SUPPORT))
+            {
+                float fX, fY, fZ;
+                m_creature->GetRandomPoint(pOrbital->GetPositionX(), pOrbital->GetPositionY(), pOrbital->GetPositionZ(), 150.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_THORIM_HAMMER_VEHICLE, fX, fY, fZ, 0, TEMPSUMMON_TIMED_DESPAWN, 8000);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // fetch all tower buffs on the first update
+            if (!m_bInitTowers)
+            {
+                FetchTowers();
+                m_bInitTowers = true;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiPursueTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_PURSUED) == CAST_OK)
+                {
+                    // don't yell from the beginning
+                    if (!m_uiHardModeTimer)
+                    {
+                        switch (urand(0, 2))
+                        {
+                        case 0: DoScriptText(SAY_CHANGE_1, m_creature); break;
+                        case 1: DoScriptText(SAY_CHANGE_2, m_creature); break;
+                        case 2: DoScriptText(SAY_CHANGE_3, m_creature); break;
+                        }
+                    }
+                    m_uiPursueTimer = 30000;
+                }
+            }
+            else
+                m_uiPursueTimer -= uiDiff;
+
+            if (m_uiFlameVentsTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FLAME_VENTS) == CAST_OK)
+                    m_uiFlameVentsTimer = urand(15000, 25000);
+            }
+            else
+                m_uiFlameVentsTimer -= uiDiff;
+
+            if (m_uiBatteringRamTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_BATTERING_RAM) == CAST_OK)
+                    m_uiBatteringRamTimer = urand(10000, 15000);
+            }
+            else
+                m_uiBatteringRamTimer -= uiDiff;
+
+            if (m_uiMissileBarrageTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_MISSILE_BARRAGE_TARGET) == CAST_OK)
+                        m_uiMissileBarrageTimer = urand(1000, 2000);
+                }
+            }
+            else
+                m_uiMissileBarrageTimer -= uiDiff;
+
+            if (m_uiGatheringSpeedTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_GATHERING_SPEED) == CAST_OK)
+                    m_uiGatheringSpeedTimer = 10000;
+            }
+            else
+                m_uiGatheringSpeedTimer -= uiDiff;
+
+            // start hard mode
+            if (m_uiHardModeTimer)
+            {
+                if (m_uiHardModeTimer <= uiDiff)
+                {
+                    // if all towers are deactivated then skip the rest
+                    if (!m_bUlduarTower[TOWER_ID_HODIR] && !m_bUlduarTower[TOWER_ID_FREYA] && !m_bUlduarTower[TOWER_ID_MIMIRON] && !m_bUlduarTower[TOWER_ID_THORIM])
+                    {
+                        DoScriptText(SAY_TOWER_DOWN, m_creature);
+                        m_uiHardModeTimer = 0;
+                    }
+                    else
+                    {
+                        // yell hard mode start and start activating each tower one by one
+                        switch (m_uiHardModeStep)
+                        {
+                        case 0:
+                            DoScriptText(SAY_HARD_MODE, m_creature);
+                            m_uiHardModeTimer = 10000;
+                            ++m_uiHardModeStep;
+                            break;
+                        default:
+                            // iterate through all towers to check which is active; skip the ones which are deactivated without triggering the timer
+                            for (uint8 i = m_uiHardModeStep - 1; i < KEEPER_ENCOUNTER; ++i)
+                            {
+                                if (m_bUlduarTower[i])
+                                {
+                                    // yell tower active
+                                    DoScriptText(aLeviathanTowerYell[i], m_creature);
+                                    DoScriptText(aLeviathanTowerEmote[i], m_creature);
+
+                                    // activate the timer for each tower ability
+                                    switch (i)
+                                    {
+                                    case TOWER_ID_HODIR:    DoSpawnHodirFury();           break;
+                                    case TOWER_ID_FREYA:    DoSpawnFreyaWard();           break;
+                                    case TOWER_ID_MIMIRON:  DoSpawnMimironInferno();      break;
+                                    case TOWER_ID_THORIM:   m_uiThorimHammerTimer = 1000; break;
+                                    }
+
+                                    // reset timer and wait for another turn
+                                    m_uiHardModeTimer = 10000;
+                                    ++m_uiHardModeStep;
+                                    break;
+                                }
+                                else
+                                    ++m_uiHardModeStep;
+
+                                // stop the timer after the final element
+                                if (i == KEEPER_ENCOUNTER - 1)
+                                    m_uiHardModeTimer = 0;
+                            }
+                            break;
+                        }
+                    }
+                }
+                else
+                    m_uiHardModeTimer -= uiDiff;
+            }
+
+            // Tower of Storm abilities
+            if (m_uiThorimHammerTimer)
+            {
+                if (m_uiThorimHammerTimer <= uiDiff)
+                {
+                    DoSpawnThorimHammer();
+                    ++m_uiThorimHammerCount;
+
+                    if (m_uiThorimHammerCount == MAX_THORIM_HAMMER)
+                        m_uiThorimHammerTimer = 0;
+                    else
+                        m_uiThorimHammerTimer = 1000;
+                }
+                else
+                    m_uiThorimHammerTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_flame_leviathanAI(pCreature);
+    }
+};
+
+/*######
+## npc_hodir_fury_reticle
+######*/
+
+struct npc_hodir_fury_reticle : public CreatureScript
+{
+    npc_hodir_fury_reticle() : CreatureScript("npc_hodir_fury_reticle") {}
+
+    struct npc_hodir_fury_reticleAI : public ScriptedAI
+    {
+        npc_hodir_fury_reticleAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiTargetChaseTimer;
+        ObjectGuid m_hodirFuryGuid;
+
+        void Reset() override
+        {
+            m_uiTargetChaseTimer = 5000;
+            SetCombatMovement(false);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_HODIR_FURY)
+                m_hodirFuryGuid = pSummoned->GetObjectGuid();
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            // cast Hodir Fury on point reached and search for another target
+            if (Creature* pHodirFury = m_creature->GetMap()->GetCreature(m_hodirFuryGuid))
+                pHodirFury->CastSpell(m_creature, SPELL_HODIR_FURY, true);
+
+            m_uiTargetChaseTimer = 5000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiTargetChaseTimer)
+            {
+                if (m_uiTargetChaseTimer <= uiDiff)
+                {
+                    if (m_pInstance)
+                    {
+                        if (Creature* pLeviathan = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN))
+                        {
+                            if (Unit* pTarget = pLeviathan->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                                m_creature->GetMotionMaster()->MovePoint(1, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ());
+                        }
+                    }
+                    m_uiTargetChaseTimer = 0;
+                }
+                else
+                    m_uiTargetChaseTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_hodir_fury_reticleAI(pCreature);
+    }
+};
+
+/*######
+## npc_hodir_fury
+######*/
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_hodir_fury : public CreatureScript
+{
+    npc_hodir_fury() : CreatureScript("npc_hodir_fury") {}
+
+    struct npc_hodir_furyAI : public Scripted_NoMovementAI
+    {
+        npc_hodir_furyAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void Reset() override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_hodir_furyAI(pCreature);
+    }
+};
+
+/*######
+## npc_freya_ward
+######*/
+
+// TODO Move this 'script' to eventAI when combat can be proper prevented from core-side
+struct npc_freya_ward : public CreatureScript
+{
+    npc_freya_ward() : CreatureScript("npc_freya_ward") {}
+
+    struct npc_freya_wardAI : public Scripted_NoMovementAI
+    {
+        npc_freya_wardAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { Reset(); }
+
+        uint32 m_uiFreyaWardTimer;
+
+        void Reset() override
+        {
+            m_uiFreyaWardTimer = 30000;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_WRITHING_LASHER || pSummoned->GetEntry() == NPC_WARD_OF_LIFE)
+                pSummoned->SetInCombatWithZone();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiFreyaWardTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FREYA_WARD) == CAST_OK)
+                    m_uiFreyaWardTimer = 30000;
+            }
+            else
+                m_uiFreyaWardTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_freya_wardAI(pCreature);
+    }
+};
+
+/*######
+## npc_mimiron_inferno
+######*/
+
+// TODO Move this 'script' to eventAI when combat can be proper prevented from core-side
+struct npc_mimiron_inferno : public CreatureScript
+{
+    npc_mimiron_inferno() : CreatureScript("npc_mimiron_inferno") {}
+
+    struct npc_mimiron_infernoAI : public Scripted_NoMovementAI
+    {
+        npc_mimiron_infernoAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { Reset(); }
+
+        uint32 m_uiMimironInfernoTimer;
+
+        void Reset() override
+        {
+            m_uiMimironInfernoTimer = 15000;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiMimironInfernoTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MIMIRON_INFERNO) == CAST_OK)
+                    m_uiMimironInfernoTimer = 1000;
+            }
+            else
+                m_uiMimironInfernoTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_mimiron_infernoAI(pCreature);
+    }
+};
+
+void AddSC_boss_flame_leviathan()
+{
+    Script* s;
+
+    s = new boss_flame_leviathan();
+    s->RegisterSelf();
+    s = new npc_hodir_fury_reticle();
+    s->RegisterSelf();
+    s = new npc_hodir_fury();
+    s->RegisterSelf();
+    s = new npc_freya_ward();
+    s->RegisterSelf();
+    s = new npc_mimiron_inferno();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_flame_leviathan";
+    //pNewScript->GetAI = GetAI_boss_flame_leviathan;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_hodir_fury_reticle";
+    //pNewScript->GetAI = GetAI_npc_hodir_fury_reticle;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_hodir_fury";
+    //pNewScript->GetAI = GetAI_npc_hodir_fury;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_freya_ward";
+    //pNewScript->GetAI = GetAI_npc_freya_ward;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_mimiron_inferno";
+    //pNewScript->GetAI = GetAI_npc_mimiron_inferno;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_freya.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_freya.cpp
new file mode 100644
index 000000000..8e480dcc5
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_freya.cpp
@@ -0,0 +1,1118 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_freya
+SD%Complete: 95%
+SDComment: Elders and some of the Nature Allies handled in ACID. Script might require some minor improvements.
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+
+enum
+{
+    SAY_AGGRO                           = -1603000,
+    SAY_AGGRO_HARD                      = -1603001,
+    SAY_ADDS_CONSERVATOR                = -1603002,
+    SAY_ADDS_TRIO                       = -1603003,
+    SAY_ADDS_LASHER                     = -1603004,
+    SAY_SLAY_1                          = -1603005,
+    SAY_SLAY_2                          = -1603006,
+    SAY_EPILOGUE                        = -1603007,
+    SAY_BERSERK                         = -1603008,
+
+    EMOTE_ALLIES_NATURE                 = -1603010,
+    EMOTE_REGEN_ALLIES                  = -1603011,
+
+    SAY_AGGRO_BRIGHT                    = -1603014,
+    SAY_SLAY_1_BRIGHT                   = -1603015,
+    SAY_SLAY_2_BRIGHT                   = -1603016,
+    SAY_DEATH_BRIGHT                    = -1603017,
+
+    SAY_AGGRO_IRON                      = -1603018,
+    SAY_SLAY_1_IRON                     = -1603019,
+    SAY_SLAY_2_IRON                     = -1603020,
+    SAY_DEATH_IRON                      = -1603021,
+
+    SAY_AGGRO_STONE                     = -1603022,
+    SAY_SLAY_1_STONE                    = -1603023,
+    SAY_SLAY_2_STONE                    = -1603024,
+    SAY_DEATH_STONE                     = -1603025,
+
+    // general spells
+    SPELL_FREYA_CREDIT                  = 65074,                // kill credit spell; added in spell_template
+    SPELL_DEFORESTATION_CREDIT          = 65015,                // used for achievs 2985 and 2984
+    SPELL_TELEPORT                      = 62940,                // despawn on event end
+    SPELL_BERSERK                       = 47008,
+    // SPELL_FREYA_DUMMY_YELLOW         = 63292,                // dummy spells used to light up the crystals; used in dbscripts_on_creature_move
+    // SPELL_FREYA_DUMMY_BLUE           = 63294,
+    // SPELL_FREYA_DUMMY_GREEN          = 63295,
+
+    // combat spells
+    SPELL_ATTUNED_TO_NATURE             = 62519,
+    SPELL_TOUCH_OF_EONAR                = 62528,
+    SPELL_TOUCH_OF_EONAR_H              = 62892,
+    SPELL_SUNBEAM                       = 62623,
+    SPELL_SUNBEAM_H                     = 62872,
+
+    // summon creature spells
+    SPELL_SUMMON_ALLIES_OF_NATURE       = 62678,                // triggers random of 62685, 62686 or 62688
+    SPELL_SUMMON_ALLIES_OF_NATURE_H     = 62873,                // spell needs to be confirmed; identical to normal mode version
+    SPELL_SUMMON_WAVE_1                 = 62685,                // summon npc 33203
+    SPELL_SUMMON_WAVE_3                 = 62686,                // summon npcs 33202, 32916 and 32919
+    SPELL_SUMMON_WAVE_10                = 62688,                // summon 10 * npc 32918
+    SPELL_LIFEBINDERS_GIFT_SUMMON       = 62572,
+    SPELL_NATURE_BOMB_SUMMON            = 64604,
+
+    // summon loot spells
+    SPELL_SUMMON_CHEST_0                = 62950,                // summon loot chest spells, depending on the number of elders alive
+    SPELL_SUMMON_CHEST_1                = 62952,
+    SPELL_SUMMON_CHEST_2                = 62953,
+    SPELL_SUMMON_CHEST_3                = 62954,
+    SPELL_SUMMON_CHEST_0_H              = 62955,
+    SPELL_SUMMON_CHEST_1_H              = 62956,
+    SPELL_SUMMON_CHEST_2_H              = 62957,
+    SPELL_SUMMON_CHEST_3_H              = 62958,
+
+    // hard mode spells
+    SPELL_FULL_HEAL                     = 43978,
+    SPELL_DRAINED_OF_POWER              = 62467,                // stun effect for each elder alive after finish channeling
+
+    SPELL_BRIGHTLEAF_ESSENCE_CHANNEL    = 62485,                // brightleaf
+    SPELL_BRIGHTLEAF_ESSENCE_CHANNEL_H  = 65587,
+    SPELL_UNSTABLE_SUN_BEAM             = 62450,
+    SPELL_UNSTABLE_SUN_BEAM_H           = 62868,
+
+    SPELL_IRONBRANCH_ESSENCE_CHANNEL    = 62484,                // ironbrach
+    SPELL_IRONBRANCH_ESSENCE_CHANNEL_H  = 65588,
+    SPELL_IRON_ROOTS                    = 62439,
+    SPELL_IRON_ROOTS_H                  = 62862,
+
+    SPELL_STONEBARK_ESSEMCE_CHANNEL     = 62483,                // stonebark
+    SPELL_STONEBARK_ESSEMCE_CHANNEL_H   = 65589,
+    SPELL_GROUND_TREMOR                 = 62437,
+    SPELL_GROUND_TREMOR_H               = 62859,
+
+    // summons spells
+    SPELL_SPORE_SUMMON_PERIODIC         = 62566,                // triggers 62582, 62591, 62592, 62593; cast by 33203
+    SPELL_HEALTHY_SPORE_VISUAL          = 62538,                // cast by npc 33215
+    SPELL_POTENT_PHEROMONES             = 62541,                // cast by npc 33215
+
+    // sun beam spells; handled by eventAI
+    // SPELL_UNSTABLE_SUN_BEAM_VISUAL   = 62216,                // cast by npc 33170
+    // SPELL_UNSTABLE_ENERGY            = 62451,                // cast by npc 33170
+    // SPELL_UNSTABLE_ENERGY_H          = 62865,
+
+    // iron roots spells
+    SPELL_STRENGTHEN_IRON_ROOTS         = 62440,                // remove stun and damange aura from summoner
+    SPELL_STRENGTHEN_IRON_ROOTS_H       = 63601,
+    SPELL_IRON_ROOTS_REMOVE             = 62282,                // same as above, but for the Elder version
+    SPELL_IRON_ROOTS_REMOVE_H           = 63598,
+
+    // nature bomb spells
+    SPELL_NATURE_BOMB_GO                = 64600,                // spawns go 194902
+    SPELL_NATURE_BOMB                   = 64587,
+    SPELL_NATURE_BOMB_H                 = 64650,
+
+    // allies of nature spells
+    SPELL_ATTUNED_10_STACKS             = 62525,                // remove 10 stacks of 62519
+    SPELL_ATTUNED_2_STACKS              = 62524,                // remove 2 stacks of 62519
+    SPELL_ATTUNED_25_STACKS             = 62521,                // remove 25 stacks of 62519
+
+    // three allies spells
+    SPELL_FEIGN_DEATH                   = 65985,
+    SPELL_CLEAR_DEBUFFS                 = 34098,
+    SPELL_TIDAL_WAVE                    = 62652,                // triggers 62653 or 62935
+    SPELL_TIDAL_WAVE_VISUAL             = 62655,
+    SPELL_HARDENED_BARK                 = 62664,
+    SPELL_HARDENED_BARK_H               = 64191,
+    SPELL_LIGHTNING_LASH                = 62648,
+    SPELL_LIGHTNING_LASH_H              = 62939,
+    SPELL_STORMBOLT                     = 62649,
+    SPELL_STORMBOLT_H                   = 62938,
+
+    // eonar's gift spells
+    SPELL_LIFEBINDERS_GIFT              = 62584,
+    SPELL_LIFEBINDERS_GIFT_H            = 64185,
+    SPELL_LIFEBINDERS_GIFT_VISUAL       = 62579,
+    SPELL_AUTO_GROW                     = 62559,                // cast by npcs 33228 and 33215
+    SPELL_PHEROMONES                    = 62619,
+
+    // allies of nature summons
+    NPC_DETONATING_LASHER               = 32918,                // has auras 64481 and 28819
+    NPC_ANCIENT_CONSERVATOR             = 33203,
+    NPC_WATER_SPIRIT                    = 33202,
+    NPC_STORM_LASHER                    = 32919,
+    NPC_SNAPLASHER                      = 32916,
+
+    // other summons
+    NPC_NATURE_BOMB                     = 34129,
+    // NPC_SUN_BEAM                     = 33170,                // handled in eventAI
+    // NPC_UNSTABLE_SUN_BEAM            = 33050,                // handled in eventAI
+    NPC_IRON_ROOTS                      = 33088,
+    NPC_STRENGHENED_IRON_ROOTS          = 33168,
+    NPC_EONARS_GIFT                     = 33228,
+    // NPC_HEALTHY_SPORE                = 33215,
+
+    // other
+    // GO_NATURE_BOMB                   = 194902,
+    MIN_ATTUNED_NATURE_STACKS           = 25,
+    MAX_ALLIES_SPELLS                   = 3,
+    MAX_ALLIES_WAVES                    = 6,
+};
+
+static const uint32 aAlliesSpawnSpells[MAX_ALLIES_SPELLS] = {SPELL_SUMMON_WAVE_1, SPELL_SUMMON_WAVE_3, SPELL_SUMMON_WAVE_10};
+
+/*######
+## boss_freya
+######*/
+
+struct boss_freya : public CreatureScript
+{
+    boss_freya() : CreatureScript("boss_freya") {}
+
+    struct boss_freyaAI : public ScriptedAI
+    {
+        boss_freyaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+
+            // init the Allies of Nature spells
+            spawnSpellsVector.reserve(MAX_ALLIES_SPELLS);
+            for (uint8 i = 0; i < MAX_ALLIES_SPELLS; ++i)
+                spawnSpellsVector.push_back(aAlliesSpawnSpells[i]);
+
+            m_bEventFinished = false;
+            m_uiEpilogueTimer = 0;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+        bool m_bEventFinished;
+
+        uint32 m_uiEpilogueTimer;
+        uint32 m_uiBerserkTimer;
+
+        uint32 m_uiAlliesNatureTimer;
+        uint8 m_uiAlliesWaveCount;
+
+        uint32 m_uiSunbeamTimer;
+        uint32 m_uiNatureBombTimer;
+        uint32 m_uiLifebindersGiftTimer;
+        uint32 m_uiThreeAlliesTimer;
+
+        uint32 m_uiUnstableEnergyTimer;
+        uint32 m_uiIronRootsTimer;
+        uint32 m_uiGroundTremorTimer;
+
+        ObjectGuid m_waterSpiritGuid;
+        ObjectGuid m_stormLasherGuid;
+        ObjectGuid m_snaplasherGuid;
+
+        std::vector<uint32> spawnSpellsVector;
+
+        void Reset() override
+        {
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            m_uiAlliesNatureTimer = 10000;
+            m_uiAlliesWaveCount = 0;
+            m_uiNatureBombTimer = 65000;
+            m_uiSunbeamTimer = 20000;
+            m_uiLifebindersGiftTimer = 25000;
+            m_uiThreeAlliesTimer = 0;
+
+            m_uiUnstableEnergyTimer = 0;
+            m_uiIronRootsTimer = 0;
+            m_uiGroundTremorTimer = 0;
+
+            // make the spawn spells random
+            std::random_shuffle(spawnSpellsVector.begin(), spawnSpellsVector.end());
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            // don't attack again after being defeated
+            if (m_bEventFinished)
+                return;
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_FREYA, IN_PROGRESS);
+
+            DoCastSpellIfCan(m_creature, SPELL_ATTUNED_TO_NATURE, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_TOUCH_OF_EONAR : SPELL_TOUCH_OF_EONAR_H, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+
+            FetchElders();
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            // don't attack again after being defeated
+            if (m_bEventFinished)
+                return;
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // don't attack again after being defeated
+            if (m_bEventFinished)
+                return;
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_FREYA, FAIL);
+
+                // reset elders
+                if (Creature* pElder = m_pInstance->GetSingleCreatureFromStorage(NPC_ELDER_BRIGHTLEAF))
+                {
+                    if (pElder->IsAlive())
+                        pElder->AI()->EnterEvadeMode();
+                }
+                if (Creature* pElder = m_pInstance->GetSingleCreatureFromStorage(NPC_ELDER_IRONBRACH))
+                {
+                    if (pElder->IsAlive())
+                        pElder->AI()->EnterEvadeMode();
+                }
+                if (Creature* pElder = m_pInstance->GetSingleCreatureFromStorage(NPC_ELDER_STONEBARK))
+                {
+                    if (pElder->IsAlive())
+                        pElder->AI()->EnterEvadeMode();
+                }
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+
+            if (m_creature->IsAlive() && !m_bEventFinished)
+                m_creature->GetMotionMaster()->MoveTargetedHome();
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                if (!m_bEventFinished)
+                {
+                    if (m_pInstance)
+                    {
+                        m_pInstance->SetData(TYPE_FREYA, DONE);
+
+                        // spawn chest loot
+                        switch (m_pInstance->GetData(TYPE_FREYA_HARD))
+                        {
+                        case 0: DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SUMMON_CHEST_0 : SPELL_SUMMON_CHEST_0_H, CAST_TRIGGERED); break;
+                        case 1: DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SUMMON_CHEST_1 : SPELL_SUMMON_CHEST_1_H, CAST_TRIGGERED); break;
+                        case 2: DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SUMMON_CHEST_2 : SPELL_SUMMON_CHEST_2_H, CAST_TRIGGERED); break;
+                        case 3: DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SUMMON_CHEST_3 : SPELL_SUMMON_CHEST_3_H, CAST_TRIGGERED); break;
+                        }
+
+                        // check aura stacks for achiev
+                        if (SpellAuraHolder* pNatureAura = m_creature->GetSpellAuraHolder(SPELL_ATTUNED_TO_NATURE))
+                        {
+                            if (pNatureAura && pNatureAura->GetStackAmount() >= MIN_ATTUNED_NATURE_STACKS)
+                                m_pInstance->SetData(TYPE_ACHIEV_BACK_NATURE, uint32(true));
+                        }
+                    }
+
+                    DoScriptText(SAY_EPILOGUE, m_creature);
+                    m_creature->CastSpell(m_creature, SPELL_FREYA_CREDIT, true);
+
+                    m_uiEpilogueTimer = 10000;
+                    m_bEventFinished = true;
+                    EnterEvadeMode();
+                }
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_EONARS_GIFT:
+                pSummoned->CastSpell(pSummoned, SPELL_LIFEBINDERS_GIFT_VISUAL, true);
+                pSummoned->CastSpell(pSummoned, SPELL_AUTO_GROW, true);
+                pSummoned->CastSpell(pSummoned, SPELL_PHEROMONES, true);
+                break;
+            case NPC_DETONATING_LASHER:
+            case NPC_ANCIENT_CONSERVATOR:
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+                break;
+            case NPC_WATER_SPIRIT:
+                m_waterSpiritGuid = pSummoned->GetObjectGuid();
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+                break;
+            case NPC_STORM_LASHER:
+                m_stormLasherGuid = pSummoned->GetObjectGuid();
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+                break;
+            case NPC_SNAPLASHER:
+                m_snaplasherGuid = pSummoned->GetObjectGuid();
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+                break;
+            case NPC_NATURE_BOMB:
+                pSummoned->CastSpell(pSummoned, SPELL_NATURE_BOMB_GO, true);
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_DETONATING_LASHER:
+                pSummoned->CastSpell(m_creature, SPELL_ATTUNED_2_STACKS, true);
+                break;
+            case NPC_ANCIENT_CONSERVATOR:
+                pSummoned->CastSpell(m_creature, SPELL_ATTUNED_25_STACKS, true);
+                break;
+            case NPC_WATER_SPIRIT:
+            case NPC_STORM_LASHER:
+            case NPC_SNAPLASHER:
+                pSummoned->CastSpell(m_creature, SPELL_ATTUNED_10_STACKS, true);
+                break;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            // handle Allies of Nature spawn
+            if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                // adjust the index to the size of the vector
+                uint8 uiIndex = m_uiAlliesWaveCount;
+                if (uiIndex >= MAX_ALLIES_SPELLS)
+                    uiIndex = m_uiAlliesWaveCount - MAX_ALLIES_SPELLS;
+
+                switch (spawnSpellsVector[uiIndex])
+                {
+                case SPELL_SUMMON_WAVE_1:  DoScriptText(SAY_ADDS_CONSERVATOR, m_creature); break;
+                case SPELL_SUMMON_WAVE_3:  DoScriptText(SAY_ADDS_TRIO, m_creature);        break;
+                case SPELL_SUMMON_WAVE_10: DoScriptText(SAY_ADDS_LASHER, m_creature);      break;
+                }
+
+                DoCastSpellIfCan(m_creature, spawnSpellsVector[uiIndex], CAST_TRIGGERED);
+
+                ++m_uiAlliesWaveCount;
+
+                // re-shuffle the spells
+                if (m_uiAlliesWaveCount == MAX_ALLIES_SPELLS)
+                {
+                    uint32 uiLastSpell = spawnSpellsVector[MAX_ALLIES_SPELLS - 1];
+                    std::random_shuffle(spawnSpellsVector.begin(), spawnSpellsVector.end());
+
+                    // make sure we won't repeat the last spell
+                    while (spawnSpellsVector[0] == uiLastSpell)
+                        std::random_shuffle(spawnSpellsVector.begin(), spawnSpellsVector.end());
+                }
+            }
+            else if (eventType == AI_EVENT_CUSTOM_B)
+            {
+                if (!m_uiThreeAlliesTimer)
+                    m_uiThreeAlliesTimer = 12000;
+            }
+        }
+
+        // check for all elders alive
+        void FetchElders()
+        {
+            if (!m_pInstance)
+                return;
+
+            uint8 uiEldersAlive = 0;
+
+            if (Creature* pElder = m_pInstance->GetSingleCreatureFromStorage(NPC_ELDER_BRIGHTLEAF))
+            {
+                if (pElder->IsAlive())
+                {
+                    pElder->CastSpell(pElder, m_bIsRegularMode ? SPELL_BRIGHTLEAF_ESSENCE_CHANNEL : SPELL_BRIGHTLEAF_ESSENCE_CHANNEL_H, true);
+                    pElder->CastSpell(pElder, SPELL_FULL_HEAL, true);
+
+                    m_uiUnstableEnergyTimer = 25000;
+                    ++uiEldersAlive;
+                }
+            }
+            if (Creature* pElder = m_pInstance->GetSingleCreatureFromStorage(NPC_ELDER_IRONBRACH))
+            {
+                if (pElder->IsAlive())
+                {
+                    pElder->CastSpell(pElder, m_bIsRegularMode ? SPELL_IRONBRANCH_ESSENCE_CHANNEL : SPELL_IRONBRANCH_ESSENCE_CHANNEL_H, true);
+                    pElder->CastSpell(pElder, SPELL_FULL_HEAL, true);
+
+                    m_uiIronRootsTimer = 60000;
+                    ++uiEldersAlive;
+                }
+            }
+            if (Creature* pElder = m_pInstance->GetSingleCreatureFromStorage(NPC_ELDER_STONEBARK))
+            {
+                if (pElder->IsAlive())
+                {
+                    pElder->CastSpell(pElder, m_bIsRegularMode ? SPELL_STONEBARK_ESSEMCE_CHANNEL : SPELL_STONEBARK_ESSEMCE_CHANNEL_H, true);
+                    pElder->CastSpell(pElder, SPELL_FULL_HEAL, true);
+
+                    m_uiGroundTremorTimer = 10000;
+                    ++uiEldersAlive;
+                }
+            }
+
+            // store the info about the elders alive
+            m_pInstance->SetData(TYPE_FREYA_HARD, uiEldersAlive);
+
+            if (uiEldersAlive)
+                DoScriptText(SAY_AGGRO_HARD, m_creature);
+            else
+                DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiEpilogueTimer)
+            {
+                if (m_uiEpilogueTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT, CAST_TRIGGERED) == CAST_OK)
+                    {
+                        m_creature->ForcedDespawn(2000);
+                        m_uiEpilogueTimer = 0;
+                    }
+                }
+                else
+                    m_uiEpilogueTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            if (m_uiThreeAlliesTimer)
+            {
+                if (m_uiThreeAlliesTimer <= uiDiff)
+                {
+                    Creature* pSpirit = m_creature->GetMap()->GetCreature(m_waterSpiritGuid);
+                    Creature* pStormLasher = m_creature->GetMap()->GetCreature(m_stormLasherGuid);
+                    Creature* pSnapLasher = m_creature->GetMap()->GetCreature(m_snaplasherGuid);
+                    if (!pSpirit || !pStormLasher || !pSnapLasher)
+                        return;
+
+                    if (pSpirit->HasAura(SPELL_FEIGN_DEATH) && pStormLasher->HasAura(SPELL_FEIGN_DEATH) && pSnapLasher->HasAura(SPELL_FEIGN_DEATH))
+                    {
+                        m_creature->DealDamage(pSpirit, pSpirit->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                        m_creature->DealDamage(pStormLasher, pStormLasher->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                        m_creature->DealDamage(pSnapLasher, pSnapLasher->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                    }
+                    else
+                    {
+                        pSpirit->CastSpell(pSpirit, SPELL_FULL_HEAL, true);
+                        pStormLasher->CastSpell(pStormLasher, SPELL_FULL_HEAL, true);
+                        pSnapLasher->CastSpell(pSnapLasher, SPELL_FULL_HEAL, true);
+                    }
+
+                    m_uiThreeAlliesTimer = 0;
+                }
+                else
+                    m_uiThreeAlliesTimer -= uiDiff;
+            }
+
+            if (m_uiAlliesWaveCount < MAX_ALLIES_WAVES)
+            {
+                if (m_uiAlliesNatureTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SUMMON_ALLIES_OF_NATURE : SPELL_SUMMON_ALLIES_OF_NATURE_H) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_ALLIES_NATURE, m_creature);
+                        m_uiAlliesNatureTimer = 60000;
+                    }
+                }
+                else
+                    m_uiAlliesNatureTimer -= uiDiff;
+            }
+            else
+            {
+                if (m_uiNatureBombTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_NATURE_BOMB_SUMMON) == CAST_OK)
+                        m_uiNatureBombTimer = 15000;
+                }
+                else
+                    m_uiNatureBombTimer -= uiDiff;
+            }
+
+            if (m_uiSunbeamTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_SUNBEAM : SPELL_SUNBEAM_H) == CAST_OK)
+                        m_uiSunbeamTimer = 15000;
+                }
+            }
+            else
+                m_uiSunbeamTimer -= uiDiff;
+
+            if (m_uiLifebindersGiftTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_LIFEBINDERS_GIFT_SUMMON) == CAST_OK)
+                    m_uiLifebindersGiftTimer = 40000;
+            }
+            else
+                m_uiLifebindersGiftTimer -= uiDiff;
+
+            // Brightleaf ability
+            if (m_uiUnstableEnergyTimer)
+            {
+                if (m_uiUnstableEnergyTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_UNSTABLE_SUN_BEAM : SPELL_UNSTABLE_SUN_BEAM_H) == CAST_OK)
+                        m_uiUnstableEnergyTimer = 25000;
+                }
+                else
+                    m_uiUnstableEnergyTimer -= uiDiff;
+            }
+
+            // Ironbranch ability
+            if (m_uiIronRootsTimer)
+            {
+                if (m_uiIronRootsTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_IRON_ROOTS : SPELL_IRON_ROOTS_H) == CAST_OK)
+                        m_uiIronRootsTimer = 60000;
+                }
+                else
+                    m_uiIronRootsTimer -= uiDiff;
+            }
+
+            // Stonebark ability
+            if (m_uiGroundTremorTimer)
+            {
+                if (m_uiGroundTremorTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_GROUND_TREMOR : SPELL_GROUND_TREMOR_H) == CAST_OK)
+                        m_uiGroundTremorTimer = 30000;
+                }
+                else
+                    m_uiGroundTremorTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_freyaAI(pCreature);
+    }
+};
+
+struct spell_ulduar_summon_allies : public SpellScript
+{
+    spell_ulduar_summon_allies() : SpellScript("spell_ulduar_summon_allies") {}
+
+    bool EffectScriptEffect(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Creature* pCreatureTarget, ObjectGuid /*originalCasterGuid*/)
+    {
+        if ((uiSpellId == SPELL_SUMMON_ALLIES_OF_NATURE || uiSpellId == SPELL_SUMMON_ALLIES_OF_NATURE_H) && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (pCreatureTarget->GetEntry() == NPC_FREYA)
+                pCreatureTarget->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pCreatureTarget);
+
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## three_nature_allies baseAI
+######*/
+
+struct three_nature_alliesAI : public ScriptedAI
+{
+    three_nature_alliesAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+    }
+
+    ScriptedInstance* m_pInstance;
+    bool m_bIsRegularMode;
+
+    bool m_bIsFakeDeath;
+
+    void Reset() override
+    {
+        m_bIsFakeDeath = false;
+    }
+
+    void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+    {
+        if (pDoneBy->GetEntry() == NPC_FREYA)
+            return;
+
+        if (uiDamage >= m_creature->GetHealth())
+        {
+            uiDamage = 0;
+
+            if (m_bIsFakeDeath)
+                return;
+
+            if (m_pInstance)
+            {
+                if (Creature* pFreya = m_pInstance->GetSingleCreatureFromStorage(NPC_FREYA))
+                    SendAIEvent(AI_EVENT_CUSTOM_B, m_creature, pFreya);
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_CLEAR_DEBUFFS, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_FEIGN_DEATH, CAST_TRIGGERED);
+
+            m_creature->SetHealth(1);
+            m_creature->ClearComboPointHolders();
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            m_creature->ClearAllReactives();
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MoveIdle();
+            m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+
+            DoScriptText(EMOTE_REGEN_ALLIES, m_creature);
+            m_bIsFakeDeath = true;
+        }
+    }
+
+    void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+    {
+        if (pSpell->Id == SPELL_FULL_HEAL)
+        {
+            m_bIsFakeDeath = false;
+            DoResetThreat();
+            m_creature->RemoveAurasDueToSpell(SPELL_FEIGN_DEATH);
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+    }
+};
+
+/*######
+## npc_water_spirit
+######*/
+
+struct npc_water_spirit : public CreatureScript
+{
+    npc_water_spirit() : CreatureScript("npc_water_spirit") {}
+
+    struct npc_water_spiritAI : public three_nature_alliesAI
+    {
+        npc_water_spiritAI(Creature* pCreature) : three_nature_alliesAI(pCreature) { }
+
+        uint32 m_uiTidalWaveTimer;
+
+        void Reset() override
+        {
+            m_uiTidalWaveTimer = 10000;
+            three_nature_alliesAI::Reset();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiTidalWaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TIDAL_WAVE) == CAST_OK)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_TIDAL_WAVE_VISUAL, CAST_TRIGGERED);
+                    m_uiTidalWaveTimer = 10000;
+                }
+            }
+            else
+                m_uiTidalWaveTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_water_spiritAI(pCreature);
+    }
+};
+
+/*######
+## npc_snaplasher
+######*/
+
+struct npc_snaplasher : public CreatureScript
+{
+    npc_snaplasher() : CreatureScript("npc_snaplasher") {}
+
+    struct npc_snaplasherAI : public three_nature_alliesAI
+    {
+        npc_snaplasherAI(Creature* pCreature) : three_nature_alliesAI(pCreature) { }
+
+        void Reset() override
+        {
+            three_nature_alliesAI::Reset();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_HARDENED_BARK : SPELL_HARDENED_BARK_H);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_snaplasherAI(pCreature);
+    }
+};
+
+/*######
+## npc_storm_lasher
+######*/
+struct npc_storm_lasher : public CreatureScript
+{
+    npc_storm_lasher() : CreatureScript("npc_storm_lasher") {}
+
+    struct npc_storm_lasherAI : public three_nature_alliesAI
+    {
+        npc_storm_lasherAI(Creature* pCreature) : three_nature_alliesAI(pCreature) { }
+
+        uint32 m_uiLightningLashTimer;
+        uint32 m_uiStormBoltTimer;
+
+        void Reset() override
+        {
+            m_uiLightningLashTimer = urand(5000, 10000);
+            m_uiStormBoltTimer = 5000;
+            three_nature_alliesAI::Reset();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiLightningLashTimer < uiDiff)
+            {
+                if (m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_LIGHTNING_LASH : SPELL_LIGHTNING_LASH_H) == CAST_OK)
+                        m_uiLightningLashTimer = urand(5000, 10000);
+                }
+            }
+            else
+                m_uiLightningLashTimer -= uiDiff;
+
+            if (m_uiStormBoltTimer < uiDiff)
+            {
+                if (m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_STORMBOLT : SPELL_STORMBOLT_H) == CAST_OK)
+                        m_uiStormBoltTimer = 5000;
+                }
+            }
+            else
+                m_uiStormBoltTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_storm_lasherAI(pCreature);
+    }
+};
+
+/*######
+## npc_eonars_gift
+######*/
+
+struct npc_eonars_gift : public CreatureScript
+{
+    npc_eonars_gift() : CreatureScript("npc_eonars_gift") {}
+
+    struct npc_eonars_giftAI : public Scripted_NoMovementAI
+    {
+        npc_eonars_giftAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+        uint32 m_uiGiftTimer;
+
+        void Reset() override
+        {
+            m_uiGiftTimer = 10000;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiGiftTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_LIFEBINDERS_GIFT : SPELL_LIFEBINDERS_GIFT_H) == CAST_OK)
+                    m_uiGiftTimer = 10000;
+            }
+            else
+                m_uiGiftTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_eonars_giftAI(pCreature);
+    }
+};
+
+/*######
+## npc_nature_bomb
+######*/
+
+struct npc_nature_bomb : public CreatureScript
+{
+    npc_nature_bomb() : CreatureScript("npc_nature_bomb") {}
+
+    struct npc_nature_bombAI : public Scripted_NoMovementAI
+    {
+        npc_nature_bombAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+        uint32 m_uiNatureBombTimer;
+
+        ObjectGuid m_natureBombGuid;
+
+        void Reset() override
+        {
+            m_uiNatureBombTimer = 10000;
+        }
+
+        void JustSummoned(GameObject* pGo) override
+        {
+            m_natureBombGuid = pGo->GetObjectGuid();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiNatureBombTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_NATURE_BOMB : SPELL_NATURE_BOMB_H) == CAST_OK)
+                {
+                    if (GameObject* pBomb = m_creature->GetMap()->GetGameObject(m_natureBombGuid))
+                        pBomb->Use(m_creature);
+
+                    m_creature->ForcedDespawn(2000);
+                    m_uiNatureBombTimer = 10000;
+                }
+            }
+            else
+                m_uiNatureBombTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_nature_bombAI(pCreature);
+    }
+};
+
+/*######
+## npc_iron_roots
+######*/
+
+struct npc_iron_roots : public CreatureScript
+{
+    npc_iron_roots() : CreatureScript("npc_iron_roots") {}
+
+    struct npc_iron_rootsAI : public Scripted_NoMovementAI
+    {
+        npc_iron_rootsAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+
+        void Reset() override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (!m_creature->IsTemporarySummon())
+                return;
+
+            if (m_creature->GetEntry() == NPC_IRON_ROOTS)
+                DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_IRON_ROOTS_REMOVE : SPELL_IRON_ROOTS_REMOVE_H, CAST_TRIGGERED);
+            else if (m_creature->GetEntry() == NPC_STRENGHENED_IRON_ROOTS)
+                DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_STRENGTHEN_IRON_ROOTS : SPELL_STRENGTHEN_IRON_ROOTS_H, CAST_TRIGGERED);
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_iron_rootsAI(pCreature);
+    }
+};
+
+/*######
+## npc_healthy_spore
+######*/
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_healthy_spore : public CreatureScript
+{
+    npc_healthy_spore() : CreatureScript("npc_healthy_spore") {}
+
+    struct npc_healthy_sporeAI : public Scripted_NoMovementAI
+    {
+        npc_healthy_sporeAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { Reset(); }
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_AUTO_GROW, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            DoCastSpellIfCan(m_creature, SPELL_POTENT_PHEROMONES, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            DoCastSpellIfCan(m_creature, SPELL_HEALTHY_SPORE_VISUAL, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            m_creature->ForcedDespawn(25000);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_healthy_sporeAI(pCreature);
+    }
+};
+
+void AddSC_boss_freya()
+{
+    Script* s;
+
+    s = new boss_freya();
+    s->RegisterSelf();
+    s = new npc_water_spirit();
+    s->RegisterSelf();
+    s = new npc_snaplasher();
+    s->RegisterSelf();
+    s = new npc_storm_lasher();
+    s->RegisterSelf();
+    s = new npc_eonars_gift();
+    s->RegisterSelf();
+    s = new npc_nature_bomb();
+    s->RegisterSelf();
+    s = new npc_iron_roots();
+    s->RegisterSelf();
+    s = new npc_healthy_spore();
+    s->RegisterSelf();
+
+    s = new spell_ulduar_summon_allies();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_freya";
+    //pNewScript->GetAI = GetAI_boss_freya;
+    //pNewScript->pEffectScriptEffectNPC = &EffectScriptEffectCreature_boss_freya;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_water_spirit";
+    //pNewScript->GetAI = GetAI_npc_water_spirit;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_snaplasher";
+    //pNewScript->GetAI = GetAI_npc_snaplasher;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_storm_lasher";
+    //pNewScript->GetAI = GetAI_npc_storm_lasher;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_eonars_gift";
+    //pNewScript->GetAI = GetAI_npc_eonars_gift;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_nature_bomb";
+    //pNewScript->GetAI = GetAI_npc_nature_bomb;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_iron_roots";
+    //pNewScript->GetAI = GetAI_npc_iron_roots;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_healthy_spore";
+    //pNewScript->GetAI = GetAI_npc_healthy_spore;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_general_vezax.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_general_vezax.cpp
new file mode 100644
index 000000000..422a97f25
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_general_vezax.cpp
@@ -0,0 +1,457 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_general_vezax
+SD%Complete: 100%
+SDComment:
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+
+enum
+{
+    SAY_AGGRO                           = -1603096,
+    SAY_SLAY_1                          = -1603097,
+    SAY_SLAY_2                          = -1603098,
+    SAY_SURGE                           = -1603099,
+    SAY_DEATH                           = -1603100,
+    SAY_ENRAGE                          = -1603101,
+    SAY_HARD_MODE                       = -1603102,
+
+    EMOTE_VAPOR                         = -1603103,
+    EMOTE_SURGE                         = -1603104,
+    EMOTE_ANIMUS                        = -1603105,
+
+    // normal spells
+    SPELL_AURA_OF_DESPAIR               = 62692,
+    SPELL_SHADOW_CRASH                  = 62660,
+    SPELL_SHADOW_CRASH_DAMAGE           = 62659,            // used for achiev check
+    SPELL_MARK_OF_FACELESS              = 63276,            // triggers 63278
+    SPELL_SEARING_FLAMES                = 62661,
+    SPELL_SURGE_OF_DARKNESS             = 62662,
+    SPELL_SUMMON_VAPORS                 = 63081,            // cast by Vezax bunny
+    SPELL_BERSERK                       = 26662,
+    
+    // hard mode spells
+    SPELL_SARONITE_BARRIER              = 63364,            // also sends event 9735
+    SPELL_SUMMON_ANIMUS                 = 63145,            // the animus should spam 63420 on target - to be done in acid
+    SPELL_ANIMUS_FORMATION              = 63319,            // visual aura on Saronite summoner bunny
+    
+    // other spells
+    SPELL_SARONITE_VAPORS               = 63323,            // cast by vapor on death
+    SPELL_CORRUPTED_RAGE                = 68415,            // Unused
+    SPELL_CORRUPTED_WISDOM              = 64646,            // Unused
+
+    MAX_HARD_MODE_VAPORS                = 6,
+
+    NPC_SARONITE_VAPOR                  = 33488,
+};
+
+/*######
+## boss_general_vezax
+######*/
+
+struct boss_general_vezax : public CreatureScript
+{
+    boss_general_vezax() : CreatureScript("boss_general_vezax") {}
+
+    struct boss_general_vezaxAI : public ScriptedAI
+    {
+        boss_general_vezaxAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiCrashTimer;
+        uint32 m_uiMarkTimer;
+        uint32 m_uiFlamesTimer;
+        uint32 m_uiSurgeTimer;
+        uint32 m_uiSaroniteVaporTimer;
+        uint32 m_uiHardModeTimer;
+        uint8 m_uiHardModeStage;
+
+        uint8 m_uiVaporsGathered;
+
+        GuidList m_lVaporsGuids;
+
+        void Reset() override
+        {
+            m_uiEnrageTimer = 10 * MINUTE * IN_MILLISECONDS;
+            m_uiFlamesTimer = 8000;
+            m_uiSaroniteVaporTimer = 30000;
+            m_uiSurgeTimer = 60000;
+            m_uiMarkTimer = 20000;
+            m_uiCrashTimer = 15000;
+            m_uiHardModeTimer = 0;
+            m_uiHardModeStage = 0;
+            m_uiVaporsGathered = 0;
+
+            m_lVaporsGuids.clear();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VEZAX, IN_PROGRESS);
+                m_pInstance->SetData(TYPE_VEZAX_HARD, NOT_STARTED);
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_AURA_OF_DESPAIR);
+
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_VEZAX, FAIL);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_VEZAX, DONE);
+
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SARONITE_VAPOR)
+            {
+                m_lVaporsGuids.push_back(pSummoned->GetObjectGuid());
+
+                // if vapors have reached the max number for hard mode then summon animus
+                if (m_lVaporsGuids.size() == MAX_HARD_MODE_VAPORS)
+                    DoPrepareAnimusIfCan();
+            }
+            else if (pSummoned->GetEntry() == NPC_SARONITE_ANIMUS)
+                pSummoned->SetInCombatWithZone();
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            if (pSender->GetEntry() == NPC_SARONITE_VAPOR)
+            {
+                // decrease the number of vapors when they die
+                if (eventType == AI_EVENT_CUSTOM_A)
+                    m_lVaporsGuids.remove(pSender->GetObjectGuid());
+                else if (eventType == AI_EVENT_CUSTOM_B)
+                {
+                    ++m_uiVaporsGathered;
+
+                    // Cast the saronite formation aura when all vapors arive
+                    if (m_uiVaporsGathered == MAX_HARD_MODE_VAPORS)
+                    {
+                        // visual on the summoning bunny
+                        if (m_pInstance)
+                        {
+                            if (Creature* pBunny = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_VEZAX_ANIMUS))))
+                                pBunny->CastSpell(pBunny, SPELL_ANIMUS_FORMATION, true);
+                        }
+
+                        // Despawn the vapors
+                        for (GuidList::const_iterator itr = m_lVaporsGuids.begin(); itr != m_lVaporsGuids.end(); ++itr)
+                        {
+                            if (Creature* pVapor = m_creature->GetMap()->GetCreature(*itr))
+                                pVapor->ForcedDespawn();
+                        }
+
+                        DoScriptText(EMOTE_ANIMUS, m_creature);
+                        m_uiHardModeTimer = 4000;
+                    }
+                }
+            }
+
+            // remove saronite barrier when animus dies
+            else if (pSender->GetEntry() == NPC_SARONITE_ANIMUS && eventType == AI_EVENT_CUSTOM_C)
+                m_creature->RemoveAurasDueToSpell(SPELL_SARONITE_BARRIER);
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            if (pTarget->GetTypeId() != TYPEID_PLAYER || !m_pInstance)
+                return;
+
+            // Check achiev criterias
+            if (pSpell->Id == SPELL_SHADOW_CRASH_DAMAGE)
+                m_pInstance->SetData(TYPE_ACHIEV_SHADOWDODGER, uint32(false));
+        }
+
+        // Merge vapors
+        void DoPrepareAnimusIfCan()
+        {
+            if (!m_pInstance)
+                return;
+
+            Creature* pBunny = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_VEZAX_ANIMUS)));
+            if (!pBunny)
+                return;
+
+            // Gather the vapors to the spawn point
+            for (GuidList::const_iterator itr = m_lVaporsGuids.begin(); itr != m_lVaporsGuids.end(); ++itr)
+            {
+                if (Creature* pVapor = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pVapor->SetWalk(false);
+                    pVapor->GetMotionMaster()->MovePoint(1, pBunny->GetPositionX(), pBunny->GetPositionY(), pBunny->GetPositionZ());
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiHardModeTimer)
+            {
+                if (m_uiHardModeTimer <= uiDiff)
+                {
+                    switch (m_uiHardModeStage)
+                    {
+                    case 0:
+                    {
+                              if (DoCastSpellIfCan(m_creature, SPELL_SARONITE_BARRIER, CAST_TRIGGERED | CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                              {
+                                  DoScriptText(SAY_HARD_MODE, m_creature);
+                                  m_uiHardModeTimer = 2000;
+                              }
+                              break;
+                    }
+                    case 1:
+                    {
+                              if (m_pInstance)
+                              {
+                                  if (Creature* pBunny = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_VEZAX_ANIMUS))))
+                                  {
+                                      pBunny->RemoveAurasDueToSpell(SPELL_ANIMUS_FORMATION);
+                                      pBunny->CastSpell(pBunny, SPELL_SUMMON_ANIMUS, true, NULL, NULL, m_creature->GetObjectGuid());
+                                  }
+                              }
+                              m_uiHardModeTimer = 0;
+                              break;
+                    }
+                    }
+                    ++m_uiHardModeStage;
+                }
+                else
+                    m_uiHardModeTimer -= uiDiff;
+            }
+
+            // summon saronite vapors before the hard mode
+            if (m_pInstance && m_pInstance->GetData(TYPE_VEZAX_HARD) == NOT_STARTED)
+            {
+                if (m_uiSaroniteVaporTimer < uiDiff)
+                {
+                    // get a bunny that will summon the vapors
+                    if (m_pInstance)
+                    {
+                        if (Creature* pBunny = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_VEZAX_VAPOR))))
+                        {
+                            pBunny->CastSpell(pBunny, SPELL_SUMMON_VAPORS, true, NULL, NULL, m_creature->GetObjectGuid());
+                            DoScriptText(EMOTE_VAPOR, m_creature);
+
+                            m_uiSaroniteVaporTimer = 30000;
+                        }
+                    }
+                }
+                else
+                    m_uiSaroniteVaporTimer -= uiDiff;
+            }
+
+            // Searing flames only while animus is not around
+            if (m_pInstance && (m_pInstance->GetData(TYPE_VEZAX_HARD) != IN_PROGRESS || !m_bIsRegularMode))
+            {
+                if (m_uiFlamesTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SEARING_FLAMES) == CAST_OK)
+                        m_uiFlamesTimer = urand(9000, 16000);
+                }
+                else
+                    m_uiFlamesTimer -= uiDiff;
+            }
+
+            if (m_uiSurgeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SURGE_OF_DARKNESS) == CAST_OK)
+                {
+                    DoScriptText(SAY_SURGE, m_creature);
+                    DoScriptText(EMOTE_SURGE, m_creature);
+                    m_uiSurgeTimer = 62000;
+                }
+            }
+            else
+                m_uiSurgeTimer -= uiDiff;
+
+            if (m_uiMarkTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_MARK_OF_FACELESS) == CAST_OK)
+                        m_uiMarkTimer = urand(25000, 30000);
+                }
+            }
+            else
+                m_uiMarkTimer -= uiDiff;
+
+            if (m_uiCrashTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_CRASH) == CAST_OK)
+                        m_uiCrashTimer = 15000;
+                }
+            }
+            else
+                m_uiCrashTimer -= uiDiff;
+
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                {
+                    DoScriptText(SAY_ENRAGE, m_creature);
+                    m_uiEnrageTimer = 30000;
+                }
+            }
+            else
+                m_uiEnrageTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_general_vezaxAI(pCreature);
+    }
+};
+
+/*######
+## npc_saronite_vapor
+######*/
+
+struct npc_saronite_vapor : public CreatureScript
+{
+    npc_saronite_vapor() : CreatureScript("npc_saronite_vapor") {}
+
+    struct npc_saronite_vaporAI : public Scripted_NoMovementAI
+    {
+        npc_saronite_vaporAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override { }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            // inform Vezax of death
+            if (m_pInstance)
+            {
+                if (Creature* pVezax = m_pInstance->GetSingleCreatureFromStorage(NPC_VEZAX))
+                    SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pVezax);
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_SARONITE_VAPORS, CAST_TRIGGERED);
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE || !uiPointId || !m_pInstance)
+                return;
+
+            // inform vezax of point reached
+            if (Creature* pVezax = m_pInstance->GetSingleCreatureFromStorage(NPC_VEZAX))
+                SendAIEvent(AI_EVENT_CUSTOM_B, m_creature, pVezax);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_saronite_vaporAI(pCreature);
+    }
+};
+
+struct event_spell_saronite_barrier : public MapEventScript
+{
+    event_spell_saronite_barrier() : MapEventScript("event_spell_saronite_barrier") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* /*pTarget*/, bool /*bIsStart*/) override
+    {
+        if (pSource->GetTypeId() == TYPEID_UNIT && ((Creature*)pSource)->GetEntry() == NPC_VEZAX)
+        {
+            if (InstanceData* pInstance = ((Creature*)pSource)->GetInstanceData())
+            {
+                // Start hard mode for Vezax and summon the Animus
+                pInstance->SetData(TYPE_VEZAX_HARD, IN_PROGRESS);
+
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+void AddSC_boss_general_vezax()
+{
+    Script* s;
+
+    s = new boss_general_vezax();
+    s->RegisterSelf();
+    s = new npc_saronite_vapor();
+    s->RegisterSelf();
+
+    s = new event_spell_saronite_barrier();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_general_vezax";
+    //pNewScript->GetAI = &GetAI_boss_general_vezax;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_saronite_vapor";
+    //pNewScript->GetAI = &GetAI_npc_saronite_vapor;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_spell_saronite_barrier";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_spell_saronite_barrier;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_hodir.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_hodir.cpp
new file mode 100644
index 000000000..785c47abd
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_hodir.cpp
@@ -0,0 +1,497 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_hodir
+SD%Complete: 90%
+SDComment: Achievements NYI.
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+#include "TemporarySummon.h"
+
+enum
+{
+    SAY_AGGRO                           = -1603086,
+    SAY_SLAY_1                          = -1603087,
+    SAY_SLAY_2                          = -1603088,
+    SAY_FLASH_FREEZE                    = -1603089,
+    SAY_FROZEN_BLOWS                    = -1603090,
+    SAY_EPILOGUE                        = -1603091,
+    SAY_BERSERK                         = -1603092,
+
+    EMOTE_FLASH_FREEZE                  = -1603094,
+    EMOTE_FROZEN_BLOWS                  = -1603095,
+
+    // spells
+    SPELL_BERSERK                       = 26662,
+    SPELL_HODIR_CREDIT                  = 64899,                // kill credit spell; added in spell_template
+    SPELL_SHATTER_CHEST                 = 65272,                // hard mode timer until chest is shattered; triggers 62501 which will send event 20907 if completed
+    SPELL_FROZEN_BLOWS                  = 62478,
+    SPELL_FROZEN_BLOWS_H                = 63512,
+    SPELL_FREEZE                        = 62469,
+    SPELL_BITTING_COLD                  = 62038,                // triggers 62039 and 62188
+    SPELL_ICICLE_AURA                   = 62227,                // periodic targeting aura; triggers the spell which summons npc 33169
+    SPELL_ICICLE_SNOWPACK               = 62476,                // cast right before Flash Freeze; triggers the spell which summons npc 33173
+    SPELL_ICICLE_SNOWPACK_H             = 62477,
+    SPELL_FLASH_FREEZE                  = 61968,                // main spell; sends event 20896
+    SPELL_TELEPORT                      = 62940,                // despawn on event end
+
+    // icicle spells
+    SPELL_ICICLE                        = 62236,
+    SPELL_ICICLE_DUMMY                  = 62453,
+
+    // snowpacked icicle spells
+    // SPELL_ICICLE_ICE_SHARDS          = 62460,                // triggers the spell which summons npc 33174 and go 194173
+
+    // snowpacked icicle target spells
+    SPELL_SAFE_AREA                     = 65705,                // grant immunity from flash freeze
+
+    // flash freeze related spells
+    // SPELL_FLASH_FREEZE_VISUAL        = 62148,                // cast by npc 30298 (handled by event 20896)
+    // SPELL_FLASH_FREEZE_SUMMON        = 61970,                // cast by all Flash Freeze targets; summons 32926
+    // SPELL_FLASH_FREEZE_SUMMON_NPC    = 61989,                // used to flash freeze all npc targets before the encounter; summons 32938
+    // SPELL_FLASH_FREEZE_STUN          = 64175,                // use and purpose unk
+    // SPELL_FLASH_FREEZE_FRIENDLY      = 64176,                // use and purpose unk
+
+    // flash freeze spells
+    SPELL_FLASH_FREEZE_AURA             = 61969,                // stuns the summoner
+    SPELL_FLASH_FREEZE_KILL             = 62226,                // kill frozen targets
+
+    // flash freeze npc spells
+    SPELL_FLASH_FREEZE_AURA_NPC         = 61990,                // stuns the summoner (npc)
+    SPELL_FLASH_FREEZE_INITIAL          = 62878,                // trigger aggro on Hodir if damaged; sends event 21045
+
+    // npcs
+    NPC_ICICLE                          = 33169,
+    // NPC_SNOWPACKED_ICICLE            = 33173,                // entry used to generate npc 33173 and go 194173; handled in eventAI
+    // NPC_SNOWPACKED_ICICLE_TARGET     = 33174,                // entry used to handle safe area aura from Flash Freeze; handled in eventAI
+    NPC_FLASH_FREEZE                    = 32926,                // entry used during the encounter
+    NPC_FLASH_FREEZE_NPC                = 32938,                // entry which stuns the friendly npcs before the actual fight
+
+    // GO_SNOWDRIFT                     = 194173,
+    EVENT_ID_ATTACK_START               = 21045,
+    EVENT_ID_SHATTER_CHEST              = 20907,
+    FACTION_ID_FRIENDLY                 = 35,
+};
+
+/*######
+## boss_hodir
+######*/
+
+struct boss_hodir : public CreatureScript
+{
+    boss_hodir() : CreatureScript("boss_hodir") {}
+
+    struct boss_hodirAI : public ScriptedAI
+    {
+        boss_hodirAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_bEventFinished = false;
+            m_uiEpilogueTimer = 0;
+            m_uiEpilogueStage = 0;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+        bool m_bEventFinished;
+
+        uint32 m_uiEpilogueTimer;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiFlashFreezeTimer;
+        uint32 m_uiFrozenBlowsTimer;
+        uint32 m_uiFreezeTimer;
+        uint8 m_uiEpilogueStage;
+
+        void Reset() override
+        {
+            m_uiBerserkTimer = 8 * MINUTE * IN_MILLISECONDS;
+            m_uiFlashFreezeTimer = 50000;
+            m_uiFrozenBlowsTimer = 70000;
+            m_uiFreezeTimer = urand(25000, 30000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HODIR, IN_PROGRESS);
+                m_pInstance->SetData(TYPE_HODIR_HARD, DONE);
+            }
+
+            DoScriptText(SAY_AGGRO, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_BITTING_COLD, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_ICICLE_AURA, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            DoCastSpellIfCan(m_creature, SPELL_SHATTER_CHEST, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            // don't attack again after being defeated
+            if (m_bEventFinished)
+                return;
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_HODIR, FAIL);
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+
+            if (m_creature->IsAlive() && !m_bEventFinished)
+                m_creature->GetMotionMaster()->MoveTargetedHome();
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                if (!m_bEventFinished)
+                {
+                    // Inform the faction helpers that the fight is over
+                    ThreatList const& threatList = m_creature->GetThreatManager().getThreatList();
+                    for (ThreatList::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
+                    {
+                        // only check creatures
+                        if (!(*itr)->getUnitGuid().IsCreature())
+                            continue;
+
+                        if (Creature* pTarget = m_creature->GetMap()->GetCreature((*itr)->getUnitGuid()))
+                            pTarget->AI()->EnterEvadeMode();
+                    }
+
+                    m_uiEpilogueTimer = 10000;
+                    m_creature->setFaction(FACTION_ID_FRIENDLY);
+                    m_bEventFinished = true;
+                    EnterEvadeMode();
+                }
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_ICICLE)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_ICICLE_DUMMY, false);
+                pSummoned->CastSpell(pSummoned, SPELL_ICICLE, true);
+                pSummoned->ForcedDespawn(5000);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiEpilogueTimer)
+            {
+                if (m_uiEpilogueTimer <= uiDiff)
+                {
+                    switch (m_uiEpilogueStage)
+                    {
+                    case 0:
+                        if (m_pInstance)
+                            m_pInstance->SetData(TYPE_HODIR, DONE);
+
+                        DoScriptText(SAY_EPILOGUE, m_creature);
+                        m_creature->CastSpell(m_creature, SPELL_HODIR_CREDIT, true);
+                        m_uiEpilogueTimer = 10000;
+                        break;
+                    case 1:
+                        if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT) == CAST_OK)
+                        {
+                            m_creature->ForcedDespawn(2000);
+                            m_uiEpilogueTimer = 0;
+                        }
+                        break;
+                    }
+                    ++m_uiEpilogueStage;
+                }
+                else
+                    m_uiEpilogueTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            if (m_uiFlashFreezeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FLASH_FREEZE) == CAST_OK)
+                {
+                    DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ICICLE_SNOWPACK : SPELL_ICICLE_SNOWPACK_H, CAST_TRIGGERED);
+                    DoScriptText(EMOTE_FLASH_FREEZE, m_creature);
+                    DoScriptText(SAY_FLASH_FREEZE, m_creature);
+                    m_uiFlashFreezeTimer = 50000;
+                }
+            }
+            else
+                m_uiFlashFreezeTimer -= uiDiff;
+
+            if (m_uiFrozenBlowsTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_FROZEN_BLOWS : SPELL_FROZEN_BLOWS_H) == CAST_OK)
+                {
+                    DoScriptText(SAY_FROZEN_BLOWS, m_creature);
+                    DoScriptText(EMOTE_FROZEN_BLOWS, m_creature);
+                    m_uiFrozenBlowsTimer = 60000;
+                }
+            }
+            else
+                m_uiFrozenBlowsTimer -= uiDiff;
+
+            if (m_uiFreezeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_FREEZE) == CAST_OK)
+                        m_uiFreezeTimer = 15000;
+                }
+            }
+            else
+                m_uiFreezeTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_hodirAI(pCreature);
+    }
+};
+
+/*######
+## npc_flash_freeze
+######*/
+
+struct npc_flash_freeze : public CreatureScript
+{
+    npc_flash_freeze() : CreatureScript("npc_flash_freeze") {}
+
+    struct npc_flash_freezeAI : public Scripted_NoMovementAI
+    {
+        npc_flash_freezeAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bFreezeInit;
+
+        void Reset() override
+        {
+            m_bFreezeInit = false;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            // On Flash Freeze death, the owner should attack Hodir
+            if (m_creature->GetEntry() == NPC_FLASH_FREEZE_NPC && m_creature->IsTemporarySummon() && m_pInstance)
+            {
+                if (Creature* pHodir = m_pInstance->GetSingleCreatureFromStorage(NPC_HODIR))
+                {
+                    if (Creature* pSummoner = m_creature->GetMap()->GetCreature(((TemporarySummon*)m_creature)->GetSummonerGuid()))
+                        pSummoner->AI()->AttackStart(pHodir);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            // Flash Freeze npcs should be always be summoned
+            if (!m_creature->IsTemporarySummon())
+                return;
+
+            // do the freezing on the first update tick
+            if (!m_bFreezeInit)
+            {
+                // Flash Freeze npc will always stun or kill the summoner
+                if (m_creature->GetEntry() == NPC_FLASH_FREEZE_NPC)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FLASH_FREEZE_AURA_NPC) == CAST_OK)
+                        DoCastSpellIfCan(m_creature, SPELL_FLASH_FREEZE_INITIAL, CAST_TRIGGERED);
+                }
+                else if (m_creature->GetEntry() == NPC_FLASH_FREEZE)
+                {
+                    if (Unit* pSummoner = m_creature->GetMap()->GetUnit(((TemporarySummon*)m_creature)->GetSummonerGuid()))
+                    {
+                        // kill frozen players
+                        if (pSummoner->HasAura(SPELL_FREEZE))
+                            DoCastSpellIfCan(pSummoner, SPELL_FLASH_FREEZE_KILL);
+                        else
+                            DoCastSpellIfCan(m_creature, SPELL_FLASH_FREEZE_AURA);
+
+                        if (pSummoner->GetTypeId() == TYPEID_PLAYER && m_pInstance)
+                            m_pInstance->SetData(TYPE_ACHIEV_CHEESE_FREEZE, uint32(false));
+                    }
+                }
+
+                m_bFreezeInit = true;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_flash_freezeAI(pCreature);
+    }
+};
+
+/*######
+## event_boss_hodir
+######*/
+
+struct event_boss_hodir : public MapEventScript
+{
+    event_boss_hodir() : MapEventScript("event_boss_hodir") {}
+
+    bool OnReceived(uint32 uiEventId, Object* pSource, Object* /*pTarget*/, bool /*bIsStart*/) override
+    {
+        if (pSource->GetTypeId() == TYPEID_UNIT)
+        {
+            ScriptedInstance* pInstance = (ScriptedInstance*)((Creature*)pSource)->GetInstanceData();
+            if (!pInstance)
+                return true;
+
+            if (uiEventId == EVENT_ID_SHATTER_CHEST)
+            {
+                // Mark hard mode as failed and despawn the Rare cache
+                pInstance->SetData(TYPE_HODIR_HARD, FAIL);
+
+                if (GameObject* pChest = pInstance->GetSingleGameObjectFromStorage(pInstance->instance->IsRegularDifficulty() ? GO_CACHE_OF_RARE_WINTER_10 : GO_CACHE_OF_RARE_WINTER_25))
+                    pChest->SetLootState(GO_JUST_DEACTIVATED);
+            }
+            else if (uiEventId == EVENT_ID_ATTACK_START)
+            {
+                // Start encounter
+                if (Creature* pHodir = pInstance->GetSingleCreatureFromStorage(NPC_HODIR))
+                    pHodir->SetInCombatWithZone();
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_icicle_target
+######*/
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_icicle_target : public CreatureScript
+{
+    npc_icicle_target() : CreatureScript("npc_icicle_target") {}
+
+    struct npc_icicle_targetAI : public Scripted_NoMovementAI
+    {
+        npc_icicle_targetAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_SAFE_AREA);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_icicle_targetAI(pCreature);
+    }
+};
+
+void AddSC_boss_hodir()
+{
+    Script* s;
+
+    s = new boss_hodir();
+    s->RegisterSelf();
+    s = new npc_flash_freeze();
+    s->RegisterSelf();
+    s = new npc_icicle_target();
+    s->RegisterSelf();
+
+    s = new event_boss_hodir();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_hodir";
+    //pNewScript->GetAI = GetAI_boss_hodir;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_flash_freeze";
+    //pNewScript->GetAI = GetAI_npc_flash_freeze;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_boss_hodir";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_boss_hodir;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_icicle_target";
+    //pNewScript->GetAI = GetAI_npc_icicle_target;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_ignis.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_ignis.cpp
new file mode 100644
index 000000000..6e1b14d8b
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_ignis.cpp
@@ -0,0 +1,407 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_ignis
+SD%Complete: 100%
+SDComment:
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+
+enum
+{
+    SAY_AGGRO                           = -1603026,
+    SAY_SLAGPOT_1                       = -1603027,
+    SAY_SLAGPOT_2                       = -1603028,
+    SAY_FLAME_JETS                      = -1603029,
+    SAY_ADDS                            = -1603030,
+    SAY_SLAY_1                          = -1603031,
+    SAY_SLAY_2                          = -1603032,
+    SAY_BERSERK                         = -1603033,
+    SAY_DEATH                           = -1603034,
+
+    EMOTE_FLAME_JETS                    = -1603035,
+    EMOTE_EXTINGUISH_SCORCH             = -1603238,
+
+    // spells
+    SPELL_FLAME_JETS                    = 62680,
+    SPELL_FLAME_JETS_H                  = 63472,
+    SPELL_SLAG_POT                      = 62717,        // damage aura applied when passenger is switched to second seat
+    // SPELL_SLAG_IMBUED                = 63536,        // buff received if target survives the slag pot
+    SPELL_GRAB                          = 62707,        // charge spells for Slag pot - triggers 62708 which will load the player into Ingis' hand (seat 1)
+    SPELL_GRAB_POT                      = 62711,        // aura triggered after 1,5 sec after the first grab; switches the seats from hand to pot (seat 2)
+    SPELL_SCORCH                        = 62546,
+    SPELL_SCORCH_H                      = 63474,
+    SPELL_SCORCH_SUMMON                 = 62551,        // summons npc 33221
+    SPELL_ACTIVATE_CONSTRUCT            = 62488,        // activates constructs and set them in combat (handled in core)
+    SPELL_KILL_ALL_CONSTRUCTS           = 65109,        // on death
+    SPELL_BERSERK                       = 26662,
+
+    // iron construct
+    SPELL_CONSTRUCT_HITTING_YA          = 65110,        // procs on melee damage; purpose unk
+    SPELL_STONED                        = 62468,        // mechanical stun aura
+    SPELL_HEAT                          = 65667,        // stackable aura which heats the construct
+    SPELL_MOLTEN                        = 62373,        // aura gained by the construct when heated to 10 stacks in Scorch
+    SPELL_CHILL                         = 62381,        // chill a construct when moved in water
+    SPELL_BRITTLE                       = 62382,        // stun a construct when chilled in water
+    SPELL_BRITTLE_H                     = 67114,
+    SPELL_SHATTER                       = 62383,        // sends event 21620 for the achiev check
+    SPELL_STRENGTH_REMOVE               = 64475,        // remove 1 stack of the Strength of Creator on construct death
+    SPELL_WATER_EFFECT                  = 64503,        // spell effect which cools the heated constructs and scorch npcs
+    // SPELL_WATER                      = 64502,        // cast by world triggers, in order to check when the constructs reach the water
+
+    // scorch target
+    SPELL_SCORCH_AURA                   = 62548,
+    SPELL_SCORCH_AURA_H                 = 63476,
+
+    // NPC ids
+    NPC_SCORCH                          = 33221,
+    NPC_IRON_CONSTRUCT                  = 33121,        // constructs which are activated on demand by Ignis
+
+    MAX_HEAT_STACKS                     = 10,
+};
+
+/*######
+## boss_ignis
+######*/
+
+struct boss_ignis : public CreatureScript
+{
+    boss_ignis() : CreatureScript("boss_ignis") {}
+
+    struct boss_ignisAI : public ScriptedAI
+    {
+        boss_ignisAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiFlameJetsTimer;
+        uint32 m_uiSlagPotTimer;
+        uint32 m_uiScorchTimer;
+        uint32 m_uiConstructTimer;
+
+        void Reset() override
+        {
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+            m_uiFlameJetsTimer = 20000;
+            m_uiSlagPotTimer = 25000;
+            m_uiScorchTimer = 13000;
+            m_uiConstructTimer = 10000;
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_IGNIS, DONE);
+
+            DoCastSpellIfCan(m_creature, SPELL_KILL_ALL_CONSTRUCTS, CAST_TRIGGERED);
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_IGNIS, IN_PROGRESS);
+
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_IGNIS, FAIL);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SCORCH)
+                pSummoned->CastSpell(pSummoned, m_bIsRegularMode ? SPELL_SCORCH_AURA : SPELL_SCORCH_AURA_H, true);
+        }
+
+        // TODO: Use the vehicle boarding wrappers when they are implemented in core
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pCaster->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            // Handle the case when passenger is loaded to the second seat
+            if (pSpell->Id == SPELL_GRAB_POT)
+                DoCastSpellIfCan(pCaster, SPELL_SLAG_POT, CAST_TRIGGERED);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            if (m_uiFlameJetsTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_FLAME_JETS : SPELL_FLAME_JETS_H) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_FLAME_JETS, m_creature);
+                    DoScriptText(SAY_FLAME_JETS, m_creature);
+                    m_uiFlameJetsTimer = 35000;
+                }
+            }
+            else
+                m_uiFlameJetsTimer -= uiDiff;
+
+            if (m_uiSlagPotTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_GRAB, SELECT_FLAG_PLAYER))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_GRAB) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_SLAGPOT_1 : SAY_SLAGPOT_2, m_creature);
+                        m_uiSlagPotTimer = 30000;
+                    }
+                }
+            }
+            else
+                m_uiSlagPotTimer -= uiDiff;
+
+            if (m_uiConstructTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ACTIVATE_CONSTRUCT) == CAST_OK)
+                {
+                    DoScriptText(SAY_ADDS, m_creature);
+                    m_uiConstructTimer = 40000;
+                }
+            }
+            else
+                m_uiConstructTimer -= uiDiff;
+
+            if (m_uiScorchTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SCORCH : SPELL_SCORCH_H) == CAST_OK)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_SCORCH_SUMMON, CAST_TRIGGERED);
+                    m_uiScorchTimer = 25000;
+                }
+            }
+            else
+                m_uiScorchTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ignisAI(pCreature);
+    }
+};
+
+/*######
+## npc_iron_construct
+######*/
+
+struct npc_iron_construct : public CreatureScript
+{
+    npc_iron_construct() : CreatureScript("npc_iron_construct") {}
+
+    struct npc_iron_constructAI : public ScriptedAI
+    {
+        npc_iron_constructAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+        bool m_bHasShattered;
+
+        void Reset() override
+        {
+            m_bHasShattered = false;
+
+            DoCastSpellIfCan(m_creature, SPELL_STONED, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_CONSTRUCT_HITTING_YA, CAST_TRIGGERED);
+        }
+
+        void JustReachedHome() override
+        {
+            // reset flags if necessary
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+            DoCastSpellIfCan(m_creature, SPELL_STONED, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_CONSTRUCT_HITTING_YA, CAST_TRIGGERED);
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) override
+        {
+            // ToDo: This may need more research related to spell proc
+            if (m_creature->HasAura(m_bIsRegularMode ? SPELL_BRITTLE : SPELL_BRITTLE_H) && !m_bHasShattered)
+            {
+                if (uiDamage > 5000)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_SHATTER, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_STRENGTH_REMOVE, CAST_TRIGGERED);
+
+                    m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    m_creature->GetMotionMaster()->MoveIdle();
+                    m_bHasShattered = true;
+                }
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_HEAT)
+            {
+                if (SpellAuraHolder* pHeatAura = m_creature->GetSpellAuraHolder(SPELL_HEAT))
+                {
+                    if (pHeatAura && pHeatAura->GetStackAmount() == MAX_HEAT_STACKS)
+                        DoCastSpellIfCan(m_creature, SPELL_MOLTEN);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // stop attacking after shattered
+            if (m_bHasShattered)
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_iron_constructAI(pCreature);
+    }
+};
+
+struct spell_ulduar_water_effect : public SpellScript
+{
+    spell_ulduar_water_effect() : SpellScript("spell_ulduar_water_effect") {}
+
+    bool EffectScriptEffect(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Creature* pCreatureTarget, ObjectGuid /*originalCasterGuid*/)
+    {
+        if (uiSpellId == SPELL_WATER_EFFECT && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (pCreatureTarget->GetEntry() == NPC_IRON_CONSTRUCT)
+            {
+                // chill the iron construct if molten (effect handled in core)
+                if (pCreatureTarget->HasAura(SPELL_MOLTEN))
+                    pCreatureTarget->CastSpell(pCreatureTarget, SPELL_CHILL, true);
+            }
+            else if (pCreatureTarget->GetEntry() == NPC_SCORCH)
+            {
+                // despawn the Scorch in water
+                DoScriptText(EMOTE_EXTINGUISH_SCORCH, pCreatureTarget);
+                pCreatureTarget->ForcedDespawn();
+            }
+            return true;
+        }
+        return false;
+    }
+};
+
+/*######
+## npc_scorch
+######*/
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_scorch : public CreatureScript
+{
+    npc_scorch() : CreatureScript("npc_scorch") {}
+
+    struct npc_scorchAI : public Scripted_NoMovementAI
+    {
+        npc_scorchAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { Reset(); }
+
+        void Reset() override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_scorchAI(pCreature);
+    }
+};
+
+void AddSC_boss_ignis()
+{
+    Script* s;
+
+    s = new boss_ignis();
+    s->RegisterSelf();
+    s = new npc_iron_construct();
+    s->RegisterSelf();
+    s = new npc_scorch();
+    s->RegisterSelf();
+
+    s = new spell_ulduar_water_effect();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ignis";
+    //pNewScript->GetAI = GetAI_boss_ignis;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_iron_construct";
+    //pNewScript->GetAI = &GetAI_npc_iron_construct;
+    //pNewScript->pEffectScriptEffectNPC = &EffectScriptEffectCreature_npc_iron_construct;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_scorch";
+    //pNewScript->GetAI = &GetAI_npc_scorch;
+    //pNewScript->pEffectScriptEffectNPC = &EffectScriptEffectCreature_npc_scorch;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp
new file mode 100644
index 000000000..14fee88d4
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp
@@ -0,0 +1,582 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_kologarn
+SD%Complete: 100%
+SDComment:
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+#include "TemporarySummon.h"
+
+enum
+{
+    SAY_AGGRO                           = -1603126,
+    SAY_SHOCKWAVE                       = -1603127,
+    SAY_GRAB                            = -1603128,
+    SAY_ARM_LOST_LEFT                   = -1603129,
+    SAY_ARM_LOST_RIGHT                  = -1603130,
+    SAY_SLAY_1                          = -1603131,
+    SAY_SLAY_2                          = -1603132,
+    SAY_BERSERK                         = -1603133,
+    SAY_DEATH                           = -1603134,
+
+    EMOTE_ARM_RIGHT                     = -1603135,
+    EMOTE_ARM_LEFT                      = -1603136,
+    EMOTE_STONE_GRIP                    = -1603137,
+
+    // Kologarn
+    SPELL_INSTAKILL_KOLOGARN_ARM        = 63628,                // kill both arms on death
+    SPELL_OVERHEAD_SMASH                = 63356,                // cast if both arms are alive
+    SPELL_OVERHEAD_SMASH_H              = 64003,
+    SPELL_ONE_ARMED_SMASH               = 63573,                // cast if only one arm is alive
+    SPELL_ONE_ARMED_SMASH_H             = 64006,
+    SPELL_STONE_SHOUT                   = 63716,                // cast if no arms are alive
+    SPELL_STONE_SHOUT_H                 = 64005,
+    SPELL_PETRIFYING_BREATH             = 62030,                // cast if nobody is in melee range
+    SPELL_PETRIFYING_BREATH_H           = 63980,
+    SPELL_BERSERK                       = 64238,
+    SPELL_REDUCE_PARRY_CHANCE           = 64651,
+
+    // Arms spells
+    SPELL_ARM_VISUAL                    = 64753,                // spawn visual
+    SPELL_ARM_DEAD_DAMAGE_KOLOGARN      = 63629,                // damage to Kologarn on arm death
+    SPELL_ARM_DEAD_DAMAGE_KOLOGARN_H    = 63979,
+    SPELL_RIDE_KOLOGARN_ARMS            = 65343,
+
+    // Left arm
+    SPELL_ARM_SWEEP                     = 63766,                // triggers shockwave effect and visual spells
+    SPELL_ARM_SWEEP_H                   = 63983,
+
+    // Right arm
+    SPELL_STONE_GRIP                    = 62166,                // triggers vehicle control, damage and visual spells
+    SPELL_STONE_GRIP_H                  = 63981,
+
+    // Focused Eyebeam
+    SPELL_FOCUSED_EYEBEAM_SUMMON        = 63342,                // triggers summons spells for npcs 33632 and 33802
+    SPELL_EYEBEAM_PERIODIC              = 63347,
+    SPELL_EYEBEAM_PERIODIC_H            = 63977,
+    SPELL_EYEBEAM_DAMAGE                = 63346,                // triggered by the periodic spell
+    SPELL_EYEBEAM_DAMAGE_H              = 63976,
+    SPELL_EYEBEAM_VISUAL_LEFT           = 63676,                // visual link to Kologarn
+    SPELL_EYEBEAM_VISUAL_RIGHT          = 63702,
+
+    // Rubble stalkers
+    SPELL_SUMMON_RUBBLE                 = 63633,                // triggers 63634 five times
+    SPELL_FALLING_RUBBLE                = 63821,
+    SPELL_FALLING_RUBBLE_H              = 64001,
+    SPELL_CANCEL_STONE_GRIP             = 65594,                // cancels stone grip aura from players
+
+    // NPC ids
+    NPC_FOCUSED_EYEBEAM_RIGHT           = 33802,
+    NPC_FOCUSED_EYEBEAM_LEFT            = 33632,
+    NPC_RUBBLE                          = 33768,
+
+    // other
+    SEAT_ID_LEFT                        = 1,
+    SEAT_ID_RIGHT                       = 2,
+    MAX_ACHIEV_RUBBLE                   = 25,
+};
+
+static const float afKoloArmsLoc[4] = {1797.15f, -24.4027f, 448.741f, 3.1939f};
+
+/*######
+## boss_kologarn
+######*/
+
+struct boss_kologarn : public CreatureScript
+{
+    boss_kologarn() : CreatureScript("boss_kologarn") {}
+
+    struct boss_kologarnAI : public Scripted_NoMovementAI
+    {
+        boss_kologarnAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiMountArmsTimer;
+
+        uint32 m_uiOverheadSmashTimer;
+        uint32 m_uiStoneShoutTimer;
+        uint32 m_uiEyebeamTimer;
+        uint32 m_uiPetrifyingBreathTimer;
+        uint32 m_uiRespawnRightTimer;
+        uint32 m_uiRespawnLeftTimer;
+
+        uint32 m_uiStoneGripTimer;
+        uint32 m_uiShockwaveTimer;
+
+        uint32 m_uiBerserkTimer;
+
+        uint8 m_uiRubbleCount;
+        uint32 m_uiDisarmedTimer;
+
+        void Reset() override
+        {
+            m_uiMountArmsTimer = 5000;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            m_uiOverheadSmashTimer = urand(5000, 10000);
+            m_uiStoneShoutTimer = 1000;
+            m_uiEyebeamTimer = 10000;
+            m_uiPetrifyingBreathTimer = 4000;
+
+            m_uiShockwaveTimer = urand(15000, 20000);
+            m_uiStoneGripTimer = 10000;
+
+            m_uiRespawnRightTimer = 0;
+            m_uiRespawnLeftTimer = 0;
+
+            m_uiRubbleCount = 0;
+            m_uiDisarmedTimer = 0;
+
+            DoCastSpellIfCan(m_creature, SPELL_REDUCE_PARRY_CHANCE, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_KOLOGARN, DONE);
+
+            DoScriptText(SAY_DEATH, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_INSTAKILL_KOLOGARN_ARM, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_INSTAKILL_KOLOGARN_ARM, CAST_TRIGGERED);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_KOLOGARN, IN_PROGRESS);
+
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_KOLOGARN, FAIL);
+
+            // kill both hands - will be respawned
+            m_creature->RemoveAllAuras();
+            DoCastSpellIfCan(m_creature, SPELL_INSTAKILL_KOLOGARN_ARM, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_INSTAKILL_KOLOGARN_ARM, CAST_TRIGGERED);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_RIGHT_ARM:
+            {
+                int32 uiSeat = (int32)SEAT_ID_RIGHT;
+                pSummoned->CastCustomSpell(m_creature, SPELL_RIDE_KOLOGARN_ARMS, &uiSeat, NULL, NULL, true);
+                pSummoned->CastSpell(pSummoned, SPELL_ARM_VISUAL, true);
+
+                if (m_creature->getVictim())
+                    pSummoned->AI()->AttackStart(m_creature->getVictim());
+                break;
+            }
+            case NPC_LEFT_ARM:
+            {
+                int32 uiSeat = (int32)SEAT_ID_LEFT;
+                pSummoned->CastCustomSpell(m_creature, SPELL_RIDE_KOLOGARN_ARMS, &uiSeat, NULL, NULL, true);
+                pSummoned->CastSpell(pSummoned, SPELL_ARM_VISUAL, true);
+
+                if (m_creature->getVictim())
+                    pSummoned->AI()->AttackStart(m_creature->getVictim());
+                break;
+            }
+            case NPC_FOCUSED_EYEBEAM_RIGHT:
+            case NPC_FOCUSED_EYEBEAM_LEFT:
+                // force despawn - if the npc gets in combat it won't despawn automatically
+                pSummoned->ForcedDespawn(10000);
+
+                // cast visuals and damage spell
+                pSummoned->CastSpell(m_creature, pSummoned->GetEntry() == NPC_FOCUSED_EYEBEAM_LEFT ? SPELL_EYEBEAM_VISUAL_LEFT : SPELL_EYEBEAM_VISUAL_RIGHT, true);
+                pSummoned->CastSpell(pSummoned, m_bIsRegularMode ? SPELL_EYEBEAM_PERIODIC : SPELL_EYEBEAM_PERIODIC_H, true);
+
+                // follow the summoner
+                if (pSummoned->IsTemporarySummon())
+                {
+                    TemporarySummon* pTemporary = (TemporarySummon*)pSummoned;
+
+                    if (Unit* pPlayer = m_creature->GetMap()->GetUnit(pTemporary->GetSummonerGuid()))
+                        pSummoned->GetMotionMaster()->MoveChase(pPlayer);
+                }
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (!m_creature->IsAlive() || !m_creature->getVictim())
+                return;
+
+            if (pSummoned->GetEntry() == NPC_LEFT_ARM)
+            {
+                if (m_pInstance)
+                {
+                    if (Creature* pStalker = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_KOLO_STALKER_LEFT))))
+                    {
+                        pStalker->CastSpell(pStalker, m_bIsRegularMode ? SPELL_FALLING_RUBBLE : SPELL_FALLING_RUBBLE_H, true);
+                        pStalker->CastSpell(pStalker, SPELL_SUMMON_RUBBLE, true);
+                        pStalker->CastSpell(pStalker, SPELL_CANCEL_STONE_GRIP, true);
+                    }
+
+                    m_pInstance->SetData(TYPE_ACHIEV_OPEN_ARMS, uint32(false));
+                }
+
+                m_creature->RemoveAurasByCasterSpell(SPELL_RIDE_KOLOGARN_ARMS, pSummoned->GetObjectGuid());
+                pSummoned->CastSpell(m_creature, m_bIsRegularMode ? SPELL_ARM_DEAD_DAMAGE_KOLOGARN : SPELL_ARM_DEAD_DAMAGE_KOLOGARN_H, true);
+                DoScriptText(SAY_ARM_LOST_LEFT, m_creature);
+                m_uiRespawnLeftTimer = 48000;
+
+                // start disarmed achiev timer or set achiev crit as true if timer already started
+                if (m_uiDisarmedTimer)
+                {
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_ACHIEV_DISARMED, uint32(true));
+                }
+                else
+                    m_uiDisarmedTimer = 12000;
+            }
+            else if (pSummoned->GetEntry() == NPC_RIGHT_ARM)
+            {
+                // spawn Rubble and cancel stone grip
+                if (m_pInstance)
+                {
+                    if (Creature* pStalker = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_KOLO_STALKER_RIGHT))))
+                    {
+                        pStalker->CastSpell(pStalker, m_bIsRegularMode ? SPELL_FALLING_RUBBLE : SPELL_FALLING_RUBBLE_H, true);
+                        pStalker->CastSpell(pStalker, SPELL_SUMMON_RUBBLE, true);
+                        pStalker->CastSpell(pStalker, SPELL_CANCEL_STONE_GRIP, true);
+                    }
+
+                    m_pInstance->SetData(TYPE_ACHIEV_OPEN_ARMS, uint32(false));
+                }
+
+                m_creature->RemoveAurasByCasterSpell(SPELL_RIDE_KOLOGARN_ARMS, pSummoned->GetObjectGuid());
+                pSummoned->CastSpell(m_creature, m_bIsRegularMode ? SPELL_ARM_DEAD_DAMAGE_KOLOGARN : SPELL_ARM_DEAD_DAMAGE_KOLOGARN_H, true);
+                DoScriptText(SAY_ARM_LOST_RIGHT, m_creature);
+                m_uiRespawnRightTimer = 48000;
+
+                // start disarmed achiev timer or set achiev crit as true if timer already started
+                if (m_uiDisarmedTimer)
+                {
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_ACHIEV_DISARMED, uint32(true));
+                }
+                else
+                    m_uiDisarmedTimer = 12000;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            // count the summoned Rubble
+            if (eventType == AI_EVENT_CUSTOM_A && pInvoker->GetEntry() == NPC_RUBBLE_STALKER)
+            {
+                ++m_uiRubbleCount;
+
+                if (m_uiRubbleCount == MAX_ACHIEV_RUBBLE && m_pInstance)
+                    m_pInstance->SetData(TYPE_ACHIEV_RUBBLE, uint32(true));
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiMountArmsTimer)
+            {
+                if (m_uiMountArmsTimer <= uiDiff)
+                {
+                    m_creature->SummonCreature(NPC_RIGHT_ARM, afKoloArmsLoc[0], afKoloArmsLoc[1], afKoloArmsLoc[2], afKoloArmsLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                    m_creature->SummonCreature(NPC_LEFT_ARM, afKoloArmsLoc[0], afKoloArmsLoc[1], afKoloArmsLoc[2], afKoloArmsLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                    m_uiMountArmsTimer = 0;
+                }
+                else
+                    m_uiMountArmsTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiRespawnLeftTimer && m_uiRespawnRightTimer)
+            {
+                if (m_uiStoneShoutTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_STONE_SHOUT : SPELL_STONE_SHOUT_H) == CAST_OK)
+                        m_uiStoneShoutTimer = urand(3000, 4000);
+                }
+                else
+                    m_uiStoneShoutTimer -= uiDiff;
+            }
+            else
+            {
+                if (m_uiOverheadSmashTimer < uiDiff)
+                {
+                    CanCastResult castResult;
+                    if (!m_uiRespawnLeftTimer && !m_uiRespawnRightTimer)
+                        castResult = DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_OVERHEAD_SMASH : SPELL_OVERHEAD_SMASH_H);
+                    else
+                        castResult = DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_ONE_ARMED_SMASH : SPELL_ONE_ARMED_SMASH_H);
+
+                    if (castResult == CAST_OK)
+                        m_uiOverheadSmashTimer = 15000;
+                }
+                else
+                    m_uiOverheadSmashTimer -= uiDiff;
+            }
+
+            if (m_uiEyebeamTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FOCUSED_EYEBEAM_SUMMON) == CAST_OK)
+                    m_uiEyebeamTimer = 20000;
+            }
+            else
+                m_uiEyebeamTimer -= uiDiff;
+
+            // respawn left arm if killed
+            if (m_uiRespawnLeftTimer)
+            {
+                if (m_uiRespawnLeftTimer <= uiDiff)
+                {
+                    DoScriptText(EMOTE_ARM_LEFT, m_creature);
+                    m_creature->SummonCreature(NPC_LEFT_ARM, afKoloArmsLoc[0], afKoloArmsLoc[1], afKoloArmsLoc[2], afKoloArmsLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                    m_uiRespawnLeftTimer = 0;
+                }
+                else
+                    m_uiRespawnLeftTimer -= uiDiff;
+            }
+            // use left arm ability if available - spell always cast by Kologarn
+            else
+            {
+                if (m_uiShockwaveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ARM_SWEEP : SPELL_ARM_SWEEP_H) == CAST_OK)
+                    {
+                        DoScriptText(SAY_SHOCKWAVE, m_creature);
+                        m_uiShockwaveTimer = 17000;
+                    }
+                }
+                else
+                    m_uiShockwaveTimer -= uiDiff;
+            }
+
+            // respawn right arm if killed
+            if (m_uiRespawnRightTimer)
+            {
+                if (m_uiRespawnRightTimer <= uiDiff)
+                {
+                    DoScriptText(EMOTE_ARM_RIGHT, m_creature);
+                    m_creature->SummonCreature(NPC_RIGHT_ARM, afKoloArmsLoc[0], afKoloArmsLoc[1], afKoloArmsLoc[2], afKoloArmsLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                    m_uiRespawnRightTimer = 0;
+                }
+                else
+                    m_uiRespawnRightTimer -= uiDiff;
+            }
+            // use right arm ability if available - spell always cast by Kologarn
+            else
+            {
+                if (m_uiStoneGripTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_STONE_GRIP : SPELL_STONE_GRIP_H) == CAST_OK)
+                    {
+                        DoScriptText(SAY_GRAB, m_creature);
+                        DoScriptText(EMOTE_STONE_GRIP, m_creature);
+                        m_uiStoneGripTimer = urand(20000, 30000);
+                    }
+                }
+                else
+                    m_uiStoneGripTimer -= uiDiff;
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        if (m_pInstance)
+                        {
+                            if (Creature* pRightArm = m_pInstance->GetSingleCreatureFromStorage(NPC_RIGHT_ARM))
+                                pRightArm->CastSpell(pRightArm, SPELL_BERSERK, true);
+                            if (Creature* pLeftArm = m_pInstance->GetSingleCreatureFromStorage(NPC_LEFT_ARM))
+                                pLeftArm->CastSpell(pLeftArm, SPELL_BERSERK, true);
+                        }
+
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            if (m_uiDisarmedTimer)
+            {
+                if (m_uiDisarmedTimer <= uiDiff)
+                {
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_ACHIEV_DISARMED, uint32(false));
+                    m_uiDisarmedTimer = 0;
+                }
+                else
+                    m_uiDisarmedTimer -= uiDiff;
+            }
+
+            // melee range check
+            if (!m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+            {
+                if (m_uiPetrifyingBreathTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_PETRIFYING_BREATH : SPELL_PETRIFYING_BREATH_H) == CAST_OK)
+                        m_uiPetrifyingBreathTimer = 4000;
+                }
+                else
+                    m_uiPetrifyingBreathTimer -= uiDiff;
+            }
+            else
+                DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_kologarnAI(pCreature);
+    }
+};
+
+/*######
+## npc_focused_eyebeam
+######*/
+
+struct npc_focused_eyebeam : public CreatureScript
+{
+    npc_focused_eyebeam() : CreatureScript("npc_focused_eyebeam") {}
+
+    struct npc_focused_eyebeamAI : public ScriptedAI
+    {
+        npc_focused_eyebeamAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void SpellHitTarget(Unit* pTarget, SpellEntry const* pSpellEntry) override
+        {
+            if (pTarget->GetTypeId() == TYPEID_PLAYER && (pSpellEntry->Id == SPELL_EYEBEAM_DAMAGE || pSpellEntry->Id == SPELL_EYEBEAM_DAMAGE_H) && m_pInstance)
+                m_pInstance->SetData(TYPE_ACHIEV_LOOKS_KILL, uint32(false));
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_focused_eyebeamAI(pCreature);
+    }
+};
+
+/*######
+## npc_rubble_stalker
+######*/
+
+struct npc_rubble_stalker : public CreatureScript
+{
+    npc_rubble_stalker() : CreatureScript("npc_rubble_stalker") {}
+
+    struct npc_rubble_stalkerAI : public Scripted_NoMovementAI
+    {
+        npc_rubble_stalkerAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_RUBBLE && m_pInstance)
+            {
+                if (Creature* pKologarn = m_pInstance->GetSingleCreatureFromStorage(NPC_KOLOGARN))
+                    SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pKologarn);
+
+                pSummoned->SetInCombatWithZone();
+            }
+        }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_rubble_stalkerAI(pCreature);
+    }
+};
+
+void AddSC_boss_kologarn()
+{
+    Script* s;
+
+    s = new boss_kologarn();
+    s->RegisterSelf();
+    s = new npc_focused_eyebeam();
+    s->RegisterSelf();
+    s = new npc_rubble_stalker();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_kologarn";
+    //pNewScript->GetAI = GetAI_boss_kologarn;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_focused_eyebeam";
+    //pNewScript->GetAI = GetAI_npc_focused_eyebeam;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_rubble_stalker";
+    //pNewScript->GetAI = GetAI_npc_rubble_stalker;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_mimiron.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_mimiron.cpp
new file mode 100644
index 000000000..4afa57116
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_mimiron.cpp
@@ -0,0 +1,2163 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_mimiron
+SD%Complete: 95%
+SDComment: Laser Barrage rotation require additional research.
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+
+enum
+{
+    SAY_INTRO                               = -1603176,
+    SAY_HARD_MODE                           = -1603177,
+    SAY_BERSERK                             = -1603178,
+
+    SAY_TANK_ACTIVE                         = -1603179,
+    SAY_TANK_SLAY_1                         = -1603180,
+    SAY_TANK_SLAY_2                         = -1603181,
+    SAY_TANK_DEATH                          = -1603182,
+
+    SAY_TORSO_ACTIVE                        = -1603183,
+    SAY_TORSO_SLAY_1                        = -1603184,
+    SAY_TORSO_SLAY_2                        = -1603185,
+    SAY_TORSO_DEATH                         = -1603186,
+
+    SAY_HEAD_ACTIVE                         = -1603187,
+    SAY_HEAD_SLAY_1                         = -1603188,
+    SAY_HEAD_SLAY_2                         = -1603189,
+    SAY_HEAD_DEATH                          = -1603190,
+
+    SAY_ROBOT_ACTIVE                        = -1603191,
+    SAY_ROBOT_SLAY_1                        = -1603192,
+    SAY_ROBOT_SLAY_2                        = -1603193,
+    SAY_ROBOT_DEATH                         = -1603194,
+
+    EMOTE_PLASMA_BLAST                      = -1603196,
+
+    SAY_SELF_DESTRUCT                       = -1603248,
+    SAY_SELF_DESTRUCT_END                   = -1603260,
+    SAY_DESTRUCT_10_MIN                     = -1603249,
+    SAY_DESTRUCT_9_MIN                      = -1603250,
+    SAY_DESTRUCT_8_MIN                      = -1603251,
+    SAY_DESTRUCT_7_MIN                      = -1603252,
+    SAY_DESTRUCT_6_MIN                      = -1603253,
+    SAY_DESTRUCT_5_MIN                      = -1603254,
+    SAY_DESTRUCT_4_MIN                      = -1603255,
+    SAY_DESTRUCT_3_MIN                      = -1603256,
+    SAY_DESTRUCT_2_MIN                      = -1603257,
+    SAY_DESTRUCT_1_MIN                      = -1603258,
+    SAY_DESTRUCT_0_MIN                      = -1603259,
+
+    // mimiron spells
+    SPELL_WELD                              = 63339,
+    SPELL_TELEPORT_VISUAL                   = 41232,
+    SPELL_TELEPORT_VISUAL_2                 = 64446,
+    SPELL_RIDE_VEHICLE_MIMIRON_0            = 52391,                    // seat 0
+    SPELL_RIDE_VEHICLE_MIMIRON_1            = 63313,                    // seat 1
+    SPELL_RIDE_VEHICLE_MIMIRON_2            = 63314,                    // seat 2
+    SPELL_RIDE_VEHICLE_MIMIRON_3            = 63315,                    // seat 3
+    SPELL_RIDE_VEHICLE_MIMIRON_4            = 63316,                    // seat 4
+    SPELL_RIDE_VEHICLE_MIMIRON_5            = 63344,                    // seat 5
+    SPELL_RIDE_VEHICLE_MIMIRON_6            = 63345,                    // seat 6
+    SPELL_JET_PACK_VISUAL                   = 63307,                    // fly animation
+    SPELL_JET_PACK                          = 63341,                    // seat switch spell
+    SPELL_SLEEP_VISUAL                      = 64393,
+    SPELL_SLEEP_WAKE                        = 64394,
+    SPELL_NOT_FRIENDLY_FIRE                 = 65040,                    // achiev check spell
+    SPELL_BERSERK                           = 26662,
+
+    // generic spells
+    SPELL_FREEZE_ANIM                       = 16245,
+    SPELL_SELF_REPAIR                       = 64383,                    // self repair for the robot phase
+    SPELL_HALF_HEAL                         = 64188,                    // heal to prepare the robot phase
+    SPELL_CLEAR_DEBUFFS                     = 34098,
+    SPELL_RIDE_VEHICLE_ROBOT_1              = 64387,                    // seat 7
+    SPELL_RIDE_VEHICLE_ROBOT_2              = 64388,                    // seat 3
+    SPELL_VEHICLE_DAMAGED                   = 63415,
+    SPELL_DESPAWN_ASSAULT_BOTS              = 64463,
+
+    // Leviathan spells
+    SPELL_PROXIMITY_MINES                   = 63027,                    // triggers 65347
+    SPELL_NAPALM_SHELL                      = 64539,                    // triggers 63667 which casts 63666 or 65026
+    SPELL_PLASMA_BLAST                      = 62997,                    // cast by the turret
+    SPELL_PLASMA_BLAST_H                    = 64529,
+    SPELL_SHOCK_BLAST                       = 63631,
+    SPELL_FREEZE_ANIM_DEFEATED              = 63354,                    // visual aura after defeat
+    SPELL_FLAME_SUPPRESSANT                 = 64570,                    // hard mode spells
+    SPELL_EMERGENCY_MODE_LEVIATHAN          = 65101,
+
+    // VX001 spells
+    SPELL_RAPID_BURST_SUMMON                = 64840,
+    SPELL_RAPID_BURST_EFFECT                = 64841,
+    SPELL_RAPID_BURST_AURA                  = 63382,                    // triggers alternative the left and right Rapid Burst or Hand Pulse
+    // SPELL_RAPID_BURST_LEFT               = 63387,                    // used in the VX phase; each spell has a different robot animation
+    // SPELL_RAPID_BURST_RIGHT              = 64019,
+    // SPELL_RAPID_BURST_LEFT_H             = 64531,
+    // SPELL_RAPID_BURST_RIGHT_H            = 64532,
+    // SPELL_LASER_BARRAGE                  = 63274,
+    SPELL_SPINNING_UP                       = 63414,                    // triggers 63274 and 66490;
+    SPELL_ROCKET_STRIKE                     = 64402,                    // targets npc 34050; triggers 63681 and 63036 from target; will spawn npc 34047
+    SPELL_HEAT_WAVE                         = 63679,
+    SPELL_HEAT_WAVE_H                       = 64534,
+    SPELL_HAND_PULSE_LEFT                   = 64348,                    // spells used only in the final phase
+    SPELL_HAND_PULSE_RIGHT                  = 64352,                    // each as a different visual for robot hand animation
+    SPELL_HAND_PULSE_LEFT_H                 = 64536,
+    SPELL_HAND_PULSE_RIGHT_H                = 64537,
+    SPELL_TORSO_DISABLED                    = 64120,                    // visual aura on defeat
+    SPELL_FLAME_SUPPRESSANT_CLOSE           = 65192,                    // hard mode spell
+    SPELL_FROST_BOMB_SUMMON                 = 64623,                    // hard mode spell; triggers 64627 in order to summon npc 34149
+
+    // Aerial unit spells
+    SPELL_PLASMA_BALL_FLY                   = 63689,                    // used during the air phase
+    SPELL_PLASMA_BALL_FLY_H                 = 64535,
+    SPELL_PLASMA_BALL                       = 65647,                    // used during the final phase
+    SPELL_PLASMA_BALL_H                     = 65648,
+    SPELL_SUMMON_ASSAULT_BOT_TRIGGER        = 64425,                    // triggers 64427 and 64426; used to summon npc 34057
+    SPELL_SUMMON_ASSAULT_BOT_VISUAL         = 64426,
+    SPELL_SUMMON_ASSAULT_BOT                = 64427,
+    SPELL_SUMMON_SCRAP_BOT_TRIGGER          = 63820,                    // triggers 63819 and 64398; used to summon npc 33855
+    SPELL_SUMMON_SCRAP_BOT_VISUAL           = 64398,
+    SPELL_SUMMON_SCRAP_BOT                  = 63819,
+    SPELL_BOMB_BOT_SUMMON                   = 63811,                    // summon npc 33836
+    SPELL_MAGNETIC_CORE_PULL                = 64436,
+    SPELL_MAGNETIC_CORE_VISUAL              = 64438,
+    SPELL_SUMMON_FIRE_BOT_TRIGGER           = 64620,                    // triggers 64621, 64622; hard mode spell; used to summon npc 34147
+    SPELL_SUMMON_FIRE_BOT_VISUAL            = 64621,
+    SPELL_SUMMON_FIRE_BOT                   = 64622,
+
+    // proximity mine
+    SPELL_PROXIMITY_MINE                    = 65345,
+    SPELL_EXPLOSION                         = 66351,
+    SPELL_EXPLOSION_H                       = 63009,
+
+    // bots spells
+    // SPELL_BOMB_BOT                       = 63767,
+    SPELL_ROCKET_STRIKE_DAMAGE              = 64064,
+
+    // hard mode spells
+    SPELL_SELF_DESTRUCTION                  = 64613,
+    SPELL_SELF_DESTRUCTION_DAMAGE           = 64610,
+    SPELL_EMERGENCY_MODE                    = 64582,
+
+    // fire spells
+    SPELL_SUMMON_FLAMES_INITIAL             = 64563,                    // cast by npc 21252
+    SPELL_FLAMES                            = 64561,                    // cast by npcs 34363 and 34121
+    SPELL_SUMMON_FLAMES_SPREAD              = 64562,                    // cast by npc 34363
+
+    // frost bomb spells
+    SPELL_EXPLOSION_FROST                   = 64626,
+    SPELL_FROST_BOMB_VISUAL                 = 64624,
+    SPELL_CLEAR_FIRES                       = 65354,
+
+    // summoned
+    NPC_PROXIMITY_MINE                      = 34362,                    // has aura 65345
+    NPC_ROCKET_VISUAL                       = 34050,                    // mounted on vehicle 33651
+    NPC_ROCKET_STRIKE                       = 34047,                    // has aura 64064
+    NPC_BURST_TARGET                        = 34211,                    // casts 64841 on VX001 which triggers 63382
+    NPC_ASSALT_BOT                          = 34057,                    // handled in eventAI
+    NPC_BOMB_BOT                            = 33836,                    // has aura 63767; handled in eventAI
+    NPC_MAGNETIC_CORE                       = 34068,                    // has auras 64438 and 64436
+    NPC_JUNK_BOT                            = 33855,
+
+    // hard mode summoned
+    // NPC_FLAME_INITIAL                    = 34363,
+    // NPC_FLAME_SPREAD                     = 34121,
+    NPC_FROST_BOMB                          = 34149,
+    // NPC_EMERGENCY_FIRE_BOT               = 34147,                    // handled in eventAI
+
+    // other
+    POINT_ID_PARK                           = 1,
+    POINT_ID_CENTER                         = 2,
+    SEAT_ID_TURRET                          = 4,
+
+    // phases
+    PHASE_INTRO                             = 0,
+    PHASE_LEVIATHAN                         = 1,
+    PHASE_VX001                             = 2,
+    PHASE_AERIAL_UNIT                       = 3,
+    PHASE_FULL_ROBOT                        = 4,
+    PHASE_TRANSITION                        = 5,
+    PHASE_DAMAGED                           = 6,
+};
+
+static const DialogueEntry aMimironDialogue[] =
+{
+    {NPC_MIMIRON,               0,              3000},              // encounter start, normal
+    {SAY_TANK_ACTIVE,           NPC_MIMIRON,    6000},
+    {PHASE_LEVIATHAN,           0,              3000},
+    {NPC_LEVIATHAN_MK,          0,              0},
+
+    {SAY_SELF_DESTRUCT,         NPC_COMPUTER,   3000},              // encounter start, hard mode
+    {SAY_DESTRUCT_10_MIN,       NPC_COMPUTER,   3000},
+    {SAY_HARD_MODE,             NPC_MIMIRON,    5000},
+    {NPC_LEVIATHAN_MK,          0,              0},
+
+    {NPC_LEVIATHAN_MK_TURRET,   0,              1000},              // Leviathan defeated, first transition
+    {SAY_TANK_DEATH,            NPC_MIMIRON,    5000},
+    {GO_MIMIRON_ELEVATOR,       0,              15000},
+    {NPC_VX001,                 0,              8000},
+    {SPELL_JET_PACK_VISUAL,     0,              1000},
+    {SPELL_JET_PACK,            0,              3000},
+    {SAY_TORSO_ACTIVE,          NPC_MIMIRON,    3000},
+    {PHASE_VX001,               0,              3000},
+    {SEAT_ID_TURRET,            0,              0},
+
+    {SPELL_TORSO_DISABLED,      0,              5000},              // VX001 defeated, second transition
+    {NPC_ROCKET_STRIKE,         0,              1000},
+    {SAY_TORSO_DEATH,           NPC_MIMIRON,    5000},
+    {NPC_AERIAL_UNIT,           0,              9000},
+    {PHASE_TRANSITION,          0,              1000},
+    {PHASE_AERIAL_UNIT,         0,              6000},
+    {SAY_HEAD_ACTIVE,           NPC_MIMIRON,    3000},
+    {NPC_MAGNETIC_CORE,         0,              0},
+
+    {NPC_JUNK_BOT,              0,              4000},              // Aerial Unit defeated, last transition
+    {SAY_HEAD_DEATH,            NPC_MIMIRON,    2000},
+    {NPC_COMPUTER,              0,              4000},
+    {SPELL_HALF_HEAL,           0,              4000},
+    {NPC_BOMB_BOT,              0,              3000},
+    {NPC_BURST_TARGET,          0,              4000},
+    {SAY_ROBOT_ACTIVE,          NPC_MIMIRON,    3000},
+    {NPC_ROCKET_VISUAL,         0,              4000},
+    {NPC_PROXIMITY_MINE,        0,              0},
+
+    {SPELL_SLEEP_VISUAL,        0,              7000},              // Robot defeated, epilogue
+    {SPELL_SLEEP_WAKE,          0,              3000},
+    {SAY_ROBOT_DEATH,           NPC_MIMIRON,    10000},
+    {SPELL_TELEPORT_VISUAL,     0,              0},
+    {0, 0, 0},
+};
+
+// a random list of seats which can be used by Mimiron in idle mode
+static const uint32 aRandomAnimationSpells[] = {SPELL_RIDE_VEHICLE_MIMIRON_0, SPELL_RIDE_VEHICLE_MIMIRON_1, SPELL_RIDE_VEHICLE_MIMIRON_2, SPELL_RIDE_VEHICLE_MIMIRON_4};
+
+// teleporters
+static const uint32 aMimironTeleporters[] = {GO_MIMIRON_TEL1, GO_MIMIRON_TEL2, GO_MIMIRON_TEL3, GO_MIMIRON_TEL4, GO_MIMIRON_TEL5, GO_MIMIRON_TEL6, GO_MIMIRON_TEL7, GO_MIMIRON_TEL8, GO_MIMIRON_TEL9};
+
+// spawn or move positions
+static const float afTankEvadePos[4] = {2792.07f, 2596.32f, 364.3136f, 3.5f};
+static const float afRobotSpawnPos[4] = {2744.431f, 2569.385f, 364.3968f, 3.141f};
+static const float afRocketSpawnPos[4] = {2746.262f, 2567.085f, 369.2921f, 3.14f};
+static const float afAerialSpawnPos[4] = {2744.365f, 2569.303f, 392.2355f, 3.15f};
+static const float afAerialMovePos[3] = {2743.32f, 2569.285f, 378.2812f};
+static const float afTankMovePos[3] = {2763.82f, 2568.87f, 364.3136f};
+static const float afCenterMovePos[3] = {2744.61f, 2569.38f, 364.3136f};
+
+/*######
+## boss_mimiron
+######*/
+
+struct boss_mimiron : public CreatureScript
+{
+    boss_mimiron() : CreatureScript("boss_mimiron") {}
+
+    struct boss_mimironAI : public ScriptedAI, private DialogueHelper
+    {
+        boss_mimironAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aMimironDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+            m_bHasDoneIntro = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+        uint8 m_uiDestructStage;
+        uint32 m_uiDestructTimer;
+
+        uint32 m_uiWeldTimer;
+        uint32 m_uiAnimationTimer;
+        uint32 m_uiCurrentSeatAura;
+
+        uint32 m_uiWakeUpTimer;
+        uint32 m_uiFlamesTimer;
+        uint32 m_uiBerserkTimer;
+
+        bool m_bHasDoneIntro;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_INTRO;
+            m_uiDestructStage = 0;
+            m_uiDestructTimer = 0;
+            m_uiWakeUpTimer = 0;
+            m_uiWeldTimer = 1000;
+            m_uiAnimationTimer = 10000;
+            m_uiFlamesTimer = 0;
+            m_uiBerserkTimer = 0;
+            m_uiCurrentSeatAura = SPELL_RIDE_VEHICLE_MIMIRON_0;
+
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasDoneIntro && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 70.0f))
+            {
+                DoScriptText(SAY_INTRO, m_creature);
+                m_bHasDoneIntro = true;
+            }
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            // start encounter on first damage
+            if (m_uiPhase == PHASE_INTRO && uiDamage)
+            {
+                m_uiPhase = PHASE_LEVIATHAN;
+
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_MIMIRON, IN_PROGRESS);
+
+                StartNextDialogueText(NPC_MIMIRON);
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            if (!m_pInstance)
+                return;
+
+            switch (iEntry)
+            {
+                // Encounter intro (normal and hard mode)
+            case NPC_MIMIRON:
+            case NPC_LEVIATHAN_MK_TURRET:
+                // jump on the top of the robot for intro / phase end text
+                m_creature->RemoveAurasDueToSpell(SPELL_WELD);
+                if (Creature* pLeviathan = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK))
+                {
+                    pLeviathan->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE, m_creature->GetObjectGuid());
+                    DoCastSpellIfCan(pLeviathan, SPELL_RIDE_VEHICLE_MIMIRON_5, CAST_TRIGGERED);
+                }
+                break;
+            case PHASE_LEVIATHAN:
+            case SAY_HARD_MODE:
+                // mount inside the robot
+                m_creature->RemoveAurasDueToSpell(SPELL_WELD);
+                if (Creature* pLeviathan = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK))
+                {
+                    pLeviathan->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE, m_creature->GetObjectGuid());
+                    DoCastSpellIfCan(pLeviathan, SPELL_RIDE_VEHICLE_MIMIRON_6, CAST_TRIGGERED);
+
+                    // hard mode aura
+                    if (m_pInstance->GetData(TYPE_MIMIRON_HARD) == DONE)
+                    {
+                        pLeviathan->CastSpell(pLeviathan, SPELL_EMERGENCY_MODE, true);
+                        pLeviathan->CastSpell(pLeviathan, SPELL_EMERGENCY_MODE_LEVIATHAN, true);
+                    }
+
+                    m_uiBerserkTimer = 15 * MINUTE * IN_MILLISECONDS;
+                }
+                break;
+            case NPC_LEVIATHAN_MK:
+                if (Creature* pLeviathan = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK))
+                {
+                    pLeviathan->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM);
+                    pLeviathan->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    pLeviathan->SetInCombatWithZone();
+                }
+                // Note: maybe the flags are handled by the vehicle seats. Set them manually for the moment.
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                break;
+
+                // Start phase 2 transition
+            case GO_MIMIRON_ELEVATOR:
+                m_pInstance->DoUseDoorOrButton(GO_MIMIRON_ELEVATOR);
+                break;
+            case NPC_VX001:
+                if (GameObject* pElevator = m_pInstance->GetSingleGameObjectFromStorage(GO_MIMIRON_ELEVATOR))
+                    pElevator->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
+                m_creature->SummonCreature(NPC_VX001, afRobotSpawnPos[0], afRobotSpawnPos[1], afRobotSpawnPos[2], afRobotSpawnPos[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                break;
+            case SPELL_JET_PACK_VISUAL:
+                DoCastSpellIfCan(m_creature, SPELL_JET_PACK_VISUAL);
+                break;
+            case SPELL_JET_PACK:
+                // fly from the Leviathan to VX001
+                if (Creature* pLeviathan = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK))
+                    pLeviathan->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE, m_creature->GetObjectGuid());
+                if (Creature* pVx001 = m_pInstance->GetSingleCreatureFromStorage(NPC_VX001))
+                    DoCastSpellIfCan(pVx001, SPELL_RIDE_VEHICLE_MIMIRON_0, CAST_TRIGGERED);
+                break;
+            case SAY_TORSO_ACTIVE:
+                m_creature->RemoveAurasDueToSpell(SPELL_JET_PACK_VISUAL);
+                break;
+            case PHASE_VX001:
+                // mount inside the robot
+                if (Creature* pVx001 = m_pInstance->GetSingleCreatureFromStorage(NPC_VX001))
+                {
+                    pVx001->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE, m_creature->GetObjectGuid());
+                    DoCastSpellIfCan(pVx001, SPELL_RIDE_VEHICLE_MIMIRON_1, CAST_TRIGGERED);
+
+                    // hard mode aura
+                    if (m_pInstance->GetData(TYPE_MIMIRON_HARD) == DONE)
+                        pVx001->CastSpell(pVx001, SPELL_EMERGENCY_MODE, true);
+                }
+                break;
+            case SEAT_ID_TURRET:
+                if (Creature* pVx001 = m_pInstance->GetSingleCreatureFromStorage(NPC_VX001))
+                {
+                    pVx001->SetHealth(pVx001->GetMaxHealth());
+                    pVx001->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM);
+                    pVx001->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    pVx001->SetInCombatWithZone();
+                }
+                break;
+
+                // Start phase 3 transition
+            case NPC_ROCKET_STRIKE:
+                // mount on the top of the robot for phase end text
+                if (Creature* pVx001 = m_pInstance->GetSingleCreatureFromStorage(NPC_VX001))
+                {
+                    pVx001->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE, m_creature->GetObjectGuid());
+                    DoCastSpellIfCan(pVx001, SPELL_RIDE_VEHICLE_MIMIRON_4, CAST_TRIGGERED);
+                }
+                break;
+            case NPC_AERIAL_UNIT:
+                m_creature->SummonCreature(NPC_AERIAL_UNIT, afAerialSpawnPos[0], afAerialSpawnPos[1], afAerialSpawnPos[2], afAerialSpawnPos[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                break;
+            case PHASE_TRANSITION:
+                DoCastSpellIfCan(m_creature, SPELL_JET_PACK_VISUAL);
+                break;
+            case PHASE_AERIAL_UNIT:
+                // mount inside the flying robot
+                if (Creature* pVx001 = m_pInstance->GetSingleCreatureFromStorage(NPC_VX001))
+                    pVx001->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE, m_creature->GetObjectGuid());
+                if (Creature* pAerial = m_pInstance->GetSingleCreatureFromStorage(NPC_AERIAL_UNIT))
+                {
+                    DoCastSpellIfCan(pAerial, SPELL_RIDE_VEHICLE_MIMIRON_0, CAST_TRIGGERED);
+
+                    // hard mode aura
+                    if (m_pInstance->GetData(TYPE_MIMIRON_HARD) == DONE)
+                        pAerial->CastSpell(pAerial, SPELL_EMERGENCY_MODE, true);
+                }
+                break;
+            case SAY_HEAD_ACTIVE:
+                m_creature->RemoveAurasDueToSpell(SPELL_JET_PACK_VISUAL);
+                break;
+            case NPC_MAGNETIC_CORE:
+                if (Creature* pAerial = m_pInstance->GetSingleCreatureFromStorage(NPC_AERIAL_UNIT))
+                {
+                    pAerial->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    pAerial->SetInCombatWithZone();
+                }
+                break;
+
+                // Start phase 4 transition
+            case NPC_COMPUTER:
+                // get the tank into combat position
+                if (Creature* pLeviathan = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK))
+                {
+                    pLeviathan->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM_DEFEATED);
+                    pLeviathan->GetMotionMaster()->MovePoint(POINT_ID_CENTER, afTankMovePos[0], afTankMovePos[1], afTankMovePos[2]);
+                }
+                break;
+            case SPELL_HALF_HEAL:
+            {
+                // mount the torso on top of the tank
+                Creature* pLeviathan = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK);
+                Creature* pVx001 = m_pInstance->GetSingleCreatureFromStorage(NPC_VX001);
+                if (!pLeviathan || !pVx001)
+                    return;
+
+                pVx001->RemoveAurasDueToSpell(SPELL_TORSO_DISABLED);
+                pVx001->CastSpell(pLeviathan, SPELL_RIDE_VEHICLE_ROBOT_1, true);
+                break;
+            }
+            case NPC_BOMB_BOT:
+                if (Creature* pLeviathan = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK))
+                    pLeviathan->GetMotionMaster()->MovePoint(POINT_ID_CENTER, afCenterMovePos[0], afCenterMovePos[1], afCenterMovePos[2]);
+                break;
+            case NPC_BURST_TARGET:
+            {
+                // mount the head on top of the torso
+                Creature* pAerial = m_pInstance->GetSingleCreatureFromStorage(NPC_AERIAL_UNIT);
+                Creature* pVx001 = m_pInstance->GetSingleCreatureFromStorage(NPC_VX001);
+                if (!pAerial || !pVx001)
+                    return;
+
+                pAerial->CastSpell(pVx001, SPELL_RIDE_VEHICLE_ROBOT_2, true);
+                break;
+            }
+            case NPC_ROCKET_VISUAL:
+                // switch from the head to inside the torso
+                if (Creature* pAerial = m_pInstance->GetSingleCreatureFromStorage(NPC_AERIAL_UNIT))
+                    pAerial->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE, m_creature->GetObjectGuid());
+                if (Creature* pVx001 = m_pInstance->GetSingleCreatureFromStorage(NPC_VX001))
+                    DoCastSpellIfCan(pVx001, SPELL_RIDE_VEHICLE_MIMIRON_1, CAST_TRIGGERED);
+                break;
+            case NPC_PROXIMITY_MINE:
+                // set the whole robot in combat and inform about phase 4
+                if (Creature* pAerial = m_pInstance->GetSingleCreatureFromStorage(NPC_AERIAL_UNIT))
+                {
+                    SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pAerial);
+                    pAerial->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                }
+                if (Creature* pVx001 = m_pInstance->GetSingleCreatureFromStorage(NPC_VX001))
+                {
+                    SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pVx001);
+                    pVx001->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    pVx001->SetInCombatWithZone();
+                }
+                if (Creature* pLeviathan = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK))
+                {
+                    SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pLeviathan);
+                    pLeviathan->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                }
+                break;
+
+                // Start encounter epilogue
+            case SPELL_SLEEP_VISUAL:
+                DoCastSpellIfCan(m_creature, SPELL_SLEEP_VISUAL);
+                if (m_pInstance->GetData(TYPE_MIMIRON_HARD) == DONE)
+                {
+                    if (Creature* pComputer = m_pInstance->GetSingleCreatureFromStorage(NPC_COMPUTER))
+                    {
+                        DoScriptText(SAY_SELF_DESTRUCT_END, pComputer);
+                        m_uiFlamesTimer = 0;
+                        m_uiDestructTimer = 0;
+                    }
+                }
+                break;
+            case SPELL_SLEEP_WAKE:
+                if (DoCastSpellIfCan(m_creature, SPELL_SLEEP_WAKE) == CAST_OK)
+                    m_creature->RemoveAurasDueToSpell(SPELL_SLEEP_VISUAL);
+                break;
+            case SPELL_TELEPORT_VISUAL:
+                if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT_VISUAL) == CAST_OK)
+                    m_creature->ForcedDespawn(2000);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_AERIAL_UNIT)
+                pSummoned->GetMotionMaster()->MovePoint(1, afAerialMovePos[0], afAerialMovePos[1], afAerialMovePos[2]);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            switch (eventType)
+            {
+                // Red button pressed
+            case AI_EVENT_CUSTOM_A:
+                StartNextDialogueText(SAY_SELF_DESTRUCT);
+                m_uiPhase = PHASE_LEVIATHAN;
+
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_MIMIRON, IN_PROGRESS);
+                m_uiDestructTimer = MINUTE * IN_MILLISECONDS;
+                m_uiFlamesTimer = 7000;
+                break;
+                // Leviathan phase finished
+            case AI_EVENT_CUSTOM_B:
+                StartNextDialogueText(NPC_LEVIATHAN_MK_TURRET);
+                break;
+                // VX001 phase finished
+            case AI_EVENT_CUSTOM_C:
+                StartNextDialogueText(SPELL_TORSO_DISABLED);
+                break;
+                // Aerial unit phase finished
+            case AI_EVENT_CUSTOM_D:
+                StartNextDialogueText(NPC_COMPUTER);
+                break;
+                // Robot piece destroyed
+            case AI_EVENT_CUSTOM_E:
+                if (!m_uiWakeUpTimer)
+                    m_uiWakeUpTimer = 10000;
+                break;
+            default:
+                break;
+            }
+        }
+
+        // function to switch to another seat on the Leviathan
+        void DoFlyToNextRandomSeat()
+        {
+            if (!m_pInstance)
+                return;
+
+            Creature* pLeviathan = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK);
+            if (!pLeviathan)
+                return;
+
+            m_creature->RemoveAurasDueToSpell(SPELL_WELD);
+            pLeviathan->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE, m_creature->GetObjectGuid());
+
+            uint32 uiNextAuraId = aRandomAnimationSpells[urand(0, countof(aRandomAnimationSpells) - 1)];
+
+            while (uiNextAuraId == m_uiCurrentSeatAura)
+                uiNextAuraId = aRandomAnimationSpells[urand(0, countof(aRandomAnimationSpells) - 1)];
+
+            m_uiCurrentSeatAura = uiNextAuraId;
+            DoCastSpellIfCan(pLeviathan, m_uiCurrentSeatAura, CAST_TRIGGERED);
+        }
+
+        // function to trigger the flames explosion for hard mode
+        void DoSpawnFlamesInitial()
+        {
+            if (!m_pInstance)
+                return;
+
+            Creature* pLeviathan = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK);
+            Creature* pTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_WORLD_TRIGGER_FLAMES);
+            if (!pLeviathan || !pTrigger)
+                return;
+
+            for (uint8 i = 0; i < 3; ++i)
+            {
+                // Select targets based on Leviathan threat list; if the Leviathan is not in combat select them using instance
+                Unit* pTarget = NULL;
+                if (pLeviathan->getVictim())
+                    pTarget = pLeviathan->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_SUMMON_FLAMES_INITIAL, SELECT_FLAG_PLAYER);
+                else
+                    pTarget = m_pInstance->GetPlayerInMap(true, false);
+
+                if (pTarget)
+                    pTrigger->CastSpell(pTarget, SPELL_SUMMON_FLAMES_INITIAL, true);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_pInstance)
+            {
+                script_error_log("Instance Ulduar: ERROR Failed to load instance data for this instace.");
+                return;
+            }
+
+            DialogueUpdate(uiDiff);
+
+            if (m_uiPhase == PHASE_INTRO)
+            {
+                // in idle mode Mimiron jumps around the Leviathan
+                if (m_uiAnimationTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_JET_PACK) == CAST_OK)
+                    {
+                        DoFlyToNextRandomSeat();
+                        m_uiWeldTimer = 2000;
+                        m_uiAnimationTimer = urand(12000, 15000);
+                    }
+                }
+                else
+                    m_uiAnimationTimer -= uiDiff;
+
+                if (m_uiWeldTimer)
+                {
+                    if (m_uiWeldTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_WELD) == CAST_OK)
+                            m_uiWeldTimer = 0;
+                    }
+                    else
+                        m_uiWeldTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiWakeUpTimer)
+            {
+                // check if all robot pieces are damaged
+                if (m_uiWakeUpTimer <= uiDiff)
+                {
+                    Creature* pLeviathan = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK);
+                    Creature* pVx001 = m_pInstance->GetSingleCreatureFromStorage(NPC_VX001);
+                    Creature* pAerial = m_pInstance->GetSingleCreatureFromStorage(NPC_AERIAL_UNIT);
+                    if (!pAerial || !pVx001 || !pLeviathan)
+                        return;
+
+                    // if all robot pieces are damaged finish the encounter
+                    if (pLeviathan->HasAura(SPELL_FREEZE_ANIM) && pVx001->getStandState() == UNIT_STAND_STATE_DEAD && pAerial->getStandState() == UNIT_STAND_STATE_DEAD)
+                    {
+                        // eject from the robot and start dialogue
+                        pVx001->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE, m_creature->GetObjectGuid());
+                        StartNextDialogueText(SPELL_SLEEP_VISUAL);
+
+                        // kill the robot parts
+                        m_creature->DealDamage(pLeviathan, pLeviathan->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                        m_creature->DealDamage(pVx001, pVx001->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                        m_creature->DealDamage(pAerial, pAerial->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                    }
+                    m_uiWakeUpTimer = 0;
+                }
+                else
+                    m_uiWakeUpTimer -= uiDiff;
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (Creature* pLeviathan = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK))
+                        pLeviathan->CastSpell(pLeviathan, SPELL_BERSERK, true);
+                    if (Creature* pVx001 = m_pInstance->GetSingleCreatureFromStorage(NPC_VX001, true))
+                        pVx001->CastSpell(pVx001, SPELL_BERSERK, true);
+                    if (Creature* pAerial = m_pInstance->GetSingleCreatureFromStorage(NPC_AERIAL_UNIT, true))
+                        pAerial->CastSpell(pAerial, SPELL_BERSERK, true);
+
+                    DoScriptText(SAY_BERSERK, m_creature);
+                    m_uiBerserkTimer = 0;
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            if (m_uiFlamesTimer)
+            {
+                if (m_uiFlamesTimer <= uiDiff)
+                {
+                    DoSpawnFlamesInitial();
+                    m_uiFlamesTimer = urand(25000, 30000);
+                }
+                else
+                    m_uiFlamesTimer -= uiDiff;
+            }
+
+            if (m_uiDestructTimer)
+            {
+                // handle the platform destruction for hard mode
+                if (m_uiDestructTimer <= uiDiff)
+                {
+                    Creature* pComputer = m_pInstance->GetSingleCreatureFromStorage(NPC_COMPUTER);
+                    if (!pComputer)
+                        return;
+
+                    ++m_uiDestructStage;
+                    m_uiDestructTimer = MINUTE * IN_MILLISECONDS;
+
+                    switch (m_uiDestructStage)
+                    {
+                    case 1: DoScriptText(SAY_DESTRUCT_9_MIN, pComputer); break;
+                    case 2: DoScriptText(SAY_DESTRUCT_8_MIN, pComputer); break;
+                    case 3: DoScriptText(SAY_DESTRUCT_7_MIN, pComputer); break;
+                    case 4: DoScriptText(SAY_DESTRUCT_6_MIN, pComputer); break;
+                    case 5: DoScriptText(SAY_DESTRUCT_5_MIN, pComputer); break;
+                    case 6: DoScriptText(SAY_DESTRUCT_4_MIN, pComputer); break;
+                    case 7: DoScriptText(SAY_DESTRUCT_3_MIN, pComputer); break;
+                    case 8: DoScriptText(SAY_DESTRUCT_2_MIN, pComputer); break;
+                    case 9: DoScriptText(SAY_DESTRUCT_1_MIN, pComputer); break;
+                    case 10:
+                        DoScriptText(SAY_DESTRUCT_0_MIN, pComputer);
+                        pComputer->CastSpell(pComputer, SPELL_SELF_DESTRUCTION, true);
+                        pComputer->CastSpell(pComputer, SPELL_SELF_DESTRUCTION_DAMAGE, true);
+                        m_uiDestructTimer = 0;
+                        break;
+                    }
+                }
+                else
+                    m_uiDestructTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_mimironAI(pCreature);
+    }
+};
+
+/*######
+## boss_leviathan_mk2
+######*/
+
+struct boss_leviathan_mk2 : public CreatureScript
+{
+    boss_leviathan_mk2() : CreatureScript("boss_leviathan_mk2") {}
+
+    struct boss_leviathan_mk2AI : public ScriptedAI
+    {
+        boss_leviathan_mk2AI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+
+            DoCastSpellIfCan(m_creature, SPELL_FREEZE_ANIM, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            m_uiPhase = PHASE_INTRO;
+            m_uiMountTimer = 1000;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+        uint8 m_uiPhase;
+
+        uint32 m_uiMountTimer;
+
+        uint32 m_uiMinesTimer;
+        uint32 m_uiNapalmTimer;
+        uint32 m_uiPlasmaBlastTimer;
+        uint32 m_uiShockBlastTimer;
+        uint32 m_uiFlameSuppressTimer;
+
+        void Reset() override
+        {
+            m_uiMinesTimer = 1000;
+            m_uiNapalmTimer = 20000;
+            m_uiPlasmaBlastTimer = 10000;
+            m_uiShockBlastTimer = 30000;
+            m_uiFlameSuppressTimer = 0;
+
+            SetCombatMovement(true);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            m_uiPhase = PHASE_LEVIATHAN;
+
+            if (m_pInstance && m_pInstance->GetData(TYPE_MIMIRON_HARD) == DONE)
+                m_uiFlameSuppressTimer = 50000;
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MIMIRON, DONE);
+        }
+
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+        {
+            if (pDoneBy->GetEntry() == NPC_MIMIRON && m_uiPhase == PHASE_DAMAGED)
+                return;
+
+            if (uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                if (m_uiPhase == PHASE_LEVIATHAN)
+                {
+                    // unmount and destroy the turret
+                    if (m_pInstance)
+                    {
+                        if (Creature* pTurret = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK_TURRET))
+                        {
+                            m_creature->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE, pTurret->GetObjectGuid());
+                            m_creature->DealDamage(pTurret, pTurret->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                        }
+                    }
+
+                    // move to parking position
+                    SetCombatMovement(false);
+                    m_uiPhase = PHASE_TRANSITION;
+                    m_creature->GetMotionMaster()->MovePoint(POINT_ID_PARK, afTankEvadePos[0], afTankEvadePos[1], afTankEvadePos[2]);
+                }
+                else if (m_uiPhase == PHASE_FULL_ROBOT)
+                {
+                    // start self repair
+                    if (DoCastSpellIfCan(m_creature, SPELL_SELF_REPAIR, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_VEHICLE_DAMAGED, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_FREEZE_ANIM, CAST_TRIGGERED);
+
+                        // inform Mimiron about the damaged state
+                        if (Creature* pMimiron = m_pInstance->GetSingleCreatureFromStorage(NPC_MIMIRON))
+                            SendAIEvent(AI_EVENT_CUSTOM_E, m_creature, pMimiron);
+
+                        SetCombatMovement(false);
+                        m_creature->GetMotionMaster()->MoveIdle();
+                        m_uiPhase = PHASE_DAMAGED;
+                    }
+                }
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            // self repair succesfull; resume fight
+            if (pSpell->Id == SPELL_SELF_REPAIR)
+            {
+                m_creature->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM);
+                SetCombatMovement(true);
+                m_creature->GetMotionMaster()->Clear();
+                DoStartMovement(m_creature->getVictim());
+                m_uiPhase = PHASE_FULL_ROBOT;
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MIMIRON, FAIL);
+
+                // respawn the turret if necessary
+                if (Creature* pTurret = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK_TURRET))
+                {
+                    if (!pTurret->IsAlive())
+                        pTurret->Respawn();
+                }
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_FREEZE_ANIM);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+            // reset all the vehicle accessories
+            m_uiMountTimer = 1000;
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER || !m_pInstance)
+                return;
+
+            if (Creature* pMimiron = m_pInstance->GetSingleCreatureFromStorage(NPC_MIMIRON))
+            {
+                if (m_uiPhase == PHASE_FULL_ROBOT)
+                    DoScriptText(urand(0, 1) ? SAY_ROBOT_SLAY_1 : SAY_ROBOT_SLAY_2, pMimiron);
+                else
+                    DoScriptText(urand(0, 1) ? SAY_TANK_SLAY_1 : SAY_TANK_SLAY_2, pMimiron);
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !m_pInstance)
+                return;
+
+            if (uiPointId == POINT_ID_PARK)
+            {
+                // start transition phase
+                if (Creature* pMimiron = m_pInstance->GetSingleCreatureFromStorage(NPC_MIMIRON))
+                    SendAIEvent(AI_EVENT_CUSTOM_B, m_creature, pMimiron);
+
+                // park the Leviathan
+                DoCastSpellIfCan(m_creature, SPELL_CLEAR_DEBUFFS, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_HALF_HEAL, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_FREEZE_ANIM_DEFEATED, CAST_TRIGGERED);
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->SetFacingTo(afTankEvadePos[3]);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            // switch to full robot abilities
+            if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                SetCombatMovement(true);
+                DoStartMovement(m_creature->getVictim());
+                m_uiPhase = PHASE_FULL_ROBOT;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_PROXIMITY_MINE)
+                pSummoned->CastSpell(pSummoned, SPELL_PROXIMITY_MINE, true);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_pInstance)
+            {
+                script_error_log("Instance Ulduar: ERROR Failed to load instance data for this instace.");
+                return;
+            }
+
+            // Mount Mimiron and the Turret manually
+            if (m_uiMountTimer)
+            {
+                if (m_uiMountTimer <= uiDiff)
+                {
+                    m_creature->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE);
+
+                    if (Creature* pTurret = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK_TURRET))
+                    {
+                        int32 iSeat = (int32)SEAT_ID_TURRET;
+                        pTurret->CastCustomSpell(m_creature, SPELL_RIDE_VEHICLE_HARDCODED, &iSeat, NULL, NULL, true);
+                    }
+
+                    if (Creature* pMimiron = m_pInstance->GetSingleCreatureFromStorage(NPC_MIMIRON))
+                        pMimiron->CastSpell(m_creature, SPELL_RIDE_VEHICLE_MIMIRON_0, true);
+
+                    m_uiMountTimer = 0;
+                }
+                else
+                    m_uiMountTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // no combat during transition or when damaged
+            if (m_uiPhase == PHASE_TRANSITION || m_uiPhase == PHASE_DAMAGED)
+                return;
+
+            // Leviathan phase spells
+            if (m_uiPhase == PHASE_LEVIATHAN)
+            {
+                if (m_uiPlasmaBlastTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (Creature* pTurret = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK_TURRET))
+                            pTurret->CastSpell(pTarget, m_bIsRegularMode ? SPELL_PLASMA_BLAST : SPELL_PLASMA_BLAST_H, false);
+
+                        DoScriptText(EMOTE_PLASMA_BLAST, m_creature);
+                        m_uiPlasmaBlastTimer = 30000;
+                    }
+                }
+                else
+                    m_uiPlasmaBlastTimer -= uiDiff;
+
+                if (m_uiNapalmTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_NAPALM_SHELL) == CAST_OK)
+                        m_uiNapalmTimer = 7000;
+                }
+                else
+                    m_uiNapalmTimer -= uiDiff;
+
+                if (m_uiFlameSuppressTimer)
+                {
+                    if (m_uiFlameSuppressTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_FLAME_SUPPRESSANT) == CAST_OK)
+                            m_uiFlameSuppressTimer = 60000;
+                    }
+                    else
+                        m_uiFlameSuppressTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiMinesTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_PROXIMITY_MINES) == CAST_OK)
+                    m_uiMinesTimer = 35000;
+            }
+            else
+                m_uiMinesTimer -= uiDiff;
+
+            if (m_uiShockBlastTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHOCK_BLAST) == CAST_OK)
+                    m_uiShockBlastTimer = 34000;
+            }
+            else
+                m_uiShockBlastTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_leviathan_mk2AI(pCreature);
+    }
+};
+
+/*######
+## boss_vx001
+######*/
+
+struct boss_vx001 : public CreatureScript
+{
+    boss_vx001() : CreatureScript("boss_vx001") {}
+
+    struct boss_vx001AI : public ScriptedAI
+    {
+        boss_vx001AI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+
+            DoCastSpellIfCan(m_creature, SPELL_FREEZE_ANIM, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            m_uiPhase = PHASE_INTRO;
+            SetCombatMovement(false);
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+        uint8 m_uiPhase;
+
+        uint32 m_uiRocketStrikeTimer;
+        uint32 m_uiRapidBurstTimer;
+        uint32 m_uLaserBarrageTimer;
+        uint32 m_uiHandPulseTimer;
+        uint32 m_uiBurstEndTimer;
+        uint32 m_uiLaserEndTimer;
+        uint32 m_uiFlameSuppressTimer;
+        uint32 m_uiFrostBombTimer;
+
+        void Reset() override
+        {
+            m_uiBurstEndTimer = 0;
+            m_uiLaserEndTimer = 0;
+            m_uiRapidBurstTimer = 1000;
+            m_uiHandPulseTimer = 1000;
+            m_uiRocketStrikeTimer = 20000;
+            m_uLaserBarrageTimer = urand(30000, 60000);
+            m_uiFlameSuppressTimer = 0;
+            m_uiFrostBombTimer = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_uiPhase == PHASE_INTRO)
+            {
+                m_uiPhase = PHASE_VX001;
+                DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_HEAT_WAVE : SPELL_HEAT_WAVE_H, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+
+                // Set levitate for animation purpose
+                m_creature->SetLevitate(true);
+            }
+
+            if (m_pInstance && m_pInstance->GetData(TYPE_MIMIRON_HARD) == DONE)
+            {
+                m_uiFrostBombTimer = 1000;
+                m_uiFlameSuppressTimer = 5000;
+            }
+        }
+
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+        {
+            if (pDoneBy->GetEntry() == NPC_MIMIRON && m_uiPhase == PHASE_DAMAGED)
+                return;
+
+            if (uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                if (m_uiPhase == PHASE_VX001)
+                {
+                    // shut down the VX001
+                    if (DoCastSpellIfCan(m_creature, SPELL_TORSO_DISABLED, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        Reset();
+                        m_uiPhase = PHASE_TRANSITION;
+
+                        // start transition phase
+                        if (Creature* pMimiron = m_pInstance->GetSingleCreatureFromStorage(NPC_MIMIRON))
+                            SendAIEvent(AI_EVENT_CUSTOM_C, m_creature, pMimiron);
+
+                        DoCastSpellIfCan(m_creature, SPELL_CLEAR_DEBUFFS, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_HALF_HEAL, CAST_TRIGGERED);
+
+                        // custom evade in order to properly handle the animations
+                        // Note: we won't remove all auras because of the hard mode; Debuffs should be removed by the spell above
+                        // m_creature->RemoveAllAurasOnEvade();
+                        m_creature->RemoveAurasDueToSpell(m_bIsRegularMode ? SPELL_HEAT_WAVE : SPELL_HEAT_WAVE_H);
+                        m_creature->DeleteThreatList();
+                        m_creature->CombatStop();
+                        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    }
+                }
+                else if (m_uiPhase == PHASE_FULL_ROBOT)
+                {
+                    // start self repair
+                    if (DoCastSpellIfCan(m_creature, SPELL_SELF_REPAIR, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        // inform Mimiron about the damaged state
+                        if (Creature* pMimiron = m_pInstance->GetSingleCreatureFromStorage(NPC_MIMIRON))
+                            SendAIEvent(AI_EVENT_CUSTOM_E, m_creature, pMimiron);
+
+                        m_uiPhase = PHASE_DAMAGED;
+                        m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+                    }
+                }
+            }
+        }
+
+        void EnterEvadeMode() override {}
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            // self repair succesfull; resume fight
+            if (pSpell->Id == SPELL_SELF_REPAIR)
+            {
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                m_uiPhase = PHASE_FULL_ROBOT;
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER || !m_pInstance)
+                return;
+
+            if (Creature* pMimiron = m_pInstance->GetSingleCreatureFromStorage(NPC_MIMIRON))
+            {
+                if (m_uiPhase == PHASE_FULL_ROBOT)
+                    DoScriptText(urand(0, 1) ? SAY_ROBOT_SLAY_1 : SAY_ROBOT_SLAY_2, pMimiron);
+                else
+                    DoScriptText(urand(0, 1) ? SAY_TORSO_SLAY_1 : SAY_TORSO_SLAY_2, pMimiron);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            // switch to full robot abilities
+            if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                m_uiPhase = PHASE_FULL_ROBOT;
+
+                // Set levitate for animation purpose
+                m_creature->SetLevitate(true);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_BURST_TARGET:
+                pSummoned->CastSpell(m_creature, SPELL_RAPID_BURST_EFFECT, true);
+                m_uiBurstEndTimer = 3000;
+
+                // Remove the target focus but allow the boss to face the burst target
+                m_creature->SetTargetGuid(ObjectGuid());
+                m_creature->SetFacingToObject(pSummoned);
+                break;
+            case NPC_FROST_BOMB:
+                pSummoned->CastSpell(pSummoned, SPELL_FROST_BOMB_VISUAL, true);
+                break;
+            }
+        }
+
+        // Custom threat management
+        bool SelectCustomHostileTarget()
+        {
+            Unit* pTarget = NULL;
+            Unit* pOldTarget = m_creature->getVictim();
+
+            if (!m_creature->GetThreatManager().isThreatListEmpty())
+                pTarget = m_creature->GetThreatManager().getHostileTarget();
+
+            if (pTarget)
+            {
+                if (pOldTarget != pTarget && !m_uiBurstEndTimer && !m_uiLaserEndTimer)
+                    AttackStart(pTarget);
+
+                // Set victim to old target (if not while Burst or Laser)
+                if (pOldTarget && pOldTarget->IsAlive() && !m_uiBurstEndTimer && !m_uiLaserEndTimer)
+                {
+                    m_creature->SetTargetGuid(pOldTarget->GetObjectGuid());
+                    m_creature->SetInFront(pOldTarget);
+                }
+
+                return true;
+            }
+
+            // Will call EnterEvadeMode if fit
+            return m_creature->SelectHostileTarget() && m_creature->getVictim();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!SelectCustomHostileTarget())
+                return;
+
+            // no combat during transition or when damaged
+            if (m_uiPhase == PHASE_TRANSITION || m_uiPhase == PHASE_DAMAGED)
+                return;
+
+            // count the burst or laser expire timer for target reset
+            if (m_uiBurstEndTimer)
+            {
+                if (m_uiBurstEndTimer <= uiDiff)
+                    m_uiBurstEndTimer = 0;
+                else
+                    m_uiBurstEndTimer -= uiDiff;
+            }
+
+            if (m_uiLaserEndTimer)
+            {
+                if (m_uiLaserEndTimer <= uiDiff)
+                    m_uiLaserEndTimer = 0;
+                else
+                    m_uiLaserEndTimer -= uiDiff;
+
+                // no other abilities during Laser
+                return;
+            }
+
+            if (m_uiPhase == PHASE_VX001)
+            {
+                if (m_uiRapidBurstTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_RAPID_BURST_SUMMON, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_RAPID_BURST_SUMMON) == CAST_OK)
+                            m_uiRapidBurstTimer = 4000;
+                    }
+                }
+                else
+                    m_uiRapidBurstTimer -= uiDiff;
+
+                if (m_uiFlameSuppressTimer)
+                {
+                    if (m_uiFlameSuppressTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_FLAME_SUPPRESSANT_CLOSE) == CAST_OK)
+                            m_uiFlameSuppressTimer = 10000;
+                    }
+                    else
+                        m_uiFlameSuppressTimer -= uiDiff;
+                }
+            }
+            else if (m_uiPhase == PHASE_FULL_ROBOT)
+            {
+                if (m_uiHandPulseTimer < uiDiff)
+                {
+                    CanCastResult uiResult;
+                    if (urand(0, 1))
+                        uiResult = DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_HAND_PULSE_LEFT : SPELL_HAND_PULSE_LEFT_H);
+                    else
+                        uiResult = DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_HAND_PULSE_RIGHT : SPELL_HAND_PULSE_RIGHT_H);
+
+                    if (uiResult == CAST_OK)
+                        m_uiHandPulseTimer = urand(1000, 2000);
+                }
+                else
+                    m_uiHandPulseTimer -= uiDiff;
+            }
+
+            if (m_uiRocketStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ROCKET_STRIKE) == CAST_OK)
+                    m_uiRocketStrikeTimer = 20000;
+            }
+            else
+                m_uiRocketStrikeTimer -= uiDiff;
+
+            if (m_uLaserBarrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SPINNING_UP) == CAST_OK)
+                {
+                    m_uiLaserEndTimer = 14000;
+                    m_uLaserBarrageTimer = 40000;
+                }
+            }
+            else
+                m_uLaserBarrageTimer -= uiDiff;
+
+            if (m_uiFrostBombTimer)
+            {
+                if (m_uiFrostBombTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FROST_BOMB_SUMMON) == CAST_OK)
+                        m_uiFrostBombTimer = 30000;
+                }
+                else
+                    m_uiFrostBombTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_vx001AI(pCreature);
+    }
+};
+
+/*######
+## boss_aerial_unit
+######*/
+
+struct boss_aerial_unit : public CreatureScript
+{
+    boss_aerial_unit() : CreatureScript("boss_aerial_unit") {}
+
+    struct boss_aerial_unitAI : public ScriptedAI
+    {
+        boss_aerial_unitAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_creature->SetLevitate(true);
+            m_uiPhase = PHASE_TRANSITION;
+            SetCombatMovement(false);
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+        uint8 m_uiPhase;
+
+        uint32 m_uiCombatMoveTimer;
+        uint32 m_uiPlasmaBallTimer;
+        uint32 m_uiBombBotTimer;
+        uint32 m_uiAssaultBotTimer;
+        uint32 m_uiScrapBotTimer;
+        uint32 m_uiFireBotTimer;
+        uint32 m_uiMagneticTimer;
+
+        void Reset() override
+        {
+            m_uiCombatMoveTimer = 2000;
+            m_uiPlasmaBallTimer = 2000;
+            m_uiAssaultBotTimer = 5000;
+            m_uiBombBotTimer = 15000;
+            m_uiScrapBotTimer = 10000;
+            m_uiMagneticTimer = 0;
+            m_uiFireBotTimer = 0;
+
+            SetCombatMovement(false);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            m_uiPhase = PHASE_AERIAL_UNIT;
+            m_creature->SetWalk(false);
+
+            // init hard mode spells
+            if (m_pInstance && m_pInstance->GetData(TYPE_MIMIRON_HARD) == DONE)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_FIRE_BOT_TRIGGER);
+                m_uiFireBotTimer = 45000;
+            }
+        }
+
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+        {
+            if (pDoneBy->GetEntry() == NPC_MIMIRON && m_uiPhase == PHASE_DAMAGED)
+                return;
+
+            if (uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                if (m_uiPhase == PHASE_AERIAL_UNIT)
+                {
+                    // start transition phase
+                    if (Creature* pMimiron = m_pInstance->GetSingleCreatureFromStorage(NPC_MIMIRON))
+                        SendAIEvent(AI_EVENT_CUSTOM_D, m_creature, pMimiron);
+
+                    // shut down the aerial unit and prepare for the final phase
+                    DoCastSpellIfCan(m_creature, SPELL_CLEAR_DEBUFFS, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_HALF_HEAL, CAST_TRIGGERED);
+                    m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                    m_creature->GetMotionMaster()->Clear();
+                    m_creature->GetMotionMaster()->MovePoint(0, afAerialMovePos[0], afAerialMovePos[1], afAerialMovePos[2]);
+                    m_uiPhase = PHASE_TRANSITION;
+                }
+                else if (m_uiPhase == PHASE_FULL_ROBOT)
+                {
+                    // start self repair
+                    if (DoCastSpellIfCan(m_creature, SPELL_SELF_REPAIR, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        // inform Mimiron about the damaged state
+                        if (Creature* pMimiron = m_pInstance->GetSingleCreatureFromStorage(NPC_MIMIRON))
+                            SendAIEvent(AI_EVENT_CUSTOM_E, m_creature, pMimiron);
+
+                        m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+                        m_uiPhase = PHASE_DAMAGED;
+                    }
+                }
+            }
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            // self repair succesfull; resume fight
+            if (pSpell->Id == SPELL_SELF_REPAIR)
+            {
+                m_uiPhase = PHASE_FULL_ROBOT;
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            }
+            else if (pSpell->Id == SPELL_MAGNETIC_CORE_PULL && pCaster->GetEntry() == NPC_MAGNETIC_CORE)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_MAGNETIC_CORE_VISUAL, CAST_INTERRUPT_PREVIOUS);
+                m_uiMagneticTimer = 20000;
+
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MovePoint(0, pCaster->GetPositionX(), pCaster->GetPositionY(), pCaster->GetPositionZ());
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_MIMIRON, FAIL);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER || !m_pInstance)
+                return;
+
+            if (Creature* pMimiron = m_pInstance->GetSingleCreatureFromStorage(NPC_MIMIRON))
+            {
+                if (m_uiPhase == PHASE_FULL_ROBOT)
+                    DoScriptText(urand(0, 1) ? SAY_ROBOT_SLAY_1 : SAY_ROBOT_SLAY_2, pMimiron);
+                else
+                    DoScriptText(urand(0, 1) ? SAY_HEAD_SLAY_1 : SAY_HEAD_SLAY_2, pMimiron);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            // switch to full robot abilities
+            if (eventType == AI_EVENT_CUSTOM_A)
+                m_uiPhase = PHASE_FULL_ROBOT;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (m_pInstance && m_pInstance->GetData(TYPE_MIMIRON_HARD) == DONE)
+                pSummoned->CastSpell(pSummoned, SPELL_EMERGENCY_MODE, true);
+
+            pSummoned->AI()->AttackStart(m_creature->getVictim());
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiMagneticTimer)
+            {
+                if (m_uiMagneticTimer <= uiDiff)
+                {
+                    m_creature->GetMotionMaster()->Clear();
+                    m_creature->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX(), m_creature->GetPositionY(), afAerialMovePos[2]);
+
+                    m_creature->RemoveAurasDueToSpell(SPELL_MAGNETIC_CORE_VISUAL);
+                    m_uiMagneticTimer = 0;
+                }
+                else
+                    m_uiMagneticTimer -= uiDiff;
+
+                // no other abilities during the magnetic pull
+                return;
+            }
+
+            // no combat during transition or when damaged
+            if (m_uiPhase == PHASE_TRANSITION || m_uiPhase == PHASE_DAMAGED)
+                return;
+
+            // aerial phase spells
+            if (m_uiPhase == PHASE_AERIAL_UNIT)
+            {
+                // move to a closer point to target
+                if (m_uiCombatMoveTimer < uiDiff)
+                {
+                    if (m_creature->GetDistance(m_creature->getVictim()) > 30.0f)
+                    {
+                        float fX, fY, fZ;
+                        m_creature->getVictim()->GetContactPoint(m_creature, fX, fY, fZ, 3 * ATTACK_DISTANCE);
+
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MovePoint(0, fX, fY, m_creature->GetPositionZ());
+                    }
+                    m_uiCombatMoveTimer = 2000;
+                }
+                else
+                    m_uiCombatMoveTimer -= uiDiff;
+
+                if (m_uiPlasmaBallTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_PLASMA_BALL_FLY : SPELL_PLASMA_BALL_FLY_H) == CAST_OK)
+                        m_uiPlasmaBallTimer = urand(2000, 3000);
+                }
+                else
+                    m_uiPlasmaBallTimer -= uiDiff;
+
+                if (m_uiAssaultBotTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_ASSAULT_BOT_TRIGGER) == CAST_OK)
+                        m_uiAssaultBotTimer = 30000;
+                }
+                else
+                    m_uiAssaultBotTimer -= uiDiff;
+
+                if (m_uiBombBotTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BOMB_BOT_SUMMON) == CAST_OK)
+                        m_uiBombBotTimer = 15000;
+                }
+                else
+                    m_uiBombBotTimer -= uiDiff;
+
+                if (m_uiScrapBotTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_SCRAP_BOT_TRIGGER) == CAST_OK)
+                        m_uiScrapBotTimer = 10000;
+                }
+                else
+                    m_uiScrapBotTimer -= uiDiff;
+
+                if (m_uiFireBotTimer)
+                {
+                    if (m_uiFireBotTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_FIRE_BOT_TRIGGER) == CAST_OK)
+                            m_uiFireBotTimer = 45000;
+                    }
+                    else
+                        m_uiFireBotTimer -= uiDiff;
+                }
+            }
+            // full robot abilities
+            else if (m_uiPhase == PHASE_FULL_ROBOT)
+            {
+                if (m_uiPlasmaBallTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_PLASMA_BALL : SPELL_PLASMA_BALL_H) == CAST_OK)
+                        m_uiPlasmaBallTimer = 2000;
+                }
+                else
+                    m_uiPlasmaBallTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_aerial_unitAI(pCreature);
+    }
+};
+
+/*######
+## npc_proximity_mine
+######*/
+
+struct npc_proximity_mine : public CreatureScript
+{
+    npc_proximity_mine() : CreatureScript("npc_proximity_mine") {}
+
+    struct npc_proximity_mineAI : public Scripted_NoMovementAI
+    {
+        npc_proximity_mineAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        uint32 m_uiExplodeTimer;
+
+        void Reset() override
+        {
+            m_uiExplodeTimer = 35000;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiExplodeTimer)
+            {
+                if (m_uiExplodeTimer <= uiDiff)
+                {
+                    // just despawn if already exploded
+                    if (!m_creature->HasAura(SPELL_PROXIMITY_MINE))
+                        m_creature->ForcedDespawn();
+                    else
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_EXPLOSION_H) == CAST_OK)
+                        {
+                            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                            m_creature->RemoveAurasDueToSpell(SPELL_PROXIMITY_MINE);
+                            m_creature->ForcedDespawn(2000);
+                            m_uiExplodeTimer = 0;
+                        }
+                    }
+                }
+                else
+                    m_uiExplodeTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_proximity_mineAI(pCreature);
+    }
+};
+
+/*######
+## npc_bot_trigger
+######*/
+
+struct npc_bot_trigger : public CreatureScript
+{
+    npc_bot_trigger() : CreatureScript("npc_bot_trigger") {}
+
+    struct npc_bot_triggerAI : public Scripted_NoMovementAI
+    {
+        npc_bot_triggerAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiSummonTimer;
+        uint32 m_uiSummonSpell;
+
+        void Reset() override
+        {
+            m_uiSummonTimer = 0;
+            m_uiSummonSpell = 0;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                m_uiSummonTimer = 6000;
+                m_uiSummonSpell = uiMiscValue;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiSummonTimer)
+            {
+                if (m_uiSummonTimer <= uiDiff)
+                {
+                    if (m_pInstance)
+                    {
+                        if (Creature* pAerial = m_pInstance->GetSingleCreatureFromStorage(NPC_AERIAL_UNIT))
+                        {
+                            if (DoCastSpellIfCan(m_creature, m_uiSummonSpell, CAST_TRIGGERED, pAerial->GetObjectGuid()) == CAST_OK)
+                                m_uiSummonTimer = 0;
+                        }
+                    }
+
+                    // search for a nearby teleporter and disable the visual
+                    for (uint8 i = 0; i < countof(aMimironTeleporters); ++i)
+                    {
+                        if (GameObject* pTeleporter = GetClosestGameObjectWithEntry(m_creature, aMimironTeleporters[i], 2.0f))
+                        {
+                            pTeleporter->ResetDoorOrButton();
+                            break;
+                        }
+                    }
+                }
+                else
+                    m_uiSummonTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_bot_triggerAI(pCreature);
+    }
+};
+
+struct spell_summon_any_bot_trigger : public SpellScript
+{
+    spell_summon_any_bot_trigger() : SpellScript("spell_summon_any_bot_trigger") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if ((uiSpellId == SPELL_SUMMON_ASSAULT_BOT_TRIGGER || uiSpellId == SPELL_SUMMON_SCRAP_BOT_TRIGGER || uiSpellId == SPELL_SUMMON_FIRE_BOT_TRIGGER) && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+            uint32 uiVisualSpell = 0;
+            uint32 uiSummonSpell = 0;
+
+            switch (uiSpellId)
+            {
+            case SPELL_SUMMON_SCRAP_BOT_TRIGGER:
+                uiVisualSpell = SPELL_SUMMON_ASSAULT_BOT_VISUAL;
+                uiSummonSpell = SPELL_SUMMON_ASSAULT_BOT;
+                break;
+            case SPELL_SUMMON_ASSAULT_BOT_TRIGGER:
+                uiVisualSpell = SPELL_SUMMON_SCRAP_BOT_VISUAL;
+                uiSummonSpell = SPELL_SUMMON_SCRAP_BOT;
+                break;
+            case SPELL_SUMMON_FIRE_BOT_TRIGGER:
+                uiVisualSpell = SPELL_SUMMON_FIRE_BOT_VISUAL;
+                uiSummonSpell = SPELL_SUMMON_FIRE_BOT;
+                break;
+            }
+
+            pCreatureTarget->CastSpell(pCreatureTarget, uiVisualSpell, true);
+            pCreatureTarget->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pCreatureTarget, uiSummonSpell);
+
+            // search for a nearby teleporter and enable the visual
+            for (uint8 i = 0; i < countof(aMimironTeleporters); ++i)
+            {
+                if (GameObject* pTeleporter = GetClosestGameObjectWithEntry(pCreatureTarget, aMimironTeleporters[i], 2.0f))
+                {
+                    pTeleporter->UseDoorOrButton();
+                    break;
+                }
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_mimiron_flames
+######*/
+
+struct npc_mimiron_flames : public CreatureScript
+{
+    npc_mimiron_flames() : CreatureScript("npc_mimiron_flames") {}
+
+    struct npc_mimiron_flamesAI : public Scripted_NoMovementAI
+    {
+        npc_mimiron_flamesAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+        uint32 m_uiSpreadTimer;
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_FLAMES, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            m_uiSpreadTimer = 4000;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        // function to select the closest player to spread the fire
+        Unit* SelectClosestSpreadTarget()
+        {
+            if (!m_pInstance)
+                return NULL;
+
+            Creature* pLeviathan = m_pInstance->GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK);
+            if (!pLeviathan)
+                return NULL;
+
+            std::list<Unit*> lTargets;
+            ThreatList const& threatList = pLeviathan->GetThreatManager().getThreatList();
+
+            for (ThreatList::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
+            {
+                if (Unit* pTarget = m_creature->GetMap()->GetUnit((*itr)->getUnitGuid()))
+                {
+                    if (pTarget->GetTypeId() == TYPEID_PLAYER)
+                        lTargets.push_back(pTarget);
+                }
+            }
+
+            // return the closest target to the caster
+            if (!lTargets.empty())
+            {
+                lTargets.sort(ObjectDistanceOrder(m_creature));
+                return lTargets.front();
+            }
+
+            return NULL;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiSpreadTimer < uiDiff)
+            {
+                if (Unit* pTarget = SelectClosestSpreadTarget())
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SUMMON_FLAMES_SPREAD) == CAST_OK)
+                        m_uiSpreadTimer = 4000;
+                }
+            }
+            else
+                m_uiSpreadTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_mimiron_flamesAI(pCreature);
+    }
+};
+
+/*######
+## npc_frost_bomb
+######*/
+
+// TODO Move this 'script' to EventAI when combat can be proper prevented from core-side
+struct npc_frost_bomb : public CreatureScript
+{
+    npc_frost_bomb() : CreatureScript("npc_frost_bomb") {}
+
+    struct npc_frost_bombAI : public Scripted_NoMovementAI
+    {
+        npc_frost_bombAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        uint32 m_uiExplosionTimer;
+        uint32 m_uiFireClearTimer;
+
+        void Reset() override
+        {
+            m_uiExplosionTimer = 10000;
+            m_uiFireClearTimer = 12000;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiExplosionTimer)
+            {
+                if (m_uiExplosionTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_EXPLOSION_FROST) == CAST_OK)
+                    {
+                        m_creature->RemoveAurasDueToSpell(SPELL_FROST_BOMB_VISUAL);
+                        m_uiExplosionTimer = 0;
+                    }
+                }
+                else
+                    m_uiExplosionTimer -= uiDiff;
+            }
+
+            if (m_uiFireClearTimer)
+            {
+                if (m_uiFireClearTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_CLEAR_FIRES) == CAST_OK)
+                    {
+                        m_creature->ForcedDespawn(2000);
+                        m_uiFireClearTimer = 0;
+                    }
+                }
+                else
+                    m_uiFireClearTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_frost_bombAI(pCreature);
+    }
+};
+
+/*######
+## npc_rocket_strike
+######*/
+
+struct npc_rocket_strike : public CreatureScript
+{
+    npc_rocket_strike() : CreatureScript("npc_rocket_strike") {}
+
+    struct npc_rocket_strikeAI : public Scripted_NoMovementAI
+    {
+        npc_rocket_strikeAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_ROCKET_STRIKE_DAMAGE, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            m_creature->ForcedDespawn(7000);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetEntry() == NPC_ASSALT_BOT)
+                DoCastSpellIfCan(m_creature, SPELL_NOT_FRIENDLY_FIRE, CAST_TRIGGERED);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_rocket_strikeAI(pCreature);
+    }
+};
+
+/*######
+## boss_leviathan_mk2_turret
+######*/
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct boss_leviathan_mk2_turret : public CreatureScript
+{
+    boss_leviathan_mk2_turret() : CreatureScript("boss_leviathan_mk2_turret") {}
+
+    struct boss_leviathan_mk2_turretAI : public Scripted_NoMovementAI
+    {
+        boss_leviathan_mk2_turretAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { Reset(); }
+
+        void Reset() override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_leviathan_mk2_turretAI(pCreature);
+    }
+};
+
+/*######
+## npc_computer
+######*/
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_computer : public CreatureScript
+{
+    npc_computer() : CreatureScript("npc_computer") {}
+
+    struct npc_computerAI : public Scripted_NoMovementAI
+    {
+        npc_computerAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { Reset(); }
+
+        void Reset() override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_computerAI(pCreature);
+    }
+};
+
+/*######
+## go_big_red_button
+######*/
+
+struct go_big_red_button : public GameObjectScript
+{
+    go_big_red_button() : GameObjectScript("go_big_red_button") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+        if (!pInstance)
+            return true;
+
+        if (pInstance->GetData(TYPE_MIMIRON) == IN_PROGRESS || pInstance->GetData(TYPE_MIMIRON) == DONE)
+            return true;
+
+        // Inform Mimiron about the button being pressed
+        if (Creature* pMimiron = pInstance->GetSingleCreatureFromStorage(NPC_MIMIRON))
+            pMimiron->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pPlayer, pMimiron);
+
+        // Set instance data and allow Mimiron script to continue the event
+        pInstance->SetData(TYPE_MIMIRON_HARD, DONE);
+        return false;
+    }
+};
+
+void AddSC_boss_mimiron()
+{
+    Script* s;
+
+    s = new boss_mimiron();
+    s->RegisterSelf();
+    s = new boss_leviathan_mk2();
+    s->RegisterSelf();
+    s = new boss_vx001();
+    s->RegisterSelf();
+    s = new boss_aerial_unit();
+    s->RegisterSelf();
+    s = new npc_proximity_mine();
+    s->RegisterSelf();
+    s = new npc_mimiron_flames();
+    s->RegisterSelf();
+    s = new npc_frost_bomb();
+    s->RegisterSelf();
+    s = new npc_rocket_strike();
+    s->RegisterSelf();
+    s = new boss_leviathan_mk2_turret();
+    s->RegisterSelf();
+    s = new npc_computer();
+    s->RegisterSelf();
+    s = new npc_bot_trigger();
+    s->RegisterSelf();
+
+    s = new go_big_red_button();
+    s->RegisterSelf();
+
+    s = new spell_summon_any_bot_trigger();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_mimiron";
+    //pNewScript->GetAI = GetAI_boss_mimiron;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_leviathan_mk2";
+    //pNewScript->GetAI = GetAI_boss_leviathan_mk2;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_vx001";
+    //pNewScript->GetAI = GetAI_boss_vx001;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_aerial_unit";
+    //pNewScript->GetAI = GetAI_boss_aerial_unit;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_proximity_mine";
+    //pNewScript->GetAI = GetAI_npc_proximity_mine;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_bot_trigger";
+    //pNewScript->GetAI = GetAI_npc_bot_trigger;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_bot_trigger;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_mimiron_flames";
+    //pNewScript->GetAI = GetAI_npc_mimiron_flames;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_frost_bomb";
+    //pNewScript->GetAI = GetAI_npc_frost_bomb;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_rocket_strike";
+    //pNewScript->GetAI = GetAI_npc_rocket_strike;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_leviathan_mk2_turret";
+    //pNewScript->GetAI = GetAI_boss_leviathan_mk2_turret;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_computer";
+    //pNewScript->GetAI = GetAI_npc_computer;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_big_red_button";
+    //pNewScript->pGOUse = &GOUse_go_big_red_button;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp
new file mode 100644
index 000000000..5093cd66e
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp
@@ -0,0 +1,919 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_razorscale
+SD%Complete: 85%
+SDComment: Fine script details require additional core support. Not all achievements are implemented.
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+
+enum
+{
+    SAY_INTRO_WELCOME                   = -1603036,
+    SAY_INTRO_1                         = -1603037,
+    SAY_INTRO_2                         = -1603038,
+    SAY_INTRO_3                         = -1603039,
+    SAY_EXTINGUISH_FIRE                 = -1603042,
+
+    EMOTE_BREATH                        = -1603041,
+    EMOTE_HARPOON_READY                 = -1603043,
+    EMOTE_GROUNDED                      = -1603044,
+
+    // general spells (used in both ground and air phases)
+    SPELL_BERSERK                       = 47008,
+    SPELL_DEVOURING_FLAME               = 63236,            // has summon property = 61, so it won't behave as expected
+    SPELL_FLAME_BREATH                  = 63317,
+    SPELL_FLAME_BREATH_H                = 64021,
+
+    // razorscale air phase spells
+    SPELL_FIREBALL                      = 62796,
+    SPELL_FIREBALL_H                    = 63815,
+    SPELL_STUN                          = 62794,
+
+    // helper npc spells
+    SPELL_SHACKLE                       = 62646,            // channeled on Razorscale grounding phase by npc 33259
+
+    // phase 2 transition spells
+    SPELL_WING_BUFFET                   = 62666,
+    SPELL_FIREBOLT                      = 62669,            // target npc 33282 - destroy the harpoons
+    SPELL_HARPOON_FIRE                  = 62696,            // visual when harpoons are destroyed, cast by 33282
+
+    // ground spells
+    SPELL_FLAME_BUFFET                  = 64016,
+    SPELL_FLAME_BUFFET_H                = 64023,
+    SPELL_FUSE_ARMOR                    = 64771,
+
+    // summoned spells
+    SPELL_DEVOURING_FLAME_AURA          = 64709,
+    SPELL_DEVOURING_FLAME_AURA_H        = 64734,
+
+    // razorscale spawner spells
+    // controlled by some dummy spells: 63114, 63115, 63116, 63968, 63969, 63970
+    SPELL_SUMMON_DWARF_WATCHER          = 63135,            // summons npc 33453
+    SPELL_SUMMON_DWARF_GUARDIAN         = 62926,            // summons npc 33388
+    SPELL_SUMMON_IRON_VRYKUL            = 63798,            // summons npc 33846
+    SPELL_SUMMON_MOLE_MACHINE           = 62899,            // summons go 194316
+
+    // summons
+    NPC_DEVOURING_FLAME                 = 34188,
+    NPC_RAZORSCALE_SPAWNER              = 33245,            // dwarf spawner npc for Razorscale
+    // NPC_DARK_RUNE_WATCHER            = 33453,
+    // NPC_DARK_RUNE_GUARDIAN           = 33388,
+    // NPC_DARK_RUNE_SENTINEL           = 33846,
+    // GO_MOLE_MACHINE                  = 194316,
+
+    // other
+    NPC_HARPOON_FIRE_STATE              = 33282,            // harpoon visual dummy for phase 2 transition
+    // EVENT_ID_HARPOON_SHOT            = 20964,            // event which informs the script that a harpoon has been shot
+    SPEED_RATE_RAZORSCALE               = 10,               // it seems that Razorscale and npcs have a special run speed during air phase, which isn't reflected in DB
+
+    // gossip
+    GOSSIP_ITEM_START_RAZORSCALE        = -3603009,
+    GOSSIP_MENU_ID_WELCOME              = 14317,
+
+    // phases
+    PHASE_AIR                           = 1,
+    PHASE_GROUNDED                      = 2,
+    PHASE_ONLY_GROUND                   = 3,
+    PHASE_TRANSITION                    = 4,
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {NPC_EXPEDITION_ENGINEER,   0,                          3000},
+    {SAY_INTRO_2,               NPC_EXPEDITION_COMMANDER,   4000},
+    {NPC_RAZORSCALE,            0,                          25000},
+    {NPC_EXPEDITION_DEFENDER,   0,                          0},
+    {0, 0, 0},
+};
+
+static const float afRazorscaleGroundPos[3] = { 585.401f, -173.543f, 391.6421f };
+
+static const float afRazorscaleSpawnersPos[3][3] =
+{
+    {577.103f, -231.223f, 391.180f},  // right
+    {606.138f, -231.266f, 391.517f},  // left
+    {589.451f, -209.737f, 391.517f},  // center
+};
+
+/*######
+## boss_razorscale
+######*/
+
+struct boss_razorscale : public CreatureScript
+{
+    boss_razorscale() : CreatureScript("boss_razorscale") {}
+
+    struct boss_razorscaleAI : public ScriptedAI
+    {
+        boss_razorscaleAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_uiMaxHarpoons = m_bIsRegularMode ? 2 : 4;
+
+            m_creature->GetMotionMaster()->MoveRandomAroundPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 10.0f);
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiPhase;
+        bool m_bIsGrounded;
+
+        uint32 m_uiBerserkTimer;
+
+        uint32 m_uiFireballTimer;
+        uint32 m_uiDevouringFlameTimer;
+        uint32 m_uiDwarfSpawnTimer;
+        uint32 m_uiRepairHarpoonTimer;
+
+        uint32 m_uiShackleTimer;
+        uint32 m_uiGroundedTimer;
+        uint8 m_uiGroundedStep;
+
+        uint32 m_uiFlameBuffetTimer;
+        uint32 m_uiFuseArmorTimer;
+        uint32 m_uiFlameBreathTimer;
+
+        uint8 m_uiMaxHarpoons;
+        //uint8 m_uiCurrentHarpoon; //moved to ScriptedInstance
+        uint8 m_uiHarpoonsUsed;
+        uint8 m_uiFlyPhaseCount;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_AIR;
+            m_bIsGrounded = false;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            m_uiFireballTimer = 5000;
+            m_uiDevouringFlameTimer = 10000;
+            m_uiDwarfSpawnTimer = 1000;
+            m_uiRepairHarpoonTimer = 0;
+
+            m_uiShackleTimer = 5000;
+            m_uiHarpoonsUsed = 0;
+            m_uiFlyPhaseCount = 0;
+
+            m_uiGroundedTimer = 30000;
+            m_uiGroundedStep = 0;
+
+            m_uiFlameBuffetTimer = 10000;
+            m_uiFuseArmorTimer = 13000;
+            m_uiFlameBreathTimer = 15000;
+
+            // no combat movement in phase 1
+            SetCombatMovement(false);
+
+            m_creature->SetLevitate(true);
+            m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_RAZORSCALE, DONE);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_RAZORSCALE, IN_PROGRESS);
+
+                // load engineers and harpoon data
+                //m_pInstance->GetEngineersGuids(m_lEngineersGuids);
+                //m_pInstance->GetTrappersGuids(m_lTrappersGuids);
+                //m_pInstance->GetHarpoonsGuids(m_vHarpoonsGuids);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_RAZORSCALE, FAIL);
+
+            m_creature->GetMotionMaster()->MoveRandomAroundPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 10.0f);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_DEVOURING_FLAME)
+                pSummoned->CastSpell(pSummoned, m_bIsRegularMode ? SPELL_DEVOURING_FLAME_AURA : SPELL_DEVOURING_FLAME_AURA_H, true);
+            else if (pSummoned->GetEntry() == NPC_RAZORSCALE_SPAWNER)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_SUMMON_MOLE_MACHINE, true);
+
+                // for central spawners inform that they should spawn a sentinel
+                if (pSummoned->GetPositionY() > -220.0f)
+                    SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pSummoned);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            // inform about the harpoon repair event
+            if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                DoMoveEngineersToHarpoon();
+                m_uiRepairHarpoonTimer = 20000;
+            }
+            // inform about a harpoon being shot
+            if (eventType == AI_EVENT_CUSTOM_B)
+            {
+                ++m_uiHarpoonsUsed;
+
+                // start grounded phase
+                if (m_uiHarpoonsUsed == m_uiMaxHarpoons)
+                {
+                    // use upgraded speed rate for FlyOrLand. This isn't supported by DB but it's confirmed to happen on retail
+                    uint32 uiSpeedRate = m_creature->GetSpeedRate(MOVE_RUN);
+                    m_creature->SetWalk(false);
+                    m_creature->SetSpeedRate(MOVE_RUN, SPEED_RATE_RAZORSCALE);
+                    m_creature->GetMotionMaster()->MoveFlyOrLand(1, afRazorscaleGroundPos[0], afRazorscaleGroundPos[1], afRazorscaleGroundPos[2], false);
+                    m_creature->SetSpeedRate(MOVE_RUN, uiSpeedRate);
+
+                    m_uiPhase = PHASE_TRANSITION;
+                    m_uiShackleTimer = 5000;
+
+                    // move the trappers around
+                    m_pInstance->SetData(TYPE_DO_TRAPPERS_MOVE, 0);
+
+                }
+            }
+        }
+
+        // function to spawn the mole machines
+        void DoSpawnMoleMachines()
+        {
+            // Note: this should be a little more random in therms of position and timer delays between the spawns
+            uint8 uiMaxMachines = roll_chance_i(33) ? 3 : 2;
+            float fX, fY, fZ;
+
+            for (uint8 i = 0; i < uiMaxMachines; ++i)
+            {
+                m_creature->GetRandomPoint(afRazorscaleSpawnersPos[i][0], afRazorscaleSpawnersPos[i][1], afRazorscaleSpawnersPos[i][2], 10.0f, fX, fY, fZ);
+                m_creature->SummonCreature(NPC_RAZORSCALE_SPAWNER, fX, fY, fZ, 0, TEMPSUMMON_TIMED_DESPAWN, 10000);
+            }
+        }
+
+        // function to enable harpoon repair animation
+        void DoMoveEngineersToHarpoon()
+        {
+            // get the current harpoon and move the engineers in front of it
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_DO_MOVE_TO_HARPOON, 0);
+        }
+
+        // function to repair nearby harpoon
+        void DoRepairHarpoon(GameObject* pSource)
+        {
+            // search for each entry of the nearby harpoon
+            GameObject* pNewHarpoon = GetClosestGameObjectWithEntry(pSource, GO_HARPOON_GUN_1, 5.0f);
+            if (!pNewHarpoon)
+                pNewHarpoon = GetClosestGameObjectWithEntry(pSource, GO_HARPOON_GUN_2, 5.0f);
+            if (!pNewHarpoon)
+                pNewHarpoon = GetClosestGameObjectWithEntry(pSource, GO_HARPOON_GUN_3, 5.0f);
+            if (!pNewHarpoon)
+                pNewHarpoon = GetClosestGameObjectWithEntry(pSource, GO_HARPOON_GUN_4, 5.0f);
+
+            if (pNewHarpoon)
+            {
+                pNewHarpoon->SetRespawnTime(HOUR);
+                pNewHarpoon->Refresh();
+            }
+        }
+
+        // custom threat management to support air phase with a high distance from the ground
+        bool SelectCustomHostileTarget()
+        {
+            if (m_uiPhase == PHASE_ONLY_GROUND || m_uiPhase == PHASE_GROUNDED)
+                return m_creature->SelectHostileTarget() && m_creature->getVictim();
+
+            // Special handling for PHASE_AIR
+
+            // Not started combat or evading prevented
+            if (!m_creature->IsInCombat() || m_creature->HasAuraType(SPELL_AURA_MOD_TAUNT))
+                return false;
+
+            // Check if there are still enemies (players)
+            ThreatList const& threatList = m_creature->GetThreatManager().getThreatList();
+            for (ThreatList::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
+            {
+                if ((*itr)->getUnitGuid().IsPlayer())
+                    return true;
+            }
+
+            // Evade in air-phase
+            EnterEvadeMode();
+            return false;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!SelectCustomHostileTarget())
+                return;
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                        m_uiBerserkTimer = 0;
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_AIR:
+
+                if (m_uiFireballTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_FIREBALL : SPELL_FIREBALL_H) == CAST_OK)
+                            m_uiFireballTimer = 2000;
+                    }
+                }
+                else
+                    m_uiFireballTimer -= uiDiff;
+
+                if (m_uiDevouringFlameTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_DEVOURING_FLAME) == CAST_OK)
+                            m_uiDevouringFlameTimer = 10000;
+                    }
+                }
+                else
+                    m_uiDevouringFlameTimer -= uiDiff;
+
+                // harpoon is repaired; move to next one, or to home position if all are completed
+                if (m_uiRepairHarpoonTimer)
+                {
+                    if (m_uiRepairHarpoonTimer <= uiDiff)
+                    {
+                        // handle fire extinguish after a grounded phase
+                        if (!m_pInstance->GetData(TYPE_DATA_CURRENT_HARPOON))
+                        {
+                            // extinguish fires
+                            if (m_pInstance)
+                            {
+                                if (Creature* pCommander = m_pInstance->GetSingleCreatureFromStorage(NPC_EXPEDITION_COMMANDER))
+                                {
+                                    if (Creature* pEngineer = GetClosestCreatureWithEntry(pCommander, NPC_EXPEDITION_ENGINEER, 15.0f))
+                                        DoScriptText(SAY_EXTINGUISH_FIRE, pEngineer);
+                                }
+                            }
+
+                            // move engineers to the first harpoon again
+                            DoMoveEngineersToHarpoon();
+                            m_uiRepairHarpoonTimer = 20000;
+                        }
+                        else
+                        {
+                            DoScriptText(EMOTE_HARPOON_READY, m_creature);
+
+                            // despawn the current broken harpoon and spawn the repaired one
+                            if (GameObject* pHarpoon = m_creature->GetMap()->GetGameObject(ObjectGuid(m_pInstance->GetData64(DATA64_BROKEN_HARPOON))))
+                            {
+                                pHarpoon->SetRespawnTime(HOUR);
+                                pHarpoon->SetLootState(GO_JUST_DEACTIVATED);
+
+                                DoRepairHarpoon(pHarpoon);
+                            }
+
+                            // if all harpoons have been repaired stop
+                            if (uint8(m_pInstance->GetData(TYPE_DATA_CURRENT_HARPOON)) == m_uiMaxHarpoons)
+                            {
+                                m_pInstance->SetData(TYPE_DO_HARPOONS_OK, 0);
+
+                                m_uiRepairHarpoonTimer = 0;
+                            }
+                            // move to next harpoon
+                            else
+                            {
+                                DoMoveEngineersToHarpoon();
+                                m_uiRepairHarpoonTimer = 20000;
+                            }
+                        }
+                    }
+                    else
+                        m_uiRepairHarpoonTimer -= uiDiff;
+                }
+
+                // spawn Mole Machines with dwarfes
+                if (m_uiDwarfSpawnTimer < uiDiff)
+                {
+                    DoSpawnMoleMachines();
+                    m_uiDwarfSpawnTimer = 40000;
+                }
+                else
+                    m_uiDwarfSpawnTimer -= uiDiff;
+
+                break;
+            case PHASE_TRANSITION:
+
+                if (m_uiShackleTimer < uiDiff)
+                {
+                    // cast trap visual
+                    m_pInstance->SetData(TYPE_DO_TRAPPERS_CAST, SPELL_SHACKLE);
+
+                    // stun Razorscale
+                    if (DoCastSpellIfCan(m_creature, SPELL_STUN) == CAST_OK)
+                    {
+                        m_creature->SetLevitate(false);
+                        m_creature->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+
+                        m_uiPhase = PHASE_GROUNDED;
+                        m_uiGroundedTimer = 30000;
+                        m_uiGroundedStep = 0;
+                        m_uiShackleTimer = 5000;
+                    }
+                }
+                else
+                    m_uiShackleTimer -= uiDiff;
+
+                break;
+            case PHASE_GROUNDED:
+
+                if (m_uiGroundedTimer < uiDiff)
+                {
+                    switch (m_uiGroundedStep)
+                    {
+                    case 0:
+                        m_creature->RemoveAurasDueToSpell(SPELL_STUN);
+                        if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_FLAME_BREATH : SPELL_FLAME_BREATH_H) == CAST_OK)
+                        {
+                            DoScriptText(EMOTE_BREATH, m_creature);
+                            m_uiGroundedTimer = 2500;
+                        }
+                        break;
+                    case 1:
+                        if (DoCastSpellIfCan(m_creature, SPELL_WING_BUFFET) == CAST_OK)
+                            m_uiGroundedTimer = 1500;
+                        break;
+                    case 2:
+                        if (DoCastSpellIfCan(m_creature, SPELL_FIREBOLT) == CAST_OK)
+                            m_uiGroundedTimer = 2000;
+                        break;
+                    case 3:
+                        // if fully grounded then go to ground phase
+                        if (m_bIsGrounded)
+                        {
+                            SetCombatMovement(true);
+                            DoResetThreat();
+                            DoStartMovement(m_creature->getVictim());
+                            m_uiPhase = PHASE_ONLY_GROUND;
+                        }
+                        // resume air phase
+                        else
+                        {
+                            m_creature->SetLevitate(true);
+                            m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+
+                            float fX, fY, fZ;
+                            m_creature->GetRespawnCoord(fX, fY, fZ);
+
+                            // use upgraded speed rate for FlyOrLand. This isn't supported by DB but it's confirmed to happen on retail
+                            uint32 uiSpeedRate = m_creature->GetSpeedRate(MOVE_RUN);
+                            m_creature->SetSpeedRate(MOVE_RUN, SPEED_RATE_RAZORSCALE);
+                            m_creature->GetMotionMaster()->MoveFlyOrLand(1, fX, fY, fZ, true);
+                            m_creature->SetSpeedRate(MOVE_RUN, uiSpeedRate);
+
+                            // reset timers
+                            m_uiPhase = PHASE_AIR;
+                            m_pInstance->SetData(TYPE_DATA_CURRENT_HARPOON, 0);
+                            m_uiHarpoonsUsed = 0;
+                            m_uiRepairHarpoonTimer = 20000;
+                            m_uiFireballTimer = 5000;
+                            m_uiDevouringFlameTimer = 10000;
+                            ++m_uiFlyPhaseCount;
+
+                            // set achiev criteria as failed
+                            if (m_uiFlyPhaseCount >= 2 && m_pInstance)
+                                m_pInstance->SetData(TYPE_ACHIEV_QUICK_SHAVE, uint32(false));
+                        }
+
+                        // make the Trappers evade or move to home position
+                        m_pInstance->SetData(TYPE_DO_TRAPPERS_EVADE, 0);
+                        break;
+                    }
+                    ++m_uiGroundedStep;
+                }
+                else
+                    m_uiGroundedTimer -= uiDiff;
+
+                // make boss land at 50% hp
+                if (!m_bIsGrounded && m_creature->GetHealthPercent() < 50.0f)
+                {
+                    DoScriptText(EMOTE_GROUNDED, m_creature);
+                    m_creature->RemoveAurasDueToSpell(SPELL_STUN);
+                    m_uiGroundedStep = 1;
+                    m_uiGroundedTimer = 0;
+                    m_bIsGrounded = true;
+                }
+
+                break;
+            case PHASE_ONLY_GROUND:
+
+                if (m_uiDevouringFlameTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_DEVOURING_FLAME) == CAST_OK)
+                            m_uiDevouringFlameTimer = 10000;
+                    }
+                }
+                else
+                    m_uiDevouringFlameTimer -= uiDiff;
+
+                if (m_uiFuseArmorTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FUSE_ARMOR) == CAST_OK)
+                        m_uiFuseArmorTimer = 13000;
+                }
+                else
+                    m_uiFuseArmorTimer -= uiDiff;
+
+                if (m_uiFlameBuffetTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_FLAME_BUFFET : SPELL_FLAME_BUFFET_H) == CAST_OK)
+                        m_uiFlameBuffetTimer = 10000;
+                }
+                else
+                    m_uiFlameBuffetTimer -= uiDiff;
+
+                if (m_uiFlameBreathTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_FLAME_BREATH : SPELL_FLAME_BREATH_H) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_BREATH, m_creature);
+                        m_uiFlameBreathTimer = 15000;
+                    }
+                }
+                else
+                    m_uiFlameBreathTimer -= uiDiff;
+
+                DoMeleeAttackIfReady();
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_razorscaleAI(pCreature);
+    }
+};
+
+/*######
+## npc_expedition_commander
+######*/
+
+struct npc_expedition_commander : public CreatureScript
+{
+    npc_expedition_commander() : CreatureScript("npc_expedition_commander") {}
+
+    struct npc_expedition_commanderAI : public ScriptedAI, private DialogueHelper
+    {
+        npc_expedition_commanderAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+            m_bIntroDone = false;
+            Reset();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bIntroDone;
+
+        ObjectGuid m_playerGuid;
+
+        void Reset() override { }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // ToDo: verify if all this is correct. There may other parts of the intro which are currently missing
+            if (!m_bIntroDone && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 20.0f))
+            {
+                DoScriptText(SAY_INTRO_WELCOME, m_creature);
+                m_bIntroDone = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            if (!m_pInstance)
+            {
+                script_error_log("Instance Ulduar: ERROR Failed to load instance data for this instace.");
+                return;
+            }
+
+            switch (iEntry)
+            {
+            case NPC_EXPEDITION_ENGINEER:
+            {
+                if (Creature* pEngineer = GetClosestCreatureWithEntry(m_creature, NPC_EXPEDITION_ENGINEER, 15.0f))
+                    DoScriptText(SAY_INTRO_1, pEngineer);
+
+                // move the defenders into attack position
+                m_pInstance->SetData(TYPE_DO_MOVE_DEFENDERS, 0);
+                break;
+            }
+            case NPC_RAZORSCALE:
+                if (Creature* pRazorscale = m_pInstance->GetSingleCreatureFromStorage(NPC_RAZORSCALE))
+                {
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                        pRazorscale->AI()->AttackStart(pPlayer);
+                }
+                break;
+            case NPC_EXPEDITION_DEFENDER:
+                if (Creature* pEngineer = GetClosestCreatureWithEntry(m_creature, NPC_EXPEDITION_ENGINEER, 15.0f))
+                    DoScriptText(SAY_INTRO_3, pEngineer);
+
+                // inform Razorscale about the start of the harpoon event
+                if (Creature* pRazorscale = m_pInstance->GetSingleCreatureFromStorage(NPC_RAZORSCALE))
+                    m_creature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pRazorscale);
+                break;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            // start intro dialogue
+            if (eventType == AI_EVENT_CUSTOM_A && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                StartNextDialogueText(NPC_EXPEDITION_ENGINEER);
+                m_playerGuid = pInvoker->GetObjectGuid();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override { DialogueUpdate(uiDiff); }
+    };
+
+    CreatureAI* GetAI (Creature* pCreature) override
+    {
+        return new npc_expedition_commanderAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_RAZORSCALE) == NOT_STARTED || pInstance->GetData(TYPE_RAZORSCALE) == FAIL)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START_RAZORSCALE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ID_WELCOME, pCreature->GetObjectGuid());
+            return true;
+        }
+
+        return false;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            // start intro dialogue
+            pCreature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pPlayer, pCreature);
+            pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_razorscale_spawner
+######*/
+
+struct npc_razorscale_spawner : public CreatureScript
+{
+    npc_razorscale_spawner() : CreatureScript("npc_razorscale_spawner") {}
+
+    struct npc_razorscale_spawnerAI : public Scripted_NoMovementAI
+    {
+        npc_razorscale_spawnerAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        uint32 m_uiSpawnTimer;
+        bool m_bIsSentinelSpawn;
+
+        void Reset() override
+        {
+            m_uiSpawnTimer = 5000;
+            m_bIsSentinelSpawn = false;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->SetInCombatWithZone();
+        }
+
+        void JustSummoned(GameObject* pGo) override
+        {
+            pGo->Use(m_creature);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            // inform that it should spawn a sentinel
+            if (eventType == AI_EVENT_CUSTOM_A)
+                m_bIsSentinelSpawn = true;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiSpawnTimer)
+            {
+                if (m_uiSpawnTimer <= uiDiff)
+                {
+                    if (m_bIsSentinelSpawn)
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_IRON_VRYKUL, CAST_TRIGGERED);
+                    else
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_DWARF_GUARDIAN, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_DWARF_WATCHER, CAST_TRIGGERED);
+                    }
+                    m_uiSpawnTimer = 0;
+                }
+                else
+                    m_uiSpawnTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_razorscale_spawnerAI(pCreature);
+    }
+};
+
+/*######
+## npc_harpoon_fire_state
+######*/
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_harpoon_fire_state : public CreatureScript
+{
+    npc_harpoon_fire_state() : CreatureScript("npc_harpoon_fire_state") {}
+
+    struct npc_harpoon_fire_stateAI : public Scripted_NoMovementAI
+    {
+        npc_harpoon_fire_stateAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void Reset() override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature)
+    {
+        return new npc_harpoon_fire_stateAI(pCreature);
+    }
+};
+
+struct spell_ulduar_firebolt : public SpellScript
+{
+    spell_ulduar_firebolt() : SpellScript("spell_ulduar_firebolt") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        Creature* pCreatureTarget = pTarget->ToCreature();
+        if (uiSpellId == SPELL_FIREBOLT && uiEffIndex == EFFECT_INDEX_0 && pCreatureTarget->GetEntry() == NPC_HARPOON_FIRE_STATE)
+        {
+            pCreatureTarget->CastSpell(pCreatureTarget, SPELL_HARPOON_FIRE, true);
+
+            // search for each entry of the nearby harpoon
+            GameObject* pHarpoon = GetClosestGameObjectWithEntry(pCreatureTarget, GO_HARPOON_GUN_1, 5.0f);
+            if (!pHarpoon)
+                pHarpoon = GetClosestGameObjectWithEntry(pCreatureTarget, GO_HARPOON_GUN_2, 5.0f);
+            if (!pHarpoon)
+                pHarpoon = GetClosestGameObjectWithEntry(pCreatureTarget, GO_HARPOON_GUN_3, 5.0f);
+            if (!pHarpoon)
+                pHarpoon = GetClosestGameObjectWithEntry(pCreatureTarget, GO_HARPOON_GUN_4, 5.0f);
+
+            // despawn the repaired harpoon
+            if (pHarpoon)
+                pHarpoon->SetLootState(GO_JUST_DEACTIVATED);
+
+            // respawn broken harpoon
+            if (GameObject* pNewHarpoon = GetClosestGameObjectWithEntry(pCreatureTarget, GO_BROKEN_HARPOON, 5.0f))
+                pNewHarpoon->Respawn();
+
+            // force reset for harpoon trigger npcs
+            if (Creature* pTrigger = GetClosestCreatureWithEntry(pCreatureTarget, NPC_RAZORSCALE_CONTROLLER, 5.0f))
+                pTrigger->InterruptNonMeleeSpells(false);
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## event_spell_harpoon_shot
+######*/
+
+struct event_spell_harpoon_shot : public MapEventScript
+{
+    event_spell_harpoon_shot() : MapEventScript("event_spell_harpoon_shot") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* /*pTarget*/, bool /*bIsStart*/) override
+    {
+        if (((Creature*)pSource)->GetEntry() == NPC_RAZORSCALE_CONTROLLER)
+        {
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)((Creature*)pSource)->GetInstanceData())
+            {
+                // event doesn't have target, so we need to give an explicit one
+                if (Creature* pRazorscale = pInstance->GetSingleCreatureFromStorage(NPC_RAZORSCALE))
+                    ((Creature*)pSource)->AI()->SendAIEvent(AI_EVENT_CUSTOM_B, (Creature*)pSource, pRazorscale);
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_razorscale()
+{
+    Script* s;
+
+    s = new boss_razorscale();
+    s->RegisterSelf();
+    s = new npc_expedition_commander();
+    s->RegisterSelf();
+    s = new npc_razorscale_spawner();
+    s->RegisterSelf();
+    s = new npc_harpoon_fire_state();
+    s->RegisterSelf();
+
+    s = new event_spell_harpoon_shot();
+    s->RegisterSelf();
+
+    s = new spell_ulduar_firebolt();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_razorscale";
+    //pNewScript->GetAI = GetAI_boss_razorscale;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_expedition_commander";
+    //pNewScript->GetAI = &GetAI_npc_expedition_commander;
+    //pNewScript->pGossipHello = GossipHello_npc_expedition_commander;
+    //pNewScript->pGossipSelect = GossipSelect_npc_expedition_commander;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_razorscale_spawner";
+    //pNewScript->GetAI = GetAI_npc_razorscale_spawner;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_harpoon_fire_state";
+    //pNewScript->GetAI = GetAI_npc_harpoon_fire_state;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_harpoon_fire_state;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_spell_harpoon_shot";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_spell_harpoon_shot;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_thorim.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_thorim.cpp
new file mode 100644
index 000000000..0c01d66d6
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_thorim.cpp
@@ -0,0 +1,1061 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_thorim
+SD%Complete: 90%
+SDComment: Platform lightning NYI. Script might need minor improvements.
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+
+enum
+{
+    SAY_AGGRO_1                             = -1603138,
+    SAY_AGGRO_2                             = -1603139,
+    SAY_SPECIAL_1                           = -1603140,
+    SAY_SPECIAL_2                           = -1603141,
+    SAY_SPECIAL_3                           = -1603142,
+    SAY_JUMP                                = -1603143,
+
+    SAY_SLAY_1                              = -1603144,
+    SAY_SLAY_2                              = -1603145,
+    SAY_BERSERK                             = -1603146,
+
+    SAY_ARENA_WIPE                          = -1603147,
+    SAY_DEFEATED                            = -1603148,
+
+    SAY_OUTRO_1                             = -1603149,
+    SAY_OUTRO_2                             = -1603150,
+    SAY_OUTRO_3                             = -1603151,
+    SAY_OUTRO_HARD_1                        = -1603152,
+    SAY_OUTRO_HARD_2                        = -1603153,
+    SAY_OUTRO_HARD_3                        = -1603154,
+
+    SAY_SIF_BEGIN                           = -1603156,
+    SAY_SIF_EVENT                           = -1603157,
+    SAY_SIF_DESPAWN                         = -1603158,
+
+    EMOTE_RUNIC_BARRIER                     = -1603247,
+
+    // phase 1 spells
+    SPELL_SHEAT_OF_LIGHTNING                = 62276,                    // damage reduction aura
+    SPELL_STORMHAMMER                       = 62042,                    // triggers 62470 and 64909 on target
+    SPELL_CHARGE_ORB                        = 62016,                    // target npc 33378;
+    SPELL_TOUCH_OF_DOMINION                 = 62507,                    // hard mode timer; triggers 62565 after 2.5 min
+    SPELL_TOUCH_OF_DOMINION_AURA            = 62565,                    // buff received by Thorim on hard mode fail
+    SPELL_BERSERK_1                         = 62560,
+    SPELL_SUMMON_LIGHTNING_ORB              = 62391,                    // on berserk
+    SPELL_LIGHTNING_DESTRUCTION             = 62393,                    // cast by npc 33138 on berserk
+
+    // phase 2 spells
+    SPELL_CHAIN_LIGHTNING                   = 62131,                    // spells need to be confirmed
+    SPELL_CHAIN_LIGHTNING_H                 = 64390,
+    // SPELL_LIGHTNING_CHARGE               = 62279,                    // buff gained on each charge
+    SPELL_LIGHTNING_CHARGE_DAMAGE           = 62466,                    // damage spell for lightning charge; dummy effect hits npc 33378 and triggers spell 64098; cone target effect hits npc 32780
+    SPELL_UNBALANCING_STRIKE                = 62130,
+    SPELL_BERSERK_2                         = 62555,
+    SPELL_THORIM_CREDIT                     = 64985,                    // kill credit spell; added in spell_template
+    SPELL_STORMHAMMER_OUTRO                 = 64767,                    // target npc 33196 and trigger spells 62470, 64909 and 64778 and despawn target in 10 sec
+    SPELL_TELEPORT                          = 62940,
+
+    // Lightning charge related spells
+    SPELL_LIGHTNING_PILLAR_ORB              = 63238,                    // cast on spell 62016 hit; cast by the lower Orb
+    SPELL_LIGHTNING_ORG_CHARGED             = 62186,                    // cast by npc 33378; makes Thorim to cast 62466;
+    SPELL_LIGHTNING_ORB_TRIGGER             = 62278,                    // spell triggered by 62186; however this won't work because 62186 has a duration of 5s while 62278 is triggered after 8s
+    SPELL_LIGHTNING_PILLAR                  = 62976,                    // cast by npc 33378 (upper Orb) to npc 33378 (lower Orb) at the same time with spell 62186
+
+    // Other lightning related spells
+    SPELL_ACTIVATE_LIGHTNING_ORB_PERIODIC   = 62184,                    // cast by npc 32879; starts the whole lightning event
+    SPELL_LIGHTNING_FIELD                   = 64972,                    // cast by npc 32892
+
+    // Sif spells
+    SPELL_FROSTBOLT                         = 62583,
+    SPELL_FROSTBOLT_H                       = 62601,
+    SPELL_FROSTBOLT_VOLLEY                  = 62580,
+    SPELL_FROSTBOLT_VOLLEY_H                = 62604,
+    SPELL_FROST_NOVA                        = 62597,
+    SPELL_FROST_NOVA_H                      = 62605,
+    SPELL_BLIZZARD                          = 62577,                    // targets npc 32892
+    SPELL_BLIZZARD_H                        = 62603,
+    SPELL_BLINK                             = 62578,
+
+    // Colossus runic smash spells
+    SPELL_RUNIC_SMASH_L                     = 62058,                    // triggers missing spell 62406
+    SPELL_RUNIC_SMASH_R                     = 62057,                    // triggers missing spell 62403
+    MAX_RUNIC_SMASH                         = 10,                       // defines the max rows of runic smash
+
+    // Colossus combat spells
+    SPELL_SMASH                             = 62339,                    // maybe use 62414 on heroic?
+    SPELL_RUNIC_BARRIER                     = 62338,
+    SPELL_CHARGE                            = 62613,
+    SPELL_CHARGE_H                          = 62614,
+
+    SPELL_LEAP                              = 61934,                    // used by the arena dwarfes
+
+    // event npcs
+    NPC_LIGHTNING_ORB                       = 33138,                    // spawned on arena berserk
+    NPC_DARK_RUNE_CHAMPION                  = 32876,                    // arena npcs
+    NPC_DARK_RUNE_WARBRINGER                = 32877,
+    NPC_DARK_RUNE_EVOKER                    = 32878,
+    // NPC_IRON_RING_GUARD                  = 32874,                    // hallway npcs
+    // NPC_DARK_RUNE_ACOLYTE_HALLWAY        = 33110,
+    // NPC_IRON_HONOR_GUARD                 = 32875,                    // stairs npcs
+    // NPC_TRAP_BUNNY_1                     = 33725,                    // thorim traps; have auras 62241 and 63540
+    // NPC_TRAP_BUNNY_2                     = 33054,
+
+    FACTION_ID_FRIENDLY                     = 35,
+    PHASE_ARENA                             = 1,
+    PHASE_SOLO                              = 2,
+    PHASE_TRANSITION                        = 3,
+};
+
+static const DialogueEntry aThorimDialogue[] =
+{
+    {SAY_AGGRO_1,               NPC_THORIM,     9000},
+    {SAY_AGGRO_2,               NPC_THORIM,     7000},
+    {NPC_SIF,                   0,              5000},
+    {SPELL_TOUCH_OF_DOMINION,   0,              0},
+    {SAY_JUMP,                  NPC_THORIM,     10000},
+    {PHASE_SOLO,                0,              0},
+    {SAY_DEFEATED,              NPC_THORIM,     3000},
+    {SAY_OUTRO_1,               NPC_THORIM,     10000},
+    {SAY_OUTRO_2,               NPC_THORIM,     12000},
+    {SAY_OUTRO_3,               NPC_THORIM,     10000},
+    {SPELL_TELEPORT,            0,              0},
+    {SPELL_STORMHAMMER_OUTRO,   0,              3000},
+    {SAY_OUTRO_HARD_1,          NPC_THORIM,     6000},
+    {SAY_OUTRO_HARD_2,          NPC_THORIM,     12000},
+    {SAY_OUTRO_HARD_3,          NPC_THORIM,     10000},
+    {SPELL_THORIM_CREDIT,       0,              0},
+    {0, 0, 0},
+};
+
+static const float afSifSpawnLoc[4] = {2148.301f, -297.8453f, 438.3308f, 2.68f};
+static const float afArenaCenterLoc[3] = {2134.8f, -263.056f, 419.983f};
+
+/*######
+## boss_thorim
+######*/
+
+struct boss_thorim : public CreatureScript
+{
+    boss_thorim() : CreatureScript("boss_thorim") {}
+
+    struct boss_thorimAI : public ScriptedAI, private DialogueHelper
+    {
+        boss_thorimAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aThorimDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            InitializeDialogueHelper(m_pInstance);
+            m_bEventFinished = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+        bool m_bEventFinished;
+        bool m_bArenaSpawned;
+
+        uint32 m_uiBerserkTimer;
+        uint8 m_uiPhase;
+        uint8 m_uiDwarfIndex;
+
+        uint32 m_uiStormHammerTimer;
+        uint32 m_uiChargeOrbTimer;
+        uint32 m_uiArenaDwarfTimer;
+        uint32 m_uiAttackTimer;
+        uint32 m_uiChainLightningTimer;
+        uint32 m_uiUnbalancingStrikeTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_ARENA;
+            m_uiBerserkTimer = 5 * MINUTE * IN_MILLISECONDS;
+
+            m_uiStormHammerTimer = 45000;
+            m_uiChargeOrbTimer = 35000;
+            m_uiArenaDwarfTimer = 20000;
+            m_uiChainLightningTimer = urand(10000, 15000);
+            m_uiUnbalancingStrikeTimer = 20000;
+            m_uiAttackTimer = 0;
+            m_uiDwarfIndex = urand(0, 2);
+
+            m_bArenaSpawned = false;
+
+            SetCombatMovement(false);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+
+            if (m_creature->IsAlive() && !m_bEventFinished)
+                m_creature->GetMotionMaster()->MoveTargetedHome();
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            // switch to phase 2 as soon as it's hit by any damage
+            if (m_uiPhase == PHASE_ARENA && uiDamage > 0)
+            {
+                StartNextDialogueText(SAY_JUMP);
+                m_uiPhase = PHASE_TRANSITION;
+
+                // prepare the hard mode if necessary
+                if (m_pInstance && m_pInstance->GetData(TYPE_THORIM_HARD) != FAIL)
+                {
+                    if (Creature* pSif = m_pInstance->GetSingleCreatureFromStorage(NPC_SIF))
+                        pSif->InterruptNonMeleeSpells(false);
+
+                    m_pInstance->SetData(TYPE_THORIM_HARD, DONE);
+                }
+                return;
+            }
+
+            // handle outro
+            if (uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                if (!m_bEventFinished)
+                {
+                    if (m_pInstance)
+                    {
+                        m_pInstance->SetData(TYPE_THORIM, DONE);
+
+                        // start a different outro version for hard mode
+                        if (m_pInstance->GetData(TYPE_THORIM_HARD) == DONE)
+                            StartNextDialogueText(SPELL_STORMHAMMER_OUTRO);
+                        else
+                            StartNextDialogueText(SAY_DEFEATED);
+                    }
+
+                    m_creature->CastSpell(m_creature, SPELL_THORIM_CREDIT, true);
+                    m_creature->setFaction(FACTION_ID_FRIENDLY);
+                    m_bEventFinished = true;
+                    EnterEvadeMode();
+                }
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THORIM, IN_PROGRESS);
+                m_pInstance->SetData(TYPE_THORIM_HARD, NOT_STARTED);
+            }
+
+            StartNextDialogueText(SAY_AGGRO_1);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            // don't attack again after being defeated
+            if (m_bEventFinished)
+                return;
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // spawn the arena npcs only when players are close to Thorim in order to avoid the possible bugs
+            if (!m_bArenaSpawned && pWho->GetTypeId() == TYPEID_PLAYER && pWho->IsAlive() && !((Player*)pWho)->isGameMaster() && m_creature->IsWithinDistInMap(pWho, DEFAULT_VISIBILITY_INSTANCE))
+            {
+                if (m_pInstance && m_pInstance->GetData(TYPE_THORIM) != DONE)
+                    m_pInstance->SetData64(DATA64_THORIM_TRIGGERED_BY, pWho->GetObjectGuid().GetRawValue());
+
+                m_bArenaSpawned = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_THORIM, FAIL);
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != EFFECT_MOTION_TYPE || !uiPointId)
+                return;
+
+            m_uiPhase = PHASE_SOLO;
+            m_uiAttackTimer = 1000;
+            m_uiChargeOrbTimer = 20000;
+            m_uiBerserkTimer = 5 * MINUTE * IN_MILLISECONDS;
+            m_creature->RemoveAurasDueToSpell(SPELL_SHEAT_OF_LIGHTNING);
+
+            // make Sif attack too if hard mode is active
+            if (m_pInstance && m_pInstance->GetData(TYPE_THORIM_HARD) == DONE)
+            {
+                if (Creature* pSif = m_pInstance->GetSingleCreatureFromStorage(NPC_SIF))
+                {
+                    DoScriptText(SAY_SIF_EVENT, pSif);
+                    SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pSif);
+                    pSif->AI()->AttackStart(m_creature->getVictim());
+                }
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            // hard mode is failed; despawn Sif
+            if (pSpell->Id == SPELL_TOUCH_OF_DOMINION_AURA && m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THORIM_HARD, FAIL);
+
+                if (Creature* pSif = m_pInstance->GetSingleCreatureFromStorage(NPC_SIF))
+                {
+                    DoScriptText(SAY_SIF_DESPAWN, pSif);
+                    pSif->ForcedDespawn(5000);
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+                // the lightning orb should clean out the whole hallway on arena berserk
+            case NPC_LIGHTNING_ORB:
+                pSummoned->CastSpell(pSummoned, SPELL_LIGHTNING_DESTRUCTION, true);
+                break;
+            case NPC_DARK_RUNE_CHAMPION:
+            case NPC_DARK_RUNE_WARBRINGER:
+            case NPC_DARK_RUNE_EVOKER:
+            case NPC_DARK_RUNE_COMMONER:
+            case NPC_DARK_RUNE_ACOLYTE:
+                if (Creature* pTarget = GetClosestLowerBunny(pSummoned))
+                    pSummoned->CastSpell(pTarget, SPELL_LEAP, true);
+                pSummoned->SetInCombatWithZone();
+                break;
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            if (!m_pInstance)
+                return;
+
+            switch (iEntry)
+            {
+            case NPC_SIF:
+                DoCastSpellIfCan(m_creature, SPELL_SHEAT_OF_LIGHTNING, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+                if (Creature* pSif = m_creature->SummonCreature(NPC_SIF, afSifSpawnLoc[0], afSifSpawnLoc[1], afSifSpawnLoc[2], afSifSpawnLoc[3], TEMPSUMMON_CORPSE_DESPAWN, 0))
+                    DoScriptText(SAY_SIF_BEGIN, pSif);
+                break;
+            case SPELL_TOUCH_OF_DOMINION:
+                if (Creature* pSif = m_pInstance->GetSingleCreatureFromStorage(NPC_SIF))
+                    pSif->CastSpell(m_creature, SPELL_TOUCH_OF_DOMINION, false);
+                break;
+            case PHASE_SOLO:
+                m_creature->GetMotionMaster()->MoveJump(afArenaCenterLoc[0], afArenaCenterLoc[1], afArenaCenterLoc[2], 45.55969f, 5.0f, 1);
+                break;
+            case SPELL_STORMHAMMER_OUTRO:
+                DoScriptText(SAY_DEFEATED, m_creature);
+                break;
+            case SAY_OUTRO_HARD_1:
+                DoCastSpellIfCan(m_creature, SPELL_STORMHAMMER_OUTRO);
+                break;
+            case SPELL_TELEPORT:
+            case SPELL_THORIM_CREDIT:
+                if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT) == CAST_OK)
+                    m_creature->ForcedDespawn(2000);
+                // despawn Sif if not despawned by accident
+                if (Creature* pSif = m_pInstance->GetSingleCreatureFromStorage(NPC_SIF))
+                    pSif->ForcedDespawn();
+                break;
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, SpellEntry const* pSpellEntry) override
+        {
+            if (pSpellEntry->Id == SPELL_LIGHTNING_CHARGE_DAMAGE && pTarget->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_ACHIEV_LIGHTNING, uint32(false));
+            }
+        }
+
+        // function to return a random arena Thunder Orb
+        ObjectGuid SelectRandomOrbGuid()
+        {
+            if (m_pInstance)
+                return ObjectGuid(m_pInstance->GetData64(DATA64_THORIM_RANDOM_ORB));
+
+            return ObjectGuid();
+        }
+
+        // function to return a random arena upper Bunny
+        Creature* SelectRandomUpperBunny()
+        {
+            if (m_pInstance)
+                return m_pInstance->instance->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_RANDOM_UPPER_BUNNY)));
+
+            return NULL;
+        }
+
+        // function to return the closest ground Bunny
+        Creature* GetClosestLowerBunny(Creature* pSource)
+        {
+            if (m_pInstance)
+                return m_pInstance->instance->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_THORIM_BUNNY)));
+
+            return NULL;
+        }
+
+        // function to return a random player from the arena
+        Unit* GetRandomArenaPlayer()
+        {
+            if (!m_pInstance)
+                return NULL;
+
+            Creature* pTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_THORIM_COMBAT_TRIGGER);
+            if (!pTrigger)
+                return NULL;
+
+            std::vector<Unit*> suitableTargets;
+            ThreatList const& threatList = m_creature->GetThreatManager().getThreatList();
+
+            for (ThreatList::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
+            {
+                if (Unit* pTarget = m_creature->GetMap()->GetUnit((*itr)->getUnitGuid()))
+                {
+                    if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->IsWithinDistInMap(pTrigger, 50.0f) && pTarget->IsWithinLOSInMap(pTrigger))
+                        suitableTargets.push_back(pTarget);
+                }
+            }
+
+            // if no player in the arena was found trigger berserk automatically
+            if (suitableTargets.empty())
+            {
+                m_uiBerserkTimer = 1000;
+                m_uiStormHammerTimer = 60000;
+                return NULL;
+            }
+            else
+                return suitableTargets[urand(0, suitableTargets.size() - 1)];
+        }
+
+        // function to spawn a random pack of dwarfes
+        void DoSpawnArenaDwarf()
+        {
+            switch (m_uiDwarfIndex)
+            {
+            case 0:                     // commoners (always in groups of 6-7)
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_DO_THORIM_SPAWN_PACK, 0);
+                break;
+            case 1:                     // warbringers (along with champions or evokers)
+                if (Creature* pBunny = SelectRandomUpperBunny())
+                    m_creature->SummonCreature(NPC_DARK_RUNE_WARBRINGER, pBunny->GetPositionX(), pBunny->GetPositionY(), pBunny->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                // warbringers can have another buddy summoned at the same time
+                if (roll_chance_i(75))
+                {
+                    if (Creature* pBunny = SelectRandomUpperBunny())
+                        m_creature->SummonCreature(roll_chance_i(70) ? NPC_DARK_RUNE_CHAMPION : NPC_DARK_RUNE_EVOKER, pBunny->GetPositionX(), pBunny->GetPositionY(), pBunny->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+                break;
+            case 2:                     // evokers alone
+                if (Creature* pBunny = SelectRandomUpperBunny())
+                    m_creature->SummonCreature(NPC_DARK_RUNE_EVOKER, pBunny->GetPositionX(), pBunny->GetPositionY(), pBunny->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                break;
+            }
+
+            // get a new index which will be different from the first one
+            uint8 uiNewIndex = (m_uiDwarfIndex + urand(1, 2)) % 3;
+            m_uiDwarfIndex = uiNewIndex;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            switch (m_uiPhase)
+            {
+                // arena phase abilities
+            case PHASE_ARENA:
+
+                if (m_uiBerserkTimer)
+                {
+                    if (m_uiBerserkTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_BERSERK_1) == CAST_OK)
+                        {
+                            DoCastSpellIfCan(m_creature, SPELL_SUMMON_LIGHTNING_ORB, CAST_TRIGGERED);
+                            DoScriptText(SAY_ARENA_WIPE, m_creature);
+                            m_uiBerserkTimer = 0;
+                        }
+                    }
+                    else
+                        m_uiBerserkTimer -= uiDiff;
+                }
+
+                if (m_uiArenaDwarfTimer < uiDiff)
+                {
+                    DoSpawnArenaDwarf();
+                    m_uiArenaDwarfTimer = 10000;
+                }
+                else
+                    m_uiArenaDwarfTimer -= uiDiff;
+
+                if (m_uiChargeOrbTimer < uiDiff)
+                {
+                    // this spell has AoE target, but we need to be very specific with the selected targets
+                    if (Creature* pTarget = m_creature->GetMap()->GetCreature(SelectRandomOrbGuid()))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_CHARGE_ORB) == CAST_OK)
+                            m_uiChargeOrbTimer = 20000;
+                    }
+                }
+                else
+                    m_uiChargeOrbTimer -= uiDiff;
+
+                if (m_uiStormHammerTimer < uiDiff)
+                {
+                    if (Unit* pTarget = GetRandomArenaPlayer())
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_STORMHAMMER) == CAST_OK)
+                            m_uiStormHammerTimer = 15000;
+                    }
+                }
+                else
+                    m_uiStormHammerTimer -= uiDiff;
+
+                break;
+                // solo phase abilities
+            case PHASE_SOLO:
+
+                if (m_uiBerserkTimer)
+                {
+                    if (m_uiBerserkTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_BERSERK_2) == CAST_OK)
+                        {
+                            DoScriptText(SAY_BERSERK, m_creature);
+                            m_uiBerserkTimer = 0;
+                        }
+                    }
+                    else
+                        m_uiBerserkTimer -= uiDiff;
+                }
+
+                if (m_uiAttackTimer)
+                {
+                    if (m_uiAttackTimer <= uiDiff)
+                    {
+                        // Add some small delay to combat movement because Jump triggers before it's actually finished
+                        DoResetThreat();
+                        SetCombatMovement(true);
+                        DoStartMovement(m_creature->getVictim());
+                        m_uiAttackTimer = 0;
+                    }
+                    else
+                        m_uiAttackTimer -= uiDiff;
+                }
+
+                if (m_uiChargeOrbTimer < uiDiff)
+                {
+                    // this spell requires very specific targets
+                    if (Creature* pTarget = m_creature->GetMap()->GetCreature(SelectRandomOrbGuid()))
+                    {
+                        pTarget->CastSpell(pTarget, SPELL_LIGHTNING_ORG_CHARGED, true);
+
+                        // charge the lower orb as well
+                        if (Unit* pOrb = GetClosestCreatureWithEntry(pTarget, NPC_THUNDER_ORB, 25.0f, true, false, true))
+                            pTarget->CastSpell(pOrb, SPELL_LIGHTNING_PILLAR, true);
+
+                        m_uiChargeOrbTimer = 20000;
+                    }
+                }
+                else
+                    m_uiChargeOrbTimer -= uiDiff;
+
+                if (m_uiChainLightningTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_CHAIN_LIGHTNING : SPELL_CHAIN_LIGHTNING_H) == CAST_OK)
+                            m_uiChainLightningTimer = urand(10000, 15000);
+                    }
+                }
+                else
+                    m_uiChainLightningTimer -= uiDiff;
+
+                if (m_uiUnbalancingStrikeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_UNBALANCING_STRIKE) == CAST_OK)
+                        m_uiUnbalancingStrikeTimer = 25000;
+                }
+                else
+                    m_uiUnbalancingStrikeTimer -= uiDiff;
+
+                DoMeleeAttackIfReady();
+                break;
+                // transition phase; nothing here, wait for transition to finish
+            case PHASE_TRANSITION:
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_thorimAI(pCreature);
+    }
+};
+
+/*######
+## boss_sif
+######*/
+
+struct boss_sif : public CreatureScript
+{
+    boss_sif() : CreatureScript("boss_sif") {}
+
+    struct boss_sifAI : public ScriptedAI
+    {
+        boss_sifAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+        bool m_bAttackReady;
+
+        uint32 m_uiFrostBoltTimer;
+        uint32 m_uiVolleyTimer;
+        uint32 m_uiFrostNovaTimer;
+        uint32 m_uiBlizzardTimer;
+        uint32 m_uiBlinkTimer;
+
+        GuidList m_lBunniesGuids;
+
+        void Reset() override
+        {
+            m_bAttackReady = false;
+
+            m_uiFrostBoltTimer = urand(2000, 3000);
+            m_uiVolleyTimer = urand(7000, 10000);
+            m_uiFrostNovaTimer = urand(30000, 35000);
+            m_uiBlizzardTimer = urand(20000, 30000);
+            m_uiBlinkTimer = urand(20000, 25000);
+
+            SetCombatMovement(false);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            // custom attack; only in hard mode
+            if (!m_bAttackReady)
+                return;
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void EnterEvadeMode() override
+        {
+            // custom evade; Sif doesn't need to move to home position
+            if (!m_bAttackReady)
+                return;
+
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            // activate attack on hard mode
+            if (eventType == AI_EVENT_CUSTOM_A && pInvoker->GetEntry() == NPC_THORIM)
+            {
+                m_bAttackReady = true;
+            }
+        }
+
+        // function to return a random arena bunny for Blizzard spell
+        ObjectGuid SelectRandomBunnyGuid()
+        {
+            if (m_lBunniesGuids.empty())
+                return ObjectGuid();
+
+            GuidList::iterator iter = m_lBunniesGuids.begin();
+            advance(iter, urand(0, m_lBunniesGuids.size() - 1));
+
+            return *iter;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiFrostBoltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_FROSTBOLT : SPELL_FROSTBOLT_H) == CAST_OK)
+                        m_uiFrostBoltTimer = urand(2000, 3000);
+                }
+            }
+            else
+                m_uiFrostBoltTimer -= uiDiff;
+
+            if (m_uiVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_FROSTBOLT_VOLLEY : SPELL_FROSTBOLT_VOLLEY_H) == CAST_OK)
+                    m_uiVolleyTimer = urand(15000, 18000);
+            }
+            else
+                m_uiVolleyTimer -= uiDiff;
+
+            if (m_uiFrostNovaTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_FROST_NOVA : SPELL_FROST_NOVA_H) == CAST_OK)
+                    m_uiFrostNovaTimer = urand(20000, 25000);
+            }
+            else
+                m_uiFrostNovaTimer -= uiDiff;
+
+            if (m_uiBlizzardTimer < uiDiff)
+            {
+                // this spell has AoE target, but we need to be very specific with the selected targets
+                if (Unit* pTarget = m_creature->GetMap()->GetUnit(SelectRandomBunnyGuid()))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_BLIZZARD : SPELL_BLIZZARD_H) == CAST_OK)
+                        m_uiBlizzardTimer = 40000;
+                }
+            }
+            else
+                m_uiBlizzardTimer -= uiDiff;
+
+            if (m_uiBlinkTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_BLINK) == CAST_OK)
+                        m_uiBlinkTimer = urand(20000, 25000);
+                }
+            }
+            else
+                m_uiBlinkTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_sifAI(pCreature);
+    }
+};
+
+/*######
+## npc_runic_colossus
+######*/
+
+struct npc_runic_colossus : public CreatureScript
+{
+    npc_runic_colossus() : CreatureScript("npc_runic_colossus") {}
+
+    struct npc_runic_colossusAI : public ScriptedAI
+    {
+        npc_runic_colossusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiChargeTimer;
+        uint32 m_uiBarrierTimer;
+        uint32 m_uiSmashTimer;
+
+        uint32 m_uiRunicSmashTimer;
+        uint32 m_uiSmashUpdateTimer;
+        uint8 m_uiSmashIndex;
+
+        bool m_bSmashStarted;
+        bool m_bSmashActive;
+
+        //GuidList m_lCurrentSmashBunnies;
+
+        void Reset() override
+        {
+            m_uiChargeTimer = 1000;
+            m_uiBarrierTimer = 15000;
+            m_uiSmashTimer = 0;
+            m_uiRunicSmashTimer = 0;
+            m_uiSmashUpdateTimer = 250;
+            m_uiSmashIndex = 1;
+            m_bSmashStarted = false;
+            m_bSmashActive = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            m_creature->InterruptNonMeleeSpells(false);
+            m_uiRunicSmashTimer = 0;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bSmashStarted && pWho->GetTypeId() == TYPEID_PLAYER && !((Player*)pWho)->isGameMaster() &&
+                m_creature->IsWithinDistInMap(pWho, 80.0f) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                m_uiRunicSmashTimer = 1000;
+                m_bSmashStarted = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            // start runic smash event
+            if (pSpell->Id == SPELL_RUNIC_SMASH_L && m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_DATA_THORIM_SMASH_SIDE, uint32(true));
+                m_bSmashActive = true;
+            }
+            else if (pSpell->Id == SPELL_RUNIC_SMASH_R && m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_DATA_THORIM_SMASH_SIDE, uint32(false));
+                m_bSmashActive = true;
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, SpellEntry const* pSpellEntry) override
+        {
+            if ((pSpellEntry->Id == SPELL_CHARGE || pSpellEntry->Id == SPELL_CHARGE_H) && pTarget->GetTypeId() == TYPEID_PLAYER)
+                m_uiSmashTimer = 1000;
+        }
+
+        // Wrapper to keep Runic Smash in a distinct function
+        void UpdateRunicSmash(const uint32 uiDiff)
+        {
+            if (!m_bSmashActive)
+                return;
+
+            if (m_uiSmashUpdateTimer < uiDiff)
+            {
+                // check all the targets which are in a certain distance from the colossus
+
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_DATA_THORIM_SMASHINDEX, m_uiSmashIndex);
+                    m_pInstance->SetData64(DATA64_THORIM_SMASH_CASTER, m_creature->GetObjectGuid().GetRawValue());
+                }
+
+                ++m_uiSmashIndex;
+                if (m_uiSmashIndex == MAX_RUNIC_SMASH + 1)
+                {
+                    m_bSmashActive = false;
+                    m_uiSmashIndex = 1;
+                }
+
+                m_uiSmashUpdateTimer = 250;
+            }
+            else
+                m_uiSmashUpdateTimer -= uiDiff;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiRunicSmashTimer)
+            {
+                if (m_uiRunicSmashTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, urand(0, 1) ? SPELL_RUNIC_SMASH_L : SPELL_RUNIC_SMASH_R) == CAST_OK)
+                        m_uiRunicSmashTimer = 7000;
+                }
+                else
+                    m_uiRunicSmashTimer -= uiDiff;
+
+                UpdateRunicSmash(uiDiff);
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiChargeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, m_bIsRegularMode ? SPELL_CHARGE : SPELL_CHARGE_H, SELECT_FLAG_NOT_IN_MELEE_RANGE))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_CHARGE : SPELL_CHARGE_H) == CAST_OK)
+                        m_uiChargeTimer = urand(10000, 15000);
+                }
+            }
+            else
+                m_uiChargeTimer -= uiDiff;
+
+            // smash is cast right after charge
+            if (m_uiSmashTimer)
+            {
+                if (m_uiSmashTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SMASH) == CAST_OK)
+                        m_uiSmashTimer = 0;
+                }
+                else
+                    m_uiSmashTimer -= uiDiff;
+            }
+
+            if (m_uiBarrierTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_RUNIC_BARRIER) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_RUNIC_BARRIER, m_creature);
+                    m_uiBarrierTimer = urand(30000, 35000);
+                }
+            }
+            else
+                m_uiBarrierTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_runic_colossusAI(pCreature);
+    }
+};
+
+/*######
+## npc_thunder_orb
+######*/
+
+struct npc_thunder_orb : public CreatureScript
+{
+    npc_thunder_orb() : CreatureScript("npc_thunder_orb") {}
+
+    struct npc_thunder_orbAI : public Scripted_NoMovementAI
+    {
+        npc_thunder_orbAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        uint32 m_uiTriggerTimer;
+
+        void Reset() override
+        {
+            m_uiTriggerTimer = 0;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            // cast visual on the lower Orb
+            if (pSpell->Id == SPELL_CHARGE_ORB)
+            {
+                if (Creature* pOrb = GetClosestCreatureWithEntry(m_creature, NPC_THUNDER_ORB, 25.0f, true, false, true))
+                    pOrb->CastSpell(pOrb, SPELL_LIGHTNING_PILLAR_ORB, false);
+            }
+            // SPECIAL NOTE: this aura has a duration lower than the trigger period for the next spell; so we need to force this by timer
+            else if (pSpell->Id == SPELL_LIGHTNING_ORG_CHARGED)
+                m_uiTriggerTimer = 8000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiTriggerTimer)
+            {
+                if (m_uiTriggerTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_LIGHTNING_ORB_TRIGGER) == CAST_OK)
+                        m_uiTriggerTimer = 0;
+                }
+                else
+                    m_uiTriggerTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_thunder_orbAI(pCreature);
+    }
+};
+
+void AddSC_boss_thorim()
+{
+    Script* s;
+
+    s = new boss_thorim();
+    s->RegisterSelf();
+    s = new boss_sif();
+    s->RegisterSelf();
+    s = new npc_runic_colossus();
+    s->RegisterSelf();
+    s = new npc_thunder_orb();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_thorim";
+    //pNewScript->GetAI = GetAI_boss_thorim;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_sif";
+    //pNewScript->GetAI = GetAI_boss_sif;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_runic_colossus";
+    //pNewScript->GetAI = GetAI_npc_runic_colossus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_thunder_orb";
+    //pNewScript->GetAI = GetAI_npc_thunder_orb;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_xt_002.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_xt_002.cpp
new file mode 100644
index 000000000..e028c2f8e
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_xt_002.cpp
@@ -0,0 +1,583 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_xt_002
+SD%Complete: 80%
+SDComment: Timers may need adjustments; Achievements and hard mode abilities NYI.
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+
+enum
+{
+    SAY_AGGRO                           = -1603045,
+    SAY_SLAY_1                          = -1603046,
+    SAY_SLAY_2                          = -1603047,
+    SAY_BERSERK                         = -1603048,
+    SAY_ADDS                            = -1603049,
+    SAY_DEATH                           = -1603050,
+    SAY_HEART_OPEN                      = -1603051,
+    SAY_HEART_CLOSE                     = -1603052,
+    SAY_TANCTRUM                        = -1603053,
+
+    EMOTE_HEART                         = -1603054,
+    EMOTE_REPAIR                        = -1603055,
+    EMOTE_KILL_HEART                    = -1603236,
+    EMOTE_EARTH_QUAKE                   = -1603237,
+
+    // spells
+    SPELL_TYMPANIC_TANTRUM              = 62776,
+    SPELL_SEARING_LIGHT                 = 63018,
+    SPELL_SEARING_LIGHT_H               = 65121,
+    SPELL_GRAVITY_BOMB                  = 63024,
+    SPELL_GRAVITY_BOMB_H                = 64234,
+    SPELL_BERSERK                       = 26662,
+    // SPELL_SUBMERGED                  = 37751,            // cast before a heart phase. not used because it's unk purpose
+    // SPELL_STAND                      = 37752,            // cast after a heart phase. not used because it's unk purpose
+
+    // hard mode spells
+    SPELL_HEARTBREAK                    = 65737,
+    SPELL_HEARTBREAK_H                  = 64193,
+    SPELL_VOIDZONE                      = 64203,
+    SPELL_VOIDZONE_H                    = 64235,
+    SPELL_LIFE_SPARK                    = 64210,
+
+    // heart of XT002 spells
+    SPELL_HEART_RIDE_VEHICLE            = 63852,            // ride seat 0 - procs on damage (probably spell 17683)
+    SPELL_FULL_HEAL                     = 17683,
+    SPELL_RIDE_VEHICLE                  = 63313,            // ride seat 1
+    SPELL_LIGHTNING_TETHER              = 64799,            // dummy
+    SPELL_HEART_OVERLOAD                = 62789,            // triggers missing spell 62791
+    SPELL_EXPOSED_HEART                 = 63849,            // procs on damage; triggers missing spell 62791
+    SPELL_ENERGY_ORB                    = 62790,            // targets 33337, in order to start spawning robots
+    SPELL_ENERGY_ORB_DUMMY              = 62826,            // dummy effect which spawns robots - not used due to core targeting issues
+
+    // robot summoning spells, used by the XT toy pile
+    SPELL_RECHARGE_ROBOT_1              = 62828,            // summons 33343
+    SPELL_RECHARGE_ROBOT_2              = 62835,            // summons 33346
+    SPELL_RECHARGE_ROBOT_3              = 62831,            // summons 33344
+
+    // summoned spells
+    SPELL_CONSUMPTION                   = 64208,            // cast by the void zone
+    SPELL_ARCANE_POWER_STATE            = 49411,            // cast by the life spark
+    SPELL_STATIC_CHARGED                = 64227,            // cast by the life spark (needs to be confirmed)
+    SPELL_STATIC_CHARGED_H              = 64236,
+    SPELL_SCRAP_REPAIR                  = 62832,            // cast on scrapbot in range to heal XT002; sends event 21606
+    SPELL_RIDE_VEHICLE_SCRAPBOT         = 47020,            // cast by scrapbot on XT002 heal
+
+    // NPC ids
+    NPC_SCRAPBOT                        = 33343,
+    NPC_BOOMBOT                         = 33346,
+    NPC_PUMMELLER                       = 33344,
+    NPC_VOIDZONE                        = 34001,
+    NPC_LIFE_SPARK                      = 34004,
+
+    // phases
+    PHASE_NORMAL                        = 1,
+    PHASE_TRANSITION                    = 2,
+    PHASE_HEART                         = 3,
+
+    MAX_SCRAPBOTS                       = 5,
+};
+
+/*######
+## boss_xt_002
+######*/
+
+struct boss_xt_002 : public CreatureScript
+{
+    boss_xt_002() : CreatureScript("boss_xt_002") {}
+
+    struct boss_xt_002AI : public ScriptedAI
+    {
+        boss_xt_002AI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_uiMountTimer = 1000;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiMountTimer;
+
+        uint8 m_uiPhase;
+        uint8 m_uiHeartStage;
+
+        uint32 m_uiHeartTimer;
+        uint32 m_uiLightBombTimer;
+        uint32 m_uiGravityBombTimer;
+        uint32 m_uiTanctrumTimer;
+
+        void Reset() override
+        {
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            m_uiPhase = PHASE_NORMAL;
+            m_uiHeartStage = 1;
+
+            m_uiLightBombTimer = 10000;
+            m_uiGravityBombTimer = 20000;
+            m_uiTanctrumTimer = 35000;
+
+            // reset flags and stand state
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_XT002, DONE);
+
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_XT002, IN_PROGRESS);
+                m_pInstance->SetData(TYPE_XT002_HARD, NOT_STARTED);
+            }
+
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_XT002, FAIL);
+
+                // mount the Heart back at the right seat after wipe or respawn (respawn handled in DB)
+                m_uiMountTimer = 1000;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            // enable hard mode
+            if (eventType == AI_EVENT_CUSTOM_B && pInvoker->GetEntry() == NPC_HEART_DECONSTRUCTOR)
+            {
+                // reset to normal phase and don't allow the boss to get back to heart phases
+                DoResetToNormalPhase();
+                m_uiHeartStage = 4;
+
+                if (m_pInstance)
+                    m_pInstance->SetData(TYPE_XT002_HARD, DONE);
+
+                DoScriptText(EMOTE_KILL_HEART, m_creature);
+                DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_HEARTBREAK : SPELL_HEARTBREAK_H, CAST_TRIGGERED);
+
+                // no spell used for this action
+                m_creature->SetHealth(m_creature->GetMaxHealth());
+            }
+        }
+
+        // wrapper to reset to normal phase
+        void DoResetToNormalPhase()
+        {
+            DoScriptText(SAY_HEART_CLOSE, m_creature);
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+            DoStartMovement(m_creature->getVictim());
+
+            // reset timers as well
+            m_uiLightBombTimer = 10000;
+            m_uiGravityBombTimer = 20000;
+            m_uiPhase = PHASE_NORMAL;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_pInstance)
+            {
+                script_error_log("Instance Ulduar: ERROR Failed to load instance data for this instace.");
+                return;
+            }
+
+            // The heart needs to be mounted manually, not by vehicle_accessories
+            if (m_uiMountTimer)
+            {
+                if (m_uiMountTimer <= uiDiff)
+                {
+                    if (Creature* pHeart = m_pInstance->GetSingleCreatureFromStorage(NPC_HEART_DECONSTRUCTOR))
+                    {
+                        // safeguard in case the Heart isn't respawned
+                        if (!pHeart->IsAlive())
+                            pHeart->Respawn();
+
+                        pHeart->AI()->EnterEvadeMode();
+                        m_creature->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE);
+                        pHeart->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                        pHeart->CastSpell(m_creature, SPELL_HEART_RIDE_VEHICLE, true);
+                    }
+
+                    m_uiMountTimer = 0;
+                }
+                else
+                    m_uiMountTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_NORMAL:
+
+                if (m_uiLightBombTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SEARING_LIGHT : SPELL_SEARING_LIGHT_H) == CAST_OK)
+                        m_uiLightBombTimer = 20000;
+                }
+                else
+                    m_uiLightBombTimer -= uiDiff;
+
+                if (m_uiGravityBombTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_GRAVITY_BOMB : SPELL_GRAVITY_BOMB_H) == CAST_OK)
+                        m_uiGravityBombTimer = 20000;
+                }
+                else
+                    m_uiGravityBombTimer -= uiDiff;
+
+                if (m_uiTanctrumTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_TYMPANIC_TANTRUM) == CAST_OK)
+                    {
+                        DoScriptText(SAY_TANCTRUM, m_creature);
+                        DoScriptText(EMOTE_EARTH_QUAKE, m_creature);
+                        m_uiTanctrumTimer = 60000;
+                    }
+                }
+                else
+                    m_uiTanctrumTimer -= uiDiff;
+
+                // start heart stage transition
+                if (m_creature->GetHealthPercent() < float(100 - 25 * m_uiHeartStage))
+                {
+                    DoScriptText(SAY_HEART_OPEN, m_creature);
+
+                    ++m_uiHeartStage;
+                    m_uiHeartTimer = 5000;
+                    m_uiPhase = PHASE_TRANSITION;
+
+                    // stop all movement
+                    m_creature->GetMotionMaster()->MoveIdle();
+                }
+
+                DoMeleeAttackIfReady();
+
+                break;
+            case PHASE_TRANSITION:
+
+                if (m_uiHeartTimer < uiDiff)
+                {
+                    // inform the heart about the phase switch
+                    if (Creature* pHeart = m_pInstance->GetSingleCreatureFromStorage(NPC_HEART_DECONSTRUCTOR))
+                        SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pHeart);
+
+                    DoScriptText(EMOTE_HEART, m_creature);
+
+                    m_creature->SetStandState(UNIT_STAND_STATE_CUSTOM);
+                    m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                    m_uiHeartTimer = 30000;
+                    m_uiPhase = PHASE_HEART;
+                }
+                else
+                    m_uiHeartTimer -= uiDiff;
+
+                break;
+            case PHASE_HEART:
+
+                // reset to normal phase when timer expires
+                if (m_uiHeartTimer < uiDiff)
+                {
+                    DoResetToNormalPhase();
+                    m_uiHeartTimer = 0;
+
+                    // mount the heart back inside if not already killed
+                    if (m_pInstance && m_pInstance->GetData(TYPE_XT002_HARD) != DONE)
+                    {
+                        if (Creature* pHeart = m_pInstance->GetSingleCreatureFromStorage(NPC_HEART_DECONSTRUCTOR))
+                        {
+                            pHeart->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                            m_creature->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE);
+                            pHeart->CastSpell(m_creature, SPELL_HEART_RIDE_VEHICLE, true);
+
+                            // no spell found for this
+                            pHeart->SetHealth(pHeart->GetMaxHealth());
+                        }
+                    }
+                }
+                else
+                    m_uiHeartTimer -= uiDiff;
+
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_xt_002AI(pCreature);
+    }
+};
+
+/*######
+## boss_heart_deconstructor
+######*/
+
+struct boss_heart_deconstructor : public CreatureScript
+{
+    boss_heart_deconstructor() : CreatureScript("boss_heart_deconstructor") {}
+
+    struct boss_heart_deconstructorAI : public ScriptedAI
+    {
+        boss_heart_deconstructorAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiRobotTimer;
+
+        void Reset() override
+        {
+            m_uiRobotTimer = 0;
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            // notify XT that hard mode is enabled
+            if (m_pInstance)
+            {
+                if (Creature* pDeconstructor = m_pInstance->GetSingleCreatureFromStorage(NPC_XT002))
+                    SendAIEvent(AI_EVENT_CUSTOM_B, m_creature, pDeconstructor);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // handle spawned robots
+            if (m_pInstance)
+            {
+                if (Creature* pDeconstructor = m_pInstance->GetSingleCreatureFromStorage(NPC_XT002))
+                {
+                    float fX, fY, fZ;
+                    pDeconstructor->GetContactPoint(pSummoned, fX, fY, fZ, INTERACTION_DISTANCE);
+                    pSummoned->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                }
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            // start XT phase switch and start recharging robots
+            if (eventType == AI_EVENT_CUSTOM_A && pInvoker->GetEntry() == NPC_XT002)
+            {
+                // remove flags and previous vehicle aura before applying the new one
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                pInvoker->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE);
+
+                DoCastSpellIfCan(pInvoker, SPELL_RIDE_VEHICLE, CAST_TRIGGERED);
+                DoCastSpellIfCan(pInvoker, SPELL_LIGHTNING_TETHER, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_HEART_OVERLOAD, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_EXPOSED_HEART, CAST_TRIGGERED);
+                m_uiRobotTimer = 1000;
+            }
+        }
+
+        // TODO: Use the dummy effect on target when proper targeting will be supported in core
+        void SpellHitTarget(Unit* pTarget, SpellEntry const* pSpellEntry) override
+        {
+            if (pTarget->GetEntry() == NPC_XT_TOY_PILE && pSpellEntry->Id == SPELL_ENERGY_ORB)
+            {
+                // spawn a bunch of scrap bots
+                for (uint8 i = 0; i < MAX_SCRAPBOTS; ++i)
+                    pTarget->CastSpell(pTarget, SPELL_RECHARGE_ROBOT_1, true, NULL, NULL, m_creature->GetObjectGuid());
+
+                // spawn a boombot or pummeller, depending on chance
+                pTarget->CastSpell(pTarget, roll_chance_i(80) ? SPELL_RECHARGE_ROBOT_2 : SPELL_RECHARGE_ROBOT_3, true, NULL, NULL, m_creature->GetObjectGuid());
+            }
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiRobotTimer)
+            {
+                if (m_uiRobotTimer <= uiDiff)
+                {
+                    // visual effect on XT (script target)
+                    DoCastSpellIfCan(m_creature, SPELL_LIGHTNING_TETHER, CAST_TRIGGERED);
+
+                    // cast the enerby orb on each pile one by one
+                    if (m_pInstance)
+                        if (Creature* pToyPile = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_XT_TOY_PILE))))
+                            DoCastSpellIfCan(pToyPile, SPELL_ENERGY_ORB, CAST_TRIGGERED);
+
+                    // reset timer after the overload aura expires
+                    if (m_creature->HasAura(SPELL_EXPOSED_HEART))
+                        m_uiRobotTimer = urand(1000, 3000);
+                    else
+                        m_uiRobotTimer = 0;
+                }
+                else
+                    m_uiRobotTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_heart_deconstructorAI(pCreature);
+    }
+};
+
+/*######
+## npc_scrapbot
+######*/
+
+struct npc_scrapbot : public CreatureScript
+{
+    npc_scrapbot() : CreatureScript("npc_scrapbot") {}
+
+    struct npc_scrapbotAI : public ScriptedAI
+    {
+        npc_scrapbotAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        bool m_bIsHealed;
+
+        void Reset() override
+        {
+            m_bIsHealed = false;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bIsHealed && pWho->GetEntry() == NPC_XT002 && pWho->IsAlive() && pWho->IsWithinDistInMap(m_creature, 10.0f))
+            {
+                DoCastSpellIfCan(pWho, SPELL_RIDE_VEHICLE_SCRAPBOT, CAST_TRIGGERED);
+                pWho->CastSpell(m_creature, SPELL_SCRAP_REPAIR, true);
+                DoScriptText(EMOTE_REPAIR, pWho);
+                m_creature->ForcedDespawn(4000);
+                m_bIsHealed = true;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_scrapbotAI(pCreature);
+    }
+};
+
+/*######
+## npc_xt_toy_pile
+######*/
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_xt_toy_pile : public CreatureScript
+{
+    npc_xt_toy_pile() : CreatureScript("npc_xt_toy_pile") {}
+
+    struct npc_xt_toy_pileAI : public Scripted_NoMovementAI
+    {
+        npc_xt_toy_pileAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void Reset() override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_xt_toy_pileAI(pCreature);
+    }
+};
+
+void AddSC_boss_xt_002()
+{
+    Script* s;
+
+    s = new boss_xt_002();
+    s->RegisterSelf();
+    s = new boss_heart_deconstructor();
+    s->RegisterSelf();
+    s = new npc_scrapbot();
+    s->RegisterSelf();
+    s = new npc_xt_toy_pile();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_xt_002";
+    //pNewScript->GetAI = GetAI_boss_xt_002;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_heart_deconstructor";
+    //pNewScript->GetAI = GetAI_boss_heart_deconstructor;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_scrapbot";
+    //pNewScript->GetAI = GetAI_npc_scrapbot;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_xt_toy_pile";
+    //pNewScript->GetAI = GetAI_npc_xt_toy_pile;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_yogg_saron.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_yogg_saron.cpp
new file mode 100644
index 000000000..3e03b7689
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/boss_yogg_saron.cpp
@@ -0,0 +1,1826 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_yogg_saron
+SD%Complete: 95%
+SDComment: Illusion contain a lot of guesswork.
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+#include "TemporarySummon.h"
+
+enum
+{
+    // phase 1 yells
+    SAY_SARA_INTRO_1                            = -1603197,
+    SAY_SARA_INTRO_2                            = -1603198,
+    SAY_SARA_AGGRO                              = -1603199,
+    SAY_SARA_HELP_1                             = -1603201,
+    SAY_SARA_HELP_2                             = -1603202,
+    SAY_SARA_SLAY_1                             = -1603203,
+    SAY_SARA_SLAY_2                             = -1603204,
+    SAY_WIPE_PHASE_1                            = -1603205,
+
+    // phase 2 transition yells
+    SAY_PHASE_2_INTRO_1                         = -1603206,
+    SAY_PHASE_2_INTRO_2                         = -1603262,
+    SAY_PHASE_2_INTRO_3                         = -1603263,
+    SAY_PHASE_2_INTRO_4                         = -1603264,
+    SAY_PHASE_2_INTRO_5                         = -1603265,
+    
+    // phase 2 and 3 yells
+    SAY_SARA_PHYCHOSIS                          = -1603207,
+    SAY_SARA_DEATH_RAY                          = -1603208,
+    SAY_MADNESS                                 = -1603209,
+    SAY_PHASE_3                                 = -1603210,
+    SAY_SLAY                                    = -1603212,
+    SAY_DEATH                                   = -1603213,
+    SAY_TO_INSANE_1                             = -1603214,
+    SAY_TO_INSANE_2                             = -1603215,
+    SOUND_ID_LUNATIC_GAZE                       = 15757,
+
+    // icecrown illusion yells
+    SAY_LICH_KING_1                             = -1603216,
+    SAY_CHAMPION_1                              = -1603217,
+    SAY_CHAMPION_2                              = -1603218,
+    SAY_LICH_KING_2                             = -1603219,
+    SAY_YOGG_V3_1                               = -1603220,
+    SAY_YOGG_V3_2                               = -1603221,
+
+    // chamber illusion yells
+    SAY_NELTHARION_1                            = -1603222,
+    SAY_YSERA                                   = -1603223,
+    SAY_NELTHARION_2                            = -1603224,
+    SAY_MALYGOS                                 = -1603225,
+    SAY_YOGG_V2                                 = -1603226,
+
+    // stormwind illusion yells
+    SAY_GARONA_1                                = -1603227,
+    SAY_GARONA_2                                = -1603267,
+    SAY_GARONA_3                                = -1603228,
+    SAY_YOGG_V1_1                               = -1603229,
+    SAY_YOGG_V1_2                               = -1603230,
+    SAY_KING_LLANE                              = -1603231,
+    SAY_GARONA_4                                = -1603232,
+    SAY_YOGG_V1_3                               = -1603233,
+
+    // emotes
+    EMOTE_VISION_BLAST                          = -1603234,
+    EMOTE_SHATTER_BLAST                         = -1603235,
+    EMOTE_CLOUD_BOIL                            = -1603261,
+    EMOTE_DEAFENING_ROAR                        = -1603266,
+    EMOTE_EMPOWERING_SHADOWS                    = -1603211,
+
+    // generic spells
+    SPELL_EXTINGUISH_LIFE                       = 64166,                    // berserk spell
+
+    // Sara phase spells
+    SPELL_SARAS_FERVOR                          = 63747,                    // triggers 63138
+    SPELL_SARAS_BLESSING                        = 63745,                    // triggers 63134
+    SPELL_SARAS_ANGER                           = 63744,                    // triggers 63147
+
+    // ominous cloud spells
+    // SPELL_OMINOUS_CLOUD_VISUAL               = 63084,                    // in c_t_a
+    SPELL_BOIL_OMNIOUSLY                        = 63030,                    // cast when a player is in range; triggers 63031
+
+    // guardian of yogg spells
+    SPELL_SHADOW_NOVA                           = 62714,                    // used by the guardians when it dies
+    SPELL_SHADOW_NOVA_H                         = 65209,
+    SPELL_DARK_VOLLEY                           = 63038,
+    SPELL_DOMINATE_MIND                         = 63713,
+
+    // Voice of Yogg spells
+    SPELL_SANITY                                = 63786,                    // add sanity when encounter starts
+    SPELL_INSANE                                = 63120,                    // charm effect on players
+    SPELL_INSANE_PERIODIC                       = 64554,                    // decrease sanity
+    SPELL_SUMMON_GUARDIAN_YOGG                  = 62978,                    // cast by npc 33280 on an Ominus cloud
+
+    // Yogg transition spells
+    SPELL_SHADOWY_BARRIER_YOGG                  = 63894,
+    SPELL_KNOCK_AWAY                            = 64022,
+    SPELL_MATCH_HEALTH                          = 64066,                    // periodic aura on the Brain
+    SPELL_BRAIN_HURT_VISUAL                     = 64361,
+
+    // Sara transition spells
+    SPELL_SHADOWY_BARRIER                       = 64775,                    // damage immunity spells
+    SPELL_FULL_HEAL                             = 43978,
+    SPELL_PHASE_2_TRANSFORM                     = 65157,
+    SPELL_RIDE_VEHICLE_YOGG                     = 61791,                    // mount vehicle Yogg
+
+    // Vision phase spells
+    SPELL_PHYCHOSIS                             = 63795,                    // Sara combat spells
+    SPELL_PHYCHOSIS_H                           = 65301,
+    SPELL_MALADY_OF_THE_MIND                    = 63830,                    // jumps to another target using 63881; requires additional research
+    SPELL_BRAIN_LINK                            = 63802,                    // triggers 63803 for damage or 63804 for visual depending on range
+    SPELL_DEATH_RAY_SUMMON                      = 63891,                    // summons npc 33882
+
+    // Tentacle spawn spells
+    SPELL_CONSTRICTOR_TENTACLE                  = 64132,                    // triggers 64133
+    SPELL_CORRUPTOR_TENTACLE                    = 64143,                    // tentacle spawn spells
+    SPELL_CRUSHER_TENTACLE                      = 64139,
+
+    // Tentacle spells
+    SPELL_TENTACLE_VOID_ZONE                    = 64384,
+    SPELL_ERUPT                                 = 64144,
+    SPELL_LUNGE                                 = 64131,                    // triggers 64123
+    SPELL_TENTACLE_VOID_ZONE_BIG                = 64017,
+    SPELL_CRUSH                                 = 64146,
+    SPELL_DIMINISH_POWER                        = 64148,
+    SPELL_FOCUSED_ANGER                         = 57688,
+    SPELL_SQUEEZE                               = 64125,
+    SPELL_SQUEEZE_H                             = 64126,
+    
+    // Vision spells
+    SPELL_LUNATIC_GAZE_SKULL                    = 64167,
+    SPELL_NONDESCRIPT_ARMOR                     = 64013,                    // stun auras for illusions
+    SPELL_NONDESCRIPT_CREATURE                  = 64010,
+    SPELL_GRIM_REPRISAL                         = 63305,                    // procs 64039 on damage taken
+    SPELL_SHATTERED_ILLUSION                    = 64173,                    // send event 21669
+    SPELL_SHATTERED_ILLUSION_REMOVE             = 65238,                    // remove aura 64173; send event 21671
+    SPELL_INDUCE_MADNESS                        = 64059,                    // reduce sanity by 100% to all players with aura 63988
+    
+    // Old God phase spells
+    SPELL_LUNATIC_GAZE_YOGG                     = 64163,
+    SPELL_SHADOW_BEACON                         = 64465,                    // triggers 64468
+    // SPELL_EMPOWERING_SHADOWS                 = 64468,
+    // SPELL_EMPOWERING_SHADOWS_H               = 64486,
+    SPELL_DEAFENING_ROAR                        = 64189,
+    SPELL_IMMORTAL_GUARDIAN                     = 64158,
+
+    // death ray spells
+    SPELL_DEATH_RAY_TRIGG                       = 63883,                    // damage spell
+    SPELL_DEATH_RAY_VISUAL_WARN                 = 63882,                    // channeled; target creature 33882
+    SPELL_DEATH_RAY_VISUAL_DAMAGE               = 63886,                    // channeled; target creature 33882
+    SPELL_DEATH_RAY_VISUAL_ORIGIN               = 63893,                    // visual for creature 33882
+
+    // descend into madness spells
+    SPELL_TELEPORT_PORTAL_VISUAL                = 64416,
+    SPELL_TELEPORT_TO_STORMWIND_ILLUSION        = 63989,
+    SPELL_TELEPORT_TO_CHAMBER_ILLUSION          = 63997,
+    SPELL_TELEPORT_TO_ICEECROWN_ILLUSION        = 63998,
+    //SPELL_TELEPORT_BACK_TO_MAIN_ROOM            = 63992,                  // triggered by spell 63993
+    
+    // immortal guardian spells
+    SPELL_EMPOWERED                             = 64161,
+    SPELL_EMPOWERED_MOD                         = 65294,
+    SPELL_RECENTLY_SPAWNED                      = 64497,
+    SPELL_SIMPLE_TELEPORT                       = 64195,
+    SPELL_DRAIN_LIFE                            = 64159,
+    SPELL_DRAIN_LIFE_H                          = 64160,
+    SPELL_WEAKENED                              = 64162,
+
+    // summoned creatures
+    NPC_DEATH_RAY                               = 33881,
+    NPC_DEATH_ORB                               = 33882,
+    NPC_CONSTRICTOR_TENTACLE                    = 33983,
+    NPC_CRUSHER_TENTACLE                        = 33966,
+    NPC_CORRUPTOR_TENTACLE                      = 33985,
+    NPC_DESCEND_INTO_MADNESS                    = 34072,
+    NPC_IMMORTAL_GUARDIAN                       = 33988,
+    // NPC_MARKED_IMMORTAL_GUARDIAN             = 36064,                    // purpose unk - maybe used for Shadow Beacon event
+    // NPC_SANITY_WELL                          = 33991,                    // summoned by Freya
+
+    // generic visions creatures
+    NPC_LAUGHING_SKULL                          = 33990,
+    NPC_INFLUENCE_TENTACLE                      = 33943,
+
+    // dragon soul vision
+    NPC_RUBY_CONSORT                            = 33716,
+    NPC_AZURE_CONSORT                           = 33717,
+    // NPC_BRONZE_CONSORT                       = 33718,                    // Nozdormu is not part of the event for some reason
+    NPC_EMERALD_CONSORT                         = 33719,
+    NPC_OBSIDIAN_CONSORT                        = 33720,
+
+    // stormwind vision
+    NPC_SUIT_OF_ARMOR                           = 33433,
+    SPELL_ASSASSINATE                           = 64063,
+
+    // icecrown citadel vision
+    NPC_DEATHSWORM_ZEALOT                       = 33567,
+    SPELL_DEATHGRASP                            = 63037,
+
+    // keepers
+    // Freya spells
+    SPELL_RESILIENCE_OF_NATURE                  = 62670,
+    SPELL_SUMMON_SANITY_WELL                    = 64170,                    // sends event 21432; used to spawn npc 33991
+
+    // sanity well spells
+    //SPELL_SANITY_WELL                           = 64169,
+    //SPELL_SANITY_WELL_VISUAL                    = 63288,
+
+    // Hodir spells
+    SPELL_FORTITUDE_OF_FROST                    = 62650,
+    SPELL_HODIRS_PROTECTIVE_GAZE                = 64174,
+
+    // Mimiron spells
+    SPELL_SPEED_OF_INVENTION                    = 62671,
+    SPELL_DESTABILIZATION_MATRIX                = 65206,
+
+    // Thorim spells
+    SPELL_FURY_OF_THE_STORM                     = 62702,
+    SPELL_TITANIC_STORM                         = 64171,
+    
+    // other
+    FACTION_SARA_HOSTILE                        = 16,
+    MAX_ILLUSIONS                               = 3,
+
+    // encounter phases
+    PHASE_INTRO                                 = 0,
+    PHASE_SARA                                  = 1,
+    PHASE_VISIONS                               = 2,
+    PHASE_OLD_GOD                               = 3,
+    PHASE_TRANSITION                            = 4,
+};
+
+static const DialogueEntry aYoggSaronDialog[] =
+{
+    {SAY_PHASE_2_INTRO_1,       NPC_SARA,       4000},
+    {SAY_PHASE_2_INTRO_2,       NPC_SARA,       5000},
+    {SAY_PHASE_2_INTRO_3,       NPC_SARA,       5000},
+    {SAY_PHASE_2_INTRO_4,       NPC_SARA,       1000},
+    {SPELL_PHASE_2_TRANSFORM,   0,              3000},
+    {SAY_PHASE_2_INTRO_5,       NPC_YOGGSARON,  0},
+    {0, 0, 0},
+};
+
+static const DialogueEntry aYoggIllusionsDialog[] =
+{
+    // stormwind
+    {NPC_KING_LLANE,    0,                      10000},
+    {SAY_GARONA_1,      NPC_GARONA,             2000},
+    {SAY_GARONA_2,      NPC_GARONA,             8000},
+    {SAY_GARONA_3,      NPC_GARONA,             12000},
+    {SAY_YOGG_V1_1,     NPC_YOGGSARON_ILLUSION, 4000},
+    {SAY_YOGG_V1_2,     NPC_YOGGSARON_ILLUSION, 4000},
+    {SAY_KING_LLANE,    NPC_KING_LLANE,         12000},
+    {SAY_GARONA_4,      NPC_GARONA,             2000},
+    {SPELL_ASSASSINATE, 0,                      4000},
+    {SAY_YOGG_V1_3,     NPC_YOGGSARON_ILLUSION, 0},
+    // chamber
+    {NPC_NELTHARION,    0,                      10000},
+    {SAY_NELTHARION_1,  NPC_NELTHARION,         10000},
+    {SAY_YSERA,         NPC_YSERA,              7000},
+    {SAY_NELTHARION_2,  NPC_NELTHARION,         6000},
+    {SAY_MALYGOS,       NPC_MALYGOS,            9000},
+    {SAY_YOGG_V2,       NPC_YOGGSARON_ILLUSION, 0},
+    // icecrown
+    {NPC_LICH_KING,     0,                      10000},
+    {SAY_LICH_KING_1,   NPC_LICH_KING,          5000},
+    {SAY_CHAMPION_1,    NPC_IMMOLATED_CHAMPION, 8000},
+    {SAY_CHAMPION_2,    NPC_IMMOLATED_CHAMPION, 8000},
+    {SAY_LICH_KING_2,   NPC_LICH_KING,          7000},
+    {SAY_YOGG_V3_1,     NPC_YOGGSARON_ILLUSION, 5000},
+    {SAY_YOGG_V3_2,     NPC_YOGGSARON_ILLUSION, 0},
+    {0, 0, 0},
+};
+
+static const float afYoggSaronSpawn[4] = {1980.43f, -25.7708f, 324.9724f, 3.141f};
+static const uint32 aMadnessTeleportSpells[MAX_ILLUSIONS] = { SPELL_TELEPORT_TO_STORMWIND_ILLUSION, SPELL_TELEPORT_TO_CHAMBER_ILLUSION, SPELL_TELEPORT_TO_ICEECROWN_ILLUSION };
+static const uint32 aMadnessChamberDoors[MAX_ILLUSIONS] = { GO_BRAIN_DOOR_STORMWIND, GO_BRAIN_DOOR_CHAMBER, GO_BRAIN_DOOR_ICECROWN };
+
+/*######
+## boss_sara
+######*/
+
+struct boss_sara : public CreatureScript
+{
+    boss_sara() : CreatureScript("boss_sara") {}
+
+    struct boss_saraAI : public Scripted_NoMovementAI, private DialogueHelper
+    {
+        boss_saraAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature),
+        DialogueHelper(aYoggSaronDialog)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bIsHostile;
+
+        uint8 m_uiPhase;
+        uint32 m_uiSarasSpellTimer;
+
+        uint32 m_uiPsychosisTimer;
+        uint32 m_uiMaladyTimer;
+        uint32 m_uiBrainLinkTimer;
+        uint32 m_uiDeathRayTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_INTRO;
+            m_uiSarasSpellTimer = 15000;
+            m_bIsHostile = false;
+
+            m_uiPsychosisTimer = 2000;
+            m_uiMaladyTimer = 15000;
+            m_uiBrainLinkTimer = 25000;
+            m_uiDeathRayTimer = 20000;
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_uiPhase == PHASE_SARA)
+                return;
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (!m_bIsHostile)
+                return;
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // start the encounter on range check
+            // ToDo: research if there is any intro available before the actual encounter starts
+            if (m_uiPhase == PHASE_INTRO && pWho->GetTypeId() == TYPEID_PLAYER && pWho->IsAlive() && !((Player*)pWho)->isGameMaster() &&
+                m_creature->IsWithinDistInMap(pWho, 70.0f) && pWho->IsWithinLOSInMap(m_creature))
+            {
+                m_uiPhase = PHASE_SARA;
+                DoScriptText(SAY_SARA_AGGRO, m_creature);
+
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_YOGGSARON, IN_PROGRESS);
+
+                    // inform the voice controller over event start
+                    if (Creature* pVoice = m_pInstance->GetSingleCreatureFromStorage(NPC_VOICE_OF_YOGG))
+                        SendAIEvent(AI_EVENT_START_EVENT, m_creature, pVoice);
+                }
+
+                DoInitialiseKeepers();
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            DoScriptText(urand(0, 1) ? SAY_SARA_SLAY_1 : SAY_SARA_SLAY_2, m_creature);
+        }
+
+        void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override
+        {
+            if (uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                // start transition to the second phase when all the health has been drained
+                if (m_uiPhase == PHASE_SARA)
+                {
+                    m_uiPhase = PHASE_TRANSITION;
+                    StartNextDialogueText(SAY_PHASE_2_INTRO_1);
+
+                    // despawn all clouds for phase 2
+                    if (m_pInstance)
+                        m_pInstance->SetData(TYPE_DO_YOGG_DESPAWN_CLOUDS, 0);
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_YOGGSARON)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_SHADOWY_BARRIER_YOGG, true);
+                pSummoned->CastSpell(pSummoned, SPELL_KNOCK_AWAY, true);
+                pSummoned->SetInCombatWithZone();
+            }
+            else if (pSummoned->GetEntry() == NPC_DEATH_ORB)
+            {
+                // the death orb is linked to 4 death rays that are randomly moving on the ground
+                float fX, fY, fZ;
+                for (uint8 i = 0; i < 4; ++i)
+                {
+                    float fDist = frand(30.0f, 45.0f);
+                    float fAng = frand(0, 2 * M_PI_F);
+                    m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, fDist, fAng);
+                    m_creature->SummonCreature(NPC_DEATH_RAY, fX, fY, fZ, 0, TEMPSUMMON_TIMED_DESPAWN, 20000);
+                }
+
+                pSummoned->CastSpell(pSummoned, SPELL_DEATH_RAY_VISUAL_ORIGIN, true);
+            }
+            else if (pSummoned->GetEntry() == NPC_DEATH_RAY)
+                pSummoned->CastSpell(pSummoned, SPELL_DEATH_RAY_VISUAL_WARN, false);
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case SAY_PHASE_2_INTRO_4:
+                // make trasition - set hostile and summon Yogg
+                DoCastSpellIfCan(m_creature, SPELL_FULL_HEAL, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_PHASE_2_TRANSFORM, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SHADOWY_BARRIER, CAST_TRIGGERED);
+
+                m_creature->SetFactionTemporary(FACTION_SARA_HOSTILE, TEMPFACTION_RESTORE_RESPAWN);
+                m_creature->SummonCreature(NPC_YOGGSARON, afYoggSaronSpawn[0], afYoggSaronSpawn[1], afYoggSaronSpawn[2], afYoggSaronSpawn[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                m_bIsHostile = true;
+                m_creature->SetInCombatWithZone();
+                break;
+            case SPELL_PHASE_2_TRANSFORM:
+                // complete transition phase - board Yogg and infor the voice controller of phase switch
+                if (m_pInstance)
+                {
+                    if (Creature* pYogg = m_pInstance->GetSingleCreatureFromStorage(NPC_YOGGSARON))
+                        DoCastSpellIfCan(pYogg, SPELL_RIDE_VEHICLE_YOGG, CAST_TRIGGERED);
+                    if (Creature* pVoice = m_pInstance->GetSingleCreatureFromStorage(NPC_VOICE_OF_YOGG))
+                        SendAIEvent(AI_EVENT_START_EVENT_A, m_creature, pVoice);
+                    m_uiPhase = PHASE_VISIONS;
+                }
+                break;
+            }
+        }
+
+        // wrapper to initialise keeper helpers
+        void DoInitialiseKeepers()
+        {
+            if (!m_pInstance)
+                return;
+
+            uint8 uiKeeperCount = 0;
+
+            if (m_pInstance->GetData(TYPE_KEEPER_FREYA) == DONE)
+            {
+                if (Creature* pHelper = m_pInstance->GetSingleCreatureFromStorage(NPC_FREYA_HELPER))
+                {
+                    pHelper->CastSpell(pHelper, SPELL_SUMMON_SANITY_WELL, false);
+                    pHelper->CastSpell(pHelper, SPELL_RESILIENCE_OF_NATURE, true);
+                    ++uiKeeperCount;
+                }
+            }
+
+            if (m_pInstance->GetData(TYPE_KEEPER_HODIR) == DONE)
+            {
+                if (Creature* pHelper = m_pInstance->GetSingleCreatureFromStorage(NPC_HODIR_HELPER))
+                {
+                    pHelper->CastSpell(pHelper, SPELL_HODIRS_PROTECTIVE_GAZE, false);
+                    pHelper->CastSpell(pHelper, SPELL_FORTITUDE_OF_FROST, true);
+                    ++uiKeeperCount;
+                }
+            }
+
+            if (m_pInstance->GetData(TYPE_KEEPER_MIMIRON) == DONE)
+            {
+                if (Creature* pHelper = m_pInstance->GetSingleCreatureFromStorage(NPC_MIMIRON_HELPER))
+                {
+                    pHelper->CastSpell(pHelper, SPELL_SPEED_OF_INVENTION, true);
+                    SendAIEvent(AI_EVENT_START_EVENT, m_creature, pHelper);
+                    ++uiKeeperCount;
+                }
+            }
+
+            if (m_pInstance->GetData(TYPE_KEEPER_THORIM) == DONE)
+            {
+                if (Creature* pHelper = m_pInstance->GetSingleCreatureFromStorage(NPC_THORIM_HELPER))
+                {
+                    pHelper->CastSpell(pHelper, SPELL_TITANIC_STORM, false);
+                    pHelper->CastSpell(pHelper, SPELL_FURY_OF_THE_STORM, true);
+                    ++uiKeeperCount;
+                }
+            }
+
+            // set hard mode data
+            m_pInstance->SetData(TYPE_YOGGSARON_HARD, uiKeeperCount);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (m_uiPhase == PHASE_SARA)
+            {
+                if (m_uiSarasSpellTimer < uiDiff)
+                {
+                    CanCastResult castResult = CAST_OK;
+                    switch (urand(0, 2))
+                    {
+                    case 0: castResult = DoCastSpellIfCan(m_creature, SPELL_SARAS_FERVOR);   break;
+                    case 1: castResult = DoCastSpellIfCan(m_creature, SPELL_SARAS_BLESSING); break;
+                    case 2: castResult = DoCastSpellIfCan(m_creature, SPELL_SARAS_ANGER);    break;
+                    }
+
+                    if (castResult == CAST_OK)
+                    {
+                        if (roll_chance_i(30))
+                            DoScriptText(urand(0, 1) ? SAY_SARA_HELP_1 : SAY_SARA_HELP_2, m_creature);
+
+                        m_uiSarasSpellTimer = 5000;
+                    }
+                }
+                else
+                    m_uiSarasSpellTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiPhase == PHASE_VISIONS)
+            {
+                if (m_uiPsychosisTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_PHYCHOSIS : SPELL_PHYCHOSIS_H) == CAST_OK)
+                    {
+                        if (roll_chance_i(10))
+                            DoScriptText(SAY_SARA_PHYCHOSIS, m_creature);
+
+                        m_uiPsychosisTimer = urand(3000, 4000);
+                    }
+                }
+                else
+                    m_uiPsychosisTimer -= uiDiff;
+
+                if (m_uiMaladyTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_MALADY_OF_THE_MIND) == CAST_OK)
+                        m_uiMaladyTimer = 15000;
+                }
+                else
+                    m_uiMaladyTimer -= uiDiff;
+
+                if (m_uiBrainLinkTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BRAIN_LINK) == CAST_OK)
+                        m_uiBrainLinkTimer = 25000;
+                }
+                else
+                    m_uiBrainLinkTimer -= uiDiff;
+
+                if (m_uiDeathRayTimer < uiDiff)
+                {
+                    if (urand(0, 1))
+                        DoScriptText(SAY_SARA_DEATH_RAY, m_creature);
+
+                    // spawn death orb at predefined location
+                    m_creature->CastSpell(1980.43f, -25.7708f, 351.5418f, SPELL_DEATH_RAY_SUMMON, true);
+                    m_uiDeathRayTimer = 20000;
+                }
+                else
+                    m_uiDeathRayTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_saraAI(pCreature);
+    }
+};
+
+/*######
+## boss_yogg_saron
+######*/
+
+struct boss_yogg_saron : public CreatureScript
+{
+    boss_yogg_saron() : CreatureScript("boss_yogg_saron") {}
+
+    struct boss_yogg_saronAI : public Scripted_NoMovementAI
+    {
+        boss_yogg_saronAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiPhase;
+
+        uint32 m_uiLunaticGazeTimer;
+        uint32 m_uiDeafeningRoarTimer;
+        uint32 m_uiShadowBeaconTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_VISIONS;
+            m_uiLunaticGazeTimer = 15000;
+            m_uiShadowBeaconTimer = 45000;
+
+            // deafening roar only available in 25man mode with 3 keepers or less active
+            if (m_pInstance)
+                m_uiDeafeningRoarTimer = (!m_bIsRegularMode && m_pInstance->GetData(TYPE_YOGGSARON_HARD) <= 3) ? 20000 : 0;
+        }
+
+        void JustReachedHome() override
+        {
+            // unboard passengers first to avoid issues
+            m_creature->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE);
+
+            if (m_pInstance)
+            {
+                if (m_pInstance->GetData(TYPE_YOGGSARON) != FAIL)
+                    m_pInstance->SetData(TYPE_YOGGSARON, FAIL);
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            // AI event received at 30% health
+            if (eventType == AI_EVENT_START_EVENT && pInvoker->GetEntry() == NPC_YOGG_BRAIN && m_uiPhase == PHASE_VISIONS)
+            {
+                DoScriptText(SAY_PHASE_3, m_creature);
+                m_uiPhase = PHASE_OLD_GOD;
+                m_creature->RemoveAurasDueToSpell(SPELL_KNOCK_AWAY);
+                m_creature->RemoveAurasDueToSpell(SPELL_SHADOWY_BARRIER_YOGG);
+
+                // despawn Sara and inform the voice controller of phase switch
+                if (m_pInstance)
+                {
+                    if (Creature* pSara = m_pInstance->GetSingleCreatureFromStorage(NPC_SARA))
+                        pSara->ForcedDespawn();
+                    if (Creature* pVoice = m_pInstance->GetSingleCreatureFromStorage(NPC_VOICE_OF_YOGG))
+                        SendAIEvent(AI_EVENT_START_EVENT_B, m_creature, pVoice);
+                }
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            DoScriptText(SAY_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_YOGGSARON, DONE);
+
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            // last phase spells
+            if (m_uiPhase == PHASE_OLD_GOD)
+            {
+                if (m_uiLunaticGazeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_LUNATIC_GAZE_YOGG) == CAST_OK)
+                    {
+                        if (urand(0, 1))
+                            DoPlaySoundToSet(m_creature, SOUND_ID_LUNATIC_GAZE);
+
+                        m_uiLunaticGazeTimer = 12000;
+                    }
+                }
+                else
+                    m_uiLunaticGazeTimer -= uiDiff;
+
+                if (m_uiShadowBeaconTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_BEACON) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_EMPOWERING_SHADOWS, m_creature);
+                        m_uiShadowBeaconTimer = 45000;
+                    }
+                }
+                else
+                    m_uiShadowBeaconTimer -= uiDiff;
+
+                if (m_uiDeafeningRoarTimer)
+                {
+                    if (m_uiDeafeningRoarTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_DEAFENING_ROAR) == CAST_OK)
+                        {
+                            DoScriptText(EMOTE_DEAFENING_ROAR, m_creature);
+                            m_uiDeafeningRoarTimer = 20000;
+                        }
+                    }
+                    else
+                        m_uiDeafeningRoarTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_yogg_saronAI(pCreature);
+    }
+};
+
+/*######
+## npc_voice_yogg_saron
+######*/
+
+struct npc_voice_yogg_saron : public CreatureScript
+{
+    npc_voice_yogg_saron() : CreatureScript("npc_voice_yogg_saron") {}
+
+    struct npc_voice_yogg_saronAI : public Scripted_NoMovementAI
+    {
+        npc_voice_yogg_saronAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+
+            for (uint8 i = 0; i < MAX_ILLUSIONS; ++i)
+                m_vuiMadnessPhases.push_back(i);
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiPhase;
+        uint8 m_uiMaxPortals;
+        uint8 m_uiPortalsCount;
+
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiSanityCheckTimer;
+        uint32 m_uiSummonGuardianTimer;
+        uint32 m_uiCrusherTentacleTimer;
+        uint32 m_uiCorruptorTentacleTimer;
+        uint32 m_uiConstrictorTentacleTimer;
+        uint32 m_uiMadnessTimer;
+        uint32 m_uiGuardianTimer;
+
+        std::vector<uint8> m_vuiMadnessPhases;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_INTRO;
+            m_uiBerserkTimer = 0;
+            m_uiSanityCheckTimer = 0;
+            m_uiSummonGuardianTimer = 1000;
+            m_uiCrusherTentacleTimer = 1000;
+            m_uiCorruptorTentacleTimer = 1000;
+            m_uiConstrictorTentacleTimer = 1000;
+            m_uiMadnessTimer = 60000;
+            m_uiGuardianTimer = 1000;
+
+            m_uiPortalsCount = 0;
+            m_uiMaxPortals = m_bIsRegularMode ? 4 : 10;
+
+            std::random_shuffle(m_vuiMadnessPhases.begin(), m_vuiMadnessPhases.end());
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            switch (eventType)
+            {
+            case AI_EVENT_START_EVENT:
+                m_uiPhase = PHASE_SARA;
+                m_uiBerserkTimer = 15 * MINUTE * IN_MILLISECONDS;
+
+                // start sanity
+                m_uiSanityCheckTimer = 15000;
+                DoCastSpellIfCan(m_creature, SPELL_SANITY);
+                break;
+            case AI_EVENT_START_EVENT_A:
+                m_uiPhase = PHASE_VISIONS;
+                break;
+            case AI_EVENT_START_EVENT_B:
+                m_uiPhase = PHASE_OLD_GOD;
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_DESCEND_INTO_MADNESS:
+                SendAIEvent(AI_EVENT_START_EVENT, m_creature, pSummoned, aMadnessTeleportSpells[m_uiPortalsCount]);
+                pSummoned->CastSpell(pSummoned, SPELL_TELEPORT_PORTAL_VISUAL, true);
+                break;
+            case NPC_CONSTRICTOR_TENTACLE:
+                pSummoned->CastSpell(pSummoned, SPELL_TENTACLE_VOID_ZONE, true);
+                pSummoned->CastSpell(pSummoned, SPELL_ERUPT, true);
+                pSummoned->CastSpell(pSummoned, SPELL_LUNGE, true);
+                pSummoned->SetInCombatWithZone();
+                break;
+            case NPC_CRUSHER_TENTACLE:
+                pSummoned->CastSpell(pSummoned, SPELL_TENTACLE_VOID_ZONE_BIG, true);
+                pSummoned->CastSpell(pSummoned, SPELL_CRUSH, true);
+                pSummoned->CastSpell(pSummoned, SPELL_DIMINISH_POWER, true);
+                pSummoned->CastSpell(pSummoned, SPELL_FOCUSED_ANGER, true);
+                pSummoned->CastSpell(pSummoned, SPELL_ERUPT, true);
+                pSummoned->SetInCombatWithZone();
+                break;
+            case NPC_CORRUPTOR_TENTACLE:
+                pSummoned->CastSpell(pSummoned, SPELL_TENTACLE_VOID_ZONE_BIG, true);
+                pSummoned->CastSpell(pSummoned, SPELL_ERUPT, true);
+                pSummoned->SetInCombatWithZone();
+                break;
+            case NPC_IMMORTAL_GUARDIAN:
+                pSummoned->CastSpell(pSummoned, SPELL_EMPOWERED, true);
+                pSummoned->CastSpell(pSummoned, SPELL_EMPOWERED_MOD, true);
+                pSummoned->CastSpell(pSummoned, SPELL_RECENTLY_SPAWNED, true);
+                pSummoned->CastSpell(pSummoned, SPELL_SIMPLE_TELEPORT, true);
+                pSummoned->SetInCombatWithZone();
+                break;
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_INSANE && pTarget->GetTypeId() == TYPEID_PLAYER && m_pInstance)
+            {
+                if (Creature* pYogg = m_pInstance->GetSingleCreatureFromStorage(NPC_YOGGSARON))
+                    DoScriptText(urand(0, 1) ? SAY_TO_INSANE_1 : SAY_TO_INSANE_2, pYogg, pTarget);
+
+                m_pInstance->SetData(TYPE_ACHIEV_DRIVE_CRAZY, uint32(false));
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_EXTINGUISH_LIFE) == CAST_OK)
+                        m_uiBerserkTimer = 0;
+                }
+                else
+                    m_uiBerserkTimer -= uiDiff;
+            }
+
+            if (m_uiSanityCheckTimer)
+            {
+                if (m_uiSanityCheckTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_INSANE_PERIODIC) == CAST_OK)
+                        m_uiSanityCheckTimer = 0;
+                }
+                else
+                    m_uiSanityCheckTimer -= uiDiff;
+            }
+
+            if (m_uiPhase == PHASE_SARA)
+            {
+                if (m_uiSummonGuardianTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_GUARDIAN_YOGG) == CAST_OK)
+                        m_uiSummonGuardianTimer = 20000;
+                }
+                else
+                    m_uiSummonGuardianTimer -= uiDiff;
+            }
+            else if (m_uiPhase == PHASE_VISIONS)
+            {
+                if (m_uiCorruptorTentacleTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_CORRUPTOR_TENTACLE) == CAST_OK)
+                        m_uiCorruptorTentacleTimer = 30000;
+                }
+                else
+                    m_uiCorruptorTentacleTimer -= uiDiff;
+
+                if (m_uiCrusherTentacleTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_CRUSHER_TENTACLE) == CAST_OK)
+                        m_uiCrusherTentacleTimer = 60000;
+                }
+                else
+                    m_uiCrusherTentacleTimer -= uiDiff;
+
+                if (m_uiConstrictorTentacleTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_CONSTRICTOR_TENTACLE) == CAST_OK)
+                        m_uiConstrictorTentacleTimer = 25000;
+                }
+                else
+                    m_uiConstrictorTentacleTimer -= uiDiff;
+
+                if (m_uiMadnessTimer < uiDiff)
+                {
+                    // no more portals if we already had 3
+                    if (m_uiPortalsCount == MAX_ILLUSIONS)
+                    {
+                        m_uiMadnessTimer = m_uiBerserkTimer * 2;
+                        return;
+                    }
+
+                    if (!m_pInstance)
+                        return;
+
+                    // inform the brain about the current illusion
+                    if (Creature* pBrain = m_pInstance->GetSingleCreatureFromStorage(NPC_YOGG_BRAIN))
+                        SendAIEvent(AI_EVENT_START_EVENT, m_creature, pBrain, m_uiPortalsCount);
+
+                    if (Creature* pYogg = m_pInstance->GetSingleCreatureFromStorage(NPC_YOGGSARON))
+                        DoScriptText(SAY_MADNESS, pYogg);
+
+                    float fX, fY, fZ, fAng;
+                    for (uint8 i = 0; i < m_uiMaxPortals; ++i)
+                    {
+                        fAng = (2 * M_PI_F / m_uiMaxPortals) * i;
+                        m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 22.0f, fAng);
+                        m_creature->SummonCreature(NPC_DESCEND_INTO_MADNESS, fX, fY, fZ, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                    }
+
+                    DoScriptText(EMOTE_VISION_BLAST, m_creature);
+                    ++m_uiPortalsCount;
+                    m_uiMadnessTimer = 90000;
+                }
+                else
+                    m_uiMadnessTimer -= uiDiff;
+            }
+            else if (m_uiPhase == PHASE_OLD_GOD)
+            {
+                if (m_uiGuardianTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_IMMORTAL_GUARDIAN) == CAST_OK)
+                        m_uiGuardianTimer = 15000;
+                }
+                else
+                    m_uiGuardianTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_voice_yogg_saronAI(pCreature);
+    }
+};
+
+/*######
+## npc_brain_yogg_saron
+######*/
+
+struct npc_brain_yogg_saron : public CreatureScript
+{
+    npc_brain_yogg_saron() : CreatureScript("npc_brain_yogg_saron") {}
+
+    struct npc_brain_yogg_saronAI : public Scripted_NoMovementAI, private DialogueHelper
+    {
+        npc_brain_yogg_saronAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature),
+        DialogueHelper(aYoggIllusionsDialog)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiIllusionIndex;
+        uint32 m_uiIllusionTimer;
+
+        bool m_bBrainDefeated;
+
+        GuidList m_lTentaclesGuids;
+
+        void Reset() override
+        {
+            m_uiIllusionTimer = 0;
+            m_uiIllusionIndex = 0;
+
+            m_bBrainDefeated = false;
+
+            DoCastSpellIfCan(m_creature, SPELL_MATCH_HEALTH);
+
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            // start illusion when informed by the voice controller
+            if (eventType == AI_EVENT_START_EVENT && pInvoker->GetEntry() == NPC_VOICE_OF_YOGG)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_INDUCE_MADNESS) == CAST_OK)
+                {
+                    m_lTentaclesGuids.clear();
+                    DoPrepareIllusion(uiMiscValue);
+                    m_uiIllusionIndex = uiMiscValue;
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_LAUGHING_SKULL:
+                pSummoned->CastSpell(pSummoned, SPELL_LUNATIC_GAZE_SKULL, false);
+                break;
+            case NPC_SUIT_OF_ARMOR:
+                pSummoned->CastSpell(pSummoned, SPELL_NONDESCRIPT_ARMOR, true);
+                pSummoned->CastSpell(pSummoned, SPELL_GRIM_REPRISAL, true);
+                m_lTentaclesGuids.push_back(pSummoned->GetObjectGuid());
+                break;
+            case NPC_DEATHSWORM_ZEALOT:
+            case NPC_RUBY_CONSORT:
+            case NPC_OBSIDIAN_CONSORT:
+            case NPC_AZURE_CONSORT:
+            case NPC_EMERALD_CONSORT:
+                pSummoned->CastSpell(pSummoned, SPELL_NONDESCRIPT_CREATURE, true);
+                pSummoned->CastSpell(pSummoned, SPELL_GRIM_REPRISAL, true);
+                m_lTentaclesGuids.push_back(pSummoned->GetObjectGuid());
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_INFLUENCE_TENTACLE)
+                m_lTentaclesGuids.remove(pSummoned->GetObjectGuid());
+
+            // open door and stun all tentacles
+            if (m_lTentaclesGuids.empty())
+            {
+                DoScriptText(EMOTE_SHATTER_BLAST, m_creature);
+                DoCastSpellIfCan(m_creature, SPELL_SHATTERED_ILLUSION, CAST_TRIGGERED);
+                m_uiIllusionTimer = 30000;
+
+                if (!m_pInstance)
+                    return;
+
+                m_pInstance->DoUseDoorOrButton(aMadnessChamberDoors[m_uiIllusionIndex]);
+
+                // respawn all nearby portals
+                std::list<GameObject*> lFleePortals;
+                GetGameObjectListWithEntryInGrid(lFleePortals, m_creature, GO_FLEE_TO_SURFACE, 40.0f);
+
+                for (std::list<GameObject*>::const_iterator itr = lFleePortals.begin(); itr != lFleePortals.end(); ++itr)
+                    m_pInstance->DoRespawnGameObject((*itr)->GetObjectGuid(), 30);
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            if (!m_pInstance)
+                return;
+
+            switch (iEntry)
+            {
+            case SPELL_ASSASSINATE:
+                if (Creature* pGarona = m_pInstance->GetSingleCreatureFromStorage(NPC_GARONA))
+                    pGarona->CastSpell(pGarona, SPELL_ASSASSINATE, true);
+                break;
+            case SAY_LICH_KING_1:
+                if (Creature* pLichKing = m_pInstance->GetSingleCreatureFromStorage(NPC_LICH_KING))
+                    pLichKing->CastSpell(pLichKing, SPELL_DEATHGRASP, false);
+                break;
+            }
+        }
+
+        // Wrapper that prepars the illusions
+        void DoPrepareIllusion(uint8 uiIndex)
+        {
+            switch (uiIndex)
+            {
+                // stormwind
+            case 0:
+                m_creature->SummonCreature(NPC_LAUGHING_SKULL, 1955.173f, 85.26153f, 239.7496f, 4.049f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_LAUGHING_SKULL, 1893.146f, 44.24343f, 239.7496f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_LAUGHING_SKULL, 1944.962f, 65.25938f, 240.4596f, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_SUIT_OF_ARMOR, 1956.503f, 72.19462f, 239.7495f, 3.281f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_SUIT_OF_ARMOR, 1951.04f, 49.88875f, 239.7495f, 2.495f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_SUIT_OF_ARMOR, 1931.14f, 38.46949f, 239.7495f, 1.710f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_SUIT_OF_ARMOR, 1908.993f, 44.26659f, 239.7495f, 0.295f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_SUIT_OF_ARMOR, 1897.344f, 64.31419f, 239.7495f, 0.139f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_SUIT_OF_ARMOR, 1903.393f, 86.60285f, 239.7495f, 5.619f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_SUIT_OF_ARMOR, 1923.342f, 98.01228f, 239.7495f, 4.834f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_SUIT_OF_ARMOR, 1945.442f, 92.17952f, 239.7495f, 4.049f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                // the following are guesswork
+                m_creature->SummonCreature(NPC_GARONA, 1931.348f, 61.0330f, 241.7094f, 2.008f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_KING_LLANE, 1930.465f, 62.6740f, 242.3763f, 5.196f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_YOGGSARON_ILLUSION, 1927.326f, 68.120f, 242.376f, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+
+                // start dialogue
+                StartNextDialogueText(NPC_KING_LLANE);
+                break;
+                // chamber
+            case 1:
+                m_creature->SummonCreature(NPC_LAUGHING_SKULL, 2063.156f, 27.95839f, 244.2707f, 5.288f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_LAUGHING_SKULL, 2061.257f, -53.8788f, 239.8633f, 2.478f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_RUBY_CONSORT, 2069.479f, -5.699653f, 239.8058f, 5.427f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_RUBY_CONSORT, 2069.298f, -43.53168f, 239.8006f, 0.471f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                // the following are guesswork
+                m_creature->SummonCreature(NPC_LAUGHING_SKULL, 2125.891f, -62.390f, 239.721f, 2.197f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_LAUGHING_SKULL, 2115.778f, 21.288f, 239.746f, 4.282f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_OBSIDIAN_CONSORT, 2144.349f, -36.108f, 239.719f, 3.116f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_OBSIDIAN_CONSORT, 2143.837f, -17.539f, 239.733f, 3.179f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_AZURE_CONSORT, 2139.173f, -51.239f, 239.747f, 2.413f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_AZURE_CONSORT, 2112.182f, -65.787f, 239.721f, 1.651f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_EMERALD_CONSORT, 2110.621f, 15.579f, 239.758f, 4.644f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_EMERALD_CONSORT, 2137.336f, 5.452f, 239.717f, 3.866f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_NELTHARION, 2117.588f, -25.318f, 242.646f, 3.15f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_ALEXSTRASZA, 2091.679f, -25.289f, 242.646f, 6.282f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_YSERA, 2114.504f, -16.118f, 242.646f, 3.91f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_MALYGOS, 2113.388f, -34.381f, 242.646f, 2.26f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_YOGGSARON_ILLUSION, 2104.555f, -25.635f, 242.646f, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+
+                // start dialogue
+                StartNextDialogueText(NPC_NELTHARION);
+                break;
+                // icecrown
+            case 2:
+                m_creature->SummonCreature(NPC_LAUGHING_SKULL, 1948.668f, -152.4481f, 240.073f, 1.919f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_LAUGHING_SKULL, 1879.845f, -72.91819f, 240.073f, 5.689f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_LAUGHING_SKULL, 1905.937f, -133.1651f, 240.073f, 5.777f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_LAUGHING_SKULL, 1935.621f, -121.0064f, 240.073f, 3.630f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_DEATHSWORM_ZEALOT, 1917.559f, -135.7448f, 240.073f, 4.188f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_DEATHSWORM_ZEALOT, 1919.125f, -140.9566f, 240.073f, 3.979f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_DEATHSWORM_ZEALOT, 1948.469f, -136.2951f, 240.0707f, 3.438f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_DEATHSWORM_ZEALOT, 1956.444f, -138.4028f, 240.1078f, 3.368f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_DEATHSWORM_ZEALOT, 1912.129f, -136.934f, 240.073f, 4.188f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_DEATHSWORM_ZEALOT, 1952.965f, -130.5295f, 240.1347f, 3.804f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_DEATHSWORM_ZEALOT, 1902.132f, -111.3594f, 240.0698f, 4.852f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_DEATHSWORM_ZEALOT, 1905.326f, -104.7865f, 240.0523f, 4.764f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_DEATHSWORM_ZEALOT, 1897.345f, -106.6076f, 240.1444f, 4.939f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_LICH_KING, 1908.557f, -152.4427f, 240.0719f, 4.238f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                // the following is guesswork
+                m_creature->SummonCreature(NPC_IMMOLATED_CHAMPION, 1915.371f, -139.9342f, 239.9896f, 4.159f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+                m_creature->SummonCreature(NPC_YOGGSARON_ILLUSION, 1915.371f, -139.9342f, 239.9896f, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 90000);
+
+                // start dialogue
+                StartNextDialogueText(NPC_LICH_KING);
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            // remove stun from tentacles after 30 sec
+            if (m_uiIllusionTimer)
+            {
+                if (m_uiIllusionTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SHATTERED_ILLUSION_REMOVE) == CAST_OK)
+                        m_uiIllusionTimer = 0;
+                }
+                else
+                    m_uiIllusionTimer -= uiDiff;
+            }
+
+            // inform Yogg that health has dropped
+            if (!m_bBrainDefeated && m_creature->GetHealthPercent() < 30.0f)
+            {
+                m_uiIllusionTimer = 0;
+                m_bBrainDefeated = true;
+                DoCastSpellIfCan(m_creature, SPELL_BRAIN_HURT_VISUAL, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SHATTERED_ILLUSION_REMOVE, CAST_TRIGGERED);
+                m_creature->RemoveAurasDueToSpell(SPELL_MATCH_HEALTH);
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+
+                if (m_pInstance)
+                {
+                    if (Creature* pYogg = m_pInstance->GetSingleCreatureFromStorage(NPC_YOGGSARON))
+                        SendAIEvent(AI_EVENT_START_EVENT, m_creature, pYogg);
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_brain_yogg_saronAI(pCreature);
+    }
+};
+
+/*######
+## npc_guardian_of_yogg
+######*/
+
+struct npc_guardian_of_yogg : public CreatureScript
+{
+    npc_guardian_of_yogg() : CreatureScript("npc_guardian_of_yogg") {}
+
+    struct npc_guardian_of_yoggAI : public ScriptedAI
+    {
+        npc_guardian_of_yoggAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiDarkVolleyTimer;
+        uint32 m_uiDominateMindTimer;
+
+        void Reset() override
+        {
+            m_uiDarkVolleyTimer = 10000;
+            m_uiDominateMindTimer = 25000;
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (pWho->GetEntry() == NPC_SARA)
+                return;
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SHADOW_NOVA : SPELL_SHADOW_NOVA_H, CAST_TRIGGERED);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                if (m_pInstance->GetData(TYPE_YOGGSARON) != FAIL)
+                {
+                    if (Creature* pVoice = m_pInstance->GetSingleCreatureFromStorage(NPC_VOICE_OF_YOGG))
+                    {
+                        Map::PlayerList const& lPlayers = m_pInstance->instance->GetPlayers();
+
+                        if (lPlayers.isEmpty())
+                            return;
+
+                        // whisper to all players
+                        for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
+                        {
+                            if (Player* pPlayer = itr->getSource())
+                                DoScriptText(SAY_WIPE_PHASE_1, pVoice, pPlayer);
+                        }
+                    }
+
+                    m_pInstance->SetData(TYPE_YOGGSARON, FAIL);
+                }
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiDarkVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DARK_VOLLEY) == CAST_OK)
+                    m_uiDarkVolleyTimer = urand(10000, 25000);
+            }
+            else
+                m_uiDarkVolleyTimer -= uiDiff;
+
+            if (m_uiDominateMindTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DOMINATE_MIND) == CAST_OK)
+                    m_uiDominateMindTimer = urand(30000, 40000);
+            }
+            else
+                m_uiDominateMindTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_guardian_of_yoggAI(pCreature);
+    }
+};
+
+/*######
+## npc_immortal_guardian
+######*/
+
+struct npc_immortal_guardian : public CreatureScript
+{
+    npc_immortal_guardian() : CreatureScript("npc_immortal_guardian") {}
+
+    struct npc_immortal_guardianAI : public ScriptedAI
+    {
+        npc_immortal_guardianAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+        bool m_bWeakened;
+
+        uint32 m_uiDrainLifeTimer;
+
+        void Reset() override
+        {
+            m_uiDrainLifeTimer = 10000;
+            m_bWeakened = false;
+        }
+
+        void DamageTaken(Unit* pDealer, uint32& uiDamage) override
+        {
+            if (pDealer->GetEntry() == NPC_THORIM_HELPER)
+                return;
+
+            if (uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                // mark as weakened for Thorim
+                if (!m_bWeakened)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_WEAKENED) == CAST_OK)
+                        m_bWeakened = true;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiDrainLifeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_DRAIN_LIFE : SPELL_DRAIN_LIFE_H) == CAST_OK)
+                        m_uiDrainLifeTimer = urand(10000, 15000);
+                }
+            }
+            else
+                m_uiDrainLifeTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_immortal_guardianAI(pCreature);
+    }
+};
+
+struct spell_yogg_empowered : public SpellScript
+{
+    spell_yogg_empowered() : SpellScript("spell_yogg_empowered") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/)
+    {
+        Creature* pCreatureTarget = pTarget->ToCreature();
+        // NOTE: this may not be 100% correct and may require additional research
+        if (uiSpellId == SPELL_EMPOWERED && uiEffIndex == EFFECT_INDEX_0 && pCreatureTarget->GetEntry() == NPC_IMMORTAL_GUARDIAN)
+        {
+            uint8 uiProjectedStacks = pCreatureTarget->GetHealthPercent() * 0.1 - 1;
+            uint8 uiCurrentStacks = 0;
+
+            if (SpellAuraHolder* pEmpowerAura = pCreatureTarget->GetSpellAuraHolder(SPELL_EMPOWERED_MOD))
+                uiCurrentStacks = pEmpowerAura->GetStackAmount();
+
+            // if creature already has the required stacks, ignore
+            if (uiProjectedStacks == uiCurrentStacks)
+                return true;
+
+            if (uiCurrentStacks > uiProjectedStacks)
+                pCreatureTarget->RemoveAuraHolderFromStack(SPELL_EMPOWERED_MOD, uiCurrentStacks - uiProjectedStacks);
+            else
+            {
+                for (uint8 i = 0; i < uiProjectedStacks - uiCurrentStacks; ++i)
+                    pCreatureTarget->CastSpell(pCreatureTarget, SPELL_EMPOWERED_MOD, true);
+            }
+
+            if (uiCurrentStacks == 0 && uiCurrentStacks < uiProjectedStacks)
+                pCreatureTarget->RemoveAurasDueToSpell(SPELL_WEAKENED);
+
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_constrictor_tentacle
+######*/
+
+struct npc_constrictor_tentacle : public CreatureScript
+{
+    npc_constrictor_tentacle() : CreatureScript("npc_constrictor_tentacle") {}
+
+    struct npc_constrictor_tentacleAI : public Scripted_NoMovementAI
+    {
+        npc_constrictor_tentacleAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+
+        void Reset() override { }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (Player* pSummoner = m_creature->GetMap()->GetPlayer(((TemporarySummon*)m_creature)->GetSummonerGuid()))
+                pSummoner->RemoveAurasDueToSpell(m_bIsRegularMode ? SPELL_SQUEEZE : SPELL_SQUEEZE_H);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_constrictor_tentacleAI(pCreature);
+    }
+};
+
+/*######
+## npc_ominous_cloud
+######*/
+
+struct npc_ominous_cloud : public CreatureScript
+{
+    npc_ominous_cloud() : CreatureScript("npc_ominous_cloud") {}
+
+    struct npc_ominous_cloudAI : public Scripted_NoMovementAI
+    {
+        npc_ominous_cloudAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        uint32 m_uiDelayTimer;
+
+        void Reset() override
+        {
+            m_uiDelayTimer = 0;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_uiDelayTimer && pWho->GetTypeId() == TYPEID_PLAYER && !((Player*)pWho)->isGameMaster() && m_creature->IsWithinDistInMap(pWho, 7.0f))
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BOIL_OMNIOUSLY) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_CLOUD_BOIL, m_creature, pWho);
+                    m_uiDelayTimer = 10000;
+                }
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_SUMMON_GUARDIAN_YOGG)
+                m_uiDelayTimer = 10000;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_GUARDIAN_OF_YOGG)
+                pSummoned->SetInCombatWithZone();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiDelayTimer)
+            {
+                if (m_uiDelayTimer <= uiDiff)
+                    m_uiDelayTimer = 0;
+                else
+                    m_uiDelayTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ominous_cloudAI(pCreature);
+    }
+};
+
+/*######
+## npc_death_ray
+######*/
+
+struct npc_death_ray : public CreatureScript
+{
+    npc_death_ray() : CreatureScript("npc_death_ray") {}
+
+    struct npc_death_rayAI : public ScriptedAI
+    {
+        npc_death_rayAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiDeathRayTimer;
+
+        void Reset() override
+        {
+            m_uiDeathRayTimer = 5000;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* pWho) override { }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiDeathRayTimer)
+            {
+                if (m_uiDeathRayTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DEATH_RAY_VISUAL_DAMAGE, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_DEATH_RAY_TRIGG, CAST_TRIGGERED);
+                        m_creature->GetMotionMaster()->MoveRandomAroundPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 10.0f);
+                        m_uiDeathRayTimer = 0;
+                    }
+                }
+                else
+                    m_uiDeathRayTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_death_rayAI(pCreature);
+    }
+};
+
+/*######
+## npc_descent_madness
+######*/
+
+struct npc_descent_madness : public CreatureScript
+{
+    npc_descent_madness() : CreatureScript("npc_descent_madness") {}
+
+    struct npc_descent_madnessAI : public Scripted_NoMovementAI
+    {
+        npc_descent_madnessAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_uiCurentSpell = 0;
+        }
+
+        uint32 m_uiCurentSpell;
+
+        void Reset() override { }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_EVENT)
+                m_uiCurentSpell = uiMiscValue;
+        }
+
+        uint32 GetCurrentSpell() { return m_uiCurentSpell; }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_descent_madnessAI(pCreature);
+    }
+
+    bool OnSpellClick(Player* pPlayer, Creature* pClickedCreature, uint32 /*uiSpellId*/) override
+    {
+        if (pClickedCreature->GetEntry() == NPC_DESCEND_INTO_MADNESS)
+        {
+            uint32 uiClickSpell = 0;
+            if (npc_descent_madnessAI* pDescentAI = dynamic_cast<npc_descent_madnessAI*>(pClickedCreature->AI()))
+                uiClickSpell = pDescentAI->GetCurrentSpell();
+
+            if (!uiClickSpell)
+                return true;
+
+            pPlayer->CastSpell(pPlayer, uiClickSpell, true);
+            pClickedCreature->ForcedDespawn();
+            return true;
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_laughing_skull
+######*/
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_laughing_skull : public CreatureScript
+{
+    npc_laughing_skull() : CreatureScript("npc_laughing_skull") {}
+
+    struct npc_laughing_skullAI : public Scripted_NoMovementAI
+    {
+        npc_laughing_skullAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void Reset() override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_laughing_skullAI(pCreature);
+    }
+};
+
+/*######
+## npc_keeper_mimiron
+######*/
+
+struct npc_keeper_mimiron : public CreatureScript
+{
+    npc_keeper_mimiron() : CreatureScript("npc_keeper_mimiron") {}
+
+    struct npc_keeper_mimironAI : public Scripted_NoMovementAI
+    {
+        npc_keeper_mimironAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        uint32 m_uiMatrixTimer;
+
+        void Reset() override
+        {
+            m_uiMatrixTimer = 0;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_START_EVENT && pInvoker->GetEntry() == NPC_SARA)
+                m_uiMatrixTimer = 30000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiMatrixTimer)
+            {
+                if (m_uiMatrixTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DESTABILIZATION_MATRIX) == CAST_OK)
+                        m_uiMatrixTimer = 30000;
+                }
+                else
+                    m_uiMatrixTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_keeper_mimironAI(pCreature);
+    }
+};
+
+/*######
+## npc_keeper_thorim
+######*/
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_keeper_thorim : public CreatureScript
+{
+    npc_keeper_thorim() : CreatureScript("npc_keeper_thorim") {}
+
+    struct npc_keeper_thorimAI : public Scripted_NoMovementAI
+    {
+        npc_keeper_thorimAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void Reset() override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_keeper_thorimAI(pCreature);
+    }
+};
+
+
+void AddSC_boss_yogg_saron()
+{
+    Script* s;
+
+    s = new boss_yogg_saron();
+    s->RegisterSelf();
+    s = new boss_sara();
+    s->RegisterSelf();
+    s = new npc_voice_yogg_saron();
+    s->RegisterSelf();
+    s = new npc_brain_yogg_saron();
+    s->RegisterSelf();
+    s = new npc_guardian_of_yogg();
+    s->RegisterSelf();
+    s = new npc_immortal_guardian();
+    s->RegisterSelf();
+    s = new npc_constrictor_tentacle();
+    s->RegisterSelf();
+    s = new npc_ominous_cloud();
+    s->RegisterSelf();
+    s = new npc_death_ray();
+    s->RegisterSelf();
+    s = new npc_descent_madness();
+    s->RegisterSelf();
+    s = new npc_laughing_skull();
+    s->RegisterSelf();
+    s = new npc_keeper_mimiron();
+    s->RegisterSelf();
+    s = new npc_keeper_thorim();
+    s->RegisterSelf();
+
+    s = new spell_yogg_empowered();
+    s->RegisterSelf();
+    
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_yogg_saron";
+    //pNewScript->GetAI = &GetAI_boss_yogg_saron;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_sara";
+    //pNewScript->GetAI = &GetAI_boss_sara;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_voice_yogg_saron";
+    //pNewScript->GetAI = &GetAI_npc_voice_yogg_saron;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_brain_yogg_saron";
+    //pNewScript->GetAI = &GetAI_npc_brain_yogg_saron;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_guardian_of_yogg";
+    //pNewScript->GetAI = &GetAI_npc_guardian_of_yogg;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_immortal_guardian";
+    //pNewScript->GetAI = &GetAI_npc_immortal_guardian;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_immortal_guardian;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_constrictor_tentacle";
+    //pNewScript->GetAI = &GetAI_npc_constrictor_tentacle;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ominous_cloud";
+    //pNewScript->GetAI = &GetAI_npc_ominous_cloud;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_death_ray";
+    //pNewScript->GetAI = &GetAI_npc_death_ray;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_descent_madness";
+    //pNewScript->GetAI = &GetAI_npc_descent_madness;
+    //pNewScript->pNpcSpellClick = &NpcSpellClick_npc_descent_madness;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_laughing_skull";
+    //pNewScript->GetAI = &GetAI_npc_laughing_skull;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_keeper_mimiron";
+    //pNewScript->GetAI = &GetAI_npc_keeper_mimiron;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_keeper_thorim";
+    //pNewScript->GetAI = &GetAI_npc_keeper_thorim;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp
new file mode 100644
index 000000000..5b5cd62ce
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp
@@ -0,0 +1,2054 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+* 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: instance_ulduar
+SD%Complete:
+SDComment:
+SDCategory: Ulduar
+EndScriptData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+
+enum
+{
+    SAY_PRE_LEVIATHAN_1                     = -1603239,
+    SAY_PRE_LEVIATHAN_2                     = -1603240,
+    SAY_PRE_LEVIATHAN_3                     = -1603241,
+
+    SAY_FREYA_HELP                          = -1603009,
+    SAY_HODIR_HELP                          = -1603093,
+    SAY_THORIM_HELP                         = -1603155,
+    SAY_MIMIRON_HELP                        = -1603195,
+    
+    SAY_GROUNDED                            = -1603040,
+
+    SPELL_KEEPER_ACTIVE                     = 62647,
+    SPELL_CLEAR_INSANE                      = 63122,       // clear all the sanity and insane on wipe / death
+    SPELL_THREAT                            = 65146,       // used by npc 33816 to apply threat to Razorscale
+    SPELL_RUNIC_SMASH                       = 62465,       // cast by npcs 33140 and 33141
+
+    SPEED_RATE_HELPERS                      = 8,
+};
+
+static const DialogueEntry aUlduarDialogue[] =
+{
+    {SAY_PRE_LEVIATHAN_1,       NPC_BRONZEBEARD_RADIO,      7000},
+    {SAY_PRE_LEVIATHAN_2,       NPC_BRONZEBEARD_RADIO,      5000},
+    {SAY_PRE_LEVIATHAN_3,       NPC_BRONZEBEARD_RADIO,      2000},
+    {NPC_LEVIATHAN,             0,                          0},
+    {0, 0, 0}
+};
+
+struct UlduarKeeperSpawns
+{
+    float fX, fY, fZ, fO;
+    uint32 uiEntry, uiType;
+    int32 iText;
+};
+
+static UlduarKeeperSpawns m_aKeepersSpawnLocs[] =
+{
+    {1945.682f, 33.34201f,  411.4408f, 5.270f, NPC_KEEPER_FREYA,   TYPE_FREYA, 0},
+    {2028.766f, 17.42014f,  411.4446f, 3.857f, NPC_KEEPER_MIMIRON, TYPE_MIMIRON, 0},
+    {1945.761f, -81.52171f, 411.4407f, 1.029f, NPC_KEEPER_HODIR,   TYPE_HODIR, 0},
+    {2028.822f, -65.73573f, 411.4426f, 2.460f, NPC_KEEPER_THORIM,  TYPE_THORIM, 0},
+};
+
+static UlduarKeeperSpawns m_aKeeperHelperLocs[] =
+{
+    {2036.873f,  25.42513f, 338.4984f, 3.909f, NPC_FREYA_HELPER,   TYPE_KEEPER_FREYA,   SAY_FREYA_HELP},
+    {2036.658f, -73.58822f, 338.4985f, 2.460f, NPC_MIMIRON_HELPER, TYPE_KEEPER_MIMIRON, SAY_MIMIRON_HELP},
+    {1939.045f, -90.87457f, 338.5426f, 0.994f, NPC_HODIR_HELPER,   TYPE_KEEPER_HODIR,   SAY_HODIR_HELP},
+    {1939.148f,  42.49035f, 338.5427f, 5.235f, NPC_THORIM_HELPER,  TYPE_KEEPER_THORIM,  SAY_THORIM_HELP},
+};
+
+struct UlduarSpawn
+{
+    float fX, fY, fZ, fO;
+    uint32 uiEntry;
+};
+
+struct UlduarSpawnTwoSide
+{
+    float fX, fY, fZ, fO;
+    uint32 uiAllyEntry, uiHordeEntry;
+};
+
+// spawn locations for Brann and Doren at the archivum
+static const float afBrannArchivumSpawnPos[4] = { 1554.274f, 142.1644f, 427.273f, 3.61f };
+static const float afProspectorSpawnPos[4] = { 1556.469f, 143.5023f, 427.2918f, 4.04f };
+
+// note: original spawn loc is 607.9199f, -12.90516f, 409.887f but we won't use it because it's too far and grid won't be loaded that far
+static const float afLeviathanSpawnPos[4] = { 422.8898f, -13.32677f, 409.8839f, 3.12f };
+static const float afLeviathanMovePos[4] = { 296.5809f, -11.55668f, 409.8278f, 3.12f };
+
+// Note: coordinates are guessed, but pretty close to what they should be
+// ToDo: spawn additional Engineers, Demolitionists, Mages and Liquid Pyrite near the columns
+// ToDo: do ckeck for horde entries
+static const UlduarSpawn afReinforcementsNormal[] =
+{
+    { 118.797f, -26.9963f, 409.80f, 3.14f, NPC_SALVAGED_SIEGE_ENGINE },
+    { 118.847f, -43.758f, 409.80f, 3.15f, NPC_SALVAGED_SIEGE_ENGINE },
+    { 116.602f, 8.464f, 409.80f, 3.10f, NPC_SALVAGED_CHOPPER },
+    { 116.859f, -4.199f, 409.80f, 3.12f, NPC_SALVAGED_CHOPPER },
+    { 122.479f, 25.093f, 410.60f, 3.10f, NPC_SALVAGED_DEMOLISHER },
+    { 123.022f, 39.671f, 409.80f, 3.10f, NPC_SALVAGED_DEMOLISHER },
+};
+
+// ToDo: do check for horde entries
+static const UlduarSpawn afReinforcementsHeroic[] =
+{
+    { 106.359f, -35.269f, 409.80f, 3.12f, NPC_SALVAGED_SIEGE_ENGINE },
+    { 135.351f, -20.767f, 409.80f, 3.15f, NPC_SALVAGED_SIEGE_ENGINE },
+    { 135.408f, -50.178f, 409.80f, 3.12f, NPC_SALVAGED_SIEGE_ENGINE },
+    { 116.429f, 4.036f, 409.79f, 3.10f, NPC_SALVAGED_CHOPPER },
+    { 116.272f, -0.013f, 409.79f, 3.10f, NPC_SALVAGED_CHOPPER },
+    { 116.948f, -8.351f, 409.79f, 3.10f, NPC_SALVAGED_CHOPPER },
+    { 137.523f, 32.346f, 409.80f, 3.12f, NPC_SALVAGED_DEMOLISHER },
+    { 112.818f, 18.981f, 409.83f, 3.10f, NPC_SALVAGED_DEMOLISHER },
+    { 112.700f, 47.884f, 409.79f, 3.10f, NPC_SALVAGED_DEMOLISHER },
+};
+
+static const UlduarSpawnTwoSide afHodirHelpersNormal[] =
+{
+    { 1999.903f, -230.4966f, 432.7581f, 1.53589f, NPC_DRUID_ALLIANCE_N, NPC_DRUID_HORDE_N },
+    { 2010.058f, -243.4553f, 432.7672f, 1.361357f, NPC_SHAMAN_ALLIANCE_N, NPC_SHAMAN_HORDE_N },
+    { 2021.118f, -236.6482f, 432.7672f, 1.937315f, NPC_MAGE_ALLIANCE_N, NPC_MAGE_HORDE_N },
+    { 1983.751f, -243.3579f, 432.7672f, 1.570796f, NPC_PRIEST_ALLIANCE_N, NPC_PRIEST_HORDE_N },
+};
+
+static const UlduarSpawnTwoSide afHodirHelpersHeroic[] =
+{
+    { 2013.37f, -240.331f, 432.687f, 1.80463f, NPC_DRUID_ALLIANCE_H, NPC_DRUID_HORDE_H },
+    { 1983.89f, -240.369f, 432.687f, 1.37658f, NPC_SHAMAN_ALLIANCE_H, NPC_SHAMAN_HORDE_H },
+    { 2000.9f, -231.232f, 432.687f, 1.59846f, NPC_MAGE_ALLIANCE_H, NPC_MAGE_HORDE_H },
+    { 1997.88f, -239.394f, 432.687f, 1.4237f, NPC_PRIEST_ALLIANCE_H, NPC_PRIEST_HORDE_H },
+};
+
+static const UlduarSpawnTwoSide afThorimSpawns[] =
+{
+    { 2127.24f, -251.309f, 419.7935f, 5.899213f, NPC_SOLDIER_HORDE, NPC_SOLDIER_ALLIANCE },
+    { 2123.316f, -254.7708f, 419.7886f, 6.178465f, NPC_SOLDIER_HORDE, NPC_SOLDIER_ALLIANCE },
+    { 2120.431f, -259.0431f, 419.6813f, 6.122538f, NPC_SOLDIER_HORDE, NPC_SOLDIER_ALLIANCE },
+    { 2145.503f, -256.3357f, 419.7306f, 3.520873f, NPC_CAPTAIN_HORDE, NPC_CAPTAIN_ALLIANCE },
+};
+
+struct is_ulduar : public InstanceScript
+{
+    is_ulduar() : InstanceScript("instance_ulduar") {}
+
+    class instance_ulduar : public ScriptedInstance, private DialogueHelper
+    {
+    public:
+        instance_ulduar(Map* pMap)
+            : ScriptedInstance(pMap), DialogueHelper(aUlduarDialogue),
+            m_bHelpersLoaded(false),
+            m_bSmashSide(true),
+            m_uiAlgalonTimer(MINUTE * IN_MILLISECONDS),
+            m_uiYoggResetTimer(0),
+            m_uiShatterAchievTimer(0),
+            m_uiGauntletStatus(0),
+            m_uiStairsSpawnTimer(0),
+            m_uiSlayedArenaMobs(0),
+            m_uiRazorCurrentHarpoon(0),
+            m_uiThorimSmashIndex(0)
+        {
+            Initialize();
+        }
+
+        ~instance_ulduar() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+            memset(&m_auiHardBoss, 0, sizeof(m_auiHardBoss));
+            memset(&m_auiUlduarKeepers, 0, sizeof(m_auiUlduarKeepers));
+            memset(&m_auiUlduarTowers, 0, sizeof(m_auiUlduarTowers));
+
+            InitializeDialogueHelper(this);
+
+            for (uint8 i = 0; i < MAX_SPECIAL_ACHIEV_CRITS; ++i)
+                m_abAchievCriteria[i] = false;
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i <= TYPE_ALGALON; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    return true;
+            }
+            return false;
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            // spawn Flame Leviathan if necessary
+            if (GetData(TYPE_LEVIATHAN) == SPECIAL || GetData(TYPE_LEVIATHAN) == FAIL)
+            {
+                if (!GetSingleCreatureFromStorage(NPC_LEVIATHAN, true))
+                {
+                    pPlayer->SummonCreature(NPC_LEVIATHAN, afLeviathanMovePos[0], afLeviathanMovePos[1], afLeviathanMovePos[2], afLeviathanMovePos[3], TEMPSUMMON_DEAD_DESPAWN, 0, true);
+                    DoCallLeviathanHelp();
+                }
+            }
+
+            // spawn Brann at the archivum if necessary
+            if (GetData(TYPE_ASSEMBLY) == DONE)
+            {
+                if (!GetSingleCreatureFromStorage(NPC_BRANN_ARCHIVUM, true))
+                {
+                    pPlayer->SummonCreature(NPC_BRANN_ARCHIVUM, afBrannArchivumSpawnPos[0], afBrannArchivumSpawnPos[1], afBrannArchivumSpawnPos[2], afBrannArchivumSpawnPos[3], TEMPSUMMON_DEAD_DESPAWN, 0, true);
+                    pPlayer->SummonCreature(instance->IsRegularDifficulty() ? NPC_PROSPECTOR_DOREN : NPC_PROSPECTOR_DOREN_H, afProspectorSpawnPos[0], afProspectorSpawnPos[1], afProspectorSpawnPos[2], afProspectorSpawnPos[3], TEMPSUMMON_DEAD_DESPAWN, 0, true);
+                }
+            }
+
+            // spawn Algalon and init world states if necessary
+            if (GetData(TYPE_ALGALON_TIMER))
+            {
+                if (!GetSingleCreatureFromStorage(NPC_ALGALON, true))
+                    pPlayer->SummonCreature(NPC_ALGALON, afAlgalonMovePos[0], afAlgalonMovePos[1], afAlgalonMovePos[2], afAlgalonMovePos[3], TEMPSUMMON_DEAD_DESPAWN, 0, true);
+
+                pPlayer->SendUpdateWorldState(WORLD_STATE_TIMER, 1);
+                pPlayer->SendUpdateWorldState(WORLD_STATE_TIMER_COUNT, GetData(TYPE_ALGALON_TIMER));
+            }
+
+            // spawn frienly keepers in the central hall, keeper helpers for Yogg-Saron and all the other faction npcs
+            if (!m_bHelpersLoaded)
+            {
+                for (uint8 i = 0; i < countof(m_aKeepersSpawnLocs); ++i)
+                {
+                    if (GetData(m_aKeepersSpawnLocs[i].uiType) == DONE)
+                        pPlayer->SummonCreature(m_aKeepersSpawnLocs[i].uiEntry, m_aKeepersSpawnLocs[i].fX, m_aKeepersSpawnLocs[i].fY, m_aKeepersSpawnLocs[i].fZ, m_aKeepersSpawnLocs[i].fO, TEMPSUMMON_CORPSE_DESPAWN, 0, true);
+                }
+
+                for (uint8 i = 0; i < countof(m_aKeeperHelperLocs); ++i)
+                {
+                    if (GetData(m_aKeeperHelperLocs[i].uiType) == DONE)
+                        pPlayer->SummonCreature(m_aKeeperHelperLocs[i].uiEntry, m_aKeeperHelperLocs[i].fX, m_aKeeperHelperLocs[i].fY, m_aKeeperHelperLocs[i].fZ, m_aKeeperHelperLocs[i].fO, TEMPSUMMON_CORPSE_DESPAWN, 0, true);
+                }
+
+                DoSpawnHodirNpcs(pPlayer);
+                m_bHelpersLoaded = true;
+            }
+        }
+
+        void OnPlayerDeath(Player* pPlayer) override
+        {
+            if (IsEncounterInProgress())
+                SetData(TYPE_CHAMPION_FAILED, DONE);
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_LEVIATHAN:
+            case NPC_EXPLORER_DELLORAH:
+            case NPC_BRANN_BRONZEBEARD:
+            case NPC_ORBITAL_SUPPORT:
+            case NPC_RAZORSCALE:
+            case NPC_EXPEDITION_COMMANDER:
+            case NPC_XT002:
+            case NPC_HEART_DECONSTRUCTOR:
+
+            case NPC_STEELBREAKER:
+            case NPC_MOLGEIM:
+            case NPC_BRUNDIR:
+            case NPC_KOLOGARN:
+            case NPC_RIGHT_ARM:
+            case NPC_LEFT_ARM:
+            case NPC_AURIAYA:
+            case NPC_FERAL_DEFENDER:
+            case NPC_BRANN_ARCHIVUM:
+            case NPC_BRANN_ALGALON:
+
+            case NPC_LEVIATHAN_MK:
+            case NPC_LEVIATHAN_MK_TURRET:
+            case NPC_COMPUTER:
+            case NPC_VX001:
+            case NPC_AERIAL_UNIT:
+            case NPC_WORLD_TRIGGER_FLAMES:
+            case NPC_RUNIC_COLOSSUS:
+            case NPC_RUNE_GIANT:
+            case NPC_SIF:
+            case NPC_JORMUNGAR_BEHEMOTH:
+            case NPC_THORIM_COMBAT_TRIGGER:
+            case NPC_ELDER_BRIGHTLEAF:
+            case NPC_ELDER_IRONBRACH:
+            case NPC_ELDER_STONEBARK:
+            case NPC_VEZAX:
+            case NPC_SARONITE_ANIMUS:
+            case NPC_YOGGSARON:
+            case NPC_SARA:
+            case NPC_YOGG_BRAIN:
+            case NPC_VOICE_OF_YOGG:
+            case NPC_ALGALON:
+
+            case NPC_MIMIRON:
+            case NPC_HODIR:
+            case NPC_THORIM:
+            case NPC_FREYA:
+            case NPC_THORIM_HELPER:
+            case NPC_MIMIRON_HELPER:
+            case NPC_HODIR_HELPER:
+            case NPC_FREYA_HELPER:
+
+            case NPC_YSERA:
+            case NPC_NELTHARION:
+            case NPC_MALYGOS:
+            case NPC_ALEXSTRASZA:
+            case NPC_GARONA:
+            case NPC_KING_LLANE:
+            case NPC_LICH_KING:
+            case NPC_IMMOLATED_CHAMPION:
+            case NPC_YOGGSARON_ILLUSION:
+                break;
+
+            case NPC_ULDUAR_COLOSSUS:
+                if (pCreature->GetPositionX() > 300.0f)
+                    m_sColossusGuidSet.insert(pCreature->GetObjectGuid());
+                return;
+            case NPC_EXPEDITION_DEFENDER:
+                m_lDefendersGuids.push_back(pCreature->GetObjectGuid());
+                return;
+            case NPC_EXPEDITION_ENGINEER:
+                m_lEngineersGuids.push_back(pCreature->GetObjectGuid());
+                return;
+            case NPC_EXPEDITION_TRAPPER:
+                m_lTrappersGuids.push_back(pCreature->GetObjectGuid());
+                return;
+            case NPC_RAZORSCALE_CONTROLLER:
+                // sort the controllers which are assigned to harpoons and allow the central one into the mail guid store
+                if (pCreature->GetPositionY() > -145.0f)
+                {
+                    m_lHarpoonDummyGuids.push_back(pCreature->GetObjectGuid());
+                    return;
+                }
+                break;
+            case NPC_XT_TOY_PILE:
+                m_vToyPileGuidVector.push_back(pCreature->GetObjectGuid());
+                return;
+            case NPC_RUBBLE_STALKER:
+                if (pCreature->GetPositionY() > -10.0f)
+                    m_rightKoloStalkerGuid = pCreature->GetObjectGuid();
+                else
+                    m_leftKoloStalkerGuid = pCreature->GetObjectGuid();
+                return;
+            case NPC_THORIM_EVENT_BUNNY:
+                // sort the event bunnies between the arena and tribune spawns; the platform spawns are ignored for the moment
+                if (pCreature->GetPositionZ() < 420.0f)
+                    m_lThorimBunniesGuids.push_back(pCreature->GetObjectGuid());
+                else if (pCreature->GetPositionZ() > 438.5f)
+                    m_lUpperBunniesGuids.push_back(pCreature->GetObjectGuid());
+                return;
+            case NPC_THUNDER_ORB:
+                // get only the upper ones; the lower ones are searched dynamically in order to be paired correctly
+                if (pCreature->GetPositionZ() > 430.0f)
+                    m_lUpperThunderOrbsGuids.push_back(pCreature->GetObjectGuid());
+                return;
+            case NPC_LEFT_HAND_BUNNY:
+                m_lLeftHandBunniesGuids.push_back(pCreature->GetObjectGuid());
+                return;
+            case NPC_RIGHT_HAND_BUNNY:
+                m_lRightHandBunniesGuids.push_back(pCreature->GetObjectGuid());
+                return;
+            case NPC_OMINOUS_CLOUD:
+                m_lOminousCloudsGuids.push_back(pCreature->GetObjectGuid());
+                return;
+            case NPC_VEZAX_BUNNY:
+                if (pCreature->GetPositionY() < 100.0f)
+                    m_animusVezaxBunnyGuid = pCreature->GetObjectGuid();
+                else
+                    m_vaporVezaxBunnyGuid = pCreature->GetObjectGuid();
+                return;
+
+            default:
+                return;
+            }
+            m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_RUNE_GIANT:
+                m_uiStairsSpawnTimer = 0;
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_SANCTUM_SENTRY:
+                if (GetData(TYPE_AURIAYA) == IN_PROGRESS)
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_CAT_LADY, false);
+                break;
+            case NPC_ULDUAR_COLOSSUS:
+            {
+                if (m_sColossusGuidSet.find(pCreature->GetObjectGuid()) != m_sColossusGuidSet.end())
+                    m_sColossusGuidSet.erase(pCreature->GetObjectGuid());
+
+                // start pre Leviathan event
+                if (m_sColossusGuidSet.empty())
+                {
+                    StartNextDialogueText(SAY_PRE_LEVIATHAN_1);
+                    SetData(TYPE_LEVIATHAN, SPECIAL);
+                    SetData(TYPE_LEVIATHAN_GAUNTLET, DONE);
+                    pCreature->SummonCreature(NPC_LEVIATHAN, afLeviathanSpawnPos[0], afLeviathanSpawnPos[1], afLeviathanSpawnPos[2], afLeviathanSpawnPos[3], TEMPSUMMON_DEAD_DESPAWN, 0, true);
+                }
+            }
+                break;
+            case NPC_DRUID_HORDE_N:
+            case NPC_DRUID_HORDE_H:
+            case NPC_SHAMAN_HORDE_N:
+            case NPC_SHAMAN_HORDE_H:
+            case NPC_MAGE_HORDE_N:
+            case NPC_MAGE_HORDE_H:
+            case NPC_PRIEST_HORDE_N:
+            case NPC_PRIEST_HORDE_H:
+            case NPC_DRUID_ALLIANCE_N:
+            case NPC_DRUID_ALLIANCE_H:
+            case NPC_SHAMAN_ALLIANCE_N:
+            case NPC_SHAMAN_ALLIANCE_H:
+            case NPC_MAGE_ALLIANCE_N:
+            case NPC_MAGE_ALLIANCE_H:
+            case NPC_PRIEST_ALLIANCE_N:
+            case NPC_PRIEST_ALLIANCE_H:
+                if (GetData(TYPE_HODIR) == IN_PROGRESS)
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_COOL_FRIENDS, false);
+                break;
+            case NPC_JORMUNGAR_BEHEMOTH:
+            case NPC_SOLDIER_ALLIANCE:
+            case NPC_CAPTAIN_ALLIANCE:
+            case NPC_SOLDIER_HORDE:
+            case NPC_CAPTAIN_HORDE:
+            case NPC_DARK_RUNE_ACOLYTE:
+                ++m_uiSlayedArenaMobs;
+
+                // start combat when all 4 faction soldiers, the Acolyte and the Jormungar are dead
+                if (m_uiSlayedArenaMobs == 6)
+                {
+                    if (Creature* pThorim = GetSingleCreatureFromStorage(NPC_THORIM))
+                        pThorim->SetInCombatWithZone();
+                }
+                break;
+            case NPC_RUNIC_COLOSSUS:
+                m_uiStairsSpawnTimer = 30000;
+                DoUseDoorOrButton(GO_RUNED_STONE_DOOR);
+                break;
+            case NPC_RUNE_GIANT:
+                DoUseDoorOrButton(GO_THORIM_STONE_DOOR);
+                break;
+            case NPC_SARONITE_ANIMUS:
+                if (Creature* pVezax = GetSingleCreatureFromStorage(NPC_VEZAX))
+                {
+                    if (pVezax->IsAlive())
+                    {
+                        pCreature->AI()->SendAIEvent(AI_EVENT_CUSTOM_C, pCreature, pVezax);
+                        SetData(TYPE_VEZAX_HARD, DONE);
+                    }
+                }
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+                // -----------------    Doors & Other   -----------------
+                // The siege
+            case GO_SHIELD_WALL:
+                break;
+            case GO_LIGHTNING_DOOR:
+                if (m_auiEncounter[TYPE_LEVIATHAN] == SPECIAL || m_auiEncounter[TYPE_LEVIATHAN] == FAIL)
+                    pGo->SetGoState(GO_STATE_READY);
+                break;
+            case GO_LEVIATHAN_GATE:
+                if (m_auiEncounter[TYPE_LEVIATHAN] != NOT_STARTED)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_XT002_GATE:
+                pGo->SetGoState(GO_STATE_READY);
+                if (m_auiEncounter[TYPE_XT002] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                if (m_auiEncounter[TYPE_LEVIATHAN] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_HODIR_CRYSTAL:
+                if (m_auiUlduarTowers[0] == FAIL)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_THORIM_CRYSTAL:
+                if (m_auiUlduarTowers[1] == FAIL)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_FREYA_CRYSTAL:
+                if (m_auiUlduarTowers[2] == FAIL)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_MIMIRON_CRYSTAL:
+                if (m_auiUlduarTowers[3] == FAIL)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+
+                // Archivum
+            case GO_IRON_ENTRANCE_DOOR:
+                break;
+            case GO_ARCHIVUM_DOOR:
+                if (m_auiEncounter[TYPE_ASSEMBLY])
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+                // Celestial Planetarium
+            case GO_CELESTIAL_ACCES:
+            case GO_CELESTIAL_ACCES_H:
+                // Note: weird, but unless flag is set, client will not respond as expected
+                pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED);
+                break;
+            case GO_CELESTIAL_DOOR_1:
+            case GO_CELESTIAL_DOOR_2:
+                if (m_auiEncounter[TYPE_ALGALON] != NOT_STARTED)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_CELESTIAL_DOOR_COMBAT:
+            case GO_UNIVERSE_FLOOR:
+            case GO_UNIVERSE_FLOOR_COMBAT:
+            case GO_AZEROTH_GLOBE:
+                break;
+                // Shattered Hallway
+            case GO_KOLOGARN_BRIDGE:
+                if (m_auiEncounter[TYPE_KOLOGARN] == DONE)
+                    pGo->SetGoState(GO_STATE_READY);
+                break;
+
+                // -----------------    The Keepers    -----------------
+                // Hodir
+            case GO_HODIR_EXIT:
+            case GO_HODIR_ICE_WALL:
+                if (m_auiEncounter[TYPE_HODIR] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_HODIR_ENTER:
+                break;
+                // Mimiron
+            case GO_MIMIRON_BUTTON:
+            case GO_MIMIRON_DOOR_1:
+            case GO_MIMIRON_DOOR_2:
+            case GO_MIMIRON_DOOR_3:
+            case GO_MIMIRON_ELEVATOR:
+                // Thorim
+            case GO_DARK_IRON_PORTCULIS:
+            case GO_RUNED_STONE_DOOR:
+            case GO_THORIM_STONE_DOOR:
+            case GO_LIGHTNING_FIELD:
+            case GO_DOOR_LEVER:
+                break;
+
+                // Prison
+            case GO_ANCIENT_GATE:
+                if (m_auiEncounter[TYPE_MIMIRON] == DONE && m_auiEncounter[TYPE_HODIR] == DONE && m_auiEncounter[TYPE_THORIM] == DONE && m_auiEncounter[TYPE_FREYA] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_VEZAX_GATE:
+                if (m_auiEncounter[TYPE_VEZAX] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_YOGG_GATE:
+            case GO_BRAIN_DOOR_CHAMBER:
+            case GO_BRAIN_DOOR_ICECROWN:
+            case GO_BRAIN_DOOR_STORMWIND:
+                break;
+
+                // -----------------    Chests    -----------------
+                // Kologarn
+            case GO_CACHE_OF_LIVING_STONE_10:
+            case GO_CACHE_OF_LIVING_STONE_25:
+
+                // Hodir
+            case GO_CACHE_OF_WINTER_10:
+            case GO_CACHE_OF_WINTER_25:
+            case GO_CACHE_OF_RARE_WINTER_10:
+            case GO_CACHE_OF_RARE_WINTER_25:
+
+                // Thorim
+            case GO_CACHE_OF_STORMS_10:
+            case GO_CACHE_OF_STORMS_25:
+            case GO_CACHE_OF_STORMS_10_H:
+            case GO_CACHE_OF_STORMS_25_H:
+
+                // Mimiron
+            case GO_CACHE_OF_INOV_10:
+            case GO_CACHE_OF_INOV_25:
+            case GO_CACHE_OF_INOV_10_H:
+            case GO_CACHE_OF_INOV_25_H:
+
+                // Alagon
+            case GO_GIFT_OF_OBSERVER_10:
+            case GO_GIFT_OF_OBSERVER_25:
+                break;
+
+            case GO_BROKEN_HARPOON:
+                m_vBrokenHarpoonsGuids.push_back(pGo->GetObjectGuid());
+                return;
+            case GO_HARPOON_GUN_1:
+            case GO_HARPOON_GUN_2:
+            case GO_HARPOON_GUN_3:
+            case GO_HARPOON_GUN_4:
+                m_lRepairedHarpoonsGuids.push_back(pGo->GetObjectGuid());
+                return;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+                // Siege of Ulduar
+            case TYPE_LEVIATHAN:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData != SPECIAL)
+                    DoUseDoorOrButton(GO_SHIELD_WALL);
+                if (uiData == IN_PROGRESS)
+                {
+                    // make sure that the Lightning door is closed when engaged in combat
+                    if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_LIGHTNING_DOOR))
+                    {
+                        if (pDoor->GetGoState() != GO_STATE_READY)
+                            DoUseDoorOrButton(GO_LIGHTNING_DOOR);
+                    }
+
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_SHUTOUT, true);
+                }
+                else if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_XT002_GATE);
+                    DoUseDoorOrButton(GO_LIGHTNING_DOOR);
+                }
+                else if (uiData == FAIL)
+                    DoCallLeviathanHelp();
+                break;
+            case TYPE_IGNIS:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                {
+                    DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_IGNIS_ID);
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_SHATTERED, false);
+                }
+                break;
+            case TYPE_RAZORSCALE:
+                if (uiData == IN_PROGRESS)
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_QUICK_SHAVE, true);
+                else if (uiData == FAIL)
+                {
+                    // reset the commander
+                    if (Creature* pCommander = GetSingleCreatureFromStorage(NPC_EXPEDITION_COMMANDER))
+                        pCommander->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+
+                    // reset all creatures
+                    for (GuidList::const_iterator itr = m_lDefendersGuids.begin(); itr != m_lDefendersGuids.end(); ++itr)
+                    {
+                        if (Creature* pDefender = instance->GetCreature(*itr))
+                        {
+                            if (!pDefender->IsAlive())
+                                pDefender->Respawn();
+                            else
+                                pDefender->GetMotionMaster()->MoveTargetedHome();
+                        }
+                    }
+                    for (GuidList::const_iterator itr = m_lEngineersGuids.begin(); itr != m_lEngineersGuids.end(); ++itr)
+                    {
+                        if (Creature* pEngineer = instance->GetCreature(*itr))
+                        {
+                            if (!pEngineer->IsAlive())
+                                pEngineer->Respawn();
+                            else
+                                pEngineer->GetMotionMaster()->MoveTargetedHome();
+                        }
+                    }
+                    for (GuidList::const_iterator itr = m_lTrappersGuids.begin(); itr != m_lTrappersGuids.end(); ++itr)
+                    {
+                        if (Creature* pTrapper = instance->GetCreature(*itr))
+                        {
+                            if (!pTrapper->IsAlive())
+                                pTrapper->Respawn();
+                            else
+                                pTrapper->GetMotionMaster()->MoveTargetedHome();
+                        }
+                    }
+                    for (GuidList::const_iterator itr = m_lHarpoonDummyGuids.begin(); itr != m_lHarpoonDummyGuids.end(); ++itr)
+                    {
+                        if (Creature* pHarpoon = instance->GetCreature(*itr))
+                            pHarpoon->InterruptNonMeleeSpells(false);
+                    }
+
+                    // reset Harpoons: respawn the broken ones and despawn the repaired ones
+                    for (GuidVector::const_iterator itr = m_vBrokenHarpoonsGuids.begin(); itr != m_vBrokenHarpoonsGuids.end(); ++itr)
+                    {
+                        if (GameObject* pHarpoon = instance->GetGameObject(*itr))
+                        {
+                            if (!pHarpoon->isSpawned())
+                                pHarpoon->Respawn();
+                        }
+                    }
+                    for (GuidList::const_iterator itr = m_lRepairedHarpoonsGuids.begin(); itr != m_lRepairedHarpoonsGuids.end(); ++itr)
+                    {
+                        if (GameObject* pHarpoon = instance->GetGameObject(*itr))
+                        {
+                            if (pHarpoon->isSpawned())
+                                pHarpoon->SetLootState(GO_JUST_DEACTIVATED);
+                        }
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_XT002:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_XT002_GATE);
+                if (uiData == IN_PROGRESS)
+                {
+                    DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_XT002_ID);
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_NERF_ENG, true);
+                }
+                break;
+
+                // Antechamber of Ulduar
+            case TYPE_ASSEMBLY:
+                // Don't set the same encounter data twice
+                if (uiData == m_auiEncounter[uiType])
+                    return;
+                m_auiEncounter[uiType] = uiData;
+                // don't continue for encounter = special
+                if (uiData == SPECIAL)
+                    return;
+                DoUseDoorOrButton(GO_IRON_ENTRANCE_DOOR);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_ARCHIVUM_DOOR);
+
+                    if (Player* pPlayer = GetPlayerInMap())
+                    {
+                        pPlayer->SummonCreature(NPC_BRANN_ARCHIVUM, afBrannArchivumSpawnPos[0], afBrannArchivumSpawnPos[1], afBrannArchivumSpawnPos[2], afBrannArchivumSpawnPos[3], TEMPSUMMON_DEAD_DESPAWN, 0, true);
+                        pPlayer->SummonCreature(instance->IsRegularDifficulty() ? NPC_PROSPECTOR_DOREN : NPC_PROSPECTOR_DOREN_H, afProspectorSpawnPos[0], afProspectorSpawnPos[1], afProspectorSpawnPos[2], afProspectorSpawnPos[3], TEMPSUMMON_DEAD_DESPAWN, 0, true);
+                    }
+                }
+                else if (uiData == IN_PROGRESS)
+                {
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_BRUNDIR, true);
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_MOLGEIM, true);
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_STEELBREAKER, true);
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_STUNNED, true);
+                }
+                break;
+            case TYPE_KOLOGARN:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_LIVING_STONE_10 : GO_CACHE_OF_LIVING_STONE_25, 30 * MINUTE);
+                    DoUseDoorOrButton(GO_KOLOGARN_BRIDGE);
+                }
+                else if (uiData == IN_PROGRESS)
+                {
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_RUBBLE, false);
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_DISARMED, false);
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_LOOKS_KILL, true);
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_OPEN_ARMS, true);
+                }
+                break;
+            case TYPE_AURIAYA:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS)
+                {
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_CAT_LADY, true);
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_NINE_LIVES, false);
+                }
+                break;
+
+                // Keepers of Ulduar
+            case TYPE_MIMIRON:
+                // Don't set the same encounter data twice
+                if (uiData == m_auiEncounter[uiType])
+                    return;
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_MIMIRON_DOOR_1);
+                DoUseDoorOrButton(GO_MIMIRON_DOOR_2);
+                DoUseDoorOrButton(GO_MIMIRON_DOOR_3);
+                if (uiData == DONE)
+                {
+                    if (GetData(TYPE_MIMIRON_HARD) == DONE)
+                        DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_INOV_10_H : GO_CACHE_OF_INOV_25_H, 30 * MINUTE);
+                    else
+                        DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_INOV_10 : GO_CACHE_OF_INOV_25, 30 * MINUTE);
+
+                    SpawnFriendlyKeeper(NPC_KEEPER_MIMIRON);
+                    DoOpenMadnessDoorIfCan();
+                }
+                else if (uiData == IN_PROGRESS)
+                    DoToggleGameObjectFlags(GO_MIMIRON_BUTTON, GO_FLAG_NO_INTERACT, true);
+                else if (uiData == FAIL)
+                {
+                    // reset objects
+                    DoToggleGameObjectFlags(GO_MIMIRON_BUTTON, GO_FLAG_NO_INTERACT, false);
+
+                    if (GameObject* pButton = GetSingleGameObjectFromStorage(GO_MIMIRON_BUTTON))
+                        pButton->ResetDoorOrButton();
+                    if (GameObject* pElevator = GetSingleGameObjectFromStorage(GO_MIMIRON_ELEVATOR))
+                        pElevator->SetGoState(GO_STATE_ACTIVE);
+
+                    // reset vehicles
+                    if (Creature* pLeviathan = GetSingleCreatureFromStorage(NPC_LEVIATHAN_MK))
+                    {
+                        pLeviathan->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE);
+                        pLeviathan->AI()->EnterEvadeMode();
+                    }
+                    if (Creature* pVx001 = GetSingleCreatureFromStorage(NPC_VX001, true))
+                    {
+                        pVx001->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE);
+                        pVx001->ForcedDespawn(1000);
+                    }
+                    if (Creature* pAerial = GetSingleCreatureFromStorage(NPC_AERIAL_UNIT, true))
+                    {
+                        pAerial->RemoveSpellsCausingAura(SPELL_AURA_CONTROL_VEHICLE);
+                        pAerial->ForcedDespawn(1000);
+                    }
+                    if (Creature* pMimiron = GetSingleCreatureFromStorage(NPC_MIMIRON))
+                        pMimiron->AI()->EnterEvadeMode();
+                    if (Creature* pComputer = GetSingleCreatureFromStorage(NPC_COMPUTER))
+                        pComputer->AI()->EnterEvadeMode();
+
+                    SetData(TYPE_MIMIRON_HARD, FAIL);
+                }
+                break;
+            case TYPE_HODIR:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_HODIR_ENTER);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_HODIR_ICE_WALL);
+                    DoUseDoorOrButton(GO_HODIR_EXIT);
+
+                    DoToggleGameObjectFlags(instance->IsRegularDifficulty() ? GO_CACHE_OF_WINTER_10 : GO_CACHE_OF_WINTER_25, GO_FLAG_NO_INTERACT, false);
+                    if (GetData(TYPE_HODIR_HARD) == DONE)
+                        DoToggleGameObjectFlags(instance->IsRegularDifficulty() ? GO_CACHE_OF_RARE_WINTER_10 : GO_CACHE_OF_RARE_WINTER_25, GO_FLAG_NO_INTERACT, false);
+
+                    SpawnFriendlyKeeper(NPC_KEEPER_HODIR);
+                    DoOpenMadnessDoorIfCan();
+                }
+                else if (uiData == FAIL)
+                {
+                    if (GameObject* pChest = GetSingleGameObjectFromStorage(instance->IsRegularDifficulty() ? GO_CACHE_OF_RARE_WINTER_10 : GO_CACHE_OF_RARE_WINTER_25))
+                        pChest->Respawn();
+
+                    if (Player* pPlayer = GetPlayerInMap())
+                        DoSpawnHodirNpcs(pPlayer);
+
+                    SetData(TYPE_HODIR_HARD, FAIL);
+                }
+                else if (uiData == IN_PROGRESS)
+                {
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_CHEESE_FREEZE, true);
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_COOL_FRIENDS, true);
+                }
+                break;
+            case TYPE_THORIM:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_LIGHTNING_FIELD);
+                if (uiData == IN_PROGRESS)
+                {
+                    DoToggleGameObjectFlags(GO_DOOR_LEVER, GO_FLAG_NO_INTERACT, false);
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_LIGHTNING, true);
+                }
+                else if (uiData == DONE)
+                {
+                    if (GetData(TYPE_THORIM_HARD) == DONE)
+                    {
+                        DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_STORMS_10_H : GO_CACHE_OF_STORMS_25_H, 30 * MINUTE);
+                        DoToggleGameObjectFlags(instance->IsRegularDifficulty() ? GO_CACHE_OF_STORMS_10_H : GO_CACHE_OF_STORMS_25_H, GO_FLAG_NO_INTERACT, false);
+                    }
+                    else
+                    {
+                        DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_CACHE_OF_STORMS_10 : GO_CACHE_OF_STORMS_25, 30 * MINUTE);
+                        DoToggleGameObjectFlags(instance->IsRegularDifficulty() ? GO_CACHE_OF_STORMS_10 : GO_CACHE_OF_STORMS_25, GO_FLAG_NO_INTERACT, false);
+                    }
+
+                    SpawnFriendlyKeeper(NPC_KEEPER_THORIM);
+                    DoOpenMadnessDoorIfCan();
+                }
+                else if (uiData == FAIL)
+                {
+                    DoToggleGameObjectFlags(GO_DOOR_LEVER, GO_FLAG_NO_INTERACT, true);
+                    if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_RUNED_STONE_DOOR))
+                        pDoor->ResetDoorOrButton();
+                    if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_THORIM_STONE_DOOR))
+                        pDoor->ResetDoorOrButton();
+                    if (Creature* pColossus = GetSingleCreatureFromStorage(NPC_RUNIC_COLOSSUS))
+                    {
+                        if (pColossus->IsAlive())
+                            pColossus->AI()->EnterEvadeMode();
+                    }
+
+                    m_uiStairsSpawnTimer = 0;
+                    m_uiSlayedArenaMobs = 0;
+                }
+                break;
+            case TYPE_FREYA:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    // despawn elders which are still alive on event complete
+                    if (Creature* pElder = GetSingleCreatureFromStorage(NPC_ELDER_BRIGHTLEAF))
+                    {
+                        if (pElder->IsAlive())
+                            pElder->ForcedDespawn();
+                    }
+                    if (Creature* pElder = GetSingleCreatureFromStorage(NPC_ELDER_IRONBRACH))
+                    {
+                        if (pElder->IsAlive())
+                            pElder->ForcedDespawn();
+                    }
+                    if (Creature* pElder = GetSingleCreatureFromStorage(NPC_ELDER_STONEBARK))
+                    {
+                        if (pElder->IsAlive())
+                            pElder->ForcedDespawn();
+                    }
+
+                    SpawnFriendlyKeeper(NPC_KEEPER_FREYA);
+                    DoOpenMadnessDoorIfCan();
+                }
+                break;
+
+                // Ulduar Prison
+            case TYPE_VEZAX:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                    DoUseDoorOrButton(GO_VEZAX_GATE);
+                else if (uiData == IN_PROGRESS)
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_SHADOWDODGER, true);
+                break;
+            case TYPE_YOGGSARON:
+                // Don't set the same encounter data twice
+                if (uiData == m_auiEncounter[uiType])
+                    return;
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_YOGG_GATE);
+                if (uiData == FAIL || uiData == DONE)
+                {
+                    // reset/cleanup encounter
+                    for (GuidList::const_iterator itr = m_lOminousCloudsGuids.begin(); itr != m_lOminousCloudsGuids.end(); ++itr)
+                    {
+                        if (Creature* pCloud = instance->GetCreature(*itr))
+                            pCloud->ForcedDespawn();
+                    }
+
+                    if (Creature* pVoice = GetSingleCreatureFromStorage(NPC_VOICE_OF_YOGG))
+                    {
+                        pVoice->CastSpell(pVoice, SPELL_CLEAR_INSANE, true);
+                        pVoice->ForcedDespawn();
+                    }
+
+                    if (Creature* pSara = GetSingleCreatureFromStorage(NPC_SARA))
+                        pSara->ForcedDespawn();
+                    if (Creature* pBrain = GetSingleCreatureFromStorage(NPC_YOGG_BRAIN))
+                        pBrain->ForcedDespawn();
+
+                    // reset illusion doors
+                    if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_BRAIN_DOOR_CHAMBER))
+                        pDoor->ResetDoorOrButton();
+                    if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_BRAIN_DOOR_ICECROWN))
+                        pDoor->ResetDoorOrButton();
+                    if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_BRAIN_DOOR_STORMWIND))
+                        pDoor->ResetDoorOrButton();
+
+                    // reset all helpers
+                    for (uint8 i = 0; i < countof(m_aKeeperHelperLocs); ++i)
+                    {
+                        if (GetData(m_aKeeperHelperLocs[i].uiType == DONE))
+                        {
+                            if (Creature* pHelper = GetSingleCreatureFromStorage(m_aKeeperHelperLocs[i].uiEntry))
+                            {
+                                pHelper->AI()->EnterEvadeMode();
+                                pHelper->CastSpell(pHelper, SPELL_KEEPER_ACTIVE, true);
+                            }
+                        }
+                    }
+
+                    // full reset only on fail
+                    if (uiData == FAIL)
+                        m_uiYoggResetTimer = 60000;
+                }
+                else if (uiData == IN_PROGRESS)
+                {
+                    DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_YOGG_ID);
+
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_DRIVE_CRAZY, true);
+                }
+                break;
+
+                // Celestial Planetarium
+            case TYPE_ALGALON:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData != SPECIAL)
+                {
+                    // environment gameobjects
+                    DoUseDoorOrButton(GO_AZEROTH_GLOBE);
+                    DoUseDoorOrButton(GO_UNIVERSE_FLOOR);
+                    DoUseDoorOrButton(GO_UNIVERSE_FLOOR_COMBAT);
+                    DoUseDoorOrButton(GO_CELESTIAL_DOOR_COMBAT);
+                }
+                if (uiData == DONE)
+                {
+                    DoUpdateWorldState(WORLD_STATE_TIMER, 0);
+                    DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_GIFT_OF_OBSERVER_10 : GO_GIFT_OF_OBSERVER_25, 30 * MINUTE);
+                }
+                else if (uiData == FAIL)
+                {
+                    // only despawn when time is over
+                    if (GetData(TYPE_ALGALON_TIMER) == 0)
+                    {
+                        DoUpdateWorldState(WORLD_STATE_TIMER, 0);
+                        if (Creature* pAlgalon = GetSingleCreatureFromStorage(NPC_ALGALON))
+                            pAlgalon->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pAlgalon, pAlgalon);
+                    }
+                }
+                break;
+            case TYPE_ALGALON_TIMER:
+                m_auiEncounter[uiType] = uiData;
+                DoUpdateWorldState(WORLD_STATE_TIMER_COUNT, m_auiEncounter[uiType]);
+                break;
+            case TYPE_CHAMPION_FAILED:
+                m_auiEncounter[uiType] = uiData;
+                break;
+
+                // Hard modes (not saved)
+            case TYPE_LEVIATHAN_HARD:
+                m_auiHardBoss[0] = uiData;
+                return;
+            case TYPE_XT002_HARD:
+                m_auiHardBoss[1] = uiData;
+                return;
+            case TYPE_HODIR_HARD:
+                m_auiHardBoss[2] = uiData;
+                return;
+            case TYPE_THORIM_HARD:
+                m_auiHardBoss[3] = uiData;
+                return;
+            case TYPE_MIMIRON_HARD:
+                m_auiHardBoss[4] = uiData;
+                return;
+            case TYPE_FREYA_HARD:
+                m_auiHardBoss[5] = uiData;
+                return;
+            case TYPE_VEZAX_HARD:
+                m_auiHardBoss[6] = uiData;
+                return;
+            case TYPE_YOGGSARON_HARD:
+                m_auiHardBoss[7] = uiData;
+                return;
+
+                // Ulduar keepers
+            case TYPE_KEEPER_HODIR:
+                if (uiData == m_auiUlduarKeepers[0] || uiData != DONE)
+                    return;
+                SpawnKeeperHelper(NPC_HODIR_HELPER);
+                m_auiUlduarKeepers[0] = uiData;
+                break;
+            case TYPE_KEEPER_THORIM:
+                if (uiData == m_auiUlduarKeepers[1] || uiData != DONE)
+                    return;
+                SpawnKeeperHelper(NPC_THORIM_HELPER);
+                m_auiUlduarKeepers[1] = uiData;
+                break;
+            case TYPE_KEEPER_FREYA:
+                if (uiData == m_auiUlduarKeepers[2] || uiData != DONE)
+                    return;
+                SpawnKeeperHelper(NPC_FREYA_HELPER);
+                m_auiUlduarKeepers[2] = uiData;
+                break;
+            case TYPE_KEEPER_MIMIRON:
+                if (uiData == m_auiUlduarKeepers[3] || uiData != DONE)
+                    return;
+                SpawnKeeperHelper(NPC_MIMIRON_HELPER);
+                m_auiUlduarKeepers[3] = uiData;
+                break;
+
+                // Ulduar towers
+            case TYPE_TOWER_HODIR:
+                if (m_auiUlduarTowers[0] == uiData)
+                    return;
+                if (uiData == FAIL)
+                    DoUseDoorOrButton(GO_HODIR_CRYSTAL);
+                m_auiUlduarTowers[0] = uiData;
+                break;
+            case TYPE_TOWER_THORIM:
+                if (m_auiUlduarTowers[1] == uiData)
+                    return;
+                if (uiData == FAIL)
+                    DoUseDoorOrButton(GO_THORIM_CRYSTAL);
+                m_auiUlduarTowers[1] = uiData;
+                break;
+            case TYPE_TOWER_FREYA:
+                if (m_auiUlduarTowers[2] == uiData)
+                    return;
+                if (uiData == FAIL)
+                    DoUseDoorOrButton(GO_FREYA_CRYSTAL);
+                m_auiUlduarTowers[2] = uiData;
+                break;
+            case TYPE_TOWER_MIMIRON:
+                if (m_auiUlduarTowers[3] == uiData)
+                    return;
+                if (uiData == FAIL)
+                    DoUseDoorOrButton(GO_MIMIRON_CRYSTAL);
+                m_auiUlduarTowers[3] = uiData;
+                break;
+
+                // Other types - not saved
+            case TYPE_LEVIATHAN_GAUNTLET:
+                m_uiGauntletStatus = uiData;
+                return;
+            case TYPE_ACHIEV_SHADOWDODGER:
+            case TYPE_ACHIEV_DRIVE_CRAZY:
+            case TYPE_ACHIEV_BACK_NATURE:
+            case TYPE_ACHIEV_LIGHTNING:
+            case TYPE_ACHIEV_COOL_FRIENDS:
+            case TYPE_ACHIEV_CHEESE_FREEZE:
+            case TYPE_ACHIEV_DISARMED:
+            case TYPE_ACHIEV_OPEN_ARMS:
+            case TYPE_ACHIEV_LOOKS_KILL:
+            case TYPE_ACHIEV_RUBBLE:
+            case TYPE_ACHIEV_NERF_ENG:
+            case TYPE_ACHIEV_SHUTOUT:
+            case TYPE_ACHIEV_QUICK_SHAVE:
+            case TYPE_ACHIEV_SHATTERED:
+            case TYPE_ACHIEV_STUNNED:
+            case TYPE_ACHIEV_MOLGEIM:
+            case TYPE_ACHIEV_BRUNDIR:
+            case TYPE_ACHIEV_STEELBREAKER:
+            case TYPE_ACHIEV_NINE_LIVES:
+            case TYPE_ACHIEV_CAT_LADY:
+                SetSpecialAchievementCriteria(uiType - TYPE_ACHIEV_CAT_LADY, bool(uiData));
+                return;
+            case TYPE_DO_SHATTERED_EVENT:
+                DoProcessShatteredEvent();
+                return;
+            case TYPE_DO_MOVE_DEFENDERS:
+                for (GuidList::const_iterator itr = m_lDefendersGuids.begin(); itr != m_lDefendersGuids.end(); ++itr)
+                {
+                    if (Creature* pDefender = instance->GetCreature(*itr))
+                    {
+                        pDefender->CastSpell(pDefender, SPELL_THREAT, true);
+                        pDefender->SetWalk(false);
+                        pDefender->GetMotionMaster()->MoveWaypoint();
+                    }
+                }
+                return;
+            case TYPE_DATA_CURRENT_HARPOON:
+                m_uiRazorCurrentHarpoon = uint8(uiData);
+                return;
+            case TYPE_DO_MOVE_TO_HARPOON:
+                if (GameObject* pHarpoon = instance->GetGameObject(m_vBrokenHarpoonsGuids[m_uiRazorCurrentHarpoon]))
+                {
+                    ++m_uiRazorCurrentHarpoon;
+                    float fX, fY, fZ;
+                    uint8 uiIndex = 1;
+                    for (GuidList::const_iterator itr = m_lEngineersGuids.begin(); itr != m_lEngineersGuids.end(); ++itr)
+                    {
+                        if (Creature* pEngineer = instance->GetCreature(*itr))
+                        {
+                            pHarpoon->GetNearPoint(pHarpoon, fX, fY, fZ, 0, INTERACTION_DISTANCE, M_PI_F / 4 * uiIndex);
+
+                            // ToDo: maybe there should be some emotes here
+                            pEngineer->SetWalk(false);
+                            pEngineer->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                            ++uiIndex;
+                        }
+                    }
+                }
+                return;
+            case TYPE_DO_HARPOONS_OK:
+                for (GuidList::const_iterator itr = m_lEngineersGuids.begin(); itr != m_lEngineersGuids.end(); ++itr)
+                {
+                    if (Creature* pEngineer = instance->GetCreature(*itr))
+                        pEngineer->GetMotionMaster()->MoveTargetedHome();
+                }
+                return;
+            case TYPE_DO_TRAPPERS_MOVE:
+                if (Creature* pController = GetSingleCreatureFromStorage(NPC_RAZORSCALE_CONTROLLER))
+                {
+                    float fX, fY, fZ;
+                    uint8 uiIndex = 5;
+                    uint32 uiSpeedRate = GetSingleCreatureFromStorage(NPC_RAZORSCALE)->GetSpeedRate(MOVE_RUN);
+                    for (GuidList::const_iterator itr = m_lTrappersGuids.begin(); itr != m_lTrappersGuids.end(); ++itr)
+                    {
+                        if (Creature* pTrapper = instance->GetCreature(*itr))
+                        {
+                            pController->GetNearPoint(pController, fX, fY, fZ, 0, 50.0f, M_PI_F / 4 * uiIndex);
+
+                            pTrapper->SetWalk(false);
+                            uiSpeedRate = pTrapper->GetSpeedRate(MOVE_RUN);
+                            pTrapper->SetSpeedRate(MOVE_RUN, SPEED_RATE_HELPERS);
+                            pTrapper->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                            pTrapper->SetSpeedRate(MOVE_RUN, uiSpeedRate);
+                            ++uiIndex;
+                        }
+                    }
+                    // yell that Razor is grounded
+                    if (Creature* pCommander = GetSingleCreatureFromStorage(NPC_EXPEDITION_COMMANDER))
+                        DoScriptText(SAY_GROUNDED, pCommander);
+                }
+                return;
+            case TYPE_DO_TRAPPERS_CAST:
+                if (Creature* razorscale = GetSingleCreatureFromStorage(NPC_RAZORSCALE))
+                {
+                    for (GuidList::const_iterator itr = m_lTrappersGuids.begin(); itr != m_lTrappersGuids.end(); ++itr)
+                    {
+                        if (Creature* pTrapper = instance->GetCreature(*itr))
+                            pTrapper->CastSpell(razorscale, uiData, false);
+                    }
+                }
+                return;
+            case TYPE_DO_TRAPPERS_EVADE:
+                for (GuidList::const_iterator itr = m_lTrappersGuids.begin(); itr != m_lTrappersGuids.end(); ++itr)
+                {
+                    if (Creature* pTrapper = instance->GetCreature(*itr))
+                        pTrapper->AI()->EnterEvadeMode();
+                }
+                return;
+            case TYPE_DO_THORIM_SPAWN_PACK:
+                if (Creature* thorim = GetSingleCreatureFromStorage(NPC_THORIM))
+                {
+                    std::vector<Creature*> vBunnies;
+                    for (GuidList::const_iterator itr = m_lUpperBunniesGuids.begin(); itr != m_lUpperBunniesGuids.end(); ++itr)
+                    {
+                        if (Creature* pBunny = instance->GetCreature(*itr))
+                            vBunnies.push_back(pBunny);
+                    }
+                    std::random_shuffle(vBunnies.begin(), vBunnies.end());
+
+                    uint8 uiMaxCommoners = urand(6, 7);
+                    if (uiMaxCommoners > vBunnies.size() - 1)
+                        uiMaxCommoners = vBunnies.size();
+
+                    for (uint8 i = 0; i < uiMaxCommoners; ++i)
+                        thorim->SummonCreature(NPC_DARK_RUNE_COMMONER, vBunnies[i]->GetPositionX(), vBunnies[i]->GetPositionY(), vBunnies[i]->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+                return;
+            case TYPE_DATA_THORIM_SMASH_SIDE:
+                m_bSmashSide = bool(uiData);
+                return;
+            case TYPE_DATA_THORIM_SMASHINDEX:
+                m_uiThorimSmashIndex = uint8(uiData);
+                return;
+            case TYPE_DO_YOGG_DESPAWN_CLOUDS:
+                for (GuidList::const_iterator itr = m_lOminousCloudsGuids.begin(); itr != m_lOminousCloudsGuids.end(); ++itr)
+                {
+                    if (Creature* pCloud = instance->GetCreature(*itr))
+                        pCloud->ForcedDespawn();
+                }
+                return;
+            }
+
+            if (uiData == DONE || uiData == FAIL || uiData == SPECIAL || uiType == TYPE_ALGALON_TIMER)
+            {
+                OUT_SAVE_INST_DATA;
+
+                // Save all encounters, hard bosses, keepers and teleporters
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6] << " " << m_auiEncounter[7] << " " << m_auiEncounter[8] << " "
+                    << m_auiEncounter[9] << " " << m_auiEncounter[10] << " " << m_auiEncounter[11] << " "
+                    << m_auiEncounter[12] << " " << m_auiEncounter[13] << " " << m_auiEncounter[14] << " "
+                    << m_auiEncounter[15] << " " << m_auiUlduarKeepers[0] << " " << m_auiUlduarKeepers[1] << " "
+                    << m_auiUlduarKeepers[2] << " " << m_auiUlduarKeepers[3] << " " << m_auiUlduarTowers[0] << " "
+                    << m_auiUlduarTowers[1] << " " << m_auiUlduarTowers[2] << " " << m_auiUlduarTowers[3];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case TYPE_LEVIATHAN:
+                return m_auiEncounter[0];
+            case TYPE_IGNIS:
+                return m_auiEncounter[1];
+            case TYPE_RAZORSCALE:
+                return m_auiEncounter[2];
+            case TYPE_XT002:
+                return m_auiEncounter[3];
+            case TYPE_ASSEMBLY:
+                return m_auiEncounter[4];
+            case TYPE_KOLOGARN:
+                return m_auiEncounter[5];
+            case TYPE_AURIAYA:
+                return m_auiEncounter[6];
+            case TYPE_MIMIRON:
+                return m_auiEncounter[7];
+            case TYPE_HODIR:
+                return m_auiEncounter[8];
+            case TYPE_THORIM:
+                return m_auiEncounter[9];
+            case TYPE_FREYA:
+                return m_auiEncounter[10];
+            case TYPE_VEZAX:
+                return m_auiEncounter[11];
+            case TYPE_YOGGSARON:
+                return m_auiEncounter[12];
+            case TYPE_ALGALON:
+                return m_auiEncounter[13];
+            case TYPE_ALGALON_TIMER:
+                return m_auiEncounter[14];
+            case TYPE_CHAMPION_FAILED:
+                return m_auiEncounter[15];
+
+                // Hard modes
+            case TYPE_LEVIATHAN_HARD:
+                return m_auiHardBoss[0];
+            case TYPE_XT002_HARD:
+                return m_auiHardBoss[1];
+            case TYPE_HODIR_HARD:
+                return m_auiHardBoss[2];
+            case TYPE_THORIM_HARD:
+                return m_auiHardBoss[3];
+            case TYPE_MIMIRON_HARD:
+                return m_auiHardBoss[4];
+            case TYPE_FREYA_HARD:
+                return m_auiHardBoss[5];
+            case TYPE_VEZAX_HARD:
+                return m_auiHardBoss[6];
+            case TYPE_YOGGSARON_HARD:
+                return m_auiHardBoss[7];
+
+                // Ulduar Keepers
+            case TYPE_KEEPER_HODIR:
+                return m_auiUlduarKeepers[0];
+            case TYPE_KEEPER_THORIM:
+                return m_auiUlduarKeepers[1];
+            case TYPE_KEEPER_FREYA:
+                return m_auiUlduarKeepers[2];
+            case TYPE_KEEPER_MIMIRON:
+                return m_auiUlduarKeepers[3];
+
+                // Ulduar Towers
+            case TYPE_TOWER_HODIR:
+                return m_auiUlduarTowers[0];
+            case TYPE_TOWER_THORIM:
+                return m_auiUlduarTowers[1];
+            case TYPE_TOWER_FREYA:
+                return m_auiUlduarTowers[2];
+            case TYPE_TOWER_MIMIRON:
+                return m_auiUlduarTowers[3];
+
+            case TYPE_LEVIATHAN_GAUNTLET:
+                return m_uiGauntletStatus;
+            case TYPE_DATA_CURRENT_HARPOON:
+                return m_uiRazorCurrentHarpoon;
+            }
+
+            return 0;
+        }
+
+        uint64 GetData64(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case DATA64_VEZAX_ANIMUS:
+                return m_animusVezaxBunnyGuid.GetRawValue();
+            case DATA64_VEZAX_VAPOR:
+                return m_vaporVezaxBunnyGuid.GetRawValue();
+            case DATA64_KOLO_STALKER_RIGHT:
+                return m_rightKoloStalkerGuid.GetRawValue();
+            case DATA64_KOLO_STALKER_LEFT:
+                return m_leftKoloStalkerGuid.GetRawValue();
+            case DATA64_BROKEN_HARPOON:
+                if (m_uiRazorCurrentHarpoon > 0)
+                    return m_vBrokenHarpoonsGuids[m_uiRazorCurrentHarpoon - 1].GetRawValue();
+            case DATA64_THORIM_RANDOM_ORB:
+                if (!m_lUpperThunderOrbsGuids.empty())
+                {
+                    GuidList::const_iterator iter = m_lUpperThunderOrbsGuids.begin();
+                    advance(iter, urand(0, m_lUpperThunderOrbsGuids.size() - 1));
+
+                    return (*iter).GetRawValue();
+                }
+                break;
+            case DATA64_RANDOM_UPPER_BUNNY:
+                if (!m_lUpperBunniesGuids.empty())
+                {
+                    GuidList::const_iterator iter = m_lUpperBunniesGuids.begin();
+                    advance(iter, urand(0, m_lUpperBunniesGuids.size() - 1));
+
+                    return (*iter).GetRawValue();
+                }
+                break;
+            case DATA64_THORIM_BUNNY:
+                if (!m_lThorimBunniesGuids.empty())
+                {
+                    if (Creature* pSource = instance->GetCreature(m_thorimCreature))
+                    {
+                        std::list<Creature*> lBunnies;
+                        for (GuidList::const_iterator itr = m_lThorimBunniesGuids.begin(); itr != m_lThorimBunniesGuids.end(); ++itr)
+                        {
+                            if (Creature* pBunny = instance->GetCreature(*itr))
+                                lBunnies.push_back(pBunny);
+                        }
+
+                        lBunnies.sort(ObjectDistanceOrder(pSource));
+                        return lBunnies.front()->GetObjectGuid().GetRawValue();
+                    }
+                }
+                break;
+            case DATA64_XT_TOY_PILE:
+                return m_vToyPileGuidVector[urand(0, m_vToyPileGuidVector.size() - 1)].GetRawValue();
+            default:
+                break;
+            }
+            return 0;
+        }
+
+        void SetData64(uint32 uiType, uint64 uiData) override
+        {
+            switch (uiType)
+            {
+            case DATA64_THORIM_TRIGGERED_BY:
+                DoSpawnThorimNpcs(ObjectGuid(uiData));
+                break;
+            case DATA64_THORIM_BUNNY:
+                m_thorimCreature = ObjectGuid(uiData);
+                break;
+            case DATA64_THORIM_SMASH_CASTER:
+                if (Creature* m_creature = instance->GetCreature(ObjectGuid(uiData)))
+                {
+                    GuidList* m_lCurrentSmashBunnies = m_bSmashSide ? &m_lLeftHandBunniesGuids : &m_lRightHandBunniesGuids;
+                    for (GuidList::const_iterator itr = m_lCurrentSmashBunnies->begin(); itr != m_lCurrentSmashBunnies->end(); ++itr)
+                    {
+                        if (Creature* pBunny = m_creature->GetMap()->GetCreature(*itr))
+                        {
+                            // use 12 and 16 as multipliers in order to get the perfect combination
+                            if (pBunny->GetPositionY() > m_creature->GetPositionY() + 12 * m_uiThorimSmashIndex &&
+                                pBunny->GetPositionY() < m_creature->GetPositionY() + 16 * m_uiThorimSmashIndex)
+                                pBunny->CastSpell(pBunny, SPELL_RUNIC_SMASH, false);
+                        }
+                    }
+                }
+                break;
+            default:
+                break;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* strIn) override
+        {
+            if (!strIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(strIn);
+
+            std::istringstream loadStream(strIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7]
+                >> m_auiEncounter[8] >> m_auiEncounter[9] >> m_auiEncounter[10] >> m_auiEncounter[11]
+                >> m_auiEncounter[12] >> m_auiEncounter[13] >> m_auiEncounter[14] >> m_auiEncounter[15]
+                >> m_auiUlduarKeepers[0] >> m_auiUlduarKeepers[1] >> m_auiUlduarKeepers[2] >> m_auiUlduarKeepers[3]
+                >> m_auiUlduarTowers[0] >> m_auiUlduarTowers[1] >> m_auiUlduarTowers[2] >> m_auiUlduarTowers[3];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+            case ACHIEV_CRIT_SARONITE_N:
+            case ACHIEV_CRIT_SARONITE_H:
+                return GetData(TYPE_VEZAX_HARD) == DONE;
+            case ACHIEV_CRIT_SHADOWDODGER_N:
+            case ACHIEV_CRIT_SHADOWDODGER_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_SHADOWDODGER - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_CAT_LADY_N:
+            case ACHIEV_CRIT_CAT_LADY_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_CAT_LADY - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_NINE_LIVES_N:
+            case ACHIEV_CRIT_NINE_LIVES_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_NINE_LIVES - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_BRUNDIR_N:
+            case ACHIEV_CRIT_BRUNDIR_H:
+                if (GetData(TYPE_ASSEMBLY) == SPECIAL)
+                    return m_abAchievCriteria[TYPE_ACHIEV_BRUNDIR - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_MOLGEIM_N:
+            case ACHIEV_CRIT_MOLGEIM_H:
+                if (GetData(TYPE_ASSEMBLY) == SPECIAL)
+                    return m_abAchievCriteria[TYPE_ACHIEV_MOLGEIM - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_STEELBREAKER_N:
+            case ACHIEV_CRIT_STEELBREAKER_H:
+                if (GetData(TYPE_ASSEMBLY) == SPECIAL)
+                    return m_abAchievCriteria[TYPE_ACHIEV_STEELBREAKER - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_STUNNED_BRUND_N:
+            case ACHIEV_CRIT_STUNNED_STEEL_N:
+            case ACHIEV_CRIT_STUNNED_MOLG_N:
+            case ACHIEV_CRIT_STUNNED_BRUND_H:
+            case ACHIEV_CRIT_STUNNED_STEEL_H:
+            case ACHIEV_CRIT_STUNNED_MOLG_H:
+                if (GetData(TYPE_ASSEMBLY) == SPECIAL)
+                    return m_abAchievCriteria[TYPE_ACHIEV_STUNNED - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_SHATTERED_N:
+            case ACHIEV_CRIT_SHATTERED_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_SHATTERED - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_HEARTBREAKER_N:
+            case ACHIEV_CRIT_HEARTBREAKER_H:
+                return GetData(TYPE_XT002_HARD) == DONE;
+            case ACHIEV_CRIT_QUICK_SHAVE_N:
+            case ACHIEV_CRIT_QUICK_SHAVE_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_QUICK_SHAVE - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_SHUTOUT_N:
+            case ACHIEV_CRIT_SHUTOUT_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_SHUTOUT - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_ORB_BOMB_N:
+            case ACHIEV_CRIT_ORB_BOMB_H:
+                return GetData(TYPE_LEVIATHAN_HARD) >= 1;
+            case ACHIEV_CRIT_ORB_DEV_N:
+            case ACHIEV_CRIT_ORB_DEV_H:
+                return GetData(TYPE_LEVIATHAN_HARD) >= 2;
+            case ACHIEV_CRIT_ORB_NUKED_N:
+            case ACHIEV_CRIT_ORB_NUKED_H:
+                return GetData(TYPE_LEVIATHAN_HARD) >= 3;
+            case ACHIEV_CRIT_ORBITUARY_N:
+            case ACHIEV_CRIT_ORBITUARY_H:
+                return GetData(TYPE_LEVIATHAN_HARD) == 4;
+            case ACHIEV_CRIT_NERF_ENG_N:
+            case ACHIEV_CRIT_NERF_ENG_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_NERF_ENG - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_RUBBLE_ROLL_N:
+            case ACHIEV_CRIT_RUBBLE_ROLL_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_RUBBLE - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_LOOKS_KILL_N:
+            case ACHIEV_CRIT_LOOKS_KILL_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_LOOKS_KILL - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_OPEN_ARMS_N:
+            case ACHIEV_CRIT_OPEN_ARMS_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_OPEN_ARMS - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_DISARMED_N:
+            case ACHIEV_CRIT_DISARMED_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_DISARMED - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_RARE_CACHE_N:
+            case ACHIEV_CRIT_RARE_CACHE_H:
+                return GetData(TYPE_HODIR_HARD) == DONE;
+            case ACHIEV_CRIT_CHEESE_N:
+            case ACHIEV_CRIT_CHEESE_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_CHEESE_FREEZE - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_COOL_FRIENDS_N:
+            case ACHIEV_CRIT_COOL_FRIENDS_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_COOL_FRIENDS - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_LOSE_ILLUSION_N:
+            case ACHIEV_CRIT_LOSE_ILLUSION_H:
+                return GetData(TYPE_THORIM_HARD) == DONE;
+            case ACHIEV_CRIT_LIGHTNING_N:
+            case ACHIEV_CRIT_LIGHTNING_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_LIGHTNING - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_BACK_NATURE_N:
+            case ACHIEV_CRIT_BACK_NATURE_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_BACK_NATURE - TYPE_ACHIEV_CAT_LADY];
+            case ACHIEV_CRIT_KNOCK_1_N:
+            case ACHIEV_CRIT_KNOCK_1_H:
+                return GetData(TYPE_FREYA_HARD) >= 1;
+            case ACHIEV_CRIT_KNOCK_2_N:
+            case ACHIEV_CRIT_KNOCK_2_H:
+                return GetData(TYPE_FREYA_HARD) >= 2;
+            case ACHIEV_CRIT_KNOCK_3_N:
+            case ACHIEV_CRIT_KNOCK_3_H:
+                return GetData(TYPE_FREYA_HARD) == 3;
+            case ACHIEV_CRIT_FIREFIGHTER_N:
+            case ACHIEV_CRIT_FIREFIGHTER_H:
+                return GetData(TYPE_MIMIRON_HARD) == DONE;
+            case ACHIEV_CRIT_THREE_LIGHTS_N:
+            case ACHIEV_CRIT_THREE_LIGHTS_H:
+                return GetData(TYPE_YOGGSARON_HARD) <= 3;
+            case ACHIEV_CRIT_TWO_LIGHTS_N:
+            case ACHIEV_CRIT_TWO_LIGHTS_H:
+                return GetData(TYPE_YOGGSARON_HARD) <= 2;
+            case ACHIEV_CRIT_ONE_LIGHT_N:
+            case ACHIEV_CRIT_ONE_LIGHT_H:
+                return GetData(TYPE_YOGGSARON_HARD) <= 1;
+            case ACHIEV_CRIT_ALONE_DARK_N:
+            case ACHIEV_CRIT_ALONE_DARK_H:
+                return GetData(TYPE_YOGGSARON_HARD) == 0;
+            case ACHIEV_CRIT_DRIVE_CRAZY_N:
+            case ACHIEV_CRIT_DRIVE_CRAZY_H:
+                return m_abAchievCriteria[TYPE_ACHIEV_DRIVE_CRAZY - TYPE_ACHIEV_CAT_LADY];
+                // Champion / Conquerer of Ulduar
+            case ACHIEV_CRIT_CHAMP_LEVI:
+            case ACHIEV_CRIT_CHAMP_RAZOR:
+            case ACHIEV_CRIT_CHAMP_XT:
+            case ACHIEV_CRIT_CHAMP_IGNIS:
+            case ACHIEV_CRIT_CHAMP_MIMIRON:
+            case ACHIEV_CRIT_CHAMP_KOLO:
+            case ACHIEV_CRIT_CHAMP_VEZAX:
+            case ACHIEV_CRIT_CHAMP_YOGG:
+            case ACHIEV_CRIT_CHAMP_AURIAYA:
+            case ACHIEV_CRIT_CHAMP_THORIM:
+            case ACHIEV_CRIT_CHAMP_HODIR:
+            case ACHIEV_CRIT_CHAMP_FREYA:
+            case ACHIEV_CRIT_CHAMP_COUNCIL:
+            case ACHIEV_CRIT_CONQ_LEVI:
+            case ACHIEV_CRIT_CONQ_RAZOR:
+            case ACHIEV_CRIT_CONQ_XT:
+            case ACHIEV_CRIT_CONQ_IGNIS:
+            case ACHIEV_CRIT_CONQ_KOLO:
+            case ACHIEV_CRIT_CONQ_MIMIRON:
+            case ACHIEV_CRIT_CONQ_VEZAX:
+            case ACHIEV_CRIT_CONQ_AURIAYA:
+            case ACHIEV_CRIT_CONQ_YOGG:
+            case ACHIEV_CRIT_CONQ_THORIM:
+            case ACHIEV_CRIT_CONQ_FREYA:
+            case ACHIEV_CRIT_CONQ_COUNCIL:
+            case ACHIEV_CRIT_CONQ_HODIR:
+            {
+                // First, check if all bosses are killed (except the last encounter)
+                uint8 uiEncounterDone = 0;
+                for (uint8 i = 0; i < TYPE_YOGGSARON; ++i)
+                if (m_auiEncounter[i] == DONE)
+                    ++uiEncounterDone;
+
+                return uiEncounterDone >= 13 && GetData(TYPE_CHAMPION_FAILED) != DONE;
+            }
+
+            default:
+                return false;
+            }
+        }
+
+        bool CheckConditionCriteriaMeet(Player const* pPlayer, uint32 uiInstanceConditionId, WorldObject const* pConditionSource, uint32 conditionSourceType) const override
+        {
+            switch (uiInstanceConditionId)
+            {
+            case INSTANCE_CONDITION_ID_NORMAL_MODE:
+            case INSTANCE_CONDITION_ID_HARD_MODE:
+            case INSTANCE_CONDITION_ID_HARD_MODE_2:
+            case INSTANCE_CONDITION_ID_HARD_MODE_3:
+            case INSTANCE_CONDITION_ID_HARD_MODE_4:
+            {
+                if (!pConditionSource)
+                    break;
+
+                uint32 uiCondId = 0;
+                switch (pConditionSource->GetEntry())
+                {
+                case NPC_LEVIATHAN:
+                    uiCondId = GetData(TYPE_LEVIATHAN_HARD);
+                    break;
+                case NPC_XT002:
+                    if (GetData(TYPE_XT002_HARD) == DONE)
+                        uiCondId = 1;
+                    break;
+                case NPC_VEZAX:
+                    if (GetData(TYPE_VEZAX_HARD) == DONE)
+                        uiCondId = 1;
+                    break;
+                case NPC_YOGGSARON:
+                    uiCondId = 4 - GetData(TYPE_YOGGSARON_HARD);
+                    break;
+                }
+
+                return uiCondId == uiInstanceConditionId;
+            }
+            case INSTANCE_CONDITION_ID_ULDUAR:
+                if (!pConditionSource)
+                    break;
+
+                // handle vehicle spell clicks - are available only after the gauntlet was started by gossip or when Leviathan is active
+                return GetData(TYPE_LEVIATHAN_GAUNTLET) == IN_PROGRESS || GetData(TYPE_LEVIATHAN) == SPECIAL || GetData(TYPE_LEVIATHAN) == FAIL;
+            }
+
+            script_error_log("instance_ulduar::CheckConditionCriteriaMeet called with unsupported Id %u. Called with param plr %s, src %s, condition source type %u",
+                uiInstanceConditionId, pPlayer ? pPlayer->GetGuidStr().c_str() : "NULL", pConditionSource ? pConditionSource->GetGuidStr().c_str() : "NULL", conditionSourceType);
+            return false;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (GetData(TYPE_IGNIS) == IN_PROGRESS)
+            {
+                if (m_uiShatterAchievTimer)
+                {
+                    // Just set the timer to 0 when it expires
+                    if (m_uiShatterAchievTimer <= uiDiff)
+                        m_uiShatterAchievTimer = 0;
+                    else
+                        m_uiShatterAchievTimer -= uiDiff;
+                }
+            }
+
+            if (GetData(TYPE_ALGALON_TIMER))
+            {
+                if (m_uiAlgalonTimer <= uiDiff)
+                {
+                    --m_auiEncounter[TYPE_ALGALON_TIMER];
+                    SetData(TYPE_ALGALON_TIMER, m_auiEncounter[TYPE_ALGALON_TIMER]);
+                    m_uiAlgalonTimer = MINUTE * IN_MILLISECONDS;
+
+                    if (m_auiEncounter[TYPE_ALGALON_TIMER] == 0)
+                        SetData(TYPE_ALGALON, FAIL);
+                }
+                else
+                    m_uiAlgalonTimer -= uiDiff;
+            }
+
+            if (m_uiYoggResetTimer)
+            {
+                if (m_uiYoggResetTimer <= uiDiff)
+                {
+                    // reset encounter
+                    for (GuidList::const_iterator itr = m_lOminousCloudsGuids.begin(); itr != m_lOminousCloudsGuids.end(); ++itr)
+                    {
+                        if (Creature* pCloud = instance->GetCreature(*itr))
+                            pCloud->Respawn();
+                    }
+
+                    if (Creature* pVoice = GetSingleCreatureFromStorage(NPC_VOICE_OF_YOGG))
+                        pVoice->Respawn();
+                    if (Creature* pSara = GetSingleCreatureFromStorage(NPC_SARA))
+                        pSara->Respawn();
+                    if (Creature* pBrain = GetSingleCreatureFromStorage(NPC_YOGG_BRAIN))
+                        pBrain->Respawn();
+
+                    m_uiYoggResetTimer = 0;
+                }
+                else
+                    m_uiYoggResetTimer -= uiDiff;
+            }
+
+            if (m_uiStairsSpawnTimer)
+            {
+                if (m_uiStairsSpawnTimer <= uiDiff)
+                {
+                    // Note: this part involves a lot of guesswork
+                    // These are the stairs npcs which are summoned before engaging the Rune Giant; both npcs have waypoint movement
+                    if (Creature* pGiant = GetSingleCreatureFromStorage(NPC_RUNE_GIANT))
+                    {
+                        if (urand(0, 1))
+                            pGiant->SummonCreature(NPC_HONOR_GUARD_STAIRS, 2101.2f, -434.135f, 438.331f, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                        else
+                            pGiant->SummonCreature(NPC_RUNE_ACOLYTE_STAIRS, 2100.41f, -446.712f, 438.331f, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                    }
+                    m_uiStairsSpawnTimer = urand(20000, 30000);
+                }
+                else
+                    m_uiStairsSpawnTimer -= uiDiff;
+            }
+        }
+
+    private:
+        void SetSpecialAchievementCriteria(uint32 uiType, bool bIsMet)
+        {
+            if (uiType < MAX_SPECIAL_ACHIEV_CRITS)
+                m_abAchievCriteria[uiType] = bIsMet;
+        }
+
+        void DoProcessShatteredEvent()
+        {
+            // If timer is already running set achiev criteria to true, else start the timer
+            if (m_uiShatterAchievTimer)
+                SetSpecialAchievementCriteria(TYPE_ACHIEV_SHATTERED, true);
+            else
+                m_uiShatterAchievTimer = 5000;
+        }
+
+        void DoSpawnThorimNpcs(ObjectGuid plGuid)
+        {
+            if (GetData(TYPE_THORIM) != DONE)
+            {
+                if (Player* pSummoner = instance->GetPlayer(plGuid))
+                for (uint8 i = 0; i < countof(afThorimSpawns); ++i)
+                    pSummoner->SummonCreature(pSummoner->GetTeam() == ALLIANCE ? afThorimSpawns[i].uiAllyEntry : afThorimSpawns[i].uiHordeEntry, afThorimSpawns[i].fX, afThorimSpawns[i].fY, afThorimSpawns[i].fZ, afThorimSpawns[i].fO, TEMPSUMMON_DEAD_DESPAWN, 0, true);
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case SAY_PRE_LEVIATHAN_1:
+            case SAY_PRE_LEVIATHAN_2:
+            case SAY_PRE_LEVIATHAN_3:
+                DoOrSimulateScriptTextForThisInstance(iEntry, NPC_BRONZEBEARD_RADIO);
+                break;
+            case NPC_LEVIATHAN:
+                // move the leviathan in the arena
+                if (Creature* pLeviathan = GetSingleCreatureFromStorage(NPC_LEVIATHAN))
+                {
+                    // the boss has increased speed for this move; handled as custom
+                    float fSpeedRate = pLeviathan->GetSpeedRate(MOVE_RUN);
+                    pLeviathan->SetWalk(false);
+                    pLeviathan->SetSpeedRate(MOVE_RUN, 5);
+                    pLeviathan->GetMotionMaster()->MovePoint(1, afLeviathanMovePos[0], afLeviathanMovePos[1], afLeviathanMovePos[2]);
+                    pLeviathan->SetSpeedRate(MOVE_RUN, fSpeedRate);
+
+                    // modify respawn / home position to the center of arena
+                    pLeviathan->SetRespawnCoord(afLeviathanMovePos[0], afLeviathanMovePos[1], afLeviathanMovePos[2], afLeviathanMovePos[3]);
+                }
+
+                // Note: starting 4.x this gate is a GO 33 and it's destroyed at this point
+                DoUseDoorOrButton(GO_LEVIATHAN_GATE);
+                break;
+            }
+        }
+
+        // Spawn the friendly keepers in the central chamber
+        void SpawnFriendlyKeeper(uint32 uiWho)
+        {
+            Player* pPlayer = GetPlayerInMap();
+            if (!pPlayer)
+                return;
+
+            switch (uiWho)
+            {
+            case NPC_KEEPER_MIMIRON: pPlayer->SummonCreature(uiWho, m_aKeepersSpawnLocs[1].fX, m_aKeepersSpawnLocs[1].fY, m_aKeepersSpawnLocs[1].fZ, m_aKeepersSpawnLocs[1].fO, TEMPSUMMON_CORPSE_DESPAWN, 0, true); break;
+            case NPC_KEEPER_HODIR:   pPlayer->SummonCreature(uiWho, m_aKeepersSpawnLocs[2].fX, m_aKeepersSpawnLocs[2].fY, m_aKeepersSpawnLocs[2].fZ, m_aKeepersSpawnLocs[2].fO, TEMPSUMMON_CORPSE_DESPAWN, 0, true); break;
+            case NPC_KEEPER_THORIM:  pPlayer->SummonCreature(uiWho, m_aKeepersSpawnLocs[3].fX, m_aKeepersSpawnLocs[3].fY, m_aKeepersSpawnLocs[3].fZ, m_aKeepersSpawnLocs[3].fO, TEMPSUMMON_CORPSE_DESPAWN, 0, true); break;
+            case NPC_KEEPER_FREYA:   pPlayer->SummonCreature(uiWho, m_aKeepersSpawnLocs[0].fX, m_aKeepersSpawnLocs[0].fY, m_aKeepersSpawnLocs[0].fZ, m_aKeepersSpawnLocs[0].fO, TEMPSUMMON_CORPSE_DESPAWN, 0, true); break;
+            }
+        }
+
+        // Spawn the keeper helpers for Yogg-Saron
+        void SpawnKeeperHelper(uint32 uiWho)
+        {
+            Player* pPlayer = GetPlayerInMap();
+            if (!pPlayer)
+                return;
+
+            switch (uiWho)
+            {
+            case NPC_MIMIRON_HELPER:
+                if (Creature* pKeeper = pPlayer->SummonCreature(uiWho, m_aKeeperHelperLocs[1].fX, m_aKeeperHelperLocs[1].fY, m_aKeeperHelperLocs[1].fZ, m_aKeeperHelperLocs[1].fO, TEMPSUMMON_CORPSE_DESPAWN, 0, true))
+                {
+                    DoScriptText(m_aKeeperHelperLocs[1].iText, pKeeper);
+                    pKeeper->CastSpell(pKeeper, SPELL_KEEPER_ACTIVE, false);
+                }
+                break;
+            case NPC_HODIR_HELPER:
+                if (Creature* pKeeper = pPlayer->SummonCreature(uiWho, m_aKeeperHelperLocs[2].fX, m_aKeeperHelperLocs[2].fY, m_aKeeperHelperLocs[2].fZ, m_aKeeperHelperLocs[2].fO, TEMPSUMMON_CORPSE_DESPAWN, 0, true))
+                {
+                    DoScriptText(m_aKeeperHelperLocs[2].iText, pKeeper);
+                    pKeeper->CastSpell(pKeeper, SPELL_KEEPER_ACTIVE, false);
+                }
+                break;
+            case NPC_THORIM_HELPER:
+                if (Creature* pKeeper = pPlayer->SummonCreature(uiWho, m_aKeeperHelperLocs[3].fX, m_aKeeperHelperLocs[3].fY, m_aKeeperHelperLocs[3].fZ, m_aKeeperHelperLocs[3].fO, TEMPSUMMON_CORPSE_DESPAWN, 0, true))
+                {
+                    DoScriptText(m_aKeeperHelperLocs[3].iText, pKeeper);
+                    pKeeper->CastSpell(pKeeper, SPELL_KEEPER_ACTIVE, false);
+                }
+                break;
+            case NPC_FREYA_HELPER:
+                if (Creature* pKeeper = pPlayer->SummonCreature(uiWho, m_aKeeperHelperLocs[0].fX, m_aKeeperHelperLocs[0].fY, m_aKeeperHelperLocs[0].fZ, m_aKeeperHelperLocs[0].fO, TEMPSUMMON_CORPSE_DESPAWN, 0, true))
+                {
+                    DoScriptText(m_aKeeperHelperLocs[0].iText, pKeeper);
+                    pKeeper->CastSpell(pKeeper, SPELL_KEEPER_ACTIVE, false);
+                }
+                break;
+            }
+        }
+
+        void DoSpawnHodirNpcs(Player* pSummoner)
+        {
+            if (GetData(TYPE_HODIR) != DONE)
+            {
+                for (uint8 i = 0; i < countof(afHodirHelpersNormal); ++i)
+                    pSummoner->SummonCreature(pSummoner->GetTeam() == ALLIANCE ? afHodirHelpersNormal[i].uiAllyEntry : afHodirHelpersNormal[i].uiHordeEntry, afHodirHelpersNormal[i].fX, afHodirHelpersNormal[i].fY, afHodirHelpersNormal[i].fZ, afHodirHelpersNormal[i].fO, TEMPSUMMON_DEAD_DESPAWN, 0, true);
+
+                if (!instance->IsRegularDifficulty())
+                {
+                    for (uint8 i = 0; i < countof(afHodirHelpersHeroic); ++i)
+                        pSummoner->SummonCreature(pSummoner->GetTeam() == ALLIANCE ? afHodirHelpersHeroic[i].uiAllyEntry : afHodirHelpersHeroic[i].uiHordeEntry, afHodirHelpersHeroic[i].fX, afHodirHelpersHeroic[i].fY, afHodirHelpersHeroic[i].fZ, afHodirHelpersHeroic[i].fO, TEMPSUMMON_DEAD_DESPAWN, 0, true);
+                }
+            }
+        }
+
+        // Used in order to unlock the door to Vezax
+        void DoOpenMadnessDoorIfCan()
+        {
+            if (m_auiEncounter[TYPE_MIMIRON] == DONE && m_auiEncounter[TYPE_HODIR] == DONE && m_auiEncounter[TYPE_THORIM] == DONE && m_auiEncounter[TYPE_FREYA] == DONE)
+                DoUseDoorOrButton(GO_ANCIENT_GATE);
+        }
+
+        // function which will handle the Flame Leviathan backup spawns
+        void DoCallLeviathanHelp()
+        {
+            Creature* pLeviathan = GetSingleCreatureFromStorage(NPC_LEVIATHAN);
+            if (!pLeviathan)
+                return;
+
+            for (uint8 i = 0; i < countof(afReinforcementsNormal); ++i)
+                pLeviathan->SummonCreature(afReinforcementsNormal[i].uiEntry, afReinforcementsNormal[i].fX, afReinforcementsNormal[i].fY, afReinforcementsNormal[i].fZ, afReinforcementsNormal[i].fO, TEMPSUMMON_DEAD_DESPAWN, 0, true);
+
+            if (!instance->IsRegularDifficulty())
+            {
+                for (uint8 i = 0; i < countof(afReinforcementsHeroic); ++i)
+                    pLeviathan->SummonCreature(afReinforcementsHeroic[i].uiEntry, afReinforcementsHeroic[i].fX, afReinforcementsHeroic[i].fY, afReinforcementsHeroic[i].fZ, afReinforcementsHeroic[i].fO, TEMPSUMMON_DEAD_DESPAWN, 0, true);
+            }
+        }
+
+        std::string m_strInstData;
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        uint32 m_auiHardBoss[HARD_MODE_ENCOUNTER];
+        uint32 m_auiUlduarKeepers[KEEPER_ENCOUNTER];
+        uint32 m_auiUlduarTowers[KEEPER_ENCOUNTER];
+        bool m_abAchievCriteria[MAX_SPECIAL_ACHIEV_CRITS];
+
+        bool m_bHelpersLoaded;
+        bool m_bSmashSide;
+
+        uint32 m_uiAlgalonTimer;
+        uint32 m_uiYoggResetTimer;
+        uint32 m_uiShatterAchievTimer;
+        uint32 m_uiGauntletStatus;
+        uint32 m_uiStairsSpawnTimer;
+        uint8 m_uiThorimSmashIndex;
+        uint8 m_uiSlayedArenaMobs;
+        uint8 m_uiRazorCurrentHarpoon;
+
+        ObjectGuid m_leftKoloStalkerGuid;
+        ObjectGuid m_rightKoloStalkerGuid;
+        ObjectGuid m_animusVezaxBunnyGuid;
+        ObjectGuid m_vaporVezaxBunnyGuid;
+        ObjectGuid m_thorimCreature;
+
+        GuidVector m_vToyPileGuidVector;
+        GuidVector m_vBrokenHarpoonsGuids;
+        GuidList m_lEngineersGuids;
+        GuidList m_lTrappersGuids;
+        GuidList m_lDefendersGuids;
+        GuidList m_lHarpoonDummyGuids;
+        GuidList m_lRepairedHarpoonsGuids;
+        GuidList m_lThorimBunniesGuids;
+        GuidList m_lUpperBunniesGuids;
+        GuidList m_lUpperThunderOrbsGuids;
+        GuidList m_lLeftHandBunniesGuids;
+        GuidList m_lRightHandBunniesGuids;
+        GuidList m_lOminousCloudsGuids;
+        GuidSet m_sColossusGuidSet;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_ulduar(pMap);
+    }
+};
+
+struct event_ulduar_spell_shatter : public MapEventScript   //EVENT_ID_SPELL_SHATTER
+{
+    event_ulduar_spell_shatter() : MapEventScript("event_ulduar_spell_shatter") {}
+
+    bool OnReceived(uint32 uiEventId, Object* pSource, Object* /*pTarget*/, bool /*bIsStart*/) override
+    {
+        if (pSource->GetTypeId() == TYPEID_UNIT)
+        {
+            if (InstanceData* pInstance = ((Creature*)pSource)->GetInstanceData())
+            {
+                pInstance->SetData(TYPE_DO_SHATTERED_EVENT, 0);
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+struct event_ulduar_shutdown : public MapEventScript    //EVENT_ID_SHUTDOWN
+{
+    event_ulduar_shutdown() : MapEventScript("event_ulduar_shutdown") {}
+
+    bool OnReceived(uint32 uiEventId, Object* pSource, Object* /*pTarget*/, bool /*bIsStart*/) override
+    {
+        if (pSource->GetTypeId() == TYPEID_UNIT)
+        {
+            if (InstanceData* pInstance = ((Creature*)pSource)->GetInstanceData())
+            {
+                pInstance->SetData(TYPE_ACHIEV_SHUTOUT, uint32(false));
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+struct event_ulduar_scrap_repair : public MapEventScript    //EVENT_ID_SCRAP_REPAIR
+{
+    event_ulduar_scrap_repair() : MapEventScript("event_ulduar_scrap_repair") {}
+
+    bool OnReceived(uint32 uiEventId, Object* pSource, Object* /*pTarget*/, bool /*bIsStart*/) override
+    {
+        if (pSource->GetTypeId() == TYPEID_UNIT)
+        {
+            if (InstanceData* pInstance = ((Creature*)pSource)->GetInstanceData())
+            {
+                pInstance->SetData(TYPE_ACHIEV_NERF_ENG, uint32(false));
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+void AddSC_instance_ulduar()
+{
+    Script* s;
+
+    s = new is_ulduar();
+    s->RegisterSelf();
+
+    s = new event_ulduar_spell_shatter();
+    s->RegisterSelf();
+    s = new event_ulduar_shutdown();
+    s->RegisterSelf();
+    s = new event_ulduar_scrap_repair();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_ulduar";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_ulduar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_ulduar";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_ulduar;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/ulduar.cpp b/src/modules/SD3/scripts/northrend/ulduar/ulduar/ulduar.cpp
new file mode 100644
index 000000000..da11b0134
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/ulduar.cpp
@@ -0,0 +1,689 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: ulduar
+SD%Complete: 70%
+SDComment: Teleporters are hacked until solved in core
+SDCategory: Ulduar
+EndScriptData */
+
+/* ContentData
+go_ulduar_teleporter
+npc_brann_ulduar
+npc_keeper_norgannon
+event_go_ulduar_tower
+npc_storm_tempered_keeper
+npc_charged_sphere
+npc_ulduar_keeper
+EndContentData */
+
+#include "precompiled.h"
+#include "ulduar.h"
+
+/*#####
+## go_ulduar_teleporter
+#####*/
+
+/* ****
+* The teleporter spells cannot be used atm, because target-type TARGET_SCRIPT_COORDINATES, NO_TARGET is not yet suitable for needed targeting. (Current core-Design)
+* All teleporters are GO with entry 194569 - on them are npcs of entry 32780 spawned.
+* However for reload case we would need to be able to target these npcs of not yet loaded grids (currently impossible)
+* And in general we would need some "good" way of selecting appropriate target-npcs for each spell, but sorting is nearly impossible, as there are > 50 of these npcs spawned in Ulduar
+
+* So --  TODO -- remove the TeleportTo Hacks when correct target selection for this spell is working.
+*/
+
+enum TeleporterSpells
+{
+    SPELL_TELE_EXPEDITION_BASE_CAMP         = 64014,
+    SPELL_TELE_FORMATION_GROUNDS            = 64032,
+    SPELL_TELE_COLOSSAL_FORGE               = 64028,
+    SPELL_TELE_SCRAPYARD                    = 64031,
+    SPELL_TELE_ANTECHAMBER_OF_ULDUAR        = 64030,
+    SPELL_TELE_SHATTERED_WALKWAY            = 64029,
+    SPELL_TELE_CONSERVATORY_OF_LIFE         = 64024,
+    SPELL_TELE_SPARK_OF_IMAGINATION         = 65061,
+    SPELL_TELE_PRISON_OF_YOGG               = 65042,
+};
+
+// Teleporter Gossip handled by SD3 because depending on Instance Data
+enum TeleporterGossipItems
+{
+    GOSSIP_ITEM_TELE_BASE_CAMP              = -3603000,
+    GOSSIP_ITEM_TELE_FORMATION_GROUNDS      = -3603001,
+    GOSSIP_ITEM_TELE_COLOSSAL_FORGE         = -3603002,
+    GOSSIP_ITEM_TELE_SCRAPYARD              = -3603003,
+    GOSSIP_ITEM_TELE_ANTECHAMBER            = -3603004,
+    GOSSIP_ITEM_TELE_WALKWAY                = -3603005,
+    GOSSIP_ITEM_TELE_CONSERVATORY           = -3603006,
+    GOSSIP_ITEM_TELE_SPARK_IMAGINATION      = -3603007,
+    GOSSIP_ITEM_TELE_YOGG_SARON             = -3603008,
+};
+
+struct go_ulduar_teleporter : public GameObjectScript
+{
+    go_ulduar_teleporter() : GameObjectScript("go_ulduar_teleporter") {}
+
+    bool OnGossipHello(Player* pPlayer, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData();
+        if (!pInstance)
+            return true;
+
+        // Base camp
+        pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELE_BASE_CAMP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+
+        // Formation grounds
+        if (pInstance->GetData(TYPE_LEVIATHAN) != NOT_STARTED || pPlayer->isGameMaster())
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELE_FORMATION_GROUNDS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+
+        // Colossal Forge
+        if (pInstance->GetData(TYPE_LEVIATHAN) == DONE || pPlayer->isGameMaster())
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELE_COLOSSAL_FORGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+
+        // Scrapyard
+        if (pInstance->GetData(TYPE_XT002) != NOT_STARTED || pPlayer->isGameMaster())
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELE_SCRAPYARD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+
+        // Antechamber
+        if (pInstance->GetData(TYPE_XT002) == DONE || pPlayer->isGameMaster())
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELE_ANTECHAMBER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+
+        // Shattered walkway
+        if (pInstance->GetData(TYPE_KOLOGARN) == DONE || pPlayer->isGameMaster())
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELE_WALKWAY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+
+        // Conservatory of life
+        if (pInstance->GetData(TYPE_AURIAYA) == DONE || pPlayer->isGameMaster())
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELE_CONSERVATORY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+
+        // Spark of imagination
+        if (pInstance->GetData(TYPE_MIMIRON) != NOT_STARTED || pPlayer->isGameMaster())
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELE_SPARK_IMAGINATION, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+
+        // Prison of Yogg-Saron
+        if (pInstance->GetData(TYPE_VEZAX) == DONE || pPlayer->isGameMaster())
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELE_YOGG_SARON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pGo->GetGOInfo()->GetGossipMenuId(), pGo), pGo->GetObjectGuid());
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, GameObject* /*pGO*/, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData();
+        if (!pInstance)
+            return true;
+
+        // Additional checks for the teleporters to prevent exploiting
+        // -- TODO -- HACK HERE, use spells when possible!
+
+        // There needs to be displayed a msg when in Combat, it is likely that this is to be handled by core and spell can-cast check
+        // -- TODO -- Remove the combat check when spells are correctly working
+        if (pPlayer->IsInCombat())
+            return true;
+
+        switch (uiAction)
+        {
+            // Basecamp
+        case GOSSIP_ACTION_INFO_DEF:
+            // pPlayer->CastSpell(pPlayer, SPELL_TELE_EXPEDITION_BASE_CAMP, true, NULL, NULL, pGo->GetObjectGuid());
+            pPlayer->TeleportTo(603, -706.122f, -92.6024f, 429.876f, 0);
+            break;
+            // Formation Grounds
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            // pPlayer->CastSpell(pPlayer, SPELL_TELE_FORMATION_GROUNDS, true, NULL, NULL, pGo->GetObjectGuid());
+            pPlayer->TeleportTo(603, 131.248f, -35.3802f, 409.804f, 0);
+            break;
+            // Colossal Forge
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            // pPlayer->CastSpell(pPlayer, SPELL_TELE_COLOSSAL_FORGE, true, NULL, NULL, pGo->GetObjectGuid());
+            pPlayer->TeleportTo(603, 553.233f, -12.3247f, 409.679f, 0);
+            break;
+            // Scrapyard
+        case GOSSIP_ACTION_INFO_DEF + 3:
+            // pPlayer->CastSpell(pPlayer, SPELL_TELE_SCRAPYARD, true, NULL, NULL, pGo->GetObjectGuid());
+            pPlayer->TeleportTo(603, 926.292f, -11.4635f, 418.595f, 0);
+            break;
+            // Antechamber
+        case GOSSIP_ACTION_INFO_DEF + 4:
+            // pPlayer->CastSpell(pPlayer, SPELL_TELE_ANTECHAMBER_OF_ULDUAR, true, NULL, NULL, pGo->GetObjectGuid());
+            pPlayer->TeleportTo(603, 1498.09f, -24.246f, 420.967f, 0);
+            break;
+            // Shattered walkway
+        case GOSSIP_ACTION_INFO_DEF + 5:
+            // pPlayer->CastSpell(pPlayer, SPELL_TELE_SHATTERED_WALKWAY, true, NULL, NULL, pGo->GetObjectGuid());
+            pPlayer->TeleportTo(603, 1859.45f, -24.1f, 448.9f, 0);
+            break;
+            // Conservatory of life
+        case GOSSIP_ACTION_INFO_DEF + 6:
+            // pPlayer->CastSpell(pPlayer, SPELL_TELE_CONSERVATORY_OF_LIFE, true, NULL, NULL, pGo->GetObjectGuid());
+            pPlayer->TeleportTo(603, 2086.27f, -24.3134f, 421.239f, 0);
+            break;
+            // Spark of imagination
+        case GOSSIP_ACTION_INFO_DEF + 7:
+            // pPlayer->CastSpell(pPlayer, SPELL_TELE_SPARK_OF_IMAGINATION, true, NULL, NULL, pGo->GetObjectGuid());
+            pPlayer->TeleportTo(603, 2518.16f, 2569.03f, 412.299f, 0);
+            break;
+            // Prison of Yogg-Saron
+        case GOSSIP_ACTION_INFO_DEF + 8:
+            // pPlayer->CastSpell(pPlayer, SPELL_TELE_PRISON_OF_YOGG, true, NULL, NULL, pGo->GetObjectGuid());
+            pPlayer->TeleportTo(603, 1854.82f, -11.56f, 334.175f, 4.71f);
+            break;
+        default:
+            return true;
+        }
+
+        pPlayer->CLOSE_GOSSIP_MENU();
+        return true;
+    }
+};
+
+/*######
+## npc_brann_ulduar
+######*/
+
+enum
+{
+    GOSSIP_ITEM_BEGIN_ASSAULT                   = -3603012,
+    GOSSIP_TEXT_ID_BRANN                        = 14369,
+};
+
+struct npc_brann_ulduar : public CreatureScript
+{
+    npc_brann_ulduar() : CreatureScript("npc_brann_ulduar") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (InstanceData* pInstance = pCreature->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_LEVIATHAN_GAUNTLET) == NOT_STARTED && pInstance->GetData(TYPE_LEVIATHAN) == NOT_STARTED)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_ASSAULT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_BRANN, pCreature->GetObjectGuid());
+        }
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*sender*/, uint32 uiAction) override
+    {
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            if (InstanceData* pInstance = pCreature->GetInstanceData())
+            {
+                // if encounter is started by Brann then hard mode is failed
+                pInstance->SetData(TYPE_TOWER_FREYA, FAIL);
+                pInstance->SetData(TYPE_TOWER_HODIR, FAIL);
+                pInstance->SetData(TYPE_TOWER_MIMIRON, FAIL);
+                pInstance->SetData(TYPE_TOWER_THORIM, FAIL);
+
+                // set gauntlet in progress; rest of the event is done by DB scripts
+                pInstance->SetData(TYPE_LEVIATHAN_GAUNTLET, IN_PROGRESS);
+                pCreature->GetMotionMaster()->MoveWaypoint();
+            }
+
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_keeper_norgannon
+######*/
+
+enum
+{
+    GOSSIP_ITEM_ACTIVATE_SYSTEMS                = -3603010,
+    GOSSIP_ITEM_CONFIRMED                       = -3603011,
+
+    GOSSIP_TEXT_ID_GREET                        = 14375,
+    GOSSIP_TEXT_ID_DEFENSES                     = 14496,
+    GOSSIP_TEXT_ID_ACTIVATED                    = 14497,
+};
+
+struct npc_keeper_norgannon : public CreatureScript
+{
+    npc_keeper_norgannon() : CreatureScript("npc_keeper_norgannon") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (InstanceData* pInstance = pCreature->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_LEVIATHAN_GAUNTLET) == NOT_STARTED && pInstance->GetData(TYPE_LEVIATHAN) == NOT_STARTED && pInstance->GetData(TYPE_TOWER_HODIR) == NOT_STARTED &&
+                pInstance->GetData(TYPE_TOWER_FREYA) == NOT_STARTED && pInstance->GetData(TYPE_TOWER_MIMIRON) == NOT_STARTED && pInstance->GetData(TYPE_TOWER_THORIM) == NOT_STARTED)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ACTIVATE_SYSTEMS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_GREET, pCreature->GetObjectGuid());
+        }
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*sender*/, uint32 uiAction) override
+    {
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CONFIRMED, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_DEFENSES, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+            {
+                // if hard mode is triggered all towers become active and encounter starts automatically
+                pInstance->SetData(TYPE_TOWER_FREYA, DONE);
+                pInstance->SetData(TYPE_TOWER_HODIR, DONE);
+                pInstance->SetData(TYPE_TOWER_MIMIRON, DONE);
+                pInstance->SetData(TYPE_TOWER_THORIM, DONE);
+
+                // set gauntlet in progress and despawn the Lorekeeper; rest of the event is done by DB scripts
+                pInstance->SetData(TYPE_LEVIATHAN_GAUNTLET, IN_PROGRESS);
+                pCreature->ForcedDespawn(10000);
+
+                if (Creature* pDellorah = pInstance->GetSingleCreatureFromStorage(NPC_EXPLORER_DELLORAH))
+                    pDellorah->GetMotionMaster()->MoveWaypoint();
+                if (Creature* pBrann = pInstance->GetSingleCreatureFromStorage(NPC_BRANN_BRONZEBEARD))
+                    pBrann->GetMotionMaster()->MoveWaypoint();
+            }
+
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_ACTIVATED, pCreature->GetObjectGuid());
+            break;
+        }
+
+        return true;
+    }
+};
+
+/*######
+## event_go_ulduar_tower
+######*/
+
+struct event_go_ulduar_tower : public MapEventScript
+{
+    event_go_ulduar_tower() : MapEventScript("event_go_ulduar_tower") {}
+
+    bool OnReceived(uint32 uiEventId, Object* pSource, Object* /*pTarget*/, bool /*bIsStart*/) override
+    {
+        if (pSource->GetTypeId() == TYPEID_GAMEOBJECT && ((GameObject*)pSource)->GetGoType() == GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING)
+        {
+            InstanceData* pInstance = ((GameObject*)pSource)->GetInstanceData();
+            if (!pInstance)
+                return true;
+
+            // Towers can be deactivated by destroying them. Notify instance data in case they get destroyed.
+            switch (uiEventId)
+            {
+            case EVENT_ID_TOWER_LIFE:
+                pInstance->SetData(TYPE_TOWER_FREYA, FAIL);
+                break;
+            case EVENT_ID_TOWER_FLAME:
+                pInstance->SetData(TYPE_TOWER_MIMIRON, FAIL);
+                break;
+            case EVENT_ID_TOWER_FROST:
+                pInstance->SetData(TYPE_TOWER_HODIR, FAIL);
+                break;
+            case EVENT_ID_TOWER_STORMS:
+                pInstance->SetData(TYPE_TOWER_THORIM, FAIL);
+                break;
+            default:
+                return false;
+            }
+
+            // despawn all generators in range
+            std::list<Creature*> lGenerators;
+            GetCreatureListWithEntryInGrid(lGenerators, (GameObject*)pSource, NPC_GENERATOR_SMALL, 100.0f);
+            for (std::list<Creature*>::iterator itr = lGenerators.begin(); itr != lGenerators.end(); ++itr)
+                (*itr)->ForcedDespawn();
+
+            // allow further DB processing
+            return false;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_storm_tempered_keeper
+######*/
+
+enum
+{
+    SPELL_FORKED_LIGHTNING          = 63541,
+    SPELL_SEPARATION_ANXIETY        = 63539,                // cast when a buddy is too far away
+    SPELL_VENGEFUL_SURGE            = 63630,                // cast when a buddy dies
+    SPELL_SUMMON_CHARGED_SPHERE     = 63527,                // summons npc 33715
+
+    SPELL_CHARGED_SPERE             = 63537,                // charged sphere spells
+    SPELL_SUPERCHARGED              = 63528,
+
+    NPC_TEMPERED_KEEPER_1           = 33699,
+    NPC_TEMPERED_KEEPER_2           = 33722,
+    NPC_CHARGED_SPHERE              = 33715,                // moves to buddy keeper location
+
+    MAX_KEEPER_DISTANCE             = 70,
+};
+
+struct npc_storm_tempered_keeper : public CreatureScript
+{
+    npc_storm_tempered_keeper() : CreatureScript("npc_storm_tempered_keeper") {}
+
+    struct npc_storm_tempered_keeperAI : public ScriptedAI
+    {
+        npc_storm_tempered_keeperAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiCheckBuddyTimer;
+        uint32 m_uiLightningTimer;
+        uint32 m_uiSphereTimer;
+
+        ObjectGuid m_buddyGuid;
+
+        void Reset() override
+        {
+            m_uiCheckBuddyTimer = 1000;
+            m_uiLightningTimer = urand(5000, 10000);
+            m_uiSphereTimer = urand(10000, 30000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            // initialize nearby buddy
+            if (Creature* pKeeper = GetClosestCreatureWithEntry(m_creature, m_creature->GetEntry() == NPC_TEMPERED_KEEPER_1 ? NPC_TEMPERED_KEEPER_2 : NPC_TEMPERED_KEEPER_1, 20))
+                m_buddyGuid = pKeeper->GetObjectGuid();
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_CHARGED_SPHERE)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_CHARGED_SPERE, true);
+
+                // move to buddy location and notify about buddy entry
+                if (Creature* pBuddy = m_creature->GetMap()->GetCreature(m_buddyGuid))
+                {
+                    pSummoned->GetMotionMaster()->MoveFollow(pBuddy, 0, 0);
+                    SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pSummoned, pBuddy->GetEntry());
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiCheckBuddyTimer)
+            {
+                if (m_uiCheckBuddyTimer <= uiDiff)
+                {
+                    Creature* pBuddy = m_creature->GetMap()->GetCreature(m_buddyGuid);
+                    if (!pBuddy)
+                    {
+                        script_error_log("npc_storm_tempered_keeper for %s couldn't find its buddy.", m_creature->GetGuidStr().c_str());
+                        m_uiCheckBuddyTimer = 0;
+                        return;
+                    }
+
+                    // check if buddy is withind distance or alive
+                    if (!pBuddy->IsWithinDistInMap(m_creature, MAX_KEEPER_DISTANCE))
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_SEPARATION_ANXIETY) == CAST_OK)
+                            m_uiCheckBuddyTimer = 5000;
+                    }
+                    else if (!pBuddy->IsAlive())
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_VENGEFUL_SURGE) == CAST_OK)
+                            m_uiCheckBuddyTimer = 0;
+                    }
+                    else
+                        m_uiCheckBuddyTimer = 1000;
+                }
+                else
+                    m_uiCheckBuddyTimer -= uiDiff;
+
+                // spawn a sphere only if the buddy is stil alive
+                if (m_uiSphereTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_CHARGED_SPHERE) == CAST_OK)
+                        m_uiSphereTimer = urand(20000, 35000);
+                }
+                else
+                    m_uiSphereTimer -= uiDiff;
+            }
+
+            if (m_uiLightningTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FORKED_LIGHTNING) == CAST_OK)
+                    m_uiLightningTimer = urand(10000, 15000);
+            }
+            else
+                m_uiLightningTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_storm_tempered_keeperAI(pCreature);
+    }
+};
+
+/*######
+## npc_charged_sphere
+######*/
+
+struct npc_charged_sphere : public CreatureScript
+{
+    npc_charged_sphere() : CreatureScript("npc_charged_sphere") {}
+
+    struct npc_charged_sphereAI : public ScriptedAI
+    {
+        npc_charged_sphereAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        bool m_bIsCharged;
+        uint32 m_uiBuddyEntry;
+
+        void Reset() override
+        {
+            m_bIsCharged = false;
+            m_uiBuddyEntry = 0;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // cast supercharged if reached the buddy
+            if (!m_bIsCharged && pWho->GetEntry() == m_uiBuddyEntry && pWho->IsAlive() && pWho->IsWithinDistInMap(m_creature, 5.0f))
+            {
+                DoCastSpellIfCan(pWho, SPELL_SUPERCHARGED, CAST_TRIGGERED);
+                m_creature->ForcedDespawn(1000);
+                m_bIsCharged = true;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 uiMiscValue) override
+        {
+            // inity entry of the buddy keeper
+            if (eventType == AI_EVENT_CUSTOM_A)
+                m_uiBuddyEntry = uiMiscValue;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_charged_sphereAI(pCreature);
+    }
+};
+
+/*######
+## npc_ulduar_keeper
+######*/
+
+enum
+{
+    SAY_KEEPER_ACTIVE                           = -1603012,
+
+    GOSSIP_ITEM_LEND_AID                        = -3603013,
+    GOSSIP_ITEM_KEEPER_CONFIRM                  = -3603014,
+
+    GOSSIP_TEXT_ID_HODIR                        = 14326,
+    GOSSIP_TEXT_ID_FREYA                        = 14332,
+    GOSSIP_TEXT_ID_THORIM                       = 14333,
+    GOSSIP_TEXT_ID_MIMIRON                      = 14334,
+    GOSSIP_TEXT_ID_KEEPER_CONFIRM               = 14325,
+    GOSSIP_TEXT_ID_YOGG_DEFEATED                = 384,                      // ToDo: add the right text id here!
+};
+
+struct npc_ulduar_keeper : public CreatureScript
+{
+    npc_ulduar_keeper() : CreatureScript("npc_ulduar_keeper") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (InstanceData* pInstance = pCreature->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_YOGGSARON) == DONE)
+                pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_YOGG_DEFEATED, pCreature->GetObjectGuid());
+            else
+            {
+                switch (pCreature->GetEntry())
+                {
+                case NPC_KEEPER_HODIR:
+                    if (pInstance->GetData(TYPE_KEEPER_HODIR) != DONE)
+                        pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_LEND_AID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+
+                    pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_HODIR, pCreature->GetObjectGuid());
+                    break;
+                case NPC_KEEPER_FREYA:
+                    if (pInstance->GetData(TYPE_KEEPER_FREYA) != DONE)
+                        pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_LEND_AID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+
+                    pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_FREYA, pCreature->GetObjectGuid());
+                    break;
+                case NPC_KEEPER_THORIM:
+                    if (pInstance->GetData(TYPE_KEEPER_THORIM) != DONE)
+                        pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_LEND_AID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+
+                    pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_THORIM, pCreature->GetObjectGuid());
+                    break;
+                case NPC_KEEPER_MIMIRON:
+                    if (pInstance->GetData(TYPE_KEEPER_MIMIRON) != DONE)
+                        pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_LEND_AID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+
+                    pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_MIMIRON, pCreature->GetObjectGuid());
+                    break;
+                }
+            }
+        }
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*sender*/, uint32 uiAction) override
+    {
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KEEPER_CONFIRM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_KEEPER_CONFIRM, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            DoScriptText(SAY_KEEPER_ACTIVE, pCreature, pPlayer);
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+            if (InstanceData* pInstance = pCreature->GetInstanceData())
+            {
+                switch (pCreature->GetEntry())
+                {
+                case NPC_KEEPER_HODIR:   pInstance->SetData(TYPE_KEEPER_HODIR, DONE); break;
+                case NPC_KEEPER_FREYA:   pInstance->SetData(TYPE_KEEPER_FREYA, DONE); break;
+                case NPC_KEEPER_THORIM:  pInstance->SetData(TYPE_KEEPER_THORIM, DONE); break;
+                case NPC_KEEPER_MIMIRON: pInstance->SetData(TYPE_KEEPER_MIMIRON, DONE); break;
+                }
+            }
+            break;
+        }
+
+        return true;
+    }
+};
+
+void AddSC_ulduar()
+{
+    Script* s;
+
+    s = new go_ulduar_teleporter();
+    s->RegisterSelf();
+    s = new npc_brann_ulduar();
+    s->RegisterSelf();
+    s = new npc_keeper_norgannon();
+    s->RegisterSelf();
+    s = new event_go_ulduar_tower();
+    s->RegisterSelf();
+    s = new npc_storm_tempered_keeper();
+    s->RegisterSelf();
+    s = new npc_charged_sphere();
+    s->RegisterSelf();
+    s = new npc_ulduar_keeper();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_ulduar_teleporter";
+    //pNewScript->pGossipHelloGO = &GossipHello_go_ulduar_teleporter;
+    //pNewScript->pGossipSelectGO = &GossipSelect_go_ulduar_teleporter;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_brann_ulduar";
+    //pNewScript->pGossipHello = &GossipHello_npc_brann_ulduar;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_brann_ulduar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_keeper_norgannon";
+    //pNewScript->pGossipHello = &GossipHello_npc_keeper_norgannon;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_keeper_norgannon;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_go_ulduar_tower";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_go_ulduar_tower;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_storm_tempered_keeper";
+    //pNewScript->GetAI = &GetAI_npc_storm_tempered_keeper;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_charged_sphere";
+    //pNewScript->GetAI = &GetAI_npc_charged_sphere;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ulduar_keeper";
+    //pNewScript->pGossipHello = &GossipHello_npc_ulduar_keeper;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_ulduar_keeper;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/ulduar/ulduar/ulduar.h b/src/modules/SD3/scripts/northrend/ulduar/ulduar/ulduar.h
new file mode 100644
index 000000000..11c3a6ce7
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/ulduar/ulduar/ulduar.h
@@ -0,0 +1,501 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+* This program is free software licensed under GPL version 2
+* Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_ULDUAR_H
+#define DEF_ULDUAR_H
+
+enum
+{
+    MAX_ENCOUNTER               = 16,
+    HARD_MODE_ENCOUNTER         = 8,
+    KEEPER_ENCOUNTER            = 4,
+
+    // Main boss types
+    TYPE_LEVIATHAN              = 0,
+    TYPE_IGNIS                  = 1,
+    TYPE_RAZORSCALE             = 2,
+    TYPE_XT002                  = 3,
+    TYPE_ASSEMBLY               = 4,
+    TYPE_KOLOGARN               = 5,
+    TYPE_AURIAYA                = 6,
+    TYPE_MIMIRON                = 7,
+    TYPE_HODIR                  = 8,
+    TYPE_THORIM                 = 9,
+    TYPE_FREYA                  = 10,
+    TYPE_VEZAX                  = 11,
+    TYPE_YOGGSARON              = 12,
+    TYPE_ALGALON                = 13,
+    TYPE_ALGALON_TIMER          = 14,
+    TYPE_CHAMPION_FAILED        = 15, // Achievements Champion / Conquerer of Ulduar, needs to be saved to database
+
+    // Hard mode boss types
+    // Used for hard mode bosses only
+    TYPE_LEVIATHAN_HARD         = 16,
+    TYPE_XT002_HARD             = 17,
+    TYPE_MIMIRON_HARD           = 18,
+    TYPE_HODIR_HARD             = 19,
+    TYPE_THORIM_HARD            = 20,
+    TYPE_FREYA_HARD             = 21,
+    TYPE_VEZAX_HARD             = 22,
+    TYPE_YOGGSARON_HARD         = 23,
+
+    // Keeper types
+    // Used to store the keepers which will be used at yogg
+    TYPE_KEEPER_HODIR           = 24,
+    TYPE_KEEPER_FREYA           = 25,
+    TYPE_KEEPER_THORIM          = 26,
+    TYPE_KEEPER_MIMIRON         = 27,
+
+    // Tower types
+    // Used to store the towers which will be used at Leviathan encounter
+    TYPE_TOWER_HODIR            = 28,
+    TYPE_TOWER_FREYA            = 29,
+    TYPE_TOWER_THORIM           = 30,
+    TYPE_TOWER_MIMIRON          = 31,
+
+    // Other types - not saved
+    TYPE_LEVIATHAN_GAUNTLET     = 32,   //types continued by TYPE_ACHIEV
+
+    // The siege of ulduar
+    NPC_LEVIATHAN               = 33113,
+    // NPC_IGNIS                = 33118,
+    NPC_RAZORSCALE              = 33186,
+    NPC_XT002                   = 33293,
+    NPC_HEART_DECONSTRUCTOR     = 33329,
+    NPC_XT_TOY_PILE             = 33337,                    // robot spawner npc for XT002
+
+    // Leviathan other npcs
+    NPC_ULDUAR_COLOSSUS         = 33237,
+    NPC_BRONZEBEARD_RADIO       = 34054,
+    NPC_EXPLORER_DELLORAH       = 33701,
+    NPC_BRANN_BRONZEBEARD       = 33579,
+    NPC_ORBITAL_SUPPORT         = 34286,
+    // NPC_GENERATOR            = 33571,                    // spawns iron dwarfs from Storm Beacons
+    NPC_GENERATOR_SMALL         = 34159,                    // spawns iron dwarfs from hard mode towers
+
+    // Leviathan reinforcements
+    // NPC_HIRED_ENGINEER       = 33626,
+    // NPC_HIRED_DEMOLITIONIST  = 33627,
+    // NPC_BATTLE_MAGE          = 33662,
+    NPC_SALVAGED_SIEGE_ENGINE   = 33060,
+    NPC_SALVAGED_CHOPPER        = 33062,
+    NPC_SALVAGED_DEMOLISHER     = 33109,
+    // NPC_LIQUID_PYRITE        = 33189,
+
+    // Razorscale helper npcs
+    NPC_EXPEDITION_COMMANDER    = 33210,
+    NPC_EXPEDITION_ENGINEER     = 33287,                    // npc used to repair the Harpoons
+    NPC_EXPEDITION_TRAPPER      = 33259,                    // npc used in Razorscale grounding phase
+    NPC_EXPEDITION_DEFENDER     = 33816,                    // used to fight Razorscale
+    NPC_RAZORSCALE_CONTROLLER   = 33233,                    // harpoon shot trigger npc for phase
+
+    // The antechamber of ulduar
+    NPC_STEELBREAKER            = 32867,
+    NPC_MOLGEIM                 = 32927,
+    NPC_BRUNDIR                 = 32857,
+    NPC_KOLOGARN                = 32930,
+    NPC_RIGHT_ARM               = 32934,
+    NPC_LEFT_ARM                = 32933,
+    NPC_RUBBLE_STALKER          = 33809,                    // npc which spawns Rubble on Kologarn arms death
+    NPC_AURIAYA                 = 33515,
+    NPC_SANCTUM_SENTRY          = 34014,
+    NPC_FERAL_DEFENDER          = 34035,
+
+    // Archivum
+    NPC_BRANN_ARCHIVUM          = 33235,                    // npcs are spawned upon the Iron Council defeat; they handle specific quests
+    NPC_PROSPECTOR_DOREN        = 33956,
+    NPC_PROSPECTOR_DOREN_H      = 33957,
+    NPC_BRANN_ALGALON           = 34064,                    // Brann entry summoned for the Algalon intro and epilogue event
+
+    // The keepers of ulduar
+    NPC_MIMIRON                 = 33350,
+    NPC_HODIR                   = 32845,
+    NPC_THORIM                  = 32865,
+    NPC_FREYA                   = 32906,
+
+    // Freya elders
+    NPC_ELDER_BRIGHTLEAF        = 32915,
+    NPC_ELDER_IRONBRACH         = 32913,
+    NPC_ELDER_STONEBARK         = 32914,
+    NPC_FREYA_ACHIEV_TRIGGER    = 33406,                    // Cast spell 65015 for achievs 2985 and 2984
+
+    // Hodir helpers
+    NPC_DRUID_HORDE_N           = 32941,                    // Tor Greycloud
+    NPC_DRUID_HORDE_H           = 33333,                    // Kar Greycloud
+    NPC_SHAMAN_HORDE_N          = 32950,                    // Spiritwalker Yona
+    NPC_SHAMAN_HORDE_H          = 33332,                    // Spiritwalker Tara
+    NPC_MAGE_HORDE_N            = 32946,                    // Veesha Blazeweaver
+    NPC_MAGE_HORDE_H            = 33331,                    // Amira Blazeweaver
+    NPC_PRIEST_HORDE_N          = 32948,                    // Battle-Priest Eliza
+    NPC_PRIEST_HORDE_H          = 33330,                    // Battle-Priest Gina
+    NPC_DRUID_ALLIANCE_N        = 32901,                    // Ellie Nightfeather
+    NPC_DRUID_ALLIANCE_H        = 33325,                    // Eivi Nightfeather
+    NPC_SHAMAN_ALLIANCE_N       = 32900,                    // Elementalist Avuun
+    NPC_SHAMAN_ALLIANCE_H       = 33328,                    // Elementalist Mahfuun
+    NPC_MAGE_ALLIANCE_N         = 32893,                    // Missy Flamecuffs
+    NPC_MAGE_ALLIANCE_H         = 33327,                    // Sissy Flamecuffs
+    NPC_PRIEST_ALLIANCE_N       = 32897,                    // Field Medic Penny
+    NPC_PRIEST_ALLIANCE_H       = 33326,                    // Field Medic Jessi
+
+    // Thorim event npcs
+    NPC_RUNIC_COLOSSUS          = 32872,
+    NPC_RUNE_GIANT              = 32873,
+    NPC_SIF                     = 33196,
+    NPC_JORMUNGAR_BEHEMOTH      = 32882,
+    NPC_DARK_RUNE_ACOLYTE       = 32886,
+    NPC_SOLDIER_ALLIANCE        = 32885,
+    NPC_CAPTAIN_ALLIANCE        = 32908,
+    NPC_SOLDIER_HORDE           = 32883,
+    NPC_CAPTAIN_HORDE           = 32907,
+    NPC_THORIM_EVENT_BUNNY      = 32892,
+    NPC_THUNDER_ORB             = 33378,
+    NPC_THORIM_CONTROLLER       = 32879,
+    NPC_THORIM_COMBAT_TRIGGER   = 34055,
+    NPC_RIGHT_HAND_BUNNY        = 33140,
+    NPC_LEFT_HAND_BUNNY         = 33141,
+    NPC_HONOR_GUARD_STAIRS      = 33125,                    // summoned mobs before the Rune Giant
+    NPC_RUNE_ACOLYTE_STAIRS     = 32957,
+    NPC_DARK_RUNE_COMMONER      = 32904,
+
+    // Mimiron event npcs
+    NPC_LEVIATHAN_MK            = 33432,
+    NPC_LEVIATHAN_MK_TURRET     = 34071,
+    NPC_VX001                   = 33651,
+    NPC_AERIAL_UNIT             = 33670,
+    NPC_COMPUTER                = 34143,
+    NPC_BOT_SUMMON_TRIGGER      = 33856,
+    NPC_WORLD_TRIGGER_FLAMES    = 21252,
+
+    // The descent into madness
+    NPC_VEZAX                   = 33271,
+    NPC_SARONITE_ANIMUS         = 33524,
+    NPC_VEZAX_BUNNY             = 33500,
+    NPC_YOGGSARON               = 33288,
+    NPC_SARA                    = 33134,
+    NPC_YOGG_BRAIN              = 33890,
+    NPC_VOICE_OF_YOGG           = 33280,
+    NPC_OMINOUS_CLOUD           = 33292,
+    NPC_GUARDIAN_OF_YOGG        = 33136,
+    
+    // Yogg Saron illusions actors
+    NPC_YSERA                   = 33495,
+    NPC_NELTHARION              = 33523,
+    NPC_MALYGOS                 = 33535,
+    NPC_ALEXSTRASZA             = 33536,
+    NPC_GARONA                  = 33436,                    // cast spell 64063 on 33437
+    NPC_KING_LLANE              = 33437,
+    NPC_LICH_KING               = 33441,                    // cast spell 63037 on 33442
+    NPC_IMMOLATED_CHAMPION      = 33442,
+    NPC_YOGGSARON_ILLUSION      = 33552,
+
+    // Celestial planetarium
+    NPC_ALGALON                 = 32871,
+
+    // Keepers helpers spawned during Yogg Saron encounter
+    NPC_THORIM_HELPER           = 33413,
+    NPC_MIMIRON_HELPER          = 33412,
+    NPC_HODIR_HELPER            = 33411,
+    NPC_FREYA_HELPER            = 33410,
+
+    // Keepers spawned in the central hall after releaseed from Yogg's enslavement
+    NPC_KEEPER_FREYA            = 33241,
+    NPC_KEEPER_HODIR            = 33213,
+    NPC_KEEPER_MIMIRON          = 33244,
+    NPC_KEEPER_THORIM           = 33242,
+
+    MAX_SPECIAL_ACHIEV_CRITS    = 20,
+
+    TYPE_ACHIEV_CAT_LADY        = 33,   //order may be important in ScriptedInstance
+    TYPE_ACHIEV_NINE_LIVES      = 34,
+    TYPE_ACHIEV_STEELBREAKER    = 35,
+    TYPE_ACHIEV_BRUNDIR         = 36,
+    TYPE_ACHIEV_MOLGEIM         = 37,
+    TYPE_ACHIEV_STUNNED         = 38,
+    TYPE_ACHIEV_SHATTERED       = 39,
+    TYPE_ACHIEV_QUICK_SHAVE     = 40,
+    TYPE_ACHIEV_SHUTOUT         = 41,
+    TYPE_ACHIEV_NERF_ENG        = 42,
+    TYPE_ACHIEV_RUBBLE          = 43,
+    TYPE_ACHIEV_LOOKS_KILL      = 44,
+    TYPE_ACHIEV_OPEN_ARMS       = 45,
+    TYPE_ACHIEV_DISARMED        = 46,
+    TYPE_ACHIEV_CHEESE_FREEZE   = 47,
+    TYPE_ACHIEV_COOL_FRIENDS    = 48,
+    TYPE_ACHIEV_LIGHTNING       = 49,
+    TYPE_ACHIEV_BACK_NATURE     = 50,
+    TYPE_ACHIEV_DRIVE_CRAZY     = 51,
+    TYPE_ACHIEV_SHADOWDODGER    = 52,
+
+    TYPE_DO_SHATTERED_EVENT     = 53,   //TYPEs cont'd
+    TYPE_DO_MOVE_DEFENDERS      = 54,
+    TYPE_DATA_CURRENT_HARPOON   = 55,
+    TYPE_DO_MOVE_TO_HARPOON     = 56,   //@TODO the next 5 parameterless types my be joined in 1 using uiData
+    TYPE_DO_HARPOONS_OK         = 57,
+    TYPE_DO_TRAPPERS_MOVE       = 58,
+    TYPE_DO_TRAPPERS_CAST       = 59,
+    TYPE_DO_TRAPPERS_EVADE      = 60,
+    TYPE_DO_THORIM_SPAWN_PACK   = 61,
+    TYPE_DATA_THORIM_SMASH_SIDE = 62,
+    TYOE_DO_THORIM_SMASH        = 63,
+    TYPE_DATA_THORIM_SMASHINDEX = 64,
+    TYPE_DO_YOGG_DESPAWN_CLOUDS = 65,
+
+    DATA64_VEZAX_ANIMUS         = 0,
+    DATA64_VEZAX_VAPOR          = 1,
+    DATA64_KOLO_STALKER_RIGHT   = 2,
+    DATA64_KOLO_STALKER_LEFT    = 3,
+    DATA64_BROKEN_HARPOON       = 4,    //Guid is harpoon (GO) one
+    DATA64_THORIM_TRIGGERED_BY  = 5,
+    DATA64_THORIM_RANDOM_ORB    = 6,
+    DATA64_RANDOM_UPPER_BUNNY   = 7,
+    DATA64_THORIM_BUNNY         = 8,
+    DATA64_THORIM_SMASH_CASTER  = 9,
+    DATA64_XT_TOY_PILE          = 10,
+
+
+    // Loot chests
+    // Kologarn
+    GO_CACHE_OF_LIVING_STONE_10 = 195046,
+    GO_CACHE_OF_LIVING_STONE_25 = 195047,
+
+    // Hodir
+    GO_CACHE_OF_WINTER_10       = 194307,
+    GO_CACHE_OF_WINTER_25       = 194308,
+    GO_CACHE_OF_RARE_WINTER_10  = 194200,
+    GO_CACHE_OF_RARE_WINTER_25  = 194201,
+
+    // Mimiron
+    GO_CACHE_OF_INOV_10         = 194789,
+    GO_CACHE_OF_INOV_25         = 194956,
+    GO_CACHE_OF_INOV_10_H       = 194957,
+    GO_CACHE_OF_INOV_25_H       = 194958,
+
+    // Thorim
+    GO_CACHE_OF_STORMS_10       = 194312,
+    GO_CACHE_OF_STORMS_25       = 194315,
+    GO_CACHE_OF_STORMS_10_H     = 194313,
+    GO_CACHE_OF_STORMS_25_H     = 194314,
+
+    // Alagon
+    GO_GIFT_OF_OBSERVER_10      = 194821,
+    GO_GIFT_OF_OBSERVER_25      = 194822,
+
+    // Doors and other Objects
+    // The siege
+    GO_SHIELD_WALL              = 194416,                   // Gate before Leviathan
+    GO_LIGHTNING_DOOR           = 194905,                   // Lightning gate after the Leviathan. It closes after the boss enters the arena
+    GO_LEVIATHAN_GATE           = 194630,                   // Gate after Leviathan -> this will be broken when the boss enters the arena
+    GO_XT002_GATE               = 194631,                   // Gate before Xt002
+    GO_BROKEN_HARPOON           = 194565,                   // Broken harpoon from Razorscale
+    GO_HARPOON_GUN_1            = 194542,                   // usable harpoons - respawn when the broken one is repaired
+    GO_HARPOON_GUN_2            = 194541,
+    GO_HARPOON_GUN_3            = 194543,
+    GO_HARPOON_GUN_4            = 194519,
+    GO_FREYA_CRYSTAL            = 194704,                   // crystals which can be active during Leviathan encounter if hard mode towers are active
+    GO_MIMIRON_CRYSTAL          = 194705,
+    GO_THORIM_CRYSTAL           = 194706,
+    GO_HODIR_CRYSTAL            = 194707,
+
+    // Antechamber
+    GO_KOLOGARN_BRIDGE          = 194232,
+    // GO_SHATTERED_DOOR        = 194553,                   // Door before kologarn
+    GO_IRON_ENTRANCE_DOOR       = 194554,                   // Door before iron council
+    GO_ARCHIVUM_DOOR            = 194556,                   // Entrance door to the archivum
+    // GO_ARCHIVUM_CONSOLE      = 194555,                   // Used at some sort of cinematic
+    // GO_FLOOR_ARCHIVUM        = 194715,                   // Used for animation
+
+    // Planetarium
+    GO_CELESTIAL_ACCES          = 194628,                   // Acces console for 10 man mode
+    GO_CELESTIAL_ACCES_H        = 194752,                   // Acces console for 25 man mode
+    GO_CELESTIAL_DOOR_1         = 194767,                   // Entrance doors to the planetarium
+    GO_CELESTIAL_DOOR_2         = 194911,
+    GO_CELESTIAL_DOOR_COMBAT    = 194910,
+    GO_UNIVERSE_FLOOR           = 194716,                   // For animation
+    GO_UNIVERSE_FLOOR_COMBAT    = 194715,
+    GO_AZEROTH_GLOBE            = 194148,                   // For animation
+
+    // The keepers
+    // Hodir
+    GO_HODIR_EXIT               = 194634,
+    GO_HODIR_ICE_WALL           = 194441,
+    GO_HODIR_ENTER              = 194442,
+    // Mimiron
+    GO_MIMIRON_BUTTON           = 194739,                   // Used to start hard mode
+    GO_MIMIRON_DOOR_1           = 194774,
+    GO_MIMIRON_DOOR_2           = 194775,
+    GO_MIMIRON_DOOR_3           = 194776,
+    GO_MIMIRON_TEL1             = 194741,                   // Used to summon mobs in phase 3
+    GO_MIMIRON_TEL2             = 194742,
+    GO_MIMIRON_TEL3             = 194743,
+    GO_MIMIRON_TEL4             = 194744,
+    GO_MIMIRON_TEL5             = 194740,
+    GO_MIMIRON_TEL6             = 194746,
+    GO_MIMIRON_TEL7             = 194747,
+    GO_MIMIRON_TEL8             = 194748,
+    GO_MIMIRON_TEL9             = 194745,
+    GO_MIMIRON_ELEVATOR         = 194749,                   // Central elevator
+    // Thorim
+    GO_DARK_IRON_PORTCULIS      = 194560,                   // Door from the arena to the hallway
+    GO_RUNED_STONE_DOOR         = 194557,                   // Door after the runic colossus
+    GO_THORIM_STONE_DOOR        = 194558,                   // Door after the ancient rune giant
+    GO_LIGHTNING_FIELD          = 194559,                   // Arena exit door
+    GO_DOOR_LEVER               = 194264,                   // In front of the door
+
+    // Descent to madness
+    GO_ANCIENT_GATE             = 194255,                   // Door upstairs before vezax, opens when all keepers are freed
+    GO_VEZAX_GATE               = 194750,                   // Door after vezax
+    GO_YOGG_GATE                = 194773,                   // Yogg-Saron chamber door
+    GO_BRAIN_DOOR_CHAMBER       = 194635,                   // Brain chamber doors
+    GO_BRAIN_DOOR_ICECROWN      = 194636,
+    GO_BRAIN_DOOR_STORMWIND     = 194637,
+    GO_FLEE_TO_SURFACE          = 194625,                   // Brain chamber portals
+
+    // World state used for algalon timer
+    WORLD_STATE_TIMER           = 4132,
+    WORLD_STATE_TIMER_COUNT     = 4131,
+
+    // events
+    EVENT_ID_SHUTDOWN           = 21605,
+    EVENT_ID_SCRAP_REPAIR       = 21606,
+    EVENT_ID_SPELL_SHATTER      = 21620,
+    EVENT_ID_TOWER_LIFE         = 21030,                    // events checked when a tower is destroyed
+    EVENT_ID_TOWER_FLAME        = 21033,
+    EVENT_ID_TOWER_FROST        = 21032,
+    EVENT_ID_TOWER_STORMS       = 21031,
+
+    // area triggers
+    AREATRIGGER_ID_INTRO        = 5388,                     // starts the intro dialogue
+    AREATRIGGER_ID_REPAIR_1     = 5369,                     // related to vehicle repair
+    AREATRIGGER_ID_REPAIR_2     = 5423,
+
+    // Achievement related
+    ACHIEV_START_IGNIS_ID       = 20951,                    // Ignis timed achievs 2930, 2929
+    ACHIEV_START_XT002_ID       = 21027,                    // XT-002 timed achievs 2937, 2938
+    ACHIEV_START_FREYA_ID       = 21597,                    // Freya timed achievs 2980, 2981
+    ACHIEV_START_YOGG_ID        = 21001,                    // Yogg timed achievs 3012, 3013
+    ACHIEV_START_COMING_WALLS   = 33136,                    // Guardian of Yogg timed achievs 3014, 3017
+    ACHIEV_START_DWARFAGEDDON   = 65387,                    // Ulduar gauntlet timed achievs 3097, 3098; triggered by missing spell 65387
+    ACHIEV_START_LUMBERJACKED   = 21686,                    // Ulduar elder kill timed achievs 2979, 3118; triggered by missing spell 65296
+    ACHIEV_START_NERF_BOTS      = 65037,                    // XT-002 gauntlet timed achievs 2933, 2935; triggered by missing spell 65037
+    ACHIEV_START_SUPERMASSIVE   = 21697,                    // Black hole timed achievs 3003, 3002
+
+    ACHIEV_CRIT_SARONITE_N      = 10451,                    // General Vezax, achievs 3181, 3188
+    ACHIEV_CRIT_SARONITE_H      = 10462,
+    ACHIEV_CRIT_SHADOWDODGER_N  = 10173,                    // General Vezax, achievs 2996, 2997
+    ACHIEV_CRIT_SHADOWDODGER_H  = 10306,
+    ACHIEV_CRIT_CAT_LADY_N      = 10400,                    // Auriaya, achievs 3006, 3007
+    ACHIEV_CRIT_CAT_LADY_H      = 10184,
+    ACHIEV_CRIT_NINE_LIVES_N    = 10399,                    // Auriaya, achievs 3076, 3077
+    ACHIEV_CRIT_NINE_LIVES_H    = 10243,
+    ACHIEV_CRIT_STEELBREAKER_N  = 10084,                    // Iron council, achievs 2941, 2944
+    ACHIEV_CRIT_STEELBREAKER_H  = 10087,
+    ACHIEV_CRIT_MOLGEIM_N       = 10082,                    // Iron council, achievs 2939, 2942
+    ACHIEV_CRIT_MOLGEIM_H       = 10085,
+    ACHIEV_CRIT_BRUNDIR_N       = 10083,                    // Iron council, achievs 2940, 2943
+    ACHIEV_CRIT_BRUNDIR_H       = 10086,
+    ACHIEV_CRIT_STUNNED_BRUND_N = 10090,                    // Iron council, achiev 2947
+    ACHIEV_CRIT_STUNNED_STEEL_N = 10422,
+    ACHIEV_CRIT_STUNNED_MOLG_N  = 10423,
+    ACHIEV_CRIT_STUNNED_BRUND_H = 10091,                    // Iron council, achiev 2948
+    ACHIEV_CRIT_STUNNED_STEEL_H = 10424,
+    ACHIEV_CRIT_STUNNED_MOLG_H  = 10425,
+    ACHIEV_CRIT_SHATTERED_N     = 10068,                    // Ignis, achievs 2925, 2926
+    ACHIEV_CRIT_SHATTERED_H     = 10069,
+    ACHIEV_CRIT_HEARTBREAKER_N  = 10221,                    // XT-002, achievs 3058, 3059
+    ACHIEV_CRIT_HEARTBREAKER_H  = 10220,
+    ACHIEV_CRIT_NERF_ENG_N      = 10074,                    // XT-002, achievs 2931, 2932
+    ACHIEV_CRIT_NERF_ENG_H      = 10075,
+    ACHIEV_CRIT_NERF_GRAVITY_N  = 10077,                    // XT-002, achievs 2934, 2936
+    ACHIEV_CRIT_NERF_GRAVITY_H  = 10079,
+    ACHIEV_CRIT_QUICK_SHAVE_N   = 10062,                    // Razorscale, achievs 2919, 2921
+    ACHIEV_CRIT_QUICK_SHAVE_H   = 10063,
+    ACHIEV_CRIT_ORB_BOMB_N      = 10056,                    // Flame Leviathan, achievs 2913, 2918 (one tower)
+    ACHIEV_CRIT_ORB_BOMB_H      = 10061,
+    ACHIEV_CRIT_ORB_DEV_N       = 10057,                    // Flame Leviathan, achievs 2914, 2916 (two towers)
+    ACHIEV_CRIT_ORB_DEV_H       = 10059,
+    ACHIEV_CRIT_ORB_NUKED_N     = 10058,                    // Flame Leviathan, achievs 2915, 2917 (three towers)
+    ACHIEV_CRIT_ORB_NUKED_H     = 10060,
+    ACHIEV_CRIT_ORBITUARY_N     = 10218,                    // Flame Leviathan, achievs 3056, 3057 (four towers)
+    ACHIEV_CRIT_ORBITUARY_H     = 10219,
+    ACHIEV_CRIT_SHUTOUT_N       = 10054,                    // Flame Leviathan, achievs 2911, 2913
+    ACHIEV_CRIT_SHUTOUT_H       = 10055,
+    ACHIEV_CRIT_UNBROKEN_N      = 10044,                    // Flame Leviathan, achievs 2905, 2906
+    ACHIEV_CRIT_UNBROKEN_H      = 10045,
+    ACHIEV_CRIT_DISARMED_N      = 10284,                    // Kologarn, achievs 2953, 2954
+    ACHIEV_CRIT_DISARMED_H      = 10722,
+    ACHIEV_CRIT_LOOKS_KILL_N    = 10286,                    // Kologarn, achievs 2955, 2956
+    ACHIEV_CRIT_LOOKS_KILL_H    = 10099,
+    ACHIEV_CRIT_RUBBLE_ROLL_N   = 10290,                    // Kologarn, achievs 2959, 2960
+    ACHIEV_CRIT_RUBBLE_ROLL_H   = 10133,
+    ACHIEV_CRIT_OPEN_ARMS_N     = 10285,                    // Kologarn, achievs 2951, 2952
+    ACHIEV_CRIT_OPEN_ARMS_H     = 10095,
+    ACHIEV_CRIT_FEEDS_TEARS_N   = 10568,                    // Algalon, achievs 3004, 3005
+    ACHIEV_CRIT_FEEDS_TEARS_H   = 10570,
+    ACHIEV_CRIT_CHEESE_N        = 10259,                    // Hodir, achievs 2961, 2962
+    ACHIEV_CRIT_CHEESE_H        = 10261,
+    ACHIEV_CRIT_GETTING_COLD_N  = 10247,                    // Hodir, achievs 2967, 2968
+    ACHIEV_CRIT_GETTING_COLD_H  = 10248,
+    ACHIEV_CRIT_COOL_FRIENDS_N  = 10258,                    // Hodir, achievs 2963, 2965
+    ACHIEV_CRIT_COOL_FRIENDS_H  = 10260,
+    ACHIEV_CRIT_RARE_CACHE_N    = 10452,                    // Hodir, achievs 3182, 3184
+    ACHIEV_CRIT_RARE_CACHE_H    = 10458,
+    ACHIEV_CRIT_LIGHTNING_N     = 10305,                    // Thorim, achievs 2971, 2972
+    ACHIEV_CRIT_LIGHTNING_H     = 10309,
+    ACHIEV_CRIT_LOSE_ILLUSION_N = 10440,                    // Thorim, achievs 3176, 3183
+    ACHIEV_CRIT_LOSE_ILLUSION_H = 10457,
+    ACHIEV_CRIT_BACK_NATURE_N   = 10445,                    // Freya, achievs 2982, 2983
+    ACHIEV_CRIT_BACK_NATURE_H   = 10758,
+    ACHIEV_CRIT_KNOCK_1_N       = 10447,                    // Freya, achievs 3177, 3185
+    ACHIEV_CRIT_KNOCK_1_H       = 10459,
+    ACHIEV_CRIT_KNOCK_2_N       = 10448,                    // Freya, achievs 3178, 3186
+    ACHIEV_CRIT_KNOCK_2_H       = 10460,
+    ACHIEV_CRIT_KNOCK_3_N       = 10449,                    // Freya, achievs 3179, 3187
+    ACHIEV_CRIT_KNOCK_3_H       = 10461,
+    ACHIEV_CRIT_FIREFIGHTER_N   = 10450,                    // Mimiron, achievs 3180, 3189
+    ACHIEV_CRIT_FIREFIGHTER_H   = 10463,
+    ACHIEV_CRIT_THREE_LIGHTS_N  = 10410,                    // Yogg-Saron, achievs 3157, 3161,
+    ACHIEV_CRIT_THREE_LIGHTS_H  = 10414,
+    ACHIEV_CRIT_TWO_LIGHTS_N    = 10338,                    // Yogg-Saron, achievs 3141, 3162
+    ACHIEV_CRIT_TWO_LIGHTS_H    = 10415,
+    ACHIEV_CRIT_ONE_LIGHT_N     = 10409,                    // Yogg-Saron, achievs 3158, 3163
+    ACHIEV_CRIT_ONE_LIGHT_H     = 10416,
+    ACHIEV_CRIT_ALONE_DARK_N    = 10412,                    // Yogg-Saron, achievs 3159, 3164
+    ACHIEV_CRIT_ALONE_DARK_H    = 10417,
+    ACHIEV_CRIT_DRIVE_CRAZY_N   = 10185,                    // Yogg-Saron, achievs 3008, 3010
+    ACHIEV_CRIT_DRIVE_CRAZY_H   = 10296,
+    
+    // Champion / Conquerer of Ulduar, achievs 2903, 2904
+    ACHIEV_CRIT_CHAMP_LEVI      = 10042,
+    ACHIEV_CRIT_CHAMP_RAZOR     = 10340,
+    ACHIEV_CRIT_CHAMP_XT        = 10341,
+    ACHIEV_CRIT_CHAMP_IGNIS     = 10342,
+    ACHIEV_CRIT_CHAMP_MIMIRON   = 10347,
+    ACHIEV_CRIT_CHAMP_KOLO      = 10348,
+    ACHIEV_CRIT_CHAMP_VEZAX     = 10349,
+    ACHIEV_CRIT_CHAMP_YOGG      = 10350,
+    ACHIEV_CRIT_CHAMP_AURIAYA   = 10351,
+    ACHIEV_CRIT_CHAMP_THORIM    = 10403,
+    ACHIEV_CRIT_CHAMP_HODIR     = 10439,
+    ACHIEV_CRIT_CHAMP_FREYA     = 10582,
+    ACHIEV_CRIT_CHAMP_COUNCIL   = 10598,
+
+    ACHIEV_CRIT_CONQ_LEVI       = 10352,
+    ACHIEV_CRIT_CONQ_RAZOR      = 10353,
+    ACHIEV_CRIT_CONQ_XT         = 10354,
+    ACHIEV_CRIT_CONQ_IGNIS      = 10355,
+    ACHIEV_CRIT_CONQ_KOLO       = 10357,
+    ACHIEV_CRIT_CONQ_MIMIRON    = 10361,
+    ACHIEV_CRIT_CONQ_VEZAX      = 10362,
+    ACHIEV_CRIT_CONQ_AURIAYA    = 10363,
+    ACHIEV_CRIT_CONQ_YOGG       = 10364,
+    ACHIEV_CRIT_CONQ_THORIM     = 10404,
+    ACHIEV_CRIT_CONQ_FREYA      = 10583,
+    ACHIEV_CRIT_CONQ_COUNCIL    = 10599,
+    ACHIEV_CRIT_CONQ_HODIR      = 10719,
+};
+
+// spawn location for Algalon in reload case
+static const float afAlgalonMovePos[4] = {1632.668f, -302.7656f, 417.3211f, 1.53f};
+
+#endif
diff --git a/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar.cpp b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar.cpp
new file mode 100644
index 000000000..e711954f3
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar.cpp
@@ -0,0 +1,428 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Ingvar
+SD%Complete: 70%
+SDComment: TODO: correct timers, spell 42912 requires proper position fix in core
+SDCategory: Utgarde Keep
+EndScriptData */
+
+#include "precompiled.h"
+#include "utgarde_keep.h"
+
+enum
+{
+    SAY_AGGRO_FIRST             = -1574005,
+    SAY_AGGRO_SECOND            = -1574006,
+    SAY_DEATH_FIRST             = -1574007,
+    SAY_DEATH_SECOND            = -1574008,
+    SAY_KILL_FIRST              = -1574009,
+    SAY_KILL_SECOND             = -1574010,
+    EMOTE_ROAR                  = -1574022,
+    SAY_ANNHYLDE_REZ            = -1574023,
+
+    NPC_ANNHYLDE                = 24068,
+    NPC_THROW_TARGET            = 23996,                    // the target, casting spell and target of moving dummy
+    NPC_THROW_DUMMY             = 23997,                    // the axe, moving to target
+    NPC_GROUND_VISUAL           = 24012,                    // has SPELL_SCOURGE_RES_BUBBLE aura
+
+    // phase 1
+    SPELL_CLEAVE                = 42724,
+
+    SPELL_SMASH                 = 42669,
+    SPELL_SMASH_H               = 59706,
+
+    SPELL_ENRAGE                = 42705,
+    SPELL_ENRAGE_H              = 59707,
+
+    SPELL_STAGGERING_ROAR       = 42708,
+    SPELL_STAGGERING_ROAR_H     = 59708,
+
+    // phase 2
+    SPELL_DARK_SMASH_H          = 42723,
+
+    SPELL_DREADFUL_ROAR         = 42729,
+    SPELL_DREADFUL_ROAR_H       = 59734,
+
+    SPELL_WOE_STRIKE            = 42730,
+    SPELL_WOE_STRIKE_H          = 59735,
+
+    SPELL_SHADOW_AXE            = 42748,
+    SPELL_SHADOW_AXE_PROC       = 42750,                    // triggers 42751
+    SPELL_SHADOW_AXE_PROC_H     = 59719,                    // triggers 59720
+
+    // ressurection sequenze
+    SPELL_ASTRAL_TELEPORT       = 34427,                    // aura cast by Annhylde on spawn
+    SPELL_SUMMON_BANSHEE        = 42912,                    // summons Annhylde and sets a glow aura
+    SPELL_FEIGN_DEATH           = 42795,
+    SPELL_TRANSFORM             = 42796,
+    SPELL_SCOURGE_RES_SUMMON    = 42863,                    // summones a dummy target
+    SPELL_SCOURGE_RES_HEAL      = 42704,                    // heals max HP
+    SPELL_SCOURGE_RES_BUBBLE    = 42862,                    // black bubble
+    SPELL_SCOURGE_RES_CHANNEL   = 42857,                    // the whirl from annhylde
+
+    POINT_ID_ANNHYLDE           = 1
+};
+
+/*######
+## boss_ingvar
+######*/
+
+struct boss_ingvar : public CreatureScript
+{
+    boss_ingvar() : CreatureScript("boss_ingvar") {}
+
+    struct boss_ingvarAI : public ScriptedAI
+    {
+        boss_ingvarAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bIsResurrected;
+        bool m_bIsFakingDeath;
+
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiSmashTimer;
+        uint32 m_uiStaggeringRoarTimer;
+        uint32 m_uiEnrageTimer;
+
+        void Reset() override
+        {
+            m_bIsResurrected = false;
+            m_bIsFakingDeath = false;
+
+            m_uiCleaveTimer = urand(5000, 7000);
+            m_uiSmashTimer = urand(8000, 15000);
+            m_uiStaggeringRoarTimer = urand(10000, 25000);
+            m_uiEnrageTimer = 30000;
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            // don't yell for her
+            if (pWho->GetEntry() == NPC_ANNHYLDE)
+                return;
+
+            // ToDo: it shouldn't yell this aggro text after removing the feign death aura
+            DoScriptText(SAY_AGGRO_FIRST, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_INGVAR, IN_PROGRESS);
+        }
+
+        void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override
+        {
+            if (m_bIsResurrected)
+                return;
+
+            if (m_bIsFakingDeath)
+            {
+                uiDamage = 0;
+                return;
+            }
+
+            if (uiDamage >= m_creature->GetHealth())
+            {
+                uiDamage = 0;
+
+                DoScriptText(SAY_DEATH_FIRST, m_creature);
+
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_BANSHEE, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_FEIGN_DEATH, CAST_TRIGGERED);
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+                m_bIsFakingDeath = true;
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_TRANSFORM)
+            {
+                DoScriptText(SAY_AGGRO_SECOND, m_creature);
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+#if defined (CATA)
+                m_creature->UpdateEntry(pSpell->GetEffectMiscValue(EFFECT_INDEX_0));
+#else
+                m_creature->UpdateEntry(pSpell->EffectMiscValue[EFFECT_INDEX_0]);
+#endif
+                m_bIsResurrected = true;
+                m_bIsFakingDeath = false;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_THROW_DUMMY:
+                // ToDo: should this move to the target?
+                pSummoned->CastSpell(pSummoned, m_bIsRegularMode ? SPELL_SHADOW_AXE_PROC : SPELL_SHADOW_AXE_PROC_H, true);
+                break;
+
+            case NPC_ANNHYLDE:
+                // This is not blizzlike - npc should be summoned above the boss and should move slower
+                pSummoned->CastSpell(pSummoned, SPELL_ASTRAL_TELEPORT, false);
+                pSummoned->SetLevitate(true);
+                pSummoned->GetMotionMaster()->MovePoint(POINT_ID_ANNHYLDE, pSummoned->GetPositionX(), pSummoned->GetPositionY(), pSummoned->GetPositionZ() + 15.0f);
+                break;
+
+            case NPC_GROUND_VISUAL:
+                pSummoned->CastSpell(pSummoned, SPELL_SCOURGE_RES_BUBBLE, false);
+                // npc doesn't despawn on time
+                pSummoned->ForcedDespawn(8000);
+                break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH_SECOND, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_INGVAR, DONE);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (urand(0, 1))
+                DoScriptText(m_bIsResurrected ? SAY_KILL_SECOND : SAY_KILL_FIRST, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_INGVAR, FAIL);
+
+            m_creature->UpdateEntry(NPC_INGVAR);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim() || m_bIsFakingDeath)
+                return;
+
+            if (!m_bIsResurrected)                              // First phase
+            {
+                if (m_uiCleaveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                        m_uiCleaveTimer = urand(2500, 7000);
+                }
+                else
+                    m_uiCleaveTimer -= uiDiff;
+
+                if (m_uiSmashTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SMASH : SPELL_SMASH_H) == CAST_OK)
+                        m_uiSmashTimer = urand(8000, 15000);
+                }
+                else
+                    m_uiSmashTimer -= uiDiff;
+
+                if (m_uiStaggeringRoarTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_STAGGERING_ROAR : SPELL_STAGGERING_ROAR_H) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_ROAR, m_creature);
+                        m_uiStaggeringRoarTimer = urand(15000, 30000);
+                    }
+                }
+                else
+                    m_uiStaggeringRoarTimer -= uiDiff;
+
+                if (m_uiEnrageTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ENRAGE : SPELL_ENRAGE_H) == CAST_OK)
+                        m_uiEnrageTimer = urand(10000, 20000);
+                }
+                else
+                    m_uiEnrageTimer -= uiDiff;
+            }
+            else                                                // Second phase
+            {
+                if (m_uiCleaveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_WOE_STRIKE : SPELL_WOE_STRIKE_H) == CAST_OK)
+                        m_uiCleaveTimer = urand(2500, 7000);
+                }
+                else
+                    m_uiCleaveTimer -= uiDiff;
+
+                if (m_uiSmashTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DARK_SMASH_H) == CAST_OK)
+                        m_uiSmashTimer = urand(8000, 15000);
+                }
+                else
+                    m_uiSmashTimer -= uiDiff;
+
+                if (m_uiStaggeringRoarTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_DREADFUL_ROAR : SPELL_DREADFUL_ROAR_H) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_ROAR, m_creature);
+                        m_uiStaggeringRoarTimer = urand(15000, 30000);
+                    }
+                }
+                else
+                    m_uiStaggeringRoarTimer -= uiDiff;
+
+                if (m_uiEnrageTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_AXE) == CAST_OK)
+                        m_uiEnrageTimer = urand(10000, 20000);
+                }
+                else
+                    m_uiEnrageTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ingvarAI(pCreature);
+    }
+};
+
+/*######
+## npc_annhylde
+######*/
+
+struct npc_annhylde : public CreatureScript
+{
+    npc_annhylde() : CreatureScript("npc_annhylde") {}
+
+    struct npc_annhyldeAI : public ScriptedAI
+    {
+        npc_annhyldeAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiResurrectTimer;
+        uint8 m_uiResurrectPhase;
+
+        void Reset() override
+        {
+            m_uiResurrectTimer = 0;
+            m_uiResurrectPhase = 0;
+        }
+
+        // No attacking
+        void MoveInLineOfSight(Unit*) override {}
+        void AttackStart(Unit*) override {}
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || uiPointId != POINT_ID_ANNHYLDE)
+                return;
+
+            DoScriptText(SAY_ANNHYLDE_REZ, m_creature);
+            m_uiResurrectTimer = 3000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiResurrectTimer)
+            {
+                if (m_uiResurrectTimer <= uiDiff)
+                {
+                    if (!m_pInstance)
+                        return;
+
+                    switch (m_uiResurrectPhase)
+                    {
+                    case 0:
+                        DoCastSpellIfCan(m_creature, SPELL_SCOURGE_RES_CHANNEL);
+                        if (Creature* pIngvar = m_pInstance->GetSingleCreatureFromStorage(NPC_INGVAR))
+                        {
+                            if (pIngvar->HasAura(SPELL_SUMMON_BANSHEE))
+                                pIngvar->RemoveAurasDueToSpell(SPELL_SUMMON_BANSHEE);
+                        }
+                        m_uiResurrectTimer = 3000;
+                        break;
+                    case 1:
+                        if (Creature* pIngvar = m_pInstance->GetSingleCreatureFromStorage(NPC_INGVAR))
+                        {
+                            pIngvar->CastSpell(pIngvar, SPELL_SCOURGE_RES_SUMMON, true);
+                            // Workaround - set Feign death again because it's removed by the previous casted spell
+                            pIngvar->CastSpell(pIngvar, SPELL_FEIGN_DEATH, true);
+                        }
+                        m_uiResurrectTimer = 5000;
+                        break;
+                    case 2:
+                        if (Creature* pIngvar = m_pInstance->GetSingleCreatureFromStorage(NPC_INGVAR))
+                            pIngvar->CastSpell(pIngvar, SPELL_SCOURGE_RES_HEAL, false);
+                        m_uiResurrectTimer = 3000;
+                        break;
+                    case 3:
+                        if (Creature* pIngvar = m_pInstance->GetSingleCreatureFromStorage(NPC_INGVAR))
+                            pIngvar->CastSpell(pIngvar, SPELL_TRANSFORM, false);
+                        // despawn the creature
+                        m_creature->GetMotionMaster()->MovePoint(2, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() + 50);
+                        m_creature->ForcedDespawn(5000);
+                        m_uiResurrectTimer = 0;
+                        break;
+                    }
+
+                    ++m_uiResurrectPhase;
+                }
+                else
+                    m_uiResurrectTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_annhyldeAI(pCreature);
+    }
+};
+
+void AddSC_boss_ingvar()
+{
+    Script* s;
+
+    s = new boss_ingvar();
+    s->RegisterSelf();
+    s = new npc_annhylde();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ingvar";
+    //pNewScript->GetAI = &GetAI_boss_ingvar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_annhylde";
+    //pNewScript->GetAI = &GetAI_npc_annhylde;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp
new file mode 100644
index 000000000..73eb079da
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp
@@ -0,0 +1,370 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Keleseth
+SD%Complete: 60%
+SDComment:
+SDCategory: Utgarde Keep
+EndScriptData */
+
+#include "precompiled.h"
+#include "utgarde_keep.h"
+
+enum
+{
+    SAY_AGGRO               = -1574000,
+    SAY_FROSTTOMB           = -1574001,
+    SAY_SKELETONS           = -1574002,
+    SAY_KILL                = -1574003,
+    SAY_DEATH               = -1574004,
+    EMOTE_FROST_TOMB        = -1574021,
+
+    // Boss Spells
+    SPELL_SHADOWBOLT        = 43667,
+    SPELL_SHADOWBOLT_H      = 59389,
+
+    SPELL_SUMMON_FROST_TOMB = 42714,
+    SPELL_FROST_TOMB        = 48400,                        // stun and deal damage
+
+    // Skeleton Spells
+    SPELL_DECREPIFY         = 42702,
+    SPELL_DECREPIFY_H       = 59397,
+    SPELL_BONE_ARMOR        = 59386,                        // casted on boss, heroic only
+
+    NPC_VRYKUL_SKELETON     = 23970
+};
+
+const float RUN_DISTANCE = 20.0;
+
+static float fAddPosition[4] = {163.5727f, 252.1900f, 42.8684f, 5.57052f};
+
+/*######
+## mob_vrykul_skeleton
+######*/
+
+struct mob_vrykul_skeleton : public CreatureScript
+{
+    mob_vrykul_skeleton() : CreatureScript("mob_vrykul_skeleton") {}
+
+    struct mob_vrykul_skeletonAI : public ScriptedAI
+    {
+        mob_vrykul_skeletonAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = m_creature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiCastTimer;
+        uint32 m_uiReviveTimer;
+
+        void Reset() override
+        {
+            m_uiReviveTimer = 0;
+            m_uiCastTimer = urand(5000, 10000);                 // taken out of thin air
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!pWho || m_uiReviveTimer)
+                return;
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (!pWho || m_uiReviveTimer)
+                return;
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void Revive()
+        {
+            m_creature->SetHealth(m_creature->GetMaxHealth());
+            m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                m_creature->GetMotionMaster()->MoveChase(pTarget);
+
+            DoResetThreat();
+            m_uiReviveTimer = 0;
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (m_uiReviveTimer)
+            {
+                uiDamage = 0;
+                return;
+            }
+
+            if (m_creature->GetHealth() < uiDamage)
+            {
+                // start faking death
+                uiDamage = 0;
+                m_uiReviveTimer = 6000;
+                m_creature->SetHealth(0);
+                m_creature->RemoveAllAurasOnDeath();
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
+                m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+                return;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiReviveTimer)
+            {
+                if (m_uiReviveTimer <= uiDiff)
+                    Revive();
+                else
+                    m_uiReviveTimer -= uiDiff;
+
+                return;
+            }
+
+            if (m_uiCastTimer < uiDiff)
+            {
+                if (m_bIsRegularMode)
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_DECREPIFY);
+                else
+                {
+                    if (urand(0, 3))
+                        DoCastSpellIfCan(m_creature->getVictim(), SPELL_DECREPIFY_H);
+                    else if (m_pInstance && m_pInstance->GetData(TYPE_KELESETH) == IN_PROGRESS)
+                    {
+                        if (Creature* pKeleseth = m_pInstance->GetSingleCreatureFromStorage(NPC_KELESETH))
+                            DoCastSpellIfCan(pKeleseth, SPELL_BONE_ARMOR);
+                    }
+                }
+
+                m_uiCastTimer = urand(5000, 15000);
+            }
+            else
+                m_uiCastTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_vrykul_skeletonAI(pCreature);
+    }
+};
+
+/*######
+## boss_keleseth
+######*/
+
+struct boss_keleseth : public CreatureScript
+{
+    boss_keleseth() : CreatureScript("boss_keleseth") {}
+
+    struct boss_kelesethAI : public ScriptedAI
+    {
+        boss_kelesethAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiFrostTombTimer;
+        uint32 m_uiSummonTimer;
+        uint32 m_uiShadowboltTimer;
+
+        GuidList m_lSummonedAddGuids;
+
+        void Reset() override
+        {
+            // timers need confirmation
+            m_uiFrostTombTimer = 20000;
+            m_uiSummonTimer = 5000;
+            m_uiShadowboltTimer = 0;
+
+            DespawnOrKillAdds(true);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+
+                m_creature->GetMotionMaster()->MoveChase(pWho, RUN_DISTANCE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_KELESETH, IN_PROGRESS);
+        }
+
+        void SummonAdds()
+        {
+            for (uint8 i = 0; i < 4; ++i)
+                m_creature->SummonCreature(NPC_VRYKUL_SKELETON, fAddPosition[0] + rand() % 7, fAddPosition[1] + rand() % 7, fAddPosition[2], fAddPosition[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        void DespawnOrKillAdds(bool bDespawn)
+        {
+            for (GuidList::const_iterator itr = m_lSummonedAddGuids.begin(); itr != m_lSummonedAddGuids.end(); ++itr)
+            {
+                if (Creature* pAdd = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    if (bDespawn)
+                        pAdd->ForcedDespawn();
+                    else
+                    {
+                        pAdd->SetDeathState(JUST_DIED);
+                        pAdd->SetHealth(0);
+                    }
+                }
+            }
+
+            m_lSummonedAddGuids.clear();
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_VRYKUL_SKELETON)
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+                m_lSummonedAddGuids.push_back(pSummoned->GetObjectGuid());
+            }
+
+            if (pSummoned->GetEntry() == NPC_FROST_TOMB)
+                pSummoned->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_FROST, true);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_KELESETH, DONE);
+
+            DespawnOrKillAdds(false);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_KELESETH, FAIL);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_KILL, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiSummonTimer)
+            {
+                if (m_uiSummonTimer <= uiDiff)
+                {
+                    SummonAdds();
+                    m_uiSummonTimer = 0;
+                }
+                else
+                    m_uiSummonTimer -= uiDiff;
+            }
+
+            if (m_uiShadowboltTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_SHADOWBOLT : SPELL_SHADOWBOLT_H);
+                m_uiShadowboltTimer = 3000;
+            }
+            else
+                m_uiShadowboltTimer -= uiDiff;
+
+            if (m_uiFrostTombTimer < uiDiff)
+            {
+                if (Unit* pTombTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    // DoCastSpellIfCan(pTombTarget, SPELL_SUMMON_FROST_TOMB);
+                    float fPosX, fPosY, fPosZ;
+                    pTombTarget->GetPosition(fPosX, fPosY, fPosZ);
+
+                    if (Creature* pFrostTomb = m_creature->SummonCreature(NPC_FROST_TOMB, fPosX, fPosY, fPosZ, 0, TEMPSUMMON_TIMED_DESPAWN, 20000))
+                    {
+                        pFrostTomb->AddThreat(pTombTarget);
+                        pFrostTomb->CastSpell(pTombTarget, SPELL_FROST_TOMB, false);
+                    }
+
+                    DoScriptText(SAY_FROSTTOMB, m_creature);
+                    DoScriptText(EMOTE_FROST_TOMB, m_creature, pTombTarget);
+                }
+
+                m_uiFrostTombTimer = 25000;
+            }
+            else
+                m_uiFrostTombTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_kelesethAI(pCreature);
+    }
+};
+
+void AddSC_boss_keleseth()
+{
+    Script* s;
+
+    s = new boss_keleseth();
+    s->RegisterSelf();
+    s = new mob_vrykul_skeleton();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_keleseth";
+    //pNewScript->GetAI = &GetAI_boss_keleseth;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_vrykul_skeleton";
+    //pNewScript->GetAI = &GetAI_mob_vrykul_skeleton;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_and_dalronn.cpp b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_and_dalronn.cpp
new file mode 100644
index 000000000..4758d1fb4
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_and_dalronn.cpp
@@ -0,0 +1,352 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Skarvald_and_Dalronn
+SD%Complete: 60%
+SDComment: TODO: correct timers
+SDCategory: Utgarde Keep
+EndScriptData */
+
+#include "precompiled.h"
+#include "utgarde_keep.h"
+
+enum
+{
+    SAY_SKA_AGGRO                       = -1574011,
+    SAY_SKA_DEATH                       = -1574012,
+    SAY_SKA_DEATH_REAL                  = -1574013,
+    SAY_SKA_KILL                        = -1574014,
+    SAY_SKA_DAL_DIES_REPLY              = -1574015,
+
+    SAY_DAL_AGGRO_REPLY                 = -1574016,
+    SAY_DAL_DEATH                       = -1574017,
+    SAY_DAL_DEATH_REAL                  = -1574018,
+    SAY_DAL_KILL                        = -1574019,
+    SAY_DAL_SKA_DIES_REPLY              = -1574020,
+
+    SPELL_SUMMON_DAL_GHOST              = 48612,
+    SPELL_SUMMON_SKA_GHOST              = 48613,
+
+    NPC_DAL_GHOST                       = 27389,
+    NPC_SKA_GHOST                       = 27390,
+
+    NPC_SKELETAL                        = 28878,            // summoned guardian in heroic
+
+    // skarvald
+    SPELL_CHARGE                        = 43651,
+    SPELL_STONE_STRIKE                  = 48583,
+    SPELL_ENRAGE                        = 48193,
+
+    // dalronn
+    SPELL_SHADOW_BOLT                   = 43649,
+    SPELL_SHADOW_BOLT_H                 = 59575,
+
+    SPELL_DEBILITATE                    = 43650,
+    SPELL_DEBILITATE_H                  = 59577,
+
+    SPELL_SUMMON_SKELETONS              = 52611
+};
+
+struct Yell
+{
+    int32   m_iTextId;
+    int32   m_iTextReplyId;
+};
+
+Yell m_aYell[] =
+{
+    {SAY_SKA_AGGRO, SAY_DAL_AGGRO_REPLY},
+    {SAY_SKA_DEATH, SAY_DAL_SKA_DIES_REPLY},
+    {SAY_DAL_DEATH, SAY_SKA_DAL_DIES_REPLY}
+};
+
+struct boss_s_and_d_dummyAI : public ScriptedAI
+{
+    boss_s_and_d_dummyAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        Reset();
+    }
+
+    ScriptedInstance* m_pInstance;
+    bool m_bIsRegularMode;
+    ObjectGuid m_ghostGuid;
+
+    Creature* GetBuddy()
+    {
+        if (!m_pInstance)
+            return NULL;
+
+        return m_pInstance->GetSingleCreatureFromStorage(m_creature->GetEntry() == NPC_DALRONN ? NPC_SKARVALD : NPC_DALRONN);
+    }
+
+    void Reset() override { }
+
+    void JustReachedHome() override
+    {
+        if (Creature* pBuddy = GetBuddy())
+        {
+            if (pBuddy->IsDead())
+                pBuddy->Respawn();
+        }
+
+        if (Creature* pGhost = m_creature->GetMap()->GetCreature(m_ghostGuid))
+        {
+            if (pGhost->IsAlive())
+                pGhost->ForcedDespawn();
+        }
+    }
+
+    void EnterCombat(Unit* pWho) override
+    {
+        if (!pWho)
+            return;
+
+        if (Creature* pBuddy = GetBuddy())
+        {
+            if (!pBuddy->getVictim())
+                pBuddy->AI()->AttackStart(pWho);
+        }
+
+        Aggro(pWho);
+    }
+
+    void JustSummoned(Creature* pSummoned) override
+    {
+        // EventAI can probably handle ghosts
+        if (pSummoned->GetEntry() == NPC_DAL_GHOST || pSummoned->GetEntry() == NPC_SKA_GHOST)
+            m_ghostGuid = pSummoned->GetObjectGuid();
+
+        Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 1);
+
+        if (m_creature->getVictim())
+            pSummoned->AI()->AttackStart(pTarget ? pTarget : m_creature->getVictim());
+    }
+
+    void JustDied(Unit* /*pKiller*/) override
+    {
+        if (Creature* pBuddy = GetBuddy())
+        {
+            if (pBuddy->IsAlive())
+            {
+                DoScriptText(m_creature->GetEntry() == NPC_SKARVALD ? m_aYell[1].m_iTextId : m_aYell[2].m_iTextId, m_creature);
+                DoScriptText(m_creature->GetEntry() == NPC_SKARVALD ? m_aYell[1].m_iTextReplyId : m_aYell[2].m_iTextReplyId, pBuddy);
+
+                pBuddy->CastSpell(m_creature, m_creature->GetEntry() == NPC_SKARVALD ? SPELL_SUMMON_SKA_GHOST : SPELL_SUMMON_DAL_GHOST, true);
+
+                m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+            }
+            else
+            {
+                if (Creature* pGhost = m_creature->GetMap()->GetCreature(m_ghostGuid))
+                    pGhost->ForcedDespawn();
+
+                pBuddy->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+            }
+        }
+    }
+};
+
+/*######
+## boss_skarvald
+######*/
+
+struct boss_skarvald : public CreatureScript
+{
+    boss_skarvald() : CreatureScript("boss_skarvald") {}
+
+    struct boss_skarvaldAI : public boss_s_and_d_dummyAI
+    {
+        boss_skarvaldAI(Creature* pCreature) : boss_s_and_d_dummyAI(pCreature) { }
+
+        uint32 m_uiYellDelayTimer;
+        uint32 m_uiChargeTimer;
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiStoneStrikeTimer;
+
+        void Reset() override
+        {
+            m_uiYellDelayTimer = 0;
+            m_uiChargeTimer = urand(2000, 6000);
+            m_uiEnrageTimer = 15000;
+            m_uiStoneStrikeTimer = 8000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(m_aYell[0].m_iTextId, m_creature);
+            m_uiYellDelayTimer = 5000;
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_SKA_KILL, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiYellDelayTimer)
+            {
+                if (m_uiYellDelayTimer <= uiDiff)
+                {
+                    if (Creature* pBuddy = GetBuddy())
+                        DoScriptText(m_aYell[0].m_iTextReplyId, pBuddy);
+
+                    m_uiYellDelayTimer = 0;
+                }
+                else
+                    m_uiYellDelayTimer -= uiDiff;
+            }
+
+            if (m_uiChargeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                    DoCastSpellIfCan(pTarget, SPELL_CHARGE);
+
+                m_uiChargeTimer = urand(8000, 16000);
+            }
+            else
+                m_uiChargeTimer -= uiDiff;
+
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_ENRAGE);
+                m_uiEnrageTimer = 20000;
+            }
+            else
+                m_uiEnrageTimer -= uiDiff;
+
+            if (m_uiStoneStrikeTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_STONE_STRIKE);
+                m_uiStoneStrikeTimer = urand(5000, 15000);
+            }
+            else
+                m_uiStoneStrikeTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_skarvaldAI(pCreature);
+    }
+};
+
+/*######
+## boss_dalronn
+######*/
+
+struct boss_dalronn : public CreatureScript
+{
+    boss_dalronn() : CreatureScript("boss_dalronn") {}
+
+    struct boss_dalronnAI : public boss_s_and_d_dummyAI
+    {
+        boss_dalronnAI(Creature* pCreature) : boss_s_and_d_dummyAI(pCreature) { }
+
+        uint32 m_uiDebilitateTimer;
+        uint32 m_uiShadowBoltTimer;
+        uint32 m_uiSkeletonTimer;
+
+        void Reset() override
+        {
+            m_uiDebilitateTimer = urand(5000, 10000);
+            m_uiShadowBoltTimer = urand(2500, 6000);
+            m_uiSkeletonTimer = urand(25000, 35000);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_DAL_KILL, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiDebilitateTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_DEBILITATE : SPELL_DEBILITATE_H);
+
+                m_uiDebilitateTimer = urand(12000, 20000);
+            }
+            else
+                m_uiDebilitateTimer -= uiDiff;
+
+            if (m_uiShadowBoltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_SHADOW_BOLT : SPELL_SHADOW_BOLT_H);
+
+                m_uiShadowBoltTimer = urand(3000, 6000);
+            }
+            else
+                m_uiShadowBoltTimer -= uiDiff;
+
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiSkeletonTimer < uiDiff)
+                {
+                    if (!m_creature->FindGuardianWithEntry(NPC_SKELETAL))
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_SKELETONS);
+
+                    m_uiSkeletonTimer = 30000;
+                }
+                else
+                    m_uiSkeletonTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_dalronnAI(pCreature);
+    }
+};
+
+void AddSC_boss_skarvald_and_dalronn()
+{
+    Script* s;
+
+    s = new boss_skarvald();
+    s->RegisterSelf();
+    s = new boss_dalronn();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_skarvald";
+    //pNewScript->GetAI = &GetAI_boss_skarvald;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_dalronn";
+    //pNewScript->GetAI = &GetAI_boss_dalronn;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
new file mode 100644
index 000000000..264d3f086
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
@@ -0,0 +1,223 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Utgarde_Keep
+SD%Complete: 20%
+SDComment:
+SDCategory: Utgarde Keep
+EndScriptData */
+
+#include "precompiled.h"
+#include "utgarde_keep.h"
+
+struct is_utgarde_keep : public InstanceScript
+{
+    is_utgarde_keep() : InstanceScript("instance_utgarde_keep") {}
+
+    class instance_utgarde_keep : public ScriptedInstance
+    {
+    public:
+        instance_utgarde_keep(Map* pMap) : ScriptedInstance(pMap),
+            m_bKelesethAchievFailed(false)
+        {
+            Initialize();
+        }
+
+        ~instance_utgarde_keep() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_KELESETH:
+            case NPC_SKARVALD:
+            case NPC_DALRONN:
+            case NPC_INGVAR:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_BELLOW_1:
+                if (m_auiEncounter[TYPE_BELLOW_1] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_BELLOW_2:
+                if (m_auiEncounter[TYPE_BELLOW_2] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_BELLOW_3:
+                if (m_auiEncounter[TYPE_BELLOW_3] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_FORGEFIRE_1:
+                if (m_auiEncounter[TYPE_BELLOW_1] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_FORGEFIRE_2:
+                if (m_auiEncounter[TYPE_BELLOW_2] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_FORGEFIRE_3:
+                if (m_auiEncounter[TYPE_BELLOW_3] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_PORTCULLIS_EXIT_1:
+            case GO_PORTCULLIS_EXIT_2:
+                if (m_auiEncounter[TYPE_INGVAR] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_PORTCULLIS_COMBAT:
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_FROST_TOMB)
+                m_bKelesethAchievFailed = true;
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_KELESETH:
+                if (uiData == IN_PROGRESS)
+                    m_bKelesethAchievFailed = false;
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_SKARVALD_DALRONN:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_INGVAR:
+                if (m_auiEncounter[uiType] == uiData)
+                    return;
+                DoUseDoorOrButton(GO_PORTCULLIS_COMBAT);
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_PORTCULLIS_EXIT_1);
+                    DoUseDoorOrButton(GO_PORTCULLIS_EXIT_2);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_BELLOW_1:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_BELLOW_2:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_BELLOW_3:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] >> m_auiEncounter[4] >> m_auiEncounter[5];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            if (uiCriteriaId == ACHIEV_CRIT_ON_THE_ROCKS)
+                return !m_bKelesethAchievFailed;
+
+            return false;
+        }
+
+    private:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        bool m_bKelesethAchievFailed;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_utgarde_keep(pMap);
+    }
+};
+
+void AddSC_instance_utgarde_keep()
+{
+    Script* s;
+
+    s = new is_utgarde_keep();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_utgarde_keep";
+    //pNewScript->GetInstanceData = GetInstanceData_instance_utgarde_keep;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp
new file mode 100644
index 000000000..7d088223c
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp
@@ -0,0 +1,168 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Utgarde_Keep
+SD%Complete: 75
+SDComment:
+SDCategory: Utgarde Keep
+EndScriptData */
+
+/* ContentData
+mob_dragonflayer_forge_master
+EndContentData */
+
+#include "precompiled.h"
+#include "utgarde_keep.h"
+
+/*######
+## mob_dragonflayer_forge_master
+######*/
+
+enum
+{
+    SPELL_BURNING_BRAND     = 43757,
+    SPELL_BURNING_BRAND_H   = 59601,
+    SPELL_CAUTERIZE         = 60211,
+
+    MAX_FORGE               = 3
+};
+
+struct mob_dragonflayer_forge_master : public CreatureScript
+{
+    mob_dragonflayer_forge_master() : CreatureScript("mob_dragonflayer_forge_master") {}
+
+    struct mob_dragonflayer_forge_masterAI : public ScriptedAI
+    {
+        mob_dragonflayer_forge_masterAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_uiForgeEncounterId = 0;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiForgeEncounterId;
+        uint32 m_uiBurningBrandTimer;
+
+        void Reset() override
+        {
+            m_uiBurningBrandTimer = 2000;
+        }
+
+        void SetMyForge()
+        {
+            std::list<GameObject*> lGOList;
+            uint32 uiGOBellow = 0;
+            uint32 uiGOFire = 0;
+
+            for (uint8 i = 0; i < MAX_FORGE; ++i)
+            {
+                switch (i)
+                {
+                case 0: uiGOBellow = GO_BELLOW_1; break;
+                case 1: uiGOBellow = GO_BELLOW_2; break;
+                case 2: uiGOBellow = GO_BELLOW_3; break;
+                }
+
+                if (GameObject* pGOTemp = m_pInstance->GetSingleGameObjectFromStorage(uiGOBellow))
+                    lGOList.push_back(pGOTemp);
+            }
+
+            if (!lGOList.empty())
+            {
+                if (lGOList.size() != MAX_FORGE)
+                    script_error_log("mob_dragonflayer_forge_master expected %u in lGOList, but does not match.", MAX_FORGE);
+
+                lGOList.sort(ObjectDistanceOrder(m_creature));
+
+                if (lGOList.front()->getLootState() == GO_READY)
+                    lGOList.front()->UseDoorOrButton(DAY);
+                else if (lGOList.front()->getLootState() == GO_ACTIVATED)
+                    lGOList.front()->ResetDoorOrButton();
+
+                switch (lGOList.front()->GetEntry())
+                {
+                case GO_BELLOW_1: uiGOFire = GO_FORGEFIRE_1; m_uiForgeEncounterId = TYPE_BELLOW_1; break;
+                case GO_BELLOW_2: uiGOFire = GO_FORGEFIRE_2; m_uiForgeEncounterId = TYPE_BELLOW_2; break;
+                case GO_BELLOW_3: uiGOFire = GO_FORGEFIRE_3; m_uiForgeEncounterId = TYPE_BELLOW_3; break;
+                }
+
+                if (GameObject* pGOTemp = m_pInstance->GetSingleGameObjectFromStorage(uiGOFire))
+                {
+                    if (pGOTemp->getLootState() == GO_READY)
+                        pGOTemp->UseDoorOrButton(DAY);
+                    else if (pGOTemp->getLootState() == GO_ACTIVATED)
+                        pGOTemp->ResetDoorOrButton();
+                }
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            SetMyForge();
+        }
+
+        void JustReachedHome() override
+        {
+            SetMyForge();
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(m_uiForgeEncounterId, DONE);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiBurningBrandTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_BURNING_BRAND : SPELL_BURNING_BRAND_H);
+                m_uiBurningBrandTimer = 15000;
+            }
+            else m_uiBurningBrandTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_dragonflayer_forge_masterAI(pCreature);
+    }
+};
+
+void AddSC_utgarde_keep()
+{
+    Script* s;
+
+    s = new mob_dragonflayer_forge_master();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_dragonflayer_forge_master";
+    //pNewScript->GetAI = &GetAI_mob_dragonflayer_forge_master;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.h b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.h
new file mode 100644
index 000000000..b217885a7
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.h
@@ -0,0 +1,38 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_UTG_KEEP_H
+#define DEF_UTG_KEEP_H
+
+enum
+{
+    MAX_ENCOUNTER               = 6,
+
+    TYPE_KELESETH               = 0,
+    TYPE_SKARVALD_DALRONN       = 1,
+    TYPE_INGVAR                 = 2,
+    TYPE_BELLOW_1               = 3,
+    TYPE_BELLOW_2               = 4,
+    TYPE_BELLOW_3               = 5,
+
+    NPC_KELESETH                = 23953,
+    NPC_SKARVALD                = 24200,
+    NPC_DALRONN                 = 24201,
+    NPC_INGVAR                  = 23954,
+
+    NPC_FROST_TOMB              = 23965,
+
+    GO_BELLOW_1                 = 186688,
+    GO_BELLOW_2                 = 186689,
+    GO_BELLOW_3                 = 186690,
+    GO_FORGEFIRE_1              = 186692,
+    GO_FORGEFIRE_2              = 186693,
+    GO_FORGEFIRE_3              = 186691,
+    GO_PORTCULLIS_COMBAT        = 186612,
+    GO_PORTCULLIS_EXIT_1        = 186694,
+    GO_PORTCULLIS_EXIT_2        = 186756,
+
+    ACHIEV_CRIT_ON_THE_ROCKS    = 7231,
+};
+#endif
diff --git a/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_gortok.cpp b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_gortok.cpp
new file mode 100644
index 000000000..46d26e8d1
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_gortok.cpp
@@ -0,0 +1,251 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Gortok
+SD%Complete: 90%
+SDComment: Timers; The subbosses and Gortok should be activated on aura remove
+SDCategory: Utgarde Pinnacle
+EndScriptData */
+
+#include "precompiled.h"
+#include "utgarde_pinnacle.h"
+
+enum
+{
+    SAY_AGGRO               = -1575015,
+    SAY_SLAY_1              = -1575016,
+    SAY_SLAY_2              = -1575017,
+    SAY_DEATH               = -1575018,
+
+    SPELL_FREEZE_ANIM       = 16245,
+
+    SPELL_IMPALE            = 48261,
+    SPELL_IMPALE_H          = 59268,
+
+    SPELL_WITHERING_ROAR    = 48256,
+    SPELL_WITHERING_ROAR_H  = 59267,
+
+    SPELL_ARCING_SMASH      = 48260
+};
+
+/*######
+## boss_gortok
+######*/
+
+struct boss_gortok : public CreatureScript
+{
+    boss_gortok() : CreatureScript("boss_gortok") {}
+
+    struct boss_gortokAI : public ScriptedAI
+    {
+        boss_gortokAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiRoarTimer;
+        uint32 m_uiImpaleTimer;
+        uint32 m_uiArcingSmashTimer;
+
+        void Reset() override
+        {
+            m_uiRoarTimer = 10000;
+            m_uiImpaleTimer = 15000;
+            m_uiArcingSmashTimer = urand(5000, 8000);
+
+            // This needs to be reset in case the event fails
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GORTOK, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_GORTOK, FAIL);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiRoarTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_WITHERING_ROAR : SPELL_WITHERING_ROAR_H) == CAST_OK)
+                    m_uiRoarTimer = 10000;
+            }
+            else
+                m_uiRoarTimer -= uiDiff;
+
+            if (m_uiImpaleTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_IMPALE : SPELL_IMPALE_H) == CAST_OK)
+                        m_uiImpaleTimer = urand(8000, 15000);
+                }
+            }
+            else
+                m_uiImpaleTimer -= uiDiff;
+
+            if (m_uiArcingSmashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ARCING_SMASH) == CAST_OK)
+                    m_uiArcingSmashTimer = urand(5000, 13000);
+            }
+            else
+                m_uiArcingSmashTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_gortokAI(pCreature);
+    }
+};
+
+struct spell_awaken_gorthok : public SpellScript
+{
+    spell_awaken_gorthok() : SpellScript("spell_awaken_gorthok") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_AWAKEN_GORTOK && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+
+            pCreatureTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            pCreatureTarget->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM);
+
+            // Start attacking the players
+            if (InstanceData* pInstance = pCreatureTarget->GetInstanceData())
+            {
+                if (Unit* pStarter = pCreatureTarget->GetMap()->GetUnit(ObjectGuid(pInstance->GetData64(DATA64_GORTHOK_EVENT_STARTER))))
+                    pCreatureTarget->AI()->AttackStart(pStarter);
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+        return false;
+    }
+};
+
+struct aura_awaken_subboss : public AuraScript
+{
+    aura_awaken_subboss() : AuraScript("aura_awaken_subboss") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        // Note: this should be handled on aura remove, but this can't be done because there are some core issues with areaeffect spells
+        if (pAura->GetId() == SPELL_AWAKEN_SUBBOSS && pAura->GetEffIndex() == EFFECT_INDEX_0 && bApply)
+        {
+            if (Creature* pTarget = (Creature*)pAura->GetTarget())
+            {
+                pTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                pTarget->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM);
+
+                // Start attacking the players
+                if (InstanceData* pInstance = pTarget->GetInstanceData())
+                {
+                    if (Unit* pStarter = pTarget->GetMap()->GetUnit(ObjectGuid(pInstance->GetData64(DATA64_GORTHOK_EVENT_STARTER))))
+                        pTarget->AI()->AttackStart(pStarter);
+                }
+            }
+        }
+        return true;
+    }
+};
+
+struct event_spell_gorthok : public MapEventScript
+{
+    event_spell_gorthok() : MapEventScript("event_spell_gorthok") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* /*pTarget*/, bool /*bIsStart*/) override
+    {
+        if (InstanceData* pInstance = ((Creature*)pSource)->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_GORTOK) == IN_PROGRESS || pInstance->GetData(TYPE_GORTOK) == DONE)
+                return false;
+
+            pInstance->SetData(TYPE_GORTOK, IN_PROGRESS);
+            pInstance->SetData64(DATA64_GORTHOK_EVENT_STARTER, pSource->GetObjectGuid().GetRawValue());
+            return true;
+        }
+        return false;
+    }
+};
+
+void AddSC_boss_gortok()
+{
+    Script* s;
+
+    s = new boss_gortok();
+    s->RegisterSelf();
+
+    s = new event_spell_gorthok();
+    s->RegisterSelf();
+
+    s = new spell_awaken_gorthok();
+    s->RegisterSelf();
+
+    s = new aura_awaken_subboss();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_gortok";
+    //pNewScript->GetAI = &GetAI_boss_gortok;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_spell_awaken_gortok;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_gortok_subboss";
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_spell_aura_dummy_awaken_subboss;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_spell_gortok_event";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_spell_gortok_event;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
new file mode 100644
index 000000000..caf047a7b
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
@@ -0,0 +1,586 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Skadi
+SD%Complete: 80%
+SDComment: The gauntlet movement needs to be random choosed for left and right. Event reset not implemented using the proper spell
+SDCategory: Utgarde Pinnacle
+EndScriptData */
+
+#include "precompiled.h"
+#include "utgarde_pinnacle.h"
+
+enum
+{
+    SAY_AGGRO                       = -1575019,
+    SAY_DRAKEBREATH_1               = -1575020,
+    SAY_DRAKEBREATH_2               = -1575021,
+    SAY_DRAKEBREATH_3               = -1575022,
+    SAY_DRAKE_HARPOON_1             = -1575023,
+    SAY_DRAKE_HARPOON_2             = -1575024,
+    SAY_KILL_1                      = -1575025,
+    SAY_KILL_2                      = -1575026,
+    SAY_KILL_3                      = -1575027,
+    SAY_DEATH                       = -1575028,
+    SAY_DRAKE_DEATH                 = -1575029,
+    EMOTE_HARPOON_RANGE             = -1575030,
+    EMOTE_DEEP_BREATH               = -1575041,
+
+    // phase 1 spells
+    SPELL_RIDE_VEHICLE              = 61791,
+    SPELL_FREEZING_CLOUD_LEFT       = 47590,
+    SPELL_FREEZING_CLOUD_RIGHT      = 47592,
+    SPELL_SKADI_TELEPORT            = 61790,                // teleport when Grauf is killed
+    SPELL_GAUNTLET_PERIODIC         = 47546,                // what is this? Unknown use/effect, but probably related - cast by each player
+    SPELL_SUMMON_GAUNTLET_MOBS      = 48630,                // tick every 30 sec
+    SPELL_SUMMON_GAUNTLET_MOBS_H    = 59275,                // tick every 25 sec
+    SPELL_LAUNCH_HARPOON            = 48642,                // this spell hit drake to reduce HP (force triggered from 48641)
+    SPELL_CLOUD_AURA_LEFT           = 47574,
+    SPELL_CLOUD_AURA_RIGHT          = 47594,
+    SPELL_CLOUD_AURA_DAMAGE         = 47579,
+
+    // phase 2 spells
+    SPELL_CRUSH                     = 50234,
+    SPELL_CRUSH_H                   = 59330,
+    SPELL_WHIRLWIND                 = 50228,
+    SPELL_WHIRLWIND_H               = 59322,
+    SPELL_POISONED_SPEAR            = 50255,
+    SPELL_POISONED_SPEAR_H          = 59331,
+
+    MAX_INTRO_MOBS                  = 13,
+
+    PHASE_GAUNTLET                  = 1,
+    PHASE_NORMAL_COMBAT             = 2,
+};
+
+struct GauntletIntroData
+{
+    uint32 uiCreatureId;
+    float fX, fY, fZ;
+};
+
+static const GauntletIntroData aSkadiIntroData[MAX_INTRO_MOBS] =
+{
+    {NPC_YMIRJAR_WITCH_DOCTOR, 478.31f, -511.049f, 104.7242f},
+    {NPC_YMIRJAR_HARPOONER, 482.25f, -514.1273f, 104.7234f},
+    {NPC_YMIRJAR_HARPOONER, 481.3883f, -507.1089f, 104.7241f},
+    {NPC_YMIRJAR_WARRIOR, 458.5323f, -516.2537f, 104.617f},
+    {NPC_YMIRJAR_WARRIOR, 429.4242f, -517.5624f, 104.8936f},
+    {NPC_YMIRJAR_WARRIOR, 427.4026f, -510.7716f, 104.8802f},
+    {NPC_YMIRJAR_WARRIOR, 458.5323f, -510.2537f, 104.617f},
+    {NPC_YMIRJAR_WARRIOR, 397.036f, -515.158f, 104.725f},                 // the rest are guesswork but follow the same pattern
+    {NPC_YMIRJAR_WARRIOR, 397.036f, -507.158f, 104.725f},
+    {NPC_YMIRJAR_WARRIOR, 360.297f, -508.927f, 104.662f},
+    {NPC_YMIRJAR_WARRIOR, 360.297f, -516.927f, 104.662f},
+    {NPC_YMIRJAR_WARRIOR, 328.324f, -513.387f, 104.577f},
+    {NPC_YMIRJAR_WARRIOR, 328.324f, -504.387f, 104.577f},
+};
+
+/*######
+## boss_skadi
+######*/
+
+struct boss_skadi : public CreatureScript
+{
+    boss_skadi() : CreatureScript("boss_skadi") {}
+
+    struct boss_skadiAI : public ScriptedAI
+    {
+        boss_skadiAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiCrush;
+        uint32 m_uiWhirlwind;
+        uint32 m_uiPoisonedSpear;
+        uint32 m_uiMountTimer;
+        uint8 m_uiPhase;
+        bool m_IntroMobs;
+
+        void Reset() override
+        {
+            m_uiMountTimer = 0;
+            m_uiCrush = 15000;
+            m_uiWhirlwind = 23000;
+            m_uiPoisonedSpear = 10000;
+            m_uiPhase = PHASE_GAUNTLET;
+            m_IntroMobs = false;
+
+            // Set immune during phase 1
+            m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ALL, true);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_uiPhase == PHASE_GAUNTLET)
+                return;
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_uiPhase == PHASE_GAUNTLET)
+                return;
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SKADI, NOT_STARTED);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SKADI, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_KILL_1, m_creature); break;
+            case 1: DoScriptText(SAY_KILL_2, m_creature); break;
+            case 2: DoScriptText(SAY_KILL_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SKADI, DONE);
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_SKADI_TELEPORT)
+            {
+                m_uiPhase = PHASE_NORMAL_COMBAT;
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ALL, false);
+            }
+        }
+
+        void JustSummoned(Creature* pSummon) override
+        {
+            // the intro mobs have predefined positions
+            if (m_IntroMobs)
+                return;
+
+            // Move all the way to the entrance - the exact location is unk so use waypoint movement
+            switch (pSummon->GetEntry())
+            {
+            case NPC_YMIRJAR_HARPOONER:
+            case NPC_YMIRJAR_WARRIOR:
+            case NPC_YMIRJAR_WITCH_DOCTOR:
+                pSummon->SetWalk(false);
+                pSummon->GetMotionMaster()->MoveWaypoint();
+                break;
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            // called only for the intro mobs which are summoned directly
+            pSummoned->SetFacingTo(3.15f);
+            if (pSummoned->GetEntry() == NPC_YMIRJAR_WARRIOR)
+                pSummoned->HandleEmote(EMOTE_STATE_READY1H);
+            else
+                pSummoned->HandleEmote(EMOTE_STATE_READYTHROWN);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* sender, Unit* invoker, uint32 /**/) override
+        {
+            if (eventType != AI_EVENT_CUSTOM_A && sender != m_creature)
+                return;
+
+            DoScriptText(SAY_AGGRO, m_creature);
+            m_uiMountTimer = 3000;
+
+            if (!m_pInstance)
+                return;
+
+            // Prepare to periodic summon the mobs
+            if (Creature* pTrigger = m_creature->GetMap()->GetCreature(ObjectGuid(m_pInstance->GetData64(DATA64_SKADI_MOBS_TRIGGER))))
+            {
+                pTrigger->CastSpell(pTrigger, m_bIsRegularMode ? SPELL_SUMMON_GAUNTLET_MOBS : SPELL_SUMMON_GAUNTLET_MOBS_H, true, NULL, NULL, m_creature->GetObjectGuid());
+
+                // Spawn the intro mobs
+                m_IntroMobs = true;
+                for (uint8 i = 0; i < MAX_INTRO_MOBS; ++i)
+                {
+                    if (Creature* pYmirjar = m_creature->SummonCreature(aSkadiIntroData[i].uiCreatureId, pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0))
+                    {
+                        pYmirjar->SetWalk(false);
+                        pYmirjar->GetMotionMaster()->MovePoint(1, aSkadiIntroData[i].fX, aSkadiIntroData[i].fY, aSkadiIntroData[i].fZ);
+                    }
+                }
+
+                m_IntroMobs = false;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiMountTimer)
+            {
+                if (m_uiMountTimer <= uiDiff)
+                {
+                    if (!m_pInstance)
+                        return;
+
+                    if (Creature* pGrauf = m_pInstance->GetSingleCreatureFromStorage(NPC_GRAUF))
+                    {
+                        if (DoCastSpellIfCan(pGrauf, SPELL_RIDE_VEHICLE) == CAST_OK)
+                        {
+                            // Maybe this flag should be set by the vehicle flags - requires research
+                            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                            m_uiMountTimer = 0;
+                        }
+                    }
+                }
+                else
+                    m_uiMountTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiCrush < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_CRUSH : SPELL_CRUSH_H) == CAST_OK)
+                    m_uiCrush = urand(10000, 15000);
+            }
+            else
+                m_uiCrush -= uiDiff;
+
+            if (m_uiWhirlwind < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_WHIRLWIND : SPELL_WHIRLWIND_H) == CAST_OK)
+                    m_uiWhirlwind = 23000;
+            }
+            else
+                m_uiWhirlwind -= uiDiff;
+
+            if (m_uiPoisonedSpear < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_POISONED_SPEAR : SPELL_POISONED_SPEAR_H) == CAST_OK)
+                        m_uiPoisonedSpear = urand(10000, 15000);
+                }
+            }
+            else
+                m_uiPoisonedSpear -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_skadiAI(pCreature);
+    }
+};
+
+/*######
+## npc_grauf
+######*/
+
+struct npc_grauf : public CreatureScript
+{
+    npc_grauf() : CreatureScript("npc_grauf") {}
+
+    struct npc_graufAI : public ScriptedAI
+    {
+        npc_graufAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            SetCombatMovement(false);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiFlightDelayTimer;
+
+        void Reset() override
+        {
+            m_uiFlightDelayTimer = 0;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustReachedHome() override
+        {
+            if (!m_pInstance)
+                return;
+
+            // Handle the auras only when reached home in order to avoid vehicle complications
+            m_creature->RemoveAllAuras();
+
+            // Allow Skadi to evade
+            if (Creature* pSkadi = m_pInstance->GetSingleCreatureFromStorage(NPC_SKADI))
+                pSkadi->AI()->EnterEvadeMode();
+
+            m_creature->SetLevitate(false);
+            m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0);
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (!m_pInstance)
+                return;
+
+            if (pSpell->Id == SPELL_LAUNCH_HARPOON)
+            {
+                if (m_creature->GetHealth() < m_creature->GetMaxHealth() * 0.35f)
+                {
+                    // Prepare phase 2 here, because the JustDied is called too late
+                    if (Creature* pSkadi = m_pInstance->GetSingleCreatureFromStorage(NPC_SKADI))
+                    {
+                        DoScriptText(SAY_DRAKE_DEATH, pSkadi);
+                        // Exit vehicle before teleporting
+                        m_creature->RemoveAllAuras();
+                        pSkadi->CastSpell(pSkadi, SPELL_SKADI_TELEPORT, true);
+                    }
+                }
+                else if (urand(0, 1))
+                {
+                    if (Creature* pSkadi = m_pInstance->GetSingleCreatureFromStorage(NPC_SKADI))
+                        DoScriptText(urand(0, 1) ? SAY_DRAKE_HARPOON_1 : SAY_DRAKE_HARPOON_2, pSkadi);
+                }
+
+                // Deal 35% damage on each harpoon hit
+                m_creature->DealDamage(m_creature, m_creature->GetMaxHealth() * 0.35f, NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+            }
+            // TODO: Temporary workaround - please remove when the boarding wrappers are implemented in core
+            else if (pSpell->Id == SPELL_RIDE_VEHICLE && pCaster->GetEntry() == NPC_SKADI)
+                m_uiFlightDelayTimer = 2000;
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != WAYPOINT_MOTION_TYPE || !m_pInstance)
+                return;
+
+            // Note: On blizz the left and right sides are randomly choosen.
+            // However because of the lack of waypoint movement scripting we'll use them alternatively
+            // Another note: the pointId in script = pointId - 1 from DB
+            switch (uiPointId)
+            {
+            case 8:
+            case 21:
+                // TODO: choose the left / right patch random when core will support this
+                DoScriptText(EMOTE_HARPOON_RANGE, m_creature);
+
+                break;
+            case 10:                                        // left breath
+                if (DoCastSpellIfCan(m_creature, SPELL_FREEZING_CLOUD_LEFT) == CAST_OK)
+                {
+                    DoHandleBreathYell();
+                    DoScriptText(EMOTE_DEEP_BREATH, m_creature);
+                }
+
+                // Set the achiev as failed once we get to breath area
+                m_pInstance->SetData(TYPE_ACHIEV_LOVE_SKADI, uint32(false));
+                break;
+            case 13:                                        // left breath end
+                m_creature->RemoveAurasDueToSpell(SPELL_FREEZING_CLOUD_LEFT);
+                break;
+            case 23:                                        // right breath
+                if (DoCastSpellIfCan(m_creature, SPELL_FREEZING_CLOUD_RIGHT) == CAST_OK)
+                {
+                    DoHandleBreathYell();
+                    DoScriptText(EMOTE_DEEP_BREATH, m_creature);
+                }
+
+                // Set the achiev as failed once we get to breath area
+                m_pInstance->SetData(TYPE_ACHIEV_LOVE_SKADI, uint32(false));
+                break;
+            case 26:                                        // right breath end
+                m_creature->RemoveAurasDueToSpell(SPELL_FREEZING_CLOUD_RIGHT);
+                break;
+            }
+        }
+
+        void DoHandleBreathYell()
+        {
+            if (!m_pInstance || !roll_chance_i(25))
+                return;
+
+            // Yell on drake breath
+            if (Creature* pSkadi = m_pInstance->GetSingleCreatureFromStorage(NPC_SKADI))
+            {
+                switch (urand(0, 2))
+                {
+                case 0: DoScriptText(SAY_DRAKEBREATH_1, pSkadi); break;
+                case 1: DoScriptText(SAY_DRAKEBREATH_2, pSkadi); break;
+                case 2: DoScriptText(SAY_DRAKEBREATH_3, pSkadi); break;
+                }
+            }
+        }
+
+        // TODO: Enable the wrappers below, when they will be properly supported by the core
+        /*
+        void PassengerBoarded(Unit* pPassenger, uint8 uiSeat) override
+        {
+        if (pPassenger->GetEntry() == NPC_SKADI)
+        m_uiFlightDelayTimer = 2000;
+        }
+        */
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Start the gauntlet flight
+            if (m_uiFlightDelayTimer)
+            {
+                if (m_uiFlightDelayTimer <= uiDiff)
+                {
+                    m_creature->SetLevitate(true);
+                    m_creature->SetWalk(false);
+                    m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+                    m_creature->GetMotionMaster()->MoveWaypoint();
+                    m_uiFlightDelayTimer = 0;
+                }
+                else
+                    m_uiFlightDelayTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_graufAI(pCreature);
+    }
+};
+
+/*######
+## npc_flame_breath_trigger
+######*/
+
+struct aura_skadi_cloud : public AuraScript
+{
+    aura_skadi_cloud() : AuraScript("aura_skadi_cloud") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetEffIndex() != EFFECT_INDEX_0 || !bApply)
+            return true;
+
+        Creature* pTarget = (Creature*)pAura->GetTarget();
+        if (!pTarget)
+            return true;
+
+        // apply auras based on creature position
+        if (pAura->GetId() == SPELL_CLOUD_AURA_LEFT)
+        {
+            if (pTarget->GetPositionY() > -511.0f)
+                pTarget->CastSpell(pTarget, SPELL_CLOUD_AURA_DAMAGE, true);
+        }
+        else if (pAura->GetId() == SPELL_CLOUD_AURA_RIGHT)
+        {
+            if (pTarget->GetPositionY() < -511.0f)
+                pTarget->CastSpell(pTarget, SPELL_CLOUD_AURA_DAMAGE, true);
+        }
+        return true;
+    }
+};
+
+/*######
+## at_skadi
+######*/
+
+struct at_skadi : public AreaTriggerScript
+{
+    at_skadi() : AreaTriggerScript("at_skadi") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*pAt*/) override
+    {
+        if (pPlayer->isGameMaster())
+            return false;
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_SKADI) == NOT_STARTED)
+            {
+                pInstance->SetData(TYPE_SKADI, SPECIAL);
+
+                // Start the gauntlet
+                if (Creature* pSkadi = pInstance->GetSingleCreatureFromStorage(NPC_SKADI))
+                {
+                    if (CreatureAI* pBossAI = pSkadi->AI())
+                        pBossAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pSkadi, pPlayer, 0);
+                }
+            }
+        }
+        return false;
+    }
+};
+
+void AddSC_boss_skadi()
+{
+    Script* s;
+
+    s = new boss_skadi();
+    s->RegisterSelf();
+    s = new npc_grauf();
+    s->RegisterSelf();
+
+    s = new aura_skadi_cloud();
+    s->RegisterSelf();
+
+    s = new at_skadi();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_skadi";
+    //pNewScript->GetAI = &GetAI_boss_skadi;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_grauf";
+    //pNewScript->GetAI = &GetAI_npc_grauf;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_flame_breath_trigger";
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_npc_flame_breath_trigger;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_skadi";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_skadi;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
new file mode 100644
index 000000000..71aefd526
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
@@ -0,0 +1,389 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Svala
+SD%Complete: 80%
+SDComment: The way spells for intro work could use more research.
+SDCategory: Utgarde Pinnacle
+EndScriptData */
+
+#include "precompiled.h"
+#include "utgarde_pinnacle.h"
+
+enum
+{
+    SAY_INTRO_1                 = -1575000,
+    SAY_INTRO_2_ARTHAS          = -1575001,
+    SAY_INTRO_3                 = -1575002,
+    SAY_INTRO_4_ARTHAS          = -1575003,
+    SAY_INTRO_5                 = -1575004,
+
+    SAY_AGGRO                   = -1575005,
+    SAY_SLAY_1                  = -1575006,
+    SAY_SLAY_2                  = -1575007,
+    SAY_SLAY_3                  = -1575008,
+    SAY_SACRIFICE_1             = -1575009,
+    SAY_SACRIFICE_2             = -1575010,
+    SAY_SACRIFICE_3             = -1575011,
+    SAY_SACRIFICE_4             = -1575012,
+    SAY_SACRIFICE_5             = -1575013,
+    SAY_DEATH                   = -1575014,
+
+    NPC_SVALA_SORROW            = 26668,
+    NPC_ARTHAS_IMAGE            = 29280,
+    NPC_CHANNELER               = 27281,
+    NPC_SCOURGE_HULK            = 26555,        // used to check the achiev
+
+    SPELL_ARTHAS_VISUAL         = 54134,
+
+    SPELL_TRANSFORMING          = 54205,        // should also remove aura 54140 (script effect)
+    SPELL_TRANSFORMING_FLOATING = 54140,        // triggers 54142
+    SPELL_TRANSFORMING_CHANNEL  = 54142,
+
+    SPELL_RITUAL_OF_SWORD       = 48276,        // teleports the boss
+    SPELL_RITUAL_STRIKE         = 48331,
+    SPELL_RITUAL_DISARM         = 54159,
+    SPELL_CALL_FLAMES           = 48258,        // sends event 17841 - this makes npc 27273 cast 48246
+    SPELL_SINISTER_STRIKE       = 15667,
+    SPELL_SINISTER_STRIKE_H     = 59409,
+
+    SPELL_SUMMON_CHANNELER_1    = 48271,
+    SPELL_SUMMON_CHANNELER_2    = 48274,
+    SPELL_SUMMON_CHANNELER_3    = 48275,
+
+    // spells used by channelers
+    SPELL_PARALIZE              = 48278,        // should apply effect 48267 on target
+    SPELL_SHADOWS_IN_THE_DARK   = 59407,
+};
+
+/*######
+## boss_svala
+######*/
+
+struct boss_svala : public CreatureScript
+{
+    boss_svala() : CreatureScript("boss_svala") {}
+
+    struct boss_svalaAI : public ScriptedAI
+    {
+        boss_svalaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_bIsIntroDone = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        Creature* pArthas;
+
+        bool m_bIsIntroDone;
+        uint32 m_uiIntroTimer;
+        uint32 m_uiIntroCount;
+
+        uint32 m_uiSinisterStrikeTimer;
+        uint32 m_uiCallFlamesTimer;
+        uint32 m_uiRitualStrikeTimer;
+        bool m_bHasDoneRitual;
+
+        ObjectGuid m_ritualTargetGuid;
+
+        void Reset() override
+        {
+            pArthas = NULL;
+
+            m_uiIntroTimer = 2500;
+            m_uiIntroCount = 0;
+
+            m_uiSinisterStrikeTimer = 10000;
+            m_uiCallFlamesTimer = urand(10000, 20000);
+            m_uiRitualStrikeTimer = 0;
+            m_bHasDoneRitual = false;
+
+            if (m_creature->IsAlive() && m_pInstance && m_pInstance->GetData(TYPE_SVALA) > IN_PROGRESS)
+            {
+                if (m_creature->GetEntry() != NPC_SVALA_SORROW)
+                    m_creature->UpdateEntry(NPC_SVALA_SORROW);
+
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+                m_bIsIntroDone = true;
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            DoMoveToPosition();
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SVALA, FAIL);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bIsIntroDone)
+            {
+                if (m_pInstance && m_pInstance->GetData(TYPE_SVALA) == IN_PROGRESS)
+                {
+                    m_pInstance->SetData(TYPE_SVALA, SPECIAL);
+
+                    float fX, fY, fZ;
+                    m_creature->GetClosePoint(fX, fY, fZ, m_creature->GetObjectBoundingRadius(), 16.0f, 0.0f);
+
+                    // we assume m_creature is spawned in proper location
+                    m_creature->SummonCreature(NPC_ARTHAS_IMAGE, fX, fY, fZ, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 60000);
+                }
+
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            m_creature->SetLevitate(false);
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_ARTHAS_IMAGE)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_ARTHAS_VISUAL, true);
+                pArthas = pSummoned;
+                pSummoned->SetFacingToObject(m_creature);
+            }
+            else if (pSummoned->GetEntry() == NPC_CHANNELER)
+            {
+                if (!m_bIsRegularMode)
+                    pSummoned->CastSpell(pSummoned, SPELL_SHADOWS_IN_THE_DARK, true);
+
+                if (Unit* pTarget = m_creature->GetMap()->GetUnit(m_ritualTargetGuid))
+                    pSummoned->CastSpell(pTarget, SPELL_PARALIZE, true);
+            }
+        }
+
+        void SummonedCreatureDespawn(Creature* pDespawned) override
+        {
+            if (pDespawned->GetEntry() == NPC_ARTHAS_IMAGE)
+                pArthas = NULL;
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_TRANSFORMING)
+            {
+                if (pArthas)
+                    pArthas->InterruptNonMeleeSpells(true);
+
+                m_creature->RemoveAurasDueToSpell(SPELL_TRANSFORMING_FLOATING);
+                m_creature->UpdateEntry(NPC_SVALA_SORROW);
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            // set achiev to true if boss kills a hulk
+            if (pVictim->GetEntry() == NPC_SCOURGE_HULK && m_pInstance)
+                m_pInstance->SetData(TYPE_ACHIEV_INCREDIBLE_HULK, uint32(true));
+
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_SVALA, DONE);
+        }
+
+        void DoMoveToPosition()
+        {
+            float fX, fZ, fY;
+            m_creature->GetRespawnCoord(fX, fY, fZ);
+
+            m_creature->SetLevitate(true);
+            m_creature->GetMotionMaster()->MovePoint(0, fX, fY, fZ + 5.0f);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (m_bIsIntroDone)
+                    return;
+
+                if (pArthas && pArthas->IsAlive())
+                {
+                    if (m_uiIntroTimer < uiDiff)
+                    {
+                        m_uiIntroTimer = 10000;
+
+                        switch (m_uiIntroCount)
+                        {
+                        case 0:
+                            DoScriptText(SAY_INTRO_1, m_creature);
+                            break;
+                        case 1:
+                            DoScriptText(SAY_INTRO_2_ARTHAS, pArthas);
+                            break;
+                        case 2:
+                            DoCastSpellIfCan(m_creature, SPELL_TRANSFORMING_FLOATING);
+                            pArthas->CastSpell(m_creature, SPELL_TRANSFORMING_CHANNEL, false);
+                            DoMoveToPosition();
+                            break;
+                        case 3:
+                            DoCastSpellIfCan(m_creature, SPELL_TRANSFORMING);
+                            DoScriptText(SAY_INTRO_3, m_creature);
+                            break;
+                        case 4:
+                            DoScriptText(SAY_INTRO_4_ARTHAS, pArthas);
+                            break;
+                        case 5:
+                            DoScriptText(SAY_INTRO_5, m_creature);
+                            break;
+                        case 6:
+                            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                            m_bIsIntroDone = true;
+                            break;
+                        }
+
+                        ++m_uiIntroCount;
+                    }
+                    else
+                        m_uiIntroTimer -= uiDiff;
+                }
+
+                return;
+            }
+
+            if (m_uiSinisterStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_SINISTER_STRIKE : SPELL_SINISTER_STRIKE_H) == CAST_OK)
+                    m_uiSinisterStrikeTimer = 10000;
+            }
+            else
+                m_uiSinisterStrikeTimer -= uiDiff;
+
+            if (m_uiCallFlamesTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CALL_FLAMES) == CAST_OK)
+                    m_uiCallFlamesTimer = urand(10000, 20000);
+            }
+            else
+                m_uiCallFlamesTimer -= uiDiff;
+
+            if (m_uiRitualStrikeTimer)
+            {
+                if (m_uiRitualStrikeTimer <= uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_RITUAL_STRIKE, CAST_INTERRUPT_PREVIOUS);
+                    DoCastSpellIfCan(m_creature, SPELL_RITUAL_DISARM, CAST_TRIGGERED);
+                    m_uiRitualStrikeTimer = 0;
+                }
+                else
+                    m_uiRitualStrikeTimer -= uiDiff;
+            }
+
+            // As from patch notes: Svala Sorrowgrave now casts Ritual of the Sword 1 time during the encounter, down from 3.
+            if (m_creature->GetHealthPercent() < 50.0f && !m_bHasDoneRitual)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_RITUAL_OF_SWORD, SELECT_FLAG_PLAYER))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_RITUAL_OF_SWORD) == CAST_OK)
+                    {
+                        m_ritualTargetGuid = pTarget->GetObjectGuid();
+
+                        // summon channelers
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_CHANNELER_1, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_CHANNELER_2, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_CHANNELER_3, CAST_TRIGGERED);
+
+                        switch (urand(0, 3))
+                        {
+                        case 0: DoScriptText(SAY_SACRIFICE_1, m_creature); break;
+                        case 1: DoScriptText(SAY_SACRIFICE_2, m_creature); break;
+                        case 2: DoScriptText(SAY_SACRIFICE_3, m_creature); break;
+                        case 3: DoScriptText(SAY_SACRIFICE_4, m_creature); break;
+                        }
+
+                        m_uiRitualStrikeTimer = 1000;
+                        m_bHasDoneRitual = true;
+                    }
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_svalaAI(pCreature);
+    }
+};
+
+struct at_svala_intro : public AreaTriggerScript
+{
+    at_svala_intro() : AreaTriggerScript("at_svala_intro") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*pAt*/) override
+    {
+        if (pPlayer->isGameMaster())
+            return false;
+
+        if (InstanceData* pInstance = pPlayer->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_SVALA) == NOT_STARTED)
+                pInstance->SetData(TYPE_SVALA, IN_PROGRESS);
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_svala()
+{
+    Script* s;
+
+    s = new boss_svala();
+    s->RegisterSelf();
+
+    s = new at_svala_intro();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_svala";
+    //pNewScript->GetAI = &GetAI_boss_svala;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_svala_intro";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_svala_intro;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
new file mode 100644
index 000000000..85a1bb9bd
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
@@ -0,0 +1,452 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Ymiron
+SD%Complete: 90%
+SDComment: Timers
+SDCategory: Utgarde Pinnacle
+EndScriptData */
+
+#include "precompiled.h"
+#include "utgarde_pinnacle.h"
+
+enum
+{
+    SAY_AGGRO                   = -1575031,
+    SAY_SUMMON_BJORN            = -1575032,
+    SAY_SUMMON_HALDOR           = -1575033,
+    SAY_SUMMON_RANULF           = -1575034,
+    SAY_SUMMON_TORGYN           = -1575035,
+    SAY_SLAY_1                  = -1575036,
+    SAY_SLAY_2                  = -1575037,
+    SAY_SLAY_3                  = -1575038,
+    SAY_SLAY_4                  = -1575039,
+    SAY_DEATH                   = -1575040,
+
+    SPELL_BANE                  = 48294,            // sends script event 20651 when target is hit - set achiev to false
+    SPELL_BANE_H                = 59301,
+    SPELL_DARK_SLASH            = 48292,
+    SPELL_FETID_ROT             = 48291,
+    SPELL_FETID_ROT_H           = 59300,
+    SPELL_SCREAMS_OF_THE_DEAD   = 51750,            // knockback players to summon boat
+    // SPELL_CHOOSE_SPIRIT       = 48306,            // boss chooses spirit
+
+    // blessings
+    SPELL_SPIRIT_BURST          = 48529,            // by Ranulf
+    SPELL_SPIRIT_BURST_H        = 59305,
+    SPELL_SPIRIT_STRIKE         = 48423,            // by Haldor
+    SPELL_SPIRIT_STRIKE_H       = 59304,
+    SPELL_SUMMON_SPIRIT_FOUNT   = 48386,            // by Bjorn
+    SPELL_SPIRIT_FOUNT_BEAM     = 48385,            // channeled beam on the spirit fount - triggers 48380 : 59320 on aura expire
+    SPELL_AVENGING_SPIRITS      = 48590,            // by Torgyn
+
+    // visuals
+    SPELL_CHANNEL_YMIRON_SPIRIT = 48307,
+    SPELL_CHANNEL_SPIRIT_YMIRON = 48316,
+    SPELL_EMERGE_STATE          = 56864,
+    SPELL_SPIRIT_DIES           = 48596,            // cast by a boat spirit
+
+    // by summoned creatures
+    // SPELL_SPIRIT_VISUAL       = 48593,            // avenging spirit summon visual - handled in eventAI
+    // SPELL_WITHER_TRIGG        = 48584,            // aura for avenging spirits - triggers 48585 on melee  - handled in eventAI
+
+    // spirit transforms
+    SPELL_BJORN_TRANSFORM       = 48308,
+    SPELL_HALDOR_TRANSFORM      = 48311,
+    SPELL_RANULF_TRANSFORM      = 48312,
+    SPELL_TORGYN_TRANSFORM      = 48313,
+
+    NPC_SPIRIT_FOUNT            = 27339,
+    // NPC_AVENGING_SPIRIT       = 27386,
+    // NPC_SPIRIT_SUMMONER       = 27392,            // summoned around the boss - triggers 48592
+
+    MAX_BOATS                   = 4,
+
+    PHASE_NO_BOAT               = 0,
+    PHASE_BJORN                 = 1,
+    PHASE_HALDOR                = 2,
+    PHASE_RANULF                = 3,
+    PHASE_TORGYN                = 4
+};
+
+struct BoatSpirits
+{
+    uint32 uiSpiritSpell, uiSpiritTarget;
+    int32 iYellId;
+    uint8 uiBoatPhase;
+};
+
+static const BoatSpirits aYmironBoatsSpirits[MAX_BOATS] =
+{
+    {SPELL_BJORN_TRANSFORM,  NPC_BJORN,  SAY_SUMMON_BJORN,  PHASE_BJORN},
+    {SPELL_HALDOR_TRANSFORM, NPC_HALDOR, SAY_SUMMON_HALDOR, PHASE_HALDOR},
+    {SPELL_RANULF_TRANSFORM, NPC_RANULF, SAY_SUMMON_RANULF, PHASE_RANULF},
+    {SPELL_TORGYN_TRANSFORM, NPC_TORGYN, SAY_SUMMON_TORGYN, PHASE_TORGYN}
+};
+
+/*######
+## boss_ymiron
+######*/
+
+struct boss_ymiron : public CreatureScript
+{
+    boss_ymiron() : CreatureScript("boss_ymiron") {}
+
+    struct boss_ymironAI : public ScriptedAI
+    {
+        boss_ymironAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+
+            for (uint8 i = 0; i < MAX_BOATS; ++i)
+                m_vuiBoatPhases.push_back(i);
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiFetidRotTimer;
+        uint32 m_uiBaneTimer;
+        uint32 m_uiDarkSlashTimer;
+        uint32 m_uiSpiritTransformTimer;
+        uint32 m_uiCombatResumeTimer;
+        uint8 m_uiPhase;
+        uint8 m_uiBoats;
+        float m_fHealthCheck;
+
+        uint32 m_uiSpiritBurstTimer;
+        uint32 m_uiSpiritStrikeTimer;
+        uint32 m_uiSpiritFountTimer;
+        uint32 m_uiAvengingSpiritsTimer;
+
+        bool m_bIsChannelingSpirit;
+
+        ObjectGuid m_uiCurrentSpiritGuid;
+
+        std::vector<uint8> m_vuiBoatPhases;
+
+        void Reset() override
+        {
+            m_uiFetidRotTimer = urand(8000, 13000);
+            m_uiBaneTimer = urand(18000, 23000);
+            m_uiDarkSlashTimer = urand(28000, 33000);
+            m_uiSpiritTransformTimer = 0;
+            m_uiCombatResumeTimer = 0;
+            m_uiPhase = PHASE_NO_BOAT;
+            m_uiBoats = 0;
+            m_fHealthCheck = m_bIsRegularMode ? 33.3f : 20.0f;
+
+            m_uiSpiritBurstTimer = 10000;
+            m_uiSpiritStrikeTimer = 10000;
+            m_uiSpiritFountTimer = 10000;
+            m_uiAvengingSpiritsTimer = 10000;
+
+            m_bIsChannelingSpirit = false;
+
+            m_uiCurrentSpiritGuid.Clear();
+
+            // Randomize spirit order
+            std::random_shuffle(m_vuiBoatPhases.begin(), m_vuiBoatPhases.end());
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_YMIRON, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 3))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            case 3: DoScriptText(SAY_SLAY_4, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            // Burn the last spirit
+            if (Creature* pSpirit = m_creature->GetMap()->GetCreature(m_uiCurrentSpiritGuid))
+            {
+                pSpirit->InterruptNonMeleeSpells(false);
+                pSpirit->CastSpell(pSpirit, SPELL_SPIRIT_DIES, false);
+            }
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_YMIRON, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            DoResetSpirits();
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_YMIRON, FAIL);
+        }
+
+        // Wrapper which handles the spirits reset
+        void DoResetSpirits()
+        {
+            if (!m_pInstance)
+                return;
+
+            for (uint8 i = 0; i < MAX_BOATS; ++i)
+            {
+                if (Creature* pSpirit = m_pInstance->GetSingleCreatureFromStorage(aYmironBoatsSpirits[i].uiSpiritTarget))
+                    pSpirit->AI()->EnterEvadeMode();
+            }
+        }
+
+        void DoChannelSpiritYmiron()
+        {
+            if (Creature* pSpirit = m_creature->GetMap()->GetCreature(m_uiCurrentSpiritGuid))
+                pSpirit->CastSpell(m_creature, SPELL_CHANNEL_SPIRIT_YMIRON, false);
+
+            // Channeling is finished - resume combat
+            if (m_creature->getVictim())
+            {
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+            }
+
+            SetCombatMovement(true);
+            m_bIsChannelingSpirit = false;
+
+            m_uiPhase = aYmironBoatsSpirits[m_vuiBoatPhases[m_uiBoats]].uiBoatPhase;
+            ++m_uiBoats;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SPIRIT_FOUNT)
+                DoCastSpellIfCan(pSummoned, SPELL_SPIRIT_FOUNT_BEAM, CAST_INTERRUPT_PREVIOUS);
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            if (Creature* pSpirit = m_creature->GetMap()->GetCreature(m_uiCurrentSpiritGuid))
+            {
+                DoCastSpellIfCan(pSpirit, SPELL_CHANNEL_YMIRON_SPIRIT);
+                DoScriptText(aYmironBoatsSpirits[m_vuiBoatPhases[m_uiBoats]].iYellId, m_creature);
+                m_uiSpiritTransformTimer = 3000;
+                m_uiCombatResumeTimer = 6000;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiSpiritTransformTimer)
+            {
+                if (m_uiSpiritTransformTimer <= uiDiff)
+                {
+                    if (Creature* pSpirit = m_creature->GetMap()->GetCreature(m_uiCurrentSpiritGuid))
+                    {
+                        pSpirit->CastSpell(pSpirit, aYmironBoatsSpirits[m_vuiBoatPhases[m_uiBoats]].uiSpiritSpell, true);
+                        pSpirit->CastSpell(pSpirit, SPELL_EMERGE_STATE, true);
+                    }
+                    m_uiSpiritTransformTimer = 0;
+                }
+                else
+                    m_uiSpiritTransformTimer -= uiDiff;
+            }
+
+            if (m_uiCombatResumeTimer)
+            {
+                // This should be done on aura 48307 remove, but because of lack of core support, we'll handle it on normal timer
+                if (m_uiCombatResumeTimer <= uiDiff)
+                {
+                    DoChannelSpiritYmiron();
+                    m_uiCombatResumeTimer = 0;
+                }
+                else
+                    m_uiCombatResumeTimer -= uiDiff;
+            }
+
+            // Don't attack while channeling on the boats
+            if (m_bIsChannelingSpirit)
+                return;
+
+            if (m_uiBaneTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_BANE : SPELL_BANE_H) == CAST_OK)
+                    m_uiBaneTimer = urand(20000, 25000);
+            }
+            else
+                m_uiBaneTimer -= uiDiff;
+
+            if (m_uiFetidRotTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_FETID_ROT : SPELL_FETID_ROT_H) == CAST_OK)
+                    m_uiFetidRotTimer = urand(10000, 15000);
+            }
+            else
+                m_uiFetidRotTimer -= uiDiff;
+
+            if (m_uiDarkSlashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DARK_SLASH) == CAST_OK)
+                    m_uiDarkSlashTimer = urand(30000, 35000);
+            }
+            else
+                m_uiDarkSlashTimer -= uiDiff;
+
+            // Check the spirit phases (also don't allow him to change phase if below 1%)
+            if (m_creature->GetHealthPercent() < 100 - m_fHealthCheck && m_creature->GetHealthPercent() > 1.0f)
+            {
+                // change phase
+                DoCastSpellIfCan(m_creature, SPELL_SCREAMS_OF_THE_DEAD, CAST_INTERRUPT_PREVIOUS);
+
+                // make the current spirit die (burn)
+                if (Creature* pSpirit = m_creature->GetMap()->GetCreature(m_uiCurrentSpiritGuid))
+                {
+                    pSpirit->InterruptNonMeleeSpells(false);
+                    pSpirit->CastSpell(pSpirit, SPELL_SPIRIT_DIES, false);
+                }
+
+                // Get a close point to the spirits and move near them
+                if (m_pInstance)
+                {
+                    if (Creature* pSpirit = m_pInstance->GetSingleCreatureFromStorage(aYmironBoatsSpirits[m_vuiBoatPhases[m_uiBoats]].uiSpiritTarget))
+                    {
+                        float fX, fY, fZ;
+                        m_uiCurrentSpiritGuid = pSpirit->GetObjectGuid();
+                        pSpirit->GetContactPoint(m_creature, fX, fY, fZ, INTERACTION_DISTANCE);
+                        m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                    }
+                }
+
+                SetCombatMovement(false);
+                m_bIsChannelingSpirit = true;
+                m_fHealthCheck += m_bIsRegularMode ? 33.3f : 20.0f;
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_BJORN:
+
+                if (m_uiSpiritFountTimer)
+                {
+                    if (m_uiSpiritFountTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_SPIRIT_FOUNT) == CAST_OK)
+                            m_uiSpiritFountTimer = 0;
+                    }
+                    else
+                        m_uiSpiritFountTimer -= uiDiff;
+                }
+
+                break;
+            case PHASE_HALDOR:
+
+                if (m_uiSpiritStrikeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_SPIRIT_STRIKE : SPELL_SPIRIT_STRIKE_H) == CAST_OK)
+                        m_uiSpiritStrikeTimer = 5000;
+                }
+                else
+                    m_uiSpiritStrikeTimer -= uiDiff;
+
+                break;
+            case PHASE_RANULF:
+
+                if (m_uiSpiritBurstTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SPIRIT_BURST : SPELL_SPIRIT_BURST_H) == CAST_OK)
+                        m_uiSpiritBurstTimer = 10000;
+                }
+                else
+                    m_uiSpiritBurstTimer -= uiDiff;
+
+                break;
+            case PHASE_TORGYN:
+
+                if (m_uiAvengingSpiritsTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_AVENGING_SPIRITS) == CAST_OK)
+                        m_uiAvengingSpiritsTimer = 15000;
+                }
+                else
+                    m_uiAvengingSpiritsTimer -= uiDiff;
+
+                break;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ymironAI(pCreature);
+    }
+};
+
+struct event_achiev_kings_bane : public MapEventScript
+{
+    event_achiev_kings_bane() : MapEventScript("event_achiev_kings_bane") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* /*pTarget*/, bool /*bIsStart*/) override
+    {
+        if (InstanceData* pInstance = ((Creature*)pSource)->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_YMIRON) != IN_PROGRESS)
+                return false;
+
+            pInstance->SetData(TYPE_YMIRON, SPECIAL);
+            return true;
+        }
+        return false;
+    }
+};
+
+void AddSC_boss_ymiron()
+{
+    Script* s;
+
+    s = new boss_ymiron();
+    s->RegisterSelf();
+
+    s = new event_achiev_kings_bane();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ymiron";
+    //pNewScript->GetAI = &GetAI_boss_ymiron;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_achiev_kings_bane";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_achiev_kings_bane;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_utgarde_pinnacle.cpp b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_utgarde_pinnacle.cpp
new file mode 100644
index 000000000..16dfd374c
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_utgarde_pinnacle.cpp
@@ -0,0 +1,419 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: instance_pinnacle
+SD%Complete: 75%
+SDComment:
+SDCategory: Utgarde Pinnacle
+EndScriptData */
+
+#include "precompiled.h"
+#include "utgarde_pinnacle.h"
+
+static const float aOrbPositions[2][3] =
+{
+    { 238.6077f, -460.7103f, 112.5671f },                 // Orb lift up
+    { 279.26f, -452.1f, 110.0f },                    // Orb center stop
+};
+
+static const uint32 aGortokMiniBosses[MAX_ENCOUNTER] = { NPC_WORGEN, NPC_FURBOLG, NPC_JORMUNGAR, NPC_RHINO };
+
+struct is_pinnacle : public InstanceScript
+{
+    is_pinnacle() : InstanceScript("instance_pinnacle") {}
+
+    class instance_pinnacle : public ScriptedInstance
+    {
+    public:
+        instance_pinnacle(Map* pMap) : ScriptedInstance(pMap),
+            m_uiGortokOrbTimer(0),
+            m_uiGortokOrbPhase(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+
+            for (uint8 i = 0; i < MAX_SPECIAL_ACHIEV_CRITS; ++i)
+                m_abAchievCriteria[i] = false;
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_FURBOLG:
+            case NPC_WORGEN:
+            case NPC_JORMUNGAR:
+            case NPC_RHINO:
+            case NPC_BJORN:
+            case NPC_HALDOR:
+            case NPC_RANULF:
+            case NPC_TORGYN:
+            case NPC_SKADI:
+            case NPC_GRAUF:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_WORLD_TRIGGER:
+                if (pCreature->GetPositionX() < 250.0f)
+                    m_gortokEventTriggerGuid = pCreature->GetObjectGuid();
+                else if (pCreature->GetPositionX() > 400.0f && pCreature->GetPositionX() < 500.0f)
+                    m_skadiMobsTriggerGuid = pCreature->GetObjectGuid();
+                break;
+            case NPC_YMIRJAR_HARPOONER:
+            case NPC_YMIRJAR_WARRIOR:
+            case NPC_YMIRJAR_WITCH_DOCTOR:
+                m_lskadiGauntletMobsList.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_DOOR_SKADI:
+                if (m_auiEncounter[TYPE_SKADI] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_DOOR_YMIRON:
+                if (m_auiEncounter[TYPE_YMIRON] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_FURBOLG:
+            case NPC_WORGEN:
+            case NPC_JORMUNGAR:
+            case NPC_RHINO:
+                SetData(TYPE_GORTOK, FAIL);
+                break;
+            case NPC_YMIRJAR_WARRIOR:
+            case NPC_YMIRJAR_WITCH_DOCTOR:
+            case NPC_YMIRJAR_HARPOONER:
+                // Handle Skadi gauntlet reset. Used instead of using spell 49308
+                SetData(TYPE_SKADI, FAIL);
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_FURBOLG:
+            case NPC_WORGEN:
+            case NPC_JORMUNGAR:
+            case NPC_RHINO:
+                m_uiGortokOrbTimer = 3000;
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_SVALA:
+                if (uiData == IN_PROGRESS || uiData == FAIL)
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_INCREDIBLE_HULK, false);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_GORTOK:
+                if (uiData == IN_PROGRESS)
+                {
+                    if (Creature* pOrb = instance->GetCreature(m_gortokEventTriggerGuid))
+                    {
+                        pOrb->SetLevitate(true);
+                        pOrb->CastSpell(pOrb, SPELL_ORB_VISUAL, true);
+                        pOrb->GetMotionMaster()->MovePoint(0, aOrbPositions[0][0], aOrbPositions[0][1], aOrbPositions[0][2]);
+
+                        m_uiGortokOrbTimer = 2000;
+                    }
+                }
+                else if (uiData == FAIL)
+                {
+                    if (Creature* pOrb = instance->GetCreature(m_gortokEventTriggerGuid))
+                    {
+                        if (!pOrb->IsAlive())
+                            pOrb->Respawn();
+                        else
+                            pOrb->RemoveAllAuras();
+
+                        // For some reasone the Orb doesn't evade automatically
+                        pOrb->GetMotionMaster()->MoveTargetedHome();
+                    }
+
+                    for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+                    {
+                        // Reset each miniboss
+                        if (Creature* pTemp = GetSingleCreatureFromStorage(aGortokMiniBosses[i]))
+                        {
+                            if (!pTemp->IsAlive())
+                                pTemp->Respawn();
+
+                            pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                        }
+                    }
+
+                    m_uiGortokOrbPhase = 0;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_SKADI:
+                // Don't process the event twice
+                if (m_auiEncounter[uiType] == uiData)
+                    return;
+                switch (uiData)
+                {
+                case DONE:
+                    DoUseDoorOrButton(GO_DOOR_SKADI);
+                    break;
+                case SPECIAL:
+                    // Prepare achievements
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_LOVE_SKADI, true);
+                    DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_SKADI_ID);
+
+                    m_auiEncounter[uiType] = uiData;
+                    return;
+                case FAIL:
+                    // Handle Grauf evade - if event is in phase 1
+                    if (Creature* pGrauf = GetSingleCreatureFromStorage(NPC_GRAUF))
+                        pGrauf->AI()->EnterEvadeMode();
+
+                    // no break;
+                case NOT_STARTED:
+                    // Despawn all summons
+                    for (GuidList::const_iterator itr = m_lskadiGauntletMobsList.begin(); itr != m_lskadiGauntletMobsList.end(); ++itr)
+                    {
+                        if (Creature* pYmirjar = instance->GetCreature(*itr))
+                            pYmirjar->ForcedDespawn();
+                    }
+
+                    // Reset position
+                    if (Creature* pGrauf = GetSingleCreatureFromStorage(NPC_GRAUF))
+                        pGrauf->GetMotionMaster()->MoveTargetedHome();
+
+                    // no break;
+                case IN_PROGRESS:
+
+                    // Remove the summon aura on phase 2 or fail
+                    if (Creature* pTrigger = instance->GetCreature(m_skadiMobsTriggerGuid))
+                        pTrigger->RemoveAllAuras();
+                    break;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_YMIRON:
+                if (uiData == DONE)
+                    DoUseDoorOrButton(GO_DOOR_YMIRON);
+                else if (uiData == IN_PROGRESS)
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_KINGS_BANE, true);
+                else if (uiData == SPECIAL)
+                    SetSpecialAchievementCriteria(TYPE_ACHIEV_KINGS_BANE, false);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_ACHIEV_KINGS_BANE:
+            case TYPE_ACHIEV_LOVE_SKADI:
+            case TYPE_ACHIEV_INCREDIBLE_HULK:
+                SetSpecialAchievementCriteria(uiType - TYPE_ACHIEV_INCREDIBLE_HULK, bool(uiData));
+                return;
+            default:
+                script_error_log("Instance Pinnacle: SetData = %u for type %u does not exist/not implemented.", uiType, uiData);
+                return;
+            }
+
+            // Saving also SPECIAL for this instance
+            if (uiData == DONE || uiData == SPECIAL)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            return 0;
+        }
+
+        void SetData64(uint32 uiType, uint64 uiData) override
+        {
+            switch (uiType)
+            {
+            case DATA64_GORTHOK_EVENT_STARTER:
+                m_gortokEventStarterGuid = ObjectGuid(uiData);
+                break;
+            default:
+                break;
+            }
+        }
+
+        uint64 GetData64(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case DATA64_GORTHOK_EVENT_STARTER:
+                return m_gortokEventStarterGuid.GetRawValue();
+            case DATA64_SKADI_MOBS_TRIGGER:
+                return m_skadiMobsTriggerGuid.GetRawValue();
+            default:
+                break;
+            }
+            return 0;
+        }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+            case ACHIEV_CRIT_INCREDIBLE_HULK:
+                return m_abAchievCriteria[TYPE_ACHIEV_INCREDIBLE_HULK - TYPE_ACHIEV_INCREDIBLE_HULK];
+            case ACHIEV_CRIT_GIRL_LOVES_SKADI:
+                return m_abAchievCriteria[TYPE_ACHIEV_LOVE_SKADI - TYPE_ACHIEV_INCREDIBLE_HULK];
+            case ACHIEV_CRIT_KINGS_BANE:
+                return m_abAchievCriteria[TYPE_ACHIEV_KINGS_BANE - TYPE_ACHIEV_INCREDIBLE_HULK];
+
+            default:
+                return false;
+            }
+        }
+
+        //void SetGortokEventStarter(ObjectGuid playerGuid) { m_gortokEventStarterGuid = playerGuid; }
+        //ObjectGuid GetGortokEventStarter() { return m_gortokEventStarterGuid; }
+        //ObjectGuid GetSkadiMobsTrigger() { return m_skadiMobsTriggerGuid; }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_uiGortokOrbTimer)
+            {
+                if (m_uiGortokOrbTimer <= uiDiff)
+                {
+                    if (!m_uiGortokOrbPhase)
+                    {
+                        if (Creature* pOrb = instance->GetCreature(m_gortokEventTriggerGuid))
+                            pOrb->GetMotionMaster()->MovePoint(0, aOrbPositions[1][0], aOrbPositions[1][1], aOrbPositions[1][2]);
+
+                        m_uiGortokOrbTimer = 18000;
+                    }
+                    // Awaken Gortok if this is the last phase
+                    else
+                    {
+                        uint8 uiMaxOrbPhase = instance->IsRegularDifficulty() ? 3 : 5;
+                        uint32 uiSpellId = m_uiGortokOrbPhase == uiMaxOrbPhase ? SPELL_AWAKEN_GORTOK : SPELL_AWAKEN_SUBBOSS;
+
+                        if (Creature* pOrb = instance->GetCreature(m_gortokEventTriggerGuid))
+                        {
+                            pOrb->CastSpell(pOrb, uiSpellId, false);
+
+                            if (m_uiGortokOrbPhase == uiMaxOrbPhase)
+                                pOrb->ForcedDespawn(10000);
+                        }
+
+                        m_uiGortokOrbTimer = 0;
+                    }
+                    ++m_uiGortokOrbPhase;
+                }
+                else
+                    m_uiGortokOrbTimer -= uiDiff;
+            }
+        }
+
+    private:
+        void SetSpecialAchievementCriteria(uint32 uiType, bool bIsMet)
+        {
+            if (uiType < MAX_SPECIAL_ACHIEV_CRITS)
+                m_abAchievCriteria[uiType] = bIsMet;
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        bool m_abAchievCriteria[MAX_SPECIAL_ACHIEV_CRITS];
+        std::string m_strInstData;
+
+        uint32 m_uiGortokOrbTimer;
+        uint8 m_uiGortokOrbPhase;
+
+        ObjectGuid m_gortokEventTriggerGuid;
+        ObjectGuid m_gortokEventStarterGuid;
+        ObjectGuid m_skadiMobsTriggerGuid;
+
+        GuidList m_lskadiGauntletMobsList;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_pinnacle(pMap);
+    }
+};
+
+void AddSC_instance_pinnacle()
+{
+    Script* s;
+
+    s = new is_pinnacle();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_pinnacle";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_pinnacle;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h
new file mode 100644
index 000000000..d2003fcd8
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h
@@ -0,0 +1,66 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_UTG_PINNACLE_H
+#define DEF_UTG_PINNACLE_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 4,
+    MAX_SPECIAL_ACHIEV_CRITS        = 3,
+
+    TYPE_SVALA                      = 0,
+    TYPE_GORTOK                     = 1,
+    TYPE_SKADI                      = 2,
+    TYPE_YMIRON                     = 3,
+
+    TYPE_ACHIEV_INCREDIBLE_HULK     = 4,
+    TYPE_ACHIEV_LOVE_SKADI          = 5,
+    TYPE_ACHIEV_KINGS_BANE          = 6,
+
+    DATA64_GORTHOK_EVENT_STARTER    = 0,
+    DATA64_SKADI_MOBS_TRIGGER       = 1,
+
+    GO_STASIS_GENERATOR             = 188593,
+    GO_DOOR_SKADI                   = 192173,
+    GO_DOOR_YMIRON                  = 192174,
+
+    NPC_WORLD_TRIGGER               = 22515,
+
+    NPC_GRAUF                       = 26893,
+    NPC_SKADI                       = 26693,
+    NPC_YMIRJAR_WARRIOR             = 26690,
+    NPC_YMIRJAR_WITCH_DOCTOR        = 26691,
+    NPC_YMIRJAR_HARPOONER           = 26692,
+    // NPC_FLAME_BREATH_TRIGGER     = 28351,            // triggers the freezing cloud spell in script
+    // NPC_WORLD_TRIGGER_LARGE      = 23472,            // only one spawn in this instance - casts 49308 during the gauntlet event
+
+    NPC_FURBOLG                     = 26684,
+    NPC_WORGEN                      = 26683,
+    NPC_JORMUNGAR                   = 26685,
+    NPC_RHINO                       = 26686,
+
+    // Ymiron spirits
+    NPC_BJORN                       = 27303,            // front right
+    NPC_HALDOR                      = 27307,            // front left
+    NPC_RANULF                      = 27308,            // back left
+    NPC_TORGYN                      = 27309,            // back right
+
+    ACHIEV_CRIT_INCREDIBLE_HULK     = 7322,             // Svala, achiev - 2043
+    ACHIEV_CRIT_GIRL_LOVES_SKADI    = 7595,             // Skadi, achiev - 2156
+    ACHIEV_CRIT_KINGS_BANE          = 7598,             // Ymiron, achiev - 2157
+
+    ACHIEV_START_SKADI_ID           = 17726,            // Starts Skadi timed achiev - 1873
+
+    // Gortok event spells
+    SPELL_ORB_VISUAL                = 48044,
+    SPELL_AWAKEN_SUBBOSS            = 47669,
+    SPELL_AWAKEN_GORTOK             = 47670,
+
+    // Skadi event spells
+    // The reset check spell is cast by npc 23472 every 7 seconds during the event
+    // If the spell doesn't hit any player then the event resets
+    // SPELL_GAUNTLET_RESET_CHECK   = 49308,            // for the moment we don't use this because of the lack of core support
+};
+#endif
diff --git a/src/modules/SD3/scripts/northrend/vault_of_archavon/boss_archavon.cpp b/src/modules/SD3/scripts/northrend/vault_of_archavon/boss_archavon.cpp
new file mode 100644
index 000000000..52d768afe
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/vault_of_archavon/boss_archavon.cpp
@@ -0,0 +1,31 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_archavon
+SD%Complete: 0
+SDComment: Placeholder
+SDCategory: Vault of Archavon
+EndScriptData */
+
+#include "precompiled.h"
+
+void AddSC_boss_archavon()
+{
+}
diff --git a/src/modules/SD3/scripts/northrend/vault_of_archavon/boss_emalon.cpp b/src/modules/SD3/scripts/northrend/vault_of_archavon/boss_emalon.cpp
new file mode 100644
index 000000000..2968e0e45
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/vault_of_archavon/boss_emalon.cpp
@@ -0,0 +1,31 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_emalon
+SD%Complete: 0
+SDComment: Placeholder
+SDCategory: Vault of Archavon
+EndScriptData */
+
+#include "precompiled.h"
+
+void AddSC_boss_emalon()
+{
+}
diff --git a/src/modules/SD3/scripts/northrend/vault_of_archavon/boss_koralon.cpp b/src/modules/SD3/scripts/northrend/vault_of_archavon/boss_koralon.cpp
new file mode 100644
index 000000000..279759bc0
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/vault_of_archavon/boss_koralon.cpp
@@ -0,0 +1,31 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_koralon
+SD%Complete: 0
+SDComment: Placeholder
+SDCategory: Vault of Archavon
+EndScriptData */
+
+#include "precompiled.h"
+
+void AddSC_boss_koralon()
+{
+}
diff --git a/src/modules/SD3/scripts/northrend/vault_of_archavon/boss_toravon.cpp b/src/modules/SD3/scripts/northrend/vault_of_archavon/boss_toravon.cpp
new file mode 100644
index 000000000..756572b3a
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/vault_of_archavon/boss_toravon.cpp
@@ -0,0 +1,31 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_toravon
+SD%Complete: 0
+SDComment: Placeholder
+SDCategory: Vault of Archavon
+EndScriptData */
+
+#include "precompiled.h"
+
+void AddSC_boss_toravon()
+{
+}
diff --git a/src/modules/SD3/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp b/src/modules/SD3/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp
new file mode 100644
index 000000000..6030b43d6
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp
@@ -0,0 +1,31 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: instance_vault_of_archavon
+SD%Complete: 0
+SDComment: Placeholder
+SDCategory: Vault of Archavon
+EndScriptData */
+
+#include "precompiled.h"
+
+void AddSC_instance_vault_of_archavon()
+{
+}
diff --git a/src/modules/SD3/scripts/northrend/vault_of_archavon/vault_of_archavon.h b/src/modules/SD3/scripts/northrend/vault_of_archavon/vault_of_archavon.h
new file mode 100644
index 000000000..6b5f9ef47
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/vault_of_archavon/vault_of_archavon.h
@@ -0,0 +1,3 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/modules/SD3/scripts/northrend/violet_hold/boss_erekem.cpp b/src/modules/SD3/scripts/northrend/violet_hold/boss_erekem.cpp
new file mode 100644
index 000000000..2043be5fe
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/violet_hold/boss_erekem.cpp
@@ -0,0 +1,280 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_erekem
+SD%Complete: 90
+SDComment: Timers may need adjustments
+SDCategory: Violet Hold
+EndScriptData */
+
+#include "precompiled.h"
+#include "violet_hold.h"
+
+enum
+{
+    SAY_AGGRO                   = -1608012,
+    SAY_ADD_DIE_1               = -1608013,
+    SAY_ADD_DIE_2               = -1608014,
+    SAY_DEATH                   = -1608018,
+    // A few Sound IDs on SLAY, if there _is_ text related, fields -1608015 to -1608017 are free
+    SOUND_ID_SLAY_1             = 14222,
+    SOUND_ID_SLAY_2             = 14223,
+    SOUND_ID_SLAY_3             = 14224,
+
+    SPELL_BLOODLUST             = 54516,
+    SPELL_BREAK_BONDS_H         = 59463,
+    SPELL_CHAIN_HEAL            = 54481,
+    SPELL_CHAIN_HEAL_H          = 59473,
+    SPELL_EARTH_SHIELD          = 54479,
+    SPELL_EARTH_SHIELD_H        = 59471,
+    SPELL_EARTH_SHOCK           = 54511,
+    SPELL_LIGHTNING_BOLT        = 53044,
+    SPELL_STORMSTRIKE           = 51876,
+
+    // Spells of adds
+    SPELL_GUSHING_WOUND         = 39215,
+    SPELL_HOWLING_SCREECH       = 54463,
+    SPELL_STRIKE                = 14516
+};
+
+struct boss_erekem : public CreatureScript
+{
+    boss_erekem() : CreatureScript("boss_erekem") {}
+
+    struct boss_erekemAI : public ScriptedAI
+    {
+        boss_erekemAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiBreakBondsTimer;
+        uint32 m_uiChainHealTimer;
+        uint32 m_uiEarthShieldTimer;
+        uint32 m_uiEarthShockTimer;
+        uint32 m_uiSpecialSpellTimer;
+        uint8 m_uiGuardiansDead;
+
+        void Reset() override
+        {
+            m_uiSpecialSpellTimer = 0;
+            m_uiEarthShieldTimer = urand(2000, 3000);
+            m_uiEarthShockTimer = urand(4000, 9000);
+            m_uiChainHealTimer = urand(5000, 15000);
+            m_uiBreakBondsTimer = urand(25000, 30000);
+            m_uiGuardiansDead = 0;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoPlaySoundToSet(m_creature, SOUND_ID_SLAY_1); break;
+            case 1: DoPlaySoundToSet(m_creature, SOUND_ID_SLAY_2); break;
+            case 2: DoPlaySoundToSet(m_creature, SOUND_ID_SLAY_3); break;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*sender*/, Unit* invoker, uint32 /**/) override
+        {
+            if (eventType != AI_EVENT_CUSTOM_A || invoker->GetEntry() != NPC_EREKEM_GUARD)
+                return;
+
+            DoScriptText(!m_uiGuardiansDead ? SAY_ADD_DIE_1 : SAY_ADD_DIE_2, m_creature);
+            ++m_uiGuardiansDead;
+
+            // cast bloodlust if both guards are dead
+            if (m_uiGuardiansDead == 2)
+                DoCastSpellIfCan(m_creature, SPELL_BLOODLUST, CAST_INTERRUPT_PREVIOUS);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiEarthShieldTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_EARTH_SHIELD : SPELL_EARTH_SHIELD_H, CAST_AURA_NOT_PRESENT) == CAST_OK)
+                    m_uiEarthShieldTimer = urand(25000, 30000);
+            }
+            else
+                m_uiEarthShieldTimer -= uiDiff;
+
+            if (m_uiEarthShockTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_EARTH_SHOCK) == CAST_OK)
+                        m_uiEarthShockTimer = urand(8000, 13000);
+                }
+            }
+            else
+                m_uiEarthShockTimer -= uiDiff;
+
+            if (m_uiChainHealTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_CHAIN_HEAL : SPELL_CHAIN_HEAL_H) == CAST_OK)
+                    m_uiChainHealTimer = urand(15000, 25000);
+            }
+            else
+                m_uiChainHealTimer -= uiDiff;
+
+            // Cast Stormstrike only if both guards are down
+            if (m_uiSpecialSpellTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_uiGuardiansDead == 2 ? SPELL_STORMSTRIKE : SPELL_LIGHTNING_BOLT) == CAST_OK)
+                    m_uiSpecialSpellTimer = urand(2000, 3000);
+            }
+            else
+                m_uiSpecialSpellTimer -= uiDiff;
+
+            // Break bonds only on heroic
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiBreakBondsTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BREAK_BONDS_H) == CAST_OK)
+                        m_uiBreakBondsTimer = urand(25000, 30000);
+                }
+                else
+                    m_uiBreakBondsTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_erekemAI(pCreature);
+    }
+};
+
+struct npc_erekem_guard : public CreatureScript
+{
+    npc_erekem_guard() : CreatureScript("npc_erekem_guard") {}
+
+    struct npc_erekem_guardAI : public ScriptedAI
+    {
+        npc_erekem_guardAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = ((ScriptedInstance*)pCreature->GetInstanceData());
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiGushingWoundTimer;
+        uint32 m_uiHowlingScreechTimer;
+        uint32 m_uiStrikeTimer;
+
+        void Reset() override
+        {
+            m_uiGushingWoundTimer = urand(9000, 14000);
+            m_uiHowlingScreechTimer = urand(8000, 12000);
+            m_uiStrikeTimer = urand(5000, 7000);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (!m_pInstance)
+                return;
+
+            if (Creature* pBoss = m_pInstance->GetSingleCreatureFromStorage(m_pInstance->GetData(TYPE_EREKEM) != DONE ? NPC_EREKEM : NPC_ARAKKOA))
+            {
+                if (!pBoss->IsAlive())
+                    return;
+
+                pBoss->AI()->ReceiveAIEvent(AI_EVENT_CUSTOM_A, m_creature, m_creature, 0);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiGushingWoundTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_GUSHING_WOUND) == CAST_OK)
+                    m_uiGushingWoundTimer = urand(25000, 30000);
+            }
+            else
+                m_uiGushingWoundTimer -= uiDiff;
+
+            if (m_uiHowlingScreechTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_HOWLING_SCREECH) == CAST_OK)
+                    m_uiHowlingScreechTimer = urand(10000, 16000);
+            }
+            else
+                m_uiHowlingScreechTimer -= uiDiff;
+
+            if (m_uiStrikeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_STRIKE) == CAST_OK)
+                    m_uiStrikeTimer = urand(5000, 7000);
+            }
+            else
+                m_uiStrikeTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_erekem_guardAI(pCreature);
+    }
+};
+
+void AddSC_boss_erekem()
+{
+    Script* s;
+
+    s = new boss_erekem();
+    s->RegisterSelf();
+    s = new npc_erekem_guard();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_erekem";
+    //pNewScript->GetAI = &GetAI_boss_erekem;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_erekem_guard";
+    //pNewScript->GetAI = &GetAI_npc_erekem_guard;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/violet_hold/boss_ichoron.cpp b/src/modules/SD3/scripts/northrend/violet_hold/boss_ichoron.cpp
new file mode 100644
index 000000000..b03ab60e5
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/violet_hold/boss_ichoron.cpp
@@ -0,0 +1,170 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_ichoron
+SD%Complete: 50
+SDComment: Water Globule event NYI
+SDCategory: Violet Hold
+EndScriptData */
+
+#include "precompiled.h"
+#include "violet_hold.h"
+
+enum
+{
+    SAY_AGGRO           = -1608019,
+    SAY_SHATTERING      = -1608020,
+    SAY_SHIELD          = -1608021,
+    SAY_SLAY_1          = -1608022,
+    SAY_SLAY_2          = -1608023,
+    SAY_SLAY_3          = -1608024,
+    SAY_ENRAGE          = -1608025,
+    SAY_DEATH           = -1608026,
+    EMOTE_BUBBLE        = -1608028,
+
+    SPELL_SPLASH                = 59516,
+    SPELL_DRAINED               = 59820,
+    SPELL_FRENZY                = 54312,
+    SPELL_FRENZY_H              = 59522,
+    SPELL_PROTECTIVE_BUBBLE     = 54306,
+    SPELL_WATER_BLAST           = 54237,
+    SPELL_WATER_BLAST_H         = 59520,
+    SPELL_WATER_BOLT_VOLLEY     = 54241,
+    SPELL_WATER_BOLT_VOLLEY_H   = 59521,
+    SPELL_WATER_GLOBULE         = 54260,
+
+    SPELL_WATER_GLOBULE_SPAWN_1 = 54258,
+    SPELL_WATER_GLOBULE_SPAWN_2 = 54264,
+    SPELL_WATER_GLOBULE_SPAWN_3 = 54265,
+    SPELL_WATER_GLOBULE_SPAWN_4 = 54266,
+    SPELL_WATER_GLOBULE_SPAWN_5 = 54267,
+
+    SPELL_MERGE                 = 54269,                // used by globules
+    SPELL_WATER_GLOBULE_TRANS   = 54268,
+};
+
+static const uint32 aWaterGlobuleSpells[5] = {SPELL_WATER_GLOBULE_SPAWN_1, SPELL_WATER_GLOBULE_SPAWN_2, SPELL_WATER_GLOBULE_SPAWN_3, SPELL_WATER_GLOBULE_SPAWN_4, SPELL_WATER_GLOBULE_SPAWN_5};
+
+struct boss_ichoron : public CreatureScript
+{
+    boss_ichoron() : CreatureScript("boss_ichoron") {}
+
+    struct boss_ichoronAI : public ScriptedAI
+    {
+        boss_ichoronAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiWaterBoltVolleyTimer;
+        uint32 m_uiWaterBlastTimer;
+        bool m_bIsFrenzy;
+
+        void Reset() override
+        {
+            m_uiWaterBoltVolleyTimer = urand(10000, 12000);
+            m_uiWaterBlastTimer = 10000;
+            m_bIsFrenzy = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            DoCastSpellIfCan(m_creature, SPELL_PROTECTIVE_BUBBLE);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* pWho) override
+        {
+            if (pWho->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiWaterBlastTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_WATER_BLAST : SPELL_WATER_BLAST_H) == CAST_OK)
+                        m_uiWaterBlastTimer = urand(8000, 14000);
+                }
+            }
+            else
+                m_uiWaterBlastTimer -= uiDiff;
+
+            if (m_uiWaterBoltVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_WATER_BOLT_VOLLEY : SPELL_WATER_BOLT_VOLLEY_H) == CAST_OK)
+                    m_uiWaterBoltVolleyTimer = urand(7000, 12000);
+            }
+            else
+                m_uiWaterBoltVolleyTimer -= uiDiff;
+
+            if (!m_bIsFrenzy && m_creature->GetHealthPercent() < 25.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_FRENZY : SPELL_FRENZY_H) == CAST_OK)
+                {
+                    DoScriptText(SAY_ENRAGE, m_creature);
+                    m_bIsFrenzy = true;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature)
+    {
+        return new boss_ichoronAI(pCreature);
+    }
+};
+
+void AddSC_boss_ichoron()
+{
+    Script* s;
+
+    s = new boss_ichoron();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ichoron";
+    //pNewScript->GetAI = &GetAI_boss_ichoron;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/violet_hold/instance_violet_hold.cpp b/src/modules/SD3/scripts/northrend/violet_hold/instance_violet_hold.cpp
new file mode 100644
index 000000000..41baaa083
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/violet_hold/instance_violet_hold.cpp
@@ -0,0 +1,950 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Violet_Hold
+SD%Complete: 75
+SDComment: Prison defense system requires more research
+SDCategory: Violet Hold
+EndScriptData */
+
+#include "precompiled.h"
+#include "violet_hold.h"
+
+struct BossInformation
+{
+    uint32 uiType, uiEntry, uiGhostEntry, uiWayPointId;
+    float fX, fY, fZ;                                       // Waypoint for Saboteur
+    int32 iSayEntry;
+};
+
+struct BossSpawn
+{
+    uint32 uiEntry;
+    float fX, fY, fZ, fO;
+};
+
+static const BossInformation aBossInformation[] =
+{
+    { TYPE_EREKEM, NPC_EREKEM, NPC_ARAKKOA, 1, 1877.03f, 853.84f, 43.33f, SAY_RELEASE_EREKEM },
+    { TYPE_ZURAMAT, NPC_ZURAMAT, NPC_VOID_LORD, 1, 1922.41f, 847.95f, 47.15f, SAY_RELEASE_ZURAMAT },
+    { TYPE_XEVOZZ, NPC_XEVOZZ, NPC_ETHERAL, 1, 1903.61f, 838.46f, 38.72f, SAY_RELEASE_XEVOZZ },
+    { TYPE_ICHORON, NPC_ICHORON, NPC_SWIRLING, 1, 1915.52f, 779.13f, 35.94f, SAY_RELEASE_ICHORON },
+    { TYPE_LAVANTHOR, NPC_LAVANTHOR, NPC_LAVA_HOUND, 1, 1855.28f, 760.85f, 38.65f, 0 },
+    { TYPE_MORAGG, NPC_MORAGG, NPC_WATCHER, 1, 1890.51f, 752.85f, 47.66f, 0 }
+};
+
+static const float fDefenseSystemLoc[4] = { 1888.146f, 803.382f, 58.604f, 3.072f };
+static const float fGuardExitLoc[3] = { 1806.955f, 803.851f, 44.36f };
+
+static const uint32 aRandomPortalNpcs[5] = { NPC_AZURE_INVADER, NPC_MAGE_HUNTER, NPC_AZURE_SPELLBREAKER, NPC_AZURE_BINDER, NPC_AZURE_MAGE_SLAYER };
+static const uint32 aRandomIntroNpcs[4] = { NPC_AZURE_BINDER_INTRO, NPC_AZURE_INVADER_INTRO, NPC_AZURE_SPELLBREAKER_INTRO, NPC_AZURE_MAGE_SLAYER_INTRO };
+
+static const int32 aSealWeakYell[3] = { SAY_SEAL_75, SAY_SEAL_50, SAY_SEAL_5 };
+
+struct is_violet_hold : public InstanceScript
+{
+    is_violet_hold() : InstanceScript("instance_violet_hold") {}
+
+    class instance_violet_hold : public ScriptedInstance
+    {
+    public:
+        instance_violet_hold(Map* pMap) : ScriptedInstance(pMap),
+            m_uiWorldState(0),
+            m_uiWorldStateSealCount(100),
+            m_uiWorldStatePortalCount(0),
+
+            m_uiPortalId(0),
+            m_uiPortalTimer(0),
+            m_uiMaxCountPortalLoc(0),
+
+            m_uiSealYellCount(0),
+            m_uiEventResetTimer(0),
+
+            m_bIsVoidDance(false),
+            m_bIsDefenseless(false),
+            m_bIsDehydratation(false)
+        {
+            Initialize();
+        }
+
+        ~instance_violet_hold()
+        {
+            // Need to free std::vector<sBossSpawn*> m_vRandomBosses;
+            for (std::vector<BossSpawn*>::const_iterator itr = m_vRandomBosses.begin(); itr != m_vRandomBosses.end(); ++itr)
+            {
+                if (*itr)
+                    delete(*itr);
+            }
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+            m_uiMaxCountPortalLoc = countof(afPortalLocation) - 1;
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_SINCLARI:
+            case NPC_SINCLARI_ALT:
+            case NPC_DOOR_SEAL:
+            case NPC_EVENT_CONTROLLER:
+                break;
+
+            case NPC_EREKEM:
+            case NPC_MORAGG:
+            case NPC_ICHORON:
+            case NPC_XEVOZZ:
+            case NPC_LAVANTHOR:
+            case NPC_ZURAMAT:
+                m_vRandomBossList.push_back(pCreature->GetEntry());
+                break;
+
+            case NPC_PORTAL_INTRO:
+                m_lIntroPortalList.push_back(pCreature->GetObjectGuid());
+                return;
+            case NPC_HOLD_GUARD:
+                m_lGuardsList.push_back(pCreature->GetObjectGuid());
+                return;
+            case NPC_EREKEM_GUARD:
+                m_lErekemGuardList.push_back(pCreature->GetObjectGuid());
+                return;
+            case NPC_ARAKKOA_GUARD:
+                m_lArakkoaGuardList.push_back(pCreature->GetObjectGuid());
+                return;
+            case NPC_ICHORON_SUMMON_TARGET:
+                m_lIchoronTargetsList.push_back(pCreature->GetObjectGuid());
+                return;
+
+            case NPC_ARAKKOA:
+            case NPC_VOID_LORD:
+            case NPC_ETHERAL:
+            case NPC_SWIRLING:
+            case NPC_WATCHER:
+            case NPC_LAVA_HOUND:
+                break;
+
+            default:
+                return;
+            }
+            m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_CELL_LAVANTHOR:
+                m_mBossToCellMap.insert(BossToCellMap::value_type(NPC_LAVANTHOR, pGo->GetObjectGuid()));
+                return;
+            case GO_CELL_MORAGG:
+                m_mBossToCellMap.insert(BossToCellMap::value_type(NPC_MORAGG, pGo->GetObjectGuid()));
+                return;
+            case GO_CELL_ZURAMAT:
+                m_mBossToCellMap.insert(BossToCellMap::value_type(NPC_ZURAMAT, pGo->GetObjectGuid()));
+                return;
+            case GO_CELL_XEVOZZ:
+                m_mBossToCellMap.insert(BossToCellMap::value_type(NPC_XEVOZZ, pGo->GetObjectGuid()));
+                return;
+            case GO_CELL_ICHORON:
+                m_mBossToCellMap.insert(BossToCellMap::value_type(NPC_ICHORON, pGo->GetObjectGuid()));
+                return;
+            case GO_CELL_EREKEM:
+                m_mBossToCellMap.insert(BossToCellMap::value_type(NPC_EREKEM, pGo->GetObjectGuid()));
+                return;
+            case GO_CELL_EREKEM_GUARD_L:
+                m_mBossToCellMap.insert(BossToCellMap::value_type(NPC_EREKEM, pGo->GetObjectGuid()));
+                return;
+            case GO_CELL_EREKEM_GUARD_R:
+                m_mBossToCellMap.insert(BossToCellMap::value_type(NPC_EREKEM, pGo->GetObjectGuid()));
+                return;
+
+            case GO_INTRO_CRYSTAL:
+            case GO_PRISON_SEAL_DOOR:
+                break;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void UpdateCellForBoss(uint32 uiBossEntry, bool bForceClosing = false)
+        {
+            BossToCellMap::const_iterator itrCellLower = m_mBossToCellMap.lower_bound(uiBossEntry);
+            BossToCellMap::const_iterator itrCellUpper = m_mBossToCellMap.upper_bound(uiBossEntry);
+
+            if (itrCellLower == itrCellUpper)
+                return;
+
+            for (BossToCellMap::const_iterator itr = itrCellLower; itr != itrCellUpper; ++itr)
+            {
+                if (!bForceClosing)
+                    DoUseDoorOrButton(itr->second);
+                else
+                {
+                    GameObject* pGo = instance->GetGameObject(itr->second);
+                    if (pGo && pGo->GetGoType() == GAMEOBJECT_TYPE_DOOR && pGo->GetGoState() == GO_STATE_ACTIVE)
+                        pGo->ResetDoorOrButton();
+                }
+            }
+        }
+
+        void ProcessActivationCrystal(Unit* pUser, bool bIsIntro = false)
+        {
+            if (Creature* pSummon = pUser->SummonCreature(NPC_DEFENSE_SYSTEM, fDefenseSystemLoc[0], fDefenseSystemLoc[1], fDefenseSystemLoc[2], fDefenseSystemLoc[3], TEMPSUMMON_TIMED_DESPAWN, 10000))
+            {
+                pSummon->CastSpell(pSummon, SPELL_DEFENSE_SYSTEM_VISUAL, true);
+
+                // TODO: figure out how the rest work
+                // NPC's NPC_DEFENSE_DUMMY_TARGET are probably channeling some spell to the defense system
+            }
+
+            if (bIsIntro)
+                DoUseDoorOrButton(GO_INTRO_CRYSTAL);
+
+            // else, kill (and despawn?) certain trash mobs. Also boss affected, but not killed.
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            UpdateWorldState(m_auiEncounter[TYPE_MAIN] == IN_PROGRESS ? true : false);
+
+            if (m_vRandomBosses.empty())
+            {
+                SetRandomBosses();
+                ResetAll();
+            }
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_ZURAMAT:
+            case NPC_VOID_LORD:
+                SetData(TYPE_ZURAMAT, IN_PROGRESS);
+                break;
+            case NPC_XEVOZZ:
+            case NPC_ETHERAL:
+                SetData(TYPE_XEVOZZ, IN_PROGRESS);
+                break;
+            case NPC_LAVANTHOR:
+            case NPC_LAVA_HOUND:
+                SetData(TYPE_LAVANTHOR, IN_PROGRESS);
+                break;
+            case NPC_MORAGG:
+            case NPC_WATCHER:
+                SetData(TYPE_MORAGG, IN_PROGRESS);
+                break;
+            case NPC_EREKEM:
+            case NPC_ARAKKOA:
+                SetData(TYPE_EREKEM, IN_PROGRESS);
+                break;
+            case NPC_ICHORON:
+            case NPC_SWIRLING:
+                SetData(TYPE_ICHORON, IN_PROGRESS);
+                break;
+            case NPC_CYANIGOSA:
+                SetData(TYPE_CYANIGOSA, IN_PROGRESS);
+                break;
+            case NPC_AZURE_CAPTAIN:
+            case NPC_AZURE_RAIDER:
+            case NPC_AZURE_SORCEROR:
+            case NPC_AZURE_STALKER:
+            case NPC_AZURE_INVADER:
+            case NPC_MAGE_HUNTER:
+            case NPC_AZURE_SPELLBREAKER:
+            case NPC_AZURE_BINDER:
+            case NPC_AZURE_MAGE_SLAYER:
+                // Interrupt door seal casting (if necessary)
+                pCreature->InterruptNonMeleeSpells(false);
+                break;
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature)
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_ZURAMAT:
+            case NPC_VOID_LORD:
+                SetData(TYPE_ZURAMAT, FAIL);
+                pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                break;
+            case NPC_XEVOZZ:
+            case NPC_ETHERAL:
+                SetData(TYPE_XEVOZZ, FAIL);
+                pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                break;
+            case NPC_LAVANTHOR:
+            case NPC_LAVA_HOUND:
+                SetData(TYPE_LAVANTHOR, FAIL);
+                pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                break;
+            case NPC_MORAGG:
+            case NPC_WATCHER:
+                SetData(TYPE_MORAGG, FAIL);
+                pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                break;
+            case NPC_EREKEM:
+            case NPC_ARAKKOA:
+                SetData(TYPE_EREKEM, FAIL);
+                pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                break;
+            case NPC_EREKEM_GUARD:
+                pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                break;
+            case NPC_ICHORON:
+            case NPC_SWIRLING:
+                SetData(TYPE_ICHORON, FAIL);
+                pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                break;
+            case NPC_CYANIGOSA:
+                SetData(TYPE_CYANIGOSA, FAIL);
+                break;
+            case NPC_AZURE_CAPTAIN:
+            case NPC_AZURE_RAIDER:
+            case NPC_AZURE_SORCEROR:
+            case NPC_AZURE_STALKER:
+            case NPC_AZURE_INVADER:
+            case NPC_MAGE_HUNTER:
+            case NPC_AZURE_SPELLBREAKER:
+            case NPC_AZURE_BINDER:
+            case NPC_AZURE_MAGE_SLAYER:
+                // Allow them to finish off the door seal
+                pCreature->SetWalk(false);
+                pCreature->GetMotionMaster()->MovePoint(1, fSealAttackLoc[0], fSealAttackLoc[1], fSealAttackLoc[2]);
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_ZURAMAT:
+            case NPC_VOID_LORD:
+                SetData(TYPE_ZURAMAT, DONE);
+                break;
+            case NPC_XEVOZZ:
+            case NPC_ETHERAL:
+                SetData(TYPE_XEVOZZ, DONE);
+                break;
+            case NPC_LAVANTHOR:
+            case NPC_LAVA_HOUND:
+                SetData(TYPE_LAVANTHOR, DONE);
+                break;
+            case NPC_MORAGG:
+            case NPC_WATCHER:
+                SetData(TYPE_MORAGG, DONE);
+                break;
+            case NPC_EREKEM:
+            case NPC_ARAKKOA:
+                SetData(TYPE_EREKEM, DONE);
+                break;
+            case NPC_ICHORON:
+            case NPC_SWIRLING:
+                SetData(TYPE_ICHORON, DONE);
+                break;
+            case NPC_CYANIGOSA:
+                SetData(TYPE_CYANIGOSA, DONE);
+                break;
+            case NPC_VOID_SENTRY:
+                if (GetData(TYPE_ZURAMAT) == IN_PROGRESS)
+                    m_bIsVoidDance = false;
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            debug_log("SD3: instance_violet_hold: SetData got type %u, data %u.", uiType, uiData);
+
+            switch (uiType)
+            {
+            case TYPE_MAIN:
+                if (uiData == m_auiEncounter[uiType])
+                    return;
+                if (m_auiEncounter[uiType] == DONE)
+                    return;
+
+                switch (uiData)
+                {
+                case IN_PROGRESS:
+                    // ToDo: enable the prison defense system when implemented
+                    DoUseDoorOrButton(GO_PRISON_SEAL_DOOR);
+                    UpdateWorldState();
+                    m_bIsDefenseless = true;
+                    m_uiPortalId = urand(0, 2);
+                    m_uiPortalTimer = 15000;
+                    break;
+                case FAIL:
+                    if (Creature* pSinclari = GetSingleCreatureFromStorage(NPC_SINCLARI))
+                        pSinclari->DealDamage(pSinclari, pSinclari->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                    if (Creature* pController = GetSingleCreatureFromStorage(NPC_EVENT_CONTROLLER))
+                        pController->AI()->EnterEvadeMode();
+                    // Reset the event (creature cleanup is handled in creature_linking)
+                    DoUseDoorOrButton(GO_PRISON_SEAL_DOOR); // open instance door
+                    ResetAll();
+                    m_uiEventResetTimer = 20000;            // Timer may not be correct - 20 sec is default reset timer for blizz
+                    break;
+                case DONE:
+                    DoUseDoorOrButton(GO_PRISON_SEAL_DOOR);
+                    UpdateWorldState(false);
+                    break;
+                case SPECIAL:
+                    break;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_SEAL:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == SPECIAL)
+                {
+                    --m_uiWorldStateSealCount;
+                    DoUpdateWorldState(WORLD_STATE_SEAL, m_uiWorldStateSealCount);
+
+                    // Yell at 75%, 50% and 25% shield
+                    if (m_uiWorldStateSealCount < 100 - 25 * m_uiSealYellCount)
+                    {
+                        if (Creature* pSinclari = GetSingleCreatureFromStorage(NPC_SINCLARI_ALT))
+                        {
+                            // ToDo: I'm not sure if the last yell should be at 25% or at 5%. Needs research
+                            ++m_uiSealYellCount;
+                            DoScriptText(aSealWeakYell[m_uiSealYellCount - 1], pSinclari);
+                        }
+                    }
+
+                    // set achiev to failed
+                    if (m_bIsDefenseless)
+                        m_bIsDefenseless = false;
+
+                    if (!m_uiWorldStateSealCount)
+                    {
+                        SetData(TYPE_MAIN, FAIL);
+                        SetData(TYPE_SEAL, NOT_STARTED);
+                    }
+                }
+                break;
+            case TYPE_PORTAL:
+                switch (uiData)
+                {
+                case SPECIAL:                               // timer to next
+                    m_uiPortalTimer = 90000;
+                    break;
+                case DONE:                                  // portal done, set timer to 5 secs
+                    m_uiPortalTimer = 3000;
+                    break;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_LAVANTHOR:
+            case TYPE_MORAGG:
+            case TYPE_EREKEM:
+            case TYPE_ICHORON:
+            case TYPE_XEVOZZ:
+            case TYPE_ZURAMAT:
+                if (uiData == DONE)
+                    m_uiPortalTimer = 35000;
+                if (m_auiEncounter[uiType] != DONE)             // Keep the DONE-information stored
+                    m_auiEncounter[uiType] = uiData;
+                // Handle achievements if necessary
+                if (uiData == IN_PROGRESS)
+                {
+                    if (uiType == TYPE_ZURAMAT)
+                        m_bIsVoidDance = true;
+                    else if (uiType == TYPE_ICHORON)
+                        m_bIsDehydratation = true;
+                }
+                if (uiData == SPECIAL && uiType == TYPE_ICHORON)
+                    m_bIsDehydratation = false;
+                if (uiData == FAIL)
+                    SetData(TYPE_MAIN, FAIL);
+                break;
+            case TYPE_CYANIGOSA:
+                if (uiData == DONE)
+                    SetData(TYPE_MAIN, DONE);
+                if (uiData == FAIL)
+                    SetData(TYPE_MAIN, FAIL);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_DO_SINCLARI_BEGIN:
+                SetIntroPortals(true);
+                CallGuards(false);
+                return;
+            case TYPE_DO_RELEASE_BOSS:
+                DoReleaseBoss();
+                return;
+            default:
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6] << " " << m_auiEncounter[7] << " " << m_auiEncounter[8] << " "
+                    << m_auiEncounter[9];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+                return m_auiEncounter[uiType];
+
+            switch (uiType)
+            {
+            case TYPE_DATA_PORTAL_NUMBER:
+                return m_uiWorldStatePortalCount;
+            case TYPE_DATA_PORTAL_ELITE:
+                return (urand(0, 1) ? NPC_PORTAL_GUARDIAN : NPC_PORTAL_KEEPER);
+            case TYPE_DATA_IS_TRASH_PORTAL:
+                return uint32(IsCurrentPortalForTrash());
+            case TYPE_DATA_GET_MOB_NORMAL:
+                return aRandomPortalNpcs[urand(0, 4)];
+            default:
+                break;
+            }
+            return 0;
+        }
+
+        void SetData64(uint32 uiType, uint64 uiData) override
+        {
+            switch (uiType)
+            {
+            case DATA64_CRYSTAL_ACTIVATOR:
+                if (Player* pl = instance->GetPlayer(ObjectGuid(uiData)))
+                    ProcessActivationCrystal(pl);
+                break;
+            case DATA64_CRYSTAL_ACTIVATOR_INT:
+                if (Unit* pl = instance->GetUnit(ObjectGuid(uiData)))
+                    ProcessActivationCrystal(pl, true);
+                break;
+            case DATA64_SABOTEUR:
+                if (const BossInformation* pData = GetBossInformation())
+                {
+                    Creature* pSummoned = instance->GetCreature(ObjectGuid(uiData));
+                    pSummoned->SetWalk(false);
+                    pSummoned->GetMotionMaster()->MovePoint(pData->uiWayPointId, pData->fX, pData->fY, pData->fZ);
+                }
+                break;
+            default:
+                break;
+            }
+        }
+
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* pTarget, uint32 uiMiscValue1 /* = 0*/) const override
+        {
+            switch (uiCriteriaId)
+            {
+                // ToDo: uncomment these when they are implemented
+                // case ACHIEV_CRIT_DEFENSELES:
+                //    return m_bIsDefenseless;
+                // case ACHIEV_CRIT_DEHYDRATATION:
+                //    return m_bIsDehydratation;
+            case ACHIEV_CRIT_VOID_DANCE:
+                return m_bIsVoidDance;
+
+            default:
+                return false;
+            }
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7]
+                >> m_auiEncounter[8] >> m_auiEncounter[9];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                    m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_uiEventResetTimer)
+            {
+                if (m_uiEventResetTimer <= uiDiff)
+                {
+                    if (Creature* pSinclari = GetSingleCreatureFromStorage(NPC_SINCLARI))
+                        pSinclari->Respawn();
+
+                    m_uiEventResetTimer = 0;
+                }
+                else
+                    m_uiEventResetTimer -= uiDiff;
+            }
+
+            if (m_auiEncounter[TYPE_MAIN] != IN_PROGRESS)
+                return;
+
+            if (m_uiPortalTimer)
+            {
+                if (m_uiPortalTimer <= uiDiff)
+                {
+                    DoUpdateWorldState(WORLD_STATE_PORTALS, ++m_uiWorldStatePortalCount);
+
+                    SetPortalId();
+                    SpawnPortal();
+
+                    m_uiPortalTimer = 0;
+                }
+                else
+                    m_uiPortalTimer -= uiDiff;
+            }
+        }
+
+        typedef std::multimap<uint32, ObjectGuid> BossToCellMap;
+
+    private:
+        void GetErekemGuardList(GuidList& lGuardList) { lGuardList = GetData(TYPE_EREKEM) != DONE ? m_lErekemGuardList : m_lArakkoaGuardList; }
+
+        bool IsCurrentPortalForTrash() const
+        {
+            if (m_uiWorldStatePortalCount % MAX_MINIBOSSES)
+                return true;
+
+            return false;
+        }
+
+        BossInformation const* GetBossInformation(uint32 uiEntry = 0)
+        {
+            uint32 mEntry = uiEntry;
+            if (!mEntry)
+            {
+                if (m_uiWorldStatePortalCount == 6 && m_vRandomBosses.size() >= 1)
+                    mEntry = m_vRandomBosses[0]->uiEntry;
+                else if (m_uiWorldStatePortalCount == 12 && m_vRandomBosses.size() >= 2)
+                    mEntry = m_vRandomBosses[1]->uiEntry;
+            }
+
+            if (!mEntry)
+                return NULL;
+
+            for (uint8 i = 0; i < MAX_MINIBOSSES; ++i)
+            {
+                if (aBossInformation[i].uiEntry == mEntry)
+                    return &aBossInformation[i];
+            }
+
+            return NULL;
+        }
+
+        void SetIntroPortals(bool bDeactivate)
+        {
+            for (GuidList::const_iterator itr = m_lIntroPortalList.begin(); itr != m_lIntroPortalList.end(); ++itr)
+            {
+                if (Creature* pPortal = instance->GetCreature(*itr))
+                {
+                    if (bDeactivate)
+                        pPortal->ForcedDespawn();
+                    else
+                        pPortal->Respawn();
+                }
+            }
+        }
+
+        void CallGuards(bool bRespawn)
+        {
+            for (GuidList::const_iterator itr = m_lGuardsList.begin(); itr != m_lGuardsList.end(); ++itr)
+            {
+                if (Creature* pGuard = instance->GetCreature(*itr))
+                {
+                    if (bRespawn)
+                        pGuard->Respawn();
+                    else if (pGuard->IsAlive())
+                    {
+                        pGuard->SetWalk(false);
+                        pGuard->GetMotionMaster()->MovePoint(0, fGuardExitLoc[0], fGuardExitLoc[1], fGuardExitLoc[2]);
+                        pGuard->ForcedDespawn(6000);
+                    }
+                }
+            }
+        }
+
+        // Release a boss from a prison cell
+        void DoReleaseBoss()
+        {
+            if (const BossInformation* pData = GetBossInformation())
+            {
+                if (Creature* pBoss = GetSingleCreatureFromStorage(GetData(pData->uiType) != DONE ? pData->uiEntry : pData->uiGhostEntry))
+                {
+                    UpdateCellForBoss(pData->uiEntry);
+                    if (pData->iSayEntry)
+                        DoScriptText(pData->iSayEntry, pBoss);
+
+                    pBoss->GetMotionMaster()->MovePoint(1, pData->fX, pData->fY, pData->fZ);
+                    pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+
+                    // Handle Erekem guards
+                    if (pData->uiType == TYPE_EREKEM)
+                    {
+                        GuidList lAddGuids;
+                        GetErekemGuardList(lAddGuids);
+
+                        float fMoveX;
+                        for (GuidList::const_iterator itr = lAddGuids.begin(); itr != lAddGuids.end(); ++itr)
+                        {
+                            if (Creature* pAdd = instance->GetCreature(*itr))
+                            {
+                                fMoveX = (pData->fX - pAdd->GetPositionX()) * .25;
+                                pAdd->GetMotionMaster()->MovePoint(0, pData->fX - fMoveX, pData->fY, pData->fZ);
+                                pAdd->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        PortalData const* GetPortalData() { return &afPortalLocation[m_uiPortalId]; }
+
+        void UpdateWorldState(bool bEnable = true)
+        {
+            m_uiWorldState = bEnable ? 1 : 0;
+
+            DoUpdateWorldState(WORLD_STATE_ID, m_uiWorldState);
+            DoUpdateWorldState(WORLD_STATE_SEAL, m_uiWorldStateSealCount);
+            DoUpdateWorldState(WORLD_STATE_PORTALS, m_uiWorldStatePortalCount);
+        }
+
+        void SetRandomBosses()
+        {
+            // Store bosses that are already done
+            for (uint8 i = 0; i < MAX_MINIBOSSES; ++i)
+            {
+                if (m_auiEncounter[aBossInformation[i].uiType] == DONE)
+                    m_vRandomBosses.push_back(CreateBossSpawnByEntry(aBossInformation[i].uiEntry));
+            }
+
+            if (m_vRandomBosses.size() < 2)                         // Get some new random bosses
+            {
+                std::random_shuffle(m_vRandomBossList.begin(), m_vRandomBossList.end());
+                // two required, in case the first is already pushed to m_vRandomBosses
+                if (m_vRandomBossList.size() < 2)
+                    script_error_log("instance_violet_hold, Mini Bosses are not properly spawned");
+                else
+                    m_vRandomBossList.resize(2);
+
+                // Fill up some random bosses
+                for (std::vector<uint32>::const_iterator itr = m_vRandomBossList.begin(); itr != m_vRandomBossList.end(); ++itr)
+                {
+                    if (m_vRandomBosses.empty() || m_vRandomBosses[0]->uiEntry != *itr)
+                        m_vRandomBosses.push_back(CreateBossSpawnByEntry(*itr));
+                }
+            }
+
+            for (uint8 i = 0; i < m_vRandomBosses.size(); ++i)
+                debug_log("SD3: instance_violet_hold random boss %u is entry %u", i, m_vRandomBosses[i]->uiEntry);
+        }
+
+        void SpawnPortal()
+        {
+            if (const PortalData* pData = GetPortalData())
+            {
+                if (Creature* pController = GetSingleCreatureFromStorage(NPC_SINCLARI_ALT))
+                {
+                    uint32 uiPortalEntry = pData->pPortalType == PORTAL_TYPE_NORM ? NPC_PORTAL : NPC_PORTAL_ELITE;
+
+                    pController->SummonCreature(uiPortalEntry, pData->fX, pData->fY, pData->fZ, pData->fOrient, TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN, 1800 * IN_MILLISECONDS);
+                }
+            }
+        }
+
+        void SetPortalId()
+        {
+            if (IsCurrentPortalForTrash())
+            {
+                // Find another Trash portal position
+                uint8 uiTemp = m_uiPortalId + urand(1, m_uiMaxCountPortalLoc - 1);
+                // Decrease m_uiMaxCountPortalLoc so that the center position is skipped
+                uiTemp %= m_uiMaxCountPortalLoc - 1;
+
+                debug_log("SD3: instance_violet_hold: SetPortalId %u, old was id %u.", uiTemp, m_uiPortalId);
+
+                m_uiPortalId = uiTemp;
+            }
+            else if (m_uiWorldStatePortalCount == 18)
+            {
+                debug_log("SD3: instance_violet_hold: SetPortalId %u (Cyanigosa), old was id %u.", 0, m_uiPortalId);
+                m_uiPortalId = 0;
+            }
+            else
+            {
+                debug_log("SD3: instance_violet_hold: SetPortalId %u (is boss), old was id %u.", m_uiMaxCountPortalLoc, m_uiPortalId);
+                m_uiPortalId = m_uiMaxCountPortalLoc;
+            }
+        }
+
+        void ResetAll()
+        {
+            ResetVariables();
+            UpdateWorldState(false);
+            CallGuards(true);
+            SetIntroPortals(false);
+            // ToDo: reset the activation crystals when implemented
+
+            for (std::vector<BossSpawn*>::const_iterator itr = m_vRandomBosses.begin(); itr != m_vRandomBosses.end(); ++itr)
+            {
+                const BossInformation* pData = GetBossInformation((*itr)->uiEntry);
+                if (pData && m_auiEncounter[pData->uiType] == DONE)
+                {
+                    // Despawn ghost boss
+                    if (Creature* pGhostBoss = GetSingleCreatureFromStorage(pData->uiGhostEntry))
+                        pGhostBoss->ForcedDespawn();
+
+                    // Spawn new boss replacement
+                    if (Creature* pSummoner = GetSingleCreatureFromStorage(NPC_SINCLARI_ALT))
+                        pSummoner->SummonCreature(pData->uiGhostEntry, (*itr)->fX, (*itr)->fY, (*itr)->fZ, (*itr)->fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                    // Replace Erekem guards
+                    if (pData->uiType == TYPE_EREKEM)
+                    {
+                        // Despawn ghost guards
+                        for (GuidList::const_iterator itr = m_lArakkoaGuardList.begin(); itr != m_lArakkoaGuardList.end(); ++itr)
+                        {
+                            if (Creature* pGhostGuard = instance->GetCreature(*itr))
+                                pGhostGuard->ForcedDespawn();
+                        }
+
+                        m_lArakkoaGuardList.clear();
+
+                        // Spawn new guards replacement
+                        float fX, fY, fZ, fO;
+                        for (GuidList::const_iterator itr = m_lErekemGuardList.begin(); itr != m_lErekemGuardList.end(); ++itr)
+                        {
+                            if (Creature* pGuard = instance->GetCreature(*itr))
+                            {
+                                // Don't allow alive original guards while the boss is dead
+                                if (!pGuard->IsDead())
+                                    pGuard->ForcedDespawn();
+
+                                // Spawn a ghost guard for each original guard
+                                pGuard->GetRespawnCoord(fX, fY, fZ, &fO);
+                                pGuard->SummonCreature(NPC_ARAKKOA_GUARD, fX, fY, fZ, fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+                            }
+                        }
+                    }
+                }
+
+                // Close Door if still open
+                if (pData && (m_auiEncounter[pData->uiType] == DONE || m_auiEncounter[pData->uiType] == FAIL))
+                    UpdateCellForBoss(pData->uiEntry, true);
+            }
+        }
+
+        void ResetVariables()
+        {
+            m_uiWorldStateSealCount = 100;
+            m_uiWorldStatePortalCount = 0;
+            m_uiSealYellCount = 0;
+        }
+
+        bool IsNextPortalForTrash()
+        {
+            if ((m_uiWorldStatePortalCount + 1) % MAX_MINIBOSSES)
+                return true;
+
+            return false;
+        }
+
+        BossSpawn* CreateBossSpawnByEntry(uint32 uiEntry)
+        {
+            BossSpawn* pBossSpawn = new BossSpawn;
+            pBossSpawn->uiEntry = uiEntry;
+
+            if (Creature* pBoss = GetSingleCreatureFromStorage(uiEntry))
+                pBoss->GetRespawnCoord(pBossSpawn->fX, pBossSpawn->fY, pBossSpawn->fZ, &(pBossSpawn->fO));
+
+            return pBossSpawn;
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiWorldState;
+        uint32 m_uiWorldStateSealCount;
+        uint32 m_uiWorldStatePortalCount;
+
+        uint8 m_uiPortalId;
+        uint32 m_uiPortalTimer;
+        uint32 m_uiMaxCountPortalLoc;
+
+        uint32 m_uiSealYellCount;
+        uint32 m_uiEventResetTimer;
+
+        bool m_bIsVoidDance;
+        bool m_bIsDefenseless;
+        bool m_bIsDehydratation;
+
+        BossToCellMap m_mBossToCellMap;
+
+        GuidList m_lIntroPortalList;
+        GuidList m_lGuardsList;
+        GuidList m_lErekemGuardList;
+        GuidList m_lArakkoaGuardList;
+        GuidList m_lIchoronTargetsList;
+        std::vector<uint32> m_vRandomBossList;
+
+        std::vector<BossSpawn*> m_vRandomBosses;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_violet_hold(pMap);
+    }
+};
+
+void AddSC_instance_violet_hold()
+{
+    Script* s;
+
+    s = new is_violet_hold();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_violet_hold";
+    //pNewScript->GetInstanceData = GetInstanceData_instance_violet_hold;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/violet_hold/violet_hold.cpp b/src/modules/SD3/scripts/northrend/violet_hold/violet_hold.cpp
new file mode 100644
index 000000000..7a0ac1821
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/violet_hold/violet_hold.cpp
@@ -0,0 +1,633 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Violet_Hold
+SD%Complete: 80
+SDComment: Intro event required more research and core support.
+SDCategory: Violet Hold
+EndScriptData */
+
+/* ContentData
+go_activation_crystal
+npc_door_seal
+npc_sinclari
+npc_prison_event_controller
+npc_teleportation_portal
+EndContentData */
+
+#include "precompiled.h"
+#include "violet_hold.h"
+#include "escort_ai.h"
+
+/*######
+## go_activation_crystal
+######*/
+
+struct go_activation_crystal : public GameObjectScript
+{
+    go_activation_crystal() : GameObjectScript("go_activation_crystal") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        if (InstanceData* pInstance = pGo->GetInstanceData())
+            pInstance->SetData64(DATA64_CRYSTAL_ACTIVATOR, pPlayer->GetObjectGuid().GetRawValue());
+
+        return false;
+    }
+};
+
+/*######
+## npc_door_seal
+######*/
+
+struct spell_destroy_door_seal : public SpellScript
+{
+    spell_destroy_door_seal() : SpellScript("spell_destroy_door_seal") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_DESTROY_DOOR_SEAL && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (InstanceData* pInstance = pTarget->ToCreature()->GetInstanceData())
+                pInstance->SetData(TYPE_SEAL, SPECIAL);
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+        return false;
+    }
+};
+
+/*######
+## npc_sinclari
+######*/
+
+enum
+{
+    SAY_BEGIN                   = -1608000,
+    SAY_LOCK_DOOR               = -1608001,
+    SAY_VICTORY                 = -1608027,
+
+    GOSSIP_ITEM_INTRO           = -3608000,
+    GOSSIP_ITEM_START           = -3608001,
+    GOSSIP_ITEM_TELEPORT        = -3608002,
+
+    GOSSIP_TEXT_ID_INTRO        = 13853,
+    GOSSIP_TEXT_ID_START        = 13854,
+
+    SPELL_TELEPORT_INSIDE       = 62138,            // script effect - should trigger 62139
+};
+
+struct npc_sinclari : public CreatureScript
+{
+    npc_sinclari() : CreatureScript("npc_sinclari") {}
+
+    struct npc_sinclariAI : public npc_escortAI
+    {
+        npc_sinclariAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bIsEpilogue;
+
+        void Reset() override
+        {
+            m_bIsEpilogue = false;
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            if (!m_pInstance)
+                return;
+
+            switch (uiPointId)
+            {
+            case 0:
+                m_pInstance->SetData64(DATA64_CRYSTAL_ACTIVATOR_INT, m_creature->GetObjectGuid().GetRawValue());
+                break;
+            case 1:
+                DoScriptText(SAY_BEGIN, m_creature);
+                m_pInstance->SetData(TYPE_DO_SINCLARI_BEGIN, 0);
+                break;
+            case 2:
+                DoScriptText(SAY_LOCK_DOOR, m_creature);
+                m_creature->SetFacingTo(0.05f);
+                break;
+            case 3:
+                m_pInstance->SetData(TYPE_MAIN, IN_PROGRESS);
+                break;
+            case 4:
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                SetEscortPaused(true);
+                break;
+            case 5:
+                m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                DoScriptText(SAY_VICTORY, m_creature);
+                SetEscortPaused(true);
+                break;
+            }
+        }
+
+        void JustRespawned() override
+        {
+            if (m_pInstance && m_pInstance->GetData(TYPE_MAIN) != DONE)
+                m_pInstance->SetData(TYPE_MAIN, NOT_STARTED);
+
+            npc_escortAI::JustRespawned();                      // Needed, to reset escort state, waypoints, etc
+        }
+
+        void UpdateEscortAI(const uint32 /*uiDiff*/) override
+        {
+            // Say outro after event is finished
+            if (m_pInstance && m_pInstance->GetData(TYPE_MAIN) == DONE && !m_bIsEpilogue)
+            {
+                SetEscortPaused(false);
+                m_bIsEpilogue = true;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_sinclariAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (InstanceData* pInstance = pCreature->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_MAIN) != IN_PROGRESS)
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_INTRO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            else
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_INTRO, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            if (InstanceData* pInstance = pCreature->GetInstanceData())
+            {
+                if (pInstance->GetData(TYPE_MAIN) == NOT_STARTED)
+                {
+                    pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+                    pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_START, pCreature->GetObjectGuid());
+                }
+            }
+            else
+                pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 2)
+        {
+            if (InstanceData* pInstance = pCreature->GetInstanceData())
+            {
+                pPlayer->CLOSE_GOSSIP_MENU();
+
+                if (pInstance->GetData(TYPE_MAIN) == NOT_STARTED)
+                {
+                    pInstance->SetData(TYPE_MAIN, SPECIAL);
+
+                    if (npc_sinclariAI* pEscortAI = dynamic_cast<npc_sinclariAI*>(pCreature->AI()))
+                        pEscortAI->Start();
+                }
+            }
+            else
+                pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 3)
+        {
+            pCreature->CastSpell(pPlayer, SPELL_TELEPORT_INSIDE, true);
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_prison_event_controller
+######*/
+
+struct npc_prison_event_controller : public CreatureScript
+{
+    npc_prison_event_controller() : CreatureScript("npc_prison_event_controller") {}
+
+    struct npc_prison_event_controllerAI : public ScriptedAI
+    {
+        npc_prison_event_controllerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        GuidSet m_sTrashPackSet;
+
+        uint32 m_uiSaboteurTimer;
+        uint8 m_uiSaboteurPhase;
+        uint8 m_uiCurrentTrashPortalId;
+
+        ObjectGuid m_currentSaboteurGuid;
+
+        void Reset() override
+        {
+            m_uiCurrentTrashPortalId = 0;
+            m_uiSaboteurPhase = 0;
+            m_uiSaboteurTimer = 0;
+
+            m_currentSaboteurGuid.Clear();
+            m_sTrashPackSet.clear();
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* sender, Unit* invoker, uint32 data)
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && sender == invoker)
+                DoSetCurrentTrashPortal(data);
+        }
+
+        void DoSetCurrentTrashPortal(uint8 uiPortalId) { m_uiCurrentTrashPortalId = uiPortalId; }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_AZURE_CAPTAIN:
+                DoScriptText(EMOTE_DRAGONFLIGHT_PORTAL, pSummoned);
+                // no break
+            case NPC_AZURE_RAIDER:
+            case NPC_AZURE_SORCEROR:
+            case NPC_AZURE_STALKER:
+                m_sTrashPackSet.insert(pSummoned->GetObjectGuid());
+                // no break
+            case NPC_AZURE_INVADER:
+            case NPC_MAGE_HUNTER:
+            case NPC_AZURE_SPELLBREAKER:
+            case NPC_AZURE_BINDER:
+            case NPC_AZURE_MAGE_SLAYER:
+                pSummoned->SetWalk(false);
+                pSummoned->GetMotionMaster()->MovePoint(1, fSealAttackLoc[0], fSealAttackLoc[1], fSealAttackLoc[2]);
+                break;
+            case NPC_AZURE_SABOTEUR:
+                if (!m_pInstance)
+                    return;
+                m_currentSaboteurGuid = pSummoned->GetObjectGuid();
+                m_pInstance->SetData64(DATA64_SABOTEUR, pSummoned->GetObjectGuid().GetRawValue());
+                break;
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE && !uiPointId)
+                return;
+
+            if (pSummoned->GetEntry() == NPC_AZURE_SABOTEUR)
+            {
+                // Prepare to release the boss
+                m_uiSaboteurPhase = 0;
+                m_uiSaboteurTimer = 1000;
+                pSummoned->CastSpell(pSummoned, SPELL_SHIELD_DISRUPTION, false);
+            }
+            // For other summons, cast destroy seal when they reach the door
+            else
+                pSummoned->CastSpell(pSummoned, SPELL_DESTROY_DOOR_SEAL, false);
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_AZURE_CAPTAIN:
+            case NPC_AZURE_RAIDER:
+            case NPC_AZURE_SORCEROR:
+            case NPC_AZURE_STALKER:
+                if (m_sTrashPackSet.find(pSummoned->GetObjectGuid()) != m_sTrashPackSet.end())
+                    m_sTrashPackSet.erase(pSummoned->GetObjectGuid());
+
+                if (m_sTrashPackSet.empty())
+                {
+                    // no need if a new portal was made while this was in progress
+                    if (m_uiCurrentTrashPortalId == m_pInstance->GetData(TYPE_DATA_PORTAL_NUMBER))
+                        m_pInstance->SetData(TYPE_PORTAL, DONE);
+                }
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiSaboteurTimer)
+            {
+                if (m_uiSaboteurTimer <= uiDiff)
+                {
+                    Creature* pSaboteur = m_creature->GetMap()->GetCreature(m_currentSaboteurGuid);
+                    if (!pSaboteur)
+                        return;
+
+                    switch (m_uiSaboteurPhase)
+                    {
+                    case 0:
+                        pSaboteur->CastSpell(pSaboteur, SPELL_SHIELD_DISRUPTION, false);
+                        m_uiSaboteurTimer = 1000;
+                        break;
+                    case 1:
+                        pSaboteur->CastSpell(pSaboteur, SPELL_SHIELD_DISRUPTION, false);
+                        m_uiSaboteurTimer = 1000;
+                        break;
+                    case 2:
+                        if (m_pInstance)
+                            m_pInstance->SetData(TYPE_DO_RELEASE_BOSS, 1);
+                        pSaboteur->CastSpell(pSaboteur, SPELL_SIMPLE_TELEPORT, false);
+                        pSaboteur->ForcedDespawn(1000);
+                        m_uiSaboteurTimer = 0;
+                        break;
+                    }
+                    ++m_uiSaboteurPhase;
+                }
+                else
+                    m_uiSaboteurTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_prison_event_controllerAI(pCreature);
+    }
+};
+
+/*######
+## npc_teleportation_portal
+######*/
+
+static const uint32 aTrashPortalNpcs[4] = {NPC_AZURE_CAPTAIN, NPC_AZURE_RAIDER, NPC_AZURE_SORCEROR, NPC_AZURE_STALKER};
+
+struct npc_teleportation_portal : public CreatureScript
+{
+    npc_teleportation_portal() : CreatureScript("npc_teleportation_portal") {}
+
+    struct npc_teleportation_portalAI : public ScriptedAI
+    {
+        npc_teleportation_portalAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_uiMyPortalNumber = 0;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bIntro;
+        uint32 m_uiMyPortalNumber;
+        uint32 m_uiCyanigosaMoveTimer;
+
+        ObjectGuid m_cyanigosaGuid;
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_PORTAL_PERIODIC);
+
+            m_bIntro = true;
+            m_uiCyanigosaMoveTimer = 0;
+
+            if (m_pInstance)
+                m_uiMyPortalNumber = m_pInstance->GetData(TYPE_DATA_PORTAL_NUMBER);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*sender*/, Unit* /*invoker*/, uint32 /**/)
+        {
+            if (!m_pInstance || eventType != AI_EVENT_CUSTOM_A)
+                return;
+
+            // Portal event used for intro
+            if (m_creature->GetEntry() == NPC_PORTAL_INTRO)
+            {
+                // ToDo: uncomment this when the information and DB data is confirmed. Right now the mobs may overrun the guards after a few min of fightning
+                // m_creature->SummonCreature(m_pInstance->GetRandomMobForIntroPortal(), 0, 0, 0, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                return;
+            }
+
+            // First summon tick
+            if (m_bIntro)
+            {
+                if (m_creature->GetEntry() == NPC_PORTAL)
+                {
+                    // Summon a guardian keeper or Cyanigosa
+                    if (m_uiMyPortalNumber == 18)
+                        m_creature->SummonCreature(NPC_CYANIGOSA, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 600 * IN_MILLISECONDS);
+                    else
+                        m_creature->SummonCreature(m_pInstance->GetData(TYPE_DATA_PORTAL_ELITE), 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 600 * IN_MILLISECONDS);
+                }
+                else if (m_creature->GetEntry() == NPC_PORTAL_ELITE)
+                {
+                    // Allow the event controller to summon the mobs, for better movement handling
+                    Creature* pController = m_pInstance->GetSingleCreatureFromStorage(NPC_EVENT_CONTROLLER);
+                    if (!pController)
+                        return;
+
+                    // Summon a squad or a saboteur
+                    if (bool(m_pInstance->GetData(TYPE_DATA_IS_TRASH_PORTAL)))
+                    {
+                        float fX, fY, fZ;
+                        for (uint8 i = 0; i < 4; ++i)
+                        {
+                            uint32 uiSummonId = aTrashPortalNpcs[i];
+
+                            // Summon the trash pack around the portal
+                            m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 3.0f, M_PI_F / 2 * i);
+                            pController->SummonCreature(uiSummonId, fX, fY, fZ, m_creature->GetOrientation(), TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 600 * IN_MILLISECONDS);
+                        }
+
+                        // If this is a trash portal, set the current number in the
+                        if (CreatureAI* pControllerAI = pController->AI())
+                            pControllerAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, m_creature, m_creature, m_uiMyPortalNumber);
+                    }
+                    else
+                        pController->SummonCreature(NPC_AZURE_SABOTEUR, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), m_creature->GetOrientation(), TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 600 * IN_MILLISECONDS);
+
+                    m_creature->ForcedDespawn(5000);
+                }
+
+                // Set special data for all the portals, except the last one
+                if (m_pInstance && m_uiMyPortalNumber != 18)
+                    m_pInstance->SetData(TYPE_PORTAL, SPECIAL);
+
+                m_bIntro = false;
+            }
+            else
+            {
+                // Allow the normal mobs to be summoned by the event controller
+                if (Creature* pController = m_pInstance->GetSingleCreatureFromStorage(NPC_EVENT_CONTROLLER))
+                    pController->SummonCreature(m_pInstance->GetData(TYPE_DATA_GET_MOB_NORMAL), m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), m_creature->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_CYANIGOSA:
+                m_cyanigosaGuid = pSummoned->GetObjectGuid();
+                m_uiCyanigosaMoveTimer = 5000;
+                m_creature->ForcedDespawn(5000);
+                break;
+            case NPC_PORTAL_GUARDIAN:
+                DoScriptText(EMOTE_GUARDIAN_PORTAL, pSummoned);
+                DoCastSpellIfCan(pSummoned, SPELL_PORTAL_CHANNEL);
+                break;
+            case NPC_PORTAL_KEEPER:
+                DoScriptText(EMOTE_KEEPER_PORTAL, pSummoned);
+                DoCastSpellIfCan(pSummoned, SPELL_PORTAL_CHANNEL);
+                break;
+            case NPC_AZURE_BINDER_INTRO:
+            case NPC_AZURE_INVADER_INTRO:
+            case NPC_AZURE_SPELLBREAKER_INTRO:
+            case NPC_AZURE_MAGE_SLAYER_INTRO:
+                // Move them to the entrance. They will attack the guards automatically
+                pSummoned->SetWalk(false);
+                pSummoned->GetMotionMaster()->MovePoint(1, fSealAttackLoc[0], fSealAttackLoc[1], fSealAttackLoc[2]);
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_PORTAL_GUARDIAN:
+            case NPC_PORTAL_KEEPER:
+                m_creature->ForcedDespawn(3000);
+                // no need if a new portal was made while this was in progress
+                if (m_pInstance && m_uiMyPortalNumber == m_pInstance->GetData(TYPE_DATA_PORTAL_NUMBER))
+                    m_pInstance->SetData(TYPE_PORTAL, DONE);
+                break;
+            }
+        }
+
+        void SummonedCreatureDespawn(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_PORTAL_GUARDIAN:
+            case NPC_PORTAL_KEEPER:
+                // Despawn in case of event reset
+                m_creature->ForcedDespawn();
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiCyanigosaMoveTimer)
+            {
+                if (m_uiCyanigosaMoveTimer <= uiDiff)
+                {
+                    if (Creature* pCyanigosa = m_creature->GetMap()->GetCreature(m_cyanigosaGuid))
+                        pCyanigosa->GetMotionMaster()->MoveJump(afPortalLocation[8].fX, afPortalLocation[8].fY, afPortalLocation[8].fZ, pCyanigosa->GetSpeed(MOVE_RUN) * 2, 10.0f);
+
+                    m_uiCyanigosaMoveTimer = 0;
+                }
+                else
+                    m_uiCyanigosaMoveTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_teleportation_portalAI(pCreature);
+    }
+};
+
+struct spell_vh_portal_periodic : public SpellScript
+{
+    spell_vh_portal_periodic() : SpellScript("spell_vh_portal_periodic") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_PORTAL_PERIODIC && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (CreatureAI* pPortalAI = pTarget->ToCreature()->AI())
+                pPortalAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, (Creature*)NULL, (Unit*)NULL, 0);
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_violet_hold()
+{
+    Script* s;
+
+    s = new go_activation_crystal();
+    s->RegisterSelf();
+    s = new npc_sinclari();
+    s->RegisterSelf();
+    s = new npc_prison_event_controller();
+    s->RegisterSelf();
+    s = new npc_teleportation_portal();
+    s->RegisterSelf();
+
+    s = new spell_destroy_door_seal();
+    s->RegisterSelf();
+    s = new spell_vh_portal_periodic();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_activation_crystal";
+    //pNewScript->pGOUse = &GOUse_go_activation_crystal;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_door_seal";
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_door_seal;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_sinclari";
+    //pNewScript->GetAI = &GetAI_npc_sinclari;
+    //pNewScript->pGossipHello = &GossipHello_npc_sinclari;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_sinclari;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_prison_event_controller";
+    //pNewScript->GetAI = &GetAI_npc_prison_event_controller;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_teleportation_portal";
+    //pNewScript->GetAI = &GetAI_npc_teleportation_portal;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_teleportation_portal;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/northrend/violet_hold/violet_hold.h b/src/modules/SD3/scripts/northrend/violet_hold/violet_hold.h
new file mode 100644
index 000000000..3e71f7b96
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/violet_hold/violet_hold.h
@@ -0,0 +1,171 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * This program is free software licensed under GPL version 2
+ * Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef DEF_VIOLET_H
+#define DEF_VIOLET_H
+
+enum
+{
+    MAX_ENCOUNTER               = 10,
+    MAX_MINIBOSSES              = 6,
+
+    TYPE_MAIN                   = 0,
+    TYPE_SEAL                   = 1,
+    TYPE_PORTAL                 = 2,
+    TYPE_LAVANTHOR              = 3,
+    TYPE_MORAGG                 = 4,
+    TYPE_EREKEM                 = 5,
+    TYPE_ICHORON                = 6,
+    TYPE_XEVOZZ                 = 7,
+    TYPE_ZURAMAT                = 8,
+    TYPE_CYANIGOSA              = 9,
+    TYPE_DO_SINCLARI_BEGIN      = MAX_ENCOUNTER,
+    TYPE_DATA_PORTAL_NUMBER     = MAX_ENCOUNTER + 1,
+    TYPE_DO_RELEASE_BOSS        = MAX_ENCOUNTER + 2,
+    TYPE_DATA_PORTAL_ELITE      = MAX_ENCOUNTER + 3,
+    TYPE_DATA_IS_TRASH_PORTAL   = MAX_ENCOUNTER + 4,
+    TYPE_DATA_GET_MOB_NORMAL    = MAX_ENCOUNTER + 5,
+
+    DATA64_CRYSTAL_ACTIVATOR    = 0,
+    DATA64_CRYSTAL_ACTIVATOR_INT= 1,
+    DATA64_SABOTEUR             = 2,
+
+    WORLD_STATE_ID              = 3816,
+    WORLD_STATE_SEAL            = 3815,
+    WORLD_STATE_PORTALS         = 3810,
+
+    GO_INTRO_CRYSTAL            = 193615,
+    GO_PRISON_CRYSTAL           = 193611,
+    GO_PRISON_SEAL_DOOR         = 191723,
+
+    GO_CELL_LAVANTHOR           = 191566,
+    GO_CELL_MORAGG              = 191606,
+    GO_CELL_ZURAMAT             = 191565,
+    GO_CELL_EREKEM              = 191564,
+    GO_CELL_EREKEM_GUARD_L      = 191563,
+    GO_CELL_EREKEM_GUARD_R      = 191562,
+    GO_CELL_XEVOZZ              = 191556,
+    GO_CELL_ICHORON             = 191722,
+
+    NPC_EVENT_CONTROLLER        = 30883,
+    NPC_PORTAL_INTRO            = 31011,
+    NPC_PORTAL                  = 30679,
+    NPC_PORTAL_ELITE            = 32174,
+    NPC_DOOR_SEAL               = 30896,
+
+    NPC_SINCLARI                = 30658,
+    NPC_SINCLARI_ALT            = 32204,                    // yeller for seal weakening and summoner for portals
+    NPC_HOLD_GUARD              = 30659,
+
+    NPC_EREKEM                  = 29315,
+    NPC_EREKEM_GUARD            = 29395,
+    NPC_MORAGG                  = 29316,
+    NPC_ICHORON                 = 29313,
+    NPC_XEVOZZ                  = 29266,
+    NPC_LAVANTHOR               = 29312,
+    NPC_ZURAMAT                 = 29314,
+    NPC_CYANIGOSA               = 31134,
+
+    NPC_PORTAL_GUARDIAN         = 30660,
+    NPC_PORTAL_KEEPER           = 30695,
+
+    NPC_AZURE_INVADER           = 30661,
+    NPC_AZURE_SPELLBREAKER      = 30662,
+    NPC_AZURE_BINDER            = 30663,
+    NPC_AZURE_MAGE_SLAYER       = 30664,
+    NPC_MAGE_HUNTER             = 30665,
+    NPC_AZURE_CAPTAIN           = 30666,
+    NPC_AZURE_SORCEROR          = 30667,
+    NPC_AZURE_RAIDER            = 30668,
+    NPC_AZURE_STALKER           = 32191,
+
+    NPC_VOID_SENTRY             = 29364,                    // Npc checked for Zuramat achiev
+    NPC_ICHORON_SUMMON_TARGET   = 29326,                    // Npc which summons the Ichoron globules
+
+    // used for intro
+    NPC_AZURE_BINDER_INTRO      = 31007,
+    NPC_AZURE_INVADER_INTRO     = 31008,
+    NPC_AZURE_SPELLBREAKER_INTRO = 31009,
+    NPC_AZURE_MAGE_SLAYER_INTRO = 31010,
+
+    NPC_AZURE_SABOTEUR          = 31079,
+
+    NPC_DEFENSE_SYSTEM          = 30837,
+    NPC_DEFENSE_DUMMY_TARGET    = 30857,
+
+    // 'Ghosts' for Killed mobs after Wipe
+    NPC_ARAKKOA                 = 32226,
+    NPC_ARAKKOA_GUARD           = 32228,
+    NPC_VOID_LORD               = 32230,
+    NPC_ETHERAL                 = 32231,
+    NPC_SWIRLING                = 32234,
+    NPC_WATCHER                 = 32235,
+    NPC_LAVA_HOUND              = 32237,
+
+    SPELL_DEFENSE_SYSTEM_VISUAL = 57887,
+    SPELL_DEFENSE_SYSTEM_SPAWN  = 57886,
+    SPELL_LIGHTNING_INTRO       = 60038,                    // intro kill spells, also related to spell 58152
+    SPELL_ARCANE_LIGHTNING      = 57930,                    // damage spells, related to spell 57912
+
+    SPELL_DESTROY_DOOR_SEAL     = 58040,                    // spell periodic cast by misc
+    SPELL_TELEPORTATION_PORTAL  = 57687,                    // visual aura, but possibly not used? creature_template model for portals are same
+
+    SPELL_SHIELD_DISRUPTION     = 58291,                    // dummy when opening a cell
+    SPELL_SIMPLE_TELEPORT       = 12980,                    // used after a cell has been opened - not sure if the id is correct
+
+    SPELL_PORTAL_PERIODIC       = 58008,                    // most likely the tick for each summon (tick each 15 seconds)
+    SPELL_PORTAL_CHANNEL        = 58012,                    // the blue "stream" between portal and guardian/keeper
+    SPELL_PORTAL_BEAM           = 56046,                    // large beam, unsure if really used here (or possible for something different)
+
+    SPELL_PORTAL_VISUAL_1       = 57872,                    // no idea, but is possibly related based on it's visual appearence
+    SPELL_PORTAL_VISUAL_2       = 57630,
+
+    SAY_SEAL_75                 = -1608002,
+    SAY_SEAL_50                 = -1608003,
+    SAY_SEAL_5                  = -1608004,
+
+    SAY_RELEASE_EREKEM          = -1608008,
+    SAY_RELEASE_ICHORON         = -1608009,
+    SAY_RELEASE_XEVOZZ          = -1608010,
+    SAY_RELEASE_ZURAMAT         = -1608011,
+
+    EMOTE_GUARDIAN_PORTAL       = -1608005,
+    EMOTE_DRAGONFLIGHT_PORTAL   = -1608006,
+    EMOTE_KEEPER_PORTAL         = -1608007,
+
+    MAX_NORMAL_PORTAL           = 8,
+
+    ACHIEV_CRIT_DEFENSELES      = 6803,                     // event achiev - 1816
+    ACHIEV_CRIT_DEHYDRATATION   = 7320,                     // Ichoron achiev - 2041
+    ACHIEV_CRIT_VOID_DANCE      = 7587,                     // Zuramat achiev - 2153
+};
+
+static const float fSealAttackLoc[3] = {1858.027f, 804.11f, 44.008f};
+
+enum ePortalType
+{
+    PORTAL_TYPE_NORM = 0,
+    PORTAL_TYPE_SQUAD,
+    PORTAL_TYPE_BOSS,
+};
+
+struct PortalData
+{
+    ePortalType pPortalType;
+    float fX, fY, fZ, fOrient;
+};
+
+static const PortalData afPortalLocation[] =
+{
+    {PORTAL_TYPE_NORM, 1936.07f, 803.198f, 53.3749f, 3.1241f},  // balcony
+    {PORTAL_TYPE_NORM, 1877.51f, 850.104f, 44.6599f, 4.7822f},  // erekem
+    {PORTAL_TYPE_NORM, 1890.64f, 753.471f, 48.7224f, 1.7104f},  // moragg
+    {PORTAL_TYPE_SQUAD, 1911.06f, 802.103f, 38.6465f, 2.8908f}, // below balcony
+    {PORTAL_TYPE_SQUAD, 1928.06f, 763.256f, 51.3167f, 2.3905f}, // bridge
+    {PORTAL_TYPE_SQUAD, 1924.26f, 847.661f, 47.1591f, 4.0202f}, // zuramat
+    {PORTAL_TYPE_NORM, 1914.16f, 832.527f, 38.6441f, 3.5160f},  // xevozz
+    {PORTAL_TYPE_NORM, 1857.30f, 764.145f, 38.6543f, 0.8339f},  // lavanthor
+    {PORTAL_TYPE_BOSS, 1890.73f, 803.309f, 38.4001f, 2.4139f},  // center
+};
+#endif
diff --git a/src/modules/SD3/scripts/northrend/zuldrak.cpp b/src/modules/SD3/scripts/northrend/zuldrak.cpp
new file mode 100644
index 000000000..05222766a
--- /dev/null
+++ b/src/modules/SD3/scripts/northrend/zuldrak.cpp
@@ -0,0 +1,328 @@
+/* Copyright (C) 2006 - 2013 ScriptDev2 <http://www.scriptdev2.com/>
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Zuldrak
+SD%Complete: 100
+SDComment: Quest support: 12652, 12934.
+SDCategory: Zuldrak
+EndScriptData */
+
+/* ContentData
+npc_gurgthock
+npc_ghoul_feeding_bunny
+npc_decaying_ghoul
+EndContentData */
+
+#include "precompiled.h"
+#include "TemporarySummon.h"
+
+/*######
+## npc_gurgthock
+######*/
+
+enum
+{
+    QUEST_FROM_BEYOND = 12934,
+
+    NPC_AZBARIN       = 30026,
+    NPC_DUKE_SINGEN   = 30019,
+    NPC_ERATHIUS      = 30025,
+    NPC_GARGORAL      = 30024
+};
+
+static float m_afSpawnLocation[] = {5768.71f, -2969.29f, 273.816f};
+static uint32 m_auiBosses[] = {NPC_AZBARIN, NPC_DUKE_SINGEN, NPC_ERATHIUS, NPC_GARGORAL};
+
+struct npc_gurgthock : public CreatureScript
+{
+    npc_gurgthock() : CreatureScript("npc_gurgthock") {}
+
+    struct npc_gurgthockAI : public ScriptedAI
+    {
+        npc_gurgthockAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_playerGuid;
+
+        void SetPlayer(Player* pPlayer)
+        {
+            m_playerGuid = pPlayer->GetObjectGuid();
+        }
+
+        void Reset() override
+        {
+            m_playerGuid.Clear();
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            uint32 uiEntry = pSummoned->GetEntry();
+            for (uint8 i = 0; i < 4; ++i)
+            {
+                if (uiEntry == m_auiBosses[i])
+                {
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                        pPlayer->GroupEventHappens(QUEST_FROM_BEYOND, m_creature);
+
+                    m_playerGuid.Clear();
+                    return;
+                }
+            }
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_FROM_BEYOND)
+        {
+            pCreature->SummonCreature(m_auiBosses[urand(0, 3)], m_afSpawnLocation[0], m_afSpawnLocation[1], m_afSpawnLocation[2], 0.0f, TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN, 600000);
+
+            if (npc_gurgthockAI* pGurthockAI = dynamic_cast<npc_gurgthockAI*>(pCreature->AI()))
+                pGurthockAI->SetPlayer(pPlayer);
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_gurgthockAI(pCreature);
+    }
+};
+
+/*######
+## npc_ghoul_feeding_bunny
+######*/
+
+enum
+{
+    SPELL_ATTRACT_GHOUL                     = 52037,                // script target on npc 28565
+    SPELL_GHOUL_KILL_CREDIT                 = 52030,
+    // SPELL_GHOUL_KILL_CREDIT_EFFECT       = 52038,                // triggers 52039; purpose unk - same effect as 52030 but with different target
+
+    NPC_DECAYING_GHOUL                      = 28565,
+};
+
+struct npc_ghoul_feeding_bunny : public CreatureScript
+{
+    npc_ghoul_feeding_bunny() : CreatureScript("npc_ghoul_feeding_bunny") {}
+
+    struct npc_ghoul_feeding_bunnyAI : public ScriptedAI
+    {
+        npc_ghoul_feeding_bunnyAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiAttractTimer;
+
+        void Reset() override
+        {
+            m_uiAttractTimer = 1000;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pInvoker->GetEntry() == NPC_DECAYING_GHOUL)
+            {
+                // Give kill credit to the summoner player
+                if (m_creature->IsTemporarySummon())
+                {
+                    TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+                    if (Player* pSummoner = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                        DoCastSpellIfCan(pSummoner, SPELL_GHOUL_KILL_CREDIT, CAST_TRIGGERED);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiAttractTimer)
+            {
+                if (m_uiAttractTimer <= uiDiff)
+                {
+                    // try to target a nearby ghoul
+                    if (DoCastSpellIfCan(m_creature, SPELL_ATTRACT_GHOUL) == CAST_OK)
+                        m_uiAttractTimer = 0;
+                    else
+                        m_uiAttractTimer = 5000;
+                }
+                else
+                    m_uiAttractTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ghoul_feeding_bunnyAI(pCreature);
+    }
+};
+
+/*######
+## npc_decaying_ghoul
+######*/
+
+enum
+{
+    SPELL_BIRTH                             = 26047,
+    SPELL_FLESH_ROT                         = 28913,
+
+    NPC_GHOUL_FEEDING_BUNNY                 = 28591,
+};
+
+struct npc_decaying_ghoul : public CreatureScript
+{
+    npc_decaying_ghoul() : CreatureScript("npc_decaying_ghoul") {}
+
+    struct npc_decaying_ghoulAI : public ScriptedAI
+    {
+        npc_decaying_ghoulAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bSpawnAnim = false;
+        }
+
+        uint32 m_uiFleshRotTimer;
+        bool m_bSpawnAnim;
+        ObjectGuid m_feedingBunnyGuid;
+
+        void Reset() override
+        {
+            m_uiFleshRotTimer = urand(1000, 3000);
+        }
+
+        void JustRespawned() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_BIRTH);
+            m_creature->HandleEmote(EMOTE_STATE_NONE);
+            m_feedingBunnyGuid.Clear();
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            // handle the animation and despawn
+            m_creature->GetMotionMaster()->MoveIdle();
+            m_creature->HandleEmote(EMOTE_STATE_EAT_NO_SHEATHE);
+            m_creature->ForcedDespawn(10000);
+
+            // send AI event for the quest credit
+            if (Creature* pBunny = m_creature->GetMap()->GetCreature(m_feedingBunnyGuid))
+                SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pBunny);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pInvoker->GetEntry() == NPC_GHOUL_FEEDING_BUNNY)
+            {
+                // check if the ghoul has already a feeding bunny set
+                if (m_feedingBunnyGuid)
+                    return;
+
+                // move the ghoul to the feeding target
+                float fX, fY, fZ;
+                m_creature->SetWalk(false);
+                m_creature->GetMotionMaster()->Clear();
+                pInvoker->GetContactPoint(m_creature, fX, fY, fZ);
+
+                m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                m_feedingBunnyGuid = pInvoker->GetObjectGuid();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // cast birth animation
+            if (!m_bSpawnAnim)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BIRTH) == CAST_OK)
+                    m_bSpawnAnim = true;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiFleshRotTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FLESH_ROT) == CAST_OK)
+                    m_uiFleshRotTimer = urand(7000, 15000);
+            }
+            else
+                m_uiFleshRotTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_decaying_ghoulAI(pCreature);
+    }
+};
+
+struct spell_attract_ghoul : public SpellScript
+{
+    spell_attract_ghoul() : SpellScript("spell_attract_ghoul") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        Creature* pCreatureTarget = pTarget->ToCreature();
+        if (uiSpellId == SPELL_ATTRACT_GHOUL && uiEffIndex == EFFECT_INDEX_0 && pCreatureTarget->GetEntry() == NPC_DECAYING_GHOUL)
+        {
+            if (pCaster->GetEntry() != NPC_GHOUL_FEEDING_BUNNY)
+                return true;
+
+            pCreatureTarget->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pCreatureTarget);
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_zuldrak()
+{
+    Script* s;
+
+    s = new npc_gurgthock();
+    s->RegisterSelf();
+    s = new npc_decaying_ghoul();
+    s->RegisterSelf();
+    s = new npc_ghoul_feeding_bunny();
+    s->RegisterSelf();
+
+    s = new spell_attract_ghoul();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_gurgthock";
+    //pNewScript->GetAI = &GetAI_npc_gurgthock;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_gurgthock;
+    //pNewScript->RegisterSelf();
+    //
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ghoul_feeding_bunny";
+    //pNewScript->GetAI = &GetAI_npc_ghoul_feeding_bunny;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_decaying_ghoul";
+    //pNewScript->GetAI = &GetAI_npc_decaying_ghoul;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_decaying_ghoul;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/src/modules/SD3/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
new file mode 100644
index 000000000..a42b3bf5f
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
@@ -0,0 +1,370 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Exarch_Maladaar
+SD%Complete: 95
+SDComment: Most of event implemented, possibly make some better code for switching his dark side in to better "images" of player.
+SDCategory: Auchindoun, Auchenai Crypts
+EndScriptData */
+
+/* ContentData
+mob_stolen_soul
+boss_exarch_maladaar
+mob_avatar_of_martyred
+EndContentData */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_STOLEN_SOUL_DISPEL = 33326,
+
+    SPELL_MOONFIRE          = 37328,
+    SPELL_FIREBALL          = 37329,
+    SPELL_MIND_FLAY         = 37330,
+    SPELL_HEMORRHAGE        = 37331,
+    SPELL_FROSTSHOCK        = 37332,
+    SPELL_CURSE_OF_AGONY    = 37334,
+    SPELL_MORTAL_STRIKE     = 37335,
+    SPELL_FREEZING_TRAP     = 37368,
+    SPELL_HAMMER_OF_JUSTICE = 37369,
+    SPELL_PLAGUE_STRIKE     = 58339
+};
+
+struct mob_stolen_soul : public CreatureScript
+{
+    mob_stolen_soul() : CreatureScript("mob_stolen_soul") {}
+
+    struct mob_stolen_soulAI : public ScriptedAI
+    {
+        mob_stolen_soulAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint8 m_uiStolenClass;
+        uint32 m_uiSpellTimer;
+
+        ObjectGuid m_targetGuid;
+
+        void Reset() override
+        {
+            m_uiSpellTimer = 1000;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit *pInvoker, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pInvoker->GetTypeId() == TYPEID_PLAYER && pSender->GetEntry() == 18373)   // 18373 Exarch Maladaar
+            {
+                m_uiStolenClass = pInvoker->getClass();
+                m_targetGuid = pInvoker->GetObjectGuid();
+                m_creature->SetDisplayId(pInvoker->GetDisplayId());
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (Unit* pTarget = m_creature->GetMap()->GetUnit(m_targetGuid))
+            {
+                DoCastSpellIfCan(pTarget, SPELL_STOLEN_SOUL_DISPEL, CAST_TRIGGERED);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiSpellTimer < uiDiff)
+            {
+                switch (m_uiStolenClass)
+                {
+                case CLASS_WARRIOR:
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_MORTAL_STRIKE);
+                    m_uiSpellTimer = 6000;
+                    break;
+                case CLASS_PALADIN:
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_HAMMER_OF_JUSTICE);
+                    m_uiSpellTimer = 6000;
+                    break;
+                case CLASS_HUNTER:
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_FREEZING_TRAP);
+                    m_uiSpellTimer = 20000;
+                    break;
+                case CLASS_ROGUE:
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_HEMORRHAGE);
+                    m_uiSpellTimer = 10000;
+                    break;
+                case CLASS_PRIEST:
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_MIND_FLAY);
+                    m_uiSpellTimer = 5000;
+                    break;
+                case CLASS_SHAMAN:
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROSTSHOCK);
+                    m_uiSpellTimer = 8000;
+                    break;
+                case CLASS_MAGE:
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_FIREBALL);
+                    m_uiSpellTimer = 5000;
+                    break;
+                case CLASS_WARLOCK:
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_CURSE_OF_AGONY);
+                    m_uiSpellTimer = 20000;
+                    break;
+                case CLASS_DRUID:
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_MOONFIRE);
+                    m_uiSpellTimer = 10000;
+                    break;
+#if defined (WOTLK) || defined (CATA)
+                case CLASS_DEATH_KNIGHT:
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_PLAGUE_STRIKE);
+                    m_uiSpellTimer = 10000;
+                    break;
+#endif
+                }
+            }
+            else
+            {
+                m_uiSpellTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_stolen_soulAI(pCreature);
+    }
+};
+
+enum
+{
+    SAY_INTRO                = -1558000,
+    SAY_SUMMON               = -1558001,
+    SAY_AGGRO_1              = -1558002,
+    SAY_AGGRO_2              = -1558003,
+    SAY_AGGRO_3              = -1558004,
+    SAY_ROAR                 = -1558005,
+    SAY_SOUL_CLEAVE          = -1558006,
+    SAY_SLAY_1               = -1558007,
+    SAY_SLAY_2               = -1558008,
+    SAY_DEATH                = -1558009,
+
+    SPELL_RIBBON_OF_SOULS    = 32422,
+    SPELL_SOUL_SCREAM        = 32421,
+    SPELL_STOLEN_SOUL        = 32346,
+    SPELL_STOLEN_SOUL_VISUAL = 32395,
+    SPELL_SUMMON_AVATAR      = 32424,
+
+    NPC_STOLEN_SOUL          = 18441,
+    NPC_DORE                 = 19412
+};
+
+struct boss_exarch_maladaar : public CreatureScript
+{
+    boss_exarch_maladaar() : CreatureScript("boss_exarch_maladaar") {}
+
+    struct boss_exarch_maladaarAI : public ScriptedAI
+    {
+        boss_exarch_maladaarAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bHasTaunted = false;
+        }
+
+        ObjectGuid m_targetGuid;
+
+        uint32 m_uiFearTimer;
+        uint32 m_uiRibbonOfSoulsTimer;
+        uint32 m_uiStolenSoulTimer;
+
+        bool m_bHasTaunted;
+        bool m_bHasSummonedAvatar;
+
+        void Reset() override
+        {
+            m_targetGuid.Clear();
+
+            m_uiFearTimer = urand(11000, 29000);
+            m_uiRibbonOfSoulsTimer = urand(4000, 8000);
+            m_uiStolenSoulTimer = urand(19000, 31000);
+
+            m_bHasSummonedAvatar = false;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasTaunted && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 150.0f) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                DoScriptText(SAY_INTRO, m_creature);
+                m_bHasTaunted = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_STOLEN_SOUL)
+            {
+                // SPELL_STOLEN_SOUL_VISUAL has shapeshift effect, but not implemented feature in mangos for this spell.
+                pSummoned->CastSpell(pSummoned, SPELL_STOLEN_SOUL_VISUAL, false);
+
+                if (Player* pTarget = m_creature->GetMap()->GetPlayer(m_targetGuid))
+                {
+                    SendAIEvent(AI_EVENT_CUSTOM_A, pTarget, pSummoned);
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (urand(0, 1))
+                DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            // When Exarch Maladaar is defeated D'ore appear.
+            DoSpawnCreature(NPC_DORE, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 600000);
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_STOLEN_SOUL && pTarget->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoSpawnCreature(NPC_STOLEN_SOUL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 10000);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (!m_bHasSummonedAvatar && m_creature->GetHealthPercent() < 25.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_AVATAR) == CAST_OK)
+                {
+                    DoScriptText(SAY_SUMMON, m_creature);
+                    m_bHasSummonedAvatar = true;
+                    m_uiStolenSoulTimer = urand(15000, 30000);
+                }
+            }
+
+            if (m_uiStolenSoulTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_STOLEN_SOUL, SELECT_FLAG_PLAYER))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_STOLEN_SOUL) == CAST_OK)
+                    {
+                        if (urand(0, 1))
+                        {
+                            DoScriptText(urand(0, 1) ? SAY_ROAR : SAY_SOUL_CLEAVE, m_creature);
+                        }
+
+                        m_targetGuid = pTarget->GetObjectGuid();
+
+                        m_uiStolenSoulTimer = urand(35000, 67000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiStolenSoulTimer -= uiDiff;
+            }
+
+            if (m_uiRibbonOfSoulsTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_RIBBON_OF_SOULS) == CAST_OK)
+                    {
+                        m_uiRibbonOfSoulsTimer = urand(4000, 18000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiRibbonOfSoulsTimer -= uiDiff;
+            }
+
+            if (m_uiFearTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SOUL_SCREAM) == CAST_OK)
+                {
+                    m_uiFearTimer = urand(13000, 30000);
+                }
+            }
+            else
+            {
+                m_uiFearTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_exarch_maladaarAI(pCreature);
+    }
+};
+
+void AddSC_boss_exarch_maladaar()
+{
+    Script* s;
+
+    s = new boss_exarch_maladaar();
+    s->RegisterSelf();
+    s = new mob_stolen_soul();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_exarch_maladaar";
+    //pNewScript->GetAI = &GetAI_boss_exarch_maladaar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_stolen_soul";
+    //pNewScript->GetAI = &GetAI_mob_stolen_soul;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak.cpp b/src/modules/SD3/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak.cpp
new file mode 100644
index 000000000..75dbc3e9a
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak.cpp
@@ -0,0 +1,189 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_shirrak
+SD%Complete: 100
+SDComment:
+SDCategory: Auchindoun, Auchenai Crypts
+EndScriptData */
+
+#include "precompiled.h"
+
+enum
+{
+    EMOTE_FOCUS                     = -1558010,
+
+    SPELL_CARNIVOROUS_BITE          = 36383,
+    SPELL_CARNIVOROUS_BITE_H        = 39382,
+    SPELL_INHIBIT_MAGIC             = 32264,
+    SPELL_ATTRACT_MAGIC             = 32265,
+
+    SPELL_FOCUS_TARGET_VISUAL       = 32286,
+    NPC_FOCUS_FIRE                  = 18374
+};
+
+struct boss_shirrak : public CreatureScript
+{
+    boss_shirrak() : CreatureScript("boss_shirrak") {}
+
+    struct boss_shirrakAI : public ScriptedAI
+    {
+        boss_shirrakAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+
+        uint32 m_uiCarnivorousBiteTimer;
+        uint32 m_uiFocusFireTimer;
+        uint32 m_uiAttractMagicTimer;
+
+        uint8 m_uiFocusFireCount;
+
+        ObjectGuid m_focusTargetGuid;
+
+        void Reset() override
+        {
+            m_uiCarnivorousBiteTimer = urand(4000, 7000);
+            m_uiFocusFireTimer = 15000;
+            m_uiAttractMagicTimer = urand(20000, 24000);
+            m_uiFocusFireCount = 0;
+
+            DoCastSpellIfCan(m_creature, SPELL_INHIBIT_MAGIC);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // The focus fire creature casts the focus fire visual
+            if (pSummoned->GetEntry() == NPC_FOCUS_FIRE)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_FOCUS_TARGET_VISUAL, true);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiCarnivorousBiteTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_CARNIVOROUS_BITE : SPELL_CARNIVOROUS_BITE_H) == CAST_OK)
+                {
+                    m_uiCarnivorousBiteTimer = urand(4000, 10000);
+                }
+            }
+            else
+            {
+                m_uiCarnivorousBiteTimer -= uiDiff;
+            }
+
+            if (m_uiAttractMagicTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ATTRACT_MAGIC) == CAST_OK)
+                {
+                    m_uiAttractMagicTimer = urand(25000, 38000);
+                }
+            }
+            else
+            {
+                m_uiAttractMagicTimer -= uiDiff;
+            }
+
+            if (m_uiFocusFireTimer < uiDiff)
+            {
+                ++m_uiFocusFireCount;
+                Unit* pTarget = NULL;
+
+                switch (m_uiFocusFireCount)
+                {
+                case 1:
+                {
+                          // engage the target
+                          pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, uint32(0), SELECT_FLAG_PLAYER);
+
+                          if (!pTarget)
+                          {
+                              pTarget = m_creature->getVictim();
+                          }
+
+                          DoScriptText(EMOTE_FOCUS, m_creature, pTarget);
+                          m_focusTargetGuid = pTarget->GetObjectGuid();
+                          // no break;
+                }
+                case 2:
+                    // we have a delay of 1 sec between the summons
+                    m_uiFocusFireTimer = 1000;
+                    break;
+                case 3:
+                    // reset the timers and the summon count
+                    m_uiFocusFireCount = 0;
+                    m_uiFocusFireTimer = 15000;
+                    break;
+                }
+
+                if (!pTarget)
+                {
+                    pTarget = m_creature->GetMap()->GetUnit(m_focusTargetGuid);
+                }
+
+                // Summon focus fire at target location
+                if (pTarget)
+                {
+                    m_creature->SummonCreature(NPC_FOCUS_FIRE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 10000);
+                }
+            }
+            else
+            {
+                m_uiFocusFireTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_shirrakAI(pCreature);
+    }
+};
+
+void AddSC_boss_shirrak()
+{
+    Script* s;
+
+    s = new boss_shirrak();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_shirrak";
+    //pNewScript->GetAI = &GetAI_boss_shirrak;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/modules/SD3/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
new file mode 100644
index 000000000..b74b02eff
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
@@ -0,0 +1,228 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_NexusPrince_Shaffar
+SD%Complete: 100
+SDComment: ToDo: move the Ethereal Beacon script to eventAI
+SDCategory: Auchindoun, Mana Tombs
+EndScriptData */
+
+/* ContentData
+boss_nexusprince_shaffar
+mob_ethereal_beacon
+EndContentData */
+
+#include "precompiled.h"
+
+enum
+{
+    SAY_INTRO                       = -1557000,
+    SAY_AGGRO_1                     = -1557001,
+    SAY_AGGRO_2                     = -1557002,
+    SAY_AGGRO_3                     = -1557003,
+    SAY_SLAY_1                      = -1557004,
+    SAY_SLAY_2                      = -1557005,
+    SAY_SUMMON                      = -1557006,
+    SAY_DEAD                        = -1557007,
+
+    SPELL_BLINK                     = 34605,
+    SPELL_FROSTBOLT                 = 32364,
+    SPELL_FIREBALL                  = 32363,
+    SPELL_FROSTNOVA                 = 32365,
+
+    SPELL_ETHEREAL_BEACON           = 32371,                // Summons 18431
+    // SPELL_ETHEREAL_BEACON_VISUAL  = 32368,               // included in creature_template_addon
+};
+
+struct boss_nexusprince_shaffar : public CreatureScript
+{
+    boss_nexusprince_shaffar() : CreatureScript("boss_nexusprince_shaffar") {}
+
+    struct boss_nexusprince_shaffarAI : public ScriptedAI
+    {
+        boss_nexusprince_shaffarAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bHasTaunted = false;
+        }
+
+        uint32 m_uiBlinkTimer;
+        uint32 m_uiBeaconTimer;
+        uint32 m_uiFireBallTimer;
+        uint32 m_uiFrostboltTimer;
+        uint32 m_uiFrostNovaTimer;
+
+        bool m_bHasTaunted;
+
+        void Reset() override
+        {
+            m_uiBlinkTimer = 30000;
+            m_uiBeaconTimer = urand(12000, 15000);
+            m_uiFireBallTimer = urand(2000, 12000);
+            m_uiFrostboltTimer = urand(1000, 14000);
+            m_uiFrostNovaTimer = urand(18000, 25000);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasTaunted && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 100.0f) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                DoScriptText(SAY_INTRO, m_creature);
+                m_bHasTaunted = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEAD, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiFrostNovaTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FROSTNOVA) == CAST_OK)
+                {
+                    m_uiFrostNovaTimer = urand(10000, 20000);
+                }
+            }
+            else
+            {
+                m_uiFrostNovaTimer -= uiDiff;
+            }
+
+            if (m_uiFrostboltTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROSTBOLT) == CAST_OK)
+                {
+                    m_uiFrostboltTimer = urand(3000, 8000);
+                }
+            }
+            else
+            {
+                m_uiFrostboltTimer -= uiDiff;
+            }
+
+            if (m_uiFireBallTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FIREBALL) == CAST_OK)
+                {
+                    m_uiFireBallTimer = urand(3000, 8000);
+                }
+            }
+            else
+            {
+                m_uiFireBallTimer -= uiDiff;
+            }
+
+            if (m_uiBlinkTimer <= uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BLINK) == CAST_OK)
+                {
+                    // expire movement, will prevent from running right back to victim after cast
+                    //(but should MoveChase be used again at a certain time or should he not move?)
+                    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
+                    {
+                        m_creature->GetMotionMaster()->MovementExpired();
+                    }
+
+                    m_uiBlinkTimer = urand(25000, 30000);
+                }
+            }
+            else
+            {
+                m_uiBlinkTimer -= uiDiff;
+            }
+
+            if (m_uiBeaconTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ETHEREAL_BEACON) == CAST_OK)
+                {
+                    if (!urand(0, 3))
+                    {
+                        DoScriptText(SAY_SUMMON, m_creature);
+                    }
+
+                    m_uiBeaconTimer = urand(45000, 75000);
+                }
+            }
+            else
+            {
+                m_uiBeaconTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_nexusprince_shaffarAI(pCreature);
+    }
+};
+
+void AddSC_boss_nexusprince_shaffar()
+{
+    Script* s;
+
+    s = new boss_nexusprince_shaffar();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_nexusprince_shaffar";
+    //pNewScript->GetAI = &GetAI_boss_nexusprince_shaffar;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp b/src/modules/SD3/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp
new file mode 100644
index 000000000..56bb5be3a
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp
@@ -0,0 +1,168 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Pandemonius
+SD%Complete: 80
+SDComment: Not known how void blast is done (amount of rapid cast seems to be related to players in party).
+SDCategory: Auchindoun, Mana Tombs
+EndScriptData */
+
+#include "precompiled.h"
+
+enum
+{
+    SAY_AGGRO_1                     = -1557008,
+    SAY_AGGRO_2                     = -1557009,
+    SAY_AGGRO_3                     = -1557010,
+    SAY_KILL_1                      = -1557011,
+    SAY_KILL_2                      = -1557012,
+    SAY_DEATH                       = -1557013,
+    EMOTE_DARK_SHELL                = -1557014,
+
+    SPELL_VOID_BLAST                = 32325,
+    SPELL_VOID_BLAST_H              = 38760,
+    SPELL_DARK_SHELL                = 32358,
+    SPELL_DARK_SHELL_H              = 38759,
+
+    MAX_VOID_BLASTS                 = 5,
+};
+
+struct boss_pandemonius : public CreatureScript
+{
+    boss_pandemonius() : CreatureScript("boss_pandemonius") {}
+
+    struct boss_pandemoniusAI : public ScriptedAI
+    {
+        boss_pandemoniusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+
+        uint32 m_uiVoidBlastTimer;
+        uint32 m_uiDarkShellTimer;
+        uint8 m_uiVoidBlastCounter;
+
+        void Reset() override
+        {
+            m_uiVoidBlastTimer = urand(15000, 20000);
+            m_uiDarkShellTimer = 15000;
+            m_uiVoidBlastCounter = 0;
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL_1 : SAY_KILL_2, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiVoidBlastTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_VOID_BLAST : SPELL_VOID_BLAST_H);
+                }
+
+                // reset timer and counter when counter has reached the max limit
+                if (m_uiVoidBlastCounter == MAX_VOID_BLASTS)
+                {
+                    m_uiVoidBlastTimer = urand(25000, 30000);
+                    m_uiVoidBlastCounter = 0;
+                }
+                // cast the void blasts in a row until we reach the max limit
+                else
+                {
+                    m_uiVoidBlastTimer = 500;
+                    ++m_uiVoidBlastCounter;
+                }
+            }
+            else
+            {
+                m_uiVoidBlastTimer -= uiDiff;
+            }
+
+            // use the darkshell only when the boss isn't casting the void blasts
+            if (!m_uiVoidBlastCounter)
+            {
+                if (m_uiDarkShellTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_DARK_SHELL : SPELL_DARK_SHELL_H) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_DARK_SHELL, m_creature);
+                        m_uiDarkShellTimer = urand(25000, 30000);
+                    }
+                }
+                else
+                {
+                    m_uiDarkShellTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_pandemoniusAI(pCreature);
+    }
+};
+
+void AddSC_boss_pandemonius()
+{
+    Script* s;
+
+    s = new boss_pandemonius();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_pandemonius";
+    //pNewScript->GetAI = &GetAI_boss_pandemonius;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/boss_anzu.cpp b/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/boss_anzu.cpp
new file mode 100644
index 000000000..92e66ca69
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/boss_anzu.cpp
@@ -0,0 +1,281 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_anzu
+SD%Complete: 70
+SDComment: Intro event NYI.
+SDCategory: Auchindoun, Sethekk Halls
+EndScriptData */
+
+#include "precompiled.h"
+#include "sethekk_halls.h"
+
+enum
+{
+    SAY_BANISH          = -1556018,
+    SAY_WHISPER_MAGIC_1 = -1556019,
+    SAY_WHISPER_MAGIC_2 = -1556021,
+    SAY_WHISPER_MAGIC_3 = -1556022,
+    EMOTE_BIRD_STONE    = -1556020,
+
+    SPELL_FLESH_RIP     = 40199,
+    SPELL_SCREECH       = 40184,
+    SPELL_SPELL_BOMB    = 40303,
+    SPELL_CYCLONE       = 40321,
+    SPELL_BANISH_SELF   = 42354,
+
+    NPC_BROOD_OF_ANZU   = 23132,
+
+    // Helper birds
+    NPC_HAWK_SPIRIT     = 23134,                // casts 40237
+    NPC_FALCON_SPIRIT   = 23135,                // casts 40241
+    NPC_EAGLE_SPIRIT    = 23136,                // casts 40240
+
+    MAX_BROODS          = 5,
+};
+
+static const uint32 aSpiritsEntries[3] = {NPC_FALCON_SPIRIT, NPC_HAWK_SPIRIT, NPC_EAGLE_SPIRIT};
+
+struct boss_anzu : public CreatureScript
+{
+    boss_anzu() : CreatureScript("boss_anzu") {}
+
+    struct boss_anzuAI : public ScriptedAI
+    {
+        boss_anzuAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiFleshRipTimer;
+        uint32 m_uiScreechTimer;
+        uint32 m_uiSpellBombTimer;
+        uint32 m_uiCycloneTimer;
+        float m_fHealthCheck;
+
+        GuidList m_lBirdsGuidList;
+
+        void Reset() override
+        {
+            m_uiFleshRipTimer = urand(9000, 10000);
+            m_uiScreechTimer = 23000;
+            m_uiSpellBombTimer = 17000;
+            m_uiCycloneTimer = 5000;
+            m_fHealthCheck = 75.0f;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            // Note: this should be moved to the intro event when implemented!
+            DoSummonBirdHelpers();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ANZU, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DespawnBirdHelpers();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ANZU, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            DespawnBirdHelpers();
+            m_creature->ForcedDespawn();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ANZU, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_BROOD_OF_ANZU)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+            else
+            {
+                DoScriptText(EMOTE_BIRD_STONE, pSummoned);
+                m_lBirdsGuidList.push_back(pSummoned->GetObjectGuid());
+            }
+        }
+
+        void DoSummonBroodsOfAnzu()
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // Note: the birds should fly around the room for about 10 seconds before starting to attack the players
+            if (GameObject* pClaw = m_pInstance->GetSingleGameObjectFromStorage(GO_RAVENS_CLAW))
+            {
+                float fX, fY, fZ;
+                for (uint8 i = 0; i < MAX_BROODS; ++i)
+                {
+                    m_creature->GetRandomPoint(pClaw->GetPositionX(), pClaw->GetPositionY(), pClaw->GetPositionZ(), 7.0f, fX, fY, fZ);
+                    m_creature->SummonCreature(NPC_BROOD_OF_ANZU, fX, fY, fZ, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                }
+            }
+        }
+
+        void DoSummonBirdHelpers()
+        {
+            float fX, fY, fZ, fAng;
+            for (uint8 i = 0; i < 3; ++i)
+            {
+                fAng = 2 * M_PI_F / 3 * i;
+                m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 15.0f, fAng);
+                m_creature->SummonCreature(aSpiritsEntries[i], fX, fY, fZ, fAng + M_PI_F, TEMPSUMMON_CORPSE_DESPAWN, 0);
+            }
+        }
+
+        void DespawnBirdHelpers()
+        {
+            for (GuidList::const_iterator itr = m_lBirdsGuidList.begin(); itr != m_lBirdsGuidList.end(); ++itr)
+            {
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pTemp->ForcedDespawn();
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Banish at 66% and 33%; Boss can still use spells while banished
+            if (m_creature->GetHealthPercent() < m_fHealthCheck)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BANISH_SELF) == CAST_OK)
+                {
+                    DoScriptText(SAY_BANISH, m_creature);
+                    DoSummonBroodsOfAnzu();
+                    m_fHealthCheck -= 40.0f;
+                }
+            }
+
+            if (m_uiFleshRipTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FLESH_RIP) == CAST_OK)
+                {
+                    m_uiFleshRipTimer = urand(10000, 20000);
+                }
+            }
+            else
+            {
+                m_uiFleshRipTimer -= uiDiff;
+            }
+
+            if (m_uiScreechTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SCREECH) == CAST_OK)
+                {
+                    m_uiScreechTimer = urand(31000, 35000);
+                }
+            }
+            else
+            {
+                m_uiScreechTimer -= uiDiff;
+            }
+
+            if (m_uiSpellBombTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SPELL_BOMB) == CAST_OK)
+                    {
+                        switch (urand(0, 2))
+                        {
+                        case 0: DoScriptText(SAY_WHISPER_MAGIC_1, m_creature, pTarget); break;
+                        case 1: DoScriptText(SAY_WHISPER_MAGIC_2, m_creature, pTarget); break;
+                        case 2: DoScriptText(SAY_WHISPER_MAGIC_3, m_creature, pTarget); break;
+                        }
+                        m_uiSpellBombTimer = urand(24000, 40000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiSpellBombTimer -= uiDiff;
+            }
+
+            if (m_uiCycloneTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_CYCLONE) == CAST_OK)
+                    {
+                        m_uiCycloneTimer = 21000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiCycloneTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_anzuAI(pCreature);
+    }
+};
+
+void AddSC_boss_anzu()
+{
+    Script* s;
+
+    s = new boss_anzu();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_anzu";
+    //pNewScript->GetAI = &GetAI_boss_anzu;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp
new file mode 100644
index 000000000..250ab1d16
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp
@@ -0,0 +1,276 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Darkweaver_Syth
+SD%Complete: 100
+SDComment:
+SDCategory: Auchindoun, Sethekk Halls
+EndScriptData */
+
+#include "precompiled.h"
+
+enum
+{
+    SAY_SUMMON                  = -1556000,
+    SAY_AGGRO_1                 = -1556001,
+    SAY_AGGRO_2                 = -1556002,
+    SAY_AGGRO_3                 = -1556003,
+    SAY_SLAY_1                  = -1556004,
+    SAY_SLAY_2                  = -1556005,
+    SAY_DEATH                   = -1556006,
+
+    SPELL_FROST_SHOCK           = 12548,
+    SPELL_FROST_SHOCK_H         = 21401,
+    SPELL_FLAME_SHOCK           = 15039,
+    SPELL_FLAME_SHOCK_H         = 15616,
+    SPELL_SHADOW_SHOCK          = 33620,
+    SPELL_SHADOW_SHOCK_H        = 38136,
+    SPELL_ARCANE_SHOCK          = 33534,
+    SPELL_ARCANE_SHOCK_H        = 38135,
+
+    SPELL_CHAIN_LIGHTNING       = 15659,
+    SPELL_CHAIN_LIGHTNING_H     = 15305,
+
+    SPELL_SUMMON_SYTH_FIRE      = 33537,                    // Spawns 19203
+    SPELL_SUMMON_SYTH_ARCANE    = 33538,                    // Spawns 19205
+    SPELL_SUMMON_SYTH_FROST     = 33539,                    // Spawns 19204
+    SPELL_SUMMON_SYTH_SHADOW    = 33540,                    // Spawns 19206
+
+    // Npc entries
+    NPC_FIRE_ELEMENTAL          = 19203,
+    NPC_FROST_ELEMENTAL         = 19204,
+    NPC_ARCANE_ELEMENTAL        = 19205,
+    NPC_SHADOW_ELEMENTAL        = 19206,
+};
+
+struct boss_darkweaver_syth : public CreatureScript
+{
+    boss_darkweaver_syth() : CreatureScript("boss_darkweaver_syth") {}
+
+    struct boss_darkweaver_sythAI : public ScriptedAI
+    {
+        boss_darkweaver_sythAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+        uint32 m_uiFlameshockTimer;
+        uint32 m_uiArcaneshockTimer;
+        uint32 m_uiFrostshockTimer;
+        uint32 m_uiShadowshockTimer;
+        uint32 m_uiChainlightningTimer;
+
+        float m_fHpCheck;
+
+        void Reset() override
+        {
+            m_uiFlameshockTimer = 18000;
+            m_uiArcaneshockTimer = 19000;
+            m_uiFrostshockTimer = 18000;
+            m_uiShadowshockTimer = 17000;
+            m_uiChainlightningTimer = urand(6000, 9000);
+
+            m_fHpCheck = 90.0f;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (urand(0, 1))
+            {
+                return;
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_FIRE_ELEMENTAL:
+                pSummoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true);
+                break;
+            case NPC_FROST_ELEMENTAL:
+                pSummoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
+                break;
+            case NPC_ARCANE_ELEMENTAL:
+                pSummoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, true);
+                break;
+            case NPC_SHADOW_ELEMENTAL:
+                pSummoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, true);
+                break;
+            }
+
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        // Wrapper to handle the elementals summon
+        void SythSummoning()
+        {
+            DoScriptText(SAY_SUMMON, m_creature);
+
+            if (m_creature->IsNonMeleeSpellCasted(false))
+            {
+                m_creature->InterruptNonMeleeSpells(false);
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_SYTH_ARCANE, CAST_TRIGGERED); // front
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_SYTH_FIRE, CAST_TRIGGERED); // back
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_SYTH_FROST, CAST_TRIGGERED); // left
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_SYTH_SHADOW, CAST_TRIGGERED); // right
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Summon elementals at 90%, 50% and 10% health
+            if (m_creature->GetHealthPercent() < m_fHpCheck)
+            {
+                SythSummoning();
+                m_fHpCheck -= 40.0f;
+            }
+
+            if (m_uiFlameshockTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_FLAME_SHOCK : SPELL_FLAME_SHOCK_H) == CAST_OK)
+                    {
+                        m_uiFlameshockTimer = m_bIsRegularMode ? urand(13000, 28000) : urand(11000, 20000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiFlameshockTimer -= uiDiff;
+            }
+
+            if (m_uiArcaneshockTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_ARCANE_SHOCK : SPELL_ARCANE_SHOCK_H) == CAST_OK)
+                    {
+                        m_uiArcaneshockTimer = m_bIsRegularMode ? urand(13000, 28000) : urand(11000, 20000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiArcaneshockTimer -= uiDiff;
+            }
+
+            if (m_uiFrostshockTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_FROST_SHOCK : SPELL_FROST_SHOCK_H) == CAST_OK)
+                    {
+                        m_uiFrostshockTimer = m_bIsRegularMode ? urand(13000, 28000) : urand(11000, 20000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiFrostshockTimer -= uiDiff;
+            }
+
+            if (m_uiShadowshockTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_SHADOW_SHOCK : SPELL_SHADOW_SHOCK_H) == CAST_OK)
+                    {
+                        m_uiShadowshockTimer = m_bIsRegularMode ? urand(13000, 28000) : urand(11000, 20000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiShadowshockTimer -= uiDiff;
+            }
+
+            if (m_uiChainlightningTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_CHAIN_LIGHTNING : SPELL_CHAIN_LIGHTNING_H) == CAST_OK)
+                    {
+                        m_uiChainlightningTimer = m_bIsRegularMode ? urand(14000, 26000) : urand(13000, 19000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiChainlightningTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_darkweaver_sythAI(pCreature);
+    }
+};
+
+void AddSC_boss_darkweaver_syth()
+{
+    Script* s;
+
+    s = new boss_darkweaver_syth();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_darkweaver_syth";
+    //pNewScript->GetAI = &GetAI_boss_darkweaver_syth;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/boss_talon_king_ikiss.cpp b/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/boss_talon_king_ikiss.cpp
new file mode 100644
index 000000000..7213a5e61
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/boss_talon_king_ikiss.cpp
@@ -0,0 +1,265 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Talon_King_Ikiss
+SD%Complete: 100
+SDComment:
+SDCategory: Auchindoun, Sethekk Halls
+EndScriptData */
+
+#include "precompiled.h"
+#include "sethekk_halls.h"
+
+enum
+{
+    SAY_INTRO                   = -1556007,
+    SAY_AGGRO_1                 = -1556008,
+    SAY_AGGRO_2                 = -1556009,
+    SAY_AGGRO_3                 = -1556010,
+    SAY_SLAY_1                  = -1556011,
+    SAY_SLAY_2                  = -1556012,
+    SAY_DEATH                   = -1556013,
+    EMOTE_ARCANE_EXP            = -1556015,
+
+    SPELL_BLINK                 = 38194,
+    SPELL_MANA_SHIELD           = 38151,
+    SPELL_ARCANE_BUBBLE         = 9438,
+    SPELL_SLOW_H                = 35032,
+
+    SPELL_POLYMORPH             = 38245,
+    SPELL_POLYMORPH_H           = 43309,
+
+    SPELL_ARCANE_VOLLEY         = 35059,
+    SPELL_ARCANE_VOLLEY_H       = 40424,
+
+    SPELL_ARCANE_EXPLOSION      = 38197,
+    SPELL_ARCANE_EXPLOSION_H    = 40425,
+};
+
+struct boss_talon_king_ikiss : public CreatureScript
+{
+    boss_talon_king_ikiss() : CreatureScript("boss_talon_king_ikiss") {}
+
+    struct boss_talon_king_ikissAI : public ScriptedAI
+    {
+        boss_talon_king_ikissAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_bIntro = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiArcaneVolleyTimer;
+        uint32 m_uiSheepTimer;
+        uint32 m_uiSlowTimer;
+        uint8 m_uiBlinkPhase;
+        float m_fHealthCheck;
+
+        bool m_bManaShield;
+        bool m_bBlink;
+        bool m_bIntro;
+
+        void Reset() override
+        {
+            m_uiArcaneVolleyTimer = urand(5000, 12000);
+            m_uiSheepTimer = 8000;
+            m_uiSlowTimer = urand(9000, 13000);
+            m_uiBlinkPhase = 0;
+            m_fHealthCheck = 80.0f;
+
+            m_bBlink = false;
+            m_bManaShield = false;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_creature->getVictim() && pWho->IsTargetableForAttack() && (m_creature->IsHostileTo(pWho)) && pWho->isInAccessablePlaceFor(m_creature))
+            {
+                if (!m_bIntro && m_creature->IsWithinDistInMap(pWho, 100.0f))
+                {
+                    m_bIntro = true;
+                    DoScriptText(SAY_INTRO, m_creature);
+                }
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_IKISS, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_IKISS, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_IKISS, FAIL);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVctim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (EnterEvadeIfOutOfCombatArea(uiDiff))
+            {
+                return;
+            }
+
+            if (m_bBlink)
+            {
+                DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ARCANE_EXPLOSION : SPELL_ARCANE_EXPLOSION_H);
+                DoCastSpellIfCan(m_creature, SPELL_ARCANE_BUBBLE, CAST_TRIGGERED);
+                DoResetThreat();
+                m_bBlink = false;
+            }
+
+            if (m_uiArcaneVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ARCANE_VOLLEY : SPELL_ARCANE_VOLLEY_H) == CAST_OK)
+                {
+                    m_uiArcaneVolleyTimer = urand(8000, 12000);
+                }
+            }
+            else
+            {
+                m_uiArcaneVolleyTimer -= uiDiff;
+            }
+
+            if (m_uiSheepTimer < uiDiff)
+            {
+                // second top aggro target in normal, random target in heroic
+                if (Unit* pTarget = m_bIsRegularMode ? m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 1) : m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_POLYMORPH : SPELL_POLYMORPH_H);
+                }
+                m_uiSheepTimer = urand(15000, 17500);
+            }
+            else
+            {
+                m_uiSheepTimer -= uiDiff;
+            }
+
+            if (!m_bManaShield && m_creature->GetHealthPercent() < 15.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_MANA_SHIELD) == CAST_OK)
+                {
+                    m_bManaShield = true;
+                }
+            }
+
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiSlowTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SLOW_H) == CAST_OK)
+                    {
+                        m_uiSlowTimer = urand(15000, 24000);
+                    }
+                }
+                else
+                {
+                    m_uiSlowTimer -= uiDiff;
+                }
+            }
+
+            if (m_creature->GetHealthPercent() < m_fHealthCheck)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BLINK, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                {
+                    m_bBlink = true;
+                    DoScriptText(EMOTE_ARCANE_EXP, m_creature);
+
+                    // There is no relationship between the health percentages
+                    switch (m_uiBlinkPhase)
+                    {
+                    case 0: m_fHealthCheck = 50.0f; break;
+                    case 1: m_fHealthCheck = 25.0f; break;
+                    case 2: m_fHealthCheck = 0.0f; break;
+                    }
+
+                    ++m_uiBlinkPhase;
+                }
+            }
+
+            if (!m_bBlink)
+            {
+                DoMeleeAttackIfReady();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_talon_king_ikissAI(pCreature);
+    }
+};
+
+void AddSC_boss_talon_king_ikiss()
+{
+    Script* s;
+
+    s = new boss_talon_king_ikiss();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_talon_king_ikiss";
+    //pNewScript->GetAI = &GetAI_boss_talon_king_ikiss;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp b/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp
new file mode 100644
index 000000000..326cae404
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp
@@ -0,0 +1,241 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance - Sethekk Halls
+SD%Complete: 60
+SDComment: Summoning event for Anzu NYI
+SDCategory: Auchindoun, Sethekk Halls
+EndScriptData */
+
+#include "precompiled.h"
+#include "sethekk_halls.h"
+
+struct is_sethekk_halls : public InstanceScript
+{
+    is_sethekk_halls() : InstanceScript("instance_sethekk_halls") {}
+
+    class instance_sethekk_halls : public ScriptedInstance
+    {
+    public:
+        instance_sethekk_halls(Map* pMap) : ScriptedInstance(pMap)
+        {
+            Initialize();
+        }
+
+        ~instance_sethekk_halls() {}
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_ANZU)
+            {
+                m_mNpcEntryGuidStore[NPC_ANZU] = pCreature->GetObjectGuid();
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_IKISS_DOOR:
+                if (m_auiEncounter[TYPE_IKISS] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_IKISS_CHEST:
+                if (m_auiEncounter[TYPE_IKISS] == DONE)
+                {
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT | GO_FLAG_INTERACT_COND);
+                }
+                break;
+            case GO_RAVENS_CLAW:
+                break;
+
+            default:
+                return;
+            }
+
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_SYTH:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_ANZU:
+                m_auiEncounter[uiType] = uiData;
+                // Respawn the Raven's Claw if event fails
+                if (uiData == FAIL)
+                {
+                    if (GameObject* pClaw = GetSingleGameObjectFromStorage(GO_RAVENS_CLAW))
+                    {
+                        pClaw->Respawn();
+                    }
+                }
+                break;
+            case TYPE_IKISS:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_IKISS_DOOR, DAY);
+                    DoToggleGameObjectFlags(GO_IKISS_CHEST, GO_FLAG_NO_INTERACT | GO_FLAG_INTERACT_COND, false);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            default:
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+#if defined (WOTLK) || defined (CATA)
+        bool CheckAchievementCriteriaMeet(uint32 uiCriteriaId, Player const* pSource, Unit const* /*pTarget*/, uint32 /*uiMiscValue1 = 0*/) const override
+        {
+            if (uiCriteriaId != ACHIEV_CRITA_TURKEY_TIME)
+                return false;
+
+            if (!pSource)
+                return false;
+
+            return pSource->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_HAT, 1) && (pSource->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_DRESS, 1)
+                    || pSource->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_ROBE, 1) || pSource->HasItemOrGemWithIdEquipped(ITEM_PILGRIMS_ATTIRE, 1));
+        }
+#endif
+
+    private:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_sethekk_halls(pMap);
+    }
+};
+
+struct event_spell_summon_raven_god : public MapEventScript
+{
+    event_spell_summon_raven_god() : MapEventScript("event_spell_summon_raven_god") {}
+
+    bool OnReceived(uint32 /*uiEventId*/, Object* pSource, Object* /*pTarget*/, bool bIsStart) override
+    {
+        if (bIsStart && pSource->GetTypeId() == TYPEID_PLAYER)
+        {
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)((Player*)pSource)->GetInstanceData())
+            {
+                // This should be checked by despawning the Raven Claw Go; However it's better to double check the condition
+                if (pInstance->GetData(TYPE_ANZU) == DONE || pInstance->GetData(TYPE_ANZU) == IN_PROGRESS)
+                {
+                    return true;
+                }
+
+                // Don't summon him twice
+                if (pInstance->GetSingleCreatureFromStorage(NPC_ANZU, true))
+                {
+                    return true;
+                }
+
+                // ToDo: add more code here to handle the summoning event. For the moment it's handled in DB because of the missing info
+            }
+        }
+        return false;
+    }
+};
+
+void AddSC_instance_sethekk_halls()
+{
+    Script* s;
+
+    s = new is_sethekk_halls();
+    s->RegisterSelf();
+    s = new event_spell_summon_raven_god();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_sethekk_halls";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_sethekk_halls;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_spell_summon_raven_god";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_spell_summon_raven_god;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/sethekk_halls.h b/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/sethekk_halls.h
new file mode 100644
index 000000000..b36133be9
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/sethekk_halls/sethekk_halls.h
@@ -0,0 +1,62 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_SETHEKK_HALLS_H
+#define DEF_SETHEKK_HALLS_H
+
+enum
+{
+    MAX_ENCOUNTER               = 3,
+
+    TYPE_SYTH                   = 0,
+    TYPE_ANZU                   = 1,
+    TYPE_IKISS                  = 2,
+
+    NPC_ANZU                    = 23035,
+    NPC_RAVEN_GOD_TARGET        = 23057,
+
+    GO_IKISS_DOOR               = 177203,
+    GO_IKISS_CHEST              = 187372,
+    GO_RAVENS_CLAW              = 185554,
+
+    SAY_ANZU_INTRO_1            = -1556016,
+    SAY_ANZU_INTRO_2            = -1556017,
+
+    // possible spells used for Anzu summoning event
+    SPELL_PORTAL                = 39952,
+    SPELL_SUMMONING_BEAMS       = 39978,
+    SPELL_RED_LIGHTNING         = 39990,
+
+#if defined (WOTLK) || defined (CATA)
+    ACHIEV_CRITA_TURKEY_TIME    = 11142,
+    ITEM_PILGRIMS_HAT           = 46723,
+    ITEM_PILGRIMS_DRESS         = 44785,
+    ITEM_PILGRIMS_ROBE          = 46824,
+    ITEM_PILGRIMS_ATTIRE        = 46800,
+#endif
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
new file mode 100644
index 000000000..1bcbf17d3
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
@@ -0,0 +1,186 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Ambassador_Hellmaw
+SD%Complete: 80
+SDComment: Enrage spell missing/not known
+SDCategory: Auchindoun, Shadow Labyrinth
+EndScriptData */
+
+#include "precompiled.h"
+#include "shadow_labyrinth.h"
+
+enum
+{
+    SAY_AGGRO_1             = -1555001,
+    SAY_AGGRO_2             = -1555002,
+    SAY_AGGRO_3             = -1555003,
+    SAY_HELP                = -1555004,
+    SAY_SLAY_1              = -1555005,
+    SAY_SLAY_2              = -1555006,
+    SAY_DEATH               = -1555007,
+
+    SPELL_CORROSIVE_ACID    = 33551,
+    SPELL_FEAR              = 33547,
+    SPELL_ENRAGE            = 34970
+};
+
+struct boss_ambassador_hellmaw : public CreatureScript
+{
+    boss_ambassador_hellmaw() : CreatureScript("boss_ambassador_hellmaw") {}
+
+    struct boss_ambassador_hellmawAI : public ScriptedAI
+    {
+        boss_ambassador_hellmawAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiBanishTimer;
+        uint32 m_uiCorrosiveAcidTimer;
+        uint32 m_uiFearTimer;
+        uint32 m_uiEnrageTimer;
+        bool m_bIsEnraged;
+
+        void Reset() override
+        {
+            m_uiBanishTimer = 2000;
+            m_uiCorrosiveAcidTimer = urand(20000, 23000);
+            m_uiFearTimer = urand(20000, 26000);
+            m_uiEnrageTimer = 3 * MINUTE * IN_MILLISECONDS;
+            m_bIsEnraged = false;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_HELLMAW, FAIL);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            }
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_HELLMAW, IN_PROGRESS);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_HELLMAW, DONE);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiBanishTimer)
+            {
+                if (m_uiBanishTimer <= uiDiff)
+                {
+                    if (!m_pInstance)
+                        return;
+
+                    // Check for banish
+                    if (m_pInstance->GetData(TYPE_IS_UNBANISHED))
+                    {
+                        m_creature->RemoveAurasDueToSpell(SPELL_BANISH);
+                        m_creature->GetMotionMaster()->MoveWaypoint();
+                        m_uiBanishTimer = 0;
+                    }
+                }
+                else
+                    m_uiBanishTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiCorrosiveAcidTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CORROSIVE_ACID) == CAST_OK)
+                    m_uiCorrosiveAcidTimer = urand(23000, 35000);
+            }
+            else
+                m_uiCorrosiveAcidTimer -= uiDiff;
+
+            if (m_uiFearTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FEAR) == CAST_OK)
+                    m_uiFearTimer = urand(20000, 38000);
+            }
+            else
+                m_uiFearTimer -= uiDiff;
+
+            if (!m_bIsRegularMode && !m_bIsEnraged)
+            {
+                if (m_uiEnrageTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                        m_bIsEnraged = true;
+                }
+                else
+                    m_uiEnrageTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ambassador_hellmawAI(pCreature);
+    }
+};
+
+void AddSC_boss_ambassador_hellmaw()
+{
+    Script* s;
+
+    s = new boss_ambassador_hellmaw();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ambassador_hellmaw";
+    //pNewScript->GetAI = &GetAI_boss_ambassador_hellmaw;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
new file mode 100644
index 000000000..7b1ca4942
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
@@ -0,0 +1,242 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Blackheart_the_Inciter
+SD%Complete: 90
+SDComment: Not all yells are implemented.
+SDCategory: Auchindoun, Shadow Labyrinth
+EndScriptData */
+
+#include "precompiled.h"
+#include "shadow_labyrinth.h"
+
+enum
+{
+    SPELL_INCITE_CHAOS      = 33676,                        // triggers 33684 on party members
+    SPELL_CHARGE            = 33709,
+    SPELL_WAR_STOMP         = 33707,
+
+    SAY_INTRO1              = -1555008,
+    SAY_INTRO2              = -1555009,
+    SAY_INTRO3              = -1555010,
+    SAY_AGGRO1              = -1555011,
+    SAY_AGGRO2              = -1555012,
+    SAY_AGGRO3              = -1555013,
+    SAY_SLAY1               = -1555014,
+    SAY_SLAY2               = -1555015,
+    SAY_HELP                = -1555016,
+    SAY_DEATH               = -1555017,
+
+    SAY2_INTRO1             = -1555018,
+    SAY2_INTRO2             = -1555019,
+    SAY2_INTRO3             = -1555020,
+    SAY2_AGGRO1             = -1555021,
+    SAY2_AGGRO2             = -1555022,
+    SAY2_AGGRO3             = -1555023,
+    SAY2_SLAY1              = -1555024,
+    SAY2_SLAY2              = -1555025,
+    SAY2_HELP               = -1555026,
+    SAY2_DEATH              = -1555027,
+};
+
+struct boss_blackheart_the_inciter : public CreatureScript
+{
+    boss_blackheart_the_inciter() : CreatureScript("boss_blackheart_the_inciter") {}
+
+    struct boss_blackheart_the_inciterAI : public ScriptedAI
+    {
+        boss_blackheart_the_inciterAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiInciteChaosTimer;
+        uint32 m_uiInciteChaosWaitTimer;
+        uint32 m_uiChargeTimer;
+        uint32 m_uiKnockbackTimer;
+
+        GuidVector m_vTargetsGuids;
+
+        void Reset() override
+        {
+            m_uiInciteChaosWaitTimer = 0;
+            m_uiInciteChaosTimer = 15000;
+            m_uiChargeTimer = urand(30000, 37000);
+            m_uiKnockbackTimer = urand(10000, 14000);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_INCITER, DONE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_INCITER, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_INCITER, FAIL);
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            // if we are waiting for Incite chaos to expire don't evade
+            if (m_uiInciteChaosWaitTimer)
+            {
+                return;
+            }
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiInciteChaosWaitTimer)
+            {
+                if (m_uiInciteChaosWaitTimer <= uiDiff)
+                {
+                    // Restart attack on all targets
+                    for (GuidVector::const_iterator itr = m_vTargetsGuids.begin(); itr != m_vTargetsGuids.end(); ++itr)
+                    {
+                        if (Unit* pTarget = m_creature->GetMap()->GetUnit(*itr))
+                        {
+                            AttackStart(pTarget);
+                        }
+                    }
+
+                    m_creature->HandleEmote(EMOTE_STATE_NONE);
+                    m_uiInciteChaosWaitTimer = 0;
+                }
+                else
+                {
+                    m_uiInciteChaosWaitTimer -= uiDiff;
+                }
+            }
+
+            // Return since we have no pTarget
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiInciteChaosTimer < uiDiff)
+            {
+                // Store the threat list
+                m_vTargetsGuids.clear();
+                m_creature->FillGuidsListFromThreatList(m_vTargetsGuids);
+
+                if (DoCastSpellIfCan(m_creature, SPELL_INCITE_CHAOS) == CAST_OK)
+                {
+                    m_creature->HandleEmote(EMOTE_STATE_LAUGH);
+                    m_uiInciteChaosTimer = 55000;
+                    m_uiInciteChaosWaitTimer = 16000;
+                    return;
+                }
+            }
+            else
+            {
+                m_uiInciteChaosTimer -= uiDiff;
+            }
+
+            // Charge Timer
+            if (m_uiChargeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_CHARGE, SELECT_FLAG_NOT_IN_MELEE_RANGE))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_CHARGE) == CAST_OK)
+                    {
+                        m_uiChargeTimer = urand(30000, 43000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiChargeTimer -= uiDiff;
+            }
+
+            // Knockback Timer
+            if (m_uiKnockbackTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WAR_STOMP) == CAST_OK)
+                {
+                    m_uiKnockbackTimer = urand(15000, 30000);
+                }
+            }
+            else
+            {
+                m_uiKnockbackTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_blackheart_the_inciterAI(pCreature);
+    }
+};
+
+void AddSC_boss_blackheart_the_inciter()
+{
+    Script* s;
+
+    s = new boss_blackheart_the_inciter();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_blackheart_the_inciter";
+    //pNewScript->GetAI = &GetAI_boss_blackheart_the_inciter;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
new file mode 100644
index 000000000..45b6aa06a
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
@@ -0,0 +1,390 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Grandmaster_Vorpil
+SD%Complete: 90
+SDComment: Timers may need adjustments
+SDCategory: Auchindoun, Shadow Labyrinth
+EndScriptData */
+
+#include "precompiled.h"
+#include "shadow_labyrinth.h"
+
+enum
+{
+    SAY_INTRO                       = -1555028,
+    SAY_AGGRO_1                     = -1555029,
+    SAY_AGGRO_2                     = -1555030,
+    SAY_AGGRO_3                     = -1555031,
+    SAY_HELP                        = -1555032,
+    SAY_SLAY_1                      = -1555033,
+    SAY_SLAY_2                      = -1555034,
+    SAY_DEATH                       = -1555035,
+
+    SPELL_DRAW_SHADOWS              = 33563,                // should trigger spell 33558 which is missing; so we need to hack the teleport
+    SPELL_VOID_PORTAL_A             = 33566,                // spell only summon one unit, but we use it for the visual effect and summon the 4 other portals manual way(only one spell exist)
+    SPELL_SHADOW_BOLT_VOLLEY        = 32963,
+    SPELL_RAIN_OF_FIRE              = 33617,
+    SPELL_RAIN_OF_FIRE_H            = 39363,
+    SPELL_BANISH_H                  = 38791,
+    SPELL_SUMMON_VOIDWALKER_A       = 33582,                // the void travelers are summond at portal locations according to DB coords
+    SPELL_SUMMON_VOIDWALKER_B       = 33583,
+    SPELL_SUMMON_VOIDWALKER_C       = 33584,
+    SPELL_SUMMON_VOIDWALKER_D       = 33585,
+    SPELL_SUMMON_VOIDWALKER_E       = 33586,
+
+    SPELL_VOID_PORTAL_VISUAL        = 33569,
+
+    SPELL_EMPOWERING_SHADOWS        = 33783,
+    SPELL_EMPOWERING_SHADOWS_H      = 39364,
+    SPELL_SHADOW_NOVA               = 33846,
+
+    NPC_VOID_PORTAL                 = 19224,
+    NPC_VOID_TRAVELER               = 19226,
+
+    MAX_PORTALS                     = 4
+};
+
+struct SummonLocations
+{
+    float m_fX, m_fY, m_fZ;
+};
+
+// Summon locations for the void portals
+static const SummonLocations aVorpilLocation[MAX_PORTALS] =
+{
+    { -262.40f, -229.57f, 17.08f},
+    { -260.35f, -297.56f, 17.08f},
+    { -292.05f, -270.37f, 12.68f},
+    { -301.64f, -255.97f, 12.68f}
+};
+
+static const float aVorpilTeleportLoc[3] = { -253.06f, -264.02f, 17.08f};
+
+static const uint32 aTravelerSummonSpells[5] = {SPELL_SUMMON_VOIDWALKER_A, SPELL_SUMMON_VOIDWALKER_B, SPELL_SUMMON_VOIDWALKER_C, SPELL_SUMMON_VOIDWALKER_D, SPELL_SUMMON_VOIDWALKER_E};
+
+struct boss_grandmaster_vorpil : public CreatureScript
+{
+    boss_grandmaster_vorpil() : CreatureScript("boss_grandmaster_vorpil") {}
+
+    struct boss_grandmaster_vorpilAI : public ScriptedAI
+    {
+        boss_grandmaster_vorpilAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_bHasDoneIntro = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiShadowBoltVolleyTimer;
+        uint32 m_uiDrawShadowsTimer;
+        uint32 m_uiRainOfFireTimer;
+        uint32 m_uiVoidTravelerTimer;
+        uint32 m_uiBanishTimer;
+        bool m_bHasDoneIntro;
+
+        void Reset() override
+        {
+            m_uiShadowBoltVolleyTimer = urand(13000, 19000);
+            m_uiDrawShadowsTimer = urand(38000, 44000);
+            m_uiRainOfFireTimer = 0;
+            m_uiVoidTravelerTimer = 5000;
+            m_uiBanishTimer = urand(12000, 16000);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // not sure about right radius
+            if (!m_bHasDoneIntro && pWho->GetTypeId() == TYPEID_PLAYER && pWho->IsWithinDistInMap(m_creature, 50.0f) && pWho->IsWithinLOSInMap(m_creature))
+            {
+                DoScriptText(SAY_INTRO, m_creature);
+                m_bHasDoneIntro = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_VOID_PORTAL_A);
+
+            // summon the other 4 portals
+            for (uint8 i = 0; i < MAX_PORTALS; ++i)
+            {
+                m_creature->SummonCreature(NPC_VOID_PORTAL, aVorpilLocation[i].m_fX, aVorpilLocation[i].m_fY, aVorpilLocation[i].m_fZ, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VORPIL, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VORPIL, FAIL);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_VOID_TRAVELER)
+            {
+                pSummoned->GetMotionMaster()->MoveFollow(m_creature, 0.0f, 0.0f);
+            }
+
+            if (pSummoned->GetEntry() == NPC_VOID_PORTAL)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_VOID_PORTAL_VISUAL, true);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VORPIL, DONE);
+            }
+        }
+
+        // Wrapper to teleport all players to the platform - Workaround for missing spell
+        void DoTeleportToPlatform()
+        {
+            m_creature->NearTeleportTo(aVorpilTeleportLoc[0], aVorpilTeleportLoc[1], aVorpilTeleportLoc[2], 0.0f);
+
+            float fX, fY, fZ;
+
+            GuidVector vGuids;
+            m_creature->FillGuidsListFromThreatList(vGuids);
+            for (GuidVector::const_iterator itr = vGuids.begin(); itr != vGuids.end(); ++itr)
+            {
+                Unit* pTarget = m_creature->GetMap()->GetUnit(*itr);
+
+                if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
+                {
+                    pTarget->GetRandomPoint(aVorpilTeleportLoc[0], aVorpilTeleportLoc[1], aVorpilTeleportLoc[2], 4.0f, fX, fY, fZ);
+                    DoTeleportPlayer(pTarget, fX, fY, fZ, m_creature->GetAngle(fX, fY));
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiRainOfFireTimer)
+            {
+                if (m_uiRainOfFireTimer <= uiDiff)
+                {
+                    SetCombatMovement(false, true);
+                    DoTeleportToPlatform();
+
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_RAIN_OF_FIRE : SPELL_RAIN_OF_FIRE_H, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                    {
+                        m_uiRainOfFireTimer = 0;
+                    }
+
+                    SetCombatMovement(true);
+
+                    return;                                     // Nothing more todo after the players had been teleported
+                }
+                else
+                {
+                    m_uiRainOfFireTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiShadowBoltVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_BOLT_VOLLEY) == CAST_OK)
+                {
+                    m_uiShadowBoltVolleyTimer = urand(10000, 26000);
+                }
+            }
+            else
+            {
+                m_uiShadowBoltVolleyTimer -= uiDiff;
+            }
+
+            if (m_uiDrawShadowsTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DRAW_SHADOWS) == CAST_OK)
+                {
+                    m_uiDrawShadowsTimer = urand(36000, 44000);
+                    m_uiRainOfFireTimer = 1000;
+                }
+            }
+            else
+            {
+                m_uiDrawShadowsTimer -= uiDiff;
+            }
+
+            if (m_uiVoidTravelerTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, aTravelerSummonSpells[urand(0, 4)]) == CAST_OK)
+                {
+                    DoScriptText(SAY_HELP, m_creature);
+                    m_uiVoidTravelerTimer = urand(10000, 15000);
+                }
+            }
+            else
+            {
+                m_uiVoidTravelerTimer -= uiDiff;
+            }
+
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiBanishTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_BANISH_H) == CAST_OK)
+                        {
+                            m_uiBanishTimer = urand(17000, 23000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiBanishTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_grandmaster_vorpilAI(pCreature);
+    }
+};
+
+struct npc_void_traveler : public CreatureScript
+{
+    npc_void_traveler() : CreatureScript("npc_void_traveler") {}
+
+    struct npc_void_travelerAI : public ScriptedAI
+    {
+        npc_void_travelerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+        bool m_bHasExploded;
+
+        uint32 m_uiDeathTimer;
+
+        void Reset() override
+        {
+            m_uiDeathTimer = 0;
+            m_bHasExploded = false;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasExploded && pWho->GetEntry() == NPC_VORPIL && pWho->IsWithinDistInMap(m_creature, 3.0f))
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_NOVA) == CAST_OK)
+                {
+                    m_bHasExploded = true;
+                    m_uiDeathTimer = 1000;
+                }
+            }
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiDeathTimer)
+            {
+                if (m_uiDeathTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_EMPOWERING_SHADOWS : SPELL_EMPOWERING_SHADOWS_H, CAST_TRIGGERED) == CAST_OK)
+                    {
+                        m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                        m_uiDeathTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiDeathTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_void_travelerAI(pCreature);
+    }
+};
+
+void AddSC_boss_grandmaster_vorpil()
+{
+    Script* s;
+
+    s = new boss_grandmaster_vorpil();
+    s->RegisterSelf();
+    s = new npc_void_traveler();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_grandmaster_vorpil";
+    //pNewScript->GetAI = &GetAI_boss_grandmaster_vorpil;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_void_traveler";
+    //pNewScript->GetAI = &GetAI_npc_void_traveler;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp b/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
new file mode 100644
index 000000000..a6e49bedd
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
@@ -0,0 +1,210 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Murmur
+SD%Complete: 75
+SDComment: Sonic Boom and Murmur's Touch require additional research and core support
+SDCategory: Auchindoun, Shadow Labyrinth
+EndScriptData */
+
+#include "precompiled.h"
+#include "shadow_labyrinth.h"
+
+enum
+{
+    EMOTE_SONIC_BOOM            = -1555036,
+
+    // Intro spells - used on npcs
+    SPELL_SUPPRESSION_BLAST     = 33332,
+    SPELL_MURMURS_WRATH         = 33331,
+    SPELL_MURMURS_WRATH_2       = 33329,
+
+    SPELL_MAGNETIC_PULL         = 33689,
+    SPELL_SONIC_BOOM            = 33923,        // dummy spell - triggers 33666
+    SPELL_SONIC_BOOM_H          = 38796,        // dummy spell - triggers 38795
+    SPELL_MURMURS_TOUCH         = 33711,        // on expire silences the party members using shockwave - 33686 - also related to spell 33760
+    SPELL_MURMURS_TOUCH_H       = 38794,
+    SPELL_RESONANCE             = 33657,
+
+    SPELL_SONIC_SHOCK           = 38797,        // Heroic Spell
+    SPELL_THUNDERING_STORM      = 39365,        // Heroic Spell
+};
+
+struct boss_murmur : public CreatureScript
+{
+    boss_murmur() : CreatureScript("boss_murmur") {}
+
+    struct boss_murmurAI : public Scripted_NoMovementAI
+    {
+        boss_murmurAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiSonicBoomTimer;
+        uint32 m_uiMurmursTouchTimer;
+        uint32 m_uiResonanceTimer;
+        uint32 m_uiMagneticPullTimer;
+        uint32 m_uiSonicShockTimer;
+        uint32 m_uiThunderingStormTimer;
+
+        void Reset() override
+        {
+            m_uiSonicBoomTimer = urand(21000, 35000);
+            m_uiMurmursTouchTimer = urand(9000, 18000);
+            m_uiResonanceTimer = urand(1000, 7000);
+            m_uiMagneticPullTimer = urand(15000, 25000);
+            m_uiSonicShockTimer = urand(5000, 15000);
+            m_uiThunderingStormTimer = urand(10000, 50000);
+
+            // Boss has only 0.4 of max health
+            m_creature->SetHealth(uint32(m_creature->GetMaxHealth()*.4));
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // SonicBoom_Timer
+            if (m_uiSonicBoomTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SONIC_BOOM : SPELL_SONIC_BOOM_H) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_SONIC_BOOM, m_creature);
+                    m_uiSonicBoomTimer = urand(31000, 38000);
+                }
+            }
+            else
+            {
+                m_uiSonicBoomTimer -= uiDiff;
+            }
+
+            // MurmursTouch_Timer
+            if (m_uiMurmursTouchTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_MURMURS_TOUCH : SPELL_MURMURS_TOUCH_H) == CAST_OK)
+                {
+                    m_uiMurmursTouchTimer = m_bIsRegularMode ? urand(21000, 21000) : urand(29000, 40000);
+                }
+            }
+            else
+            {
+                m_uiMurmursTouchTimer -= uiDiff;
+            }
+
+            // Resonance_Timer - cast if no target is in range
+            if (!m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+            {
+                if (m_uiResonanceTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_RESONANCE) == CAST_OK)
+                    {
+                        m_uiResonanceTimer = urand(5000, 12000);
+                    }
+                }
+                else
+                {
+                    m_uiResonanceTimer -= uiDiff;
+                }
+            }
+
+            // MagneticPull_Timer
+            if (m_uiMagneticPullTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_MAGNETIC_PULL, SELECT_FLAG_PLAYER | SELECT_FLAG_NOT_IN_MELEE_RANGE))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_MAGNETIC_PULL) == CAST_OK)
+                    {
+                        m_uiMagneticPullTimer = urand(21000, 30000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiMagneticPullTimer -= uiDiff;
+            }
+
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiSonicShockTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_SONIC_SHOCK, SELECT_FLAG_IN_MELEE_RANGE))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SONIC_SHOCK) == CAST_OK)
+                        {
+                            m_uiSonicShockTimer = urand(3000, 10000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiSonicShockTimer -= uiDiff;
+                }
+
+                if (m_uiThunderingStormTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_THUNDERING_STORM) == CAST_OK)
+                    {
+                        m_uiThunderingStormTimer = urand(5000, 6000);
+                    }
+                }
+                else
+                {
+                    m_uiThunderingStormTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_murmurAI(pCreature);
+    }
+};
+
+void AddSC_boss_murmur()
+{
+    Script* s;
+
+    s = new boss_murmur();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_murmur";
+    //pNewScript->GetAI = &GetAI_boss_murmur;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
new file mode 100644
index 000000000..54093aae5
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
@@ -0,0 +1,228 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Shadow_Labyrinth
+SD%Complete: 85
+SDComment: Some cleanup left along with save
+SDCategory: Auchindoun, Shadow Labyrinth
+EndScriptData */
+
+#include "precompiled.h"
+#include "shadow_labyrinth.h"
+
+/* Shadow Labyrinth encounters:
+1 - Ambassador Hellmaw event
+2 - Blackheart the Inciter event
+3 - Grandmaster Vorpil event
+4 - Murmur event
+*/
+
+struct is_shadow_labyrinth : public InstanceScript
+{
+    is_shadow_labyrinth() : InstanceScript("instance_shadow_labyrinth") {}
+
+    class instance_shadow_labyrinth : public ScriptedInstance
+    {
+    public:
+        instance_shadow_labyrinth(Map* pMap) : ScriptedInstance(pMap)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_REFECTORY_DOOR:
+                if (m_auiEncounter[2] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+            case GO_SCREAMING_HALL_DOOR:
+                if (m_auiEncounter[3] == DONE)
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                break;
+
+            default:
+                return;
+            }
+
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_VORPIL:
+            case NPC_HELLMAW:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            // unbanish Hellmaw when all Cabal Ritualists are dead
+            if (pCreature->GetEntry() == NPC_CABAL_RITUALIST)
+            {
+                m_sRitualistsAliveGUIDSet.erase(pCreature->GetObjectGuid());
+
+                if (m_sRitualistsAliveGUIDSet.empty())
+                {
+                    if (Creature* pHellmaw = GetSingleCreatureFromStorage(NPC_HELLMAW))
+                    {
+                        // yell intro and remove banish aura
+                        DoScriptText(SAY_HELLMAW_INTRO, pHellmaw);
+                        pHellmaw->GetMotionMaster()->MoveWaypoint();
+                        pHellmaw->RemoveAurasDueToSpell(SPELL_BANISH);
+                    }
+                }
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_HELLMAW:
+                m_auiEncounter[0] = uiData;
+                break;
+
+            case TYPE_INCITER:
+                if (uiData == DONE)
+                    DoUseDoorOrButton(GO_REFECTORY_DOOR);
+                m_auiEncounter[1] = uiData;
+                break;
+
+            case TYPE_VORPIL:
+                if (uiData == DONE)
+                    DoUseDoorOrButton(GO_SCREAMING_HALL_DOOR);
+                m_auiEncounter[2] = uiData;
+                break;
+
+            case TYPE_MURMUR:
+                m_auiEncounter[3] = uiData;
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " "
+                    << m_auiEncounter[2] << " " << m_auiEncounter[3];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            switch (uiType)
+            {
+            case TYPE_HELLMAW:  return m_auiEncounter[0];
+            case TYPE_INCITER:  return m_auiEncounter[1];
+            case TYPE_VORPIL:   return m_auiEncounter[2];
+            case TYPE_MURMUR:   return m_auiEncounter[3];
+            case TYPE_IS_UNBANISHED: return uint32(m_sRitualistsAliveGUIDSet.empty());
+
+            default:
+                return 0;
+            }
+        }
+
+        void SetData64(uint32 uiType, uint64 uiGuid) override
+        {
+            // If Hellmaw already completed, just ignore
+            if (GetData(TYPE_HELLMAW) == DONE)
+                return;
+
+            // Note: this is handled in Acid. The purpose is check which Cabal Ritualists is alive, in case of server reset
+            // The function is triggered by eventAI on generic timer
+            if (uiType == DATA_CABAL_RITUALIST)
+                m_sRitualistsAliveGUIDSet.insert(ObjectGuid(uiGuid));
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        GuidSet m_sRitualistsAliveGUIDSet;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_shadow_labyrinth(pMap);
+    }
+};
+
+void AddSC_instance_shadow_labyrinth()
+{
+    Script* s;
+
+    s = new is_shadow_labyrinth();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_shadow_labyrinth";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_shadow_labyrinth;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h b/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h
new file mode 100644
index 000000000..a133aa8c8
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h
@@ -0,0 +1,55 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_SHADOW_LABYRINTH_H
+#define DEF_SHADOW_LABYRINTH_H
+
+enum
+{
+    MAX_ENCOUNTER           = 4,
+
+    TYPE_HELLMAW            = 1,
+    // TYPE_OVERSEER        = 2,                            // obsolete id used by acid
+    TYPE_INCITER            = 3,
+    TYPE_VORPIL             = 4,
+    TYPE_MURMUR             = 5,
+    TYPE_IS_UNBANISHED      = 6,
+
+    DATA_CABAL_RITUALIST    = 1,                            // DO NOT CHANGE! Used by Acid. - used to check the Cabal Ritualists alive
+
+    NPC_HELLMAW             = 18731,
+    NPC_VORPIL              = 18732,
+    NPC_CABAL_RITUALIST     = 18794,
+
+    GO_REFECTORY_DOOR       = 183296,                       // door opened when blackheart the inciter dies
+    GO_SCREAMING_HALL_DOOR  = 183295,                       // door opened when grandmaster vorpil dies
+
+    SAY_HELLMAW_INTRO       = -1555000,
+
+    SPELL_BANISH            = 30231,                        // spell is handled in creature_template_addon;
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/outland/black_temple/black_temple.cpp b/src/modules/SD3/scripts/outland/black_temple/black_temple.cpp
new file mode 100644
index 000000000..6b40388d3
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/black_temple/black_temple.cpp
@@ -0,0 +1,91 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Black_Temple
+SD%Complete: 95
+SDComment: Spirit of Olum: Player Teleporter to Seer Kanai Teleport after defeating Naj'entus and Supremus. TODO: Find proper gossip.
+SDCategory: Black Temple
+EndScriptData */
+
+/* ContentData
+npc_spirit_of_olum
+EndContentData */
+
+#include "precompiled.h"
+#include "black_temple.h"
+
+/*###
+# npc_spirit_of_olum
+####*/
+
+#define SPELL_TELEPORT      41566                           // s41566 - Teleport to Ashtongue NPC's
+#define GOSSIP_OLUM1        "Teleport me to the other Ashtongue Deathsworn"
+//TODO prepare localisation
+struct npc_spirit_of_olum : public CreatureScript
+{
+    npc_spirit_of_olum() : CreatureScript("npc_spirit_of_olum") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+
+        if (pInstance && (pInstance->GetData(TYPE_SUPREMUS) >= DONE) && (pInstance->GetData(TYPE_NAJENTUS) >= DONE))
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_OLUM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        pPlayer->InterruptNonMeleeSpells(false);
+        pPlayer->CastSpell(pPlayer, SPELL_TELEPORT, false);
+        return true;
+    }
+};
+
+void AddSC_black_temple()
+{
+    Script* s;
+
+    s = new npc_spirit_of_olum();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_spirit_of_olum";
+    //pNewScript->pGossipHello = &GossipHello_npc_spirit_of_olum;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_spirit_of_olum;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/black_temple/black_temple.h b/src/modules/SD3/scripts/outland/black_temple/black_temple.h
new file mode 100644
index 000000000..d49e60220
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/black_temple/black_temple.h
@@ -0,0 +1,95 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_BLACK_TEMPLE_H
+#define DEF_BLACK_TEMPLE_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 9,
+
+    TYPE_NAJENTUS                   = 0,
+    TYPE_SUPREMUS                   = 1,
+    TYPE_SHADE                      = 2,
+    TYPE_GOREFIEND                  = 3,
+    TYPE_BLOODBOIL                  = 4,
+    TYPE_RELIQUIARY                 = 5,
+    TYPE_SHAHRAZ                    = 6,
+    TYPE_COUNCIL                    = 7,
+    TYPE_ILLIDAN                    = 8,
+    TYPE_GLAIVE_1                   = MAX_ENCOUNTER,
+    TYPE_GLAIVE_2                   = MAX_ENCOUNTER+1,
+    TYPE_CHANNELERS                 = MAX_ENCOUNTER+2,
+
+    // NPC_WARLORD_NAJENTUS         = 22887,
+    // NPC_SUPREMUS                 = 22898,
+    NPC_SHADE_OF_AKAMA              = 22841,
+    NPC_AKAMA_SHADE                 = 22990,
+    NPC_RELIQUARY_OF_SOULS          = 22856,
+    NPC_ILLIDARI_COUNCIL            = 23426,
+    NPC_COUNCIL_VOICE               = 23499,
+    NPC_LADY_MALANDE                = 22951,
+    NPC_ZEREVOR                     = 22950,
+    NPC_GATHIOS                     = 22949,
+    NPC_VERAS                       = 22952,
+    NPC_AKAMA                       = 23089,
+    NPC_MAIEV_SHADOWSONG            = 23197,
+    NPC_ILLIDAN_STORMRAGE           = 22917,
+
+    NPC_ASH_CHANNELER               = 23421,
+    NPC_ASH_BROKEN                  = 23319,
+    NPC_CREATURE_GENERATOR          = 23210,
+    NPC_ILLIDAN_DOOR_TRIGGER        = 23412,
+    NPC_GLAIVE_TARGET               = 23448,
+    NPC_SPIRIT_OF_OLUM              = 23411,
+    NPC_SPIRIT_OF_UDALO             = 23410,
+
+    GO_NAJENTUS_GATE                = 185483,
+    GO_SUPREMUS_DOORS               = 185882,
+    GO_SHADE_OF_AKAMA               = 185478,
+    GO_GOREFIEND_DOOR               = 186153,
+    GO_GURTOGG_DOOR                 = 185892,
+    GO_PRE_SHAHRAZ_DOOR             = 185479,
+    GO_POST_SHAHRAZ_DOOR            = 185482,
+    GO_PRE_COUNCIL_DOOR             = 185481,
+    GO_COUNCIL_DOOR                 = 186152,
+    GO_ILLIDAN_GATE                 = 185905,
+    GO_ILLIDAN_DOOR_R               = 186261,
+    GO_ILLIDAN_DOOR_L               = 186262,
+};
+
+struct Location
+{
+    float m_fX, m_fY, m_fZ;
+};
+
+static const Location afBrokenSpawnLoc[] =
+{
+    { 541.375916f, 401.439575f, 112.784f },       // The place where Akama channels
+    { 534.130005f, 352.394531f, 112.784f },       // Behind a 'pillar' which is behind the east alcove
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/outland/black_temple/boss_bloodboil.cpp b/src/modules/SD3/scripts/outland/black_temple/boss_bloodboil.cpp
new file mode 100644
index 000000000..60d779695
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/black_temple/boss_bloodboil.cpp
@@ -0,0 +1,365 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Bloodboil
+SD%Complete: 90
+SDComment: Timers may need adjustments.
+SDCategory: Black Temple
+EndScriptData */
+
+#include "precompiled.h"
+#include "black_temple.h"
+
+enum
+{
+    // Speech'n'Sound
+    SAY_AGGRO                   = -1564029,
+    SAY_SLAY1                   = -1564030,
+    SAY_SLAY2                   = -1564031,
+    SAY_SPECIAL1                = -1564032,
+    SAY_SPECIAL2                = -1564033,
+    SAY_ENRAGE1                 = -1564034,
+    SAY_ENRAGE2                 = -1564035,
+    SAY_DEATH                   = -1564036,
+
+    // Spells
+    // Phase 1
+    SPELL_FEL_ACID_1            = 40508,
+    SPELL_ARCING_SMASH_1        = 40457,
+    SPELL_EJECT_1               = 40486,
+    SPELL_ACIDIC_WOUND          = 40481,
+    SPELL_BLOODBOIL             = 42005,
+    SPELL_BEWILDERING_STRIKE    = 40491,
+
+    // Phase 2
+    SPELL_ACID_GEYSER           = 40630,
+    SPELL_FEL_ACID_2            = 40595,
+    SPELL_ARCING_SMASH_2        = 40599,
+    SPELL_EJECT_2               = 40597,
+    SPELL_INSIGNIFIGANCE        = 40618,
+    SPELL_FEL_RAGE              = 40594,
+    SPELL_FEL_RAGE_PLAYER_1     = 40604,
+    SPELL_FEL_RAGE_PLAYER_2     = 40616,
+    SPELL_FEL_RAGE_PLAYER_3     = 41625,
+    SPELL_FEL_RAGE_4            = 40617,                // spell not confirmed
+    SPELL_FEL_RAGE_5            = 46787,                // spell not confirmed
+    SPELL_TAUNT_GURTOGG         = 40603,
+
+    // Other spells
+    SPELL_CHARGE                = 40602,                // spell not confirmed
+    SPELL_BERSERK               = 27680,
+
+    MAX_BLOODBOILS              = 5,
+};
+
+struct boss_gurtogg_bloodboil : public CreatureScript
+{
+    boss_gurtogg_bloodboil() : CreatureScript("boss_gurtogg_bloodboil") {}
+
+    struct boss_gurtogg_bloodboilAI : public ScriptedAI
+    {
+        boss_gurtogg_bloodboilAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiBloodboilTimer;
+        uint32 m_uiAcidGeyserTimer;
+        uint32 m_uiAcidicWoundTimer;
+        uint32 m_uiArcingSmashTimer;
+        uint32 m_uiFelAcidTimer;
+        uint32 m_uiEjectTimer;
+        uint32 m_uiStrikeTimer;
+        uint32 m_uiPhaseChangeTimer;
+        uint32 m_uiBerserkTimer;
+        uint8 m_uiBloodboilCount;
+
+        bool m_bIsPhase1;
+
+        void Reset() override
+        {
+            m_uiBloodboilTimer = 10000;
+            m_uiBloodboilCount = 0;
+            m_uiAcidGeyserTimer = 1000;
+            m_uiAcidicWoundTimer = 6000;
+            m_uiArcingSmashTimer = 19000;
+            m_uiFelAcidTimer = 25000;
+            m_uiEjectTimer = 10000;
+            m_uiStrikeTimer = 15000;
+            m_uiPhaseChangeTimer = MINUTE * IN_MILLISECONDS;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            m_bIsPhase1 = true;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BLOODBOIL, FAIL);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BLOODBOIL, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BLOODBOIL, DONE);
+            }
+
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiArcingSmashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsPhase1 ? SPELL_ARCING_SMASH_1 : SPELL_ARCING_SMASH_2) == CAST_OK)
+                {
+                    m_uiArcingSmashTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiArcingSmashTimer -= uiDiff;
+            }
+
+            if (m_uiFelAcidTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsPhase1 ? SPELL_FEL_ACID_1 : SPELL_FEL_ACID_2) == CAST_OK)
+                {
+                    m_uiFelAcidTimer = 25000;
+                }
+            }
+            else
+            {
+                m_uiFelAcidTimer -= uiDiff;
+            }
+
+            // Phase 1 spells
+            if (m_bIsPhase1)
+            {
+                if (m_uiStrikeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_BEWILDERING_STRIKE) == CAST_OK)
+                    {
+                        m_uiStrikeTimer = 20000;
+                    }
+                }
+                else
+                {
+                    m_uiStrikeTimer -= uiDiff;
+                }
+
+                if (m_uiEjectTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_EJECT_1) == CAST_OK)
+                    {
+                        // Script effect: reduce threat on main target
+                        m_creature->GetThreatManager().modifyThreatPercent(m_creature->getVictim(), -40);
+                        m_uiEjectTimer = 15000;
+                    }
+                }
+                else
+                {
+                    m_uiEjectTimer -= uiDiff;
+                }
+
+                if (m_uiAcidicWoundTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ACIDIC_WOUND) == CAST_OK)
+                    {
+                        m_uiAcidicWoundTimer = 10000;
+                    }
+                }
+                else
+                {
+                    m_uiAcidicWoundTimer -= uiDiff;
+                }
+
+                if (m_uiBloodboilTimer)
+                {
+                    if (m_uiBloodboilTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_BLOODBOIL) == CAST_OK)
+                        {
+                            ++m_uiBloodboilCount;
+
+                            // Allow only 5 Bloodboils per phase.
+                            if (m_uiBloodboilCount == MAX_BLOODBOILS)
+                            {
+                                m_uiBloodboilTimer = 0;
+                            }
+                            else
+                            {
+                                m_uiBloodboilTimer = 10000;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiBloodboilTimer -= uiDiff;
+                    }
+                }
+            }
+            // Phase 2 spells
+            else
+            {
+                if (m_uiAcidGeyserTimer)
+                {
+                    if (m_uiAcidGeyserTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_ACID_GEYSER) == CAST_OK)
+                        {
+                            m_uiAcidGeyserTimer = 0;
+                        }
+                    }
+                    else
+                    {
+                        m_uiAcidGeyserTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiEjectTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_EJECT_2) == CAST_OK)
+                    {
+                        m_uiEjectTimer = 15000;
+                    }
+                }
+                else
+                {
+                    m_uiEjectTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiPhaseChangeTimer < uiDiff)
+            {
+                if (m_bIsPhase1)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        // Buff self
+                        if (DoCastSpellIfCan(m_creature, SPELL_FEL_RAGE) == CAST_OK)
+                        {
+                            DoScriptText(urand(0, 1) ? SAY_SPECIAL1 : SAY_SPECIAL2, m_creature);
+
+                            // Debuff player
+                            DoCastSpellIfCan(pTarget, SPELL_FEL_RAGE_PLAYER_1, CAST_TRIGGERED);
+                            DoCastSpellIfCan(pTarget, SPELL_FEL_RAGE_PLAYER_2, CAST_TRIGGERED);
+                            DoCastSpellIfCan(pTarget, SPELL_FEL_RAGE_PLAYER_3, CAST_TRIGGERED);
+                            // Allow player to taunt Gurtogg
+                            pTarget->CastSpell(m_creature, SPELL_TAUNT_GURTOGG, true);
+
+                            // Don't allow others to generate threat
+                            DoCastSpellIfCan(m_creature, SPELL_INSIGNIFIGANCE, CAST_TRIGGERED);
+
+                            // Reset timers
+                            m_bIsPhase1 = false;
+                            m_uiAcidGeyserTimer = 1000;
+                            m_uiPhaseChangeTimer = 30000;
+                        }
+                    }
+                }
+                else
+                {
+                    // Reset timers
+                    m_bIsPhase1 = true;
+                    m_uiBloodboilTimer = 10000;
+                    m_uiBloodboilCount = 0;
+                    m_uiAcidicWoundTimer += 2000;
+                    m_uiArcingSmashTimer += 2000;
+                    m_uiFelAcidTimer += 2000;
+                    m_uiEjectTimer += 2000;
+                    m_uiPhaseChangeTimer = 60000;
+                }
+            }
+            else
+            {
+                m_uiPhaseChangeTimer -= uiDiff;
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_ENRAGE1 : SAY_ENRAGE2, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_gurtogg_bloodboilAI(pCreature);
+    }
+};
+
+void AddSC_boss_gurtogg_bloodboil()
+{
+    Script* s;
+
+    s = new boss_gurtogg_bloodboil();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_gurtogg_bloodboil";
+    //pNewScript->GetAI = &GetAI_boss_gurtogg_bloodboil;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/black_temple/boss_illidan.cpp b/src/modules/SD3/scripts/outland/black_temple/boss_illidan.cpp
new file mode 100644
index 000000000..2ba213018
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/black_temple/boss_illidan.cpp
@@ -0,0 +1,1973 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Illidan_Stormrage
+SD%Complete: 90
+SDComment: Movement during flight phase NYI. Some other fine details may need adjustments.
+SDCategory: Black Temple
+EndScriptData */
+
+#include "precompiled.h"
+#include "black_temple.h"
+#include "escort_ai.h"
+
+enum
+{
+    /************* Quotes and Sounds ***********************/
+    // Intro yells and gossip
+    SAY_AKAMA_BEWARE                = -1564120,
+    SAY_AKAMA_OPEN_DOOR_1           = -1564131,
+    SAY_AKAMA_OPEN_DOOR_2           = -1564132,
+    SAY_UDALO_OPEN_DOOR_3           = -1564133,
+    SAY_OLUM_OPEN_DOOR_4            = -1564134,
+
+    // Gossip for when a player clicks Akama
+    GOSSIP_ITEM_PREPARE             = -3564001,
+    GOSSIP_ITEM_START_EVENT         = -3564002,
+    TEXT_ID_AKAMA_ILLIDAN_PREPARE   = 10465,                // ToDo: fix text id - this entry is wrong -> "The time has come to face Illidan, $N. Are you ready?"
+    TEXT_ID_AKAMA_ILLIDAN_START     = 10835,
+
+    // Event speech
+    SAY_ILLIDAN_SPEECH_1            = -1564097,
+    SAY_AKAMA_SPEECH_2              = -1564098,
+    SAY_ILLIDAN_SPEECH_3            = -1564099,
+    SAY_AKAMA_SPEECH_4              = -1564100,
+    SAY_ILLIDAN_SPEECH_5            = -1564101,             // aggro
+    SAY_ILLIDAN_MINION              = -1564121,
+    SAY_AKAMA_LEAVE                 = -1564122,
+    SAY_ILLIDAN_SPEECH_6            = -1564102,
+    SAY_MAIEV_SPEECH_7              = -1564103,
+    SAY_ILLIDAN_SPEECH_8            = -1564104,
+    SAY_MAIEV_SPEECH_9              = -1564105,
+    SAY_MAIEV_TRAP                  = -1564118,
+
+    // Epilogue speech
+    SAY_MAIEV_EPILOGUE_1            = -1564107,
+    SAY_ILLIDAN_EPILOGUE_2          = -1564108,
+    SAY_MAIEV_EPILOGUE_3            = -1564109,
+    SAY_MAIEV_EPILOGUE_4            = -1564110,
+    SAY_AKAMA_EPILOGUE_5            = -1564111,
+
+    // Combat yells
+    SAY_KILL1                       = -1564123,
+    SAY_KILL2                       = -1564124,
+    SAY_TAKEOFF                     = -1564125,
+    SAY_SUMMONFLAMES                = -1564126,
+    SAY_EYE_BLAST                   = -1564127,
+    SAY_MORPH                       = -1564128,
+    SAY_FRENZY                      = -1564106,
+    SAY_BERSERK                     = -1564129,
+
+    // Note: this yells may not be used. Need additional research
+    SAY_TAUNT_1                     = -1564112,
+    SAY_TAUNT_2                     = -1564113,
+    SAY_TAUNT_3                     = -1564114,
+    SAY_TAUNT_4                     = -1564115,
+
+    SAY_MAIEV_TAUNT_1               = -1564116,
+    SAY_MAIEV_TAUNT_2               = -1564117,
+    SAY_MAIEV_TAUNT_3               = -1564119,
+
+
+    /************** Spells *************/
+    // Normal Form
+    SPELL_SHEAR                     = 41032,                // Reduces Max. Health by 60% for 7 seconds. Can stack 19 times. 1.5 second cast
+    SPELL_FLAME_CRASH               = 40832,                // Summons an invis/unselect passive mob that has an uiAura of flame in a circle around him.
+    SPELL_DRAW_SOUL                 = 40904,                // 5k Shadow Damage in front of him. Heals Illidan for 100k health (script effect)
+    SPELL_PARASITIC_SHADOWFIEND     = 41917,                // DoT of 3k Shadow every 2 seconds. Lasts 10 seconds. (Script effect: Summon 2 parasites once the debuff has ticked off)
+    // SPELL_SUMMON_PARASITICS       = 41915,               // Summons 2 Parasitic Shadowfiends on the target. Handled in core.
+    SPELL_AGONIZING_FLAMES          = 40834,                // triggers 40932
+    SPELL_FRENZY                    = 40683,                // Increases damage by 50% and attack speed by 30%. 20 seconds, PHASE 5 ONLY
+
+    // Flying (Phase 2)
+    SPELL_THROW_GLAIVE              = 39635,                // triggers 41466 - Throws the first glaive on the ground
+    SPELL_THROW_GLAIVE_VISUAL       = 39849,                // triggers 41466 - Throws the second glaive on the ground
+    SPELL_GLAIVE_RETURNS            = 39873,                // Glaive flies back to Illidan
+    SPELL_FIREBALL                  = 40598,                // 2.5k-3.5k damage in 10 yard radius. 2 second cast time.
+    SPELL_DARK_BARRAGE              = 40585,                // 10 second channeled spell, 3k shadow damage per second.
+    SPELL_EYE_BLAST_DUMMY           = 39908,                // This does the blue beam channel - targets 23070
+
+    // Demon Form
+    SPELL_DEMON_TRANSFORM_1         = 40511,                // start transform animation - spell sequence: 40398, 40506, 40510 - handled in core
+    SPELL_DEMON_TRANSFORM_2         = 40398,                // Second uiPhase of animations (kneel)
+    SPELL_DEMON_TRANSFORM_3         = 40510,                // Final uiPhase of animations (stand up and roar)
+    SPELL_DEMON_FORM                = 40506,                // Transforms into Demon Illidan. Has an Aura of Dread on him.
+    SPELL_SHADOW_BLAST              = 41078,                // 8k - 11k Shadow Damage. Targets highest threat. Has a splash effect, damaging anyone in 20 yards of the target.
+    SPELL_FLAME_BURST               = 41126,                // triggers 41131
+    SPELL_SUMMON_SHADOW_DEMONS      = 41117,                // summons 23375
+
+    // Other Illidan spells
+    SPELL_KNEEL_INTRO               = 39656,                // Before beginning encounter, this is how he appears (talking to Wilson).
+    SPELL_SUMMMON_MAIEV             = 40403,                // summons 23197
+    SPELL_TELEPORT_MAIEV            = 41221,
+    SPELL_SHADOW_PRISON             = 40647,                // Illidan casts this spell to immobilize entire raid when he summons Maiev.
+    SPELL_CAGE_TRAP                 = 40693,                // Cast by Illidan on Maiev - teleports Maiev for the trap
+    SPELL_DEATH                     = 41220,                // This spell doesn't do anything except stun Illidan and set him on his knees.
+    SPELL_BERSERK                   = 45078,                // Damage increased by 500%, attack speed by 150%
+
+
+    /************** Non-Illidan Spells *************/
+    // Akama
+    SPELL_AKAMA_DOOR_FAIL           = 41271,                // Akama's first door attempt
+    SPELL_AKAMA_DOOR_CHANNEL        = 41268,                // Akama's channel spell on the door before the Temple Summit
+    SPELL_DEATHSWORN_DOOR_CHANNEL   = 41269,                // Olum and Udalo's channel spell on the door before the Temple Summit
+    SPELL_HEALING_POTION            = 40535,                // Akama uses this to heal himself to full.
+    SPELL_CHAIN_LIGHTNING           = 40536,
+
+    // Maiev
+    SPELL_SHADOW_STRIKE             = 40685,
+    SPELL_THROW_DAGGER              = 41152,
+    SPELL_CAGE_TRAP_SUMMON          = 40694,                // summons npc 23304 and go 185916
+    SPELL_TELEPORT_VISUAL           = 41236,
+
+    // Misc Summoned
+    SPELL_FLAME_CRASH_EFFECT        = 40836,                // Firey blue ring of circle that the other flame crash summons
+    SPELL_EYE_BLAST_TRIGGER         = 40017,                // This summons Demon Form every few seconds and deals ~20k damage in its radius
+    // SPELL_DEMON_FIRE             = 40029,                // Blue fire trail left by Eye Blast. Deals 2k per second if players stand on it.
+    SPELL_BLAZE_EFFECT              = 40610,                // Green flame on the ground, triggers damage (5k) every few seconds
+
+    // Blade of Azzinoth
+    SPELL_RANGE_MARKER              = 41997,                // Dummy effect used by the Blade of Azzinoth to check the range of the Azzinoth flame - needs core support
+    SPELL_SUMMON_TEAR_AZZINOTH      = 39855,                // Summons 22997
+    SPELL_AZZINOTH_CHANNEL          = 39857,                // Glaives cast it on Flames
+
+    // Flame of Azzinoth
+    SPELL_FLAME_BLAST               = 40631,                // Flames of Azzinoth use this. Frontal cone AoE 7k-9k damage.
+    SPELL_CHARGE                    = 42003,                // Flames of Azzinoth charges whoever is too far from them. They enrage after this
+    SPELL_UNCAGED_WRATH             = 39869,
+    SPELL_BLAZE                     = 40637,                // summons 23259
+
+    // Shadow Demon
+    SPELL_SHADOW_DEMON_PASSIVE      = 41079,                // Adds the "shadowform" uiAura to Shadow Demons.
+    SPELL_CONSUME_SOUL              = 41080,                // Once the Shadow Demons reach their target, they use this to kill them
+    SPELL_PARALYZE                  = 41083,                // Shadow Demons cast this on their target
+
+    // Cage spells
+    SPELL_CAGE_TRAP_PERIODIC        = 40760,                // purpose unk
+    SPELL_CAGE_TRAP_DUMMY           = 40761,                // purpose unk
+    SPELL_CAGED                     = 40695,                // Caged Trap triggers will cast this on Illidan if he is within 3 yards
+
+
+    /************** Creature Summons **************/
+    NPC_ILLIDARI_ELITE              = 23226,                // attacks Akama on the stairs
+    NPC_FLAME_CRASH                 = 23336,                // has aura 40836
+    // NPC_PARASITIC_SHADOWFIEND    = 23498,                // has aura 41913 (in c_t_a)
+    NPC_BLADE_OF_AZZINOTH           = 22996,                // has aura 41997 and summons 22997 on spawn
+    NPC_FLAME_OF_AZZINOTH           = 22997,
+    NPC_ILLIDAN_TARGET              = 23070,                // the eye blast target - has aura 40017
+    // NPC_DEMON_FIRE               = 23069,                // has aura 40029 (in EventAI)
+    NPC_BLAZE                       = 23259,                // has aura 40610
+    NPC_SHADOW_DEMON                = 23375,
+    // NPC_CAGE_TRAP_DISTURB_TRIGGER = 23304,
+
+    GO_CAGE_TRAP                    = 185916,
+
+    /************** Others **************/
+    EQUIP_ID_MAIN_HAND              = 32837,
+    EQUIP_ID_OFF_HAND               = 32838,
+
+    MAX_ILLIDARI_ELITES             = 10,
+    MAX_CAGE_SPELLS                 = 8,
+    MAX_FLAME_AZZINOTH              = 2,
+
+    DUMMY_EMOTE_ID_1                = 1,
+    DUMMY_EMOTE_ID_2                = 2,
+    DUMMY_EMOTE_ID_3                = 3,
+};
+
+static const uint32 aCagedSummonSpells[MAX_CAGE_SPELLS] = { 40696, 40697, 40698, 40699, 40700, 40701, 40702, 40703 };
+static const uint32 aCagedVisualSpells[MAX_CAGE_SPELLS] = { 40704, 40707, 40708, 40709, 40710, 40711, 40712, 40713 };
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {SAY_AKAMA_OPEN_DOOR_1,     NPC_AKAMA,              4000},
+    {SPELL_AKAMA_DOOR_FAIL,     0,                      9000},
+    {SAY_AKAMA_OPEN_DOOR_2,     NPC_AKAMA,              6000},
+    {NPC_SPIRIT_OF_OLUM,        0,                      2000},
+    {SAY_UDALO_OPEN_DOOR_3,     NPC_SPIRIT_OF_UDALO,    2000},
+    {SAY_OLUM_OPEN_DOOR_4,      NPC_SPIRIT_OF_OLUM,     4000},
+    {SPELL_AKAMA_DOOR_CHANNEL,  0,                      11000},
+    {GO_ILLIDAN_GATE,           0,                      4000},
+    {NPC_SPIRIT_OF_UDALO,       0,                      0},
+    {0, 0, 0},
+};
+
+static const DialogueEntry aEventDialogue[] =
+{
+    // Akama intro
+    {NPC_AKAMA,                 0,                      1000},
+    {SAY_ILLIDAN_SPEECH_1,      NPC_ILLIDAN_STORMRAGE,  3000},
+    {EMOTE_ONESHOT_QUESTION,    0,                      3000},
+    {DUMMY_EMOTE_ID_1,          0,                      3000},
+    {DUMMY_EMOTE_ID_2,          0,                      3000},
+    {SAY_AKAMA_SPEECH_2,        NPC_AKAMA,              10000},
+    {SAY_ILLIDAN_SPEECH_3,      NPC_ILLIDAN_STORMRAGE,  3000},
+    {DUMMY_EMOTE_ID_3,          0,                      4000},
+    {SAY_AKAMA_SPEECH_4,        NPC_AKAMA,              4000},
+    {EQUIP_ID_MAIN_HAND,        0,                      1000},
+    {SAY_ILLIDAN_SPEECH_5,      NPC_ILLIDAN_STORMRAGE,  4000},
+    {NPC_ILLIDAN_STORMRAGE,     0,                      0},
+    // Akama leaves fight
+    {SAY_ILLIDAN_MINION,        NPC_ILLIDAN_STORMRAGE,  8000},
+    {SAY_AKAMA_LEAVE,           NPC_AKAMA,              0},
+    // Maiev cutscene
+    {SAY_ILLIDAN_SPEECH_6,      NPC_ILLIDAN_STORMRAGE,  7000},
+    {SPELL_SUMMMON_MAIEV,       0,                      1000},
+    {SAY_MAIEV_SPEECH_7,        NPC_MAIEV_SHADOWSONG,   2000},
+    {EMOTE_ONESHOT_EXCLAMATION, 0,                      6000},
+    {SAY_ILLIDAN_SPEECH_8,      NPC_ILLIDAN_STORMRAGE,  7000},
+    {SAY_MAIEV_SPEECH_9,        NPC_MAIEV_SHADOWSONG,   2000},
+    {EMOTE_ONESHOT_YES,         0,                      5000},
+    {NPC_MAIEV_SHADOWSONG,      0,                      0},
+    {0, 0, 0},
+};
+
+static const DialogueEntry aEpilogueDialogue[] =
+{
+    {SAY_MAIEV_EPILOGUE_1,      NPC_MAIEV_SHADOWSONG,   6000},
+    {SAY_ILLIDAN_EPILOGUE_2,    NPC_ILLIDAN_STORMRAGE,  18000},
+    {NPC_ILLIDAN_STORMRAGE,     0,                      2000},
+    {SAY_MAIEV_EPILOGUE_3,      NPC_MAIEV_SHADOWSONG,   13000},
+    {SAY_MAIEV_EPILOGUE_4,      NPC_MAIEV_SHADOWSONG,   2000},
+    {SPELL_TELEPORT_VISUAL,     0,                      0},
+    {0, 0, 0},
+};
+
+/*** Phase Names ***/
+enum Phase
+{
+    PHASE_AKAMA             = 1,
+    PHASE_BLADES            = 2,
+    PHASE_DUAL_NORMAL       = 3,
+    PHASE_DUAL_DEMON        = 4,
+    PHASE_MAIEV             = 5,
+    PHASE_TRANSITION        = 6,
+};
+
+struct Locations
+{
+    float fX, fY, fZ;
+};
+
+static const Locations aCenterLoc[] =
+{
+    {705.012f, 305.721f, 354.723f},             // front location
+    {676.740f, 305.297f, 353.192f},             // center location
+};
+
+static const Locations aIllidariElitesPos[MAX_ILLIDARI_ELITES] =
+{
+    {743.9686f, 289.6447f, 311.1807f},
+    {753.8425f, 286.562f, 310.9353f},
+    {745.2552f, 322.1574f, 310.4596f},
+    {745.3237f, 283.986f, 309.2765f},
+    {750.0472f, 282.3274f, 309.4353f},
+    {747.0576f, 326.4268f, 309.0688f},
+    {751.0878f, 327.6505f, 309.4576f},
+    {748.8422f, 288.062f, 310.9782f},
+    {750.0322f, 323.6064f, 310.2757f},
+    {754.0332f, 325.8136f, 310.3195f},
+};
+
+static const Locations aEyeBlastPos[] =
+{
+    // spawn
+    {650.600f, 258.124f, 352.996f},             // back left
+    {651.867f, 353.212f, 352.996f},             // back right
+    {710.010f, 266.950f, 352.996f},             // front left
+    {711.003f, 343.562f, 352.996f},             // front right
+    // target - left
+    {742.212f, 338.333f, 352.996f},             // front right
+    {674.559f, 375.761f, 352.996f},             // back right
+    // target - right
+    {741.545f, 270.640f, 352.996f},             // front left
+    {671.943f, 235.718f, 352.996f},             // back left
+    // center back
+    {639.511f, 305.852f, 353.264f}
+};
+
+/*######
+## boss_illidan_stormrage
+######*/
+
+struct boss_illidan_stormrage : public CreatureScript
+{
+    boss_illidan_stormrage() : CreatureScript("boss_illidan_stormrage") {}
+
+    struct boss_illidan_stormrageAI : public ScriptedAI, private DialogueHelper
+    {
+        boss_illidan_stormrageAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aEventDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        Phase m_uiPhase;
+        uint32 m_uiBerserkTimer;
+
+        bool m_bHasSummonedElites;
+        float m_fTargetMoveX, m_fTargetMoveY, m_fTargetMoveZ;
+
+        uint32 m_uiShearTimer;
+        uint32 m_uiDrawSoulTimer;
+        uint32 m_uiFlameCrashTimer;
+        uint32 m_uiShadowFiendTimer;
+
+        uint32 m_uiFireballTimer;
+        uint32 m_uiEyeBlastTimer;
+        uint32 m_uiDarkBarrageTimer;
+        uint32 m_uiSummonBladesTimer;                           // Animate summoning the Blades of Azzinoth in Phase 2
+        uint32 m_uiCenterMoveTimer;
+        uint32 m_uiLandTimer;                                   // This is used at the end of uiPhase 2 to signal Illidan landing after Flames are dead
+        uint8 m_uiLandStage;
+        uint8 m_uiFlameAzzinothKilled;
+
+        uint32 m_uiAgonizingFlamesTimer;
+        uint32 m_uiTransformTimer;
+
+        uint32 m_uiShadowBlastTimer;
+        uint32 m_uiFlameBurstTimer;
+        uint32 m_uiShadowDemonTimer;
+        Phase m_uiPrevPhase;                                    // store the previous phase in transition
+
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiTrapTimer;
+
+        GuidList m_lBladesGuidList;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_AKAMA;
+            m_uiBerserkTimer = 25 * MINUTE * IN_MILLISECONDS;
+
+            m_bHasSummonedElites = false;
+
+            m_uiShearTimer = urand(10000, 15000);
+            m_uiFlameCrashTimer = 30000;
+            m_uiShadowFiendTimer = 25000;
+            m_uiDrawSoulTimer = 35000;
+
+            m_uiFlameAzzinothKilled = 0;
+            m_uiSummonBladesTimer = 0;
+            m_uiCenterMoveTimer = 0;
+            m_uiFireballTimer = 5000;
+            m_uiDarkBarrageTimer = 45000;
+            m_uiEyeBlastTimer = 15000;
+            m_uiLandTimer = 0;
+            m_uiLandStage = 0;
+
+            m_uiAgonizingFlamesTimer = 35000;
+            m_uiTransformTimer = 0;
+
+            m_uiShadowBlastTimer = urand(1000, 2000);
+            m_uiFlameBurstTimer = 10000;
+            m_uiShadowDemonTimer = 30000;
+
+            m_uiEnrageTimer = 40000;
+            m_uiTrapTimer = urand(30000, 40000);
+
+            m_lBladesGuidList.clear();
+
+            // Reset boss
+            m_creature->SetLevitate(false);
+            SetCombatMovement(true);
+
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_UNEQUIP, EQUIP_NO_CHANGE);
+        }
+
+        void GetAIInformation(ChatHandler& reader) override
+        {
+            reader.PSendSysMessage("Boss Illidan, current uiPhase = %u", m_uiPhase);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ILLIDAN, IN_PROGRESS);
+            }
+        }
+
+        // Do not attack using LoS function. The attack is triggered in script
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ILLIDAN, FAIL);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ILLIDAN, DONE);
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, m_creature);
+        }
+
+        void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override
+        {
+            if (uiDamage < m_creature->GetHealth())
+            {
+                return;
+            }
+
+            // Make sure it won't die by accident
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+            {
+                uiDamage = 0;
+                return;
+            };
+
+            uiDamage = 0;
+            m_creature->InterruptNonMeleeSpells(true);
+            m_creature->SetHealth(1);
+            m_creature->StopMoving();
+            m_creature->RemoveAllAurasOnDeath();
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            m_creature->ClearAllReactives();
+
+            DoCastSpellIfCan(m_creature, SPELL_DEATH, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_TELEPORT_MAIEV, CAST_TRIGGERED);
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MoveIdle();
+
+            // Signal Maiev to start the outro dialogue
+            if (m_pInstance)
+            {
+                if (Creature* pMaiev = m_pInstance->GetSingleCreatureFromStorage(NPC_MAIEV_SHADOWSONG))
+                {
+                    pMaiev->AI()->KilledUnit(m_creature);
+                }
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case NPC_AKAMA:
+                if (m_pInstance)
+                {
+                    if (Creature* pAkama = m_pInstance->GetSingleCreatureFromStorage(NPC_AKAMA))
+                    {
+                        m_creature->SetFacingToObject(pAkama);
+                    }
+                }
+                m_creature->RemoveAurasDueToSpell(SPELL_KNEEL_INTRO);
+                break;
+            case EMOTE_ONESHOT_QUESTION:
+            case DUMMY_EMOTE_ID_1:
+            case DUMMY_EMOTE_ID_2:
+            case DUMMY_EMOTE_ID_3:
+                m_creature->HandleEmote(EMOTE_ONESHOT_QUESTION);
+                break;
+            case EQUIP_ID_MAIN_HAND:
+                SetEquipmentSlots(false, EQUIP_ID_MAIN_HAND, EQUIP_ID_OFF_HAND, EQUIP_NO_CHANGE);
+                break;
+            case NPC_ILLIDAN_STORMRAGE:
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                m_creature->SetInCombatWithZone();
+                if (m_pInstance)
+                {
+                    if (Creature* pAkama = m_pInstance->GetSingleCreatureFromStorage(NPC_AKAMA))
+                    {
+                        pAkama->AI()->AttackStart(m_creature);
+                        AttackStart(pAkama);
+                    }
+                }
+                break;
+            case SAY_AKAMA_LEAVE:
+                DoResetThreat();
+                if (m_pInstance)
+                {
+                    // Remove Akama from threat list and allow him to fight the Illidari elites
+                    if (Creature* pAkama = m_pInstance->GetSingleCreatureFromStorage(NPC_AKAMA))
+                    {
+                        pAkama->AI()->EnterEvadeMode();
+                        m_creature->GetThreatManager().modifyThreatPercent(pAkama, -101);
+                    }
+                }
+                break;
+            case SPELL_SUMMMON_MAIEV:
+                DoCastSpellIfCan(m_creature, SPELL_SUMMMON_MAIEV);
+                break;
+            case EMOTE_ONESHOT_EXCLAMATION:
+                if (m_pInstance)
+                {
+                    if (Creature* pMaiev = m_pInstance->GetSingleCreatureFromStorage(NPC_MAIEV_SHADOWSONG))
+                    {
+                        pMaiev->HandleEmote(EMOTE_ONESHOT_EXCLAMATION);
+                    }
+                }
+                break;
+            case EMOTE_ONESHOT_YES:
+                if (m_pInstance)
+                {
+                    if (Creature* pMaiev = m_pInstance->GetSingleCreatureFromStorage(NPC_MAIEV_SHADOWSONG))
+                    {
+                        pMaiev->HandleEmote(EMOTE_ONESHOT_YES);
+                    }
+                }
+                break;
+            case NPC_MAIEV_SHADOWSONG:
+                // Resume combat and attack Maiev
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->SetTargetGuid(m_creature->getVictim()->GetObjectGuid());
+                SetCombatMovement(false);
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                if (m_pInstance)
+                {
+                    if (Creature* pMaiev = m_pInstance->GetSingleCreatureFromStorage(NPC_MAIEV_SHADOWSONG))
+                    {
+                        pMaiev->AI()->AttackStart(m_creature);
+                    }
+                }
+                m_uiPhase = PHASE_MAIEV;
+                m_uiTransformTimer = 60000;
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_FLAME_CRASH:
+                pSummoned->CastSpell(pSummoned, SPELL_FLAME_CRASH_EFFECT, false);
+                break;
+            case NPC_BLADE_OF_AZZINOTH:
+                pSummoned->CastSpell(pSummoned, SPELL_RANGE_MARKER, true);
+                pSummoned->CastSpell(pSummoned, SPELL_SUMMON_TEAR_AZZINOTH, true);
+                m_lBladesGuidList.push_back(pSummoned->GetObjectGuid());
+                break;
+            case NPC_ILLIDAN_TARGET:
+                pSummoned->SetWalk(false);
+                pSummoned->CastSpell(pSummoned, SPELL_EYE_BLAST_TRIGGER, true);
+                pSummoned->GetMotionMaster()->MovePoint(0, m_fTargetMoveX, m_fTargetMoveY, m_fTargetMoveZ);
+                DoCastSpellIfCan(pSummoned, SPELL_EYE_BLAST_DUMMY, CAST_TRIGGERED);
+                break;
+            case NPC_SHADOW_DEMON:
+                pSummoned->CastSpell(pSummoned, SPELL_SHADOW_DEMON_PASSIVE, true);
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_PARALYZE, SELECT_FLAG_PLAYER))
+                {
+                    // Dummy attack function - used only to set the target
+                    pSummoned->AI()->AttackStart(pTarget);
+                    pSummoned->CastSpell(pTarget, SPELL_PARALYZE, true);
+
+                    // Move towards target (which is stunned)
+                    float fX, fY, fZ;
+                    pTarget->GetContactPoint(pSummoned, fX, fY, fZ);
+                    pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                }
+                break;
+            case NPC_MAIEV_SHADOWSONG:
+                pSummoned->SetFacingToObject(m_creature);
+                m_creature->SetTargetGuid(pSummoned->GetObjectGuid());
+                break;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit* /*pInvoker*/, uint32 /*data*/) override
+        {
+            switch (eventType)
+            {
+            case AI_EVENT_CUSTOM_A:
+                if (pSender->GetEntry() == NPC_AKAMA)
+                    DoStartCombatEvent();
+                break;
+            case AI_EVENT_CUSTOM_B:
+                if (pSender->GetEntry() == NPC_BLADE_OF_AZZINOTH)
+                    DoInformFlameKilled();
+                break;
+            default:
+                break;
+            }
+        }
+
+        // Wrapper to start the combat dialogue
+        void DoStartCombatEvent() { StartNextDialogueText(NPC_AKAMA); }
+
+        // Wrapper to land Illidan when both flames are killed
+        void DoInformFlameKilled()
+        {
+            // Land Illidan if both Flames are killed
+            ++m_uiFlameAzzinothKilled;
+
+            if (m_uiFlameAzzinothKilled == MAX_FLAME_AZZINOTH)
+            {
+                m_uiLandTimer = 5000;
+                m_uiPhase = PHASE_TRANSITION;
+                m_creature->InterruptNonMeleeSpells(false);
+            }
+        }
+
+        // Wrapper to handle the Eye Blast cast
+        bool DoCastEyeBlastIfCan()
+        {
+            if (m_creature->IsNonMeleeSpellCasted(false))
+            {
+                return false;
+            }
+
+            DoScriptText(SAY_EYE_BLAST, m_creature);
+
+            // Set spawn and target loc
+            uint8 uiSpawnLoc = urand(0, 3);
+            uint8 uiTargetLoc = 0;
+            switch (uiSpawnLoc)
+            {
+            case 0: uiTargetLoc = urand(4, 5); break;
+            case 1: uiTargetLoc = urand(6, 7); break;
+            case 2: uiTargetLoc = urand(0, 1) ? 5 : 8; break;
+            case 3: uiTargetLoc = urand(7, 8); break;
+            }
+
+            m_fTargetMoveX = aEyeBlastPos[uiTargetLoc].fX;
+            m_fTargetMoveY = aEyeBlastPos[uiTargetLoc].fY;
+            m_fTargetMoveZ = aEyeBlastPos[uiTargetLoc].fZ;
+            m_creature->SummonCreature(NPC_ILLIDAN_TARGET, aEyeBlastPos[uiSpawnLoc].fX, aEyeBlastPos[uiSpawnLoc].fY, aEyeBlastPos[uiSpawnLoc].fZ, 0, TEMPSUMMON_TIMED_DESPAWN, 15000);
+
+            return true;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Make Akama evade combat at 85%
+            if (!m_bHasSummonedElites && m_creature->GetHealthPercent() < 85.0f)
+            {
+                StartNextDialogueText(SAY_ILLIDAN_MINION);
+                m_bHasSummonedElites = true;
+            }
+
+            // Phase 1 to 2 transition
+            if (m_uiPhase == PHASE_AKAMA && m_creature->GetHealthPercent() < 65.0f)
+            {
+                DoScriptText(SAY_TAKEOFF, m_creature);
+                m_uiSummonBladesTimer = 10000;
+                m_uiCenterMoveTimer = 2000;
+                m_uiPhase = PHASE_BLADES;
+
+                m_creature->RemoveAllAuras();
+                m_creature->SetLevitate(true);
+                SetCombatMovement(false);
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->HandleEmote(EMOTE_ONESHOT_LIFTOFF);
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                return;
+            }
+
+            // Summon Maiev at 30% hp
+            if (m_uiPhase == PHASE_DUAL_NORMAL && m_creature->GetHealthPercent() <= 30.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_PRISON, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                {
+                    StartNextDialogueText(SAY_ILLIDAN_SPEECH_6);
+                    m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                    SetCombatMovement(false);
+                    m_creature->GetMotionMaster()->Clear();
+                    m_creature->GetMotionMaster()->MoveIdle();
+
+                    m_uiPhase = PHASE_TRANSITION;
+                    m_uiTransformTimer = 0;
+                }
+                return;
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_BERSERK, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            switch (m_uiPhase)
+            {
+            case PHASE_MAIEV:
+
+                // Phase 5 spell only
+                if (m_uiEnrageTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                    {
+                        DoScriptText(SAY_FRENZY, m_creature);
+                        m_uiEnrageTimer = 40000;
+                    }
+                }
+                else
+                {
+                    m_uiEnrageTimer -= uiDiff;
+                }
+
+                if (m_uiTrapTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_CAGE_TRAP) == CAST_OK)
+                    {
+                        m_uiTrapTimer = urand(40000, 50000);
+                    }
+                }
+                else
+                {
+                    m_uiTrapTimer -= uiDiff;
+                }
+
+                // no break;
+            case PHASE_DUAL_NORMAL:
+
+                // Phase 3 and 5 spells
+                if (m_uiAgonizingFlamesTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_AGONIZING_FLAMES) == CAST_OK)
+                    {
+                        m_uiAgonizingFlamesTimer = 60000;
+                    }
+                }
+                else
+                {
+                    m_uiAgonizingFlamesTimer -= uiDiff;
+                }
+
+                if (m_uiTransformTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DEMON_TRANSFORM_1) == CAST_OK)
+                    {
+                        DoScriptText(SAY_MORPH, m_creature);
+
+                        m_uiPrevPhase = m_uiPhase;
+                        m_uiPhase = PHASE_TRANSITION;
+                        m_uiTransformTimer = 12500;
+                        m_uiFlameBurstTimer = 10000;
+                        m_uiShadowDemonTimer = 30000;
+
+                        SetCombatMovement(false);
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MoveIdle();
+                    }
+                }
+                else
+                {
+                    m_uiTransformTimer -= uiDiff;
+                }
+
+                // no break;
+            case PHASE_AKAMA:
+
+                if (m_uiShearTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHEAR) == CAST_OK)
+                    {
+                        m_uiShearTimer = urand(10000, 15000);
+                    }
+                }
+                else
+                {
+                    m_uiShearTimer -= uiDiff;
+                }
+
+                if (m_uiFlameCrashTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FLAME_CRASH) == CAST_OK)
+                    {
+                        m_uiFlameCrashTimer = urand(25000, 35000);
+                    }
+                }
+                else
+                {
+                    m_uiFlameCrashTimer -= uiDiff;
+                }
+
+                if (m_uiShadowFiendTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_PARASITIC_SHADOWFIEND, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_PARASITIC_SHADOWFIEND) == CAST_OK)
+                        {
+                            m_uiShadowFiendTimer = 40000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiShadowFiendTimer -= uiDiff;
+                }
+
+                if (m_uiDrawSoulTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DRAW_SOUL) == CAST_OK)
+                    {
+                        m_uiDrawSoulTimer = 35000;
+                    }
+                }
+                else
+                {
+                    m_uiDrawSoulTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+
+                break;
+            case PHASE_BLADES:
+
+                if (m_uiCenterMoveTimer)
+                {
+                    if (m_uiCenterMoveTimer <= uiDiff)
+                    {
+                        // The movement is not very clear - it may be possible that he is moving around the center during this phase
+                        // ToDo: this requires additional resarch. For now bring him near home position
+                        m_creature->GetMotionMaster()->MovePoint(0, aCenterLoc[0].fX, aCenterLoc[0].fY, aCenterLoc[0].fZ);
+                        m_uiCenterMoveTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiCenterMoveTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiSummonBladesTimer)
+                {
+                    if (m_uiSummonBladesTimer <= uiDiff)
+                    {
+                        if (m_pInstance)
+                        {
+                            // Need to provide explicit glaive targets
+                            Creature* pGlaive1 = m_pInstance->instance->GetCreature(ObjectGuid(m_pInstance->GetData64(TYPE_GLAIVE_1)));
+                            Creature* pGlaive2 = m_pInstance->instance->GetCreature(ObjectGuid(m_pInstance->GetData64(TYPE_GLAIVE_2)));
+                            if (!pGlaive1 || !pGlaive2)
+                            {
+                                return;
+                            }
+
+                            // Summon both blades and remove them from equipment
+                            if (DoCastSpellIfCan(pGlaive1, SPELL_THROW_GLAIVE_VISUAL) == CAST_OK)
+                            {
+                                DoCastSpellIfCan(pGlaive2, SPELL_THROW_GLAIVE, CAST_TRIGGERED);
+                                SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_UNEQUIP, EQUIP_NO_CHANGE);
+                                m_uiSummonBladesTimer = 0;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiSummonBladesTimer -= uiDiff;
+                    }
+
+                    // no other spells during takeoff
+                    return;
+                }
+
+                if (m_uiFireballTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_FIREBALL) == CAST_OK)
+                        {
+                            m_uiFireballTimer = urand(2000, 3000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiFireballTimer -= uiDiff;
+                }
+
+                if (m_uiDarkBarrageTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_DARK_BARRAGE) == CAST_OK)
+                        {
+                            m_uiDarkBarrageTimer = 45000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiDarkBarrageTimer -= uiDiff;
+                }
+
+                if (m_uiEyeBlastTimer < uiDiff)
+                {
+                    if (DoCastEyeBlastIfCan())
+                    {
+                        m_uiEyeBlastTimer = urand(35000, 45000);
+                        m_uiFireballTimer = 15000;
+                    }
+                }
+                else
+                {
+                    m_uiEyeBlastTimer -= uiDiff;
+                }
+
+                break;
+            case PHASE_DUAL_DEMON:
+
+                // Handle phase transition at 30%
+                if (m_uiPrevPhase == PHASE_DUAL_NORMAL && m_creature->GetHealthPercent() <= 30.0f)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DEMON_TRANSFORM_1) == CAST_OK)
+                    {
+                        m_uiTransformTimer = 12500;
+                        m_uiPhase = PHASE_TRANSITION;
+
+                        SetCombatMovement(true);
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    }
+                }
+
+                if (m_uiTransformTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DEMON_TRANSFORM_1) == CAST_OK)
+                    {
+                        m_uiTransformTimer = 12500;
+                        m_uiPhase = PHASE_TRANSITION;
+
+                        SetCombatMovement(true);
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    }
+                }
+                else
+                {
+                    m_uiTransformTimer -= uiDiff;
+                }
+
+                if (m_uiShadowDemonTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_SHADOW_DEMONS) == CAST_OK)
+                    {
+                        m_uiShadowDemonTimer = 60000;
+                    }
+                }
+                else
+                {
+                    m_uiShadowDemonTimer -= uiDiff;
+                }
+
+                if (m_uiShadowBlastTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_BLAST) == CAST_OK)
+                        {
+                            m_uiShadowBlastTimer = urand(2000, 3000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiShadowBlastTimer -= uiDiff;
+                }
+
+                if (m_uiFlameBurstTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FLAME_BURST) == CAST_OK)
+                    {
+                        m_uiFlameBurstTimer = 20000;
+                    }
+                }
+                else
+                {
+                    m_uiFlameBurstTimer -= uiDiff;
+                }
+
+                break;
+            case PHASE_TRANSITION:
+
+                if (m_uiLandTimer)
+                {
+                    if (m_uiLandTimer <= uiDiff)
+                    {
+                        switch (m_uiLandStage)
+                        {
+                        case 0:
+                            // Despawn the blades
+                            for (GuidList::const_iterator itr = m_lBladesGuidList.begin(); itr != m_lBladesGuidList.end(); ++itr)
+                            {
+                                if (Creature* pBlade = m_creature->GetMap()->GetCreature(*itr))
+                                {
+                                    pBlade->CastSpell(m_creature, SPELL_GLAIVE_RETURNS, true);
+                                    pBlade->ForcedDespawn(500);
+                                }
+                            }
+                            m_uiLandTimer = 5000;
+                            break;
+                        case 1:
+                            // Set the equipment and land
+                            SetEquipmentSlots(false, EQUIP_ID_MAIN_HAND, EQUIP_ID_OFF_HAND, EQUIP_NO_CHANGE);
+
+                            m_creature->SetLevitate(false);
+                            m_creature->HandleEmote(EMOTE_ONESHOT_LAND);
+                            m_uiLandTimer = 2000;
+                            break;
+                        case 2:
+                            // Start phase 3
+                            DoResetThreat();
+                            m_uiPhase = PHASE_DUAL_NORMAL;
+
+                            SetCombatMovement(true);
+                            m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                            m_uiTransformTimer = 64000;
+                            m_uiLandTimer = 0;
+                            break;
+                        }
+                        ++m_uiLandStage;
+                    }
+                    else
+                    {
+                        m_uiLandTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiTransformTimer)
+                {
+                    if (m_uiTransformTimer <= uiDiff)
+                    {
+                        // Drop the transform time from the spell timers
+                        if (m_creature->HasAura(SPELL_DEMON_FORM))
+                        {
+                            DoResetThreat();
+                            m_uiPhase = PHASE_DUAL_DEMON;
+                            m_uiShadowDemonTimer = 17000;
+                            m_uiFlameBurstTimer = 7000;
+                            m_uiTransformTimer = 47000;
+                        }
+                        else
+                        {
+                            m_uiPhase = m_uiPrevPhase;
+                            m_uiEnrageTimer = 40000;
+                            m_uiTransformTimer = 60000;
+                            m_uiTrapTimer = urand(30000, 40000);
+                        }
+                    }
+                    else
+                    {
+                        m_uiTransformTimer -= uiDiff;
+                    }
+                }
+
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_illidan_stormrageAI(pCreature);
+    }
+};
+
+/*######
+## npc_akama_illidan
+######*/
+
+struct npc_akama_illidan : public CreatureScript
+{
+    npc_akama_illidan() : CreatureScript("npc_akama_illidan") {}
+
+    struct npc_akama_illidanAI : public npc_escortAI, private DialogueHelper
+    {
+        npc_akama_illidanAI(Creature* pCreature) : npc_escortAI(pCreature),
+        DialogueHelper(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiSummonMinionTimer;
+        uint32 m_uiHealDelayTimer;
+        uint32 m_uiChainLightningTimer;
+
+        bool m_bFightMinions;
+        bool m_bIsIntroFinished;
+
+        void Reset() override
+        {
+            m_uiSummonMinionTimer = 2000;
+            m_uiHealDelayTimer = 0;
+            m_uiChainLightningTimer = urand(5000, 10000);
+
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_bFightMinions = false;
+                m_bIsIntroFinished = false;
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                return;
+            }
+
+            // Star the event
+            if (pWho->GetTypeId() == TYPEID_PLAYER && pWho->IsWithinDistInMap(m_creature, 70.0f) && pWho->IsWithinLOSInMap(m_creature))
+            {
+                Start(true);
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            // Don't attack Illidan again
+            if (m_bIsIntroFinished && pWho->GetEntry() == NPC_ILLIDAN_STORMRAGE)
+            {
+                return;
+            }
+
+            npc_escortAI::AttackStart(pWho);
+        }
+
+        void EnterEvadeMode() override
+        {
+            // Called first when evading from Illidan
+            if (!m_bIsIntroFinished)
+            {
+                SetEscortPaused(false);
+                m_bIsIntroFinished = true;
+            }
+
+            // Go back to epilogue position
+            if (m_pInstance && m_pInstance->GetData(TYPE_ILLIDAN) == DONE)
+            {
+                SetEscortPaused(false);
+                m_bFightMinions = false;
+            }
+
+            npc_escortAI::EnterEvadeMode();
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                SetEscortPaused(true);
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                break;
+            case 9:
+                SetEscortPaused(true);
+                if (m_pInstance)
+                {
+                    if (Creature* pTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_ILLIDAN_DOOR_TRIGGER))
+                    {
+                        m_creature->SetFacingToObject(pTrigger);
+                    }
+                }
+                StartNextDialogueText(SAY_AKAMA_OPEN_DOOR_1);
+                break;
+            case 16:
+                SetEscortPaused(true);
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                if (m_pInstance)
+                {
+                    if (Creature* pIllidan = m_pInstance->GetSingleCreatureFromStorage(NPC_ILLIDAN_STORMRAGE))
+                    {
+                        m_creature->SetFacingToObject(pIllidan);
+                    }
+                }
+                break;
+            case 17:
+                SetEscortPaused(true);
+                if (m_pInstance)
+                {
+                    if (Creature* pIllidan = m_pInstance->GetSingleCreatureFromStorage(NPC_ILLIDAN_STORMRAGE))
+                    {
+                        SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pIllidan);
+
+                        m_creature->SetFacingToObject(pIllidan);
+                    }
+                }
+                break;
+            case 24:
+                SetEscortPaused(true);
+                m_bFightMinions = true;
+                break;
+            case 30:
+                SetEscortPaused(true);
+                if (m_pInstance)
+                {
+                    // Move to a close point to Illidan
+                    if (Creature* pIllidan = m_pInstance->GetSingleCreatureFromStorage(NPC_ILLIDAN_STORMRAGE))
+                    {
+                        float fX, fY, fZ;
+                        pIllidan->GetContactPoint(m_creature, fX, fY, fZ);
+                        m_creature->GetMotionMaster()->MovePoint(100, fX, fY, fZ);
+                    }
+                }
+                break;
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            npc_escortAI::MovementInform(uiMoveType, uiPointId);
+
+            if (uiMoveType != POINT_MOTION_TYPE || uiPointId != 100)
+            {
+                return;
+            }
+
+            // Do outro
+            if (m_pInstance)
+            {
+                if (Creature* pIllidan = m_pInstance->GetSingleCreatureFromStorage(NPC_ILLIDAN_STORMRAGE))
+                {
+                    m_creature->SetFacingToObject(pIllidan);
+                }
+            }
+
+            DoScriptText(SAY_AKAMA_EPILOGUE_5, m_creature);
+            m_creature->ForcedDespawn(10000);
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case SPELL_AKAMA_DOOR_FAIL:
+                DoCastSpellIfCan(m_creature, SPELL_AKAMA_DOOR_FAIL);
+                break;
+            case NPC_SPIRIT_OF_OLUM:
+                m_creature->SummonCreature(NPC_SPIRIT_OF_OLUM, 751.64f, 297.22f, 312.21f, 6.03f, TEMPSUMMON_TIMED_DESPAWN, 25000);
+                m_creature->SummonCreature(NPC_SPIRIT_OF_UDALO, 751.47f, 311.01f, 312.19f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 25000);
+                break;
+            case SPELL_AKAMA_DOOR_CHANNEL:
+                DoCastSpellIfCan(m_creature, SPELL_AKAMA_DOOR_CHANNEL);
+                if (m_pInstance)
+                {
+                    if (Creature* pOlum = m_pInstance->GetSingleCreatureFromStorage(NPC_SPIRIT_OF_OLUM))
+                    {
+                        pOlum->CastSpell(pOlum, SPELL_DEATHSWORN_DOOR_CHANNEL, true);
+                    }
+                    if (Creature* pUdalo = m_pInstance->GetSingleCreatureFromStorage(NPC_SPIRIT_OF_UDALO))
+                    {
+                        pUdalo->CastSpell(pUdalo, SPELL_DEATHSWORN_DOOR_CHANNEL, true);
+                    }
+                }
+                break;
+            case GO_ILLIDAN_GATE:
+                if (m_pInstance)
+                {
+                    m_pInstance->DoUseDoorOrButton(GO_ILLIDAN_GATE);
+                }
+                break;
+            case NPC_SPIRIT_OF_UDALO:
+                SetEscortPaused(false);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_ILLIDARI_ELITE:
+                pSummoned->AI()->AttackStart(m_creature);
+                break;
+            case NPC_SPIRIT_OF_OLUM:
+            case NPC_SPIRIT_OF_UDALO:
+                pSummoned->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                break;
+            }
+        }
+
+        // Wrapper to handle event resume
+        void DoResumeEvent()
+        {
+            SetEscortPaused(false);
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (m_bFightMinions)
+            {
+                if (m_uiSummonMinionTimer < uiDiff)
+                {
+                    for (uint8 i = 0; i < MAX_ILLIDARI_ELITES; ++i)
+                    {
+                        m_creature->SummonCreature(NPC_ILLIDARI_ELITE, aIllidariElitesPos[i].fX, aIllidariElitesPos[i].fY, aIllidariElitesPos[i].fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                    }
+
+                    m_uiSummonMinionTimer = urand(35000, 50000);
+                }
+                else
+                {
+                    m_uiSummonMinionTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiHealDelayTimer)
+            {
+                if (m_uiHealDelayTimer <= uiDiff)
+                {
+                    m_uiHealDelayTimer = 0;
+                }
+                else
+                {
+                    m_uiHealDelayTimer -= uiDiff;
+                }
+            }
+
+            if (m_bFightMinions)
+            {
+                if (m_uiChainLightningTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CHAIN_LIGHTNING) == CAST_OK)
+                    {
+                        m_uiChainLightningTimer = urand(4000, 8000);
+                    }
+                }
+                else
+                {
+                    m_uiChainLightningTimer -= uiDiff;
+                }
+            }
+
+            if (m_creature->GetHealthPercent() < 10.0f && !m_uiHealDelayTimer)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_HEALING_POTION) == CAST_OK)
+                {
+                    m_uiHealDelayTimer = 30000;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        // Before climbing the stairs
+        if (pCreature->GetPositionZ() < 300.0f)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_PREPARE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_AKAMA_ILLIDAN_PREPARE, pCreature->GetObjectGuid());
+        }
+        // Before starting combat
+        else
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START_EVENT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_AKAMA_ILLIDAN_START, pCreature->GetObjectGuid());
+        }
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1 || GOSSIP_ACTION_INFO_DEF + 2)
+        {
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+            if (npc_akama_illidanAI* pAkamaAI = dynamic_cast<npc_akama_illidanAI*>(pCreature->AI()))
+            {
+                pAkamaAI->DoResumeEvent();
+            }
+        }
+
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_akama_illidanAI(pCreature);
+    }
+};
+
+/*######
+## boss_maiev
+######*/
+
+struct boss_maiev : public CreatureScript
+{
+    boss_maiev() : CreatureScript("boss_maiev_shadowsong") {}
+
+    struct boss_maievAI : public ScriptedAI, private DialogueHelper
+    {
+        boss_maievAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aEpilogueDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+        };
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiTauntTimer;
+        uint32 m_uiShadowStriketimer;
+        uint32 m_uiThrowDaggerTimer;
+
+        bool m_bHasYelledTrap;
+
+        void Reset() override
+        {
+            m_uiTauntTimer = urand(40000, 60000);
+            m_uiShadowStriketimer = urand(4000, 8000);
+            m_uiThrowDaggerTimer = urand(6000, 10000);
+            m_bHasYelledTrap = false;
+
+            // Not sure if this is correct, but she seems to ignore all the shadow damage inflicted
+            m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, true);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            // Dummy function - used to start the epilogue
+            if (pVictim->GetEntry() == NPC_ILLIDAN_STORMRAGE)
+            {
+                StartNextDialogueText(SAY_MAIEV_EPILOGUE_1);
+            }
+        }
+
+        // Custom evade - don't allow her to return to home position
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        // Attack only by script
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case NPC_ILLIDAN_STORMRAGE:
+                if (m_pInstance)
+                {
+                    if (Creature* pIllidan = m_pInstance->GetSingleCreatureFromStorage(NPC_ILLIDAN_STORMRAGE))
+                    {
+                        pIllidan->DealDamage(pIllidan, pIllidan->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                    }
+                }
+                break;
+            case SPELL_TELEPORT_VISUAL:
+                if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT_VISUAL) == CAST_OK)
+                {
+                    m_creature->ForcedDespawn(1000);
+                }
+                break;
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_CAGE_TRAP)
+            {
+                // Yell only the first time
+                if (!m_bHasYelledTrap)
+                {
+                    DoScriptText(SAY_MAIEV_TRAP, m_creature);
+                    m_bHasYelledTrap = true;
+                }
+                DoCastSpellIfCan(m_creature, SPELL_CAGE_TRAP_SUMMON, CAST_TRIGGERED);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiTauntTimer < uiDiff)
+            {
+                switch (urand(0, 2))
+                {
+                case 0: DoScriptText(SAY_MAIEV_TAUNT_1, m_creature); break;
+                case 1: DoScriptText(SAY_MAIEV_TAUNT_2, m_creature); break;
+                case 2: DoScriptText(SAY_MAIEV_TAUNT_3, m_creature); break;
+                }
+                m_uiTauntTimer = urand(40000, 60000);
+            }
+            else
+            {
+                m_uiTauntTimer -= uiDiff;
+            }
+
+            if (m_uiShadowStriketimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHADOW_STRIKE) == CAST_OK)
+                {
+                    m_uiShadowStriketimer = urand(12000, 16000);
+                }
+            }
+            else
+            {
+                m_uiShadowStriketimer -= uiDiff;
+            }
+
+            if (m_uiThrowDaggerTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_THROW_DAGGER) == CAST_OK)
+                {
+                    m_uiThrowDaggerTimer = urand(6000, 10000);
+                }
+            }
+            else
+            {
+                m_uiThrowDaggerTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_maievAI(pCreature);
+    }
+};
+
+/*######
+## npc_cage_trap_trigger
+######*/
+
+struct npc_cage_trap_trigger : public CreatureScript
+{
+    npc_cage_trap_trigger() : CreatureScript("mob_cage_trap_trigger") {}
+
+    struct npc_cage_trap_triggerAI : public ScriptedAI
+    {
+        npc_cage_trap_triggerAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        bool m_bActive;
+
+        void Reset() override
+        {
+            m_bActive = false;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bActive && pWho->GetEntry() == NPC_ILLIDAN_STORMRAGE && m_creature->IsWithinDistInMap(pWho, 3.0f))
+            {
+                pWho->CastSpell(pWho, SPELL_CAGED, true);
+
+                // Cast the visual effects
+                for (uint8 i = 0; i < MAX_CAGE_SPELLS; ++i)
+                {
+                    DoCastSpellIfCan(m_creature, aCagedSummonSpells[i], CAST_TRIGGERED);
+                }
+
+                for (uint8 i = 0; i < MAX_CAGE_SPELLS; ++i)
+                {
+                    DoCastSpellIfCan(m_creature, aCagedVisualSpells[i], CAST_TRIGGERED);
+                }
+
+                if (GameObject* pCageTrap = GetClosestGameObjectWithEntry(m_creature, GO_CAGE_TRAP, 5.0f))
+                {
+                    pCageTrap->Use(m_creature);
+                }
+
+                m_bActive = true;
+                m_creature->ForcedDespawn(15000);
+            }
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_cage_trap_triggerAI(pCreature);
+    }
+};
+
+/*######
+## npc_flame_of_azzinoth
+######*/
+
+struct npc_flame_of_azzinoth : public CreatureScript
+{
+    npc_flame_of_azzinoth() : CreatureScript("mob_flame_of_azzinoth") {}
+
+    struct npc_flame_of_azzinothAI : public ScriptedAI
+    {
+        npc_flame_of_azzinothAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiFlameBlastTimer;
+        uint32 m_uiSummonBlazeTimer;
+        uint32 m_uiChargeTimer;
+        uint32 m_uiWrathCheckTimer;
+
+        void Reset() override
+        {
+            m_uiFlameBlastTimer = 10000;
+            m_uiSummonBlazeTimer = 0;
+            m_uiChargeTimer = 5000;
+            m_uiWrathCheckTimer = 1000;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_BLAZE)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_BLAZE_EFFECT, false);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiFlameBlastTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FLAME_BLAST) == CAST_OK)
+                {
+                    m_uiFlameBlastTimer = 10000;
+                    m_uiSummonBlazeTimer = 3000;
+                }
+            }
+            else
+            {
+                m_uiFlameBlastTimer -= uiDiff;
+            }
+
+            if (m_uiSummonBlazeTimer)
+            {
+                if (m_uiSummonBlazeTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BLAZE) == CAST_OK)
+                    {
+                        m_uiSummonBlazeTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiSummonBlazeTimer -= uiDiff;
+                }
+            }
+
+            // Workaround for broken aura 41997; the creature should enrage if not within dist of 30 from summoner
+            // This should be done by checking if aura 41997 is removed from self, when getting out of range
+            if (m_uiWrathCheckTimer)
+            {
+                if (m_uiWrathCheckTimer <= uiDiff)
+                {
+                    if (GetClosestCreatureWithEntry(m_creature, NPC_BLADE_OF_AZZINOTH, 30.0f))
+                    {
+                        m_uiWrathCheckTimer = 1000;
+                    }
+                    else
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_UNCAGED_WRATH, CAST_TRIGGERED) == CAST_OK)
+                        {
+                            m_uiWrathCheckTimer = 0;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiWrathCheckTimer -= uiDiff;
+                }
+            }
+
+            // Try to find a suitable target to charge
+            if (m_uiChargeTimer < uiDiff)
+            {
+                std::vector<Unit*> suitableTargets;
+                ThreatList const& threatList = m_creature->GetThreatManager().getThreatList();
+
+                for (ThreatList::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
+                {
+                    if (Unit* pTarget = m_creature->GetMap()->GetUnit((*itr)->getUnitGuid()))
+                    {
+                        if (pTarget->GetTypeId() == TYPEID_PLAYER && !pTarget->IsWithinDist(m_creature, 30.0f))
+                        {
+                            suitableTargets.push_back(pTarget);
+                        }
+                    }
+                }
+
+                if (suitableTargets.empty())
+                {
+                    m_uiChargeTimer = 3000;
+                }
+                else
+                {
+                    Unit* pTarget = suitableTargets[urand(0, suitableTargets.size() - 1)];
+
+                    if (pTarget)
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_CHARGE) == CAST_OK)
+                        {
+                            m_uiChargeTimer = urand(5000, 10000);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                m_uiChargeTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_flame_of_azzinothAI(pCreature);
+    }
+};
+
+/*######
+## npc_shadow_demon
+######*/
+
+struct npc_shadow_demon : public CreatureScript
+{
+    npc_shadow_demon() : CreatureScript("mob_shadow_demon") {}
+
+    struct npc_shadow_demonAI : public ScriptedAI
+    {
+        npc_shadow_demonAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_targetGuid;
+
+        void AttackStart(Unit* pWho) override
+        {
+            // Function used to set target only - the npc doesn't really attack
+            m_targetGuid = pWho->GetObjectGuid();
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_targetGuid))
+            {
+                pPlayer->RemoveAurasDueToSpell(SPELL_PARALYZE);
+            }
+        }
+
+        void MovementInform(uint32 uiMovementType, uint32 uiPointId) override
+        {
+            if (uiMovementType != POINT_MOTION_TYPE || !uiPointId)
+            {
+                return;
+            }
+
+            if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_targetGuid))
+            {
+                if (DoCastSpellIfCan(pPlayer, SPELL_CONSUME_SOUL) == CAST_OK)
+                {
+                    m_creature->ForcedDespawn(1000);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_shadow_demonAI(pCreature);
+    }
+};
+
+/*######
+## npc_blade_of_azzinoth
+######*/
+
+struct npc_blade_of_azzinoth : public CreatureScript
+{
+    npc_blade_of_azzinoth() : CreatureScript("mob_blade_of_azzinoth") {}
+
+    struct npc_blade_of_azzinothAI : public ScriptedAI
+    {
+        npc_blade_of_azzinothAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        // Do-Nothing-But-Stand-There
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Summon a Flame pear each blade
+            if (pSummoned->GetEntry() == NPC_FLAME_OF_AZZINOTH)
+            {
+                DoCastSpellIfCan(pSummoned, SPELL_AZZINOTH_CHANNEL, CAST_TRIGGERED);
+                pSummoned->SetInCombatWithZone();
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // Inform Illidan when a flame is killed
+            if (pSummoned->GetEntry() == NPC_FLAME_OF_AZZINOTH)
+            {
+                if (!m_pInstance)
+                {
+                    return;
+                }
+
+                // For some reason it doesn't work with Spell Hit for SPELL_GLAIVE_RETURNS script effect, so we need to inform him manually
+                if (Creature* pIllidan = m_pInstance->GetSingleCreatureFromStorage(NPC_ILLIDAN_STORMRAGE))
+                {
+                    SendAIEvent(AI_EVENT_CUSTOM_B, m_creature, pIllidan);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_blade_of_azzinothAI(pCreature);
+    }
+};
+
+void AddSC_boss_illidan()
+{
+    Script* s;
+
+    s = new boss_illidan_stormrage();
+    s->RegisterSelf();
+    s = new npc_akama_illidan();
+    s->RegisterSelf();
+    s = new boss_maiev();
+    s->RegisterSelf();
+    s = new npc_flame_of_azzinoth();
+    s->RegisterSelf();
+    s = new npc_blade_of_azzinoth();
+    s->RegisterSelf();
+    s = new npc_cage_trap_trigger();
+    s->RegisterSelf();
+    s = new npc_shadow_demon();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_illidan_stormrage";
+    //pNewScript->GetAI = &GetAI_boss_illidan_stormrage;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_akama_illidan";
+    //pNewScript->GetAI = &GetAI_npc_akama_illidan;
+    //pNewScript->pGossipHello = &GossipHello_npc_akama_illidan;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_akama_illidan;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_maiev_shadowsong";
+    //pNewScript->GetAI = &GetAI_boss_maiev;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_flame_of_azzinoth";
+    //pNewScript->GetAI = &GetAI_mob_flame_of_azzinoth;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_blade_of_azzinoth";
+    //pNewScript->GetAI = &GetAI_npc_blade_of_azzinoth;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_cage_trap_trigger";
+    //pNewScript->GetAI = &GetAI_npc_cage_trap_trigger;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_shadow_demon";
+    //pNewScript->GetAI = &GetAI_npc_shadow_demon;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/black_temple/boss_mother_shahraz.cpp b/src/modules/SD3/scripts/outland/black_temple/boss_mother_shahraz.cpp
new file mode 100644
index 000000000..ea58c2329
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/black_temple/boss_mother_shahraz.cpp
@@ -0,0 +1,275 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Mother_Shahraz
+SD%Complete: 80
+SDComment: Saber Lash and Fatal Attraction need core support. Timers may need some tunning.
+SDCategory: Black Temple
+EndScriptData */
+
+#include "precompiled.h"
+#include "black_temple.h"
+
+enum
+{
+    // Speech'n'Sounds
+    SAY_TAUNT_1                 = -1564018,
+    SAY_TAUNT_2                 = -1564019,
+    SAY_TAUNT_3                 = -1564020,
+    SAY_AGGRO                   = -1564021,
+    SAY_SPELL_1                 = -1564022,
+    SAY_SPELL_2                 = -1564023,
+    SAY_SPELL_3                 = -1564024,
+    SAY_SLAY_1                  = -1564025,
+    SAY_SLAY_2                  = -1564026,
+    SAY_ENRAGE                  = -1564027,
+    SAY_DEATH                   = -1564028,
+
+    // Spells
+    SPELL_SINFUL_PERIODIC       = 40862,        // periodic triggers 40827
+    SPELL_SINISTER_PERIODIC     = 40863,        // periodic triggers 40859
+    SPELL_VILE_PERIODIC         = 40865,        // periodic triggers 40860
+    SPELL_WICKED_PERIODIC       = 40866,        // periodic triggers 40861
+    SPELL_FATAL_ATTRACTION      = 40869,        // dummy, triggers 41001
+    SPELL_SILENCING_SHRIEK      = 40823,
+    SPELL_SABER_LASH_PROC       = 40816,        // procs 40810 and 43690 on melee damage
+    SPELL_FRENZY                = 23537,
+    SPELL_BERSERK               = 45078,
+};
+
+static const uint32 aPrismaticAuras[] =
+{
+    40880,                                                  // Shadow
+    40882,                                                  // Fire
+    40883,                                                  // Nature
+    40891,                                                  // Arcane
+    40896,                                                  // Frost
+    40897,                                                  // Holy
+};
+
+static const uint32 aPeriodicBeams[] = {SPELL_SINFUL_PERIODIC, SPELL_SINISTER_PERIODIC, SPELL_VILE_PERIODIC, SPELL_WICKED_PERIODIC};
+
+struct boss_shahraz : public CreatureScript
+{
+    boss_shahraz() : CreatureScript("boss_mother_shahraz") {}
+
+    struct boss_shahrazAI : public ScriptedAI
+    {
+        boss_shahrazAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiBeamTimer;
+        uint32 m_uiPrismaticShieldTimer;
+        uint32 m_uiFatalAttractionTimer;
+        uint32 m_uiShriekTimer;
+        uint32 m_uiRandomYellTimer;
+        uint32 m_uiBerserkTimer;
+        uint8 m_uiCurrentBeam;
+
+        bool m_bIsEnraged;
+
+        void Reset() override
+        {
+            m_uiBeamTimer = urand(5000, 10000);
+            m_uiCurrentBeam = urand(0, 3);
+            m_uiPrismaticShieldTimer = 0;
+            m_uiFatalAttractionTimer = 25000;
+            m_uiShriekTimer = 30000;
+            m_uiRandomYellTimer = urand(70000, 110000);
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            m_bIsEnraged = false;
+
+            DoCastSpellIfCan(m_creature, SPELL_SABER_LASH_PROC);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SHAHRAZ, IN_PROGRESS);
+            }
+
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SHAHRAZ, FAIL);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SHAHRAZ, DONE);
+            }
+
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->GetHealthPercent() < 10.0f && !m_bIsEnraged)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                {
+                    DoScriptText(SAY_ENRAGE, m_creature);
+                    m_bIsEnraged = true;
+                }
+            }
+
+            // Randomly cast one beam.
+            if (m_uiBeamTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, aPeriodicBeams[m_uiCurrentBeam]) == CAST_OK)
+                {
+                    uint8 uiNextBeam = (m_uiCurrentBeam + urand(1, 3)) % 4;
+                    m_uiCurrentBeam = uiNextBeam;
+                    m_uiBeamTimer = urand(10000, 13000);
+                }
+            }
+            else
+            {
+                m_uiBeamTimer -= uiDiff;
+            }
+
+            // Random Prismatic Shield every 15 seconds.
+            if (m_uiPrismaticShieldTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, aPrismaticAuras[urand(0, 5)]) == CAST_OK)
+                {
+                    m_uiPrismaticShieldTimer = 15000;
+                }
+            }
+            else
+            {
+                m_uiPrismaticShieldTimer -= uiDiff;
+            }
+
+            if (m_uiFatalAttractionTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FATAL_ATTRACTION) == CAST_OK)
+                {
+                    switch (urand(0, 2))
+                    {
+                    case 0: DoScriptText(SAY_SPELL_1, m_creature); break;
+                    case 1: DoScriptText(SAY_SPELL_2, m_creature); break;
+                    case 2: DoScriptText(SAY_SPELL_3, m_creature); break;
+                    }
+                    m_uiFatalAttractionTimer = urand(30000, 40000);
+                }
+            }
+            else
+            {
+                m_uiFatalAttractionTimer -= uiDiff;
+            }
+
+            if (m_uiShriekTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SILENCING_SHRIEK) == CAST_OK)
+                {
+                    m_uiShriekTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiShriekTimer -= uiDiff;
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_ENRAGE, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            // Random taunts
+            if (m_uiRandomYellTimer < uiDiff)
+            {
+                switch (urand(0, 2))
+                {
+                case 0: DoScriptText(SAY_TAUNT_1, m_creature); break;
+                case 1: DoScriptText(SAY_TAUNT_2, m_creature); break;
+                case 2: DoScriptText(SAY_TAUNT_3, m_creature); break;
+                }
+
+                m_uiRandomYellTimer = urand(60000, 150000);
+            }
+            else
+            {
+                m_uiRandomYellTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_shahrazAI(pCreature);
+    }
+};
+
+void AddSC_boss_mother_shahraz()
+{
+    Script* s;
+
+    s = new boss_shahraz();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_mother_shahraz";
+    //pNewScript->GetAI = &GetAI_boss_shahraz;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/black_temple/boss_reliquary_of_souls.cpp b/src/modules/SD3/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
new file mode 100644
index 000000000..9c250d854
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
@@ -0,0 +1,830 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Reliquary_of_Souls
+SD%Complete: 90
+SDComment: Persistent Area Auras for each Essence (Aura of Suffering, Aura of Desire, Aura of Anger) requires core support.
+SDCategory: Black Temple
+EndScriptData */
+
+#include "precompiled.h"
+#include "black_temple.h"
+
+enum
+{
+    // Sound'n'speech
+    // Suffering
+    SUFF_SAY_FREED                  = -1564047,
+    SUFF_SAY_AGGRO                  = -1564048,
+    SUFF_SAY_SLAY1                  = -1564049,
+    SUFF_SAY_SLAY2                  = -1564050,
+    SUFF_SAY_FRENZY                 = -1564051,
+    SUFF_SAY_RECAP                  = -1564052,
+    SUFF_SAY_AFTER                  = -1564053,
+    EMOTE_BOSS_GENERIC_ENRAGED      = -1000006,
+
+    // Desire
+    DESI_SAY_FREED                  = -1564055,
+    DESI_SAY_SLAY1                  = -1564056,
+    DESI_SAY_SLAY2                  = -1564057,
+    DESI_SAY_SLAY3                  = -1564058,
+    DESI_SAY_SPEC                   = -1564059,
+    DESI_SAY_RECAP                  = -1564060,
+    DESI_SAY_AFTER                  = -1564061,
+
+    // Anger
+    ANGER_SAY_FREED                 = -1564062,
+    ANGER_SAY_FREED2                = -1564063,
+    ANGER_SAY_SLAY1                 = -1564064,
+    ANGER_SAY_SLAY2                 = -1564065,
+    ANGER_SAY_SPEC                  = -1564066,
+    ANGER_SAY_BEFORE                = -1564067,
+    ANGER_SAY_DEATH                 = -1564068,
+
+    // Spells
+    // Suffering
+    SPELL_AURA_OF_SUFFERING         = 41292,
+    SPELL_AURA_OF_SUFFERING_ARMOR   = 42017,
+    SPELL_SUFFERING_PASSIVE         = 41296,
+    SPELL_SUFFERING_PASSIVE_2       = 41623,
+    SPELL_FRENZY                    = 41305,
+    SPELL_SOUL_DRAIN                = 41303,
+
+    // Desire
+    SPELL_AURA_OF_DESIRE            = 41350,
+    SPELL_RUNE_SHIELD               = 41431,
+    SPELL_DEADEN                    = 41410,
+    SPELL_SPIRIT_SHOCK              = 41426,
+
+    // Anger
+    SPELL_AURA_OF_ANGER             = 41337,
+    SPELL_SEETHE                    = 41364,
+    SPELL_SOUL_SCREAM               = 41545,
+    SPELL_SPITE                     = 41376,                // triggers 41377 after 2 seconds
+
+    // Generic
+    SPELL_SUMMON_ESSENCE_SUFFERING  = 41488,
+    SPELL_SUMMON_ESSENCE_DESIRE     = 41493,
+    SPELL_SUMMON_ESSENCE_ANGER      = 41496,
+    SPELL_SUMMON_ENSLAVED_SOUL      = 41537,
+#if defined (CLASSIC) || defined (TBC)
+    SPELL_SUBMERGE_VISUAL           = 28819,
+#endif
+
+    // Soul spells
+    SPELL_ENSLAVED_SOUL_PASSIVE     = 41535,
+    SPELL_SOUL_RELEASE              = 41542,
+
+    // Summons
+    NPC_ESSENCE_SUFFERING           = 23418,
+    NPC_ESSENCE_DESIRE              = 23419,
+    NPC_ESSENCE_ANGER               = 23420,
+    NPC_ENSLAVED_SOUL               = 23469,
+
+    // Phases
+    PHASE_0_NOT_BEGUN               = 0,
+    PHASE_1_SUFFERING               = 1,
+    PHASE_2_DESIRE                  = 2,
+    PHASE_3_ANGER                   = 3,
+
+    MAX_ENSLAVED_SOULS              = 36,
+};
+
+/*######
+## boss_reliquary_of_souls
+######*/
+
+struct boss_reliquary_of_souls : public CreatureScript
+{
+    boss_reliquary_of_souls() : CreatureScript("boss_reliquary_of_souls") {}
+
+    struct boss_reliquary_of_soulsAI : public Scripted_NoMovementAI
+    {
+        boss_reliquary_of_soulsAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+        uint8 m_uiSoulSummonedCount;
+        uint8 m_uiSoulDeathCount;
+
+        uint32 m_uiSummonEssenceTimer;
+        uint32 m_uiSummonSoulTimer;
+        uint32 m_uiAnimationTimer;
+        uint32 m_uiAnimResetTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_0_NOT_BEGUN;
+            m_uiSoulDeathCount = 0;
+            m_uiSoulSummonedCount = 0;
+
+            m_uiSummonSoulTimer = 1000;
+            m_uiAnimationTimer = 0;
+            m_uiAnimResetTimer = 0;
+            m_uiSummonEssenceTimer = 0;
+
+            // Reset animation
+            m_creature->HandleEmote(EMOTE_STATE_NONE);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_RELIQUIARY, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_RELIQUIARY, FAIL);
+            }
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_uiPhase == PHASE_0_NOT_BEGUN && pWho->GetTypeId() == TYPEID_PLAYER && !((Player*)pWho)->isGameMaster() &&
+                m_creature->IsWithinDistInMap(pWho, m_creature->GetAttackDistance(pWho)) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                // Start phase 1
+                m_uiPhase = PHASE_1_SUFFERING;
+                m_uiSummonEssenceTimer = 7000;
+                m_uiAnimationTimer = 4000;
+
+                // Set the player in combat with the boss
+                pWho->SetInCombatWith(m_creature);
+                m_creature->AddThreat(pWho);
+
+                // Start animation
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_RELIQUIARY, IN_PROGRESS);
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_ESSENCE_SUFFERING:
+                DoScriptText(SUFF_SAY_FREED, pSummoned);
+                break;
+            case NPC_ESSENCE_DESIRE:
+                DoScriptText(DESI_SAY_FREED, pSummoned);
+                break;
+            case NPC_ESSENCE_ANGER:
+                DoScriptText(ANGER_SAY_FREED, pSummoned);
+                break;
+            }
+
+            // All summons are set in combat
+            pSummoned->SetInCombatWithZone();
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // Self kill when the Essence of Anger is killed
+            if (pSummoned->GetEntry() == NPC_ESSENCE_ANGER)
+            {
+                m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+            {
+                return;
+            }
+
+            // Switch to next phase when the essence gets back
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_ESSENCE_SUFFERING:
+                DoScriptText(SUFF_SAY_AFTER, pSummoned);
+                m_uiPhase = PHASE_2_DESIRE;;
+                break;
+            case NPC_ESSENCE_DESIRE:
+                DoScriptText(DESI_SAY_AFTER, pSummoned);
+                m_uiPhase = PHASE_3_ANGER;
+                break;
+            }
+
+            // Despawn and set animation
+            pSummoned->ForcedDespawn();
+
+            m_uiSoulDeathCount = 0;
+            m_uiSoulSummonedCount = 0;
+            m_uiAnimResetTimer = 2000;
+#if defined (CLASSIC) || defined (TBC)
+            // Reset animation - visual effect similar to EMOTE_ONESHOT_EMERGE
+            m_creature->RemoveAurasDueToSpell(SPELL_SUBMERGE_VISUAL);
+#else
+        // Reset animation
+        m_creature->HandleEmote(EMOTE_ONESHOT_EMERGE);
+#endif
+        }
+
+        // Wrapper to count the dead spirits
+        void DoNotifySouldDead()
+        {
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit *pInvoker, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender->GetEntry() == NPC_ENSLAVED_SOUL)
+            {
+                ++m_uiSoulDeathCount;
+
+                // Prepare to summon the essence
+                if (m_uiSoulDeathCount == MAX_ENSLAVED_SOULS)
+                {
+                    m_uiSummonEssenceTimer = 7000;
+                    m_uiAnimationTimer = 4000;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Animation for opening the Reliquary
+            if (m_uiAnimationTimer)
+            {
+                if (m_uiAnimationTimer <= uiDiff)
+                {
+#if defined (CLASSIC) || defined (TBC)
+                    // Visual effect similar to EMOTE_ONESHOT_SUBMERGE
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUBMERGE_VISUAL) == CAST_OK)
+#else
+                    m_creature->HandleEmote(EMOTE_ONESHOT_SUBMERGE);
+#endif
+                        m_uiAnimationTimer = 0;
+                }
+                else
+                {
+                    m_uiAnimationTimer -= uiDiff;
+                }
+            }
+
+            // Animation for reset Reliquary
+            if (m_uiAnimResetTimer)
+            {
+                if (m_uiAnimResetTimer <= uiDiff)
+                {
+                    // Reset animation
+                    m_creature->HandleEmote(EMOTE_STATE_NONE);
+                    m_uiAnimResetTimer = 0;
+                }
+                else
+                {
+                    m_uiAnimResetTimer -= uiDiff;
+                }
+            }
+
+            // Summon the Essence on timer
+            if (m_uiSummonEssenceTimer)
+            {
+                if (m_uiSummonEssenceTimer <= uiDiff)
+                {
+                    uint32 uiSpellId = 0;
+                    switch (m_uiPhase)
+                    {
+                    case PHASE_1_SUFFERING: uiSpellId = SPELL_SUMMON_ESSENCE_SUFFERING; break;
+                    case PHASE_2_DESIRE:    uiSpellId = SPELL_SUMMON_ESSENCE_DESIRE;    break;
+                    case PHASE_3_ANGER:     uiSpellId = SPELL_SUMMON_ESSENCE_ANGER;     break;
+                    }
+
+                    if (DoCastSpellIfCan(m_creature, uiSpellId) == CAST_OK)
+                    {
+                        m_creature->HandleEmote(EMOTE_STATE_SUBMERGED);
+                        m_uiSummonEssenceTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiSummonEssenceTimer -= uiDiff;
+                }
+            }
+
+            // Summon Enslaved souls between the essence
+            switch (m_uiPhase)
+            {
+            case PHASE_2_DESIRE:
+            case PHASE_3_ANGER:
+
+                if (m_uiSoulSummonedCount < MAX_ENSLAVED_SOULS)
+                {
+                    if (m_uiSummonSoulTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_ENSLAVED_SOUL) == CAST_OK)
+                        {
+                            ++m_uiSoulSummonedCount;
+                            m_uiSummonSoulTimer = 500;
+                        }
+                    }
+                    else
+                    {
+                        m_uiSummonSoulTimer -= uiDiff;
+                    }
+                }
+
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_reliquary_of_soulsAI(pCreature);
+    }
+};
+
+/*######
+## essence_base_AI
+######*/
+
+struct essence_base_AI : public ScriptedAI
+{
+    essence_base_AI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        m_bIsPhaseFinished = false;
+    }
+
+    ScriptedInstance* m_pInstance;
+
+    bool m_bIsPhaseFinished;
+
+    virtual void OnPhaseFinished() {}
+
+    void JustReachedHome() override
+    {
+        // Reset encounter and despawn Essence
+        if (m_pInstance)
+        {
+            if (Creature* pReliquary = m_pInstance->GetSingleCreatureFromStorage(NPC_RELIQUARY_OF_SOULS))
+            { pReliquary->AI()->EnterEvadeMode(); }
+        }
+
+        m_creature->ForcedDespawn();
+    }
+
+    void DamageTaken(Unit* /*pKiller*/, uint32& uiDamage) override
+    {
+        if (uiDamage < m_creature->GetHealth())
+        { return; }
+
+        // Prevent glitch if in fake death
+        if (m_bIsPhaseFinished)
+        {
+            uiDamage = 0;
+            return;
+        }
+
+        uiDamage = 0;
+
+        m_creature->InterruptNonMeleeSpells(true);
+        m_creature->SetHealth(0);
+        m_creature->StopMoving();
+        m_creature->ClearComboPointHolders();
+        m_creature->RemoveAllAurasOnDeath();
+        m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+        m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        m_creature->ClearAllReactives();
+        m_creature->GetMotionMaster()->Clear();
+
+        if (!m_pInstance)
+        { return; }
+
+        // Move to home position
+        if (Creature* pReliquary = m_pInstance->GetSingleCreatureFromStorage(NPC_RELIQUARY_OF_SOULS))
+        { m_creature->GetMotionMaster()->MovePoint(1, pReliquary->GetPositionX(), pReliquary->GetPositionY(), pReliquary->GetPositionZ()); }
+
+        m_bIsPhaseFinished = true;
+
+        OnPhaseFinished();
+    }
+};
+
+/*######
+## boss_essence_of_suffering
+######*/
+
+struct boss_essence_of_suffering : public CreatureScript
+{
+    boss_essence_of_suffering() : CreatureScript("boss_essence_of_suffering") {}
+
+    struct boss_essence_of_sufferingAI : public essence_base_AI
+    {
+        boss_essence_of_sufferingAI(Creature* pCreature) : essence_base_AI(pCreature) { }
+
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiSoulDrainTimer;
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_AURA_OF_SUFFERING, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_SUFFERING_PASSIVE, CAST_TRIGGERED);
+
+            m_uiEnrageTimer = 45000;
+            m_uiSoulDrainTimer = 20000;
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SUFF_SAY_SLAY1 : SUFF_SAY_SLAY2, m_creature);
+        }
+
+        void OnPhaseFinished()
+        {
+            DoScriptText(SUFF_SAY_RECAP, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_BOSS_GENERIC_ENRAGED, m_creature);
+                    DoScriptText(SUFF_SAY_FRENZY, m_creature);
+                    m_uiEnrageTimer = 45000;
+                }
+            }
+            else
+            {
+                m_uiEnrageTimer -= uiDiff;
+            }
+
+            if (m_uiSoulDrainTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SOUL_DRAIN) == CAST_OK)
+                {
+                    m_uiSoulDrainTimer = urand(45000, 60000);
+                }
+            }
+            else
+            {
+                m_uiSoulDrainTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_essence_of_sufferingAI(pCreature);
+    }
+};
+
+/*######
+## boss_essence_of_desire
+######*/
+
+struct boss_essence_of_desire : public CreatureScript
+{
+    boss_essence_of_desire() : CreatureScript("boss_essence_of_desire") {}
+
+    struct boss_essence_of_desireAI : public essence_base_AI
+    {
+        boss_essence_of_desireAI(Creature* pCreature) : essence_base_AI(pCreature) { }
+
+        uint32 m_uiRuneShieldTimer;
+        uint32 m_uiDeadenTimer;
+        uint32 m_uiSoulShockTimer;
+
+        void Reset() override
+        {
+            m_uiRuneShieldTimer = urand(10000, 15000);
+            m_uiDeadenTimer = 15000;
+            m_uiSoulShockTimer = urand(5000, 10000);
+
+            DoCastSpellIfCan(m_creature, SPELL_AURA_OF_DESIRE);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(DESI_SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(DESI_SAY_SLAY2, m_creature); break;
+            case 2: DoScriptText(DESI_SAY_SLAY3, m_creature); break;
+            }
+        }
+
+        void OnPhaseFinished()
+        {
+            DoScriptText(DESI_SAY_RECAP, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiRuneShieldTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_RUNE_SHIELD) == CAST_OK)
+                {
+                    m_uiRuneShieldTimer = 15000;
+                }
+            }
+            else
+            {
+                m_uiRuneShieldTimer -= uiDiff;
+            }
+
+            if (m_uiDeadenTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DEADEN) == CAST_OK)
+                {
+                    DoScriptText(DESI_SAY_SPEC, m_creature);
+                    m_uiDeadenTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiDeadenTimer -= uiDiff;
+            }
+
+            if (m_uiSoulShockTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SPIRIT_SHOCK) == CAST_OK)
+                {
+                    m_uiSoulShockTimer = urand(5000, 10000);
+                }
+            }
+            else
+            {
+                m_uiSoulShockTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_essence_of_desireAI(pCreature);
+    }
+};
+
+/*######
+## boss_essence_of_anger
+######*/
+
+struct boss_essence_of_anger : public CreatureScript
+{
+    boss_essence_of_anger() : CreatureScript("boss_essence_of_anger") {}
+
+    struct boss_essence_of_angerAI : public ScriptedAI
+    {
+        boss_essence_of_angerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiSeetheTimer;
+        uint32 m_uiSoulScreamTimer;
+        uint32 m_uiSpiteTimer;
+
+        void Reset() override
+        {
+            m_uiSeetheTimer = 5000;
+            m_uiSoulScreamTimer = 10000;
+            m_uiSpiteTimer = 20000;
+
+            DoCastSpellIfCan(m_creature, SPELL_AURA_OF_ANGER);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? ANGER_SAY_SLAY1 : ANGER_SAY_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(ANGER_SAY_DEATH, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            // Reset encounter and despawn Essence
+            if (m_pInstance)
+            {
+                if (Creature* pReliquary = m_pInstance->GetSingleCreatureFromStorage(NPC_RELIQUARY_OF_SOULS))
+                {
+                    pReliquary->AI()->EnterEvadeMode();
+                }
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiSeetheTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SEETHE) == CAST_OK)
+                {
+                    m_uiSeetheTimer = urand(20000, 30000);
+                }
+            }
+            else
+            {
+                m_uiSeetheTimer -= uiDiff;
+            }
+
+            if (m_uiSoulScreamTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SOUL_SCREAM) == CAST_OK)
+                {
+                    m_uiSoulScreamTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiSoulScreamTimer -= uiDiff;
+            }
+
+            if (m_uiSpiteTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SPITE) == CAST_OK)
+                {
+                    DoScriptText(ANGER_SAY_BEFORE, m_creature);
+                    m_uiSpiteTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiSpiteTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_essence_of_angerAI(pCreature);
+    }
+};
+
+/*######
+## npc_enslaved_soul
+######*/
+
+struct npc_enslaved_soul : public CreatureScript
+{
+    npc_enslaved_soul() : CreatureScript("npc_enslaved_soul") {}
+
+    struct npc_enslaved_soulAI : public ScriptedAI
+    {
+        npc_enslaved_soulAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_ENSLAVED_SOUL_PASSIVE);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_SOUL_RELEASE, CAST_TRIGGERED);
+
+            // Notify the main boss about the spirit death. Needs to be done here, because the spirit is summoned with triggered spell
+            if (m_pInstance)
+            {
+                if (Creature* pReliquary = m_pInstance->GetSingleCreatureFromStorage(NPC_RELIQUARY_OF_SOULS))
+                {
+                    SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pReliquary);
+                }
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            // Reset encounter and despawn the spirit
+            if (m_pInstance)
+            {
+                if (Creature* pReliquary = m_pInstance->GetSingleCreatureFromStorage(NPC_RELIQUARY_OF_SOULS))
+                {
+                    pReliquary->AI()->EnterEvadeMode();
+                }
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_enslaved_soulAI(pCreature);
+    }
+};
+
+void AddSC_boss_reliquary_of_souls()
+{
+    Script* s;
+
+    s = new boss_reliquary_of_souls();
+    s->RegisterSelf();
+    s = new boss_essence_of_suffering();
+    s->RegisterSelf();
+    s = new boss_essence_of_desire();
+    s->RegisterSelf();
+    s = new boss_essence_of_anger();
+    s->RegisterSelf();
+    s = new npc_enslaved_soul();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_reliquary_of_souls";
+    //pNewScript->GetAI = &GetAI_boss_reliquary_of_souls;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_essence_of_suffering";
+    //pNewScript->GetAI = &GetAI_boss_essence_of_suffering;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_essence_of_desire";
+    //pNewScript->GetAI = &GetAI_boss_essence_of_desire;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_essence_of_anger";
+    //pNewScript->GetAI = &GetAI_boss_essence_of_anger;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_enslaved_soul";
+    //pNewScript->GetAI = &GetAI_npc_enslaved_soul;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/black_temple/boss_shade_of_akama.cpp b/src/modules/SD3/scripts/outland/black_temple/boss_shade_of_akama.cpp
new file mode 100644
index 000000000..8d0b26390
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/black_temple/boss_shade_of_akama.cpp
@@ -0,0 +1,798 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Shade_of_Akama
+SD%Complete: 90
+SDComment: Some adjustments may be required once the Shade Soul Channel stacking is fixed in core. Epilogue positions need more work.
+SDCategory: Black Temple
+EndScriptData */
+
+#include "precompiled.h"
+#include "black_temple.h"
+
+enum
+{
+    // yells
+    SAY_DEATH                       = -1564013,
+    SAY_LOW_HEALTH                  = -1564014,
+    // Ending cinematic text
+    SAY_FREE_1                      = -1564130,
+    SAY_FREE_2                      = -1564015,
+    SAY_BROKEN_FREE_01              = -1564016,
+    SAY_BROKEN_FREE_02              = -1564017,
+
+    // gossip
+    GOSSIP_ITEM_START_ENCOUNTER     = -3564000,
+    TEXT_ID_AKAMA                   = 10866,
+
+    // Akama spells
+    SPELL_STEALTH                   = 34189,
+    SPELL_DESTRUCTIVE_POISON        = 40874,
+    SPELL_CHAIN_LIGHTNING           = 39945,                // old spell was 42024 -> probably wrong
+    SPELL_AKAMA_SOUL_CHANNEL        = 40447,                // channeled during the event
+    SPELL_AKAMA_SOUL_RETRIEVE       = 40902,                // used for the epilogue
+
+    // Other spells
+    SPELL_SUMMON_DEFENDER           = 40474,
+    SPELL_SUMMON_SORCERER           = 40476,
+    // SPELL_VERTEX_SHADE_BLACK      = 39833,               // used by the shade - in c_t_a
+    SPELL_SHADE_SOUL_CHANNEL        = 40401,                // channel spell, used to banish the shade
+    SPELL_SUMMON_SHADE_TRIGGER      = 40955,
+
+    // npcs
+    NPC_ASH_SORCERER                = 23215,
+    NPC_ASH_DEFENDER                = 23216,
+    NPC_ASH_ELEMENTAL               = 23523,
+    NPC_ASH_ROGUE                   = 23318,
+    NPC_ASH_SPIRITBIND              = 23524,
+
+    // akama's phases
+    PHASE_CHANNEL                   = 1,
+    PHASE_COMBAT                    = 2,
+    PHASE_EPILOGUE                  = 3,
+
+    MAX_CHANNELERS                  = 6,
+};
+
+static const uint32 auiRandSpawnEntry[] =
+{
+    NPC_ASH_ELEMENTAL,
+    NPC_ASH_ROGUE,
+    NPC_ASH_SPIRITBIND
+};
+
+static const DialogueEntry aOutroDialogue[] =
+{
+    {SPELL_AKAMA_SOUL_RETRIEVE, 0,                  18000},
+    {EMOTE_ONESHOT_ROAR,        0,                  2000},
+    {SAY_FREE_1,                NPC_AKAMA_SHADE,    5000},
+    {SAY_FREE_2,                NPC_AKAMA_SHADE,    20000},
+    {SAY_BROKEN_FREE_01,        0,                  2000},
+    {EMOTE_STATE_KNEEL,         0,                  5000},
+    {SAY_BROKEN_FREE_02,        0,                  0},
+    {0, 0, 0},
+};
+
+static const Location afAkamaWP[] =
+{
+    {516.885193f, 400.836060f, 112.784f},
+    {469.597443f, 402.264404f, 118.537f}
+};
+
+/*######
+## npc_akama
+######*/
+
+struct npc_akama : public CreatureScript
+{
+    npc_akama() : CreatureScript("npc_akama_shade") {}
+
+    struct npc_akamaAI : public ScriptedAI, private DialogueHelper
+    {
+        npc_akamaAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aOutroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+
+        uint32 m_uiDestructivePoisonTimer;
+        uint32 m_uiLightningBoltTimer;
+
+        uint32 m_uiSummonPackTimer;
+        uint32 m_uiSummonDefenderTimer;
+        uint32 m_uiSummonSorcererTimer;
+
+        uint8 m_uiChannelersDead;
+
+        GuidList m_lBrokenGUIDList;
+        GuidList m_lSorcerersGUIDList;
+
+        bool m_bHasYelledOnce;
+
+        void Reset() override
+        {
+            SetCombatMovement(false);
+
+            m_uiPhase = 0;
+
+            m_uiDestructivePoisonTimer = 15000;
+            m_uiLightningBoltTimer = 10000;
+
+            m_uiSummonPackTimer = 5000;
+            m_uiSummonDefenderTimer = 10000;
+            m_uiSummonSorcererTimer = 10000;
+
+            m_uiChannelersDead = 0;
+
+            m_bHasYelledOnce = false;
+
+            m_lBrokenGUIDList.clear();
+            m_lSorcerersGUIDList.clear();
+
+            DoCastSpellIfCan(m_creature, SPELL_STEALTH);
+            m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+        }
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            // When the Shade starts to attack Akama, switch to melee phase
+            if (m_uiPhase == PHASE_CHANNEL && pAttacker->GetEntry() == NPC_SHADE_OF_AKAMA)
+            {
+                m_creature->InterruptNonMeleeSpells(false);
+                AttackStart(pAttacker);
+                m_uiPhase = PHASE_COMBAT;
+
+                // despawn all sorcerers at this point
+                for (GuidList::const_iterator itr = m_lSorcerersGUIDList.begin(); itr != m_lSorcerersGUIDList.end(); ++itr)
+                {
+                    if (Creature* pSorcerer = m_creature->GetMap()->GetCreature(*itr))
+                    {
+                        pSorcerer->ForcedDespawn();
+                    }
+                }
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            // Note: this is called from the Shade, Channeler and Sorcerer script
+            // If the function is changed in the future, please review this.
+            switch (pVictim->GetEntry())
+            {
+            case NPC_SHADE_OF_AKAMA:
+                m_uiPhase = PHASE_EPILOGUE;
+
+                m_creature->GetMotionMaster()->MovePoint(PHASE_EPILOGUE, afAkamaWP[1].m_fX, afAkamaWP[1].m_fY, afAkamaWP[1].m_fZ);
+                break;
+            case NPC_ASH_SORCERER:
+                // Decrease the sorcerer counter
+                m_lSorcerersGUIDList.remove(pVictim->GetObjectGuid());
+                break;
+            case NPC_ASH_CHANNELER:
+
+                ++m_uiChannelersDead;
+
+                // Move the shade to Akama when all channelers are dead
+                // Note: the boss should be already slowly moving, but this isn't possible because of the missing stack for the speed debuff
+                if (m_uiChannelersDead == MAX_CHANNELERS)
+                {
+                    if (m_pInstance)
+                    {
+                        if (Creature* pShade = m_pInstance->GetSingleCreatureFromStorage(NPC_SHADE_OF_AKAMA))
+                        {
+                            float fX, fY, fZ;
+                            m_creature->GetContactPoint(pShade, fX, fY, fZ);
+                            pShade->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                        }
+                    }
+                }
+                break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+            m_creature->SetCorpseDelay(30);
+
+            if (m_pInstance)
+            {
+                // Reset the shade
+                if (Creature* pShade = m_pInstance->GetSingleCreatureFromStorage(NPC_SHADE_OF_AKAMA))
+                {
+                    pShade->AI()->EnterEvadeMode();
+                }
+            }
+        }
+
+        void CorpseRemoved(uint32& uiRespawnDelay) override
+        {
+            // Resapwn after 5 min
+            uiRespawnDelay = 5 * MINUTE;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_ASH_SORCERER:
+            {
+                    pSummoned->SetWalk(false);
+                    m_lSorcerersGUIDList.push_back(pSummoned->GetObjectGuid());
+
+                    float fX, fY, fZ;
+                    if (m_pInstance)
+                    {
+                        if (Creature* pShade = m_pInstance->GetSingleCreatureFromStorage(NPC_SHADE_OF_AKAMA))
+                        {
+                            pShade->GetNearPoint(pShade, fX, fY, fZ, 0, 20.0f, pShade->GetAngle(pSummoned));
+                            pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                        }
+                    }
+                    break;
+            }
+            case NPC_ASH_BROKEN:
+            {
+                    float fX, fY, fZ;
+                    m_lBrokenGUIDList.push_back(pSummoned->GetObjectGuid());
+
+                    m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 30.0f, m_creature->GetAngle(pSummoned));
+                    pSummoned->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                    break;
+            }
+            case NPC_ASH_DEFENDER:
+                pSummoned->AI()->AttackStart(m_creature);
+                break;
+            default:
+                pSummoned->SetInCombatWithZone();
+                break;
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !m_pInstance)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case PHASE_CHANNEL:
+                if (DoCastSpellIfCan(m_creature, SPELL_AKAMA_SOUL_CHANNEL) == CAST_OK)
+                {
+                    m_uiPhase = PHASE_CHANNEL;
+
+                    m_pInstance->SetData(TYPE_CHANNELERS, 0);
+
+                }
+                break;
+            case PHASE_EPILOGUE:
+                // Start epilogue here
+                if (Creature* pShade = m_pInstance->GetSingleCreatureFromStorage(NPC_SHADE_OF_AKAMA))
+                {
+                    m_creature->SetFacingToObject(pShade);
+                }
+
+                StartNextDialogueText(SPELL_AKAMA_SOUL_RETRIEVE);
+                break;
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case SPELL_AKAMA_SOUL_RETRIEVE:
+                DoCastSpellIfCan(m_creature, SPELL_AKAMA_SOUL_RETRIEVE);
+                break;
+            case EMOTE_ONESHOT_ROAR:
+                m_creature->HandleEmote(EMOTE_ONESHOT_ROAR);
+                break;
+            case SAY_FREE_1:
+                DoSummonBrokenAshtongue();
+                break;
+            case SAY_BROKEN_FREE_01:
+                if (Creature* pBroken = GetClosestCreatureWithEntry(m_creature, NPC_ASH_BROKEN, 35.0f))
+                {
+                    DoScriptText(SAY_BROKEN_FREE_01, pBroken);
+                }
+                break;
+            case EMOTE_STATE_KNEEL:
+                for (GuidList::const_iterator itr = m_lBrokenGUIDList.begin(); itr != m_lBrokenGUIDList.end(); ++itr)
+                {
+                    if (Creature* pBroken = m_creature->GetMap()->GetCreature(*itr))
+                    {
+                        pBroken->HandleEmote(EMOTE_STATE_KNEEL);
+                    }
+                }
+                break;
+            case SAY_BROKEN_FREE_02:
+                for (GuidList::const_iterator itr = m_lBrokenGUIDList.begin(); itr != m_lBrokenGUIDList.end(); ++itr)
+                {
+                    if (Creature* pBroken = m_creature->GetMap()->GetCreature(*itr))
+                    {
+                        DoScriptText(SAY_BROKEN_FREE_02, pBroken);
+                    }
+                }
+                break;
+            }
+        }
+
+        // Wrapper to start the Akama event
+        void DoStartEvent()
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SHADE, IN_PROGRESS);
+            }
+
+            m_creature->RemoveAurasDueToSpell(SPELL_STEALTH);
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            m_creature->GetMotionMaster()->MovePoint(PHASE_CHANNEL, afAkamaWP[0].m_fX, afAkamaWP[0].m_fY, afAkamaWP[0].m_fZ);
+        }
+
+        // Wrapper to summon ashtongue mobs
+        void DoSummonAshtongue(uint32 uiSpellId = 0)
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            uint64 guid = m_pInstance->GetData64(TYPE_CHANNELERS);
+            Creature* pGenerator = m_creature->GetMap()->GetCreature(ObjectGuid(guid));
+            if (!pGenerator)
+            {
+                return;
+            }
+
+            // Summon mobs by spell
+            if (uiSpellId)
+            {
+                pGenerator->CastSpell(pGenerator, uiSpellId, true, NULL, NULL, m_creature->GetObjectGuid());
+            }
+            // Summon ashtongue pack
+            else
+            {
+                float fX, fY, fZ;
+                for (uint8 i = 0; i < countof(auiRandSpawnEntry); ++i)
+                {
+                    pGenerator->GetRandomPoint(pGenerator->GetPositionX(), pGenerator->GetPositionY(), pGenerator->GetPositionZ(), 5.0f, fX, fY, fZ);
+                    m_creature->SummonCreature(auiRandSpawnEntry[i], fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                }
+            }
+        }
+
+        // Wrapper to summon the npcs for the epilogue
+        void DoSummonBrokenAshtongue()
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            float fX, fY, fZ;
+
+            // Spawn 4 Broken in the center and behind the column
+            for (uint8 i = 0; i < countof(afBrokenSpawnLoc); ++i)
+            {
+                for (uint8 j = 0; j < 4; ++j)
+                {
+                    fX = afBrokenSpawnLoc[i].m_fX;
+                    fY = afBrokenSpawnLoc[i].m_fY + (j * 7);
+                    fZ = afBrokenSpawnLoc[i].m_fZ;
+
+                    m_creature->SummonCreature(NPC_ASH_BROKEN, fX, fY, fZ, 0, TEMPSUMMON_TIMED_DESPAWN, 10 * MINUTE * IN_MILLISECONDS);
+                }
+            }
+
+            m_pInstance->SetData64(TYPE_CHANNELERS, m_creature->GetObjectGuid().GetRawValue());
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            switch (m_uiPhase)
+            {
+            case PHASE_CHANNEL:
+
+                if (m_uiSummonDefenderTimer < uiDiff)
+                {
+                    DoSummonAshtongue(SPELL_SUMMON_DEFENDER);
+                    m_uiSummonDefenderTimer = 15000;
+                }
+                else
+                {
+                    m_uiSummonDefenderTimer -= uiDiff;
+                }
+
+                if (m_lSorcerersGUIDList.size() <= m_uiChannelersDead)
+                {
+                    if (m_uiSummonSorcererTimer < uiDiff)
+                    {
+                        DoSummonAshtongue(SPELL_SUMMON_SORCERER);
+                        m_uiSummonSorcererTimer = urand(20000, 30000);
+                    }
+                    else
+                    {
+                        m_uiSummonSorcererTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiSummonPackTimer < uiDiff)
+                {
+                    DoSummonAshtongue();
+                    m_uiSummonPackTimer = 35000;
+                }
+                else
+                {
+                    m_uiSummonPackTimer -= uiDiff;
+                }
+
+                break;
+            case PHASE_COMBAT:
+
+                if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                {
+                    return;
+                }
+
+                if (!m_bHasYelledOnce && m_creature->GetHealthPercent() < 15.0f)
+                {
+                    DoScriptText(SAY_LOW_HEALTH, m_creature);
+                    m_bHasYelledOnce = true;
+                }
+
+                if (m_uiDestructivePoisonTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DESTRUCTIVE_POISON) == CAST_OK)
+                    {
+                        m_uiDestructivePoisonTimer = 15000;
+                    }
+                }
+                else
+                {
+                    m_uiDestructivePoisonTimer -= uiDiff;
+                }
+
+                if (m_uiLightningBoltTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CHAIN_LIGHTNING) == CAST_OK)
+                    {
+                        m_uiLightningBoltTimer = 10000;
+                    }
+                }
+                else
+                {
+                    m_uiLightningBoltTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+
+                break;
+            case PHASE_EPILOGUE:
+                DialogueUpdate(uiDiff);
+                break;
+            }
+        }
+    };
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pCreature->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_SHADE) != DONE)
+            {
+                pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START_ENCOUNTER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            }
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(TEXT_ID_AKAMA, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)             // Fight time
+        {
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+            if (npc_akamaAI* pAkamaAI = dynamic_cast<npc_akamaAI*>(pCreature->AI()))
+            {
+                pAkamaAI->DoStartEvent();
+            }
+        }
+
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_akamaAI(pCreature);
+    }
+};
+
+/*######
+## boss_shade_of_akama
+######*/
+
+struct boss_shade_of_akama : public CreatureScript
+{
+    boss_shade_of_akama() : CreatureScript("boss_shade_of_akama") {}
+
+    struct boss_shade_of_akamaAI : public ScriptedAI
+    {
+        boss_shade_of_akamaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void Reset() override
+        {
+            SetCombatMovement(false);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SHADE, FAIL);
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetEntry() == NPC_AKAMA)
+            {
+                EnterEvadeMode();
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_SHADE_TRIGGER, CAST_TRIGGERED);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SHADE, DONE);
+
+                // Inform Akama that the Shade is dead
+                if (Creature* pAkama = m_pInstance->GetSingleCreatureFromStorage(NPC_AKAMA_SHADE))
+                {
+                    pAkama->AI()->KilledUnit(m_creature);
+                }
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId || !m_pInstance)
+            {
+                return;
+            }
+
+            // Set in combat with Akama
+            if (Creature* pAkama = m_pInstance->GetSingleCreatureFromStorage(NPC_AKAMA_SHADE))
+            {
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                // Shade should move to Akama, not the other way around
+                AttackStart(pAkama);
+
+                // Crazy amount of threat
+                m_creature->AddThreat(pAkama, 10000000.0f);
+                pAkama->AddThreat(m_creature, 10000000.0f);
+            }
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_shade_of_akamaAI(pCreature);
+    }
+};
+
+/*######
+## mob_ashtongue_channeler
+######*/
+
+struct mob_ashtongue_channeler : public CreatureScript
+{
+    mob_ashtongue_channeler() : CreatureScript("mob_ashtongue_channeler") {}
+
+    struct mob_ashtongue_channelerAI : public ScriptedAI
+    {
+        mob_ashtongue_channelerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiBanishTimer;
+
+        void Reset() override
+        {
+            m_uiBanishTimer = 5000;
+
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // Inform Akama that one channeler is dead
+            if (Creature* pAkama = m_pInstance->GetSingleCreatureFromStorage(NPC_AKAMA_SHADE))
+            {
+                pAkama->AI()->KilledUnit(m_creature);
+            }
+        }
+
+        void AttackStart(Unit* /*pWho*/) override {}
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiBanishTimer)
+            {
+                if (m_uiBanishTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SHADE_SOUL_CHANNEL))
+                    {
+                        m_uiBanishTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBanishTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_ashtongue_channelerAI(pCreature);
+    }
+};
+
+/*######
+## mob_ashtongue_sorcerer
+######*/
+
+struct mob_ashtongue_sorcerer : public CreatureScript
+{
+    mob_ashtongue_sorcerer() : CreatureScript("mob_ashtongue_sorcerer") {}
+
+    struct mob_ashtongue_sorcererAI : public ScriptedAI
+    {
+        mob_ashtongue_sorcererAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        void AttackStart(Unit* /*pWho*/) override {}
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            // Inform Akama that one sorcerer is dead
+            if (Creature* pAkama = m_pInstance->GetSingleCreatureFromStorage(NPC_AKAMA_SHADE))
+            {
+                pAkama->AI()->KilledUnit(m_creature);
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+            {
+                return;
+            }
+
+            // Channel on the Shade when reached the calculated point
+            if (DoCastSpellIfCan(m_creature, SPELL_SHADE_SOUL_CHANNEL) == CAST_OK)
+            {
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MoveIdle();
+            }
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override {}
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_ashtongue_sorcererAI(pCreature);
+    }
+};
+
+void AddSC_boss_shade_of_akama()
+{
+    Script* s;
+
+    s = new npc_akama();
+    s->RegisterSelf();
+    s = new boss_shade_of_akama();
+    s->RegisterSelf();
+    s = new mob_ashtongue_channeler();
+    s->RegisterSelf();
+    s = new mob_ashtongue_sorcerer();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_akama_shade";
+    //pNewScript->GetAI = &GetAI_npc_akama_shade;
+    //pNewScript->pGossipHello = &GossipHello_npc_akama;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_akama;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_shade_of_akama";
+    //pNewScript->GetAI = &GetAI_boss_shade_of_akama;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_ashtongue_channeler";
+    //pNewScript->GetAI = &GetAI_mob_ashtongue_channeler;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_ashtongue_sorcerer";
+    //pNewScript->GetAI = &GetAI_mob_ashtongue_sorcerer;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/black_temple/boss_supremus.cpp b/src/modules/SD3/scripts/outland/black_temple/boss_supremus.cpp
new file mode 100644
index 000000000..e0d599971
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/black_temple/boss_supremus.cpp
@@ -0,0 +1,400 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Supremus
+SD%Complete: 90
+SDComment: Unknown if other speed-changes happen, remove AI for trigger mobs in next step
+SDCategory: Black Temple
+EndScriptData */
+
+#include "precompiled.h"
+#include "black_temple.h"
+
+enum
+{
+    EMOTE_NEW_TARGET                = -1564010,
+    EMOTE_PUNCH_GROUND              = -1564011,
+    EMOTE_GROUND_CRACK              = -1564012,
+
+    // Spells
+    SPELL_HATEFUL_STRIKE            = 41926,
+    SPELL_CHARGE                    = 41581,
+    SPELL_MOLTEN_FLAME              = 40980,
+    SPELL_VOLCANIC_ERUPTION_BOSS    = 40276,
+    SPELL_VOLCANIC_ERUPTION_VOLCANO = 40117,
+    SPELL_MOLTEN_PUNCH              = 40126,
+    SPELL_BERSERK                   = 45078,
+    SPELL_SLOW_SELF                 = 41922,
+
+    NPC_VOLCANO                     = 23085,
+    NPC_STALKER                     = 23095,
+};
+
+/* Non existed spells that were used in 3.2
+ * Stalker:  40257 41930
+ * Supremus: 33420 41582 41925 41951
+ */
+
+const float RANGE_MOLTEN_PUNCH      = 40.0;
+
+/* These floats are related to the speed-hack near end of script;
+ * Statet at wowwiki: "If the gaze target is further away than 40 yards, he dashes at about five times the normal run speed until the range is about 20 yards."
+ * TODO But this is currently not confirmed otherwise to be actually happening
+ * const float RANGE_MIN_DASHING       = 20.0;
+ * const float SPEED_DASHING           = 5.0;
+ * const float SPEED_CHASE             = 0.9f;
+ */
+
+// TODO Remove this 'script' when combat movement can be proper prevented from core-side
+struct molten_flame : public CreatureScript
+{
+    molten_flame() : CreatureScript("molten_flame") {}
+
+    struct molten_flameAI : public Scripted_NoMovementAI
+    {
+        molten_flameAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void AttackStart(Unit* /*pWho*/) override {}
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+        void UpdateAI(const uint32 /*uiDiff*/) override {}
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new molten_flameAI(pCreature);
+    }
+};
+
+// TODO Remove this 'script' when combat movement can be proper prevented from core-side
+struct npc_volcano : public CreatureScript
+{
+    npc_volcano() : CreatureScript("npc_volcano") {}
+
+    struct npc_volcanoAI : public Scripted_NoMovementAI
+    {
+        npc_volcanoAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void AttackStart(Unit* /*pWho*/) override {}
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+        void UpdateAI(const uint32 /*uiDiff*/) override {}
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_volcanoAI(pCreature);
+    }
+};
+
+struct boss_supremus : public CreatureScript
+{
+    boss_supremus() : CreatureScript("boss_supremus") {}
+
+    struct boss_supremusAI : public ScriptedAI
+    {
+        boss_supremusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiSummonFlameTimer;
+        uint32 m_uiSwitchTargetTimer;
+        uint32 m_uiPhaseSwitchTimer;
+        uint32 m_uiSummonVolcanoTimer;
+        uint32 m_uiHatefulStrikeTimer;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiMoltenPunchTimer;
+
+        bool m_bTankPhase;
+
+        GuidList m_lSummonedGUIDs;
+
+        void Reset() override
+        {
+            m_uiHatefulStrikeTimer = 5000;
+            m_uiSummonFlameTimer = 20000;
+            m_uiPhaseSwitchTimer = 60000;
+            m_uiMoltenPunchTimer = 8000;
+            m_uiBerserkTimer = 15 * MINUTE * IN_MILLISECONDS;
+
+            m_bTankPhase = true;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SUPREMUS, NOT_STARTED);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SUPREMUS, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SUPREMUS, DONE);
+            }
+
+            for (GuidList::const_iterator itr = m_lSummonedGUIDs.begin(); itr != m_lSummonedGUIDs.end(); ++itr)
+            {
+                if (Creature* pSummoned = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pSummoned->ForcedDespawn();
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_STALKER)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+                if (!pTarget)
+                {
+                    pTarget = m_creature->getVictim();
+                }
+
+                if (pTarget)
+                {
+                    pSummoned->GetMotionMaster()->Clear();
+                    pSummoned->GetMotionMaster()->MoveFollow(pTarget, 0.0f, 0.0f);
+                    pSummoned->CastSpell(pSummoned, SPELL_MOLTEN_FLAME, false, NULL, NULL, m_creature->GetObjectGuid());
+                }
+            }
+
+            else if (pSummoned->GetEntry() == NPC_VOLCANO)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_VOLCANIC_ERUPTION_VOLCANO, false, NULL, NULL, m_creature->GetObjectGuid());
+            }
+        }
+
+        Unit* GetHatefulStrikeTarget()
+        {
+            uint32 uiHealth = 0;
+            Unit* pTarget = NULL;
+
+            ThreatList const& tList = m_creature->GetThreatManager().getThreatList();
+            for (ThreatList::const_iterator iter = tList.begin(); iter != tList.end(); ++iter)
+            {
+                Unit* pUnit = m_creature->GetMap()->GetUnit((*iter)->getUnitGuid());
+
+                if (pUnit && m_creature->CanReachWithMeleeAttack(pUnit))
+                {
+                    if (pUnit->GetHealth() > uiHealth)
+                    {
+                        uiHealth = pUnit->GetHealth();
+                        pTarget = pUnit;
+                    }
+                }
+            }
+
+            return pTarget;
+        }
+
+        void KilledUnit(Unit* pKilled) override
+        {
+            // The current target is the fixated target - repick a new one
+            if (!m_bTankPhase && pKilled == m_creature->getVictim())
+            {
+                m_uiSwitchTargetTimer = 0;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiSummonFlameTimer < uiDiff)
+            {
+                // This currently is entirely screwed, because the npc is summoned somewhere far away as of big bounding box of supremus
+                if (DoCastSpellIfCan(m_creature, SPELL_MOLTEN_PUNCH) == CAST_OK)
+                {
+                    m_uiSummonFlameTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiSummonFlameTimer -= uiDiff;
+            }
+
+            if (m_uiPhaseSwitchTimer < uiDiff)
+            {
+                if (!m_bTankPhase)
+                {
+                    m_bTankPhase = true;
+                    m_creature->RemoveAurasDueToSpell(SPELL_SLOW_SELF);
+                    m_creature->FixateTarget(NULL);
+                }
+                else
+                {
+                    m_bTankPhase = false;
+                    m_uiSwitchTargetTimer = 0;
+                    m_uiSummonVolcanoTimer = 2000;
+
+                    DoCastSpellIfCan(m_creature, SPELL_SLOW_SELF, CAST_INTERRUPT_PREVIOUS);
+                }
+
+                m_uiPhaseSwitchTimer = MINUTE * IN_MILLISECONDS;
+            }
+            else
+            {
+                m_uiPhaseSwitchTimer -= uiDiff;
+            }
+
+            if (m_bTankPhase)
+            {
+                if (m_uiHatefulStrikeTimer < uiDiff)
+                {
+                    if (Unit* pTarget = GetHatefulStrikeTarget())
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_HATEFUL_STRIKE) == CAST_OK)
+                        {
+                            m_uiHatefulStrikeTimer = 5000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiHatefulStrikeTimer -= uiDiff;
+                }
+            }
+            else                                                // !m_bTankPhase
+            {
+                if (m_uiSwitchTargetTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        m_creature->FixateTarget(pTarget);
+                        DoScriptText(EMOTE_NEW_TARGET, m_creature);
+                        m_uiSwitchTargetTimer = 10000;
+                    }
+                }
+                else
+                {
+                    m_uiSwitchTargetTimer -= uiDiff;
+                }
+
+                if (m_uiSummonVolcanoTimer < uiDiff)
+                {
+                    Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+
+                    if (DoCastSpellIfCan(pTarget ? pTarget : m_creature->getVictim(), SPELL_VOLCANIC_ERUPTION_BOSS) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_GROUND_CRACK, m_creature);
+                        m_uiSummonVolcanoTimer = 10000;
+                    }
+                }
+                else
+                {
+                    m_uiSummonVolcanoTimer -= uiDiff;
+                }
+
+                if (m_uiMoltenPunchTimer < uiDiff)
+                {
+                    if (m_creature->GetCombatDistance(m_creature->getVictim(), false) < RANGE_MOLTEN_PUNCH)
+                    {
+                        DoCastSpellIfCan(m_creature->getVictim(), SPELL_CHARGE);
+                        DoScriptText(EMOTE_PUNCH_GROUND, m_creature);
+                    }
+                    m_uiMoltenPunchTimer = 8000;                // might be better with small timer and some sort of cast-chance
+                }
+                else
+                {
+                    m_uiMoltenPunchTimer -= uiDiff;
+                }
+
+                /* Not understood how this really must work
+                 * if (m_creature->GetSpeedRate(MOVE_RUN) > SPEED_CHASE && m_creature->GetCombatDistance(m_creature->getVictim()) < RANGE_MIN_DASHING)
+                 *     m_creature->SetSpeedRate(MOVE_RUN, SPEED_CHASE);
+                 * else if (m_creature->GetCombatDistance(m_creature->getVictim()) > RANGE_MOLTEN_PUNCH)
+                 *     m_creature->SetSpeedRate(MOVE_RUN, SPEED_DASHING);
+                 */
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_supremusAI(pCreature);
+    }
+};
+
+void AddSC_boss_supremus()
+{
+    Script* s;
+
+    s = new boss_supremus();
+    s->RegisterSelf();
+    s = new molten_flame();
+    s->RegisterSelf();
+    s = new npc_volcano();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_supremus";
+    //pNewScript->GetAI = &GetAI_boss_supremus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "molten_flame";
+    //pNewScript->GetAI = &GetAI_molten_flame;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_volcano";
+    //pNewScript->GetAI = &GetAI_npc_volcano;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/black_temple/boss_teron_gorefiend.cpp b/src/modules/SD3/scripts/outland/black_temple/boss_teron_gorefiend.cpp
new file mode 100644
index 000000000..3f02a7590
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/black_temple/boss_teron_gorefiend.cpp
@@ -0,0 +1,272 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Teron_Gorefiend
+SD%Complete: 60
+SDComment: Requires Mind Control support for Ghosts.
+SDCategory: Black Temple
+EndScriptData */
+
+#include "precompiled.h"
+#include "black_temple.h"
+
+enum
+{
+    // Speech'n'sound
+    SAY_INTRO                = -1564037,
+    SAY_AGGRO                = -1564038,
+    SAY_SLAY1                = -1564039,
+    SAY_SLAY2                = -1564040,
+    SAY_SPELL1               = -1564041,
+    SAY_SPELL2               = -1564042,
+    SAY_SPECIAL1             = -1564043,
+    SAY_SPECIAL2             = -1564044,
+    SAY_ENRAGE               = -1564045,
+    SAY_DEATH                = -1564046,
+
+    // Spells - boss spells
+    SPELL_INCINERATE            = 40239,
+    SPELL_CRUSHING_SHADOWS      = 40243,
+    SPELL_SHADOW_OF_DEATH       = 40251,
+    SPELL_BERSERK               = 45078,
+    SPELL_SUMMON_DOOM_BLOSSOM   = 40188,
+    SPELL_SUMMON_SKELETON_1     = 40270,
+    SPELL_SUMMON_SKELETON_2     = 41948,
+    SPELL_SUMMON_SKELETON_3     = 41949,
+    SPELL_SUMMON_SKELETON_4     = 41950,
+    SPELL_SUMMON_SPIRIT         = 40266,
+    SPELL_DESTROY_SPIRIT        = 41626,                    // purpose unk
+    SPELL_DESTROY_ALL_SPIRITS   = 44659,                    // purpose unk
+
+    // Spells - other
+    // SPELL_ATROPHY             = 40327,                   // Shadowy Constructs use this when they get within melee range of a player
+    SPELL_SHADOWY_CONSTRUCT     = 40326,
+
+    // NPC_DOOM_BLOSSOM          = 23123,                   // scripted in eventAI
+    NPC_SHADOWY_CONSTRUCT       = 23111,                    // scripted in eventAI
+    // NPC_VENGEFUL_SPIRIT       = 23109,                   // npc controlled by the dead player
+};
+
+struct boss_teron_gorefiend : public CreatureScript
+{
+    boss_teron_gorefiend() : CreatureScript("boss_teron_gorefiend") {}
+
+    struct boss_teron_gorefiendAI : public ScriptedAI
+    {
+        boss_teron_gorefiendAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIntroDone = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiIncinerateTimer;
+        uint32 m_uiSummonDoomBlossomTimer;
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiCrushingShadowsTimer;
+        uint32 m_uiShadowOfDeathTimer;
+
+        bool m_bIntroDone;
+
+        void Reset() override
+        {
+            m_uiIncinerateTimer = urand(20000, 30000);
+            m_uiSummonDoomBlossomTimer = urand(5000, 10000);
+            m_uiShadowOfDeathTimer = 10000;
+            m_uiCrushingShadowsTimer = 22000;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GOREFIEND, FAIL);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GOREFIEND, IN_PROGRESS);
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bIntroDone && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 60.0f))
+            {
+                DoScriptText(SAY_INTRO, m_creature);
+                m_bIntroDone = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GOREFIEND, DONE);
+            }
+
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SHADOWY_CONSTRUCT)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_SHADOWY_CONSTRUCT, true);
+            }
+
+            pSummoned->SetInCombatWithZone();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiSummonDoomBlossomTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_DOOM_BLOSSOM) == CAST_OK)
+                {
+                    if (urand(0, 1))
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_SPELL1 : SAY_SPELL2, m_creature);
+                    }
+
+                    m_uiSummonDoomBlossomTimer = 35000;
+                }
+            }
+            else
+            {
+                m_uiSummonDoomBlossomTimer -= uiDiff;
+            }
+
+            if (m_uiIncinerateTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+
+                if (DoCastSpellIfCan(pTarget ? pTarget : m_creature->getVictim(), SPELL_INCINERATE) == CAST_OK)
+                {
+                    m_uiIncinerateTimer = urand(20000, 50000);
+                }
+            }
+            else
+            {
+                m_uiIncinerateTimer -= uiDiff;
+            }
+
+            if (m_uiCrushingShadowsTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CRUSHING_SHADOWS) == CAST_OK)
+                {
+                    if (urand(0, 1))
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_SPECIAL1 : SAY_SPECIAL2, m_creature);
+                    }
+
+                    m_uiCrushingShadowsTimer = urand(10000, 26000);
+                }
+            }
+            else
+            {
+                m_uiCrushingShadowsTimer -= uiDiff;
+            }
+
+            if (m_uiShadowOfDeathTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_SHADOW_OF_DEATH, SELECT_FLAG_PLAYER))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_OF_DEATH) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_SPECIAL1 : SAY_SPECIAL2, m_creature);
+                        m_uiShadowOfDeathTimer = 30000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiShadowOfDeathTimer -= uiDiff;
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(SAY_ENRAGE, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_teron_gorefiendAI(pCreature);
+    }
+};
+
+void AddSC_boss_teron_gorefiend()
+{
+    Script* s;
+
+    s = new boss_teron_gorefiend();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_teron_gorefiend";
+    //pNewScript->GetAI = &GetAI_boss_teron_gorefiend;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/black_temple/boss_warlord_najentus.cpp b/src/modules/SD3/scripts/outland/black_temple/boss_warlord_najentus.cpp
new file mode 100644
index 000000000..1624dc603
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/black_temple/boss_warlord_najentus.cpp
@@ -0,0 +1,261 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Warlord_Najentus
+SD%Complete: 90
+SDComment: Core spell support for Needle Spine (spells 39992, 39835) missing, no change from SD3 needed
+SDCategory: Black Temple
+EndScriptData */
+
+#include "precompiled.h"
+#include "black_temple.h"
+
+enum
+{
+    SAY_AGGRO                       = -1564000,
+    SAY_NEEDLE1                     = -1564001,
+    SAY_NEEDLE2                     = -1564002,
+    SAY_SLAY1                       = -1564003,
+    SAY_SLAY2                       = -1564004,
+    SAY_SPECIAL1                    = -1564005,
+    SAY_SPECIAL2                    = -1564006,
+    SAY_ENRAGE1                     = -1564007,             // is this text actually in use?
+    SAY_ENRAGE2                     = -1564008,
+    SAY_DEATH                       = -1564009,
+
+    SPELL_CRASHINGWAVE              = 40100,
+    SPELL_NEEDLE_SPINE              = 39992,
+    SPELL_TIDAL_BURST               = 39878,
+    SPELL_TIDAL_SHIELD              = 39872,
+    SPELL_IMPALING_SPINE            = 39837,
+    SPELL_CREATE_NAJENTUS_SPINE     = 39956,
+    SPELL_HURL_SPINE                = 39948,
+    SPELL_BERSERK                   = 26662
+};
+
+struct boss_najentus : public CreatureScript
+{
+    boss_najentus() : CreatureScript("boss_najentus") {}
+
+    struct boss_najentusAI : public ScriptedAI
+    {
+        boss_najentusAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiNeedleSpineTimer;
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiSpecialYellTimer;
+        uint32 m_uiTidalShieldTimer;
+        uint32 m_uiImpalingSpineTimer;
+
+        bool m_bIsShielded;
+
+        void Reset() override
+        {
+            m_bIsShielded = false;
+
+            m_uiNeedleSpineTimer = 10000;
+            m_uiEnrageTimer = MINUTE * 8 * IN_MILLISECONDS;
+            m_uiSpecialYellTimer = urand(45000, 120000);
+            m_uiTidalShieldTimer = 60000;
+            m_uiImpalingSpineTimer = 20000;
+
+            SetCombatMovement(true);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NAJENTUS, NOT_STARTED);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NAJENTUS, DONE);
+            }
+
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            if (m_bIsShielded && pSpell->Id == SPELL_HURL_SPINE)
+            {
+                if (m_creature->HasAura(SPELL_TIDAL_SHIELD))
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_TIDAL_SHIELD);
+                }
+
+                DoCastSpellIfCan(m_creature, SPELL_TIDAL_BURST);
+                m_bIsShielded = false;
+
+                SetCombatMovement(true);
+                if (m_creature->getVictim())
+                {
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                }
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NAJENTUS, IN_PROGRESS);
+            }
+
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // If shield expired after 45s, attack again
+            if (m_bIsShielded && m_uiTidalShieldTimer < 16000 && !m_creature->HasAura(SPELL_TIDAL_SHIELD))
+            {
+                m_bIsShielded = false;
+
+                SetCombatMovement(true);
+                m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+            }
+
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BERSERK, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                {
+                    m_uiEnrageTimer = MINUTE * 8 * IN_MILLISECONDS;
+                    DoScriptText(SAY_ENRAGE2, m_creature);
+                }
+            }
+            else
+            {
+                m_uiEnrageTimer -= uiDiff;
+            }
+
+            if (m_uiSpecialYellTimer < uiDiff)
+            {
+                DoScriptText(urand(0, 1) ? SAY_SPECIAL1 : SAY_SPECIAL2, m_creature);
+                m_uiSpecialYellTimer = urand(25000, 100000);
+            }
+            else
+            {
+                m_uiSpecialYellTimer -= uiDiff;
+            }
+
+            if (m_uiImpalingSpineTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_IMPALING_SPINE, SELECT_FLAG_PLAYER);
+
+                if (!pTarget)
+                {
+                    pTarget = m_creature->getVictim();
+                }
+
+                if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
+                {
+                    DoCastSpellIfCan(pTarget, SPELL_IMPALING_SPINE);
+                    m_uiImpalingSpineTimer = 20000;
+
+                    DoScriptText(urand(0, 1) ? SAY_NEEDLE1 : SAY_NEEDLE2, m_creature);
+                }
+            }
+            else
+            {
+                m_uiImpalingSpineTimer -= uiDiff;
+            }
+
+            if (m_uiTidalShieldTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_TIDAL_SHIELD, CAST_INTERRUPT_PREVIOUS | CAST_TRIGGERED);
+
+                m_creature->GetMotionMaster()->Clear(false);
+                m_creature->GetMotionMaster()->MoveIdle();
+                SetCombatMovement(false);
+
+                m_bIsShielded = true;
+                m_uiTidalShieldTimer = 60000;
+
+                // Skip needle splines for 10s
+                m_uiNeedleSpineTimer += 10000;
+            }
+            else
+            {
+                m_uiTidalShieldTimer -= uiDiff;
+            }
+
+            // Needle
+            if (m_uiNeedleSpineTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_NEEDLE_SPINE) == CAST_OK)
+                {
+                    m_uiNeedleSpineTimer = 3000;
+                }
+            }
+            else
+            {
+                m_uiNeedleSpineTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_najentusAI(pCreature);
+    }
+};
+
+void AddSC_boss_najentus()
+{
+    Script* s;
+
+    s = new boss_najentus();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_najentus";
+    //pNewScript->GetAI = &GetAI_boss_najentus;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/black_temple/illidari_council.cpp b/src/modules/SD3/scripts/outland/black_temple/illidari_council.cpp
new file mode 100644
index 000000000..20e6b2d26
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/black_temple/illidari_council.cpp
@@ -0,0 +1,988 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Illidari_Council
+SD%Complete: 90
+SDComment: The shared health is done by workaround - proper spells are NYI.
+SDCategory: Black Temple
+EndScriptData */
+
+#include "precompiled.h"
+#include "black_temple.h"
+
+enum
+{
+    // Speech'n'Sounds
+    SAY_GATH_AGGRO              = -1564069,
+    SAY_GATH_SLAY               = -1564085,
+    SAY_GATH_SLAY_COMNT         = -1564089,
+    SAY_GATH_DEATH              = -1564093,
+    SAY_GATH_SPECIAL1           = -1564077,
+    SAY_GATH_SPECIAL2           = -1564081,
+    SAY_GATH_BERSERK            = -1564073,
+
+    SAY_VERA_AGGRO              = -1564070,
+    SAY_VERA_SLAY               = -1564086,
+    SAY_VERA_COMNT              = -1564089,
+    SAY_VERA_DEATH              = -1564094,
+    SAY_VERA_SPECIAL1           = -1564078,
+    SAY_VERA_SPECIAL2           = -1564082,
+    SAY_VERA_BERSERK            = -1564074,
+
+    SAY_MALA_AGGRO              = -1564071,
+    SAY_MALA_SLAY               = -1564087,
+    SAY_MALA_COMNT              = -1564090,
+    SAY_MALA_DEATH              = -1564095,
+    SAY_MALA_SPECIAL1           = -1564079,
+    SAY_MALA_SPECIAL2           = -1564083,
+    SAY_MALA_BERSERK            = -1564075,
+
+    SAY_ZERE_AGGRO              = -1564072,
+    SAY_ZERE_SLAY               = -1564088,
+    SAY_ZERE_COMNT              = -1564091,
+    SAY_ZERE_DEATH              = -1564096,
+    SAY_ZERE_SPECIAL1           = -1564080,
+    SAY_ZERE_SPECIAL2           = -1564084,
+    SAY_ZERE_BERSERK            = -1564076,
+
+    // High Nethermancer Zerevor's spells
+    SPELL_FLAMESTRIKE           = 41481,
+    SPELL_BLIZZARD              = 41482,
+    SPELL_ARCANE_BOLT           = 41483,
+    SPELL_ARCANE_EXPLOSION      = 41524,
+    SPELL_DAMPEN_MAGIC          = 41478,
+
+    // Lady Malande's spells
+    SPELL_EMPOWERED_SMITE       = 41471,
+    SPELL_CIRCLE_OF_HEALING     = 41455,
+    SPELL_REFLECTIVE_SHIELD     = 41475,
+    SPELL_DIVINE_WRATH          = 41472,
+
+    // Gathios the Shatterer's spells
+    SPELL_BLESS_PROTECTION      = 41450,
+    SPELL_BLESS_SPELLWARD       = 41451,
+    SPELL_CONSECRATION          = 41541,
+    SPELL_HAMMER_OF_JUSTICE     = 41468,
+    SPELL_SEAL_OF_COMMAND       = 41469,
+    SPELL_SEAL_OF_BLOOD         = 41459,
+    SPELL_CHROMATIC_AURA        = 41453,
+    SPELL_DEVOTION_AURA         = 41452,
+    SPELL_JUDGMENT              = 41467,                    // triggers 41473 (41470 or 41461)
+
+    // Veras Darkshadow's spells
+    SPELL_DEADLY_POISON         = 41485,
+    SPELL_ENVENOM               = 41487,
+    SPELL_VANISH_TELEPORT       = 41479,
+    SPELL_VANISH                = 41476,
+
+    SPELL_BERSERK               = 45078,
+    // SPELL_BALANCE_OF_POWER   = 41341,                    // somehow related to 41344
+    SPELL_SHARED_RULE_DAM       = 41342,
+    SPELL_SHARED_RULE_HEAL      = 41343,
+    SPELL_EMPYREAL_EQUIVALENCY  = 41333,
+    SPELL_EMPYREAL_BALANCE      = 41499,
+};
+
+static const DialogueEntry aCouncilDialogue[] =
+{
+    {SAY_GATH_AGGRO,    NPC_GATHIOS,        5000},
+    {SAY_VERA_AGGRO,    NPC_VERAS,          5500},
+    {SAY_MALA_AGGRO,    NPC_LADY_MALANDE,   5000},
+    {SAY_ZERE_AGGRO,    NPC_ZEREVOR,        0},
+    {SAY_GATH_BERSERK,  NPC_GATHIOS,        2000},
+    {SAY_VERA_BERSERK,  NPC_VERAS,          6000},
+    {SAY_MALA_BERSERK,  NPC_LADY_MALANDE,   5000},
+    {SAY_ZERE_BERSERK,  NPC_ZEREVOR,        0},
+    {0, 0, 0},
+};
+
+static const uint32 aCouncilMember[] = {NPC_GATHIOS, NPC_VERAS, NPC_LADY_MALANDE, NPC_ZEREVOR};
+
+/*######
+## mob_blood_elf_council_voice_trigger
+######*/
+
+struct mob_blood_elf_council_voice_trigger : public CreatureScript
+{
+    mob_blood_elf_council_voice_trigger() : CreatureScript("mob_blood_elf_council_voice_trigger") {}
+
+    struct mob_blood_elf_council_voice_triggerAI : public ScriptedAI
+    {
+        mob_blood_elf_council_voice_triggerAI(Creature* pCreature) : ScriptedAI(pCreature),
+        m_councilDialogue(aCouncilDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)(m_creature->GetInstanceData());
+            m_councilDialogue.InitializeDialogueHelper(m_pInstance);
+        }
+
+        ScriptedInstance* m_pInstance;
+        DialogueHelper m_councilDialogue;
+
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiAggroYellTimer;
+
+        void Reset() override
+        {
+            m_uiEnrageTimer = 0;
+            m_uiAggroYellTimer = 0;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit *pInvoker, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender->GetEntry() == NPC_ILLIDARI_COUNCIL)
+            {
+                m_uiAggroYellTimer = 500;
+                m_uiEnrageTimer = 15 * MINUTE * IN_MILLISECONDS;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            m_councilDialogue.DialogueUpdate(uiDiff);
+
+            if (m_uiAggroYellTimer)
+            {
+                if (m_uiAggroYellTimer <= uiDiff)
+                {
+                    // Start yells
+                    m_councilDialogue.StartNextDialogueText(SAY_GATH_AGGRO);
+                    m_uiAggroYellTimer = 0;
+                }
+                else
+                {
+                    m_uiAggroYellTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiEnrageTimer)
+            {
+                if (m_uiEnrageTimer <= uiDiff)
+                {
+                    // Cast berserk on all members
+                    for (uint8 i = 0; i < 4; ++i)
+                    {
+                        if (Creature* pMember = m_pInstance->GetSingleCreatureFromStorage(aCouncilMember[i]))
+                        {
+                            pMember->CastSpell(pMember, SPELL_BERSERK, true);
+                        }
+                    }
+                    // Start yells
+                    m_councilDialogue.StartNextDialogueText(SAY_GATH_BERSERK);
+                    m_uiEnrageTimer = 0;
+                }
+                else
+                {
+                    m_uiEnrageTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_blood_elf_council_voice_triggerAI(pCreature);
+    }
+};
+
+/*######
+## mob_illidari_council
+######*/
+
+struct mob_illidari_council : public CreatureScript
+{
+    mob_illidari_council() : CreatureScript("mob_illidari_council") {}
+
+    struct mob_illidari_councilAI : public ScriptedAI
+    {
+        mob_illidari_councilAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiEquivalencyTimer;
+
+        bool m_bEventBegun;
+        bool m_bEventEnd;
+
+        void Reset() override
+        {
+            m_bEventBegun = false;
+            m_bEventEnd = false;
+
+            m_uiEquivalencyTimer = urand(2000, 3000);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoEndEvent();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_COUNCIL, DONE);
+            }
+        }
+
+        void DoStartEvent()
+        {
+            if (!m_pInstance || m_bEventBegun)
+            {
+                return;
+            }
+
+            // Prevent further handling for next council uiMember aggroing
+            m_bEventBegun = true;
+
+            // Start the event for the Voice Trigger
+            if (Creature* pVoiceTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_COUNCIL_VOICE))
+            {
+                SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pVoiceTrigger);
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_EMPYREAL_BALANCE);
+        }
+
+        void DoEndEvent()
+        {
+            if (!m_pInstance || m_bEventEnd)
+            {
+                return;
+            }
+
+            // Prevent further handling for next council uiMember death
+            m_bEventEnd = true;
+
+            // Kill all the other council members
+            for (uint8 i = 0; i < 4; ++i)
+            {
+                Creature* pMember = m_pInstance->GetSingleCreatureFromStorage(aCouncilMember[i]);
+                if (pMember && pMember->IsAlive())
+                {
+                    pMember->DealDamage(pMember, pMember->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                }
+            }
+
+            // Self kill the voice trigger and the controller
+            if (Creature* pVoiceTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_COUNCIL_VOICE))
+            {
+                pVoiceTrigger->DealDamage(pVoiceTrigger, pVoiceTrigger->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+            }
+
+            m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit *pInvoker, uint32 /*data*/) override
+        {
+            if (pSender == pInvoker)
+            {
+                switch (eventType)
+                {
+                case AI_EVENT_CUSTOM_A:
+                    DoStartEvent();
+                    break;
+                case AI_EVENT_CUSTOM_B:
+                    DoEndEvent();
+                    break;
+                default:
+                    break;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Make the council members health equal every 2-3 secs
+            if (m_bEventBegun && !m_bEventEnd)
+            {
+                if (m_uiEquivalencyTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_EMPYREAL_EQUIVALENCY) == CAST_OK)
+                    {
+                        m_uiEquivalencyTimer = urand(2000, 3000);
+                    }
+                }
+                else
+                {
+                    m_uiEquivalencyTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_illidari_councilAI(pCreature);
+    }
+};
+
+/*######
+## boss_illidari_council : common AI part
+######*/
+
+struct boss_illidari_councilAI : public ScriptedAI
+{
+    boss_illidari_councilAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+    }
+
+    ScriptedInstance* m_pInstance;
+
+    void Aggro(Unit* /*pWho*/) override
+    {
+        if (m_pInstance)
+        {
+            // Note: council aggro handled by creature linking
+
+            if (Creature* pController = m_pInstance->GetSingleCreatureFromStorage(NPC_ILLIDARI_COUNCIL))
+            {
+                SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pController);
+            }
+
+            m_pInstance->SetData(TYPE_COUNCIL, IN_PROGRESS);
+        }
+    }
+
+    void JustDied(Unit* /*pKiller*/) override
+    {
+        if (m_pInstance)
+        {
+            if (Creature* pController = m_pInstance->GetSingleCreatureFromStorage(NPC_ILLIDARI_COUNCIL))
+            {
+                SendAIEvent(AI_EVENT_CUSTOM_B, m_creature, pController);
+            }
+
+            m_pInstance->SetData(TYPE_COUNCIL, DONE);
+        }
+    }
+
+    void JustReachedHome() override
+    {
+        if (m_pInstance)
+        {
+            // Note: council respawn handled by creature linking
+
+            if (Creature* pVoiceTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_COUNCIL_VOICE))
+            { pVoiceTrigger->AI()->EnterEvadeMode(); }
+
+            if (Creature* pController = m_pInstance->GetSingleCreatureFromStorage(NPC_ILLIDARI_COUNCIL))
+            { pController->AI()->EnterEvadeMode(); }
+
+            m_pInstance->SetData(TYPE_COUNCIL, FAIL);
+        }
+    }
+
+#if defined (CLASSIC) || defined (TBC)
+    void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+#endif
+#if defined (WOTLK) || defined (CATA)
+    void DamageTaken(Unit* /* pDoneBy */, uint32& uiDamage) override
+#endif
+    {
+        int32 uiDamageTaken = (int32)uiDamage;
+        m_creature->CastCustomSpell(m_creature, SPELL_SHARED_RULE_DAM, &uiDamageTaken, NULL, NULL, true);
+    }
+
+#if defined (CLASSIC) || defined (TBC)
+    void HealedBy(Unit* pHealer, uint32& uiHealedAmount) override
+#endif
+#if defined (WOTLK) || defined (CATA)
+    void HealedBy(Unit* /* pHealer */, uint32& uiHealedAmount) override
+#endif
+    {
+        int32 uHealTaken = (int32)uiHealedAmount;
+        m_creature->CastCustomSpell(m_creature, SPELL_SHARED_RULE_HEAL, &uHealTaken, NULL, NULL, true);
+    }
+};
+
+/*######
+## boss_gathios_the_shatterer
+######*/
+
+struct boss_gathios_the_shatterer : public CreatureScript
+{
+    boss_gathios_the_shatterer() : CreatureScript("boss_gathios_the_shatterer") {}
+
+    struct boss_gathios_the_shattererAI : public boss_illidari_councilAI
+    {
+        boss_gathios_the_shattererAI(Creature* pCreature) : boss_illidari_councilAI(pCreature) { }
+
+        uint32 m_uiConsecrationTimer;
+        uint32 m_uiHammerOfJusticeTimer;
+        uint32 m_uiSealTimer;
+        uint32 m_uiAuraTimer;
+        uint32 m_uiBlessingTimer;
+        uint32 m_uiJudgmentTimer;
+
+        void Reset() override
+        {
+            m_uiConsecrationTimer = 40000;
+            m_uiHammerOfJusticeTimer = 10000;
+            m_uiSealTimer = 40000;
+            m_uiAuraTimer = 90000;
+            m_uiBlessingTimer = 60000;
+            m_uiJudgmentTimer = 0;
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_GATH_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            DoScriptText(SAY_GATH_DEATH, m_creature);
+
+            boss_illidari_councilAI::JustDied(pKiller);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiBlessingTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(80.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, urand(0, 1) ? SPELL_BLESS_SPELLWARD : SPELL_BLESS_PROTECTION) == CAST_OK)
+                    {
+                        m_uiBlessingTimer = 60000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiBlessingTimer -= uiDiff;
+            }
+
+            if (m_uiConsecrationTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CONSECRATION) == CAST_OK)
+                {
+                    m_uiConsecrationTimer = urand(10000, 15000);
+                }
+            }
+            else
+            {
+                m_uiConsecrationTimer -= uiDiff;
+            }
+
+            if (m_uiHammerOfJusticeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_HAMMER_OF_JUSTICE, SELECT_FLAG_PLAYER | SELECT_FLAG_NOT_IN_MELEE_RANGE))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_HAMMER_OF_JUSTICE) == CAST_OK)
+                    {
+                        m_uiHammerOfJusticeTimer = 20000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiHammerOfJusticeTimer -= uiDiff;
+            }
+
+            if (m_uiSealTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, urand(0, 1) ? SPELL_SEAL_OF_COMMAND : SPELL_SEAL_OF_BLOOD) == CAST_OK)
+                {
+                    m_uiSealTimer = 40000;
+
+                    if (urand(0, 1))
+                    {
+                        m_uiJudgmentTimer = urand(4000, 7000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiSealTimer -= uiDiff;
+            }
+
+            if (m_uiAuraTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, urand(0, 1) ? SPELL_DEVOTION_AURA : SPELL_CHROMATIC_AURA) == CAST_OK)
+                {
+                    m_uiAuraTimer = 90000;
+                }
+            }
+            else
+            {
+                m_uiAuraTimer -= uiDiff;
+            }
+
+            if (m_uiJudgmentTimer)
+            {
+                if (m_uiJudgmentTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_JUDGMENT) == CAST_OK)
+                    {
+                        m_uiJudgmentTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiJudgmentTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_gathios_the_shattererAI(pCreature);
+    }
+};
+
+/*######
+## boss_high_nethermancer_zerevor
+######*/
+
+struct boss_high_nethermancer_zerevor : public CreatureScript
+{
+    boss_high_nethermancer_zerevor() : CreatureScript("boss_high_nethermancer_zerevor") {}
+
+    struct boss_high_nethermancer_zerevorAI : public boss_illidari_councilAI
+    {
+        boss_high_nethermancer_zerevorAI(Creature* pCreature) : boss_illidari_councilAI(pCreature) { }
+
+        uint32 m_uiBlizzardTimer;
+        uint32 m_uiFlamestrikeTimer;
+        uint32 m_uiArcaneBoltTimer;
+        uint32 m_uiDampenMagicTimer;
+        uint32 m_uiArcaneExplosionTimer;
+
+        void Reset() override
+        {
+            m_uiBlizzardTimer = urand(10000, 20000);
+            m_uiFlamestrikeTimer = urand(10000, 20000);
+            m_uiArcaneBoltTimer = 3000;
+            m_uiDampenMagicTimer = 2000;
+            m_uiArcaneExplosionTimer = 13000;
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                DoStartMovement(pWho, 20.0f);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_ZERE_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            DoScriptText(SAY_ZERE_DEATH, m_creature);
+
+            boss_illidari_councilAI::JustDied(pKiller);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiDampenMagicTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DAMPEN_MAGIC) == CAST_OK)
+                {
+                    m_uiDampenMagicTimer = 110000;
+                }              // Almost 2 minutes
+            }
+            else
+            {
+                m_uiDampenMagicTimer -= uiDiff;
+            }
+
+            if (m_uiArcaneExplosionTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_EXPLOSION) == CAST_OK)
+                {
+                    m_uiArcaneExplosionTimer = urand(5000, 15000);
+                }
+            }
+            else
+            {
+                m_uiArcaneExplosionTimer -= uiDiff;
+            }
+
+            if (m_uiArcaneBoltTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ARCANE_BOLT) == CAST_OK)
+                {
+                    m_uiArcaneBoltTimer = 3000;
+                }
+            }
+            else
+            {
+                m_uiArcaneBoltTimer -= uiDiff;
+            }
+
+            if (m_uiBlizzardTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_BLIZZARD) == CAST_OK)
+                    {
+                        m_uiBlizzardTimer = urand(5000, 15000);
+                        m_uiFlamestrikeTimer += 5000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiBlizzardTimer -= uiDiff;
+            }
+
+            if (m_uiFlamestrikeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_FLAMESTRIKE) == CAST_OK)
+                    {
+                        m_uiFlamestrikeTimer = urand(5000, 15000);
+                        m_uiBlizzardTimer += 5000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiFlamestrikeTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_high_nethermancer_zerevorAI(pCreature);
+    }
+};
+
+/*######
+## boss_lady_malande
+######*/
+
+struct boss_lady_malande : public CreatureScript
+{
+    boss_lady_malande() : CreatureScript("boss_lady_malande") {}
+
+    struct boss_lady_malandeAI : public boss_illidari_councilAI
+    {
+        boss_lady_malandeAI(Creature* pCreature) : boss_illidari_councilAI(pCreature) { }
+
+        uint32 m_uiEmpoweredSmiteTimer;
+        uint32 m_uiCircleOfHealingTimer;
+        uint32 m_uiDivineWrathTimer;
+        uint32 m_uiReflectiveShieldTimer;
+
+        void Reset() override
+        {
+            m_uiEmpoweredSmiteTimer = 10000;
+            m_uiCircleOfHealingTimer = 20000;
+            m_uiDivineWrathTimer = 5000;
+            m_uiReflectiveShieldTimer = 0;
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                DoStartMovement(pWho, 20.0f);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_MALA_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            DoScriptText(SAY_MALA_DEATH, m_creature);
+
+            boss_illidari_councilAI::JustDied(pKiller);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiEmpoweredSmiteTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_EMPOWERED_SMITE) == CAST_OK)
+                    {
+                        m_uiEmpoweredSmiteTimer = urand(5000, 15000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiEmpoweredSmiteTimer -= uiDiff;
+            }
+
+            if (m_uiCircleOfHealingTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CIRCLE_OF_HEALING) == CAST_OK)
+                {
+                    m_uiCircleOfHealingTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiCircleOfHealingTimer -= uiDiff;
+            }
+
+            if (m_uiDivineWrathTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_DIVINE_WRATH) == CAST_OK)
+                    {
+                        m_uiDivineWrathTimer = urand(2000, 5000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiDivineWrathTimer -= uiDiff;
+            }
+
+            if (m_uiReflectiveShieldTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_REFLECTIVE_SHIELD) == CAST_OK)
+                {
+                    m_uiReflectiveShieldTimer = urand(30000, 40000);
+                }
+            }
+            else
+            {
+                m_uiReflectiveShieldTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_lady_malandeAI(pCreature);
+    }
+};
+
+/*######
+## boss_veras_darkshadow
+######*/
+
+struct boss_veras_darkshadow : public CreatureScript
+{
+    boss_veras_darkshadow() : CreatureScript("boss_veras_darkshadow") {}
+
+    struct boss_veras_darkshadowAI : public boss_illidari_councilAI
+    {
+        boss_veras_darkshadowAI(Creature* pCreature) : boss_illidari_councilAI(pCreature) { }
+
+        uint32 m_uiDeadlyPoisonTimer;
+        uint32 m_uiVanishTimer;
+        uint32 m_uiVanishEndtimer;
+        uint32 m_uiEnvenomTimer;
+
+        void Reset() override
+        {
+            m_uiDeadlyPoisonTimer = 1000;
+            m_uiVanishTimer = urand(30000, 40000);
+            m_uiEnvenomTimer = 5000;
+            m_uiVanishEndtimer = 0;
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_VERA_SLAY, m_creature);
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            DoScriptText(SAY_VERA_DEATH, m_creature);
+
+            boss_illidari_councilAI::JustDied(pKiller);
+        }
+
+        void EnterEvadeMode() override
+        {
+            if (m_uiVanishEndtimer)
+            {
+                return;
+            }
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiVanishEndtimer)
+            {
+                if (m_uiVanishEndtimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_VANISH_TELEPORT) == CAST_OK)
+                    {
+                        DoResetThreat();
+                        m_uiVanishEndtimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiVanishEndtimer -= uiDiff;
+                }
+
+                // no more abilities during vanish
+                return;
+            }
+
+            if (m_uiDeadlyPoisonTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DEADLY_POISON) == CAST_OK)
+                {
+                    m_uiDeadlyPoisonTimer = urand(4000, 7000);
+                }
+            }
+            else
+            {
+                m_uiDeadlyPoisonTimer -= uiDiff;
+            }
+
+            if (m_uiEnvenomTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ENVENOM) == CAST_OK)
+                {
+                    m_uiEnvenomTimer = 5000;
+                }
+            }
+            else
+            {
+                m_uiEnvenomTimer -= uiDiff;
+            }
+
+            if (m_uiVanishTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_VANISH) == CAST_OK)
+                {
+                    m_uiVanishTimer = urand(30000, 40000);
+                    m_uiVanishEndtimer = 1000;
+                }
+            }
+            else
+            {
+                m_uiVanishTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_veras_darkshadowAI(pCreature);
+    }
+};
+
+void AddSC_boss_illidari_council()
+{
+    Script* s;
+
+    s = new mob_illidari_council();
+    s->RegisterSelf();
+    s = new mob_blood_elf_council_voice_trigger();
+    s->RegisterSelf();
+    s = new boss_gathios_the_shatterer();
+    s->RegisterSelf();
+    s = new boss_lady_malande();
+    s->RegisterSelf();
+    s = new boss_veras_darkshadow();
+    s->RegisterSelf();
+    s = new boss_high_nethermancer_zerevor();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_illidari_council";
+    //pNewScript->GetAI = &GetAI_mob_illidari_council;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_blood_elf_council_voice_trigger";
+    //pNewScript->GetAI = &GetAI_mob_blood_elf_council_voice_trigger;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_gathios_the_shatterer";
+    //pNewScript->GetAI = &GetAI_boss_gathios_the_shatterer;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_lady_malande";
+    //pNewScript->GetAI = &GetAI_boss_lady_malande;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_veras_darkshadow";
+    //pNewScript->GetAI = &GetAI_boss_veras_darkshadow;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_high_nethermancer_zerevor";
+    //pNewScript->GetAI = &GetAI_boss_high_nethermancer_zerevor;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/black_temple/instance_black_temple.cpp b/src/modules/SD3/scripts/outland/black_temple/instance_black_temple.cpp
new file mode 100644
index 000000000..55c8793f5
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/black_temple/instance_black_temple.cpp
@@ -0,0 +1,433 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Black_Temple
+SD%Complete: 100
+SDComment: Instance Data Scripts and functions to acquire mobs and set encounter status for use in various Black Temple Scripts
+SDCategory: Black Temple
+EndScriptData */
+
+#include "precompiled.h"
+#include "black_temple.h"
+
+/* Black Temple encounters:
+0 - High Warlord Naj'entus event
+1 - Supremus Event
+2 - Shade of Akama Event
+3 - Teron Gorefiend Event
+4 - Gurtogg Bloodboil Event
+5 - Reliquary Of Souls Event
+6 - Mother Shahraz Event
+7 - Illidari Council Event
+8 - Illidan Stormrage Event
+*/
+
+struct is_black_temple : public InstanceScript
+{
+    is_black_temple() : InstanceScript("instance_black_temple") {}
+
+    class instance_black_temple : public ScriptedInstance
+    {
+    public:
+        instance_black_temple(Map* pMap) : ScriptedInstance(pMap)
+        {
+            Initialize();
+        };
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            DoSpawnAkamaIfCan();
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_SPIRIT_OF_OLUM:
+            case NPC_SPIRIT_OF_UDALO:
+                // Use only the summoned versions
+                if (!pCreature->IsTemporarySummon())
+                {
+                    break;
+                }
+            case NPC_AKAMA:
+            case NPC_ILLIDAN_STORMRAGE:
+            case NPC_MAIEV_SHADOWSONG:
+            case NPC_AKAMA_SHADE:
+            case NPC_SHADE_OF_AKAMA:
+            case NPC_RELIQUARY_OF_SOULS:
+            case NPC_GATHIOS:
+            case NPC_ZEREVOR:
+            case NPC_LADY_MALANDE:
+            case NPC_VERAS:
+            case NPC_ILLIDARI_COUNCIL:
+            case NPC_COUNCIL_VOICE:
+            case NPC_ILLIDAN_DOOR_TRIGGER:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_ASH_CHANNELER:
+                m_lChannelersGuidList.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_CREATURE_GENERATOR:
+                m_vCreatureGeneratorGuidVector.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_GLAIVE_TARGET:
+                m_vGlaiveTargetGuidVector.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_NAJENTUS_GATE:                              // Gate past Naj'entus (at the entrance to Supermoose's courtyards)
+                if (m_auiEncounter[TYPE_NAJENTUS] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_SUPREMUS_DOORS:                             // Main Temple Doors - right past Supermoose (Supremus)
+                if (m_auiEncounter[TYPE_SUPREMUS] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_SHADE_OF_AKAMA:                             // Door close during encounter
+            case GO_GOREFIEND_DOOR:                             // Door close during encounter
+                break;
+            case GO_GURTOGG_DOOR:                               // Door opens after encounter
+                if (m_auiEncounter[TYPE_BLOODBOIL] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_PRE_SHAHRAZ_DOOR:                           // Door leading to Mother Shahraz
+                if (m_auiEncounter[TYPE_SHADE] == DONE && m_auiEncounter[TYPE_GOREFIEND] == DONE && m_auiEncounter[TYPE_BLOODBOIL] == DONE && m_auiEncounter[TYPE_RELIQUIARY] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_POST_SHAHRAZ_DOOR:                          // Door after shahraz
+                if (m_auiEncounter[TYPE_SHAHRAZ] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_PRE_COUNCIL_DOOR:                           // Door leading to the Council (grand promenade)
+            case GO_COUNCIL_DOOR:                               // Door leading to the Council (inside)
+            case GO_ILLIDAN_GATE:                               // Gate leading to Temple Summit
+            case GO_ILLIDAN_DOOR_R:                             // Right door at Temple Summit
+            case GO_ILLIDAN_DOOR_L:                             // Left door at Temple Summit
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_NAJENTUS:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_NAJENTUS_GATE);
+                }
+                break;
+            case TYPE_SUPREMUS:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_SUPREMUS_DOORS);
+                }
+                break;
+            case TYPE_SHADE:
+                m_auiEncounter[uiType] = uiData;
+                // combat door
+                DoUseDoorOrButton(GO_SHADE_OF_AKAMA);
+                if (uiData == FAIL)
+                {
+                    // Reset channelers on fail
+                    for (GuidList::const_iterator itr = m_lChannelersGuidList.begin(); itr != m_lChannelersGuidList.end(); ++itr)
+                    {
+                        if (Creature* pChanneler = instance->GetCreature(*itr))
+                        {
+                            if (!pChanneler->IsAlive())
+                            {
+                                pChanneler->Respawn();
+                            }
+                            else
+                            {
+                                pChanneler->AI()->EnterEvadeMode();
+                            }
+                        }
+                    }
+                }
+                if (uiData == DONE)
+                {
+                    DoOpenPreMotherDoor();
+                }
+                break;
+            case TYPE_GOREFIEND:
+                m_auiEncounter[uiType] = uiData;
+                DoUseDoorOrButton(GO_GOREFIEND_DOOR);
+                if (uiData == DONE)
+                {
+                    DoOpenPreMotherDoor();
+                }
+                break;
+            case TYPE_BLOODBOIL:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoOpenPreMotherDoor();
+                    DoUseDoorOrButton(GO_GURTOGG_DOOR);
+                }
+                break;
+            case TYPE_RELIQUIARY:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoOpenPreMotherDoor();
+                }
+                break;
+            case TYPE_SHAHRAZ:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_POST_SHAHRAZ_DOOR);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_COUNCIL:
+                // Don't set the same data twice
+                if (m_auiEncounter[uiType] == uiData)
+                {
+                    return;
+                }
+                DoUseDoorOrButton(GO_COUNCIL_DOOR);
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoSpawnAkamaIfCan();
+                }
+                break;
+            case TYPE_ILLIDAN:
+                DoUseDoorOrButton(GO_ILLIDAN_DOOR_R);
+                DoUseDoorOrButton(GO_ILLIDAN_DOOR_L);
+                if (uiData == FAIL)
+                {
+                    // Cleanup encounter
+                    DoSpawnAkamaIfCan();
+                    DoUseDoorOrButton(GO_ILLIDAN_GATE);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_CHANNELERS:
+                for (GuidList::const_iterator itr = m_lChannelersGuidList.begin(); itr != m_lChannelersGuidList.end(); ++itr)
+                {
+                    if (Creature* pChanneler = instance->GetCreature(*itr))
+                    {
+                        pChanneler->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    }
+                }
+                return;
+            default:
+                script_error_log("Instance Black Temple: ERROR SetData = %u for type %u does not exist/not implemented.", uiType, uiData);
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " "
+                    << m_auiEncounter[6] << " " << m_auiEncounter[7] << " " << m_auiEncounter[8];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        void SetData64(uint32 type, uint64 data) override
+        {
+            if (type == TYPE_CHANNELERS)
+            {
+                if (Creature *akama = instance->GetCreature(ObjectGuid(data)))
+                {
+                    float fX, fY, fZ;
+                    // Spawn 4 Brokens at each generator
+                    for (uint8 i = 0; i < m_vCreatureGeneratorGuidVector.size(); ++i)
+                    {
+                        if (Creature* pGenerator = instance->GetCreature(m_vCreatureGeneratorGuidVector[i]))
+                        {
+                            for (uint8 j = 0; j < 4; ++j)
+                            {
+                                pGenerator->GetRandomPoint(pGenerator->GetPositionX(), pGenerator->GetPositionY(), pGenerator->GetPositionZ(), 10.0f, fX, fY, fZ);
+                                akama->SummonCreature(NPC_ASH_BROKEN, fX, fY, fZ, 0, TEMPSUMMON_TIMED_DESPAWN, 10 * MINUTE * IN_MILLISECONDS);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        uint64 GetData64(uint32 type) const override
+        {
+            switch (type)
+            {
+            case TYPE_GLAIVE_1:
+                return m_vGlaiveTargetGuidVector[0].GetRawValue();
+            case TYPE_GLAIVE_2:
+                return m_vGlaiveTargetGuidVector[1].GetRawValue();
+            case TYPE_CHANNELERS:
+                return m_vCreatureGeneratorGuidVector[urand(0, 1)].GetRawValue();
+            default:
+                break;
+            }
+            return 0;
+        }
+
+        void GetChannelersGuidList(GuidList& lList) { lList = m_lChannelersGuidList; }
+        void GetGeneratorGuidVector(GuidVector& vVector) { vVector = m_vCreatureGeneratorGuidVector; }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7] >> m_auiEncounter[8];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)            // Do not load an encounter as "In Progress" - reset it instead.
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        void DoOpenPreMotherDoor()
+        {
+            if (GetData(TYPE_SHADE) == DONE && GetData(TYPE_GOREFIEND) == DONE && GetData(TYPE_BLOODBOIL) == DONE && GetData(TYPE_RELIQUIARY) == DONE)
+            {
+                DoUseDoorOrButton(GO_PRE_SHAHRAZ_DOOR);
+            }
+        }
+
+        void DoSpawnAkamaIfCan()
+        {
+            if (GetData(TYPE_ILLIDAN) == DONE || GetData(TYPE_COUNCIL) != DONE)
+            {
+                return;
+            }
+
+            // If already spawned return
+            if (GetSingleCreatureFromStorage(NPC_AKAMA, true))
+            {
+                return;
+            }
+
+            // Summon Akama after the council has been defeated
+            if (Player* pPlayer = GetPlayerInMap())
+            {
+                pPlayer->SummonCreature(NPC_AKAMA, 617.754f, 307.768f, 271.735f, 6.197f, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        GuidList m_lChannelersGuidList;
+        GuidVector m_vCreatureGeneratorGuidVector;
+        GuidVector m_vGlaiveTargetGuidVector;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_black_temple(pMap);
+    }
+};
+
+void AddSC_instance_black_temple()
+{
+    Script* s;
+
+    s = new is_black_temple();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_black_temple";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_black_temple;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/blades_edge_mountains.cpp b/src/modules/SD3/scripts/outland/blades_edge_mountains.cpp
new file mode 100644
index 000000000..9502632d9
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/blades_edge_mountains.cpp
@@ -0,0 +1,935 @@
+/**
+ * ScriptDev2 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Blades_Edge_Mountains
+SD%Complete: 90
+SDComment: Quest support: 10503, 10504, 10512, 10545, 10556, 10609, 11058, 11080. (npc_daranelle needs bit more work before consider complete)
+SDCategory: Blade's Edge Mountains
+EndScriptData */
+
+/* ContentData
+mobs_nether_drake
+npc_daranelle
+npc_bloodmaul_stout_trigger
+npc_simon_game_bunny
+EndContentData */
+
+#include "precompiled.h"
+#include "TemporarySummon.h"
+
+/*######
+## mobs_nether_drake
+######*/
+
+enum
+{
+    SAY_NIHIL_1                 = -1000169,
+    SAY_NIHIL_2                 = -1000170,
+    SAY_NIHIL_3                 = -1000171,
+    SAY_NIHIL_4                 = -1000172,
+    SAY_NIHIL_INTERRUPT         = -1000173,
+
+    MAX_ENTRIES                 = 4,
+
+    NPC_PROTO                   = 21821,
+    NPC_ADOLESCENT              = 21817,
+    NPC_MATURE                  = 21820,
+    NPC_NIHIL                   = 21823,
+
+    SPELL_T_PHASE_MODULATOR     = 37573,
+
+    SPELL_ARCANE_BLAST          = 38881,
+    SPELL_MANA_BURN             = 38884,
+    SPELL_INTANGIBLE_PRESENCE   = 36513,
+};
+
+static const uint32 aNetherDrakeEntries[MAX_ENTRIES] = {NPC_PROTO, NPC_ADOLESCENT, NPC_MATURE, NPC_NIHIL};
+
+struct mobs_nether_drake : public CreatureScript
+{
+    mobs_nether_drake() : CreatureScript("mobs_nether_drake") {}
+
+    struct mobs_nether_drakeAI : public ScriptedAI
+    {
+        mobs_nether_drakeAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        bool m_bIsNihil;
+        uint32 m_uiNihilSpeechTimer;
+        uint32 m_uiNihilSpeechPhase;
+
+        uint32 m_uiArcaneBlastTimer;
+        uint32 m_uiManaBurnTimer;
+        uint32 m_uiIntangiblePresenceTimer;
+
+        void Reset() override
+        {
+            m_bIsNihil = false;
+            m_uiNihilSpeechTimer = 3000;
+            m_uiNihilSpeechPhase = 0;
+
+            m_uiArcaneBlastTimer = 7500;
+            m_uiManaBurnTimer = 10000;
+            m_uiIntangiblePresenceTimer = 15000;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+            {
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        // in case creature was not summoned (not expected)
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            if (uiPointId)
+            {
+                m_creature->ForcedDespawn();
+            }
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_T_PHASE_MODULATOR && pCaster->GetTypeId() == TYPEID_PLAYER)
+            {
+                // we are nihil, so say before transform
+                if (m_creature->GetEntry() == NPC_NIHIL)
+                {
+                    DoScriptText(SAY_NIHIL_INTERRUPT, m_creature);
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                    m_bIsNihil = false;
+                }
+
+                // choose a new entry
+                uint8 uiIndex = urand(0, MAX_ENTRIES - 1);
+
+                // If we choose the same entry, try again
+                while (aNetherDrakeEntries[uiIndex] == m_creature->GetEntry())
+                {
+                    uiIndex = urand(0, MAX_ENTRIES - 1);
+                }
+
+                if (m_creature->UpdateEntry(aNetherDrakeEntries[uiIndex]))
+                {
+                    // Nihil does only dialogue
+                    if (aNetherDrakeEntries[uiIndex] == NPC_NIHIL)
+                    {
+                        EnterEvadeMode();
+                        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                        m_bIsNihil = true;
+                    }
+                    else
+                    {
+                        AttackStart(pCaster);
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_bIsNihil)
+            {
+                if (m_uiNihilSpeechTimer < uiDiff)
+                {
+                    switch (m_uiNihilSpeechPhase)
+                    {
+                    case 0:
+                        DoScriptText(SAY_NIHIL_1, m_creature);
+                        break;
+                    case 1:
+                        DoScriptText(SAY_NIHIL_2, m_creature);
+                        break;
+                    case 2:
+                        DoScriptText(SAY_NIHIL_3, m_creature);
+                        break;
+                    case 3:
+                        DoScriptText(SAY_NIHIL_4, m_creature);
+                        break;
+                    case 4:
+                        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                        // take off to location above
+                        m_creature->SetLevitate(true);
+                        m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+                        m_creature->GetMotionMaster()->MovePoint(1, m_creature->GetPositionX() + 50.0f, m_creature->GetPositionY(), m_creature->GetPositionZ() + 50.0f);
+                        break;
+                    }
+                    ++m_uiNihilSpeechPhase;
+                    m_uiNihilSpeechTimer = 5000;
+                }
+                else
+                {
+                    m_uiNihilSpeechTimer -= uiDiff;
+                }
+
+                // anything below here is not interesting for Nihil, so skip it
+                return;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiIntangiblePresenceTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_INTANGIBLE_PRESENCE) == CAST_OK)
+                {
+                    m_uiIntangiblePresenceTimer = urand(15000, 30000);
+                }
+            }
+            else
+            {
+                m_uiIntangiblePresenceTimer -= uiDiff;
+            }
+
+            if (m_uiManaBurnTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_MANA_BURN, SELECT_FLAG_POWER_MANA))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_MANA_BURN) == CAST_OK)
+                    {
+                        m_uiManaBurnTimer = urand(8000, 16000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiManaBurnTimer -= uiDiff;
+            }
+
+            if (m_uiArcaneBlastTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ARCANE_BLAST) == CAST_OK)
+                {
+                    m_uiArcaneBlastTimer = urand(2500, 7500);
+                }
+            }
+            else
+            {
+                m_uiArcaneBlastTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mobs_nether_drakeAI(pCreature);
+    }
+};
+
+/*######
+## npc_daranelle
+######*/
+
+enum
+{
+    SAY_SPELL_INFLUENCE     = -1000174,
+    NPC_KALIRI_AURA_DISPEL  = 21511,
+    SPELL_LASHHAN_CHANNEL   = 36904
+};
+
+struct npc_daranelle : public CreatureScript
+{
+    npc_daranelle() : CreatureScript("npc_daranelle") {}
+
+    struct npc_daranelleAI : public ScriptedAI
+    {
+        npc_daranelleAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (pWho->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (pWho->HasAura(SPELL_LASHHAN_CHANNEL, EFFECT_INDEX_0) && m_creature->IsWithinDistInMap(pWho, 10.0f))
+                {
+                    DoScriptText(SAY_SPELL_INFLUENCE, m_creature, pWho);
+
+                    // TODO: Move the below to updateAI and run if this statement == true
+                    ((Player*)pWho)->KilledMonsterCredit(NPC_KALIRI_AURA_DISPEL, m_creature->GetObjectGuid());
+                    pWho->RemoveAurasDueToSpell(SPELL_LASHHAN_CHANNEL);
+                }
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_daranelleAI(pCreature);
+    }
+};
+
+/*######
+## npc_bloodmaul_stout_trigger
+######*/
+
+enum
+{
+    SAY_BREW_1                  = -1000156,
+    SAY_BREW_2                  = -1000207,
+    SAY_BREW_3                  = -1000208,
+
+    SPELL_INTOXICATION          = 35240,
+    SPELL_INTOXICATION_VISUAL   = 35777,
+};
+
+static const uint32 aOgreEntries[] = {19995, 19998, 20334, 20723, 20726, 20730, 20731, 20732, 21296};
+
+struct npc_bloodmaul_stout_trigger : public CreatureScript
+{
+    npc_bloodmaul_stout_trigger() : CreatureScript("npc_bloodmaul_stout_trigger") {}
+
+    struct npc_bloodmaul_stout_triggerAI : public ScriptedAI
+    {
+        npc_bloodmaul_stout_triggerAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiStartTimer;
+        bool m_bHasValidOgre;
+
+        ObjectGuid m_selectedOgreGuid;
+
+        void Reset() override
+        {
+            m_uiStartTimer = 1000;
+            m_bHasValidOgre = false;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_bHasValidOgre && pWho->GetObjectGuid() == m_selectedOgreGuid && m_creature->IsWithinDistInMap(pWho, 3.5f))
+            {
+                // This part it's not 100% accurate - most of it is guesswork
+                // Some animations or spells may be missing
+                pWho->CastSpell(pWho, SPELL_INTOXICATION_VISUAL, true);
+                pWho->CastSpell(pWho, SPELL_INTOXICATION, true);
+
+                // Handle evade after some time with EAI
+                m_creature->AI()->SendAIEvent(AI_EVENT_CUSTOM_EVENTAI_A, m_creature, (Creature*)pWho);
+
+                // Give kill credit to the summoner player
+                if (m_creature->IsTemporarySummon())
+                {
+                    TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+                    if (Player* pSummoner = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                    {
+                        pSummoner->KilledMonsterCredit(m_creature->GetEntry(), m_creature->GetObjectGuid());
+                    }
+                }
+
+                m_bHasValidOgre = false;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiStartTimer)
+            {
+                if (m_uiStartTimer <= uiDiff)
+                {
+                    // get all the ogres in range
+                    std::list<Creature*> lOgreList;
+                    for (uint8 i = 0; i < countof(aOgreEntries); ++i)
+                    {
+                        GetCreatureListWithEntryInGrid(lOgreList, m_creature, aOgreEntries[i], 30.0f);
+                    }
+
+                    if (lOgreList.empty())
+                    {
+                        m_uiStartTimer = 5000;
+                        return;
+                    }
+
+                    // sort by distance and get only the closest
+                    lOgreList.sort(ObjectDistanceOrder(m_creature));
+
+                    std::list<Creature*>::const_iterator ogreItr = lOgreList.begin();
+                    Creature* pOgre = NULL;
+
+                    do
+                    {
+                        if ((*ogreItr)->IsAlive() && !(*ogreItr)->HasAura(SPELL_INTOXICATION))
+                        {
+                            pOgre = *ogreItr;
+                        }
+
+                        ++ogreItr;
+                    } while (!pOgre && ogreItr != lOgreList.end());
+
+                    if (!pOgre)
+                    {
+                        m_uiStartTimer = 5000;
+                        return;
+                    }
+
+                    // Move ogre to the point
+                    float fX, fY, fZ;
+                    pOgre->GetMotionMaster()->MoveIdle();
+                    m_creature->GetContactPoint(pOgre, fX, fY, fZ);
+                    pOgre->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+
+                    switch (urand(0, 2))
+                    {
+                    case 0: DoScriptText(SAY_BREW_1, pOgre); break;
+                    case 1: DoScriptText(SAY_BREW_2, pOgre); break;
+                    case 2: DoScriptText(SAY_BREW_3, pOgre); break;
+                    }
+
+                    m_selectedOgreGuid = pOgre->GetObjectGuid();
+                    m_uiStartTimer = 0;
+                    m_bHasValidOgre = true;
+                }
+                else
+                {
+                    m_uiStartTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_bloodmaul_stout_triggerAI(pCreature);
+    }
+};
+
+/*######
+## npc_simon_game_bunny
+######*/
+
+enum
+{
+    // sounds
+    SOUND_ID_BLUE                   = 11588,
+    SOUND_ID_GREEN                  = 11589,
+    SOUND_ID_RED                    = 11590,
+    SOUND_ID_YELLOW                 = 11591,
+    SOUND_ID_DISABLE_NODE           = 11758,
+
+    // generic spells
+    SPELL_SIMON_GAME_START          = 39993,        // aura used to prepare the AI game
+    SPELL_PRE_EVENT_TIMER           = 40041,        // aura used to handle the color sequence
+
+    // stage prepare spells (summons the colored auras)
+    SPELL_PRE_GAME_BLUE_AURA        = 40176,
+    SPELL_PRE_GAME_GREEN_AURA       = 40177,
+    SPELL_PRE_GAME_RED_AURA         = 40178,
+    SPELL_PRE_GAME_YELLOW_AURA      = 40179,
+
+    // stage prepare spells large
+    SPELL_PRE_GAME_YELLOW_LARGE     = 41110,
+    SPELL_PRE_GAME_RED_LARGE        = 41111,
+    SPELL_PRE_GAME_GREEN_LARGE      = 41112,
+    SPELL_PRE_GAME_BLUE_LARGE       = 41113,
+
+    // visual spells which define which buttons are pressed
+    SPELL_BUTTON_PUSH_BLUE          = 40244,
+    SPELL_BUTTON_PUSH_GREEN         = 40245,
+    SPELL_BUTTON_PUSH_RED           = 40246,
+    SPELL_BUTTON_PUSH_YELLOW        = 40247,
+
+    // allow the clusters to be used and despawns the visual auras
+    SPELL_GAME_START_RED            = 40169,
+    SPELL_GAME_START_BLUE           = 40170,
+    SPELL_GAME_START_GREEN          = 40171,
+    SPELL_GAME_START_YELLOW         = 40172,
+
+    // locks the clusters after a stage is completed
+    SPELL_GAME_END_BLUE             = 40283,
+    SPELL_GAME_END_GREEN            = 40284,
+    SPELL_GAME_END_RED              = 40285,
+    SPELL_GAME_END_YELLOW           = 40286,
+
+    // other spells
+    // SPELL_SWITCHED_ON_OFF        = 40512,            // decharger lock (not used)
+    // SPELL_SWITCHED_ON_OFF_2      = 40499,            // decharger unlock (not used)
+    SPELL_SWITCHED_ON               = 40494,            // apexis lock spell
+    SPELL_SWITCHED_OFF              = 40495,            // apexis unlock spell
+
+    // misc visual spells
+    SPELL_VISUAL_LEVEL_START        = 40436,            // on Player game begin
+    SPELL_VISUAL_GAME_FAILED        = 40437,            // on Player game fail
+    SPELL_VISUAL_GAME_START         = 40387,            // on AI game begin
+    SPELL_VISUAL_GAME_TICK          = 40391,            // game tick (sound)
+    SPELL_VISUAL_GAME_TICK_LARGE    = 42019,            // game tick large (sound)
+
+    // spells used by the player on GO press
+    SPELL_INTROSPECTION_GREEN       = 40055,
+    SPELL_INTROSPECTION_BLUE        = 40165,
+    SPELL_INTROSPECTION_RED         = 40166,
+    SPELL_INTROSPECTION_YELLOW      = 40167,
+
+    // button press results
+    SPELL_SIMON_BUTTON_PRESSED      = 39999,
+    SPELL_GOOD_PRESS                = 40063,
+    SPELL_BAD_PRESS                 = 41241,            // single player punishment
+    SPELL_SIMON_GROUP_REWARD        = 41952,            // group punishment
+
+    // quest rewards
+    SPELL_APEXIS_VIBRATIONS         = 40310,            // quest complete spell
+    SPELL_APEXIS_EMANATIONS         = 40311,            // quest complete spell
+    SPELL_APEXIS_ENLIGHTENMENT      = 40312,            // quest complete spell
+
+    // other
+    NPC_SIMON_GAME_BUNNY            = 22923,
+
+    GO_APEXIS_RELIC                 = 185890,
+    GO_APEXIS_MONUMENT              = 185944,
+
+    QUEST_AN_APEXIS_RELIC           = 11058,
+    QUEST_RELICS_EMANATION          = 11080,
+
+    // colors
+    COLOR_IDX_BLUE                  = 0,
+    COLOR_IDX_GREEN                 = 1,
+    COLOR_IDX_RED                   = 2,
+    COLOR_IDX_YELLOW                = 3,
+
+    // phases
+    PHASE_LEVEL_PREPARE             = 1,
+    PHASE_AI_GAME                   = 2,
+    PHASE_PLAYER_PREPARE            = 3,
+    PHASE_PLAYER_GAME               = 4,
+    PHASE_LEVEL_FINISHED            = 5,
+
+    MAX_SIMON_LEVELS                = 8,                // counts the max levels of the game
+    MAX_SIMON_FAIL_TIMER            = 5,                // counts the delay in which the player is allowed to click
+};
+
+struct SimonGame
+{
+    uint8 m_uiColor;
+    uint32 m_uiVisual, m_uiIntrospection, m_uiSoundId;
+};
+
+static const SimonGame aApexisGameData[4] =
+{
+    {COLOR_IDX_BLUE,    SPELL_BUTTON_PUSH_BLUE,     SPELL_INTROSPECTION_BLUE,   SOUND_ID_BLUE},
+    {COLOR_IDX_GREEN,   SPELL_BUTTON_PUSH_GREEN,    SPELL_INTROSPECTION_GREEN,  SOUND_ID_GREEN},
+    {COLOR_IDX_RED,     SPELL_BUTTON_PUSH_RED,      SPELL_INTROSPECTION_RED,    SOUND_ID_RED},
+    {COLOR_IDX_YELLOW,  SPELL_BUTTON_PUSH_YELLOW,   SPELL_INTROSPECTION_YELLOW, SOUND_ID_YELLOW}
+};
+
+struct npc_simon_game_bunny : public CreatureScript
+{
+    npc_simon_game_bunny() : CreatureScript("npc_simon_game_bunny") {}
+
+    struct npc_simon_game_bunnyAI : public ScriptedAI
+    {
+        npc_simon_game_bunnyAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint8 m_uiGamePhase;
+
+        uint32 m_uiLevelCount;
+        uint32 m_uiLevelStage;
+        uint32 m_uiPlayerStage;
+
+        std::vector<uint8> m_vColors;
+        bool m_bIsLargeEvent;
+        bool m_bIsEventStarted;
+
+        ObjectGuid m_masterPlayerGuid;
+
+        void Reset() override
+        {
+            m_uiGamePhase = PHASE_LEVEL_PREPARE;
+            m_bIsEventStarted = false;
+
+            m_uiLevelCount = 0;
+            m_uiLevelStage = 0;
+            m_uiPlayerStage = 0;
+        }
+
+        void GetAIInformation(ChatHandler& reader) override
+        {
+            reader.PSendSysMessage("Simon Game Bunny, current game phase = %u, current level = %u", m_uiGamePhase, m_uiLevelCount);
+        }
+
+        // Prepare levels
+        void DoPrepareLevel()
+        {
+            // this visual is cast only after the first level
+            if (m_uiLevelCount)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_VISUAL_GAME_START, CAST_TRIGGERED);
+            }
+            // this part is done only on the first tick
+            else
+            {
+                // lock apexis
+                DoCastSpellIfCan(m_creature, SPELL_SWITCHED_ON, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_PRE_EVENT_TIMER, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+
+                // Get original summoner
+                if (m_creature->IsTemporarySummon())
+                {
+                    m_masterPlayerGuid = ((TemporarySummon*)m_creature)->GetSummonerGuid();
+                }
+
+                // Get closest apexis
+                if (GameObject* pGo = GetClosestGameObjectWithEntry(m_creature, GO_APEXIS_RELIC, 5.0f))
+                {
+                    m_bIsLargeEvent = false;
+                }
+                else if (GameObject* pGo = GetClosestGameObjectWithEntry(m_creature, GO_APEXIS_MONUMENT, 17.0f))
+                {
+                    m_bIsLargeEvent = true;
+                }
+            }
+
+            // prepare the buttons and summon the visual auras
+            DoCastSpellIfCan(m_creature, m_bIsLargeEvent ? SPELL_PRE_GAME_BLUE_LARGE : SPELL_PRE_GAME_BLUE_AURA, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, m_bIsLargeEvent ? SPELL_PRE_GAME_GREEN_LARGE : SPELL_PRE_GAME_GREEN_AURA, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, m_bIsLargeEvent ? SPELL_PRE_GAME_RED_LARGE : SPELL_PRE_GAME_RED_AURA, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, m_bIsLargeEvent ? SPELL_PRE_GAME_YELLOW_LARGE : SPELL_PRE_GAME_YELLOW_AURA, CAST_TRIGGERED);
+
+            m_vColors.clear();
+            ++m_uiLevelCount;
+        }
+
+        // Setup the color sequence
+        void DoSetupLevel()
+        {
+            uint8 uiIndex = urand(COLOR_IDX_BLUE, COLOR_IDX_YELLOW);
+            m_vColors.push_back(uiIndex);
+
+            DoCastSpellIfCan(m_creature, aApexisGameData[uiIndex].m_uiVisual, CAST_TRIGGERED);
+            DoPlaySoundToSet(m_creature, aApexisGameData[uiIndex].m_uiSoundId);
+        }
+
+        // Setup the player level - called at the beginning at each player level
+        void DoSetupPlayerLevel()
+        {
+            // allow the buttons to be used and despawn the visual auras
+            DoCastSpellIfCan(m_creature, SPELL_GAME_START_RED, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_GAME_START_BLUE, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_GAME_START_GREEN, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_GAME_START_YELLOW, CAST_TRIGGERED);
+        }
+
+        // Complete level - called when one level is completed succesfully
+        void DoCompleteLevel()
+        {
+            // lock the buttons
+            DoCastSpellIfCan(m_creature, SPELL_GAME_END_RED, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_GAME_END_BLUE, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_GAME_END_GREEN, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_GAME_END_YELLOW, CAST_TRIGGERED);
+
+            // Complete game if all the levels
+            if (m_uiLevelCount == MAX_SIMON_LEVELS)
+            {
+                DoCompleteGame();
+            }
+        }
+
+        // Complete event - called when the game has been completed succesfully
+        void DoCompleteGame()
+        {
+            // ToDo: not sure if the quest reward spells are implemented right. They all give the same buff but with a different duration
+            if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_masterPlayerGuid))
+            {
+                if (Group* pGroup = pPlayer->GetGroup())
+                {
+                    for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
+                    {
+                        if (Player* pMember = pRef->getSource())
+                        {
+                            // distance check - they need to be close to the Apexis
+                            if (!pMember->IsWithinDistInMap(m_creature, 20.0f))
+                            {
+                                continue;
+                            }
+
+                            // on group event cast Enlightment on daily quest and Emanations on normal quest
+                            if (pMember->GetQuestStatus(QUEST_AN_APEXIS_RELIC) == QUEST_STATUS_INCOMPLETE)
+                            {
+                                DoCastSpellIfCan(pMember, SPELL_APEXIS_EMANATIONS, CAST_TRIGGERED);
+                            }
+                            else if (pMember->GetQuestStatus(QUEST_RELICS_EMANATION) == QUEST_STATUS_INCOMPLETE)
+                            {
+                                DoCastSpellIfCan(pMember, SPELL_APEXIS_ENLIGHTENMENT, CAST_TRIGGERED);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    // solo event - cast Emanations on daily quest and vibrations on normal quest
+                    if (pPlayer->GetQuestStatus(QUEST_AN_APEXIS_RELIC) == QUEST_STATUS_INCOMPLETE)
+                    {
+                        DoCastSpellIfCan(pPlayer, SPELL_APEXIS_VIBRATIONS, CAST_TRIGGERED);
+                    }
+                    else if (pPlayer->GetQuestStatus(QUEST_RELICS_EMANATION) == QUEST_STATUS_INCOMPLETE)
+                    {
+                        DoCastSpellIfCan(pPlayer, SPELL_APEXIS_EMANATIONS, CAST_TRIGGERED);
+                    }
+                }
+            }
+
+            // cleanup event after quest is finished
+            DoCastSpellIfCan(m_creature, SPELL_SWITCHED_OFF, CAST_TRIGGERED);
+            DoPlaySoundToSet(m_creature, SOUND_ID_DISABLE_NODE);
+            m_creature->ForcedDespawn();
+        }
+
+        // Cleanup event - called when event fails
+        void DoCleanupGame()
+        {
+            // lock the buttons
+            DoCastSpellIfCan(m_creature, SPELL_GAME_END_RED, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_GAME_END_BLUE, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_GAME_END_GREEN, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_GAME_END_YELLOW, CAST_TRIGGERED);
+
+            //  unlock apexis and despawn
+            DoCastSpellIfCan(m_creature, SPELL_SWITCHED_OFF, CAST_TRIGGERED);
+            DoPlaySoundToSet(m_creature, SOUND_ID_DISABLE_NODE);
+            m_creature->ForcedDespawn();
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            switch (m_uiGamePhase)
+            {
+            case PHASE_LEVEL_PREPARE:
+                // delay before each level - handled by big timer aura
+                if (eventType == AI_EVENT_CUSTOM_A)
+                {
+                    m_uiGamePhase = PHASE_AI_GAME;
+                }
+                break;
+            case PHASE_AI_GAME:
+                // AI game - handled by small timer aura
+                if (eventType == AI_EVENT_CUSTOM_B)
+                {
+                    // Move to next phase if the level is setup
+                    if (m_uiLevelStage == m_uiLevelCount)
+                    {
+                        m_uiGamePhase = PHASE_PLAYER_PREPARE;
+                        m_uiLevelStage = 0;
+                        return;
+                    }
+
+                    DoSetupLevel();
+                    ++m_uiLevelStage;
+                }
+                break;
+            case PHASE_PLAYER_PREPARE:
+                // Player prepare - handled by small timer aura
+                if (eventType == AI_EVENT_CUSTOM_B)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_VISUAL_LEVEL_START, CAST_TRIGGERED);
+                    DoSetupPlayerLevel();
+
+                    m_uiGamePhase = PHASE_PLAYER_GAME;
+                    m_uiPlayerStage = 0;
+                }
+                break;
+            case PHASE_PLAYER_GAME:
+                // Player game - listen to the player moves
+                if (eventType == AI_EVENT_CUSTOM_C)
+                {
+                    // good button pressed
+                    if (uiMiscValue == aApexisGameData[m_vColors[m_uiLevelStage]].m_uiIntrospection)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_GOOD_PRESS, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, aApexisGameData[m_vColors[m_uiLevelStage]].m_uiVisual, CAST_TRIGGERED);
+
+                        DoPlaySoundToSet(m_creature, aApexisGameData[m_vColors[m_uiLevelStage]].m_uiSoundId);
+
+                        // increase the level stage and reset the event counter
+                        ++m_uiLevelStage;
+                        m_uiPlayerStage = 0;
+
+                        // if all buttons were pressed succesfully, then move to next level
+                        if (m_uiLevelStage == m_vColors.size())
+                        {
+                            DoCompleteLevel();
+
+                            m_uiLevelStage = 0;
+                            m_uiGamePhase = PHASE_LEVEL_FINISHED;
+                        }
+                        // cast tick sound
+                        else
+                        {
+                            DoCastSpellIfCan(pInvoker, m_bIsLargeEvent ? SPELL_VISUAL_GAME_TICK_LARGE : SPELL_VISUAL_GAME_TICK, CAST_TRIGGERED);
+                        }
+                    }
+                    // bad button pressed
+                    else
+                    {
+                        DoCastSpellIfCan(pInvoker, m_bIsLargeEvent ? SPELL_SIMON_GROUP_REWARD : SPELL_BAD_PRESS, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_VISUAL_GAME_FAILED, CAST_TRIGGERED);
+                        DoCleanupGame();
+                    }
+                }
+                // AI ticks which handle the player timeout
+                else if (eventType == AI_EVENT_CUSTOM_B)
+                {
+                    // if it takes too much time, the event will fail
+                    if (m_uiPlayerStage == MAX_SIMON_FAIL_TIMER)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_VISUAL_GAME_FAILED, CAST_TRIGGERED);
+                        DoCleanupGame();
+                    }
+
+                    // Not sure if this is right, but we need to keep the buttons unlocked on every tick
+                    DoSetupPlayerLevel();
+                    ++m_uiPlayerStage;
+                }
+                break;
+            case PHASE_LEVEL_FINISHED:
+                // small delay until the next level
+                if (eventType == AI_EVENT_CUSTOM_A)
+                {
+                    DoPrepareLevel();
+                    m_uiGamePhase = PHASE_LEVEL_PREPARE;
+                }
+                break;
+            }
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            // Start game on first update tick - don't wait for dummy auras
+            if (!m_bIsEventStarted)
+            {
+                DoPrepareLevel();
+                m_bIsEventStarted = true;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_simon_game_bunnyAI(pCreature);
+    }
+};
+
+struct spell_simon_game_start : public SpellScript
+{
+    spell_simon_game_start() : SpellScript("spell_simon_game_start") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiEffIndex != EFFECT_INDEX_0 || pTarget->GetEntry() != NPC_SIMON_GAME_BUNNY)
+        {
+            return false;
+        }
+        Creature *pCreatureTarget = pTarget->ToCreature();
+        pCreatureTarget->AI()->SendAIEvent(uiSpellId == SPELL_SIMON_GAME_START ? AI_EVENT_CUSTOM_A : AI_EVENT_CUSTOM_B, pCaster, pCreatureTarget);
+
+        //if (uiSpellId == SPELL_SIMON_GAME_START && uiEffIndex == EFFECT_INDEX_0)
+        //{
+        //    pCreatureTarget->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pCreatureTarget);
+        //    return true;
+        //}
+        //else if (uiSpellId == SPELL_PRE_EVENT_TIMER && uiEffIndex == EFFECT_INDEX_0)
+        //{
+        //    pCreatureTarget->AI()->SendAIEvent(AI_EVENT_CUSTOM_B, pCaster, pCreatureTarget);
+        //    return true;
+        //}
+
+        return false;
+    }
+};
+
+struct spell_simon_game_move : public SpellScript
+{
+    spell_simon_game_move() : SpellScript("spell_simon_game_move") {}
+
+    bool EffectScriptEffect(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Creature* pCreatureTarget, ObjectGuid originalCasterGuid) 
+    {
+        if ((uiSpellId == SPELL_INTROSPECTION_BLUE || uiSpellId == SPELL_INTROSPECTION_GREEN || uiSpellId == SPELL_INTROSPECTION_RED ||
+            uiSpellId == SPELL_INTROSPECTION_YELLOW) && uiEffIndex == EFFECT_INDEX_1)
+        {
+            if (pCreatureTarget->GetEntry() == NPC_SIMON_GAME_BUNNY && pCaster->GetTypeId() == TYPEID_PLAYER && originalCasterGuid.IsGameObject())
+            {
+                pCreatureTarget->AI()->SendAIEvent(AI_EVENT_CUSTOM_C, pCaster, pCreatureTarget, uiSpellId);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_blades_edge_mountains()
+{
+    Script* s;
+
+    s = new mobs_nether_drake();
+    s->RegisterSelf();
+    s = new npc_daranelle();
+    s->RegisterSelf();
+    s = new npc_bloodmaul_stout_trigger();
+    s->RegisterSelf();
+    s = new npc_simon_game_bunny();
+    s->RegisterSelf();
+    s = new spell_simon_game_start();
+    s->RegisterSelf();
+    s = new spell_simon_game_move();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mobs_nether_drake";
+    //pNewScript->GetAI = &GetAI_mobs_nether_drake;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_daranelle";
+    //pNewScript->GetAI = &GetAI_npc_daranelle;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_bloodmaul_stout_trigger";
+    //pNewScript->GetAI = &GetAI_npc_bloodmaul_stout_trigger;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_simon_game_bunny";
+    //pNewScript->GetAI = &GetAI_npc_simon_game_bunny;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_simon_game_bunny;
+    //pNewScript->pEffectScriptEffectNPC = &EffectScriptEffectCreature_npc_simon_game_bunny;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/boss_doomlord_kazzak.cpp b/src/modules/SD3/scripts/outland/boss_doomlord_kazzak.cpp
new file mode 100644
index 000000000..ffdd058c4
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/boss_doomlord_kazzak.cpp
@@ -0,0 +1,268 @@
+/**
+ * ScriptDev2 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Doomlord_Kazzak
+SD%Complete: 90
+SDComment: Timers
+SDCategory: Hellfire Peninsula
+EndScriptData */
+
+#include "precompiled.h"
+
+enum
+{
+    SAY_INTRO                       = -1000147,
+    SAY_AGGRO1                      = -1000148,
+    SAY_AGGRO2                      = -1000149,
+    SAY_SURPREME1                   = -1000150,
+    SAY_SURPREME2                   = -1000151,
+    SAY_KILL1                       = -1000152,
+    SAY_KILL2                       = -1000153,
+    SAY_KILL3                       = -1000154,
+    SAY_DEATH                       = -1000155,
+    EMOTE_GENERIC_FRENZY            = -1000002,
+    SAY_RAND1                       = -1000157,
+    SAY_RAND2                       = -1000158,
+
+    SPELL_SHADOW_VOLLEY             = 32963,
+    SPELL_CLEAVE                    = 31779,
+    SPELL_THUNDERCLAP               = 36706,
+    SPELL_VOID_BOLT                 = 39329,
+    SPELL_MARK_OF_KAZZAK            = 32960,
+    SPELL_FRENZY                    = 32964,        // triggers 32963
+    SPELL_CAPTURE_SOUL              = 48473,        // procs 32966 on player kill
+    SPELL_TWISTED_REFLECTION        = 21063,
+    SPELL_BERSERK                   = 32965,        // triggers 32963
+};
+
+struct boss_doomlordkazzak : public CreatureScript
+{
+    boss_doomlordkazzak() : CreatureScript("boss_doomlord_kazzak") {}
+
+    struct boss_doomlordkazzakAI : public ScriptedAI
+    {
+        boss_doomlordkazzakAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiShadowVolleyTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiThunderClapTimer;
+        uint32 m_uiVoidBoltTimer;
+        uint32 m_uiMarkOfKazzakTimer;
+        uint32 m_uiEnrageTimer;
+        uint32 m_uiGreatEnrageTimer;
+        uint32 m_uiTwistedReflectionTimer;
+
+        void Reset() override
+        {
+            m_uiShadowVolleyTimer = urand(6000, 10000);
+            m_uiCleaveTimer = 7000;
+            m_uiThunderClapTimer = urand(14000, 18000);
+            m_uiVoidBoltTimer = 30000;
+            m_uiMarkOfKazzakTimer = 25000;
+            m_uiEnrageTimer = 60000;
+            m_uiGreatEnrageTimer = 3 * MINUTE * IN_MILLISECONDS;
+            m_uiTwistedReflectionTimer = 33000;                // Timer may be incorrect
+        }
+
+        void JustRespawned() override
+        {
+            DoScriptText(SAY_INTRO, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_AGGRO1 : SAY_AGGRO2, m_creature);
+            DoCastSpellIfCan(m_creature, SPELL_CAPTURE_SOUL, CAST_TRIGGERED);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            // When Kazzak kills a player (not pets/totems), he regens some health
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_KILL1, m_creature); break;
+            case 1: DoScriptText(SAY_KILL2, m_creature); break;
+            case 2: DoScriptText(SAY_KILL3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // ShadowVolley_Timer
+            if (m_uiShadowVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_VOLLEY) == CAST_OK)
+                {
+                    m_uiShadowVolleyTimer = urand(10000, 30000);
+                }
+            }
+            else
+            {
+                m_uiShadowVolleyTimer -= uiDiff;
+            }
+
+            // Cleave_Timer
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                {
+                    m_uiCleaveTimer = urand(8000, 12000);
+                }
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            // ThunderClap_Timer
+            if (m_uiThunderClapTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_THUNDERCLAP) == CAST_OK)
+                {
+                    m_uiThunderClapTimer = urand(10000, 14000);
+                }
+            }
+            else
+            {
+                m_uiThunderClapTimer -= uiDiff;
+            }
+
+            // VoidBolt_Timer
+            if (m_uiVoidBoltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_VOID_BOLT) == CAST_OK)
+                    {
+                        m_uiVoidBoltTimer = urand(15000, 18000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiVoidBoltTimer -= uiDiff;
+            }
+
+            // MarkOfKazzak_Timer
+            if (m_uiMarkOfKazzakTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_MARK_OF_KAZZAK, SELECT_FLAG_POWER_MANA))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_MARK_OF_KAZZAK) == CAST_OK)
+                    {
+                        m_uiMarkOfKazzakTimer = 20000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiMarkOfKazzakTimer -= uiDiff;
+            }
+
+            // Enrage_Timer
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_GENERIC_FRENZY, m_creature);
+                    m_uiEnrageTimer = 60000;
+                }
+            }
+            else
+            {
+                m_uiEnrageTimer -= uiDiff;
+            }
+
+            // Great_Enrage_Timer
+            if (m_uiGreatEnrageTimer)
+            {
+                if (m_uiGreatEnrageTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        m_uiGreatEnrageTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiGreatEnrageTimer -= uiDiff;
+                }
+            }
+
+            // Twisted Reflection
+            if (m_uiTwistedReflectionTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_TWISTED_REFLECTION) == CAST_OK)
+                    {
+                        m_uiTwistedReflectionTimer = 15000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiTwistedReflectionTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_doomlordkazzakAI(pCreature);
+    }
+};
+
+void AddSC_boss_doomlordkazzak()
+{
+    Script* s;
+
+    s = new boss_doomlordkazzak();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_doomlord_kazzak";
+    //pNewScript->GetAI = &GetAI_boss_doomlordkazzak;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/boss_doomwalker.cpp b/src/modules/SD3/scripts/outland/boss_doomwalker.cpp
new file mode 100644
index 000000000..f52e4e598
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/boss_doomwalker.cpp
@@ -0,0 +1,214 @@
+/**
+ * ScriptDev2 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Doomwalker
+SD%Complete: 100
+SDComment:
+SDCategory: Shadowmoon Valley
+EndScriptData */
+
+#include "precompiled.h"
+
+enum
+{
+    SAY_AGGRO                   = -1000159,
+    SAY_EARTHQUAKE_1            = -1000160,
+    SAY_EARTHQUAKE_2            = -1000161,
+    SAY_OVERRUN_1               = -1000162,
+    SAY_OVERRUN_2               = -1000163,
+    SAY_SLAY_1                  = -1000164,
+    SAY_SLAY_2                  = -1000165,
+    SAY_SLAY_3                  = -1000166,
+    SAY_DEATH                   = -1000167,
+
+    SPELL_EARTHQUAKE            = 32686,
+    SPELL_CRUSH_ARMOR           = 33661,
+    SPELL_LIGHTNING_WRATH       = 33665,
+    SPELL_OVERRUN               = 32636,
+    SPELL_ENRAGE                = 33653,
+    SPELL_MARK_OF_DEATH_PLAYER  = 37128,
+    SPELL_MARK_OF_DEATH_AURA    = 37125,        // triggers 37131 on target if it has aura 37128
+};
+
+struct boss_doomwalker : public CreatureScript
+{
+    boss_doomwalker() : CreatureScript("boss_doomwalker") {}
+
+    struct boss_doomwalkerAI : public ScriptedAI
+    {
+        boss_doomwalkerAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiChainTimer;
+        uint32 m_uiOverrunTimer;
+        uint32 m_uiQuakeTimer;
+        uint32 m_uiArmorTimer;
+
+        bool m_bHasEnrage;
+
+        void Reset() override
+        {
+            m_uiArmorTimer = urand(5000, 13000);
+            m_uiChainTimer = urand(10000, 30000);
+            m_uiQuakeTimer = urand(25000, 35000);
+            m_uiOverrunTimer = urand(30000, 45000);
+
+            m_bHasEnrage = false;
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            pVictim->CastSpell(pVictim, SPELL_MARK_OF_DEATH_PLAYER, true, NULL, NULL, m_creature->GetObjectGuid());
+
+            if (urand(0, 4))
+            {
+                return;
+            }
+
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_MARK_OF_DEATH_AURA, CAST_TRIGGERED);
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Spell Enrage, when hp <= 20% gain enrage
+            if (m_creature->GetHealthPercent() <= 20.0f && !m_bHasEnrage)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                {
+                    m_bHasEnrage = true;
+                }
+            }
+
+            // Spell Overrun
+            if (m_uiOverrunTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_OVERRUN) == CAST_OK)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_OVERRUN_1 : SAY_OVERRUN_2, m_creature);
+                    m_uiOverrunTimer = urand(25000, 40000);
+                }
+            }
+            else
+            {
+                m_uiOverrunTimer -= uiDiff;
+            }
+
+            // Spell Earthquake
+            if (m_uiQuakeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_EARTHQUAKE) == CAST_OK)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_EARTHQUAKE_1 : SAY_EARTHQUAKE_2, m_creature);
+                    m_uiQuakeTimer = urand(30000, 55000);
+                }
+            }
+            else
+            {
+                m_uiQuakeTimer -= uiDiff;
+            }
+
+            // Spell Chain Lightning
+            if (m_uiChainTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+                if (!pTarget)
+                {
+                    pTarget = m_creature->getVictim();
+                }
+
+                if (pTarget)
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_LIGHTNING_WRATH) == CAST_OK)
+                    {
+                        m_uiChainTimer = urand(7000, 27000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiChainTimer -= uiDiff;
+            }
+
+            // Spell Sunder Armor
+            if (m_uiArmorTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CRUSH_ARMOR) == CAST_OK)
+                {
+                    m_uiArmorTimer = urand(10000, 25000);
+                }
+            }
+            else
+            {
+                m_uiArmorTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_doomwalkerAI(pCreature);
+    }
+};
+
+void AddSC_boss_doomwalker()
+{
+    Script* s;
+
+    s = new boss_doomwalker();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_doomwalker";
+    //pNewScript->GetAI = &GetAI_boss_doomwalker;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_fathomlord_karathress.cpp
new file mode 100644
index 000000000..a5154b247
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_fathomlord_karathress.cpp
@@ -0,0 +1,636 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Fathomlord_Karathress
+SD%Complete: 95
+SDComment: Timers may need adjustments.
+SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
+EndScriptData */
+
+#include "precompiled.h"
+#include "serpent_shrine.h"
+
+enum
+{
+    SAY_AGGRO                       = -1548021,
+    SAY_GAIN_BLESSING               = -1548022,
+    SAY_GAIN_ABILITY1               = -1548023,
+    SAY_GAIN_ABILITY2               = -1548024,
+    SAY_GAIN_ABILITY3               = -1548025,
+    SAY_SLAY1                       = -1548026,
+    SAY_SLAY2                       = -1548027,
+    SAY_SLAY3                       = -1548028,
+    SAY_DEATH                       = -1548029,
+
+    // Karathress spells
+    SPELL_CATACLYSMIC_BOLT          = 38441,
+    SPELL_ENRAGE                    = 24318,                // ToDo: spell needs to be confirmed
+    SPELL_SEAR_NOVA                 = 38445,
+    SPELL_BLESSING_OF_THE_TIDES     = 38449,                // cast by each of the advisors when the boss reaches 75% hp
+
+    // Sharkkis spells
+    SPELL_LEECHING_THROW            = 29436,
+    SPELL_THE_BEAST_WITHIN          = 38373,
+    SPELL_HURL_TRIDENT              = 38374,
+    SPELL_MULTI_TOSS                = 38366,
+    SPELL_SUMMON_FATHOM_LURKER      = 38433,
+    SPELL_SUMMON_FATHOM_SPOREBAT    = 38431,
+    SPELL_POWER_OF_SHARKKIS         = 38455,                // cast on Karathress, on death
+
+    // Tidalvess spells
+    SPELL_FROST_SHOCK               = 38234,
+    SPELL_SPITFIRE_TOTEM            = 38236,
+    SPELL_POISON_CLEANSING_TOTEM    = 38306,
+    SPELL_EARTHBIND_TOTEM           = 38304,
+    SPELL_WINDFURY_WEAPON           = 32911,                // triggers spell 32912 (Windfury)
+    SPELL_POWER_OF_TIDALVESS        = 38452,                // cast on Karathress, on death
+
+    // Caribdis Spells
+    SPELL_WATER_BOLT_VOLLEY         = 38335,
+    SPELL_TIDAL_SURGE               = 38358,                // triggers 38353 which then triggers 38357
+    SPELL_HEALING_WAVE              = 38330,
+    SPELL_SUMMON_CYCLONE            = 38337,                // summons creature 22104 which uses spell 29538
+    SPELL_POWER_OF_CARIBDIS         = 38451,                // cast on Karathress, on death
+
+    SPELL_CYCLONE                   = 29538,
+
+    MAX_ADVISORS                    = 3,
+
+    NPC_CYCLONE                     = 22104,
+    NPC_SEER_OLUM                   = 22820
+};
+
+// position for Seer Olum
+static const float afCoordsOlum[4] = {446.78f, -542.76f, -7.547f, 0.401f};
+
+static const uint32 aAdvisors[MAX_ADVISORS] = {NPC_SHARKKIS, NPC_TIDALVESS, NPC_CARIBDIS};
+
+/*######
+## boss_fathomlord_karathress
+######*/
+
+struct boss_fathomlord_karathress : public CreatureScript
+{
+    boss_fathomlord_karathress() : CreatureScript("boss_fathomlord_karathress") {}
+
+    struct boss_fathomlord_karathressAI : public ScriptedAI
+    {
+        boss_fathomlord_karathressAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiCataclysmicBoltTimer;
+        uint32 m_uiSearingNovaTimer;
+        uint32 m_uiEnrageTimer;
+
+        bool m_bBlessingOfTides;
+
+        void Reset() override
+        {
+            m_uiCataclysmicBoltTimer = 10000;
+            m_uiSearingNovaTimer = urand(20000, 30000);
+            m_uiEnrageTimer = 10 * MINUTE * IN_MILLISECONDS;
+            m_bBlessingOfTides = false;
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            switch (pSpell->Id)
+            {
+            case SPELL_POWER_OF_SHARKKIS:
+                DoScriptText(SAY_GAIN_ABILITY1, m_creature);
+                break;
+            case SPELL_POWER_OF_TIDALVESS:
+                DoScriptText(SAY_GAIN_ABILITY1, m_creature);
+                break;
+            case SPELL_POWER_OF_CARIBDIS:
+                DoScriptText(SAY_GAIN_ABILITY3, m_creature);
+                break;
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KARATHRESS_EVENT, IN_PROGRESS);
+            }
+
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KARATHRESS_EVENT, DONE);
+            }
+
+            // support for quest 10944
+            m_creature->SummonCreature(NPC_SEER_OLUM, afCoordsOlum[0], afCoordsOlum[1], afCoordsOlum[2], afCoordsOlum[3], TEMPSUMMON_TIMED_DESPAWN, 1 * HOUR * IN_MILLISECONDS);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KARATHRESS_EVENT, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiCataclysmicBoltTimer < uiDiff)
+            {
+                // select a random unit other than the main tank
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+
+                // if there aren't other units, cast on the tank
+                if (!pTarget)
+                {
+                    pTarget = m_creature->getVictim();
+                }
+
+                if (pTarget)
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_CATACLYSMIC_BOLT) == CAST_OK)
+                    {
+                        m_uiCataclysmicBoltTimer = 10000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiCataclysmicBoltTimer -= uiDiff;
+            }
+
+            if (!m_bBlessingOfTides && m_creature->GetHealthPercent() < 75.0f)
+            {
+                for (uint8 i = 0; i < MAX_ADVISORS; ++i)
+                {
+                    if (Creature* pAdvisor = m_pInstance->GetSingleCreatureFromStorage(aAdvisors[i]))
+                    {
+                        // stack max three times (one for each alive)
+                        if (pAdvisor->IsAlive())
+                        {
+                            pAdvisor->InterruptNonMeleeSpells(false);
+                            pAdvisor->CastSpell(m_creature, SPELL_BLESSING_OF_THE_TIDES, true);
+                        }
+                    }
+                }
+
+                // yell if we now have the aura
+                if (m_creature->HasAura(SPELL_BLESSING_OF_THE_TIDES))
+                {
+                    DoScriptText(SAY_GAIN_BLESSING, m_creature);
+                }
+
+                m_bBlessingOfTides = true;
+            }
+
+            if (m_uiSearingNovaTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SEAR_NOVA) == CAST_OK)
+                {
+                    m_uiSearingNovaTimer = urand(20000, 30000);
+                }
+            }
+            else
+            {
+                m_uiSearingNovaTimer -= uiDiff;
+            }
+
+            if (m_uiEnrageTimer)
+            {
+                if (m_uiEnrageTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                    {
+                        m_uiEnrageTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiEnrageTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_fathomlord_karathressAI(pCreature);
+    }
+};
+
+/*######
+## boss_fathomguard_sharkkis
+######*/
+
+struct boss_fathomguard_sharkkis : public CreatureScript
+{
+    boss_fathomguard_sharkkis() : CreatureScript("boss_fathomguard_sharkkis") {}
+
+    struct boss_fathomguard_sharkkisAI : public ScriptedAI
+    {
+        boss_fathomguard_sharkkisAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiHurlTridentTimer;
+        uint32 m_uiLeechingThrowTimer;
+        uint32 m_uiTheBeastWithinTimer;
+        uint32 m_uiMultiTossTimer;
+        uint32 m_uiPetTimer;
+
+        void Reset() override
+        {
+            m_uiHurlTridentTimer = 2500;
+            m_uiLeechingThrowTimer = 20000;
+            m_uiTheBeastWithinTimer = 30000;
+            m_uiMultiTossTimer = urand(7000, 11000);
+            if (!m_creature->GetPet())
+            {
+                m_uiPetTimer = 10000;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_POWER_OF_SHARKKIS, CAST_TRIGGERED);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (m_creature->getVictim())
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // resummon the pet in 10 secs
+            if (pSummoned->IsPet())
+            {
+                m_uiPetTimer = 10000;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiPetTimer)
+            {
+                if (m_uiPetTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, urand(0, 1) ? SPELL_SUMMON_FATHOM_LURKER : SPELL_SUMMON_FATHOM_SPOREBAT) == CAST_OK)
+                    {
+                        m_uiPetTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiPetTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiHurlTridentTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_HURL_TRIDENT, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_HURL_TRIDENT) == CAST_OK)
+                    {
+                        m_uiHurlTridentTimer = 5000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiHurlTridentTimer -= uiDiff;
+            }
+
+            if (m_uiLeechingThrowTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_LEECHING_THROW) == CAST_OK)
+                {
+                    m_uiLeechingThrowTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiLeechingThrowTimer -= uiDiff;
+            }
+
+            if (m_uiTheBeastWithinTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_THE_BEAST_WITHIN) == CAST_OK)
+                {
+                    m_uiTheBeastWithinTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiTheBeastWithinTimer -= uiDiff;
+            }
+
+            if (m_uiMultiTossTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_HURL_TRIDENT) == CAST_OK)
+                    {
+                        m_uiMultiTossTimer = urand(7000, 12000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiMultiTossTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_fathomguard_sharkkisAI(pCreature);
+    }
+};
+
+/*######
+## boss_fathomguard_tidalvess
+######*/
+
+struct boss_fathomguard_tidalvess : public CreatureScript
+{
+    boss_fathomguard_tidalvess() : CreatureScript("boss_fathomguard_tidalvess") {}
+
+    struct boss_fathomguard_tidalvessAI : public ScriptedAI
+    {
+        boss_fathomguard_tidalvessAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiFrostShockTimer;
+        uint32 m_uiWindfuryTimer;
+        uint32 m_uiTotemTimer;
+
+        void Reset() override
+        {
+            m_uiFrostShockTimer = 25000;
+            m_uiWindfuryTimer = 0;
+            m_uiTotemTimer = urand(2000, 5000);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_POWER_OF_TIDALVESS, CAST_TRIGGERED);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiFrostShockTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROST_SHOCK) == CAST_OK)
+                {
+                    m_uiFrostShockTimer = urand(25000, 30000);
+                }
+            }
+            else
+            {
+                m_uiFrostShockTimer -= uiDiff;
+            }
+
+            if (m_uiWindfuryTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WINDFURY_WEAPON) == CAST_OK)
+                {
+                    m_uiWindfuryTimer = urand(90000, 100000);
+                }
+            }
+            else
+            {
+                m_uiWindfuryTimer -= uiDiff;
+            }
+
+            if (m_uiTotemTimer < uiDiff)
+            {
+                if (m_creature->IsNonMeleeSpellCasted(false))
+                {
+                    switch (urand(0, 2))
+                    {
+                    case 0: DoCastSpellIfCan(m_creature, SPELL_SPITFIRE_TOTEM);
+                    case 1: DoCastSpellIfCan(m_creature, SPELL_POISON_CLEANSING_TOTEM);
+                    case 2: DoCastSpellIfCan(m_creature, SPELL_EARTHBIND_TOTEM);
+                    }
+                    m_uiTotemTimer = urand(30000, 60000);
+                }
+            }
+            else
+            {
+                m_uiTotemTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_fathomguard_tidalvessAI(pCreature);
+    }
+};
+
+/*######
+## boss_fathomguard_caribdis
+######*/
+
+struct boss_fathomguard_caribdis : public CreatureScript
+{
+    boss_fathomguard_caribdis() : CreatureScript("boss_fathomguard_caribdis") {}
+
+    struct boss_fathomguard_caribdisAI : public ScriptedAI
+    {
+        boss_fathomguard_caribdisAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiWaterBoltVolleyTimer;
+        uint32 m_uiTidalSurgeTimer;
+        uint32 m_uiHealTimer;
+        uint32 m_uiCycloneTimer;
+
+        void Reset() override
+        {
+            m_uiWaterBoltVolleyTimer = 35000;
+            m_uiTidalSurgeTimer = urand(15000, 20000);
+            m_uiHealTimer = 55000;
+            m_uiCycloneTimer = urand(10000, 15000);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_POWER_OF_CARIBDIS, CAST_TRIGGERED);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // ToDo: research if this creature should follow the summoner or a random target
+            if (pSummoned->GetEntry() == NPC_CYCLONE)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_CYCLONE, true);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiWaterBoltVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WATER_BOLT_VOLLEY) == CAST_OK)
+                {
+                    m_uiWaterBoltVolleyTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiWaterBoltVolleyTimer -= uiDiff;
+            }
+
+            if (m_uiTidalSurgeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TIDAL_SURGE) == CAST_OK)
+                {
+                    m_uiTidalSurgeTimer = urand(15000, 20000);
+                }
+            }
+            else
+            {
+                m_uiTidalSurgeTimer -= uiDiff;
+            }
+
+            if (m_uiCycloneTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_CYCLONE) == CAST_OK)
+                {
+                    m_uiCycloneTimer = urand(45000, 60000);
+                }
+            }
+            else
+            {
+                m_uiCycloneTimer -= uiDiff;
+            }
+
+            if (m_uiHealTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(50.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_HEALING_WAVE) == CAST_OK)
+                    {
+                        m_uiHealTimer = 60000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiHealTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_fathomguard_caribdisAI(pCreature);
+    }
+};
+
+void AddSC_boss_fathomlord_karathress()
+{
+    Script* s;
+
+    s = new boss_fathomlord_karathress();
+    s->RegisterSelf();
+    s = new boss_fathomguard_sharkkis();
+    s->RegisterSelf();
+    s = new boss_fathomguard_tidalvess();
+    s->RegisterSelf();
+    s = new boss_fathomguard_caribdis();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_fathomlord_karathress";
+    //pNewScript->GetAI = &GetAI_boss_fathomlord_karathress;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_fathomguard_sharkkis";
+    //pNewScript->GetAI = &GetAI_boss_fathomguard_sharkkis;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_fathomguard_tidalvess";
+    //pNewScript->GetAI = &GetAI_boss_fathomguard_tidalvess;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_fathomguard_caribdis";
+    //pNewScript->GetAI = &GetAI_boss_fathomguard_caribdis;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_hydross_the_unstable.cpp
new file mode 100644
index 000000000..0d0649a48
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_hydross_the_unstable.cpp
@@ -0,0 +1,418 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Hydross_The_Unstable
+SD%Complete: 95
+SDComment: Timers may need improvemets.
+SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
+EndScriptData */
+
+#include "precompiled.h"
+#include "serpent_shrine.h"
+
+enum
+{
+    SAY_AGGRO                   = -1548000,
+    SAY_SWITCH_TO_CLEAN         = -1548001,
+    SAY_CLEAN_SLAY1             = -1548002,
+    SAY_CLEAN_SLAY2             = -1548003,
+    SAY_CLEAN_DEATH             = -1548004,
+    SAY_SWITCH_TO_CORRUPT       = -1548005,
+    SAY_CORRUPT_SLAY1           = -1548006,
+    SAY_CORRUPT_SLAY2           = -1548007,
+    SAY_CORRUPT_DEATH           = -1548008,
+
+    SPELL_WATER_TOMB            = 38235,
+    SPELL_VILE_SLUDGE           = 38246,
+    SPELL_CORRUPTION            = 37961,                    // transform spell
+    SPELL_ENRAGE                = 27680,                    // ToDo: this spell need verification
+    SPELL_SUMMON_WATER_ELEMENT  = 36459,                    // spawn elemental on OOC timer
+    // SPELL_ELEMENTAL_SPAWNIN   = 25035,                   // already handled in eventAI
+    SPELL_PURIFY_ELEMENTAL      = 36461,                    // purify elemental on OOC timer
+
+    NPC_PURE_SPAWN              = 22035,
+    NPC_TAINTED_SPAWN           = 22036,
+    NPC_PURIFIED_ELEMENTAL      = 21260,
+    NPC_TAINTED_ELEMENTAL       = 21253,
+
+    POINT_ID_ELEMENTAL_CLEAN    = 1,
+    POINT_ID_ELEMENTAL_EXIT     = 2,
+
+    SWITCH_RADIUS               = 18,
+    MAX_HYDROSS_ADDS            = 4,
+    MAX_HYDROSS_MARKS           = 6,
+};
+
+static const uint32 aMarkHydross[MAX_HYDROSS_MARKS] = {38215, 38216, 38217, 38218, 38231, 40584};
+static const uint32 aMarkCorruption[MAX_HYDROSS_MARKS] = {38219, 38220, 38221, 38222, 38230, 40583};
+
+static const float aElementalCleanPoint[3] = { -231.48f, -343.05f, -1.58f};
+static const float aElementalExitPoint[3] = { -177.41f, -395.72f, -1.60f};
+
+struct boss_hydross_the_unstable : public CreatureScript
+{
+    boss_hydross_the_unstable() : CreatureScript("boss_hydross_the_unstable") {}
+
+    struct boss_hydross_the_unstableAI : public ScriptedAI
+    {
+        boss_hydross_the_unstableAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiBeamInitTimer;
+        uint32 m_uiElementalTimer;
+        uint32 m_uiPosCheckTimer;
+        uint32 m_uiMarkTimer;
+        uint32 m_uiWaterTombTimer;
+        uint32 m_uiVileSludgeTimer;
+        uint32 m_uiEnrageTimer;
+        uint8 m_uiMarkCount;
+        bool m_bCorruptedForm;
+
+        void Reset() override
+        {
+            m_uiBeamInitTimer = 5000;
+            m_uiElementalTimer = 20000;
+            m_uiPosCheckTimer = 2000;
+            m_uiMarkTimer = 15000;
+            m_uiWaterTombTimer = 7000;
+            m_uiVileSludgeTimer = 7000;
+            m_uiMarkCount = 0;
+            m_uiEnrageTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            m_bCorruptedForm = false;
+
+            m_creature->SetMeleeDamageSchool(SPELL_SCHOOL_FROST);
+            m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
+            m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, false);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HYDROSS_EVENT, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (m_bCorruptedForm)
+            {
+                DoScriptText(urand(0, 1) ? SAY_CORRUPT_SLAY1 : SAY_CORRUPT_SLAY2, m_creature);
+            }
+            else
+            {
+                DoScriptText(urand(0, 1) ? SAY_CLEAN_SLAY1 : SAY_CLEAN_SLAY2, m_creature);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(m_bCorruptedForm ? SAY_CORRUPT_DEATH : SAY_CLEAN_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HYDROSS_EVENT, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HYDROSS_EVENT, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_PURE_SPAWN:
+                pSummoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
+                break;
+            case NPC_TAINTED_SPAWN:
+                pSummoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);
+                break;
+            case NPC_TAINTED_ELEMENTAL:
+                pSummoned->GetMotionMaster()->MovePoint(POINT_ID_ELEMENTAL_CLEAN, aElementalCleanPoint[0], aElementalCleanPoint[1], aElementalCleanPoint[2]);
+                break;
+            }
+
+            // Attack only in combat
+            if (m_creature->getVictim())
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            if (uiPointId == POINT_ID_ELEMENTAL_CLEAN)
+            {
+                pSummoned->SetFacingToObject(m_creature);
+                DoCastSpellIfCan(pSummoned, SPELL_PURIFY_ELEMENTAL);
+            }
+            else if (uiPointId == POINT_ID_ELEMENTAL_EXIT)
+            {
+                pSummoned->ForcedDespawn();
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            // Purify elementals and make them go to exit
+            if (pSpell->Id == SPELL_PURIFY_ELEMENTAL)
+            {
+                ((Creature*)pTarget)->UpdateEntry(NPC_PURIFIED_ELEMENTAL);
+                pTarget->GetMotionMaster()->MovePoint(POINT_ID_ELEMENTAL_EXIT, aElementalExitPoint[0], aElementalExitPoint[1], aElementalExitPoint[2]);
+            }
+        }
+
+        // Adds summon during phase switch
+        void DoSpawnAdds()
+        {
+            float fX, fY, fZ;
+            for (uint8 i = 0; i < MAX_HYDROSS_ADDS; ++i)
+            {
+                m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 10, M_PI_F / 2 * i);
+                m_creature->SummonCreature(m_bCorruptedForm ? NPC_PURE_SPAWN : NPC_TAINTED_SPAWN, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        // Wrapper to handle the blue beams animation
+        void DoHandleBeamHelpers(bool bReset)
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+            m_pInstance->SetData(TYPE_DO_HANDLE_BEAMS, uint32(bReset));
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                // handle elementals on OOC timer
+                if (m_uiElementalTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_WATER_ELEMENT) == CAST_OK)
+                    {
+                        m_uiElementalTimer = 20000;
+                    }
+                }
+                else
+                {
+                    m_uiElementalTimer -= uiDiff;
+                }
+
+                return;
+            }
+
+            if (m_uiBeamInitTimer)
+            {
+                if (m_uiBeamInitTimer <= uiDiff)
+                {
+                    DoHandleBeamHelpers(false);
+                    m_uiBeamInitTimer = 0;
+                }
+                else
+                {
+                    m_uiBeamInitTimer -= uiDiff;
+                }
+            }
+
+            // corrupted form
+            if (m_bCorruptedForm)
+            {
+                if (m_uiVileSludgeTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_VILE_SLUDGE) == CAST_OK)
+                        {
+                            m_uiVileSludgeTimer = 15000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiVileSludgeTimer -= uiDiff;
+                }
+
+                // Change to clean
+                if (m_uiPosCheckTimer < uiDiff)
+                {
+                    float fPosX, fPosY, fPosZ;
+                    m_creature->GetCombatStartPosition(fPosX, fPosY, fPosZ);
+
+                    if (m_creature->IsWithinDist2d(fPosX, fPosY, SWITCH_RADIUS))
+                    {
+                        DoScriptText(SAY_SWITCH_TO_CLEAN, m_creature);
+                        m_creature->RemoveAurasDueToSpell(SPELL_CORRUPTION);
+                        m_uiMarkCount = 0;
+
+                        DoHandleBeamHelpers(false);
+                        DoResetThreat();
+                        DoSpawnAdds();
+
+                        m_creature->SetMeleeDamageSchool(SPELL_SCHOOL_FROST);
+                        m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
+                        m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, false);
+
+                        m_bCorruptedForm = false;
+                        m_uiMarkTimer = 15000;
+                    }
+
+                    m_uiPosCheckTimer = 2000;
+                }
+                else
+                {
+                    m_uiPosCheckTimer -= uiDiff;
+                }
+            }
+            // clean form
+            else
+            {
+                if (m_uiWaterTombTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_WATER_TOMB) == CAST_OK)
+                        {
+                            m_uiWaterTombTimer = 7000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiWaterTombTimer -= uiDiff;
+                }
+
+                // Change to corrupt
+                if (m_uiPosCheckTimer < uiDiff)
+                {
+                    float fPosX, fPosY, fPosZ;
+                    m_creature->GetCombatStartPosition(fPosX, fPosY, fPosZ);
+
+                    if (!m_creature->IsWithinDist2d(fPosX, fPosY, SWITCH_RADIUS))
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_CORRUPTION) == CAST_OK)
+                        {
+                            DoScriptText(SAY_SWITCH_TO_CORRUPT, m_creature);
+                            m_uiMarkCount = 0;
+
+                            DoHandleBeamHelpers(true);
+                            DoResetThreat();
+                            DoSpawnAdds();
+
+                            m_creature->SetMeleeDamageSchool(SPELL_SCHOOL_NATURE);
+                            m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);
+                            m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, false);
+
+                            m_bCorruptedForm = true;
+                            m_uiMarkTimer = 15000;
+                        }
+                    }
+
+                    m_uiPosCheckTimer = 2000;
+                }
+                else
+                {
+                    m_uiPosCheckTimer -= uiDiff;
+                }
+            }
+
+            // Apply mark debuff
+            if (m_uiMarkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bCorruptedForm ? aMarkCorruption[m_uiMarkCount] : aMarkHydross[m_uiMarkCount]) == CAST_OK)
+                {
+                    ++m_uiMarkCount;
+                    m_uiMarkTimer = 15000;
+
+                    // limit the mark counter to 6
+                    if (m_uiMarkCount == MAX_HYDROSS_MARKS)
+                    {
+                        m_uiMarkCount = MAX_HYDROSS_MARKS - 1;
+                    }
+                }
+            }
+            else
+            {
+                m_uiMarkTimer -= uiDiff;
+            }
+
+            if (m_uiEnrageTimer)
+            {
+                if (m_uiEnrageTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ENRAGE) == CAST_OK)
+                    {
+                        m_uiEnrageTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiEnrageTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_hydross_the_unstableAI(pCreature);
+    }
+};
+
+void AddSC_boss_hydross_the_unstable()
+{
+    Script* s;
+
+    s = new boss_hydross_the_unstable();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_hydross_the_unstable";
+    //pNewScript->GetAI = &GetAI_boss_hydross_the_unstable;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_lady_vashj.cpp b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_lady_vashj.cpp
new file mode 100644
index 000000000..97207c4eb
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_lady_vashj.cpp
@@ -0,0 +1,599 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Lady_Vashj
+SD%Complete: 80
+SDComment: Some details are not very clear: the usage of Shoot and Multishot spells; the summons positions. Tainted Core paralize NYI. Timers need improvements.
+SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
+EndScriptData */
+
+#include "precompiled.h"
+#include "serpent_shrine.h"
+
+enum
+{
+    // yells
+    SAY_INTRO                   = -1548042,
+    SAY_AGGRO1                  = -1548043,
+    SAY_AGGRO2                  = -1548044,
+    SAY_AGGRO3                  = -1548045,
+    SAY_AGGRO4                  = -1548046,
+    SAY_PHASE1                  = -1548047,
+    SAY_PHASE2                  = -1548048,
+    SAY_PHASE3                  = -1548049,
+    SAY_BOWSHOT1                = -1548050,
+    SAY_BOWSHOT2                = -1548051,
+    SAY_SLAY1                   = -1548052,
+    SAY_SLAY2                   = -1548053,
+    SAY_SLAY3                   = -1548054,
+    SAY_DEATH                   = -1548055,
+
+    // spells
+    SPELL_MULTI_SHOT            = 38310,
+    SPELL_SHOCK_BLAST           = 38509,
+    SPELL_ENTANGLE              = 38316,
+    SPELL_STATIC_CHARGE         = 38280,
+    SPELL_FORKED_LIGHTNING      = 38145,
+    SPELL_SHOOT                 = 38295,
+
+    SPELL_SURGE                 = 38044,
+    SPELL_SUMMON_TAINTED_ELEM   = 38139,                    // maybe also related to spell 38494
+    SPELL_PARALIZE              = 38132,                    // aura which should apply to the player which picked the tainted core
+
+    // summons
+    NPC_ENCHANTED_ELEMENTAL     = 21958,
+    NPC_TAINTED_ELEMENTAL       = 22009,
+    NPC_COILFANG_STRIDER        = 22056,
+    NPC_COILFANG_ELITE          = 22055,
+    NPC_TOXIC_SPOREBAT          = 22140,
+
+    // other
+    POINT_MOVE_CENTER           = 1,
+
+    PHASE_1                     = 1,
+    PHASE_2                     = 2,
+    PHASE_3                     = 3,
+
+    MAX_SHIELD_GEN              = 4,
+};
+
+static const float afMiddlePos[3]   = {30.134f, -923.65f, 42.9f};
+
+// ToDo: all the following mobs are probably summoned by trigger npcs.
+// Remove the hardcoded coords and set the right summoning when then DB will suppot this!
+
+static const float afSporebatPos[4] = {30.977156f, -925.297761f, 77.176567f, 5.223932f};
+
+static const float afElementPos[8][4] =
+{
+    {8.3f  , -835.3f , 21.9f, 5.0f},
+    {53.4f , -835.3f , 21.9f, 4.5f},
+    {96.0f , -861.9f , 21.8f, 4.0f},
+    {96.0f , -986.4f , 21.4f, 2.5f},
+    {54.4f , -1010.6f, 22.0f, 1.8f},
+    {9.8f  , -1012.0f, 21.7f, 1.4f},
+    { -35.0f, -987.6f , 21.5f, 0.8f},
+    { -58.9f, -901.6f , 21.5f, 6.0f}
+};
+
+const float afCoilfangElitePos[3][4] =
+{
+    {28.84f    , -923.28f    , 42.9f     , 6.0f     },
+    {31.183281f, -953.502625f, 41.523602f, 1.640957f},
+    {58.895180f, -923.124268f, 41.545307f, 3.152848f}
+};
+
+const float afCoilfangStriderPos[3][4] =
+{
+    {66.427f, -948.778f, 41.262245f, 2.584f},
+    {7.513f , -959.538f, 41.300422f, 1.0346f},
+    { -12.843f, -907.798f, 41.239620f, 6.087f}
+};
+
+struct boss_lady_vashj : public CreatureScript
+{
+    boss_lady_vashj() : CreatureScript("boss_lady_vashj") {}
+
+    struct boss_lady_vashjAI : public ScriptedAI
+    {
+        boss_lady_vashjAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiShockBlastTimer;
+        uint32 m_uiEntangleTimer;
+        uint32 m_uiStaticChargeTimer;
+        uint32 m_uiRangedCheckTimer;
+        uint32 m_uiForkedLightningTimer;
+        uint32 m_uiEnchantedElementalTimer;
+        uint32 m_uiTaintedElementalTimer;
+        uint32 m_uiCoilfangEliteTimer;
+        uint32 m_uiCoilfangStriderTimer;
+        uint32 m_uiSummonSporebatTimer;
+        uint32 m_uiSummonSporebatStaticTimer;
+
+        uint8 m_uiPhase;
+        uint8 m_uiGeneratorsUsed;
+
+        bool m_bEntangle;
+
+        void Reset() override
+        {
+            SetCombatMovement(true);
+
+            m_uiPhase = PHASE_1;
+            m_uiGeneratorsUsed = 0;
+
+            m_uiShockBlastTimer = urand(1000, 60000);
+            m_uiEntangleTimer = 30000;
+            m_uiStaticChargeTimer = urand(10000, 25000);
+            m_uiRangedCheckTimer = 2000;
+            m_bEntangle = false;
+
+            m_uiForkedLightningTimer = urand(3000, 5000);
+            m_uiEnchantedElementalTimer = 10000;
+            m_uiTaintedElementalTimer = 53000;
+            m_uiCoilfangEliteTimer = 47000;
+            m_uiCoilfangStriderTimer = 60000;
+
+            m_uiSummonSporebatTimer = 10000;
+            m_uiSummonSporebatStaticTimer = 30000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 3))
+            {
+            case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
+            case 3: DoScriptText(SAY_AGGRO4, m_creature); break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LADYVASHJ_EVENT, IN_PROGRESS);
+            }
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            if (uiPointId == POINT_MOVE_CENTER)
+            {
+                // Initialize all the shield generators
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_DO_VASHJ_GENERATORS, m_creature->GetObjectGuid().GetRawValue());
+                }
+
+                m_uiPhase = PHASE_2;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_COILFANG_STRIDER:
+            case NPC_COILFANG_ELITE:
+            case NPC_TOXIC_SPOREBAT:
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+                break;
+            case NPC_ENCHANTED_ELEMENTAL:
+                pSummoned->GetMotionMaster()->MoveFollow(m_creature, 0, 0);
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // Set the timer when summoned killed
+            if (pSummoned->GetEntry() == NPC_TAINTED_ELEMENTAL)
+            {
+                m_uiTaintedElementalTimer = 50000;
+            }
+        }
+
+        void SummonedCreatureDespawn(Creature* pSummoned) override
+        {
+            // Set the timer when summoned despawned, if not already killed
+            if (pSummoned->GetEntry() == NPC_TAINTED_ELEMENTAL)
+            {
+                if (!m_uiTaintedElementalTimer)
+                {
+                    m_uiTaintedElementalTimer = 50000;
+                }
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LADYVASHJ_EVENT, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LADYVASHJ_EVENT, FAIL);
+            }
+        }
+
+        bool CanCastShootOrMultishot()
+        {
+            // It's not very clear how this should work - requires additional research!
+            if (DoCastSpellIfCan(m_creature->getVictim(), urand(0, 1) ? SPELL_SHOOT : SPELL_MULTI_SHOT) == CAST_OK)
+            {
+                if (urand(0, 2))
+                {
+                    DoScriptText(urand(0, 1) ? SAY_BOWSHOT1 : SAY_BOWSHOT2, m_creature);
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+        // Wrapper to inform the boss that a generator has been deactivated
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit* /*pReceiver*/, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+            {
+                ++m_uiGeneratorsUsed;
+
+                // Remove 5% of health on each generator used
+                // ToDo: research if this should be done by spell
+                m_creature->SetHealth(m_creature->GetHealth() - m_creature->GetMaxHealth()*.05f);
+
+                // Check if all generators have been deactivated, or the creature doesn't have the spell barrier aura (in order to avoid eventual aura stacking bugs)
+                if (m_uiGeneratorsUsed == MAX_SHIELD_GEN || !m_creature->HasAura(SPELL_MAGIC_BARRIER))
+                {
+                    DoScriptText(SAY_PHASE3, m_creature);
+                    SetCombatMovement(true);
+
+                    if (m_creature->getVictim())
+                    {
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    }
+
+                    m_uiPhase = PHASE_3;
+                    m_uiRangedCheckTimer = 3000;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiPhase == PHASE_1 || m_uiPhase == PHASE_3)
+            {
+                if (m_uiShockBlastTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHOCK_BLAST) == CAST_OK)
+                    {
+                        m_uiShockBlastTimer = urand(1000, 15000);
+                    }
+                }
+                else
+                {
+                    m_uiShockBlastTimer -= uiDiff;
+                }
+
+                if (m_uiStaticChargeTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_STATIC_CHARGE, SELECT_FLAG_IN_MELEE_RANGE))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_STATIC_CHARGE) == CAST_OK)
+                        {
+                            m_uiStaticChargeTimer = urand(10000, 30000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiStaticChargeTimer -= uiDiff;
+                }
+
+                if (m_uiEntangleTimer < uiDiff)
+                {
+                    if (!m_bEntangle)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_ENTANGLE) == CAST_OK)
+                        {
+                            m_bEntangle = true;
+                            m_uiEntangleTimer = 5000;
+                        }
+                    }
+                    else
+                    {
+                        // Cast Shoot or Multishot after Entangle
+                        if (CanCastShootOrMultishot())
+                        {
+                            m_bEntangle = false;
+                            m_uiEntangleTimer = urand(20000, 25000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiEntangleTimer -= uiDiff;
+                }
+
+                // Phase 1 abilities
+                if (m_uiPhase == PHASE_1)
+                {
+                    // m_uiPhase 2 begins when Vashj hits 70%. She will run to the middle of her platform and surround herself in a shield making her invulerable.
+                    if (m_creature->GetHealthPercent() <= 70.0f)
+                    {
+                        DoScriptText(SAY_PHASE2, m_creature);
+
+                        SetCombatMovement(false);
+
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MovePoint(POINT_MOVE_CENTER, afMiddlePos[0], afMiddlePos[1], afMiddlePos[2]);
+
+                        m_uiPhase = PHASE_2;
+                        m_uiRangedCheckTimer = 10000;
+                    }
+                }
+                // Phase 3 abilities
+                else
+                {
+                    // ToDo: this is not very clear how it should work - requires additional research!
+                    if (m_uiSummonSporebatTimer < uiDiff)
+                    {
+                        m_creature->SummonCreature(NPC_TOXIC_SPOREBAT, afSporebatPos[0], afSporebatPos[1], afSporebatPos[2], afSporebatPos[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                        // summon sporebats faster and faster
+                        if (m_uiSummonSporebatStaticTimer > 1000)
+                        {
+                            m_uiSummonSporebatStaticTimer -= 1000;
+                        }
+
+                        m_uiSummonSporebatTimer = m_uiSummonSporebatStaticTimer;
+                    }
+                    else
+                    {
+                        m_uiSummonSporebatTimer -= uiDiff;
+                    }
+                }
+
+                // If we are within range melee the target
+                if (m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+                {
+                    DoMeleeAttackIfReady();
+                }
+                else
+                {
+                    // Cast Shoot or Multishot when nobody in melee range
+                    if (m_uiRangedCheckTimer < uiDiff)
+                    {
+                        if (CanCastShootOrMultishot())
+                        {
+                            m_uiRangedCheckTimer = urand(1000, 2000);
+                        }
+                    }
+                    else
+                    {
+                        m_uiRangedCheckTimer -= uiDiff;
+                    }
+                }
+            }
+            // Phase 2 only
+            else
+            {
+                if (m_uiForkedLightningTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_FORKED_LIGHTNING) == CAST_OK)
+                        {
+                            m_uiForkedLightningTimer = urand(3000, 6000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiForkedLightningTimer -= uiDiff;
+                }
+
+                if (m_uiEnchantedElementalTimer < uiDiff)
+                {
+                    uint8 uiPos = urand(0, 7);
+                    m_creature->SummonCreature(NPC_ENCHANTED_ELEMENTAL, afElementPos[uiPos][0], afElementPos[uiPos][1], afElementPos[uiPos][2], afElementPos[uiPos][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+
+                    m_uiEnchantedElementalTimer = urand(5000, 10000);
+                }
+                else
+                {
+                    m_uiEnchantedElementalTimer -= uiDiff;
+                }
+
+                if (m_uiTaintedElementalTimer)
+                {
+                    if (m_uiTaintedElementalTimer <= uiDiff)
+                    {
+                        uint8 uiPos = urand(0, 7);
+
+                        m_creature->SummonCreature(NPC_TAINTED_ELEMENTAL, afElementPos[uiPos][0], afElementPos[uiPos][1], afElementPos[uiPos][2], afElementPos[uiPos][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                        m_uiTaintedElementalTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiTaintedElementalTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiCoilfangEliteTimer < uiDiff)
+                {
+                    uint8 uiPos = urand(0, 2);
+
+                    m_creature->SummonCreature(NPC_COILFANG_ELITE, afCoilfangElitePos[uiPos][0], afCoilfangElitePos[uiPos][1], afCoilfangElitePos[uiPos][2], afCoilfangElitePos[uiPos][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                    m_uiCoilfangEliteTimer = urand(45000, 50000);
+                }
+                else
+                {
+                    m_uiCoilfangEliteTimer -= uiDiff;
+                }
+
+                if (m_uiCoilfangStriderTimer < uiDiff)
+                {
+                    uint8 uiPos = urand(0, 2);
+
+                    m_creature->SummonCreature(NPC_COILFANG_STRIDER, afCoilfangStriderPos[uiPos][0], afCoilfangStriderPos[uiPos][1], afCoilfangStriderPos[uiPos][2], afCoilfangStriderPos[uiPos][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                    m_uiCoilfangStriderTimer = urand(60000, 70000);
+                }
+                else
+                {
+                    m_uiCoilfangStriderTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_lady_vashjAI(pCreature);
+    }
+};
+
+struct mob_enchanted_elemental : public CreatureScript
+{
+    mob_enchanted_elemental() : CreatureScript("mob_enchanted_elemental") {}
+
+    struct mob_enchanted_elementalAI : public ScriptedAI
+    {
+        mob_enchanted_elementalAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            SetCombatMovement(false);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // Buff Lady Vashj on range check - spell has script target
+            if (pWho->GetEntry() == NPC_LADYVASHJ && pWho->IsWithinDistInMap(m_creature, INTERACTION_DISTANCE) && pWho->IsWithinLOSInMap(m_creature))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SURGE, CAST_TRIGGERED);
+            }
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_enchanted_elementalAI(pCreature);
+    }
+};
+
+struct go_shield_generator : public GameObjectScript
+{
+    go_shield_generator() : GameObjectScript("go_shield_generator") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        // Interrupt Magic barrier spell casting, inform the boss and make the GO unusable
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData())
+        {
+            if (Creature* pGenerator = GetClosestCreatureWithEntry(pGo, NPC_SHIELD_GENERATOR, 5.0f))
+            {
+                pGenerator->InterruptNonMeleeSpells(false);
+            }
+
+            if (Creature* pVashj = pInstance->GetSingleCreatureFromStorage(NPC_LADYVASHJ))
+            {
+                if (CreatureAI* pLadyAI = pVashj->AI())
+                {
+                    pLadyAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pVashj, pVashj, 0);
+                }
+            }
+
+            pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_lady_vashj()
+{
+    Script* s;
+
+    s = new boss_lady_vashj();
+    s->RegisterSelf();
+    s = new mob_enchanted_elemental();
+    s->RegisterSelf();
+    s = new go_shield_generator();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_lady_vashj";
+    //pNewScript->GetAI = &GetAI_boss_lady_vashj;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_enchanted_elemental";
+    //pNewScript->GetAI = &GetAI_mob_enchanted_elemental;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_shield_generator";
+    //pNewScript->pGOUse = &GOUse_go_shield_generator;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_leotheras_the_blind.cpp
new file mode 100644
index 000000000..ce02e8610
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_leotheras_the_blind.cpp
@@ -0,0 +1,398 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Leotheras_The_Blind
+SD%Complete: 70
+SDComment: Inner Demons NYI; Transition to final phase needs more work.
+SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
+EndScriptData */
+
+#include "precompiled.h"
+#include "serpent_shrine.h"
+
+enum
+{
+    SAY_AGGRO               = -1548009,
+    SAY_SWITCH_TO_DEMON     = -1548010,
+    SAY_INNER_DEMONS        = -1548011,
+    SAY_DEMON_SLAY1         = -1548012,
+    SAY_DEMON_SLAY2         = -1548013,
+    SAY_DEMON_SLAY3         = -1548014,
+    SAY_NIGHTELF_SLAY1      = -1548015,
+    SAY_NIGHTELF_SLAY2      = -1548016,
+    SAY_NIGHTELF_SLAY3      = -1548017,
+    SAY_FINAL_FORM          = -1548018,
+    SAY_FREE                = -1548019,
+    SAY_DEATH               = -1548020,
+
+    SPELL_BERSERK           = 27680,
+    SPELL_WHIRLWIND         = 37640,
+    SPELL_CHAOS_BLAST       = 37674,                    // triggers 37675
+    SPELL_INSIDIOUS_WHISPER = 37676,
+    SPELL_WHISPER_CLEAR     = 37922,                    // purpose unk - probably clear the demons on evade
+    SPELL_CONS_MADNESS      = 37749,                    // charm spell for the players which didn't kill the inner demons during the demon phase
+    SPELL_METAMORPHOSIS     = 37673,                    // demon transform spell
+
+    // Inner demons already scripted in eventAI
+    // SPELL_DEMON_ALIGNMENT = 37713,
+    // SPELL_SHADOW_BOLT     = 39309,
+    // SPELL_DEMON_LINK      = 37716,
+
+    // FACTION_DEMON_1       = 1829,
+    // FACTION_DEMON_2       = 1830,
+    // FACTION_DEMON_3       = 1831,
+    // FACTION_DEMON_4       = 1832,
+    // FACTION_DEMON_5       = 1833,
+
+    NPC_INNER_DEMON         = 21857,
+    NPC_SHADOW_LEO          = 21875
+};
+
+struct boss_leotheras_the_blind : public CreatureScript
+{
+    boss_leotheras_the_blind() : CreatureScript("boss_leotheras_the_blind") {}
+
+    struct boss_leotheras_the_blindAI : public ScriptedAI
+    {
+        boss_leotheras_the_blindAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiBanishTimer;
+        uint32 m_uiWhirlwindTimer;
+        uint32 m_uiInnerDemonTimer;
+        uint32 m_uiSwitchTimer;
+        uint32 m_uiChaosBlastTimer;
+        uint32 m_uiFinalFormTimer;
+        uint32 m_uiEnrageTimer;
+
+        bool m_bDemonForm;
+        bool m_bIsFinalForm;
+
+        void Reset() override
+        {
+            m_uiBanishTimer = 10000;
+            m_uiWhirlwindTimer = 18500;
+            m_uiInnerDemonTimer = 27500;
+            m_uiSwitchTimer = 60000;
+            m_uiChaosBlastTimer = 0;
+            m_uiFinalFormTimer = 0;
+            m_uiEnrageTimer = 10 * MINUTE * IN_MILLISECONDS;
+
+            m_bDemonForm = false;
+            m_bIsFinalForm = false;
+
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            SetCombatMovement(true);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LEOTHERAS_EVENT, IN_PROGRESS);
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            // Don't attack while banished
+            if (m_creature->HasAura(SPELL_LEOTHERAS_BANISH))
+            {
+                return;
+            }
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // Don't attack while banished
+            if (m_creature->HasAura(SPELL_LEOTHERAS_BANISH))
+            {
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(m_bDemonForm ? SAY_DEMON_SLAY1 : SAY_NIGHTELF_SLAY1, m_creature); break;
+            case 1: DoScriptText(m_bDemonForm ? SAY_DEMON_SLAY2 : SAY_NIGHTELF_SLAY2, m_creature); break;
+            case 2: DoScriptText(m_bDemonForm ? SAY_DEMON_SLAY3 : SAY_NIGHTELF_SLAY3, m_creature); break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SHADOW_LEO)
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+                pSummoned->GetMotionMaster()->MoveFollow(m_creature, 0, 0);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LEOTHERAS_EVENT, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_LEOTHERAS_EVENT, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Banish the boss before combat
+            if (m_uiBanishTimer)
+            {
+                if (m_uiBanishTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_LEOTHERAS_BANISH) == CAST_OK)
+                    {
+                        m_uiBanishTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBanishTimer -= uiDiff;
+                }
+            }
+
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiFinalFormTimer)
+            {
+                if (m_uiFinalFormTimer <= uiDiff)
+                {
+                    DoSpawnCreature(NPC_SHADOW_LEO, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                    SetCombatMovement(true);
+                    DoStartMovement(m_creature->getVictim());
+                    m_uiFinalFormTimer = 0;
+                }
+                else
+                {
+                    m_uiFinalFormTimer -= uiDiff;
+                }
+
+                // Wait until we finish the transition
+                return;
+            }
+
+            // Human form spells
+            if (!m_bDemonForm)
+            {
+                if (m_uiWhirlwindTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_WHIRLWIND) == CAST_OK)
+                    {
+                        m_uiWhirlwindTimer = 32000;
+                    }
+                }
+                else
+                {
+                    m_uiWhirlwindTimer -= uiDiff;
+                }
+
+                if (!m_bIsFinalForm)
+                {
+                    if (m_uiSwitchTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_METAMORPHOSIS) == CAST_OK)
+                        {
+                            DoScriptText(SAY_SWITCH_TO_DEMON, m_creature);
+
+                            SetCombatMovement(false);
+                            m_creature->GetMotionMaster()->Clear();
+                            m_creature->GetMotionMaster()->MoveIdle();
+
+                            DoResetThreat();
+                            m_bDemonForm = true;
+
+                            m_uiInnerDemonTimer = 27500;
+                            m_uiSwitchTimer = 60000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiSwitchTimer -= uiDiff;
+                    }
+                }
+
+                DoMeleeAttackIfReady();
+            }
+            // Demon form spells
+            else
+            {
+                if (m_uiInnerDemonTimer)
+                {
+                    if (m_uiInnerDemonTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_INSIDIOUS_WHISPER, CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                        {
+                            DoScriptText(SAY_INNER_DEMONS, m_creature);
+                            m_uiInnerDemonTimer = 0;
+                        }
+                    }
+                    else
+                    {
+                        m_uiInnerDemonTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiChaosBlastTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CHAOS_BLAST) == CAST_OK)
+                    {
+                        m_uiChaosBlastTimer = urand(2000, 3000);
+                    }
+                }
+                else
+                {
+                    m_uiChaosBlastTimer -= uiDiff;
+                }
+
+                if (m_uiSwitchTimer < uiDiff)
+                {
+                    if (m_creature->IsNonMeleeSpellCasted(false))
+                    {
+                        m_creature->InterruptNonMeleeSpells(false);
+                    }
+
+                    // switch to nightelf form
+                    m_creature->RemoveAurasDueToSpell(SPELL_METAMORPHOSIS);
+
+                    SetCombatMovement(true);
+                    DoStartMovement(m_creature->getVictim());
+
+                    DoResetThreat();
+                    m_bDemonForm = false;
+
+                    m_uiWhirlwindTimer = 18500;
+                    m_uiSwitchTimer = 45000;
+                }
+                else
+                {
+                    m_uiSwitchTimer -= uiDiff;
+                }
+            }
+
+            // Prepare to summon the Shadow of Leotheras
+            if (!m_bIsFinalForm && m_creature->GetHealthPercent() < 15.0f)
+            {
+                DoScriptText(SAY_FINAL_FORM, m_creature);
+                m_uiFinalFormTimer = 10000;
+
+                // reset him to human form if necessary
+                if (m_bDemonForm)
+                {
+                    if (m_creature->IsNonMeleeSpellCasted(false))
+                    {
+                        m_creature->InterruptNonMeleeSpells(false);
+                    }
+
+                    // switch to nightelf form
+                    m_creature->RemoveAurasDueToSpell(SPELL_METAMORPHOSIS);
+
+                    DoResetThreat();
+                    m_bDemonForm = false;
+                }
+
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->HandleEmote(EMOTE_ONESHOT_KNEEL);
+
+                SetCombatMovement(false);
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MoveIdle();
+
+                m_bIsFinalForm = true;
+            }
+
+            // Hard enrage timer
+            if (m_uiEnrageTimer)
+            {
+                if (m_uiEnrageTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        m_uiEnrageTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiEnrageTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_leotheras_the_blindAI(pCreature);
+    }
+};
+
+void AddSC_boss_leotheras_the_blind()
+{
+    Script* s;
+
+    s = new boss_leotheras_the_blind();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_leotheras_the_blind";
+    //pNewScript->GetAI = &GetAI_boss_leotheras_the_blind;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_morogrim_tidewalker.cpp
new file mode 100644
index 000000000..fb9d1ca9f
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_morogrim_tidewalker.cpp
@@ -0,0 +1,346 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Morogrim_Tidewalker
+SD%Complete: 90
+SDComment: Water Globule script is not complete - requires additional research.
+SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
+EndScriptData */
+
+#include "precompiled.h"
+#include "serpent_shrine.h"
+
+enum
+{
+    SAY_AGGRO                       = -1548030,
+    SAY_SUMMON1                     = -1548031,
+    SAY_SUMMON2                     = -1548032,
+    SAY_SUMMON_BUBL1                = -1548033,
+    SAY_SUMMON_BUBL2                = -1548034,
+    SAY_SLAY1                       = -1548035,
+    SAY_SLAY2                       = -1548036,
+    SAY_SLAY3                       = -1548037,
+    SAY_DEATH                       = -1548038,
+    EMOTE_WATERY_GRAVE              = -1548039,
+    EMOTE_EARTHQUAKE                = -1548040,
+    EMOTE_WATERY_GLOBULES           = -1548041,
+
+    SPELL_DOUBLE_ATTACK             = 18943,
+    SPELL_TIDAL_WAVE                = 37730,
+    SPELL_EARTHQUAKE                = 37764,
+    SPELL_WATERY_GRAVE              = 38028,
+    // SPELL_WATERY_GRAVE_EXPLOSION  = 38049,               // spell purpose unk
+
+    SPELL_SUMMON_MURLOC_A6          = 39813,
+    SPELL_SUMMON_MURLOC_A7          = 39814,
+    SPELL_SUMMON_MURLOC_A8          = 39815,
+    SPELL_SUMMON_MURLOC_A9          = 39816,
+    SPELL_SUMMON_MURLOC_A10         = 39817,
+
+    SPELL_SUMMON_MURLOC_B6          = 39818,
+    SPELL_SUMMON_MURLOC_B7          = 39819,
+    SPELL_SUMMON_MURLOC_B8          = 39820,
+    SPELL_SUMMON_MURLOC_B9          = 39821,
+    SPELL_SUMMON_MURLOC_B10         = 39822,
+
+    SPELL_SUMMON_GLOBULE_1          = 37854,
+    SPELL_SUMMON_GLOBULE_2          = 37858,
+    SPELL_SUMMON_GLOBULE_3          = 37860,
+    SPELL_SUMMON_GLOBULE_4          = 37861,
+
+    SPELL_WATER_GLOBULE_NEW_TARGET  = 39848,                // spell requires additional research and probably core or script support
+
+    NPC_WATER_GLOBULE               = 21913,
+    NPC_TIDEWALKER_LURKER           = 21920
+};
+
+static const uint32 m_auiSpellWateryGraveTeleport[] = { 37850, 38023, 38024, 38025 };
+
+struct boss_morogrim_tidewalker : public CreatureScript
+{
+    boss_morogrim_tidewalker() : CreatureScript("boss_morogrim_tidewalker") {}
+
+    struct boss_morogrim_tidewalkerAI : public ScriptedAI
+    {
+        boss_morogrim_tidewalkerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiTidalWaveTimer;
+        uint32 m_uiWateryGraveTimer;
+        uint32 m_uiEarthquakeTimer;
+        uint32 m_uiWateryGlobulesTimer;
+        uint8 m_uiGraveIndex;
+
+        bool m_bIsPhase2;
+
+        void Reset() override
+        {
+            m_uiTidalWaveTimer = 10000;
+            m_uiWateryGraveTimer = 30000;
+            m_uiEarthquakeTimer = 40000;
+            m_uiWateryGlobulesTimer = 0;
+            m_uiGraveIndex = 0;
+
+            m_bIsPhase2 = false;
+
+            DoCastSpellIfCan(m_creature, SPELL_DOUBLE_ATTACK);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MOROGRIM_EVENT, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MOROGRIM_EVENT, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MOROGRIM_EVENT, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_TIDEWALKER_LURKER)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+            else if (pSummoned->GetEntry() == NPC_WATER_GLOBULE)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->GetMotionMaster()->MoveFollow(pTarget, 0.0f, 0.0f);
+                }
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            // Handle watery grave teleport - each player hit has his own teleport spell
+            if (pSpell->Id == SPELL_WATERY_GRAVE && pTarget->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoCastSpellIfCan(pTarget, m_auiSpellWateryGraveTeleport[m_uiGraveIndex], CAST_TRIGGERED);
+                ++m_uiGraveIndex;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiEarthquakeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_EARTHQUAKE) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_EARTHQUAKE, m_creature);
+                    DoScriptText(urand(0, 1) ? SAY_SUMMON1 : SAY_SUMMON2, m_creature);
+
+                    // summon murlocs - north
+                    DoCastSpellIfCan(m_creature, SPELL_SUMMON_MURLOC_A6, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_SUMMON_MURLOC_A7, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_SUMMON_MURLOC_A8, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_SUMMON_MURLOC_A9, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_SUMMON_MURLOC_A10, CAST_TRIGGERED);
+
+                    // summon murlocs - south
+                    DoCastSpellIfCan(m_creature, SPELL_SUMMON_MURLOC_B6, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_SUMMON_MURLOC_B7, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_SUMMON_MURLOC_B8, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_SUMMON_MURLOC_B9, CAST_TRIGGERED);
+                    DoCastSpellIfCan(m_creature, SPELL_SUMMON_MURLOC_B10, CAST_TRIGGERED);
+
+                    m_uiEarthquakeTimer = 50000;
+                }
+            }
+            else
+            {
+                m_uiEarthquakeTimer -= uiDiff;
+            }
+
+            if (m_uiTidalWaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TIDAL_WAVE) == CAST_OK)
+                {
+                    m_uiTidalWaveTimer = urand(20000, 25000);
+                }
+            }
+            else
+            {
+                m_uiTidalWaveTimer -= uiDiff;
+            }
+
+            // Phase one specific spells
+            if (!m_bIsPhase2)
+            {
+                if (m_uiWateryGraveTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_WATERY_GRAVE) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_WATERY_GRAVE, m_creature);
+                        m_uiWateryGraveTimer = 30000;
+                        m_uiGraveIndex = 0;
+                    }
+                }
+                else
+                {
+                    m_uiWateryGraveTimer -= uiDiff;
+                }
+
+                // Start Phase2 below 25% hp
+                if (m_creature->GetHealthPercent() < 25.0f)
+                {
+                    m_bIsPhase2 = true;
+                }
+            }
+            else
+            {
+                if (m_uiWateryGlobulesTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_GLOBULE_1) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_WATERY_GLOBULES, m_creature);
+                        DoScriptText(urand(0, 1) ? SAY_SUMMON_BUBL1 : SAY_SUMMON_BUBL2, m_creature);
+
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_GLOBULE_2, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_GLOBULE_3, CAST_TRIGGERED);
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_GLOBULE_4, CAST_TRIGGERED);
+
+                        m_uiWateryGlobulesTimer = 25000;
+                    }
+                }
+                else
+                {
+                    m_uiWateryGlobulesTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_morogrim_tidewalkerAI(pCreature);
+    }
+};
+
+struct mob_water_globule : public CreatureScript
+{
+    mob_water_globule() : CreatureScript("mob_water_globule") {}
+
+    struct mob_water_globuleAI : public ScriptedAI
+    {
+        mob_water_globuleAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiTargetTimer;
+
+        void Reset() override
+        {
+            m_uiTargetTimer = 10000;
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override
+        {
+            // ToDo: cast damage spell here, after proper checks are done
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiTargetTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WATER_GLOBULE_NEW_TARGET) == CAST_OK)
+                {
+                    m_uiTargetTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiTargetTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_water_globuleAI(pCreature);
+    }
+};
+
+void AddSC_boss_morogrim_tidewalker()
+{
+    Script* s;
+
+    s = new boss_morogrim_tidewalker();
+    s->RegisterSelf();
+    s = new mob_water_globule();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_morogrim_tidewalker";
+    //pNewScript->GetAI = &GetAI_boss_morogrim_tidewalker;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_water_globule";
+    //pNewScript->GetAI = &GetAI_mob_water_globule;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_the_lurker_below.cpp b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_the_lurker_below.cpp
new file mode 100644
index 000000000..24705d4fd
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/boss_the_lurker_below.cpp
@@ -0,0 +1,382 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_the_lurker_below
+SD%Complete: 90
+SDComment: Spawn animation NYI; Timers may need adjustments.
+SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
+EndScriptData */
+
+#include "precompiled.h"
+#include "serpent_shrine.h"
+
+enum
+{
+    EMOTE_DEEP_BREATH               = -1548056,
+
+#if defined (WOTLK) || defined (CATA)
+    SPELL_LURKER_SPAWN_TRIGGER      = 54587,
+#endif
+    SPELL_WHIRL                     = 37660,
+    SPELL_GEYSER                    = 37478,
+    SPELL_SPOUT                     = 37431,                // trigger spells 37429, 37430
+    SPELL_SPOUT_LEFT                = 37429,
+    SPELL_SPOUT_RIGHT               = 37430,
+    SPELL_WATERBOLT                 = 37138,
+    SPELL_SUBMERGE                  = 37550,
+
+#if defined (CLASSIC) || defined (TBC) || defined (WOTLK) || defined (CATA)
+    NPC_LURKER_BELOW                = 21217,
+#endif
+    NPC_COILFANG_AMBUSHER           = 21865,
+    NPC_COILFANG_GUARDIAN           = 21873,
+
+    MAX_SUBMERGE_ADDS               = 9,
+};
+
+enum Phases
+{
+    PHASE_EMERGEING             = 0,                        // TODO unused for now
+    PHASE_NORMAL                = 1,
+    PHASE_SPOUT                 = 2,
+    PHASE_SUBMERGED             = 3,
+};
+
+struct AddsLocations
+{
+    uint32 uiEntry;
+    float fX, fY, fZ;
+};
+
+// Coords are guesswork
+static const AddsLocations aLurkerLoc[MAX_SUBMERGE_ADDS] =
+{
+    {NPC_COILFANG_AMBUSHER, 2.855f,  -459.823f, -19.18f},
+    {NPC_COILFANG_AMBUSHER, 12.458f, -466.042f, -19.18f},
+    {NPC_COILFANG_AMBUSHER, 51.366f, -460.836f, -19.18f},
+    {NPC_COILFANG_AMBUSHER, 62.597f, -457.433f, -19.18f},
+    {NPC_COILFANG_AMBUSHER, 77.607f, -384.302f, -19.18f},
+    {NPC_COILFANG_AMBUSHER, 63.897f, -378.984f, -19.18f},
+    {NPC_COILFANG_GUARDIAN, 34.447f, -387.333f, -19.18f},
+    {NPC_COILFANG_GUARDIAN, 14.388f, -423.468f, -19.62f},
+    {NPC_COILFANG_GUARDIAN, 42.471f, -445.115f, -19.76f},
+};
+
+#if defined (CLASSIC) || defined (TBC) || defined (WOTLK) || defined (CATA)
+static const float afLurkerSpawnPos[4] = {40.4058f, -417.108f, -21.5911f, 3.03312f};
+#endif
+struct boss_the_lurker_below : public CreatureScript
+{
+    boss_the_lurker_below() : CreatureScript("boss_the_lurker_below") {}
+
+    struct boss_the_lurker_belowAI : public Scripted_NoMovementAI
+    {
+        boss_the_lurker_belowAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        Phases m_uiPhase;
+        uint32 m_uiPhaseChangeTimer;
+
+        uint32 m_uiWhirlTimer;
+        uint32 m_uiGeyserTimer;
+        uint32 m_uiSpoutTimer;
+        uint32 m_uiSpoutEndTimer;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_NORMAL;
+            m_uiPhaseChangeTimer = 90000;
+
+            DoResetCombatTimers();
+        }
+
+        void DoResetCombatTimers()
+        {
+            m_uiWhirlTimer = 18000;
+            m_uiGeyserTimer = 50000;
+            m_uiSpoutTimer = 42000;
+            m_uiSpoutEndTimer = 23000;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THELURKER_EVENT, FAIL);
+            }
+
+            m_creature->ForcedDespawn();
+        }
+
+        void JustDied(Unit* /*pVictim*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THELURKER_EVENT, DONE);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Allow the adds to attack
+            pSummoned->SetInCombatWithZone();
+        }
+
+        // Wrapper to summon adds in phase 2
+        void DoSummonCoilfangNaga()
+        {
+            for (uint8 i = 0; i < MAX_SUBMERGE_ADDS; ++i)
+            {
+                m_creature->SummonCreature(aLurkerLoc[i].uiEntry, aLurkerLoc[i].fX, aLurkerLoc[i].fY, aLurkerLoc[i].fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        // Custom threat management
+        bool SelectHostileTarget()
+        {
+            Unit* pTarget = NULL;
+            Unit* pOldTarget = m_creature->getVictim();
+
+            if (!m_creature->GetThreatManager().isThreatListEmpty())
+            {
+                pTarget = m_creature->GetThreatManager().getHostileTarget();
+            }
+
+            if (pTarget)
+            {
+                if (pOldTarget != pTarget && m_uiPhase != PHASE_SPOUT)
+                {
+                    AttackStart(pTarget);
+                }
+
+                // Set victim to old target (if not while Spout)
+                if (pOldTarget && pOldTarget->IsAlive() && m_uiPhase != PHASE_SPOUT)
+                {
+                    m_creature->SetTargetGuid(pOldTarget->GetObjectGuid());
+                    m_creature->SetInFront(pOldTarget);
+                }
+
+                return true;
+            }
+
+            // Will call EnterEvadeMode if fit
+            return m_creature->SelectHostileTarget();
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!SelectHostileTarget())
+            {
+                return;
+            }
+
+            switch (m_uiPhase)
+            {
+#if defined (WOTLK) || defined (CATA)
+            case PHASE_EMERGEING:
+                break;
+#endif
+            case PHASE_SPOUT:
+
+                if (m_uiSpoutEndTimer < uiDiff)
+                {
+                    // Remove rotation auras
+                    m_creature->RemoveAurasDueToSpell(SPELL_SPOUT_LEFT);
+                    m_creature->RemoveAurasDueToSpell(SPELL_SPOUT_RIGHT);
+
+                    m_uiPhase = PHASE_NORMAL;
+                    m_uiSpoutEndTimer = 23000;
+                }
+                else
+                {
+                    m_uiSpoutEndTimer -= uiDiff;
+                }
+
+                // no break;
+            case PHASE_NORMAL:
+
+                // Count the first phase during Spout too
+                if (m_uiPhaseChangeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUBMERGE) == CAST_OK)
+                    {
+                        DoSummonCoilfangNaga();
+                        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                        m_uiPhase = PHASE_SUBMERGED;
+                        m_uiPhaseChangeTimer = MINUTE * IN_MILLISECONDS;
+                    }
+                }
+                else
+                {
+                    m_uiPhaseChangeTimer -= uiDiff;
+                }
+
+                // Combat spells are only in normal phase
+                if (m_uiPhase == PHASE_NORMAL)
+                {
+                    if (m_uiSpoutTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_SPOUT) == CAST_OK)
+                        {
+                            DoScriptText(EMOTE_DEEP_BREATH, m_creature);
+
+                            // Remove the target focus but allow the boss to face the current victim
+                            m_creature->SetTargetGuid(ObjectGuid());
+                            m_creature->SetFacingToObject(m_creature->getVictim());
+
+                            m_uiPhase = PHASE_SPOUT;
+                            m_uiSpoutTimer = 30000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiSpoutTimer -= uiDiff;
+                    }
+
+                    if (m_uiWhirlTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_WHIRL) == CAST_OK)
+                        {
+                            m_uiWhirlTimer = 18000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiWhirlTimer -= uiDiff;
+                    }
+
+                    if (m_uiGeyserTimer < uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        {
+                            if (DoCastSpellIfCan(pTarget, SPELL_GEYSER) == CAST_OK)
+                            {
+                                m_uiGeyserTimer = urand(50000, 60000);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiGeyserTimer -= uiDiff;
+                    }
+
+                    // If we are within range melee the target
+                    if (m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+                    {
+                        DoMeleeAttackIfReady();
+                    }
+                    // Spam Waterbolt spell when not tanked
+                    else
+                    {
+                        if (!m_creature->IsNonMeleeSpellCasted(false))
+                        {
+                            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                            {
+                                DoCastSpellIfCan(pTarget, SPELL_WATERBOLT);
+                            }
+                        }
+                    }
+                }
+
+                break;
+            case PHASE_SUBMERGED:
+
+                if (m_uiPhaseChangeTimer < uiDiff)
+                {
+                    DoResetCombatTimers();
+                    m_uiPhase = PHASE_NORMAL;
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    m_creature->RemoveAurasDueToSpell(SPELL_SUBMERGE);
+                    m_uiPhaseChangeTimer = 2 * MINUTE * IN_MILLISECONDS;
+                }
+                else
+                {
+                    m_uiPhaseChangeTimer -= uiDiff;
+                }
+
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_the_lurker_belowAI(pCreature);
+    }
+};
+
+// Cast the spell that should summon the Lurker-Below
+struct go_strange_pool : public GameObjectScript
+{
+    go_strange_pool() : GameObjectScript("go_strange_pool") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        // There is some chance to fish The Lurker Below, sources are from 20s to 10minutes, average 5min => 20 tries, hence 5%
+        if (urand(0, 99) < 5)
+        {
+            if (ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData())
+            {
+                if (pInstance->GetData(TYPE_THELURKER_EVENT) == NOT_STARTED || pInstance->GetData(TYPE_THELURKER_EVENT) == FAIL)
+                {
+#if defined (CLASSIC) || defined (TBC)
+                    pPlayer->SummonCreature(NPC_LURKER_BELOW, afLurkerSpawnPos[0], afLurkerSpawnPos[1], afLurkerSpawnPos[2], afLurkerSpawnPos[3], TEMPSUMMON_DEAD_DESPAWN, 0);
+#else
+                pPlayer->CastSpell(pPlayer, SPELL_LURKER_SPAWN_TRIGGER, true);
+#endif
+                    pInstance->SetData(TYPE_THELURKER_EVENT, IN_PROGRESS);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+};
+
+void AddSC_boss_the_lurker_below()
+{
+    Script* s;
+
+    s = new boss_the_lurker_below();
+    s->RegisterSelf();
+    s = new go_strange_pool();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_the_lurker_below";
+    //pNewScript->GetAI = &GetAI_boss_the_lurker_below;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_strange_pool";
+    //pNewScript->pGOUse = &GOUse_go_strange_pool;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/instance_serpent_shrine.cpp b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/instance_serpent_shrine.cpp
new file mode 100644
index 000000000..770be61e8
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/instance_serpent_shrine.cpp
@@ -0,0 +1,359 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Serpent_Shrine
+SD%Complete: 90
+SDComment:
+SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
+EndScriptData */
+
+#include "precompiled.h"
+#include "serpent_shrine.h"
+
+/* Serpentshrine cavern encounters:
+0 - Hydross The Unstable event
+1 - Leotheras The Blind Event
+2 - The Lurker Below Event
+3 - Fathom-Lord Karathress Event
+4 - Morogrim Tidewalker Event
+5 - Lady Vashj Event
+*/
+
+struct is_serpentshrine_cavern : public InstanceScript
+{
+    is_serpentshrine_cavern() : InstanceScript("instance_serpent_shrine") {}
+
+    class instance_serpentshrine_cavern : public ScriptedInstance
+    {
+    public:
+        instance_serpentshrine_cavern(Map* pMap) : ScriptedInstance(pMap),
+            m_uiSpellBinderCount(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_LADYVASHJ:
+            case NPC_SHARKKIS:
+            case NPC_TIDALVESS:
+            case NPC_CARIBDIS:
+            case NPC_LEOTHERAS:
+            case NPC_HYDROSS_THE_UNSTABLE:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_GREYHEART_SPELLBINDER:
+                m_lSpellBindersGUIDList.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_HYDROSS_BEAM_HELPER:
+                m_lBeamHelpersGUIDList.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_SHIELD_GENERATOR:
+                m_lShieldGeneratorGUIDList.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_COILFANG_PRIESTESS:
+            case NPC_COILFANG_SHATTERER:
+            case NPC_VASHJIR_HONOR_GUARD:
+            case NPC_GREYHEART_TECHNICIAN:
+                // Filter only the mobs spawned on the platforms
+                if (pCreature->GetPositionZ() > 0)
+                {
+                    m_sPlatformMobsGUIDSet.insert(pCreature->GetObjectGuid());
+                }
+                break;
+            }
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            // Interrupt spell casting on aggro
+            if (pCreature->GetEntry() == NPC_GREYHEART_SPELLBINDER)
+            {
+                pCreature->InterruptNonMeleeSpells(false);
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_GREYHEART_SPELLBINDER:
+                ++m_uiSpellBinderCount;
+
+                if (m_uiSpellBinderCount == MAX_SPELLBINDERS)
+                {
+                    if (Creature* pLeotheras = GetSingleCreatureFromStorage(NPC_LEOTHERAS))
+                    {
+                        pLeotheras->RemoveAurasDueToSpell(SPELL_LEOTHERAS_BANISH);
+                        pLeotheras->SetInCombatWithZone();
+                    }
+                }
+                break;
+            case NPC_COILFANG_PRIESTESS:
+            case NPC_COILFANG_SHATTERER:
+            case NPC_VASHJIR_HONOR_GUARD:
+            case NPC_GREYHEART_TECHNICIAN:
+                if (m_sPlatformMobsGUIDSet.find(pCreature->GetObjectGuid()) != m_sPlatformMobsGUIDSet.end())
+                {
+                    m_sPlatformMobsAliveGUIDSet.erase(pCreature->GetObjectGuid());
+                }
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_SHIELD_GENERATOR_1:
+            case GO_SHIELD_GENERATOR_2:
+            case GO_SHIELD_GENERATOR_3:
+            case GO_SHIELD_GENERATOR_4:
+                m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_HYDROSS_EVENT:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_LEOTHERAS_EVENT:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == FAIL)
+                {
+                    for (GuidList::const_iterator itr = m_lSpellBindersGUIDList.begin(); itr != m_lSpellBindersGUIDList.end(); ++itr)
+                    {
+                        if (Creature* pSpellBinder = instance->GetCreature(*itr))
+                        {
+                            pSpellBinder->Respawn();
+                        }
+                    }
+
+                    m_uiSpellBinderCount = 0;
+                }
+                break;
+            case TYPE_THELURKER_EVENT:
+            case TYPE_KARATHRESS_EVENT:
+            case TYPE_MOROGRIM_EVENT:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_LADYVASHJ_EVENT:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == FAIL)
+                {
+                    // interrupt the shield
+                    for (GuidList::const_iterator itr = m_lShieldGeneratorGUIDList.begin(); itr != m_lShieldGeneratorGUIDList.end(); ++itr)
+                    {
+                        if (Creature* pGenerator = instance->GetCreature(*itr))
+                        {
+                            pGenerator->InterruptNonMeleeSpells(false);
+                        }
+                    }
+
+                    // reset generators
+                    DoToggleGameObjectFlags(GO_SHIELD_GENERATOR_1, GO_FLAG_NO_INTERACT, false);
+                    DoToggleGameObjectFlags(GO_SHIELD_GENERATOR_2, GO_FLAG_NO_INTERACT, false);
+                    DoToggleGameObjectFlags(GO_SHIELD_GENERATOR_3, GO_FLAG_NO_INTERACT, false);
+                    DoToggleGameObjectFlags(GO_SHIELD_GENERATOR_4, GO_FLAG_NO_INTERACT, false);
+                }
+                break;
+            case TYPE_DO_HANDLE_BEAMS:
+                for (GuidList::const_iterator itr = m_lBeamHelpersGUIDList.begin(); itr != m_lBeamHelpersGUIDList.end(); ++itr)
+                {
+                    if (Creature* pBeam = instance->GetCreature(*itr))
+                    {
+                        if (uiData)
+                        {
+                            pBeam->InterruptNonMeleeSpells(false);
+                        }
+                        else
+                        {
+                            Creature *hydross = GetSingleCreatureFromStorage(NPC_HYDROSS_THE_UNSTABLE);
+                            if (hydross)
+                                pBeam->CastSpell(hydross, SPELL_BLUE_BEAM, false);
+                        }
+                    }
+                }
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        void SetData64(uint32 uiType, uint64 uiGuid) override
+        {
+            switch (uiType)
+            {
+            case DATA_WATERSTATE_EVENT:
+                // Note: this is handled in Acid. The purpose is check which npc from the platform set is alive
+                // The function is triggered by eventAI on generic timer
+                if (uiType == DATA_WATERSTATE_EVENT)
+                {
+                    if (m_sPlatformMobsGUIDSet.find(ObjectGuid(uiGuid)) != m_sPlatformMobsGUIDSet.end())
+                    {
+                        m_sPlatformMobsAliveGUIDSet.insert(ObjectGuid(uiGuid));
+                    }
+                }
+                break;
+            case TYPE_DO_VASHJ_GENERATORS:
+                if (Creature *vashj = instance->GetCreature(ObjectGuid(uiGuid)))
+                {
+                    for (GuidList::const_iterator itr = m_lShieldGeneratorGUIDList.begin(); itr != m_lShieldGeneratorGUIDList.end(); ++itr)
+                    {
+                        if (Creature* pGenerator = instance->GetCreature(*itr))
+                        {
+                            pGenerator->CastSpell(vashj, SPELL_MAGIC_BARRIER, false);
+                        }
+                    }
+                }
+                break;
+            default:
+                break;
+            }
+        }
+
+        bool CheckConditionCriteriaMeet(Player const* pPlayer, uint32 uiInstanceConditionId, WorldObject const* pConditionSource, uint32 conditionSourceType) const override
+        {
+            switch (uiInstanceConditionId)
+            {
+            case INSTANCE_CONDITION_ID_LURKER:
+                return GetData(TYPE_THELURKER_EVENT) != DONE;
+            case INSTANCE_CONDITION_ID_SCALDING_WATER:
+                return m_sPlatformMobsAliveGUIDSet.empty();
+            }
+
+            script_error_log("instance_serpentshrine_cavern::CheckConditionCriteriaMeet called with unsupported Id %u. Called with param plr %s, src %s, condition source type %u",
+                uiInstanceConditionId, pPlayer ? pPlayer->GetGuidStr().c_str() : "NULL", pConditionSource ? pConditionSource->GetGuidStr().c_str() : "NULL", conditionSourceType);
+            return false;
+        }
+
+        void GetBeamHelpersGUIDList(GuidList& lList) { lList = m_lBeamHelpersGUIDList; }
+        void GetShieldGeneratorsGUIDList(GuidList& lList) { lList = m_lShieldGeneratorGUIDList; }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4] >> m_auiEncounter[5];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiSpellBinderCount;
+
+        GuidList m_lSpellBindersGUIDList;
+        GuidList m_lBeamHelpersGUIDList;
+        GuidList m_lShieldGeneratorGUIDList;
+        GuidSet m_sPlatformMobsGUIDSet;
+        GuidSet m_sPlatformMobsAliveGUIDSet;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_serpentshrine_cavern(pMap);
+    }
+};
+
+void AddSC_instance_serpentshrine_cavern()
+{
+    Script* s;
+
+    s = new is_serpentshrine_cavern();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_serpent_shrine";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_serpentshrine_cavern;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/serpent_shrine.h b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/serpent_shrine.h
new file mode 100644
index 000000000..b5bcd26e9
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/serpent_shrine/serpent_shrine.h
@@ -0,0 +1,84 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_SERPENT_SHRINE_H
+#define DEF_SERPENT_SHRINE_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 6,
+    MAX_SPELLBINDERS                = 3,
+
+    TYPE_HYDROSS_EVENT              = 0,
+    TYPE_KARATHRESS_EVENT           = 1,
+    TYPE_LADYVASHJ_EVENT            = 2,
+    TYPE_LEOTHERAS_EVENT            = 3,
+    TYPE_MOROGRIM_EVENT             = 4,
+    TYPE_THELURKER_EVENT            = 5,
+    TYPE_DO_HANDLE_BEAMS            = MAX_ENCOUNTER,
+    TYPE_DO_VASHJ_GENERATORS        = MAX_ENCOUNTER+1,
+
+    DATA_WATERSTATE_EVENT           = 1,                    // DO NOT CHANGE! Used by Acid. - used to check the mobs for the water event.
+
+    // NPC_KARATHRESS                = 21214,
+    NPC_CARIBDIS                    = 21964,
+    NPC_SHARKKIS                    = 21966,
+    NPC_TIDALVESS                   = 21965,
+    NPC_LEOTHERAS                   = 21215,
+    NPC_LADYVASHJ                   = 21212,
+    NPC_GREYHEART_SPELLBINDER       = 21806,
+    NPC_HYDROSS_BEAM_HELPER         = 21933,
+    NPC_HYDROSS_THE_UNSTABLE        = 21216,
+    NPC_SHIELD_GENERATOR            = 19870,
+
+    // waterstate event related
+    NPC_COILFANG_PRIESTESS          = 21220,
+    NPC_COILFANG_SHATTERER          = 21301,
+    NPC_VASHJIR_HONOR_GUARD         = 21218,
+    NPC_GREYHEART_TECHNICIAN        = 21263,
+
+    GO_SHIELD_GENERATOR_1           = 185051,
+    GO_SHIELD_GENERATOR_2           = 185052,
+    GO_SHIELD_GENERATOR_3           = 185053,
+    GO_SHIELD_GENERATOR_4           = 185054,
+
+    // Objects and doors no longer used since 2.4.0
+    // GO_CONSOLE_HYDROSS            = 185117,
+    // GO_CONSOLE_LURKER             = 185118,
+    // GO_CONSOLE_LEOTHERAS          = 185115,
+    // GO_CONSOLE_KARATHRESS         = 185114,
+    // GO_CONSOLE_MOROGRIM           = 185116,
+    // GO_CONSOLE_VASHJ              = 184568,
+    // GO_BRIDGE_PART_1              = 184203,
+    // GO_BRIDGE_PART_2              = 184204,
+    // GO_BRIDGE_PART_3              = 184205,
+
+    SPELL_LEOTHERAS_BANISH          = 37546,
+    SPELL_BLUE_BEAM                 = 38015,
+    SPELL_MAGIC_BARRIER             = 38112,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/slave_pens/boss_ahune.cpp b/src/modules/SD3/scripts/outland/coilfang_reservoir/slave_pens/boss_ahune.cpp
new file mode 100644
index 000000000..e887f9309
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/slave_pens/boss_ahune.cpp
@@ -0,0 +1,501 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_ahune
+SD%Complete: 75
+SDComment: Submerged phase visual spells NYI; they require additional research.
+SDCategory: Slave Pens
+EndScriptData */
+
+#include "precompiled.h"
+#include "TemporarySummon.h"
+
+enum
+{
+    // general spells
+    SPELL_AHUNES_SHIELD         = 45954,
+    SPELL_SPANKY_HANDS          = 46146,            // procs on melee hit; should proc 46430 but currently is not used because of the invalid proc flag
+    SPELL_SYNCH_HEALTH          = 46430,
+    SPELL_SUICIDE               = 45254,
+    SPELL_AHUNE_LOOT            = 45941,
+    SPELL_AHUNE_LOOT_H          = 46623,
+    SPELL_ISDEAD_CHECK          = 61976,            // purpose unk
+    SPELL_AHUNE_DIES_ACHIEV     = 62043,
+
+    // ground phase spells
+    SPELL_SUMMON_HAILSTONE      = 45951,
+    SPELL_SUMMON_COLDWAVE       = 45952,
+    SPELL_SUMMON_FROSTWIND      = 45953,
+
+    // submerged phase spells
+    SPELL_BIRTH                 = 37745,            // spawn animation - not confirmed
+    SPELL_SUBMERGE              = 37550,            // submerge animation - not confirmed
+    SPELL_STAY_SUBMERGED        = 46981,            // triggers 37751; this should keep the boss submerged
+    SPELL_AHUNE_SELF_STUN       = 46416,
+    SPELL_ICE_BOMBARD           = 46397,            // cast on phase 2 end; related to the fire opening visuals
+    SPELL_CLOSE_OPENING_VISUAL  = 46236,            // same as above
+    SPELL_STAND                 = 37752,            // purpose unk
+
+    // frozen core spells
+    SPELL_ICE_SPEAR_AURA        = 46371,
+    SPELL_FROZEN_CORE_HIT       = 46810,            // procs on melee hit; should summon npc 26239 for a 2 seconds
+    SPELL_GHOST_DISGUISE        = 46786,            // triggered by spell 46809
+
+    // ice spear spells
+    SPELL_SUMMON_ICE_SPEAR_GO   = 46369,
+    SPELL_ICE_SPEAR_DELAY       = 46878,
+    SPELL_ICE_SPEAR_KNOCKBACK   = 46360,
+    SPELL_ICE_SPEAR_VISUAL      = 75498,
+
+    // npcs and GOs
+    NPC_FROZEN_CORE             = 25865,
+    NPC_GHOST_OF_AHUNE          = 26239,
+    NPC_AHUNITE_HAILSTONE       = 25755,
+    NPC_AHUNITE_COLDWAVE        = 25756,
+    NPC_AHUNITE_FROSTWIND       = 25757,
+    NPC_ICE_SPEAR_BUNNY         = 25985,
+    GO_ICE_SPEAR                = 188077,
+
+    PHASE_GROUND                = 1,
+    PHASE_SUBMERGED             = 2,
+};
+
+/*######
+## boss_ahune
+######*/
+
+struct boss_ahune : public CreatureScript
+{
+    boss_ahune() : CreatureScript("boss_ahune") {}
+
+    struct boss_ahuneAI : public Scripted_NoMovementAI
+    {
+        boss_ahuneAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+        {
+            m_bHasCombatStarted = false;
+        }
+
+        bool m_bHasCombatStarted;
+
+        uint8 m_uiPhase;
+        uint8 m_uiPhaseChangeCount;
+        uint32 m_uiPhaseChangeTimer;
+
+        uint32 m_uiHailstoneTimer;
+        uint32 m_uiColdwaveTimer;
+        uint32 m_uiFrostwindTimer;
+
+        ObjectGuid m_frozenCoreGuid;
+
+        void Reset() override
+        {
+            m_uiPhase = PHASE_GROUND;
+            m_uiPhaseChangeTimer = 90000;
+            m_uiPhaseChangeCount = 0;
+
+            m_uiHailstoneTimer = 1000;
+            m_uiColdwaveTimer = urand(5000, 10000);
+            m_uiFrostwindTimer = urand(20000, 25000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_BIRTH);
+            DoCastSpellIfCan(m_creature, SPELL_AHUNES_SHIELD, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            DoCastSpellIfCan(m_creature, SPELL_SPANKY_HANDS, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_AHUNE_DIES_ACHIEV, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, m_creature->GetMap()->IsRegularDifficulty() ? SPELL_AHUNE_LOOT : SPELL_AHUNE_LOOT_H, CAST_TRIGGERED);
+        }
+
+        void JustReachedHome() override
+        {
+            // Cleanup on evade is done by creature_linking
+            m_creature->ForcedDespawn();
+        }
+
+#if defined (CLASSIC) || defined (TBC) || defined (WOTLK) || defined (CATA)
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+#else
+    void DamageTaken(Unit* /* pDoneBy */, uint32& uiDamage) override
+#endif
+        {
+            // it's not clear whether this should work like this or should be handled by the proc aura
+            if (Creature* pCore = m_creature->GetMap()->GetCreature(m_frozenCoreGuid))
+            {
+                DoCastSpellIfCan(pCore, SPELL_SYNCH_HEALTH, CAST_TRIGGERED);
+            }
+        }
+
+        void SpellHit(Unit* /*pSource*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_SUBMERGE)
+            {
+                // Note: the following spell breaks the visual. Needs to be fixed!
+                // DoCastSpellIfCan(m_creature, SPELL_AHUNE_SELF_STUN, CAST_TRIGGERED);
+
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                if (Creature* pCore = m_creature->GetMap()->GetCreature(m_frozenCoreGuid))
+                {
+                    pCore->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_AHUNITE_HAILSTONE:
+            case NPC_AHUNITE_COLDWAVE:
+            case NPC_AHUNITE_FROSTWIND:
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+                break;
+            case NPC_FROZEN_CORE:
+                m_frozenCoreGuid = pSummoned->GetObjectGuid();
+                break;
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // When the core dies, commit suicide
+            if (pSummoned->GetEntry() == NPC_FROZEN_CORE)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SUICIDE, CAST_TRIGGERED);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Attack on first update tick, in order to properly handle the spawn animation
+            if (!m_bHasCombatStarted)
+            {
+                if (m_creature->IsTemporarySummon())
+                {
+                    TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+                    if (Player* pSummoner = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                    {
+                        AttackStart(pSummoner);
+                    }
+                }
+
+                m_bHasCombatStarted = true;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiPhase == PHASE_GROUND)
+            {
+                // only once at the beginning of the phase
+                if (m_uiHailstoneTimer)
+                {
+                    if (m_uiHailstoneTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_HAILSTONE) == CAST_OK)
+                        {
+                            m_uiHailstoneTimer = 0;
+                        }
+                    }
+                    else
+                    {
+                        m_uiHailstoneTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiColdwaveTimer < uiDiff)
+                {
+                    for (uint8 i = 0; i < 2; ++i)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_SUMMON_COLDWAVE);
+                    }
+
+                    m_uiColdwaveTimer = urand(5000, 10000);
+                }
+                else
+                {
+                    m_uiColdwaveTimer -= uiDiff;
+                }
+
+                // starts only after the first phase change
+                if (m_uiPhaseChangeCount)
+                {
+                    if (m_uiFrostwindTimer < uiDiff)
+                    {
+                        for (uint8 i = 0; i < m_uiPhaseChangeCount; ++i)
+                        {
+                            DoCastSpellIfCan(m_creature, SPELL_SUMMON_FROSTWIND);
+                        }
+
+                        m_uiFrostwindTimer = urand(5000, 10000);
+                    }
+                    else
+                    {
+                        m_uiFrostwindTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiPhaseChangeTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUBMERGE) == CAST_OK)
+                    {
+                        m_uiPhaseChangeTimer = 40000;
+                        m_uiPhase = PHASE_SUBMERGED;
+                        ++m_uiPhaseChangeCount;
+                    }
+                }
+                else
+                {
+                    m_uiPhaseChangeTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+            }
+            else if (m_uiPhase == PHASE_SUBMERGED)
+            {
+                if (m_uiPhaseChangeTimer < uiDiff)
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_SUBMERGE);
+                    m_creature->RemoveAurasDueToSpell(SPELL_AHUNE_SELF_STUN);
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                    DoCastSpellIfCan(m_creature, SPELL_BIRTH);
+
+                    if (Creature* pCore = m_creature->GetMap()->GetCreature(m_frozenCoreGuid))
+                    {
+                        pCore->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                    }
+
+                    m_uiPhase = PHASE_GROUND;
+                    m_uiHailstoneTimer = 1000;
+                    m_uiPhaseChangeTimer = 90000;
+                }
+                else
+                {
+                    m_uiPhaseChangeTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ahuneAI(pCreature);
+    }
+};
+
+/*######
+## npc_frozen_core
+######*/
+
+struct npc_frozen_core : public CreatureScript
+{
+    npc_frozen_core() : CreatureScript("npc_frozen_core") {}
+
+    struct npc_frozen_coreAI : public Scripted_NoMovementAI
+    {
+        npc_frozen_coreAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        ObjectGuid m_ahuheGuid;
+
+        void Reset() override
+        {
+            if (m_creature->IsTemporarySummon())
+            {
+                m_ahuheGuid = ((TemporarySummon*)m_creature)->GetSummonerGuid();
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_FROZEN_CORE_HIT, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            DoCastSpellIfCan(m_creature, SPELL_ICE_SPEAR_AURA, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+        }
+
+#if defined (CLASSIC) || defined (TBC) || defined (WOTLK) || defined (CATA)
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+#else
+    void DamageTaken(Unit* /* pDoneBy */, uint32& uiDamage) override
+#endif
+        {
+            // it's not clear whether this should work like this or should be handled by the proc aura
+            if (Creature* pAhune = m_creature->GetMap()->GetCreature(m_ahuheGuid))
+            {
+                DoCastSpellIfCan(pAhune, SPELL_SYNCH_HEALTH, CAST_TRIGGERED);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_ICE_SPEAR_BUNNY)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_ICE_SPEAR_VISUAL, true);
+                pSummoned->CastSpell(pSummoned, SPELL_SUMMON_ICE_SPEAR_GO, true);
+                pSummoned->CastSpell(pSummoned, SPELL_ICE_SPEAR_DELAY, true);
+            }
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_frozen_coreAI(pCreature);
+    }
+};
+
+/*######
+## npc_ice_spear_bunny
+######*/
+
+struct npc_ice_spear_bunny : public CreatureScript
+{
+    npc_ice_spear_bunny() : CreatureScript("npc_ice_spear_bunny") {}
+
+    struct npc_ice_spear_bunnyAI : public Scripted_NoMovementAI
+    {
+        npc_ice_spear_bunnyAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { Reset(); }
+
+        ObjectGuid m_iceSpearGuid;
+
+        uint8 m_uiEventCount;
+
+        void Reset() override
+        {
+            m_uiEventCount = 0;
+        }
+
+        void JustSummoned(GameObject* pGo) override
+        {
+            if (pGo->GetEntry() == GO_ICE_SPEAR)
+            {
+                m_iceSpearGuid = pGo->GetObjectGuid();
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                ++m_uiEventCount;
+
+                // Knockback at 4 aura stacks (2 seconds)
+                if (m_uiEventCount == 4)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_ICE_SPEAR_KNOCKBACK);
+
+                    if (GameObject* pSpear = m_creature->GetMap()->GetGameObject(m_iceSpearGuid))
+                    {
+                        pSpear->Use(m_creature);
+                    }
+                }
+                // Cleanup at 10 aura stacks (5 seconds)
+                else if (m_uiEventCount == 10)
+                {
+                    if (GameObject* pSpear = m_creature->GetMap()->GetGameObject(m_iceSpearGuid))
+                    {
+                        pSpear->SetLootState(GO_JUST_DEACTIVATED);
+                    }
+
+                    m_creature->ForcedDespawn();
+                }
+            }
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ice_spear_bunnyAI(pCreature);
+    }
+};
+
+struct spell_ice_spear_delay : public SpellScript
+{
+    spell_ice_spear_delay() : SpellScript("spell_ice_spear_delay") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_ICE_SPEAR_DELAY && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            if (pCreatureTarget->GetEntry() == NPC_ICE_SPEAR_BUNNY)
+            {
+                pCreatureTarget->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pCreatureTarget);
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_boss_ahune()
+{
+    Script* s;
+
+    s = new boss_ahune();
+    s->RegisterSelf();
+    s = new npc_frozen_core();
+    s->RegisterSelf();
+    s = new npc_ice_spear_bunny();
+    s->RegisterSelf();
+    s = new spell_ice_spear_delay();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ahune";
+    //pNewScript->GetAI = &GetAI_boss_ahune;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_frozen_core";
+    //pNewScript->GetAI = &GetAI_npc_frozen_core;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ice_spear_bunny";
+    //pNewScript->GetAI = &GetAI_npc_ice_spear_bunny;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_ice_spear_bunny;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/boss_hydromancer_thespia.cpp b/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/boss_hydromancer_thespia.cpp
new file mode 100644
index 000000000..4f5a04e51
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/boss_hydromancer_thespia.cpp
@@ -0,0 +1,203 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Hydromancer_Thespia
+SD%Complete: 80
+SDComment: Timers may need small adjustments; Elementals summon needs further research
+SDCategory: Coilfang Resevoir, The Steamvault
+EndScriptData */
+
+/* ContentData
+boss_hydromancer_thespia
+mob_coilfang_waterelemental
+EndContentData */
+
+#include "precompiled.h"
+#include "steam_vault.h"
+
+enum
+{
+    SAY_SUMMON                  = -1545000,
+    SAY_CLOUD                   = -1545024,
+    SAY_AGGRO_1                 = -1545001,
+    SAY_AGGRO_2                 = -1545002,
+    SAY_AGGRO_3                 = -1545003,
+    SAY_SLAY_1                  = -1545004,
+    SAY_SLAY_2                  = -1545005,
+    SAY_DEAD                    = -1545006,
+
+    SPELL_LIGHTNING_CLOUD       = 25033,
+    SPELL_LUNG_BURST            = 31481,
+    SPELL_ENVELOPING_WINDS      = 31718,
+    SPELL_SUMMON_ELEMENTALS     = 31476,            // not sure where to use this
+};
+
+struct boss_thespia : public CreatureScript
+{
+    boss_thespia() : CreatureScript("boss_hydromancer_thespia") {}
+
+    struct boss_thespiaAI : public ScriptedAI
+    {
+        boss_thespiaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiLightningCloudTimer;
+        uint32 m_uiLungBurstTimer;
+        uint32 m_uiEnvelopingWindsTimer;
+
+        void Reset() override
+        {
+            m_uiLightningCloudTimer = 15000;
+            m_uiLungBurstTimer = urand(15000, 18000);
+            m_uiEnvelopingWindsTimer = urand(20000, 25000);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HYDROMANCER_THESPIA, FAIL);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEAD, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HYDROMANCER_THESPIA, DONE);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HYDROMANCER_THESPIA, IN_PROGRESS);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // LightningCloud_Timer
+            if (m_uiLightningCloudTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_LIGHTNING_CLOUD) == CAST_OK)
+                    {
+                        if (urand(0, 1))
+                        {
+                            DoScriptText(SAY_CLOUD, m_creature);
+                        }
+                        m_uiLightningCloudTimer = m_bIsRegularMode ? 30000 : 10000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiLightningCloudTimer -= uiDiff;
+            }
+
+            // LungBurst_Timer
+            if (m_uiLungBurstTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_LUNG_BURST) == CAST_OK)
+                    {
+                        m_uiLungBurstTimer = urand(7000, 12000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiLungBurstTimer -= uiDiff;
+            }
+
+            // EnvelopingWinds_Timer
+            if (m_uiEnvelopingWindsTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_ENVELOPING_WINDS) == CAST_OK)
+                    {
+                        m_uiEnvelopingWindsTimer = m_bIsRegularMode ? 10000 : 15000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiEnvelopingWindsTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_thespiaAI(pCreature);
+    }
+};
+
+void AddSC_boss_hydromancer_thespia()
+{
+    Script* s;
+
+    s = new boss_thespia();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_hydromancer_thespia";
+    //pNewScript->GetAI = &GetAI_boss_thespiaAI;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/boss_mekgineer_steamrigger.cpp
new file mode 100644
index 000000000..6140a40f1
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/boss_mekgineer_steamrigger.cpp
@@ -0,0 +1,350 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Mekgineer_Steamrigger
+SD%Complete: 80
+SDComment: Enrage on heroic NYI
+SDCategory: Coilfang Resevoir, The Steamvault
+EndScriptData */
+
+/* ContentData
+boss_mekgineer_steamrigger
+mob_steamrigger_mechanic
+EndContentData */
+
+#include "precompiled.h"
+#include "steam_vault.h"
+
+enum
+{
+    SAY_MECHANICS               = -1545007,
+    SAY_AGGRO_1                 = -1545008,
+    SAY_AGGRO_2                 = -1545009,
+    SAY_AGGRO_3                 = -1545010,
+    SAY_AGGRO_4                 = -1545011,
+    SAY_SLAY_1                  = -1545012,
+    SAY_SLAY_2                  = -1545013,
+    SAY_SLAY_3                  = -1545014,
+    SAY_DEATH                   = -1545015,
+
+    SPELL_SUPER_SHRINK_RAY      = 31485,
+    SPELL_SAW_BLADE             = 31486,
+    SPELL_ELECTRIFIED_NET       = 35107,
+    // SPELL_ENRAGE_H            = 1,                       // current enrage spell not known
+
+    NPC_STEAMRIGGER_MECHANIC    = 17951,
+
+    // Mechanic spells
+    SPELL_DISPEL_MAGIC          = 17201,
+    SPELL_REPAIR                = 31532,
+    SPELL_REPAIR_H              = 37936,
+};
+
+struct SummonLocation
+{
+    float m_fX, m_fY, m_fZ;
+};
+
+// Spawn locations
+static const SummonLocation aSteamriggerSpawnLocs[] =
+{
+    { -316.101f, -166.444f, -7.66f},
+    { -348.497f, -161.718f, -7.66f},
+    { -331.161f, -112.212f, -7.66f},
+};
+
+struct boss_mekgineer_steamrigger : public CreatureScript
+{
+    boss_mekgineer_steamrigger() : CreatureScript("boss_mekgineer_steamrigger") {}
+
+    struct boss_mekgineer_steamriggerAI : public ScriptedAI
+    {
+        boss_mekgineer_steamriggerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiShrinkTimer;
+        uint32 m_uiSawBladeTimer;
+        uint32 m_uiElectrifiedNetTimer;
+        uint32 m_uiMechanicTimer;
+        uint8 m_uiMechanicPhaseCount;
+
+        void Reset() override
+        {
+            m_uiShrinkTimer = 20000;
+            m_uiSawBladeTimer = 15000;
+            m_uiElectrifiedNetTimer = 10000;
+            m_uiMechanicTimer = 20000;
+            m_uiMechanicPhaseCount = 1;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, FAIL);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, DONE);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY_3, m_creature); break;
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, IN_PROGRESS);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_STEAMRIGGER_MECHANIC)
+            {
+                pSummoned->GetMotionMaster()->MoveFollow(m_creature, 0, 0);
+            }
+        }
+
+        // Wrapper to summon three Mechanics
+        void SummonMechanichs()
+        {
+            DoScriptText(SAY_MECHANICS, m_creature);
+
+            for (uint8 i = 0; i < 3; ++i)
+            {
+                m_creature->SummonCreature(NPC_STEAMRIGGER_MECHANIC, aSteamriggerSpawnLocs[i].m_fX, aSteamriggerSpawnLocs[i].m_fY, aSteamriggerSpawnLocs[i].m_fZ, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 240000);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiShrinkTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUPER_SHRINK_RAY) == CAST_OK)
+                {
+                    m_uiShrinkTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiShrinkTimer -= uiDiff;
+            }
+
+            if (m_uiSawBladeTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+                if (!pTarget)
+                {
+                    pTarget = m_creature->getVictim();
+                }
+
+                if (pTarget)
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SAW_BLADE) == CAST_OK)
+                    {
+                        m_uiSawBladeTimer = 15000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiSawBladeTimer -= uiDiff;
+            }
+
+            if (m_uiElectrifiedNetTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_ELECTRIFIED_NET) == CAST_OK)
+                    {
+                        m_uiElectrifiedNetTimer = 10000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiElectrifiedNetTimer -= uiDiff;
+            }
+
+            // On Heroic mode summon a mechanic at each 20 secs
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiMechanicTimer < uiDiff)
+                {
+                    m_creature->SummonCreature(NPC_STEAMRIGGER_MECHANIC, aSteamriggerSpawnLocs[2].m_fX, aSteamriggerSpawnLocs[2].m_fY, aSteamriggerSpawnLocs[2].m_fZ, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 240000);
+                    m_uiMechanicTimer = 20000;
+                }
+                else
+                {
+                    m_uiMechanicTimer -= uiDiff;
+                }
+            }
+
+            if (m_creature->GetHealthPercent() < (100 - 25 * m_uiMechanicPhaseCount))
+            {
+                SummonMechanichs();
+                ++m_uiMechanicPhaseCount;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_mekgineer_steamriggerAI(pCreature);
+    }
+};
+
+struct mob_steamrigger_mechanic : public CreatureScript
+{
+    mob_steamrigger_mechanic() : CreatureScript("mob_steamrigger_mechanic") {}
+
+    struct mob_steamrigger_mechanicAI : public ScriptedAI
+    {
+        mob_steamrigger_mechanicAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bCanStartAttack;
+
+        void Reset() override
+        {
+            m_bCanStartAttack = false;
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            // Trigger attack only for players
+            if (pWho->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            m_creature->InterruptNonMeleeSpells(false);
+            ScriptedAI::AttackStart(pWho);
+            m_bCanStartAttack = true;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // Return if already in combat
+            if (m_bCanStartAttack)
+            {
+                return;
+            }
+
+            // Don't attack players unless attacked
+            if (pWho->GetEntry() == NPC_STEAMRIGGER)
+            {
+                if (m_pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == IN_PROGRESS)
+                {
+                    // Channel the repair spell on Steamrigger
+                    // This will also stop creature movement and will allow them to continue to follow the boss after channeling is finished or the boss is out of range
+                    if (m_creature->IsWithinDistInMap(pWho, 2 * INTERACTION_DISTANCE))
+                    {
+                        DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_REPAIR : SPELL_REPAIR_H);
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_steamrigger_mechanicAI(pCreature);
+    }
+};
+
+void AddSC_boss_mekgineer_steamrigger()
+{
+    Script* s;
+
+    s = new boss_mekgineer_steamrigger();
+    s->RegisterSelf();
+    s = new mob_steamrigger_mechanic();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_mekgineer_steamrigger";
+    //pNewScript->GetAI = &GetAI_boss_mekgineer_steamrigger;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_steamrigger_mechanic";
+    //pNewScript->GetAI = &GetAI_mob_steamrigger_mechanic;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/boss_warlord_kalithresh.cpp b/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/boss_warlord_kalithresh.cpp
new file mode 100644
index 000000000..a946fc1d2
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/boss_warlord_kalithresh.cpp
@@ -0,0 +1,318 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Warlord_Kalithres
+SD%Complete: 90
+SDComment: Timers may need some fine adjustments
+SDCategory: Coilfang Resevoir, The Steamvault
+EndScriptData */
+
+#include "precompiled.h"
+#include "steam_vault.h"
+
+enum
+{
+    SAY_INTRO                   = -1545016,
+    SAY_REGEN                   = -1545017,
+    SAY_AGGRO1                  = -1545018,
+    SAY_AGGRO2                  = -1545019,
+    SAY_AGGRO3                  = -1545020,
+    SAY_SLAY1                   = -1545021,
+    SAY_SLAY2                   = -1545022,
+    SAY_DEATH                   = -1545023,
+
+    SPELL_SPELL_REFLECTION      = 31534,
+    SPELL_IMPALE                = 39061,
+    SPELL_WARLORDS_RAGE         = 37081,        // triggers 36453
+    SPELL_WARLORDS_RAGE_NAGA    = 31543,        // triggers 37076
+#if defined (CLASSIC) || defined (TBC) || defined (WOTLK) || defined (CATA)
+    SPELL_WARLORDS_RAGE_AURA    = 36453,
+#endif
+};
+
+struct boss_warlord_kalithresh : public CreatureScript
+{
+    boss_warlord_kalithresh() : CreatureScript("boss_warlord_kalithresh") {}
+
+    struct boss_warlord_kalithreshAI : public ScriptedAI
+    {
+        boss_warlord_kalithreshAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bHasTaunted = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiReflectionTimer;
+        uint32 m_uiImpaleTimer;
+        uint32 m_uiRageTimer;
+        uint32 m_uiRageCastTimer;
+
+        ObjectGuid m_distillerGuid;
+
+        bool m_bHasTaunted;
+
+        void Reset() override
+        {
+            m_uiReflectionTimer = 15000;
+            m_uiImpaleTimer = urand(7000, 14000);
+            m_uiRageTimer = urand(15000, 20000);
+            m_uiRageCastTimer = 0;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_WARLORD_KALITHRESH, FAIL);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_WARLORD_KALITHRESH, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_WARLORD_KALITHRESH, DONE);
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasTaunted && m_creature->IsWithinDistInMap(pWho, 40.0f))
+            {
+                DoScriptText(SAY_INTRO, m_creature);
+                m_bHasTaunted = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+            {
+                return;
+            }
+
+            // There is a small delay between the point reach and the channeling start
+            m_uiRageCastTimer = 1000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiRageCastTimer)
+            {
+                if (m_uiRageCastTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_WARLORDS_RAGE) == CAST_OK)
+                    {
+                        DoScriptText(SAY_REGEN, m_creature);
+                        SetCombatMovement(true);
+                        m_uiRageCastTimer = 0;
+
+                        // Also make the distiller cast
+                        if (Creature* pDistiller = m_creature->GetMap()->GetCreature(m_distillerGuid))
+                        {
+                            pDistiller->CastSpell(pDistiller, SPELL_WARLORDS_RAGE_NAGA, true);
+                            pDistiller->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiRageCastTimer -= uiDiff;
+                }
+            }
+
+            // Move to closest distiller
+            if (m_uiRageTimer)
+            {
+                if (m_uiRageTimer <= uiDiff)
+                {
+                    // If the boss already has the rage aura we don't have to do this again
+                    if (m_creature->HasAura(SPELL_WARLORDS_RAGE_AURA))
+                    {
+                        m_uiRageTimer = 0;
+                        return;
+                    }
+
+                    if (Creature* pDistiller = GetClosestCreatureWithEntry(m_creature, NPC_NAGA_DISTILLER, 100.0f))
+                    {
+                        float fX, fY, fZ;
+                        pDistiller->GetContactPoint(m_creature, fX, fY, fZ, INTERACTION_DISTANCE);
+                        m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                        SetCombatMovement(false);
+                        m_distillerGuid = pDistiller->GetObjectGuid();
+                    }
+
+                    m_uiRageTimer = urand(35000, 45000);
+                }
+                else
+                {
+                    m_uiRageTimer -= uiDiff;
+                }
+            }
+
+            // Reflection_Timer
+            if (m_uiReflectionTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SPELL_REFLECTION) == CAST_OK)
+                {
+                    m_uiReflectionTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiReflectionTimer -= uiDiff;
+            }
+
+            // Impale_Timer
+            if (m_uiImpaleTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_IMPALE) == CAST_OK)
+                    {
+                        m_uiImpaleTimer = urand(7500, 12500);
+                    }
+                }
+            }
+            else
+            {
+                m_uiImpaleTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_warlord_kalithreshAI(pCreature);
+    }
+};
+
+struct aura_dummy_warlord_rage : public AuraScript
+{
+    aura_dummy_warlord_rage() : AuraScript("aura_dummy_warlord_rage") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() == SPELL_WARLORDS_RAGE && pAura->GetEffIndex() == EFFECT_INDEX_0)
+        {
+            if (Creature* pTarget = (Creature*)pAura->GetTarget())
+            {
+                // Resume combat when the cast is finished or interrupted
+                if (!bApply)
+                {
+                    if (pTarget->getVictim())
+                    {
+                        pTarget->GetMotionMaster()->MovementExpired();
+                        pTarget->GetMotionMaster()->MoveChase(pTarget->getVictim());
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+};
+
+struct mob_naga_distiller : public CreatureScript
+{
+    mob_naga_distiller() : CreatureScript("mob_naga_distiller") {}
+
+    struct mob_naga_distillerAI : public Scripted_NoMovementAI
+    {
+        mob_naga_distillerAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void Reset() override
+        {
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_naga_distillerAI(pCreature);
+    }
+};
+
+void AddSC_boss_warlord_kalithresh()
+{
+    Script* s;
+
+    s = new boss_warlord_kalithresh();
+    s->RegisterSelf();
+    s = new aura_dummy_warlord_rage();
+    s->RegisterSelf();
+    s = new mob_naga_distiller();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_warlord_kalithresh";
+    //pNewScript->GetAI = &GetAI_boss_warlord_kalithresh;
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_spell_aura_dummy_warlord_rage;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_naga_distiller";
+    //pNewScript->GetAI = &GetAI_mob_naga_distiller;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/instance_steam_vault.cpp b/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/instance_steam_vault.cpp
new file mode 100644
index 000000000..82ec67f0d
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/instance_steam_vault.cpp
@@ -0,0 +1,272 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Steam_Vault
+SD%Complete: 80
+SDComment: Instance script and access panel GO
+SDCategory: Coilfang Resevoir, The Steamvault
+EndScriptData */
+
+#include "precompiled.h"
+#include "steam_vault.h"
+
+/* Steam Vaults encounters:
+1 - Hydromancer Thespia Event
+2 - Mekgineer Steamrigger Event
+3 - Warlord Kalithresh Event
+*/
+
+struct is_steam_vault : public InstanceScript
+{
+    is_steam_vault() : InstanceScript("instance_steam_vault") {}
+
+    class instance_steam_vault : public ScriptedInstance
+    {
+    public:
+        instance_steam_vault(Map* pMap) : ScriptedInstance(pMap)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_STEAMRIGGER:
+            case NPC_KALITHRESH:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_NAGA_DISTILLER:
+                m_lNagaDistillerGuidList.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_MAIN_CHAMBERS_DOOR:
+                if (m_auiEncounter[TYPE_HYDROMANCER_THESPIA] == SPECIAL && m_auiEncounter[TYPE_MEKGINEER_STEAMRIGGER] == SPECIAL)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_ACCESS_PANEL_HYDRO:
+                if (m_auiEncounter[TYPE_HYDROMANCER_THESPIA] == DONE)
+                {
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                }
+                break;
+            case GO_ACCESS_PANEL_MEK:
+                if (m_auiEncounter[TYPE_MEKGINEER_STEAMRIGGER] == DONE)
+                {
+                    pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT);
+                }
+                break;
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            // Break the Warlord spell on the Distiller death
+            if (pCreature->GetEntry() == NPC_NAGA_DISTILLER)
+            {
+                if (Creature* pWarlord = GetSingleCreatureFromStorage(NPC_KALITHRESH))
+                {
+                    pWarlord->InterruptNonMeleeSpells(false);
+                }
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_HYDROMANCER_THESPIA:
+                if (uiData == DONE)
+                {
+                    DoToggleGameObjectFlags(GO_ACCESS_PANEL_HYDRO, GO_FLAG_NO_INTERACT, false);
+                }
+                if (uiData == SPECIAL)
+                {
+                    if (GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL)
+                    {
+                        DoUseDoorOrButton(GO_MAIN_CHAMBERS_DOOR);
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_MEKGINEER_STEAMRIGGER:
+                if (uiData == DONE)
+                {
+                    DoToggleGameObjectFlags(GO_ACCESS_PANEL_MEK, GO_FLAG_NO_INTERACT, false);
+                }
+                if (uiData == SPECIAL)
+                {
+                    if (GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL)
+                    {
+                        DoUseDoorOrButton(GO_MAIN_CHAMBERS_DOOR);
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_WARLORD_KALITHRESH:
+                DoUseDoorOrButton(GO_MAIN_CHAMBERS_DOOR);
+                if (uiData == FAIL)
+                {
+                    // Reset Distiller flags - respawn is handled by DB
+                    for (GuidList::const_iterator itr = m_lNagaDistillerGuidList.begin(); itr != m_lNagaDistillerGuidList.end(); ++itr)
+                    {
+                        if (Creature* pDistiller = instance->GetCreature(*itr))
+                        {
+                            if (!pDistiller->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+                            {
+                                pDistiller->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                            }
+                        }
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            }
+
+            if (uiData == DONE || uiData == SPECIAL)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        GuidList m_lNagaDistillerGuidList;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_steam_vault(pMap);
+    }
+};
+
+struct go_main_chambers_access_panel : public GameObjectScript
+{
+    go_main_chambers_access_panel() : GameObjectScript("go_main_chambers_access_panel") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+
+        if (!pInstance)
+        {
+            return true;
+        }
+
+        if (pGo->GetEntry() == GO_ACCESS_PANEL_HYDRO)
+        {
+            pInstance->SetData(TYPE_HYDROMANCER_THESPIA, SPECIAL);
+        }
+        else if (pGo->GetEntry() == GO_ACCESS_PANEL_MEK)
+        {
+            pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, SPECIAL);
+        }
+
+        return false;
+    }
+};
+
+void AddSC_instance_steam_vault()
+{
+    Script* s;
+
+    s = new is_steam_vault();
+    s->RegisterSelf();
+    s = new go_main_chambers_access_panel();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_main_chambers_access_panel";
+    //pNewScript->pGOUse = &GOUse_go_main_chambers_access_panel;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_steam_vault";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_steam_vault;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/steam_vault.h b/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/steam_vault.h
new file mode 100644
index 000000000..72b9bf60a
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/steam_vault/steam_vault.h
@@ -0,0 +1,48 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_STEAM_VAULT_H
+#define DEF_STEAM_VAULT_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 3,
+
+    TYPE_HYDROMANCER_THESPIA        = 0,
+    TYPE_MEKGINEER_STEAMRIGGER      = 1,
+    TYPE_WARLORD_KALITHRESH         = 2,
+
+    NPC_NAGA_DISTILLER              = 17954,
+    NPC_STEAMRIGGER                 = 17796,
+    NPC_KALITHRESH                  = 17798,
+    // NPC_THESPIA                   = 17797,
+
+    GO_MAIN_CHAMBERS_DOOR           = 183049,
+    GO_ACCESS_PANEL_HYDRO           = 184125,
+    GO_ACCESS_PANEL_MEK             = 184126,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/outland/coilfang_reservoir/underbog/boss_hungarfen.cpp b/src/modules/SD3/scripts/outland/coilfang_reservoir/underbog/boss_hungarfen.cpp
new file mode 100644
index 000000000..65faa348a
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/coilfang_reservoir/underbog/boss_hungarfen.cpp
@@ -0,0 +1,234 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Hungarfen
+SD%Complete: 80
+SDComment: Need confirmation if spell data are same in both modes; The Underbog Mushroom may need some more research
+SDCategory: Coilfang Resevoir, Underbog
+EndScriptData */
+
+#include "precompiled.h"
+
+enum
+{
+    SPELL_FOUL_SPORES           = 31673,
+    SPELL_ACID_GEYSER           = 38739,
+    SPELL_DESPAWN_MUSHROOMS     = 34874,
+
+    // Mushroom spells
+    SPELL_SPORE_CLOUD           = 34168,
+    SPELL_PUTRID_MUSHROOM       = 31690,
+    SPELL_GROW                  = 31698,
+
+    NPC_UNDERBOG_MUSHROOM       = 17990,
+};
+
+struct boss_hungarfen : public CreatureScript
+{
+    boss_hungarfen() : CreatureScript("boss_hungarfen") {}
+
+    struct boss_hungarfenAI : public ScriptedAI
+    {
+        boss_hungarfenAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+        bool m_bHasSpores;
+        uint32 m_uiMushroomTimer;
+        uint32 m_uiAcidGeyserTimer;
+
+        void Reset() override
+        {
+            m_bHasSpores = false;
+            m_uiMushroomTimer = 5000;                         // 1 mushroom after 5s, then one per 10s. This should be different in heroic mode
+            m_uiAcidGeyserTimer = 10000;
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_DESPAWN_MUSHROOMS, CAST_TRIGGERED);
+        }
+
+        void JustReachedHome() override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_DESPAWN_MUSHROOMS, CAST_TRIGGERED);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->GetHealthPercent() <= 20.0f && !m_bHasSpores)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FOUL_SPORES) == CAST_OK)
+                {
+                    m_bHasSpores = true;
+                }
+            }
+
+            if (m_uiMushroomTimer < uiDiff)
+            {
+                // Summon a mushroom exactly on target position
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    m_creature->SummonCreature(NPC_UNDERBOG_MUSHROOM, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                }
+
+                m_uiMushroomTimer = m_bIsRegularMode ? 10000 : 5000;
+            }
+            else
+            {
+                m_uiMushroomTimer -= uiDiff;
+            }
+
+            if (m_uiAcidGeyserTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_ACID_GEYSER) == CAST_OK)
+                    {
+                        m_uiAcidGeyserTimer = urand(10000, 17500);
+                    }
+                }
+            }
+            else
+            {
+                m_uiAcidGeyserTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_hungarfenAI(pCreature);
+    }
+};
+
+struct mob_underbog_mushroom : public CreatureScript
+{
+    mob_underbog_mushroom() : CreatureScript("mob_underbog_mushroom") {}
+
+    struct mob_underbog_mushroomAI : public ScriptedAI
+    {
+        mob_underbog_mushroomAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        uint32 m_uiGrowTimer;
+        uint32 m_uiShrinkTimer;
+        uint32 m_uiSporeTimer;
+
+        void Reset() override
+        {
+            m_uiGrowTimer = 1000;
+            m_uiSporeTimer = 15000;
+            m_uiShrinkTimer = 20000;
+
+            DoCastSpellIfCan(m_creature, SPELL_PUTRID_MUSHROOM);
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { return; }
+        void AttackStart(Unit* /*pWho*/) override { return; }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiSporeTimer)
+            {
+                if (m_uiSporeTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SPORE_CLOUD) == CAST_OK)
+                    {
+                        m_uiGrowTimer = 0;
+                        m_uiSporeTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiSporeTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiGrowTimer)
+            {
+                if (m_uiGrowTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_GROW) == CAST_OK)
+                    {
+                        m_uiGrowTimer = 3000;
+                    }
+                }
+                else
+                {
+                    m_uiGrowTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiShrinkTimer)
+            {
+                if (m_uiShrinkTimer <= uiDiff)
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_GROW);
+                    m_uiShrinkTimer = 0;
+                }
+                else
+                {
+                    m_uiShrinkTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_underbog_mushroomAI(pCreature);
+    }
+};
+
+void AddSC_boss_hungarfen()
+{
+    Script* s;
+
+    s = new boss_hungarfen();
+    s->RegisterSelf();
+    s = new mob_underbog_mushroom();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_hungarfen";
+    //pNewScript->GetAI = &GetAI_boss_hungarfen;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_underbog_mushroom";
+    //pNewScript->GetAI = &GetAI_mob_underbog_mushroom;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/gruuls_lair/boss_gruul.cpp b/src/modules/SD3/scripts/outland/gruuls_lair/boss_gruul.cpp
new file mode 100644
index 000000000..7566ee66d
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/gruuls_lair/boss_gruul.cpp
@@ -0,0 +1,318 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Gruul
+SD%Complete: 60
+SDComment: Ground Slam need further development (knock back effect and shatter effect must be added to mangos)
+SDCategory: Gruul's Lair
+EndScriptData */
+
+#include "precompiled.h"
+#include "gruuls_lair.h"
+
+enum
+{
+    SAY_AGGRO                   = -1565010,
+    SAY_SLAM1                   = -1565011,
+    SAY_SLAM2                   = -1565012,
+    SAY_SHATTER1                = -1565013,
+    SAY_SHATTER2                = -1565014,
+    SAY_SLAY1                   = -1565015,
+    SAY_SLAY2                   = -1565016,
+    SAY_SLAY3                   = -1565017,
+    SAY_DEATH                   = -1565018,
+
+    EMOTE_GROW                  = -1565019,
+
+    SPELL_GROWTH                = 36300,
+    SPELL_CAVE_IN               = 36240,
+    SPELL_GROUND_SLAM           = 33525,                    // AoE Ground Slam applying Ground Slam to everyone with a script effect (most likely the knock back, we can code it to a set knockback)
+    SPELL_REVERBERATION         = 36297,
+    SPELL_SHATTER               = 33654,
+
+    SPELL_SHATTER_EFFECT        = 33671,
+    SPELL_HURTFUL_STRIKE        = 33813,
+    SPELL_STONED                = 33652,                    // Spell is self cast by target
+
+    SPELL_MAGNETIC_PULL         = 28337,
+    SPELL_KNOCK_BACK            = 24199                     // Knockback spell until correct implementation is made
+};
+
+struct boss_gruul : public CreatureScript
+{
+    boss_gruul() : CreatureScript("boss_gruul") {}
+
+    struct boss_gruulAI : public ScriptedAI
+    {
+        boss_gruulAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiGrowthTimer;
+        uint32 m_uiCaveInTimer;
+        uint32 m_uiCaveInStaticTimer;
+        uint32 m_uiGroundSlamTimer;
+        uint32 m_uiHurtfulStrikeTimer;
+        uint32 m_uiReverberationTimer;
+
+        bool m_bPerformingGroundSlam;
+
+        void Reset() override
+        {
+            m_uiGrowthTimer = 30000;
+            m_uiCaveInTimer = 27000;
+            m_uiCaveInStaticTimer = 30000;
+            m_uiGroundSlamTimer = 35000;
+            m_uiHurtfulStrikeTimer = 8000;
+            m_uiReverberationTimer = 60000 + 45000;
+            m_bPerformingGroundSlam = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GRUUL_EVENT, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GRUUL_EVENT, FAIL);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_GRUUL_EVENT, DONE);
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            // This to emulate effect1 (77) of SPELL_GROUND_SLAM, knock back to any direction
+            // It's initially wrong, since this will cause fall damage, which is by comments, not intended.
+            if (pSpell->Id == SPELL_GROUND_SLAM)
+            {
+                if (pTarget->GetTypeId() == TYPEID_PLAYER)
+                {
+                    switch (urand(0, 1))
+                    {
+                    case 0: pTarget->CastSpell(pTarget, SPELL_MAGNETIC_PULL, true, NULL, NULL, m_creature->GetObjectGuid()); break;
+                    case 1: pTarget->CastSpell(pTarget, SPELL_KNOCK_BACK, true, NULL, NULL, m_creature->GetObjectGuid()); break;
+                    }
+                }
+            }
+
+            // this part should be in mangos
+            if (pSpell->Id == SPELL_SHATTER)
+            {
+                // this spell must have custom handling in mangos, dealing damage based on distance
+                pTarget->CastSpell(pTarget, SPELL_SHATTER_EFFECT, true);
+
+                if (pTarget->HasAura(SPELL_STONED))
+                {
+                    pTarget->RemoveAurasDueToSpell(SPELL_STONED);
+                }
+
+                // clear this, if we are still performing
+                if (m_bPerformingGroundSlam)
+                {
+                    m_bPerformingGroundSlam = false;
+
+                    // and correct movement, if not already
+                    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
+                    {
+                        if (m_creature->getVictim())
+                        {
+                            m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                        }
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Gruul can cast this spell up to 30 times
+            if (m_uiGrowthTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_GROWTH) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_GROW, m_creature);
+                    m_uiGrowthTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiGrowthTimer -= uiDiff;
+            }
+
+            if (m_bPerformingGroundSlam)
+            {
+                if (m_uiGroundSlamTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SHATTER) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_SHATTER1 : SAY_SHATTER2, m_creature);
+                        m_uiGroundSlamTimer = 120000;
+                        m_uiHurtfulStrikeTimer = 8000;
+
+                        // Give a little time to the players to undo the damage from shatter
+                        if (m_uiReverberationTimer < 10000)
+                        {
+                            m_uiReverberationTimer += 10000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiGroundSlamTimer -= uiDiff;
+                }
+            }
+            else
+            {
+                // Hurtful Strike
+                if (m_uiHurtfulStrikeTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 1, SPELL_HURTFUL_STRIKE, SELECT_FLAG_PLAYER))
+                    {
+                        DoCastSpellIfCan(pTarget, SPELL_HURTFUL_STRIKE);
+                    }
+                    else
+                    {
+                        DoCastSpellIfCan(m_creature->getVictim(), SPELL_HURTFUL_STRIKE);
+                    }
+
+                    m_uiHurtfulStrikeTimer = 8000;
+                }
+                else
+                {
+                    m_uiHurtfulStrikeTimer -= uiDiff;
+                }
+
+                // Reverberation
+                if (m_uiReverberationTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_REVERBERATION) == CAST_OK)
+                    {
+                        m_uiReverberationTimer = urand(15000, 25000);
+                    }
+                }
+                else
+                {
+                    m_uiReverberationTimer -= uiDiff;
+                }
+
+                // Cave In
+                if (m_uiCaveInTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_CAVE_IN) == CAST_OK)
+                        {
+                            if (m_uiCaveInStaticTimer >= 4000)
+                            {
+                                m_uiCaveInStaticTimer -= 2000;
+                            }
+
+                            m_uiCaveInTimer = m_uiCaveInStaticTimer;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiCaveInTimer -= uiDiff;
+                }
+
+                // Ground Slam, Gronn Lord's Grasp, Stoned, Shatter
+                if (m_uiGroundSlamTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_GROUND_SLAM) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_SLAM1 : SAY_SLAM2, m_creature);
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MoveIdle();
+
+                        m_bPerformingGroundSlam = true;
+                        m_uiGroundSlamTimer = 10000;
+                    }
+                }
+                else
+                {
+                    m_uiGroundSlamTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_gruulAI(pCreature);
+    }
+};
+
+void AddSC_boss_gruul()
+{
+    Script* s;
+
+    s = new boss_gruul();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_gruul";
+    //pNewScript->GetAI = &GetAI_boss_gruul;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp b/src/modules/SD3/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
new file mode 100644
index 000000000..a0b731da4
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
@@ -0,0 +1,693 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_High_King_Maulgar
+SD%Complete: 80
+SDComment: Verify that the script is working properly
+SDCategory: Gruul's Lair
+EndScriptData */
+
+#include "precompiled.h"
+#include "gruuls_lair.h"
+
+enum
+{
+    SAY_AGGRO                   = -1565000,
+    SAY_ENRAGE                  = -1565001,
+    SAY_OGRE_DEATH1             = -1565002,
+    SAY_OGRE_DEATH2             = -1565003,
+    SAY_OGRE_DEATH3             = -1565004,
+    SAY_OGRE_DEATH4             = -1565005,
+    SAY_SLAY1                   = -1565006,
+    SAY_SLAY2                   = -1565007,
+    SAY_SLAY3                   = -1565008,
+    SAY_DEATH                   = -1565009,
+
+    // High King Maulgar Spells
+    SPELL_ARCING_SMASH          = 39144,
+    SPELL_MIGHTY_BLOW           = 33230,
+    SPELL_WHIRLWIND             = 33238,
+    SPELL_FLURRY                = 33232,
+    SPELL_CHARGE                = 26561,
+    SPELL_FEAR                  = 16508,
+
+    // Olm the Summoner Spells
+    SPELL_DARK_DECAY            = 33129,
+    SPELL_DEATH_COIL            = 33130,
+    SPELL_SUMMON_WILD_FELHUNTER = 33131,
+
+    // Kiggler the Crazed Spells
+    SPELL_GREATER_POLYMORPH     = 33173,
+    SPELL_LIGHTNING_BOLT        = 36152,
+    SPELL_ARCANE_SHOCK          = 33175,
+    SPELL_ARCANE_EXPLOSION      = 33237,
+
+    // Blindeye the Seer Spells
+    SPELL_GREATER_PW_SHIELD     = 33147,
+    SPELL_HEAL                  = 33144,
+    SPELL_PRAYEROFHEALING       = 33152,
+
+    // Krosh Firehand Spells
+    SPELL_GREATER_FIREBALL      = 33051,
+    SPELL_SPELLSHIELD           = 33054,
+    SPELL_BLAST_WAVE            = 33061,
+};
+
+// High King Maulgar AI
+struct boss_high_king_maulgar : public CreatureScript
+{
+    boss_high_king_maulgar() : CreatureScript("boss_high_king_maulgar") {}
+
+    struct boss_high_king_maulgarAI : public ScriptedAI
+    {
+        boss_high_king_maulgarAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiArcingSmashTimer;
+        uint32 m_uiMightyBlowTimer;
+        uint32 m_uiWhirlwindTimer;
+        uint32 m_uiChargeTimer;
+        uint32 m_uiFearTimer;
+        uint32 m_uiCouncilDeathCount;
+
+        bool m_bPhase2;
+
+        void Reset() override
+        {
+            m_uiArcingSmashTimer = urand(8000, 14000);
+            m_uiMightyBlowTimer = urand(15000, 25000);
+            m_uiWhirlwindTimer = 30000;
+            m_uiChargeTimer = 2000;
+            m_uiFearTimer = urand(10000, 25000);
+            m_uiCouncilDeathCount = 0;
+            m_bPhase2 = false;
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAULGAR_EVENT, FAIL);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            // Set data to Special on Death
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAULGAR_EVENT, SPECIAL);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAULGAR_EVENT, IN_PROGRESS);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit *pInvoker, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A)
+            {
+                switch (++m_uiCouncilDeathCount)
+                {
+                case 1: DoScriptText(SAY_OGRE_DEATH1, m_creature); break;
+                case 2: DoScriptText(SAY_OGRE_DEATH2, m_creature); break;
+                case 3: DoScriptText(SAY_OGRE_DEATH3, m_creature); break;
+                case 4: DoScriptText(SAY_OGRE_DEATH4, m_creature); break;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiArcingSmashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ARCING_SMASH) == CAST_OK)
+                {
+                    m_uiArcingSmashTimer = urand(8000, 12000);
+                }
+            }
+            else
+            {
+                m_uiArcingSmashTimer -= uiDiff;
+            }
+
+            if (m_uiWhirlwindTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WHIRLWIND) == CAST_OK)
+                {
+                    m_uiWhirlwindTimer = urand(30000, 40000);
+                }
+            }
+            else
+            {
+                m_uiWhirlwindTimer -= uiDiff;
+            }
+
+            if (m_uiMightyBlowTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MIGHTY_BLOW) == CAST_OK)
+                {
+                    m_uiMightyBlowTimer = urand(20000, 35000);
+                }
+            }
+            else
+            {
+                m_uiMightyBlowTimer -= uiDiff;
+            }
+
+            if (!m_bPhase2 && m_creature->GetHealthPercent() < 50.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FLURRY) == CAST_OK)
+                {
+                    DoScriptText(SAY_ENRAGE, m_creature);
+                    m_bPhase2 = true;
+                }
+            }
+
+            if (m_bPhase2)
+            {
+                if (m_uiChargeTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_CHARGE) == CAST_OK)
+                        {
+                            m_uiChargeTimer = urand(14000, 20000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiChargeTimer -= uiDiff;
+                }
+
+                if (m_uiFearTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FEAR) == CAST_OK)
+                    {
+                        m_uiFearTimer = urand(20000, 35000);
+                    }
+                }
+                else
+                {
+                    m_uiFearTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_high_king_maulgarAI(pCreature);
+    }
+};
+
+// Base AI for every council member - common AI Part
+struct Council_Base_AI : public ScriptedAI
+{
+    Council_Base_AI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+    }
+
+    ScriptedInstance* m_pInstance;
+
+    void JustDied(Unit* /*pVictim*/) override
+    {
+        if (!m_pInstance)
+        { return; }
+
+        Creature* pMaulgar = m_pInstance->GetSingleCreatureFromStorage(NPC_MAULGAR);
+        if (pMaulgar && pMaulgar->IsAlive())
+        {
+            SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pMaulgar);
+        }
+
+        // Set data to Special on Death
+        m_pInstance->SetData(TYPE_MAULGAR_EVENT, SPECIAL);
+    }
+};
+
+// Olm The Summoner AI
+struct boss_olm_the_summoner : public CreatureScript
+{
+    boss_olm_the_summoner() : CreatureScript("boss_olm_the_summoner") {}
+
+    struct boss_olm_the_summonerAI : public Council_Base_AI
+    {
+        boss_olm_the_summonerAI(Creature* pCreature) : Council_Base_AI(pCreature) { }
+
+        uint32 m_uiDarkDecayTimer;
+        uint32 m_uiDeathCoilTimer;
+        uint32 m_uiSummonTimer;
+
+        void Reset() override
+        {
+            m_uiDarkDecayTimer = 18000;
+            m_uiDeathCoilTimer = 14000;
+            m_uiSummonTimer = 10000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiDarkDecayTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DARK_DECAY) == CAST_OK)
+                {
+                    m_uiDarkDecayTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiDarkDecayTimer -= uiDiff;
+            }
+
+            if (m_uiDeathCoilTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_DEATH_COIL) == CAST_OK)
+                {
+                    m_uiDeathCoilTimer = urand(8000, 13000);
+                }
+            }
+            else
+            {
+                m_uiDeathCoilTimer -= uiDiff;
+            }
+
+            if (m_uiSummonTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_WILD_FELHUNTER) == CAST_OK)
+                {
+                    m_uiSummonTimer = urand(25000, 35000);
+                }
+            }
+            else
+            {
+                m_uiSummonTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_olm_the_summonerAI(pCreature);
+    }
+};
+
+// Kiggler The Crazed AI
+struct boss_kiggler_the_crazed : public CreatureScript
+{
+    boss_kiggler_the_crazed() : CreatureScript("boss_kiggler_the_crazed") {}
+
+    struct boss_kiggler_the_crazedAI : public Council_Base_AI
+    {
+        boss_kiggler_the_crazedAI(Creature* pCreature) : Council_Base_AI(pCreature) { Reset(); }
+
+        uint32 m_uiGreatherPolymorphTimer;
+        uint32 m_uiLightningBoltTimer;
+        uint32 m_uiArcaneShockTimer;
+        uint32 m_uiArcaneExplosionTimer;
+
+        void Reset() override
+        {
+            m_uiGreatherPolymorphTimer = 15000;
+            m_uiLightningBoltTimer = 10000;
+            m_uiArcaneShockTimer = 20000;
+            m_uiArcaneExplosionTimer = 30000;
+        }
+
+        void SpellHitTarget(Unit* pVictim, const SpellEntry* pSpell) override
+        {
+            // Spell currently not supported by core. Knock back effect should lower threat
+            // Workaround in script:
+            if (pSpell->Id == SPELL_ARCANE_EXPLOSION)
+            {
+                if (pVictim->GetTypeId() != TYPEID_PLAYER)
+                {
+                    return;
+                }
+
+                m_creature->GetThreatManager().modifyThreatPercent(pVictim, -75);
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (!pWho)
+            {
+                return;
+            }
+
+            if (m_creature->Attack(pWho, false))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+
+                m_creature->GetMotionMaster()->MoveChase(pWho, 20.0f);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiGreatherPolymorphTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_GREATER_POLYMORPH) == CAST_OK)
+                    {
+                        m_uiGreatherPolymorphTimer = urand(15000, 20000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiGreatherPolymorphTimer -= uiDiff;
+            }
+
+            if (m_uiLightningBoltTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_LIGHTNING_BOLT) == CAST_OK)
+                {
+                    m_uiLightningBoltTimer = urand(2500, 4000);
+                }
+            }
+            else
+            {
+                m_uiLightningBoltTimer -= uiDiff;
+            }
+
+            if (m_uiArcaneShockTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ARCANE_SHOCK) == CAST_OK)
+                {
+                    m_uiArcaneShockTimer = urand(15000, 20000);
+                }
+            }
+            else
+            {
+                m_uiArcaneShockTimer -= uiDiff;
+            }
+
+            if (m_uiArcaneExplosionTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_EXPLOSION) == CAST_OK)
+                {
+                    m_uiArcaneExplosionTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiArcaneExplosionTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_kiggler_the_crazedAI(pCreature);
+    }
+};
+
+// Blindeye The Seer AI
+struct boss_blindeye_the_seer : public CreatureScript
+{
+    boss_blindeye_the_seer() : CreatureScript("boss_blindeye_the_seer") {}
+
+    struct boss_blindeye_the_seerAI : public Council_Base_AI
+    {
+        boss_blindeye_the_seerAI(Creature* pCreature) : Council_Base_AI(pCreature) { }
+
+        uint32 m_uiGreaterPowerWordShieldTimer;
+        uint32 m_uiHealTimer;
+        uint32 m_uiPrayerofHealingTimer;
+
+        void Reset() override
+        {
+            m_uiGreaterPowerWordShieldTimer = 5000;
+            m_uiHealTimer = urand(25000, 40000);
+            m_uiPrayerofHealingTimer = urand(45000, 55000);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiGreaterPowerWordShieldTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_GREATER_PW_SHIELD) == CAST_OK)
+                {
+                    m_uiGreaterPowerWordShieldTimer = urand(30000, 40000);
+                }
+            }
+            else
+            {
+                m_uiGreaterPowerWordShieldTimer -= uiDiff;
+            }
+
+            if (m_uiHealTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(50.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_HEAL) == CAST_OK)
+                    {
+                        m_uiHealTimer = urand(15000, 40000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiHealTimer -= uiDiff;
+            }
+
+            if (m_uiPrayerofHealingTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_PRAYEROFHEALING) == CAST_OK)
+                {
+                    m_uiPrayerofHealingTimer = urand(35000, 50000);
+                }
+            }
+            else
+            {
+                m_uiPrayerofHealingTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_blindeye_the_seerAI(pCreature);
+    }
+};
+
+// Krosh Firehand AI
+struct boss_krosh_firehand : public CreatureScript
+{
+    boss_krosh_firehand() : CreatureScript("boss_krosh_firehand") {}
+
+    struct boss_krosh_firehandAI : public Council_Base_AI
+    {
+        boss_krosh_firehandAI(Creature* pCreature) : Council_Base_AI(pCreature) { }
+
+        uint32 m_uiGreaterFireballTimer;
+        uint32 m_uiSpellShieldTimer;
+        uint32 m_uiBlastWaveTimer;
+
+        void Reset() override
+        {
+            m_uiGreaterFireballTimer = 4000;
+            m_uiSpellShieldTimer = 1000;
+            m_uiBlastWaveTimer = 12000;
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (!pWho)
+            {
+                return;
+            }
+
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+
+                m_creature->GetMotionMaster()->MoveChase(pWho, 30.0f);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiGreaterFireballTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_GREATER_FIREBALL) == CAST_OK)
+                {
+                    m_uiGreaterFireballTimer = 3200;
+                }
+            }
+            else
+            {
+                m_uiGreaterFireballTimer -= uiDiff;
+            }
+
+            if (m_uiSpellShieldTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SPELLSHIELD) == CAST_OK)
+                {
+                    m_uiSpellShieldTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiSpellShieldTimer -= uiDiff;
+            }
+
+            if (m_uiBlastWaveTimer < uiDiff)
+            {
+                GuidVector vGuids;
+                m_creature->FillGuidsListFromThreatList(vGuids);
+                for (GuidVector::const_iterator i = vGuids.begin(); i != vGuids.end(); ++i)
+                {
+                    Unit* pUnit = m_creature->GetMap()->GetUnit(*i);
+
+                    if (pUnit && pUnit->IsWithinDistInMap(m_creature, 15.0f))
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_BLAST_WAVE, CAST_INTERRUPT_PREVIOUS);
+                        break;
+                    }
+                }
+
+                m_uiBlastWaveTimer = 6000;
+            }
+            else
+            {
+                m_uiBlastWaveTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_krosh_firehandAI(pCreature);
+    }
+};
+
+void AddSC_boss_high_king_maulgar()
+{
+    Script* s;
+
+    s = new boss_high_king_maulgar();
+    s->RegisterSelf();
+    s = new boss_kiggler_the_crazed();
+    s->RegisterSelf();
+    s = new boss_blindeye_the_seer();
+    s->RegisterSelf();
+    s = new boss_olm_the_summoner();
+    s->RegisterSelf();
+    s = new boss_krosh_firehand();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_high_king_maulgar";
+    //pNewScript->GetAI = &GetAI_boss_high_king_maulgar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_kiggler_the_crazed";
+    //pNewScript->GetAI = &GetAI_boss_kiggler_the_crazed;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_blindeye_the_seer";
+    //pNewScript->GetAI = &GetAI_boss_blindeye_the_seer;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_olm_the_summoner";
+    //pNewScript->GetAI = &GetAI_boss_olm_the_summoner;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_krosh_firehand";
+    //pNewScript->GetAI = &GetAI_boss_krosh_firehand;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/gruuls_lair/gruuls_lair.h b/src/modules/SD3/scripts/outland/gruuls_lair/gruuls_lair.h
new file mode 100644
index 000000000..52f43d900
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/gruuls_lair/gruuls_lair.h
@@ -0,0 +1,50 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_GRUULS_LAIR_H
+#define DEF_GRUULS_LAIR_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 2,
+    MAX_COUNCIL                     = 5,
+
+    // Encounter Status
+    TYPE_MAULGAR_EVENT              = 0,
+    TYPE_GRUUL_EVENT                = 1,
+
+    GO_PORT_GRONN_1                 = 183817,               // 184468 not in use
+    GO_PORT_GRONN_2                 = 184662,
+
+    // NPC GUIDs
+    NPC_MAULGAR                     = 18831,
+    // NPC_BLINDEYE                  = 18836,
+    // NPC_KIGGLER                   = 18835,
+    // NPC_KROSH                     = 18832,
+    // NPC_OLM                       = 18834,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp b/src/modules/SD3/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
new file mode 100644
index 000000000..c47b44671
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
@@ -0,0 +1,202 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Gruuls_Lair
+SD%Complete: 100
+SDComment:
+SDCategory: Gruul's Lair
+EndScriptData */
+
+#include "precompiled.h"
+#include "gruuls_lair.h"
+
+/* Gruuls Lair encounters:
+1 - High King Maulgar event
+2 - Gruul event
+*/
+
+struct is_gruuls_lair : public InstanceScript
+{
+    is_gruuls_lair() : InstanceScript("instance_gruuls_lair") {}
+
+    class instance_gruuls_lair : public ScriptedInstance
+    {
+    public:
+        instance_gruuls_lair(Map* pMap) : ScriptedInstance(pMap),
+            m_uiCouncilMembersDied(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            if (m_auiEncounter[i] == IN_PROGRESS)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_MAULGAR)
+            {
+                m_mNpcEntryGuidStore[NPC_MAULGAR] = pCreature->GetObjectGuid();
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_PORT_GRONN_1:
+                if (m_auiEncounter[TYPE_MAULGAR_EVENT] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_PORT_GRONN_2:
+                break;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_MAULGAR_EVENT:
+                if (uiData == SPECIAL)
+                {
+                    ++m_uiCouncilMembersDied;
+
+                    if (m_uiCouncilMembersDied == MAX_COUNCIL)
+                    {
+                        SetData(TYPE_MAULGAR_EVENT, DONE);
+                    }
+                    // Don't store special data
+                    break;
+                }
+                if (uiData == FAIL)
+                {
+                    m_uiCouncilMembersDied = 0;
+                }
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_PORT_GRONN_1);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_GRUUL_EVENT:
+                DoUseDoorOrButton(GO_PORT_GRONN_2);
+                m_auiEncounter[uiType] = uiData;
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1];
+
+                m_strSaveData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strSaveData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            if (m_auiEncounter[i] == IN_PROGRESS)
+            {
+                m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+    private:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strSaveData;
+
+        uint8 m_uiCouncilMembersDied;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_gruuls_lair(pMap);
+    }
+};
+
+void AddSC_instance_gruuls_lair()
+{
+    Script* s;
+
+    s = new is_gruuls_lair();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_gruuls_lair";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_gruuls_lair;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.h b/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.h
new file mode 100644
index 000000000..1e5a249ee
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.h
@@ -0,0 +1,71 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_BLOOD_FURNACE_H
+#define DEF_BLOOD_FURNACE_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 3,
+    MAX_ORC_WAVES                   = 4,
+
+    TYPE_THE_MAKER_EVENT            = 0,
+    TYPE_BROGGOK_EVENT              = 1,
+    TYPE_KELIDAN_EVENT              = 2,
+    TYPE_ADD_AGGROED                = MAX_ENCOUNTER,
+    TYPE_ADD_DO_SETUP               = MAX_ENCOUNTER+1,
+    TYPE_BROGGOK_DO_MOVE            = MAX_ENCOUNTER+2,
+
+    // NPC_THE_MAKER                = 17381,
+    NPC_BROGGOK                     = 17380,
+    NPC_KELIDAN_THE_BREAKER         = 17377,
+    NPC_NASCENT_FEL_ORC             = 17398,                // Used in the Broggok event
+    NPC_MAGTHERIDON                 = 21174,
+    NPC_SHADOWMOON_CHANNELER        = 17653,
+
+    GO_DOOR_FINAL_EXIT              = 181766,
+    GO_DOOR_MAKER_FRONT             = 181811,
+    GO_DOOR_MAKER_REAR              = 181812,
+    GO_DOOR_BROGGOK_FRONT           = 181822,
+    GO_DOOR_BROGGOK_REAR            = 181819,
+    GO_DOOR_KELIDAN_EXIT            = 181823,
+
+    // GO_PRISON_CELL_MAKER1        = 181813,               // The maker cell front right
+    // GO_PRISON_CELL_MAKER2        = 181814,               // The maker cell back right
+    // GO_PRISON_CELL_MAKER3        = 181816,               // The maker cell front left
+    // GO_PRISON_CELL_MAKER4        = 181815,               // The maker cell back left
+
+    GO_PRISON_CELL_BROGGOK_1        = 181817,               // Broggok cell back left   (NE)
+    GO_PRISON_CELL_BROGGOK_2        = 181818,               // Broggok cell back right  (SE)
+    GO_PRISON_CELL_BROGGOK_3        = 181820,               // Broggok cell front left  (NW)
+    GO_PRISON_CELL_BROGGOK_4        = 181821,               // Broggok cell front right (SW)
+
+    SAY_BROGGOK_INTRO               = -1542015,
+
+    POINT_EVENT_COMBAT              = 1,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp b/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
new file mode 100644
index 000000000..53f142000
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
@@ -0,0 +1,232 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Broggok
+SD%Complete: 70
+SDComment: pre-event not made
+SDCategory: Hellfire Citadel, Blood Furnace
+EndScriptData */
+
+#include "precompiled.h"
+#include "blood_furnace.h"
+
+enum
+{
+    SAY_AGGRO               = -1542008,
+
+    SPELL_SLIME_SPRAY       = 30913,
+    SPELL_SLIME_SPRAY_H     = 38458,
+    SPELL_POISON_CLOUD      = 30916,
+    SPELL_POISON_BOLT       = 30917,
+    SPELL_POISON_BOLT_H     = 38459,
+
+    SPELL_POISON            = 30914,
+};
+
+struct boss_broggok : public CreatureScript
+{
+    boss_broggok() : CreatureScript("boss_broggok") {}
+
+    struct boss_broggokAI : public ScriptedAI
+    {
+        boss_broggokAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiAcidSprayTimer;
+        uint32 m_uiPoisonSpawnTimer;
+        uint32 m_uiPoisonBoltTimer;
+
+        void Reset() override
+        {
+            m_uiAcidSprayTimer = 10000;
+            m_uiPoisonSpawnTimer = 5000;
+            m_uiPoisonBoltTimer = 7000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BROGGOK_EVENT, IN_PROGRESS);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // ToDo: set correct flags and data in DB!!!
+            pSummoned->setFaction(16);
+            pSummoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+            pSummoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            pSummoned->CastSpell(pSummoned, SPELL_POISON, false, NULL, NULL, m_creature->GetObjectGuid());
+        }
+
+        void JustDied(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BROGGOK_EVENT, DONE);
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+
+            if (!m_creature->IsAlive())
+            {
+                return;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BROGGOK_DO_MOVE, 4);
+            }
+            else
+            {
+                m_creature->GetMotionMaster()->MoveTargetedHome();
+            }
+        }
+
+        // Reset Orientation
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || uiPointId != POINT_EVENT_COMBAT)
+            {
+                return;
+            }
+
+            if (GameObject* pFrontDoor = m_pInstance->GetSingleGameObjectFromStorage(GO_DOOR_BROGGOK_FRONT))
+            {
+                m_creature->SetFacingToObject(pFrontDoor);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiAcidSprayTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SLIME_SPRAY : SPELL_SLIME_SPRAY_H) == CAST_OK)
+                {
+                    m_uiAcidSprayTimer = urand(4000, 12000);
+                }
+            }
+            else
+            {
+                m_uiAcidSprayTimer -= uiDiff;
+            }
+
+            if (m_uiPoisonBoltTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_POISON_BOLT : SPELL_POISON_BOLT_H) == CAST_OK)
+                {
+                    m_uiPoisonBoltTimer = urand(4000, 12000);
+                }
+            }
+            else
+            {
+                m_uiPoisonBoltTimer -= uiDiff;
+            }
+
+            if (m_uiPoisonSpawnTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_POISON_CLOUD) == CAST_OK)
+                {
+                    m_uiPoisonSpawnTimer = 20000;
+                }
+            }
+            else
+            {
+                m_uiPoisonSpawnTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_broggokAI(pCreature);
+    }
+};
+
+struct mob_broggok_poisoncloud : public CreatureScript
+{
+    mob_broggok_poisoncloud() : CreatureScript("mob_broggok_poisoncloud") {}
+
+    struct mob_broggok_poisoncloudAI : public ScriptedAI
+    {
+        mob_broggok_poisoncloudAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        void MoveInLineOfSight(Unit* /*who*/) override { }
+        void AttackStart(Unit* /*who*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_broggok_poisoncloudAI(pCreature);
+    }
+};
+
+void AddSC_boss_broggok()
+{
+    Script* s;
+
+    s = new boss_broggok();
+    s->RegisterSelf();
+    s = new mob_broggok_poisoncloud();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_broggok";
+    //pNewScript->GetAI = &GetAI_boss_broggok;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_broggok_poisoncloud";
+    //pNewScript->GetAI = &GetAI_mob_broggok_poisoncloud;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
new file mode 100644
index 000000000..bd3ec04b5
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
@@ -0,0 +1,429 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Kelidan_The_Breaker
+SD%Complete: 100
+SDComment:
+SDCategory: Hellfire Citadel, Blood Furnace
+EndScriptData */
+
+/* ContentData
+boss_kelidan_the_breaker
+mob_shadowmoon_channeler
+EndContentData */
+
+#include "precompiled.h"
+#include "blood_furnace.h"
+
+enum
+{
+    MAX_ADDS                    = 5,
+
+    SAY_MAGTHERIDON_INTRO       = -1542016,                 // Yell by Magtheridon
+    SAY_WAKE                    = -1542000,
+    SAY_ADD_AGGRO_1             = -1542001,
+    SAY_ADD_AGGRO_2             = -1542002,
+    SAY_ADD_AGGRO_3             = -1542003,
+    SAY_KILL_1                  = -1542004,
+    SAY_KILL_2                  = -1542005,
+    SAY_NOVA                    = -1542006,
+    SAY_DIE                     = -1542007,
+
+    SPELL_CORRUPTION            = 30938,
+    SPELL_EVOCATION             = 30935,
+
+    SPELL_FIRE_NOVA             = 33132,
+    SPELL_FIRE_NOVA_H           = 37371,
+
+    SPELL_SHADOW_BOLT_VOLLEY    = 28599,
+    SPELL_SHADOW_BOLT_VOLLEY_H  = 40070,
+
+    SPELL_BURNING_NOVA          = 30940,
+    SPELL_VORTEX                = 37370,
+};
+
+struct boss_kelidan_the_breaker : public CreatureScript
+{
+    boss_kelidan_the_breaker() : CreatureScript("boss_kelidan_the_breaker") {}
+
+    struct boss_kelidan_the_breakerAI : public ScriptedAI
+    {
+        boss_kelidan_the_breakerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_uiSetupAddsTimer = 100;
+            m_bDidMagtheridonYell = false;
+            DoCastSpellIfCan(m_creature, SPELL_EVOCATION);
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bIsRegularMode;
+
+        uint32 m_uiShadowVolleyTimer;
+        uint32 m_uiBurningNovaTimer;
+        uint32 m_uiFirenovaTimer;
+        uint32 m_uiCorruptionTimer;
+        uint32 m_uiSetupAddsTimer;
+        uint8 m_uiKilledAdds;
+        bool m_bDidMagtheridonYell;
+
+        GuidVector m_vAddGuids;
+
+        void Reset() override
+        {
+            m_uiShadowVolleyTimer = 1000;
+            m_uiBurningNovaTimer = 15000;
+            m_uiCorruptionTimer = 5000;
+            m_uiFirenovaTimer = 0;
+            m_uiKilledAdds = 0;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bDidMagtheridonYell && pWho->GetTypeId() == TYPEID_PLAYER && !((Player*)pWho)->isGameMaster() && m_creature->_IsWithinDist(pWho, 73.0f, false))
+            {
+                if (m_pInstance)
+                {
+                    m_pInstance->DoOrSimulateScriptTextForThisInstance(SAY_MAGTHERIDON_INTRO, NPC_MAGTHERIDON);
+                }
+
+                m_bDidMagtheridonYell = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_WAKE, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (urand(0, 1))
+            {
+                return;
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_KILL_1 : SAY_KILL_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DIE, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KELIDAN_EVENT, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KELIDAN_EVENT, FAIL);
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_EVOCATION);
+            m_uiSetupAddsTimer = 2000;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit *pInvoker, uint32 /*data*/) override
+        {
+            switch (eventType)
+            {
+            case AI_EVENT_CUSTOM_A:
+                if (pSender->GetEntry() == NPC_SHADOWMOON_CHANNELER)
+                    m_uiSetupAddsTimer = 2000;
+                break;
+            case AI_EVENT_CUSTOM_B:
+                if (pSender->GetEntry() == NPC_SHADOWMOON_CHANNELER)
+                {
+                    ++m_uiKilledAdds;
+                    if (m_uiKilledAdds == MAX_ADDS)
+                    {
+                        m_creature->InterruptNonMeleeSpells(true);
+                        AttackStart(pInvoker);
+                    }
+                }
+                break;
+            default:
+                break;
+            }
+        }
+
+        void DoSetupAdds()
+        {
+            m_uiSetupAddsTimer = 0;
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+            m_pInstance->SetData(TYPE_ADD_DO_SETUP, 0);
+            m_uiKilledAdds = 0;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiSetupAddsTimer)
+            {
+                if (m_uiSetupAddsTimer <= uiDiff)
+                {
+                    DoSetupAdds();
+                }
+                else
+                {
+                    m_uiSetupAddsTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiFirenovaTimer)
+            {
+                if (m_uiFirenovaTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_FIRE_NOVA : SPELL_FIRE_NOVA_H) == CAST_OK)
+                    {
+                        m_uiFirenovaTimer = 0;
+                        m_uiShadowVolleyTimer = 2000;
+                    }
+                }
+                else
+                {
+                    m_uiFirenovaTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiShadowVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SHADOW_BOLT_VOLLEY : SPELL_SHADOW_BOLT_VOLLEY_H) == CAST_OK)
+                {
+                    m_uiShadowVolleyTimer = urand(5000, 13000);
+                }
+            }
+            else
+            {
+                m_uiShadowVolleyTimer -= uiDiff;
+            }
+
+            if (m_uiCorruptionTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CORRUPTION) == CAST_OK)
+                {
+                    m_uiCorruptionTimer = urand(30000, 50000);
+                }
+            }
+            else
+            {
+                m_uiCorruptionTimer -= uiDiff;
+            }
+
+            if (m_uiBurningNovaTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BURNING_NOVA, CAST_TRIGGERED) == CAST_OK)
+                {
+                    DoScriptText(SAY_NOVA, m_creature);
+
+                    if (!m_bIsRegularMode)
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_VORTEX, CAST_TRIGGERED);
+                    }
+
+                    m_uiBurningNovaTimer = urand(20000, 28000);
+                    m_uiFirenovaTimer = 5000;
+                }
+            }
+            else
+            {
+                m_uiBurningNovaTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_kelidan_the_breakerAI(pCreature);
+    }
+};
+
+/*######
+## mob_shadowmoon_channeler
+######*/
+
+enum
+{
+    SPELL_SHADOW_BOLT       = 12739,
+    SPELL_SHADOW_BOLT_H     = 15472,
+
+    SPELL_MARK_OF_SHADOW    = 30937,
+};
+
+struct mob_shadowmoon_channeler : public CreatureScript
+{
+    mob_shadowmoon_channeler() : CreatureScript("mob_shadowmoon_channeler") {}
+
+    struct mob_shadowmoon_channelerAI : public ScriptedAI
+    {
+        mob_shadowmoon_channelerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiShadowBoltTimer;
+        uint32 m_uiMarkOfShadowTimer;
+
+        void Reset() override
+        {
+            m_uiShadowBoltTimer = urand(1000, 2000);
+            m_uiMarkOfShadowTimer = urand(5000, 7000);
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            m_creature->InterruptNonMeleeSpells(false);
+
+            switch (urand(0, 2))
+            {
+            case 0:
+                DoScriptText(SAY_ADD_AGGRO_1, m_creature);
+                break;
+            case 1:
+                DoScriptText(SAY_ADD_AGGRO_2, m_creature);
+                break;
+            case 2:
+                DoScriptText(SAY_ADD_AGGRO_3, m_creature);
+                break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData64(TYPE_ADD_AGGROED, pWho->GetObjectGuid().GetRawValue());
+            }
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            if (Creature* pKelidan = m_pInstance->GetSingleCreatureFromStorage(NPC_KELIDAN_THE_BREAKER))
+                SendAIEvent(AI_EVENT_CUSTOM_B, pKiller, pKelidan);
+        }
+
+        void JustReachedHome() override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            if (Creature* pKelidan = m_pInstance->GetSingleCreatureFromStorage(NPC_KELIDAN_THE_BREAKER))
+                SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pKelidan);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiMarkOfShadowTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_MARK_OF_SHADOW) == CAST_OK)
+                    {
+                        m_uiMarkOfShadowTimer = urand(15000, 20000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiMarkOfShadowTimer -= uiDiff;
+            }
+
+            if (m_uiShadowBoltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_SHADOW_BOLT : SPELL_SHADOW_BOLT_H) == CAST_OK)
+                    {
+                        m_uiShadowBoltTimer = urand(5000, 6000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiShadowBoltTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_shadowmoon_channelerAI(pCreature);
+    }
+};
+
+void AddSC_boss_kelidan_the_breaker()
+{
+    Script* s;
+
+    s = new boss_kelidan_the_breaker();
+    s->RegisterSelf();
+    s = new mob_shadowmoon_channeler();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_kelidan_the_breaker";
+    //pNewScript->GetAI = &GetAI_boss_kelidan_the_breaker;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_shadowmoon_channeler";
+    //pNewScript->GetAI = &GetAI_mob_shadowmoon_channeler;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp b/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
new file mode 100644
index 000000000..8810d1087
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
@@ -0,0 +1,201 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_The_Maker
+SD%Complete: 80
+SDComment: Mind control no support
+SDCategory: Hellfire Citadel, Blood Furnace
+EndScriptData */
+
+#include "precompiled.h"
+#include "blood_furnace.h"
+
+enum
+{
+    SAY_AGGRO_1                 = -1542009,
+    SAY_AGGRO_2                 = -1542010,
+    SAY_AGGRO_3                 = -1542011,
+    SAY_KILL_1                  = -1542012,
+    SAY_KILL_2                  = -1542013,
+    SAY_DIE                     = -1542014,
+
+    SPELL_ACID_SPRAY            = 38153,                    // heroic 38973 ??? 38153
+    SPELL_EXPLODING_BREAKER     = 30925,
+    SPELL_EXPLODING_BREAKER_H   = 40059,
+    SPELL_KNOCKDOWN             = 20276,
+    SPELL_DOMINATION            = 30923
+};
+
+struct boss_the_maker : public CreatureScript
+{
+    boss_the_maker() : CreatureScript("boss_the_maker") {}
+
+    struct boss_the_makerAI : public ScriptedAI
+    {
+        boss_the_makerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiAcidSprayTimer;
+        uint32 m_uiExplodingBreakerTimer;
+        uint32 m_uiDominationTimer;
+        uint32 m_uiKnockdownTimer;
+
+        void Reset() override
+        {
+            m_uiAcidSprayTimer = 15000;
+            m_uiExplodingBreakerTimer = 6000;
+            m_uiDominationTimer = 20000;
+            m_uiKnockdownTimer = 10000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THE_MAKER_EVENT, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THE_MAKER_EVENT, FAIL);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL_1 : SAY_KILL_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DIE, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_THE_MAKER_EVENT, DONE);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiAcidSprayTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ACID_SPRAY) == CAST_OK)
+                {
+                    m_uiAcidSprayTimer = urand(15000, 23000);
+                }
+            }
+            else
+            {
+                m_uiAcidSprayTimer -= uiDiff;
+            }
+
+            if (m_uiExplodingBreakerTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_EXPLODING_BREAKER : SPELL_EXPLODING_BREAKER_H) == CAST_OK)
+                    {
+                        m_uiExplodingBreakerTimer = urand(4000, 12000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiExplodingBreakerTimer -= uiDiff;
+            }
+
+            if (m_uiDominationTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_DOMINATION) == CAST_OK)
+                    {
+                        m_uiDominationTimer = urand(15000, 25000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiDominationTimer -= uiDiff;
+            }
+
+            if (m_uiKnockdownTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_KNOCKDOWN) == CAST_OK)
+                {
+                    m_uiKnockdownTimer = urand(4000, 12000);
+                }
+            }
+            else
+            {
+                m_uiKnockdownTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_the_makerAI(pCreature);
+    }
+};
+
+void AddSC_boss_the_maker()
+{
+    Script* s;
+
+    s = new boss_the_maker();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_the_maker";
+    //pNewScript->GetAI = &GetAI_boss_the_makerAI;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
new file mode 100644
index 000000000..f24e80819
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
@@ -0,0 +1,629 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Blood_Furnace
+SD%Complete: 75
+SDComment:
+SDCategory: Blood Furnace
+EndScriptData */
+
+#include "precompiled.h"
+#include "blood_furnace.h"
+
+enum
+{
+    SPELL_CHANNELING = 39123,
+};
+
+// Random Magtheridon taunt
+static const int32 aRandomTaunt[] = { -1544000, -1544001, -1544002, -1544003, -1544004, -1544005 };
+
+struct BroggokEventInfo
+{
+    BroggokEventInfo() : m_bIsCellOpened(false), m_uiKilledOrcCount(0) {}
+
+    ObjectGuid m_cellGuid;
+    bool m_bIsCellOpened;
+    uint8 m_uiKilledOrcCount;
+    GuidSet m_sSortedOrcGuids;
+};
+
+struct SortByAngle
+{
+    SortByAngle(WorldObject const* pRef) : m_pRef(pRef) {}
+    bool operator()(WorldObject* pLeft, WorldObject* pRight)
+    {
+        return m_pRef->GetAngle(pLeft) < m_pRef->GetAngle(pRight);
+    }
+    WorldObject const* m_pRef;
+};
+
+struct is_blood_furnace : public InstanceScript
+{
+    is_blood_furnace() : InstanceScript("instance_blood_furnace") {}
+
+    class instance_blood_furnace : public ScriptedInstance
+    {
+    public:
+        instance_blood_furnace(Map* pMap) : ScriptedInstance(pMap),
+            m_uiBroggokEventTimer(30000),
+            m_uiBroggokEventPhase(0),
+            m_uiRandYellTimer(90000)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_BROGGOK:
+            case NPC_KELIDAN_THE_BREAKER:
+            case NPC_MAGTHERIDON:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+
+            case NPC_NASCENT_FEL_ORC:
+                m_luiNascentOrcGuids.push_back(pCreature->GetObjectGuid());
+                break;
+            case NPC_SHADOWMOON_CHANNELER:
+                m_lChannelersGuids.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_DOOR_MAKER_FRONT:                           // the maker front door
+                break;
+            case GO_DOOR_MAKER_REAR:                            // the maker rear door
+                if (m_auiEncounter[TYPE_THE_MAKER_EVENT] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_DOOR_BROGGOK_FRONT:                         // broggok front door
+                break;
+            case GO_DOOR_BROGGOK_REAR:                          // broggok rear door
+                if (m_auiEncounter[TYPE_BROGGOK_EVENT] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_DOOR_KELIDAN_EXIT:                          // kelidan exit door
+                if (m_auiEncounter[TYPE_KELIDAN_EVENT] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_DOOR_FINAL_EXIT:                            // final exit door
+                if (m_auiEncounter[TYPE_KELIDAN_EVENT] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+
+            case GO_PRISON_CELL_BROGGOK_1: m_aBroggokEvent[0].m_cellGuid = pGo->GetObjectGuid(); return;
+            case GO_PRISON_CELL_BROGGOK_2: m_aBroggokEvent[1].m_cellGuid = pGo->GetObjectGuid(); return;
+            case GO_PRISON_CELL_BROGGOK_3: m_aBroggokEvent[2].m_cellGuid = pGo->GetObjectGuid(); return;
+            case GO_PRISON_CELL_BROGGOK_4: m_aBroggokEvent[3].m_cellGuid = pGo->GetObjectGuid(); return;
+
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            if (m_auiEncounter[TYPE_BROGGOK_EVENT] != IN_PROGRESS)
+            {
+                return;
+            }
+
+            if (pCreature->GetEntry() == NPC_NASCENT_FEL_ORC)
+            {
+                uint8 uiClearedCells = 0;
+                for (uint8 i = 0; i < std::min<uint32>(m_uiBroggokEventPhase, MAX_ORC_WAVES); ++i)
+                {
+                    if (m_aBroggokEvent[i].m_sSortedOrcGuids.size() == m_aBroggokEvent[i].m_uiKilledOrcCount)
+                    {
+                        ++uiClearedCells;
+                        continue;
+                    }
+
+                    // Increase kill counter, if we found a mob of this cell
+                    if (m_aBroggokEvent[i].m_sSortedOrcGuids.find(pCreature->GetObjectGuid()) != m_aBroggokEvent[i].m_sSortedOrcGuids.end())
+                    {
+                        m_aBroggokEvent[i].m_uiKilledOrcCount++;
+                    }
+
+                    if (m_aBroggokEvent[i].m_sSortedOrcGuids.size() == m_aBroggokEvent[i].m_uiKilledOrcCount)
+                    {
+                        ++uiClearedCells;
+                    }
+                }
+
+                // Increase phase when all opened cells are cleared
+                if (uiClearedCells == m_uiBroggokEventPhase)
+                {
+                    DoNextBroggokEventPhase();
+                }
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            if (m_auiEncounter[TYPE_BROGGOK_EVENT] == FAIL)
+            {
+                return;
+            }
+
+            if (pCreature->GetEntry() == NPC_BROGGOK)
+            {
+                SetData(TYPE_BROGGOK_EVENT, FAIL);
+            }
+
+            else if (pCreature->GetEntry() == NPC_NASCENT_FEL_ORC)
+            {
+                for (uint8 i = 0; i < std::min<uint32>(m_uiBroggokEventPhase, MAX_ORC_WAVES); ++i)
+                {
+                    if (m_aBroggokEvent[i].m_sSortedOrcGuids.find(pCreature->GetObjectGuid()) != m_aBroggokEvent[i].m_sSortedOrcGuids.end())
+                    {
+                        SetData(TYPE_BROGGOK_EVENT, FAIL);
+                    }
+                }
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_THE_MAKER_EVENT:
+                if (uiData == IN_PROGRESS)
+                {
+                    DoUseDoorOrButton(GO_DOOR_MAKER_FRONT);
+                }
+                if (uiData == FAIL)
+                {
+                    DoUseDoorOrButton(GO_DOOR_MAKER_FRONT);
+                }
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_DOOR_MAKER_FRONT);
+                    DoUseDoorOrButton(GO_DOOR_MAKER_REAR);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_BROGGOK_EVENT:
+                if (m_auiEncounter[uiType] == uiData)
+                {
+                    return;
+                }
+
+                // Combat door; the exit door is opened in event
+                DoUseDoorOrButton(GO_DOOR_BROGGOK_FRONT);
+                if (uiData == IN_PROGRESS)
+                {
+                    if (m_uiBroggokEventPhase <= MAX_ORC_WAVES)
+                    {
+                        m_uiBroggokEventPhase = 0;
+                        DoSortBroggokOrcs();
+                        // open first cage
+                        DoNextBroggokEventPhase();
+                    }
+                }
+                else if (uiData == FAIL)
+                {
+                    // On wipe we reset only the orcs; if the party wipes at the boss itself then the orcs don't reset
+                    if (m_uiBroggokEventPhase <= MAX_ORC_WAVES)
+                    {
+                        for (uint8 i = 0; i < MAX_ORC_WAVES; ++i)
+                        {
+                            // Reset Orcs
+                            if (!m_aBroggokEvent[i].m_bIsCellOpened)
+                            {
+                                continue;
+                            }
+
+                            m_aBroggokEvent[i].m_uiKilledOrcCount = 0;
+                            for (GuidSet::const_iterator itr = m_aBroggokEvent[i].m_sSortedOrcGuids.begin(); itr != m_aBroggokEvent[i].m_sSortedOrcGuids.end(); ++itr)
+                            {
+                                if (Creature* pOrc = instance->GetCreature(*itr))
+                                {
+                                    if (!pOrc->IsAlive())
+                                    {
+                                        pOrc->Respawn();
+                                    }
+                                }
+                            }
+
+                            // Close Door
+                            DoUseDoorOrButton(m_aBroggokEvent[i].m_cellGuid);
+                            m_aBroggokEvent[i].m_bIsCellOpened = false;
+                        }
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_KELIDAN_EVENT:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_DOOR_KELIDAN_EXIT);
+                    DoUseDoorOrButton(GO_DOOR_FINAL_EXIT);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_ADD_DO_SETUP:
+            {
+                GuidList lAddGuids = m_lChannelersGuids;
+                m_lChannelersGuids.clear();
+
+                // Sort Adds to vector if not already done
+                if (!lAddGuids.empty())
+                {
+                    m_vAddGuids.reserve(lAddGuids.size());
+                    std::list<Creature*> lAdds;
+                    for (GuidList::const_iterator itr = lAddGuids.begin(); itr != lAddGuids.end(); ++itr)
+                    {
+                        if (Creature* pAdd = instance->GetCreature(*itr))
+                        {
+                            lAdds.push_back(pAdd);
+                        }
+                    }
+                    // Sort them by angle
+                    lAdds.sort(SortByAngle(GetSingleCreatureFromStorage(NPC_KELIDAN_THE_BREAKER)));
+                    for (std::list<Creature*>::const_iterator itr = lAdds.begin(); itr != lAdds.end(); ++itr)
+                    {
+                        m_vAddGuids.push_back((*itr)->GetObjectGuid());
+                    }
+                }
+
+                // Respawn killed adds
+                for (GuidVector::const_iterator itr = m_vAddGuids.begin(); itr != m_vAddGuids.end(); ++itr)
+                {
+                    Creature* pAdd = instance->GetCreature(*itr);
+                    if (pAdd && !pAdd->IsAlive())
+                    {
+                        pAdd->Respawn();
+                    }
+                }
+
+                // Cast pentagram
+                uint8 s = m_vAddGuids.size();
+                for (uint8 i = 0; i < s; ++i)
+                {
+                    Creature* pCaster = instance->GetCreature(m_vAddGuids[i]);
+                    Creature* pTarget = instance->GetCreature(m_vAddGuids[(i + 2) % s]);
+                    if (pCaster && pTarget)
+                    {
+                        pCaster->CastSpell(pTarget, SPELL_CHANNELING, false);
+                    }
+                }
+                }
+                return;
+            case TYPE_BROGGOK_DO_MOVE:
+                if (Creature *broggok = GetSingleCreatureFromStorage(NPC_BROGGOK))
+                {
+                    float dx, dy;
+                    float fRespX, fRespY, fRespZ;
+                    broggok->GetRespawnCoord(fRespX, fRespY, fRespZ);
+                    GetMovementDistanceForIndex(uiData, dx, dy);
+                    broggok->GetMotionMaster()->MovePoint(POINT_EVENT_COMBAT, dx, dy, fRespZ);
+                }
+                return;
+            default:
+                script_error_log("Instance Blood Furnace SetData with Type %u Data %u, but this is not implemented.", uiType, uiData);
+                return;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        void SetData64(uint32 type, uint64 data) override
+        {
+            switch (type)
+            {
+            case TYPE_ADD_AGGROED:
+                if (Unit *victim = instance->GetUnit(ObjectGuid(data)))
+                {
+                    // Let all adds attack
+                    for (GuidList::const_iterator itr = m_lChannelersGuids.begin(); itr != m_lChannelersGuids.end(); ++itr)
+                    {
+                        Creature* pAdd = instance->GetCreature(*itr);
+                        if (pAdd && !pAdd->getVictim())
+                        {
+                            pAdd->AI()->AttackStart(victim);
+                        }
+                    }
+                }
+                break;
+            default:
+                break;
+            }
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            // Broggok Event: For the last wave we don't check the timer; the boss is released only when all mobs die, also the timer is only active on heroic
+            if (m_auiEncounter[TYPE_BROGGOK_EVENT] == IN_PROGRESS && m_uiBroggokEventPhase < MAX_ORC_WAVES && !instance->IsRegularDifficulty())
+            {
+                if (m_uiBroggokEventTimer < uiDiff)
+                {
+                    DoNextBroggokEventPhase();
+                }
+                else
+                {
+                    m_uiBroggokEventTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiRandYellTimer < uiDiff)
+            {
+                if (Creature* pMagtheridon = GetSingleCreatureFromStorage(NPC_MAGTHERIDON))
+                {
+                    DoScriptText(aRandomTaunt[urand(0, 5)], pMagtheridon);
+                    m_uiRandYellTimer = 90000;
+                }
+            }
+            else
+            {
+                m_uiRandYellTimer -= uiDiff;
+            }
+        }
+
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            if (m_auiEncounter[i] == IN_PROGRESS || m_auiEncounter[i] == FAIL)
+            {
+                m_auiEncounter[i] = NOT_STARTED;
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+
+        // Helper function to calculate the position to where the orcs should move
+        // For case of orc-indexes the difference, for Braggok his position
+        void GetMovementDistanceForIndex(uint32 uiIndex, float& dx, float& dy)
+        {
+            GameObject* pDoor[2];
+
+            if (uiIndex < MAX_ORC_WAVES)
+            {
+                // Use doors 0, 1 for index 0 or 1; and use doors 2, 3 for index 2 or 3
+                pDoor[0] = instance->GetGameObject(m_aBroggokEvent[(uiIndex / 2) * 2].m_cellGuid);
+                pDoor[1] = instance->GetGameObject(m_aBroggokEvent[(uiIndex / 2) * 2 + 1].m_cellGuid);
+            }
+            else
+            {
+                // Use doors 0 and 3 for Braggok case (which means the middle point is the center of the room)
+                pDoor[0] = instance->GetGameObject(m_aBroggokEvent[0].m_cellGuid);
+                pDoor[1] = instance->GetGameObject(m_aBroggokEvent[3].m_cellGuid);
+            }
+
+            if (!pDoor[0] || !pDoor[1])
+            {
+                return;
+            }
+
+            if (uiIndex < MAX_ORC_WAVES)
+            {
+                dx = (pDoor[0]->GetPositionX() + pDoor[1]->GetPositionX()) / 2 - pDoor[uiIndex % 2]->GetPositionX();
+                dy = (pDoor[0]->GetPositionY() + pDoor[1]->GetPositionY()) / 2 - pDoor[uiIndex % 2]->GetPositionY();
+            }
+            else
+            {
+                dx = (pDoor[0]->GetPositionX() + pDoor[1]->GetPositionX()) / 2;
+                dy = (pDoor[0]->GetPositionY() + pDoor[1]->GetPositionY()) / 2;
+            }
+        }
+
+    private:
+        // Sort all nascent orcs in the instance in order to get only those near broggok doors
+        void DoSortBroggokOrcs()
+        {
+            for (GuidList::const_iterator itr = m_luiNascentOrcGuids.begin(); itr != m_luiNascentOrcGuids.end(); ++itr)
+            {
+                if (Creature* pOrc = instance->GetCreature(*itr))
+                {
+                    for (uint8 i = 0; i < MAX_ORC_WAVES; ++i)
+                    {
+                        if (GameObject* pDoor = instance->GetGameObject(m_aBroggokEvent[i].m_cellGuid))
+                        {
+                            if (pOrc->IsWithinDistInMap(pDoor, 15.0f))
+                            {
+                                m_aBroggokEvent[i].m_sSortedOrcGuids.insert(pOrc->GetObjectGuid());
+                                if (!pOrc->IsAlive())
+                                {
+                                    pOrc->Respawn();
+                                }
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        void DoNextBroggokEventPhase()
+        {
+            // Get Movement Position
+            float dx, dy;
+            GetMovementDistanceForIndex(m_uiBroggokEventPhase, dx, dy);
+
+            // Open door to the final boss now and move boss to the center of the room
+            if (m_uiBroggokEventPhase >= MAX_ORC_WAVES)
+            {
+                DoUseDoorOrButton(GO_DOOR_BROGGOK_REAR);
+
+                if (Creature* pBroggok = GetSingleCreatureFromStorage(NPC_BROGGOK))
+                {
+                    pBroggok->SetWalk(false);
+                    pBroggok->GetMotionMaster()->MovePoint(0, dx, dy, pBroggok->GetPositionZ());
+                }
+            }
+            else
+            {
+                // Open cage door
+                if (!m_aBroggokEvent[m_uiBroggokEventPhase].m_bIsCellOpened)
+                {
+                    DoUseDoorOrButton(m_aBroggokEvent[m_uiBroggokEventPhase].m_cellGuid);
+                }
+
+                m_aBroggokEvent[m_uiBroggokEventPhase].m_bIsCellOpened = true;
+
+                for (GuidSet::const_iterator itr = m_aBroggokEvent[m_uiBroggokEventPhase].m_sSortedOrcGuids.begin(); itr != m_aBroggokEvent[m_uiBroggokEventPhase].m_sSortedOrcGuids.end(); ++itr)
+                {
+                    if (Creature* pOrc = instance->GetCreature(*itr))
+                    {
+                        // Remove unit flags from npcs
+                        pOrc->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                        pOrc->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                        // Move them out of the cages
+                        pOrc->SetWalk(false);
+                        pOrc->GetMotionMaster()->MovePoint(0, pOrc->GetPositionX() + dx, pOrc->GetPositionY() + dy, pOrc->GetPositionZ());
+                    }
+                }
+            }
+
+            // Prepare for further handling
+            m_uiBroggokEventTimer = 30000;
+            ++m_uiBroggokEventPhase;
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        BroggokEventInfo m_aBroggokEvent[MAX_ORC_WAVES];
+
+        uint32 m_uiBroggokEventTimer;                       // Timer for opening the event cages; only on heroic mode = 30 secs
+        uint32 m_uiBroggokEventPhase;
+        uint32 m_uiRandYellTimer;                           // Random yell for Magtheridon
+
+        GuidList m_luiNascentOrcGuids;
+        GuidList m_lChannelersGuids;
+        GuidVector m_vAddGuids;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_blood_furnace(pMap);
+    }
+};
+
+struct go_prison_cell_lever : public GameObjectScript
+{
+    go_prison_cell_lever() : GameObjectScript("go_prison_cell_lever") {}
+
+    bool OnUse(Player* /*pPlayer*/, GameObject* pGo) override
+    {
+        ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData();
+
+        if (!pInstance)
+        {
+            return false;
+        }
+
+        // Set broggok event in progress
+        if (pInstance->GetData(TYPE_BROGGOK_EVENT) != DONE && pInstance->GetData(TYPE_BROGGOK_EVENT) != IN_PROGRESS)
+        {
+            pInstance->SetData(TYPE_BROGGOK_EVENT, IN_PROGRESS);
+
+            // Yell intro
+            if (Creature* pBroggok = pInstance->GetSingleCreatureFromStorage(NPC_BROGGOK))
+            {
+                DoScriptText(SAY_BROGGOK_INTRO, pBroggok);
+            }
+        }
+
+        return false;
+    }
+};
+
+void AddSC_instance_blood_furnace()
+{
+    Script* s;
+
+    s = new is_blood_furnace();
+    s->RegisterSelf();
+    s = new go_prison_cell_lever();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_blood_furnace";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_blood_furnace;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_prison_cell_lever";
+    //pNewScript->pGOUse = &GOUse_go_prison_cell_lever;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_nazan_and_vazruden.cpp b/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_nazan_and_vazruden.cpp
new file mode 100644
index 000000000..709ab9b2c
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_nazan_and_vazruden.cpp
@@ -0,0 +1,554 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Nazan_And_Vazruden
+SD%Complete: 95
+SDComment: Bellowing Roar Timer (heroic) needs some love
+SDCategory: Hellfire Citadel, Hellfire Ramparts
+EndScriptData */
+
+#include "precompiled.h"
+#include "hellfire_ramparts.h"
+
+enum
+{
+    SAY_INTRO               = -1543017,
+    SAY_AGGRO1              = -1543018,
+    SAY_AGGRO2              = -1543019,
+    SAY_AGGRO3              = -1543020,
+    SAY_TAUNT               = -1543021,
+    SAY_KILL1               = -1543022,
+    SAY_KILL2               = -1543023,
+    SAY_DEATH               = -1543024,
+    EMOTE_DESCEND           = -1543025,
+
+    SPELL_SUMMON_VAZRUDEN   = 30717,
+
+    // vazruden
+    SPELL_REVENGE           = 19130,
+    SPELL_REVENGE_H         = 40392,
+
+    // nazan
+    SPELL_FIREBALL          = 30691,                        // This and the next while flying (dmg values will change in cata)
+    SPELL_FIREBALL_B        = 33793,
+    SPELL_FIREBALL_H        = 32491,
+    SPELL_FIREBALL_B_H      = 33794,
+    SPELL_FIREBALL_LAND     = 34653,                        // While landed
+    SPELL_FIREBALL_LAND_H   = 36920,
+
+    SPELL_CONE_OF_FIRE      = 30926,
+    SPELL_CONE_OF_FIRE_H    = 36921,
+
+    SPELL_BELLOW_ROAR_H     = 39427,
+
+    // misc
+    POINT_ID_CENTER         = 100,
+    POINT_ID_FLYING         = 101,
+    POINT_ID_COMBAT         = 102,
+
+    NPC_NAZAN               = 17536,
+};
+
+const float afCenterPos[3] = { -1399.401f, 1736.365f, 87.008f}; // moves here to drop off nazan
+const float afCombatPos[3] = { -1413.848f, 1754.019f, 83.146f}; // moves here when decending
+
+// This is the flying mob ("mounted" on dragon) spawned initially
+// This npc will morph into the "unmounted" dragon (nazan) after vazruden is summoned and continue flying
+// Descent after Vazruden reach 30% HP
+struct boss_vazruden_herald : public CreatureScript
+{
+    boss_vazruden_herald() : CreatureScript("boss_vazruden_herald") {}
+
+    struct boss_vazruden_heraldAI : public ScriptedAI
+    {
+        boss_vazruden_heraldAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            pCreature->SetActiveObjectState(true);
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bIsEventInProgress;
+        bool m_bIsDescending;
+        uint32 m_uiMovementTimer;
+        uint32 m_uiFireballTimer;
+        uint32 m_uiFireballBTimer;
+        uint32 m_uiConeOfFireTimer;
+        uint32 m_uiBellowingRoarTimer;
+
+        ObjectGuid m_lastSeenPlayerGuid;
+        ObjectGuid m_vazrudenGuid;
+
+        void Reset() override
+        {
+            if (m_creature->GetEntry() != NPC_VAZRUDEN_HERALD)
+            {
+                m_creature->UpdateEntry(NPC_VAZRUDEN_HERALD);
+            }
+
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+            m_uiMovementTimer = 0;
+            m_bIsEventInProgress = false;
+            m_bIsDescending = false;
+            m_lastSeenPlayerGuid.Clear();
+            m_vazrudenGuid.Clear();
+            m_uiFireballTimer = 0;
+            m_uiFireballBTimer = 2100;
+            m_uiConeOfFireTimer = urand(8100, 19700);
+            m_uiBellowingRoarTimer = 100;                       // TODO Guesswork, though such an AoE fear soon after landing seems fitting
+
+            // see boss_onyxia
+            // sort of a hack, it is unclear how this really work but the values appear to be valid
+            m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+            m_creature->SetLevitate(true);
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_bIsEventInProgress && !m_lastSeenPlayerGuid && pWho->GetTypeId() == TYPEID_PLAYER && pWho->IsAlive() && !((Player*)pWho)->isGameMaster())
+            {
+                if (m_creature->IsWithinDistInMap(pWho, 40.0f))
+                {
+                    m_lastSeenPlayerGuid = pWho->GetObjectGuid();
+                }
+            }
+
+            if (m_pInstance && m_pInstance->GetData(TYPE_NAZAN) != IN_PROGRESS)
+            {
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_pInstance && m_pInstance->GetData(TYPE_NAZAN) != IN_PROGRESS)
+            {
+                return;
+            }
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            if (uiType == WAYPOINT_MOTION_TYPE)
+            {
+                if (m_uiMovementTimer || m_bIsEventInProgress)
+                {
+                    return;
+                }
+
+                if (m_pInstance->GetData(TYPE_NAZAN) == SPECIAL)
+                {
+                    m_creature->SetCombatStartPosition(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+                    m_uiMovementTimer = 1000;
+                    m_bIsEventInProgress = true;
+                }
+            }
+
+            if (uiType == POINT_MOTION_TYPE)
+            {
+                switch (uiPointId)
+                {
+                case POINT_ID_CENTER:
+                    DoSplit();
+                    break;
+                case POINT_ID_COMBAT:
+                    {
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                    m_pInstance->SetData(TYPE_NAZAN, IN_PROGRESS);
+
+                    // Landing
+                    // undo flying
+                    m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, 0);
+                    m_creature->SetLevitate(false);
+
+                    Player* pPlayer = m_creature->GetMap()->GetPlayer(m_lastSeenPlayerGuid);
+                    if (pPlayer && pPlayer->IsAlive())
+                    {
+                        AttackStart(pPlayer);
+                    }
+
+                    // Initialize for combat
+                    m_uiFireballTimer = urand(5200, 16500);
+                    }
+                    break;
+                case POINT_ID_FLYING:
+                    if (m_bIsEventInProgress)               // Additional check for wipe case, while nazan is flying to this point
+                    {
+                        m_uiFireballTimer = 1;
+                    }
+                    break;
+                }
+            }
+        }
+
+        void DoMoveToCenter()
+        {
+            DoScriptText(SAY_INTRO, m_creature);
+            m_creature->GetMotionMaster()->MovePoint(POINT_ID_CENTER, afCenterPos[0], afCenterPos[1], afCenterPos[2]);
+        }
+
+        void DoSplit()
+        {
+            m_creature->UpdateEntry(NPC_NAZAN);
+
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_VAZRUDEN);
+
+            m_uiMovementTimer = 3000;
+
+            // Let him idle for now
+            m_creature->GetMotionMaster()->MoveIdle();
+        }
+
+        void DoMoveToAir()
+        {
+            float fX, fY, fZ;
+            m_creature->GetCombatStartPosition(fX, fY, fZ);
+
+            // Remove Idle MMGen
+            if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == IDLE_MOTION_TYPE)
+            {
+                m_creature->GetMotionMaster()->MovementExpired(false);
+            }
+
+            m_creature->GetMotionMaster()->MovePoint(POINT_ID_FLYING, fX, fY, fZ);
+        }
+
+        void DoMoveToCombat()
+        {
+            if (m_bIsDescending || !m_pInstance || m_pInstance->GetData(TYPE_NAZAN) == IN_PROGRESS)
+            {
+                return;
+            }
+
+            m_bIsDescending = true;
+
+            m_creature->SetWalk(false);
+            m_creature->GetMotionMaster()->MovePoint(POINT_ID_COMBAT, afCombatPos[0], afCombatPos[1], afCombatPos[2]);
+            DoScriptText(EMOTE_DESCEND, m_creature);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit* /*pInvoker*/, uint32 /*data*/) override
+        {
+            if (pSender->GetEntry() == NPC_VAZRUDEN)
+            {
+                DoMoveToCombat();
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() != NPC_VAZRUDEN)
+            {
+                return;
+            }
+
+            if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_lastSeenPlayerGuid))
+            {
+                pSummoned->AI()->AttackStart(pPlayer);
+            }
+
+            m_vazrudenGuid = pSummoned->GetObjectGuid();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VAZRUDEN, IN_PROGRESS);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NAZAN, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NAZAN, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (m_uiMovementTimer)
+                {
+                    if (m_uiMovementTimer <= uiDiff)
+                    {
+                        if (m_pInstance)
+                        {
+                            if (m_pInstance->GetData(TYPE_VAZRUDEN) == IN_PROGRESS)
+                            {
+                                DoMoveToAir();
+                            }
+                            else
+                            {
+                                DoMoveToCenter();
+                            }
+                        }
+                        m_uiMovementTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiMovementTimer -= uiDiff;
+                    }
+                }
+
+                if (m_vazrudenGuid && m_uiFireballTimer)
+                {
+                    if (m_uiFireballTimer <= uiDiff)
+                    {
+                        if (Creature* pVazruden = m_creature->GetMap()->GetCreature(m_vazrudenGuid))
+                        {
+                            if (Unit* pEnemy = pVazruden->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                            {
+                                if (DoCastSpellIfCan(pEnemy, m_bIsRegularMode ? SPELL_FIREBALL : SPELL_FIREBALL_H, 0, pVazruden->GetObjectGuid()) == CAST_OK)
+                                {
+                                    m_uiFireballTimer = urand(2100, 7300);
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiFireballTimer -= uiDiff;
+                    }
+
+                    if (m_uiFireballBTimer < uiDiff)
+                    {
+                        if (Creature* pVazruden = m_creature->GetMap()->GetCreature(m_vazrudenGuid))
+                        {
+                            if (Unit* pEnemy = pVazruden->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                            {
+                                if (DoCastSpellIfCan(pEnemy, m_bIsRegularMode ? SPELL_FIREBALL_B : SPELL_FIREBALL_B_H, 0, pVazruden->GetObjectGuid()) == CAST_OK)
+                                {
+                                    m_uiFireballBTimer = 15700;
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiFireballBTimer -= uiDiff;
+                    }
+                }
+
+                if (m_creature->GetHealthPercent() < 20.0f)
+                {
+                    DoMoveToCombat();
+                }
+
+                return;
+            }
+
+            // In Combat
+            if (m_uiFireballTimer < uiDiff)
+            {
+                if (Unit* pEnemy = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pEnemy, m_bIsRegularMode ? SPELL_FIREBALL_LAND : SPELL_FIREBALL_LAND_H) == CAST_OK)
+                    {
+                        m_uiFireballTimer = urand(7300, 13200);
+                    }
+                }
+            }
+            else
+            {
+                m_uiFireballTimer -= uiDiff;
+            }
+
+            if (m_uiConeOfFireTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_CONE_OF_FIRE : SPELL_CONE_OF_FIRE_H) == CAST_OK)
+                {
+                    m_uiConeOfFireTimer = urand(7300, 13200);
+                }
+            }
+            else
+            {
+                m_uiConeOfFireTimer -= uiDiff;
+            }
+
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiBellowingRoarTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BELLOW_ROAR_H) == CAST_OK)
+                    {
+                        m_uiBellowingRoarTimer = urand(8000, 12000);
+                    } // TODO Guesswork, 8s cooldown
+                }
+                else
+                {
+                    m_uiBellowingRoarTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_vazruden_heraldAI(pCreature);
+    }
+};
+
+// This is the summoned boss ("dismounted") that starts attacking the players
+struct boss_vazruden : public CreatureScript
+{
+    boss_vazruden() : CreatureScript("boss_vazruden") {}
+
+    struct boss_vazrudenAI : public ScriptedAI
+    {
+        boss_vazrudenAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiRevengeTimer;
+        bool m_bHealthBelow;
+
+        void Reset() override
+        {
+            m_bHealthBelow = false;
+            m_uiRevengeTimer = urand(5500, 8400);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VAZRUDEN, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VAZRUDEN, FAIL);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, m_creature);
+        }
+
+        void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override
+        {
+            if (!m_bHealthBelow && m_pInstance && (float(m_creature->GetHealth() - uiDamage) / m_creature->GetMaxHealth()) < 0.30f)
+            {
+                if (Creature* pNazan = m_pInstance->GetSingleCreatureFromStorage(NPC_VAZRUDEN_HERALD))
+                    SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pNazan);
+
+                m_bHealthBelow = true;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiRevengeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_REVENGE : SPELL_REVENGE_H) == CAST_OK)
+                {
+                    m_uiRevengeTimer = urand(11400, 14300);
+                }
+            }
+            else
+            {
+                m_uiRevengeTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_vazrudenAI(pCreature);
+    }
+};
+
+void AddSC_boss_nazan_and_vazruden()
+{
+    Script* s;
+
+    s = new boss_vazruden();
+    s->RegisterSelf();
+    s = new boss_vazruden_herald();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_vazruden";
+    //pNewScript->GetAI = &GetAI_boss_vazruden;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_vazruden_herald";
+    //pNewScript->GetAI = &GetAI_boss_vazruden_herald;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
new file mode 100644
index 000000000..f8ea9754e
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
@@ -0,0 +1,268 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Omar_The_Unscarred
+SD%Complete: 90
+SDComment: Temporary solution for orbital/shadow whip-ability. Needs more core support before making it more proper.
+SDCategory: Hellfire Citadel, Hellfire Ramparts
+EndScriptData */
+
+#include "precompiled.h"
+
+enum
+{
+    SAY_AGGRO_1                 = -1543009,
+    SAY_AGGRO_2                 = -1543010,
+    SAY_AGGRO_3                 = -1543011,
+    SAY_SUMMON                  = -1543012,
+    SAY_CURSE                   = -1543013,
+    SAY_KILL_1                  = -1543014,
+    SAY_DIE                     = -1543015,
+    SAY_WIPE                    = -1543016,
+
+    SPELL_ORBITAL_STRIKE        = 30637,
+    SPELL_SHADOW_WHIP           = 30638,
+    SPELL_TREACHEROUS_AURA      = 30695,
+    SPELL_BANE_OF_TREACHERY_H   = 37566,
+    SPELL_DEMONIC_SHIELD        = 31901,
+    SPELL_SHADOW_BOLT           = 30686,
+    SPELL_SHADOW_BOLT_H         = 39297,
+    SPELL_SUMMON_FIENDISH_HOUND = 30707,
+};
+
+struct boss_omor_the_unscarred : public CreatureScript
+{
+    boss_omor_the_unscarred() : CreatureScript("boss_omor_the_unscarred") {}
+
+    struct boss_omor_the_unscarredAI : public ScriptedAI
+    {
+        boss_omor_the_unscarredAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            SetCombatMovement(false);
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+
+        uint32 m_uiOrbitalStrikeTimer;
+        uint32 m_uiShadowWhipTimer;
+        uint32 m_uiAuraTimer;
+        uint32 m_uiDemonicShieldTimer;
+        uint32 m_uiShadowboltTimer;
+        uint32 m_uiSummonTimer;
+        ObjectGuid m_playerGuid;
+        bool m_bCanPullBack;
+
+        void Reset() override
+        {
+            DoScriptText(SAY_WIPE, m_creature);
+
+            m_uiOrbitalStrikeTimer = 25000;
+            m_uiShadowWhipTimer = 2000;
+            m_uiAuraTimer = urand(12300, 23300);
+            m_uiDemonicShieldTimer = 1000;
+            m_uiShadowboltTimer = urand(6600, 8900);
+            m_uiSummonTimer = urand(19600, 23100);
+            m_playerGuid.Clear();
+            m_bCanPullBack = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            if (urand(0, 1))
+            {
+                return;
+            }
+
+            DoScriptText(SAY_KILL_1, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            DoScriptText(SAY_SUMMON, m_creature);
+
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DIE, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiSummonTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_FIENDISH_HOUND) == CAST_OK)
+                {
+                    m_uiSummonTimer = urand(24100, 26900);
+                }
+            }
+            else
+            {
+                m_uiSummonTimer -= uiDiff;
+            }
+
+            if (m_bCanPullBack)
+            {
+                if (m_uiShadowWhipTimer < uiDiff)
+                {
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                    {
+                        // if unit dosen't have this flag, then no pulling back (script will attempt cast, even if orbital strike was resisted)
+                        if (pPlayer->HasMovementFlag(MOVEFLAG_FALLING))
+                        {
+                            DoCastSpellIfCan(pPlayer, SPELL_SHADOW_WHIP, CAST_INTERRUPT_PREVIOUS);
+                        }
+                    }
+                    m_playerGuid.Clear();
+                    m_uiShadowWhipTimer = 2000;
+                    m_bCanPullBack = false;
+                }
+                else
+                {
+                    m_uiShadowWhipTimer -= uiDiff;
+                }
+            }
+            else if (m_uiOrbitalStrikeTimer < uiDiff)
+            {
+                Unit* pTemp = NULL;
+                if (m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+                {
+                    pTemp = m_creature->getVictim();
+                }
+                else
+                {
+                    pTemp = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0);
+                }
+
+                if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER)
+                {
+                    if (DoCastSpellIfCan(pTemp, SPELL_ORBITAL_STRIKE) == CAST_OK)
+                    {
+                        m_uiOrbitalStrikeTimer = urand(14000, 16000);
+                        m_playerGuid = pTemp->GetObjectGuid();
+
+                        m_bCanPullBack = true;
+                    }
+                }
+            }
+            else
+            {
+                m_uiOrbitalStrikeTimer -= uiDiff;
+            }
+
+            if (m_creature->GetHealthPercent() < 20.0f)
+            {
+                if (m_uiDemonicShieldTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DEMONIC_SHIELD) == CAST_OK)
+                    {
+                        m_uiDemonicShieldTimer = 15000;
+                    }
+                }
+                else
+                {
+                    m_uiDemonicShieldTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiAuraTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_TREACHEROUS_AURA : SPELL_BANE_OF_TREACHERY_H) == CAST_OK)
+                    {
+                        m_uiAuraTimer = urand(8000, 16000);
+                        DoScriptText(SAY_CURSE, m_creature);
+                    }
+                }
+            }
+            else
+            {
+                m_uiAuraTimer -= uiDiff;
+            }
+
+            if (m_uiShadowboltTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_SHADOW_BOLT : SPELL_SHADOW_BOLT_H) == CAST_OK)
+                    {
+                        m_uiShadowboltTimer = urand(4200, 7300);
+                    }
+                }
+                else
+                {
+                    m_uiShadowboltTimer = 2000;
+                }
+            }
+            else
+            {
+                m_uiShadowboltTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_omor_the_unscarredAI(pCreature);
+    }
+};
+
+void AddSC_boss_omor_the_unscarred()
+{
+    Script* s;
+
+    s = new boss_omor_the_unscarred();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_omor_the_unscarred";
+    //pNewScript->GetAI = &GetAI_boss_omor_the_unscarredAI;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
new file mode 100644
index 000000000..fe96150ef
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
@@ -0,0 +1,210 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Watchkeeper_Gargolmar
+SD%Complete: 80
+SDComment: Missing adds to heal him. Surge should be used on pTarget furthest away, not random.
+SDCategory: Hellfire Citadel, Hellfire Ramparts
+EndScriptData */
+
+#include "precompiled.h"
+
+enum
+{
+    SAY_TAUNT                   = -1543000,
+    SAY_HEAL                    = -1543001,
+    SAY_SURGE                   = -1543002,
+    SAY_AGGRO_1                 = -1543003,
+    SAY_AGGRO_2                 = -1543004,
+    SAY_AGGRO_3                 = -1543005,
+    SAY_KILL_1                  = -1543006,
+    SAY_KILL_2                  = -1543007,
+    SAY_DIE                     = -1543008,
+
+    SPELL_MORTAL_WOUND          = 30641,
+    SPELL_MORTAL_WOUND_H        = 36814,
+    SPELL_SURGE                 = 34645,
+    SPELL_RETALIATION           = 22857,
+    SPELL_OVERPOWER             = 32154,
+};
+
+struct boss_watchkeeper_gargolmar : public CreatureScript
+{
+    boss_watchkeeper_gargolmar() : CreatureScript("boss_watchkeeper_gargolmar") {}
+
+    struct boss_watchkeeper_gargolmarAI : public ScriptedAI
+    {
+        boss_watchkeeper_gargolmarAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+
+        uint32 m_uiSurgeTimer;
+        uint32 m_uiMortalWoundTimer;
+        uint32 m_uiRetaliationTimer;
+        uint32 m_uiOverpowerTimer;
+
+        bool m_bHasTaunted;
+        bool m_bYelledForHeal;
+
+        void Reset() override
+        {
+            m_uiSurgeTimer = urand(2400, 6100);
+            m_uiMortalWoundTimer = urand(3500, 14400);
+            m_uiRetaliationTimer = 0;
+            m_uiOverpowerTimer = urand(3600, 14800);
+
+            m_bHasTaunted = false;
+            m_bYelledForHeal = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasTaunted && m_creature->IsWithinDistInMap(pWho, 60.0f))
+            {
+                DoScriptText(SAY_TAUNT, m_creature);
+                m_bHasTaunted = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL_1 : SAY_KILL_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DIE, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiMortalWoundTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_MORTAL_WOUND : SPELL_MORTAL_WOUND_H) == CAST_OK)
+                {
+                    m_uiMortalWoundTimer = urand(6100, 12200);
+                }
+            }
+            else
+            {
+                m_uiMortalWoundTimer -= uiDiff;
+            }
+
+            if (m_uiSurgeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SURGE) == CAST_OK)
+                    {
+                        DoScriptText(SAY_SURGE, m_creature);
+                        m_uiSurgeTimer = urand(12100, 21700);
+                    }
+                }
+            }
+            else
+            {
+                m_uiSurgeTimer -= uiDiff;
+            }
+
+            if (m_creature->GetHealthPercent() < 20.0f)
+            {
+                if (m_uiRetaliationTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_RETALIATION) == CAST_OK)
+                    {
+                        m_uiRetaliationTimer = 30000;
+                    }
+                }
+                else
+                {
+                    m_uiRetaliationTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiOverpowerTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_OVERPOWER) == CAST_OK)
+                {
+                    m_uiOverpowerTimer = urand(18100, 33700);
+                }
+            }
+            else
+            {
+                m_uiOverpowerTimer -= uiDiff;
+            }
+
+            if (!m_bYelledForHeal)
+            {
+                if (m_creature->GetHealthPercent() < 40.0f)
+                {
+                    DoScriptText(SAY_HEAL, m_creature);
+                    m_bYelledForHeal = true;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_watchkeeper_gargolmarAI(pCreature);
+    }
+};
+
+void AddSC_boss_watchkeeper_gargolmar()
+{
+    Script* s;
+
+    s = new boss_watchkeeper_gargolmar();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_watchkeeper_gargolmar";
+    //pNewScript->GetAI = &GetAI_boss_watchkeeper_gargolmarAI;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h b/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h
new file mode 100644
index 000000000..8c147d893
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h
@@ -0,0 +1,45 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_RAMPARTS_H
+#define DEF_RAMPARTS_H
+
+enum
+{
+    MAX_ENCOUNTER               = 2,
+
+    TYPE_VAZRUDEN               = 1,
+    TYPE_NAZAN                  = 2,                        // Do not change, used in ACID (SetData(SPECIAL) on death of 17517
+
+    NPC_HELLFIRE_SENTRY         = 17517,
+    NPC_VAZRUDEN_HERALD         = 17307,
+    NPC_VAZRUDEN                = 17537,
+
+    GO_FEL_IRON_CHEST           = 185168,
+    GO_FEL_IRON_CHEST_H         = 185169,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp b/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
new file mode 100644
index 000000000..5f6d29804
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
@@ -0,0 +1,212 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Hellfire_Ramparts
+SD%Complete: 50
+SDComment:
+SDCategory: Hellfire Ramparts
+EndScriptData */
+
+#include "precompiled.h"
+#include "hellfire_ramparts.h"
+
+struct is_ramparts : public InstanceScript
+{
+    is_ramparts() : InstanceScript("instance_ramparts") {}
+
+    class instance_ramparts : public ScriptedInstance
+    {
+    public:
+        instance_ramparts(Map* pMap) : ScriptedInstance(pMap),
+            m_uiSentryCounter(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_VAZRUDEN_HERALD:
+            case NPC_VAZRUDEN:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_HELLFIRE_SENTRY:
+                m_lSentryGUIDs.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_FEL_IRON_CHEST:
+            case GO_FEL_IRON_CHEST_H:
+                m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            debug_log("SD3: Instance Ramparts: SetData received for type %u with data %u", uiType, uiData);
+
+            switch (uiType)
+            {
+            case TYPE_VAZRUDEN:
+                if (m_auiEncounter[0] == uiData)
+                {
+                    return;
+                }
+                if (uiData == DONE && m_auiEncounter[1] == DONE)
+                {
+                    DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_FEL_IRON_CHEST : GO_FEL_IRON_CHEST_H, HOUR);
+                }
+                if (uiData == FAIL && m_auiEncounter[0] != FAIL)
+                {
+                    DoFailVazruden();
+                }
+                m_auiEncounter[0] = uiData;
+                break;
+            case TYPE_NAZAN:
+                if (m_auiEncounter[1] == uiData)
+                {
+                    return;
+                }
+                if (uiData == SPECIAL)                          // SPECIAL set via ACID
+                {
+                    ++m_uiSentryCounter;
+
+                    if (m_uiSentryCounter == 2)
+                    {
+                        m_auiEncounter[1] = uiData;
+                    }
+
+                    return;
+                }
+                if (uiData == DONE && m_auiEncounter[0] == DONE)
+                {
+                    DoRespawnGameObject(instance->IsRegularDifficulty() ? GO_FEL_IRON_CHEST : GO_FEL_IRON_CHEST_H, HOUR);
+                    DoToggleGameObjectFlags(instance->IsRegularDifficulty() ? GO_FEL_IRON_CHEST : GO_FEL_IRON_CHEST_H, GO_FLAG_NO_INTERACT, false);
+                }
+                if (uiData == FAIL && m_auiEncounter[1] != FAIL)
+                {
+                    DoFailVazruden();
+                }
+
+                m_auiEncounter[1] = uiData;
+                break;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType == TYPE_VAZRUDEN)
+            {
+                return m_auiEncounter[0];
+            }
+
+            if (uiType == TYPE_NAZAN)
+            {
+                return m_auiEncounter[1];
+            }
+
+            return 0;
+        }
+
+        // No need to save and load this instance (only one encounter needs special handling, no doors used)
+
+    private:
+        void DoFailVazruden()
+        {
+            // Store FAIL for both types
+            m_auiEncounter[0] = FAIL;
+            m_auiEncounter[1] = FAIL;
+
+            // Restore Sentries (counter and respawn them)
+            m_uiSentryCounter = 0;
+            for (GuidList::const_iterator itr = m_lSentryGUIDs.begin(); itr != m_lSentryGUIDs.end(); ++itr)
+            {
+                if (Creature* pSentry = instance->GetCreature(*itr))
+                {
+                    pSentry->Respawn();
+                }
+            }
+
+            // Respawn or Reset Vazruden the herald
+            if (Creature* pVazruden = GetSingleCreatureFromStorage(NPC_VAZRUDEN_HERALD))
+            {
+                if (!pVazruden->IsAlive())
+                {
+                    pVazruden->Respawn();
+                }
+                else
+                {
+                    if (ScriptedAI* pVazrudenAI = dynamic_cast<ScriptedAI*>(pVazruden->AI()))
+                    {
+                        pVazrudenAI->EnterEvadeMode();
+                    }
+                }
+            }
+
+            // Despawn Vazruden
+            if (Creature* pVazruden = GetSingleCreatureFromStorage(NPC_VAZRUDEN))
+            {
+                pVazruden->ForcedDespawn();
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+
+        uint32 m_uiSentryCounter;
+        GuidList m_lSentryGUIDs;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_ramparts(pMap);
+    }
+};
+
+void AddSC_instance_ramparts()
+{
+    Script* s;
+
+    s = new is_ramparts();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_ramparts";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_ramparts;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/modules/SD3/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
new file mode 100644
index 000000000..f60d98c66
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
@@ -0,0 +1,721 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Magtheridon
+SD%Complete: 80
+SDComment: Phase 3 transition requires additional research. The Manticron cubes require additional core support. Timers need to be revised.
+SDCategory: Hellfire Citadel, Magtheridon's lair
+EndScriptData */
+
+#include "precompiled.h"
+#include "magtheridons_lair.h"
+
+enum
+{
+    // yells
+    SAY_AGGRO_1                 = -1544006,
+    SAY_AGGRO_2                 = -1544007,
+    SAY_BANISH                  = -1544008,
+    SAY_CHAMBER_DESTROY         = -1544009,
+    SAY_PLAYER_KILLED           = -1544010,
+    SAY_DEATH                   = -1544011,
+
+    EMOTE_GENERIC_ENRAGED       = -1000003,
+    EMOTE_BLASTNOVA             = -1544013,
+    EMOTE_FREED                 = -1544015,
+
+    // Maghteridon spells
+    SPELL_SHADOW_CAGE_DUMMY     = 30205,                    // dummy aura - in creature_template_addon
+    SPELL_BLASTNOVA             = 30616,
+    SPELL_CLEAVE                = 30619,
+    // SPELL_QUAKE               = 30657,                   // spell may be related but probably used in the recent versions of the script
+    // SPELL_QUAKE_TRIGGER       = 30576,                   // spell removed from DBC - triggers 30571
+    SPELL_QUAKE_KNOCKBACK       = 30571,
+    SPELL_BLAZE                 = 30541,                    // triggers 30542
+    SPELL_BERSERK               = 27680,
+
+    // phase 3 spells
+    SPELL_CAMERA_SHAKE          = 36455,
+    SPELL_DEBRIS_KNOCKDOWN      = 36449,
+    SPELL_QUAKE_EFFECT          = 30572,                    // sets the debris during phase 3 - triggers 30632
+    SPELL_DEBRIS_DAMAGE         = 30631,
+    SPELL_DEBRIS_VISUAL         = 30632,
+
+    // Cube spells
+    SPELL_SHADOW_CAGE           = 30168,
+    SPELL_SHADOW_GRASP_VISUAL   = 30166,
+    SPELL_SHADOW_GRASP          = 30410,
+    SPELL_MIND_EXHAUSTION       = 44032,
+
+    // Hellfire channeler spells
+    SPELL_SHADOW_GRASP_DUMMY    = 30207,                    // dummy spell - cast on OOC timer
+    SPELL_SHADOW_BOLT_VOLLEY    = 30510,
+    SPELL_DARK_MENDING          = 30528,
+    SPELL_FEAR                  = 30530,                    // 39176
+    SPELL_BURNING_ABYSSAL       = 30511,
+    SPELL_SOUL_TRANSFER         = 30531,
+
+    // Abyss spells
+    SPELL_FIRE_BLAST            = 37110,
+
+    // summons
+    // NPC_MAGS_ROOM             = 17516,
+    NPC_BURNING_ABYSS           = 17454,
+    NPC_RAID_TRIGGER            = 17376,
+
+    MAX_QUAKE_COUNT             = 7,
+};
+
+/*######
+## boss_magtheridon
+######*/
+
+struct boss_magtheridon : public CreatureScript
+{
+    boss_magtheridon() : CreatureScript("boss_magtheridon") {}
+
+    struct boss_magtheridonAI : public ScriptedAI
+    {
+        boss_magtheridonAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiBerserkTimer;
+        uint32 m_uiQuakeTimer;
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiBlastNovaTimer;
+        uint32 m_uiBlazeTimer;
+        uint32 m_uiDebrisTimer;
+        uint32 m_uiTransitionTimer;
+        uint8 m_uiTransitionCount;
+        uint8 m_uiQuakeCount;
+
+        bool m_bIsPhase3;
+
+        void Reset() override
+        {
+            m_uiBerserkTimer = 20 * MINUTE * IN_MILLISECONDS;
+            m_uiQuakeTimer = 30000;
+            m_uiBlazeTimer = urand(10000, 15000);
+            m_uiBlastNovaTimer = 60000;
+            m_uiCleaveTimer = 15000;
+            m_uiTransitionTimer = 0;
+            m_uiTransitionCount = 0;
+            m_uiDebrisTimer = urand(20000, 30000);
+
+            m_bIsPhase3 = false;
+
+            SetCombatMovement(true);
+
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(EMOTE_FREED, m_creature);
+            DoScriptText(urand(0, 1) ? SAY_AGGRO_1 : SAY_AGGRO_2, m_creature);
+
+            m_creature->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE_DUMMY);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_PLAYER_KILLED, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAGTHERIDON_EVENT, DONE);
+            }
+
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_MAGTHERIDON_EVENT, FAIL);
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            // When banished by the cubes
+            if (pSpell->Id == SPELL_SHADOW_CAGE)
+            {
+                DoScriptText(SAY_BANISH, m_creature);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        DoScriptText(EMOTE_GENERIC_ENRAGED, m_creature);
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            // Transition to phase 3
+            if (m_uiTransitionTimer)
+            {
+                if (m_uiTransitionTimer <= uiDiff)
+                {
+                    switch (m_uiTransitionCount)
+                    {
+                    case 0:
+                        // Shake the room
+                        if (DoCastSpellIfCan(m_creature, SPELL_CAMERA_SHAKE) == CAST_OK)
+                        {
+                            if (m_pInstance)
+                            {
+                                m_pInstance->SetData(TYPE_MAGTHERIDON_EVENT, SPECIAL);
+                            }
+
+                            m_uiTransitionTimer = 8000;
+                        }
+                        break;
+                    case 1:
+                        if (DoCastSpellIfCan(m_creature, SPELL_DEBRIS_KNOCKDOWN) == CAST_OK)
+                        {
+                            m_uiTransitionTimer = 0;
+                        }
+                        break;
+                    }
+
+                    ++m_uiTransitionCount;
+                }
+                else
+                {
+                    m_uiTransitionTimer -= uiDiff;
+                }
+
+                // Workaround for missing spell: no other spells during transition
+                if (!m_uiTransitionCount)
+                {
+                    return;
+                }
+            }
+
+            if (m_uiQuakeTimer < uiDiff)
+            {
+                // Workaround for missing spell
+                // Note: this won't really stun the boss, but it won't allow him to use other spells
+                if (!m_uiQuakeCount)
+                {
+                    SetCombatMovement(false);
+                    m_creature->GetMotionMaster()->Clear();
+                    m_creature->GetMotionMaster()->MoveIdle();
+                }
+
+                if (m_uiQuakeCount < MAX_QUAKE_COUNT)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_QUAKE_KNOCKBACK) == CAST_OK)
+                    {
+                        m_uiQuakeTimer = 1000;
+                        ++m_uiQuakeCount;
+                    }
+                }
+                else
+                {
+                    SetCombatMovement(true);
+                    m_creature->GetMotionMaster()->Clear();
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+
+                    m_uiQuakeTimer = 43000;
+                    m_uiQuakeCount = 0;
+                }
+            }
+            else
+            {
+                m_uiQuakeTimer -= uiDiff;
+            }
+
+            // don't use other spells during quake
+            if (m_uiQuakeCount)
+            {
+                return;
+            }
+
+            if (m_uiCleaveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE) == CAST_OK)
+                {
+                    m_uiCleaveTimer = 10000;
+                }
+            }
+            else
+            {
+                m_uiCleaveTimer -= uiDiff;
+            }
+
+            if (m_uiBlastNovaTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BLASTNOVA) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_BLASTNOVA, m_creature);
+                    m_uiBlastNovaTimer = 60000;
+                }
+            }
+            else
+            {
+                m_uiBlastNovaTimer -= uiDiff;
+            }
+
+            if (m_uiBlazeTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BLAZE) == CAST_OK)
+                {
+                    m_uiBlazeTimer = urand(10000, 15000);
+                }
+            }
+            else
+            {
+                m_uiBlazeTimer -= uiDiff;
+            }
+
+            // Transition to phase 3
+            if (!m_bIsPhase3 && m_creature->GetHealthPercent() < 30.0f)
+            {
+                // ToDo: maybe there is a spell here - requires additional research
+                DoScriptText(SAY_CHAMBER_DESTROY, m_creature);
+                m_uiTransitionTimer = 5000;
+                m_bIsPhase3 = true;
+            }
+
+            // Debris fall in phase 3
+            if (m_bIsPhase3)
+            {
+                if (m_uiDebrisTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_QUAKE_EFFECT) == CAST_OK)
+                    {
+                        m_uiDebrisTimer = urand(20000, 30000);
+                    }
+                }
+                else
+                {
+                    m_uiDebrisTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_magtheridonAI(pCreature);
+    }
+};
+
+/*######
+## mob_hellfire_channeler
+######*/
+
+struct mob_hellfire_channeler : public CreatureScript
+{
+    mob_hellfire_channeler() : CreatureScript("mob_hellfire_channeler") {}
+
+    struct mob_hellfire_channelerAI : public ScriptedAI
+    {
+        mob_hellfire_channelerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiShadowGraspTimer;
+        uint32 m_uiShadowBoltVolleyTimer;
+        uint32 m_uiDarkMendingTimer;
+        uint32 m_uiFearTimer;
+        uint32 m_uiInfernalTimer;
+
+        void Reset() override
+        {
+            m_uiShadowGraspTimer = 10000;
+            m_uiShadowBoltVolleyTimer = urand(8000, 10000);
+            m_uiDarkMendingTimer = 10000;
+            m_uiFearTimer = urand(15000, 20000);
+            m_uiInfernalTimer = urand(10000, 50000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            m_creature->InterruptNonMeleeSpells(false);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_CHANNELER_EVENT, IN_PROGRESS);
+            }
+        }
+
+        // Don't attack on LoS check
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_SOUL_TRANSFER, CAST_TRIGGERED);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_CHANNELER_EVENT, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (m_creature->getVictim())
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        void SummonedCreatureDespawn(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_BURNING_ABYSS)
+            {
+                m_uiInfernalTimer = urand(10000, 15000);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Channel spell on Magtheridon, on OOC timer
+            if (m_uiShadowGraspTimer)
+            {
+                if (m_uiShadowGraspTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_GRASP_DUMMY) == CAST_OK)
+                    {
+                        m_uiShadowGraspTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiShadowGraspTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiShadowBoltVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SHADOW_BOLT_VOLLEY) == CAST_OK)
+                {
+                    m_uiShadowBoltVolleyTimer = urand(10000, 20000);
+                }
+            }
+            else
+            {
+                m_uiShadowBoltVolleyTimer -= uiDiff;
+            }
+
+            if (m_uiDarkMendingTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(30.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_DARK_MENDING) == CAST_OK)
+                    {
+                        m_uiDarkMendingTimer = urand(10000, 20000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiDarkMendingTimer -= uiDiff;
+            }
+
+            if (m_uiFearTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_FEAR) == CAST_OK)
+                    {
+                        m_uiFearTimer = urand(25000, 40000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiFearTimer -= uiDiff;
+            }
+
+            if (m_uiInfernalTimer)
+            {
+                if (m_uiInfernalTimer <= uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_BURNING_ABYSSAL) == CAST_OK)
+                        {
+                            m_uiInfernalTimer = 0;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiInfernalTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_hellfire_channelerAI(pCreature);
+    }
+};
+
+/*######
+## go_manticron_cube
+######*/
+
+struct go_manticron_cube : public GameObjectScript
+{
+    go_manticron_cube() : GameObjectScript("go_manticron_cube") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        // if exhausted or already channeling return
+        if (pPlayer->HasAura(SPELL_MIND_EXHAUSTION) || pPlayer->HasAura(SPELL_SHADOW_GRASP))
+        {
+            return true;
+        }
+
+        if (ScriptedInstance* pInstance = (ScriptedInstance*)pGo->GetInstanceData())
+        {
+            if (pInstance->GetData(TYPE_MAGTHERIDON_EVENT) != IN_PROGRESS)
+            {
+                return true;
+            }
+
+            if (Creature* pMagtheridon = pInstance->GetSingleCreatureFromStorage(NPC_MAGTHERIDON))
+            {
+                if (!pMagtheridon->IsAlive())
+                {
+                    return true;
+                }
+
+                // visual is cast by cube
+                if (Creature* pTrigger = GetClosestCreatureWithEntry(pGo, NPC_RAID_TRIGGER, 5.0f))
+                {
+                    pTrigger->CastSpell(pTrigger, SPELL_SHADOW_GRASP_VISUAL, false);
+                }
+
+                // the real spell is cast by player
+                pPlayer->CastSpell(pPlayer, SPELL_SHADOW_GRASP, false, NULL, NULL, pGo->GetObjectGuid());
+            }
+        }
+
+        return true;
+    }
+};
+
+// TODO Remove this 'script' when combat and persistent area auras can be proper prevented from core-side
+struct npc_target_trigger : public CreatureScript
+{
+    npc_target_trigger() : CreatureScript("npc_target_trigger") {}
+
+    struct npc_target_triggerAI : public Scripted_NoMovementAI
+    {
+        npc_target_triggerAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        uint32 m_uiDebrisTimer;
+
+        void Reset() override
+        {
+            m_uiDebrisTimer = 0;
+        }
+
+        void AttackStart(Unit* /*pWho*/) override {}
+        void MoveInLineOfSight(Unit* /*pWho*/) override {}
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            // Workaround for missing core support for this type of dummy aura
+            if (pSpell->Id == SPELL_QUAKE_EFFECT)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DEBRIS_VISUAL) == CAST_OK)
+                {
+                    m_uiDebrisTimer = 5000;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Cast debris damage after 5 seconds (on visual removal)
+            if (m_uiDebrisTimer)
+            {
+                if (m_uiDebrisTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DEBRIS_DAMAGE) == CAST_OK)
+                    {
+                        m_uiDebrisTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiDebrisTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_target_triggerAI(pCreature);
+    }
+};
+
+// ToDo: move this script to eventAI
+struct mob_abyssal : public CreatureScript
+{
+    mob_abyssal() : CreatureScript("mob_abyssal") {}
+
+    struct mob_abyssalAI : public ScriptedAI
+    {
+        mob_abyssalAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiFireBlastTimer;
+        uint32 m_uiDespawnTimer;
+
+        void Reset() override
+        {
+            m_uiDespawnTimer = 60000;
+            m_uiFireBlastTimer = 6000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiDespawnTimer < uiDiff)
+            {
+                m_creature->ForcedDespawn();
+                m_uiDespawnTimer = 10000;
+            }
+            else
+            {
+                m_uiDespawnTimer -= uiDiff;
+            }
+
+            if (m_uiFireBlastTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FIRE_BLAST) == CAST_OK)
+                {
+                    m_uiFireBlastTimer = urand(5000, 15000);
+                }
+            }
+            else
+            {
+                m_uiFireBlastTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_abyssalAI(pCreature);
+    }
+};
+
+void AddSC_boss_magtheridon()
+{
+    Script* s;
+
+    s = new boss_magtheridon();
+    s->RegisterSelf();
+    s = new mob_hellfire_channeler();
+    s->RegisterSelf();
+    s = new go_manticron_cube();
+    s->RegisterSelf();
+    s = new npc_target_trigger();
+    s->RegisterSelf();
+    s = new mob_abyssal();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_magtheridon";
+    //pNewScript->GetAI = &GetAI_boss_magtheridon;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_hellfire_channeler";
+    //pNewScript->GetAI = &GetAI_mob_hellfire_channeler;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_manticron_cube";
+    //pNewScript->pGOUse = &GOUse_go_manticron_cube;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_target_trigger";
+    //pNewScript->GetAI = &GetAI_npc_target_triggerAI;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_abyssal";
+    //pNewScript->GetAI = &GetAI_mob_abyssalAI;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/modules/SD3/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
new file mode 100644
index 000000000..2ac8d55e3
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
@@ -0,0 +1,320 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Magtheridons_Lair
+SD%Complete: 100
+SDComment:
+SDCategory: Hellfire Citadel, Magtheridon's lair
+EndScriptData */
+
+#include "precompiled.h"
+#include "magtheridons_lair.h"
+
+static const int32 aRandomTaunt[] = { -1544000, -1544001, -1544002, -1544003, -1544004, -1544005 };
+
+struct is_magtheridons_lair : public InstanceScript
+{
+    is_magtheridons_lair() : InstanceScript("instance_magtheridons_lair") {}
+
+    class instance_magtheridons_lair : public ScriptedInstance
+    {
+    public:
+        instance_magtheridons_lair(Map* pMap) : ScriptedInstance(pMap),
+            m_uiRandYellTimer(90000),
+            m_uiCageBreakTimer(0),
+            m_uiCageBreakStage(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_MAGTHERIDON:
+                m_mNpcEntryGuidStore[NPC_MAGTHERIDON] = pCreature->GetObjectGuid();
+                break;
+            case NPC_CHANNELER:
+                m_lChannelerGuidList.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_DOODAD_HF_MAG_DOOR01:                       // event door
+                m_mGoEntryGuidStore[GO_DOODAD_HF_MAG_DOOR01] = pGo->GetObjectGuid();
+                break;
+            case GO_DOODAD_HF_RAID_FX01:                        // hall
+            case GO_MAGTHERIDON_COLUMN_003:                     // six columns
+            case GO_MAGTHERIDON_COLUMN_002:
+            case GO_MAGTHERIDON_COLUMN_004:
+            case GO_MAGTHERIDON_COLUMN_005:
+            case GO_MAGTHERIDON_COLUMN_000:
+            case GO_MAGTHERIDON_COLUMN_001:
+                m_lColumnGuidList.push_back(pGo->GetObjectGuid());
+                break;
+            case GO_MANTICRON_CUBE:
+                m_lCubeGuidList.push_back(pGo->GetObjectGuid());
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_MAGTHERIDON_EVENT:
+                switch (uiData)
+                {
+                case FAIL:
+                    // Reset channelers
+                    for (GuidList::const_iterator itr = m_lChannelerGuidList.begin(); itr != m_lChannelerGuidList.end(); ++itr)
+                    {
+                        if (Creature* pChanneler = instance->GetCreature(*itr))
+                        {
+                            if (!pChanneler->IsAlive())
+                            {
+                                pChanneler->Respawn();
+                            }
+                        }
+                    }
+
+                    // Reset columns
+                    for (GuidList::const_iterator itr = m_lColumnGuidList.begin(); itr != m_lColumnGuidList.end(); ++itr)
+                    {
+                        if (GameObject* pColumn = instance->GetGameObject(*itr))
+                        {
+                            pColumn->ResetDoorOrButton();
+                        }
+                    }
+
+                    // Reset cubes
+                    for (GuidList::const_iterator itr = m_lCubeGuidList.begin(); itr != m_lCubeGuidList.end(); ++itr)
+                    {
+                        DoToggleGameObjectFlags(*itr, GO_FLAG_NO_INTERACT, true);
+                    }
+
+                    // Reset timers and doors
+                    SetData(TYPE_CHANNELER_EVENT, NOT_STARTED);
+                    m_uiCageBreakTimer = 0;
+                    m_uiCageBreakStage = 0;
+
+                    // no break;
+                case DONE:
+                    // Reset door on Fail or Done
+                    if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_DOODAD_HF_MAG_DOOR01))
+                    {
+                        pDoor->ResetDoorOrButton();
+                    }
+                    break;
+                case IN_PROGRESS:
+                    // Set boss in combat
+                    if (Creature* pMagtheridon = GetSingleCreatureFromStorage(NPC_MAGTHERIDON))
+                    {
+                        if (pMagtheridon->IsAlive())
+                        {
+                            pMagtheridon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                            pMagtheridon->SetInCombatWithZone();
+                        }
+                    }
+                    // Enable cubes
+                    for (GuidList::const_iterator itr = m_lCubeGuidList.begin(); itr != m_lCubeGuidList.end(); ++itr)
+                    {
+                        DoToggleGameObjectFlags(*itr, GO_FLAG_NO_INTERACT, false);
+                    }
+                    break;
+                case SPECIAL:
+                    // Collapse the hall - don't store this value
+                    for (GuidList::const_iterator itr = m_lColumnGuidList.begin(); itr != m_lColumnGuidList.end(); ++itr)
+                    {
+                        DoUseDoorOrButton(*itr);
+                    }
+                    // return, don't set encounter as special
+                    return;
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_CHANNELER_EVENT:
+                // don't set the same data twice
+                if (m_auiEncounter[1] == uiData)
+                {
+                    break;
+                }
+                // stop the event timer on fail
+                if (uiData == FAIL)
+                {
+                    m_uiCageBreakTimer = 0;
+                    m_uiCageBreakStage = 0;
+
+                    // Reset door on Fail
+                    if (GameObject* pDoor = GetSingleGameObjectFromStorage(GO_DOODAD_HF_MAG_DOOR01))
+                    {
+                        pDoor->ResetDoorOrButton();
+                    }
+
+                    // Reset Magtheridon
+                    if (Creature* pMagtheridon = GetSingleCreatureFromStorage(NPC_MAGTHERIDON))
+                    {
+                        if (pMagtheridon->IsAlive())
+                        {
+                            pMagtheridon->AI()->EnterEvadeMode();
+                        }
+                    }
+                }
+                // prepare Magtheridon for release
+                if (uiData == IN_PROGRESS)
+                {
+                    if (Creature* pMagtheridon = GetSingleCreatureFromStorage(NPC_MAGTHERIDON))
+                    {
+                        if (pMagtheridon->IsAlive())
+                        {
+                            DoScriptText(EMOTE_EVENT_BEGIN, pMagtheridon);
+                            m_uiCageBreakTimer = MINUTE * IN_MILLISECONDS;
+                        }
+                    }
+
+                    // combat door
+                    DoUseDoorOrButton(GO_DOODAD_HF_MAG_DOOR01);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            }
+
+            // Instance save isn't needed for this one
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            // Prepare to release Magtheridon
+            if (m_uiCageBreakTimer)
+            {
+                if (m_uiCageBreakTimer <= uiDiff)
+                {
+                    switch (m_uiCageBreakStage)
+                    {
+                    case 0:
+                        if (Creature* pMagtheridon = GetSingleCreatureFromStorage(NPC_MAGTHERIDON))
+                        {
+                            if (pMagtheridon->IsAlive())
+                            {
+                                DoScriptText(EMOTE_NEARLY_FREE, pMagtheridon);
+                                m_uiCageBreakTimer = MINUTE * IN_MILLISECONDS;
+                            }
+                        }
+                        break;
+                    case 1:
+                        SetData(TYPE_MAGTHERIDON_EVENT, IN_PROGRESS);
+                        m_uiCageBreakTimer = 0;
+                        break;
+                    }
+
+                    ++m_uiCageBreakStage;
+                }
+                else
+                {
+                    m_uiCageBreakTimer -= uiDiff;
+                }
+            }
+
+            // no yell if event is in progress or finished
+            if (m_auiEncounter[TYPE_CHANNELER_EVENT] == IN_PROGRESS || m_auiEncounter[TYPE_MAGTHERIDON_EVENT] == DONE)
+            {
+                return;
+            }
+
+            if (m_uiRandYellTimer < uiDiff)
+            {
+                DoOrSimulateScriptTextForThisInstance(aRandomTaunt[urand(0, 5)], NPC_MAGTHERIDON);
+                m_uiRandYellTimer = 90000;
+            }
+            else
+            {
+                m_uiRandYellTimer -= uiDiff;
+            }
+        }
+
+    private:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+
+        GuidList m_lChannelerGuidList;
+        GuidList m_lColumnGuidList;
+        GuidList m_lCubeGuidList;
+
+        uint32 m_uiRandYellTimer;
+        uint32 m_uiCageBreakTimer;
+        uint8 m_uiCageBreakStage;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_magtheridons_lair(pMap);
+    }
+};
+
+void AddSC_instance_magtheridons_lair()
+{
+    Script* s;
+
+    s = new is_magtheridons_lair();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_magtheridons_lair";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_magtheridons_lair;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h b/src/modules/SD3/scripts/outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h
new file mode 100644
index 000000000..cf6161a1a
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h
@@ -0,0 +1,54 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_MAGTHERIDONS_LAIR_H
+#define DEF_MAGTHERIDONS_LAIR_H
+
+enum
+{
+    MAX_ENCOUNTER               = 2,
+
+    TYPE_MAGTHERIDON_EVENT      = 0,
+    TYPE_CHANNELER_EVENT        = 1,
+
+    NPC_MAGTHERIDON             = 17257,
+    NPC_CHANNELER               = 17256,
+
+    GO_MANTICRON_CUBE           = 181713,
+    GO_DOODAD_HF_MAG_DOOR01     = 183847,
+    GO_DOODAD_HF_RAID_FX01      = 184653,
+    GO_MAGTHERIDON_COLUMN_003   = 184634,
+    GO_MAGTHERIDON_COLUMN_002   = 184635,
+    GO_MAGTHERIDON_COLUMN_004   = 184636,
+    GO_MAGTHERIDON_COLUMN_005   = 184637,
+    GO_MAGTHERIDON_COLUMN_000   = 184638,
+    GO_MAGTHERIDON_COLUMN_001   = 184639,
+
+    EMOTE_EVENT_BEGIN           = -1544014,
+    EMOTE_NEARLY_FREE           = -1544016,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
new file mode 100644
index 000000000..d30a790c2
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
@@ -0,0 +1,559 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Grand_Warlock_Nethekurse
+SD%Complete: 75
+SDComment: encounter not fully completed. missing part where boss kill minions.
+SDCategory: Hellfire Citadel, Shattered Halls
+EndScriptData */
+
+/* ContentData
+boss_grand_warlock_nethekurse
+mob_fel_orc_convert
+mob_lesser_shadow_fissure
+EndContentData */
+
+#include "precompiled.h"
+#include "shattered_halls.h"
+
+struct Say
+{
+    int32 id;
+};
+
+static Say PeonAttacked[] =
+{
+    { -1540001},
+    { -1540002},
+    { -1540003},
+    { -1540004},
+};
+
+static Say PeonDies[] =
+{
+    { -1540005},
+    { -1540006},
+    { -1540007},
+    { -1540008},
+};
+
+enum
+{
+    SAY_INTRO              = -1540000,
+    SAY_TAUNT_1            = -1540009,
+    SAY_TAUNT_2            = -1540010,
+    SAY_TAUNT_3            = -1540011,
+    SAY_AGGRO_1            = -1540012,
+    SAY_AGGRO_2            = -1540013,
+    SAY_AGGRO_3            = -1540014,
+    SAY_SLAY_1             = -1540015,
+    SAY_SLAY_2             = -1540016,
+    SAY_DIE                = -1540017,
+
+    SPELL_DEATH_COIL       = 30500,
+    SPELL_DARK_SPIN        = 30502,                         // core bug spell attack caster :D
+    SPELL_SHADOW_FISSURE   = 30496,                         // Summon the ShadowFissure NPC
+
+    SPELL_SHADOW_CLEAVE    = 30495,
+    SPELL_SHADOW_SLAM_H    = 35953,
+
+    SPELL_SHADOW_SEAR      = 30735,                         // On fel orcs - not sure yet how it is used
+    SPELL_HEMORRHAGE       = 30478,
+
+    SPELL_CONSUMPTION      = 30497,                         // Cast by the shadow fissure
+
+    NPC_FEL_ORC_CONVERT    = 17083,
+};
+
+struct boss_grand_warlock_nethekurse : public CreatureScript
+{
+    boss_grand_warlock_nethekurse() : CreatureScript("boss_grand_warlock_nethekurse") {}
+
+    struct boss_grand_warlock_nethekurseAI : public ScriptedAI
+    {
+        boss_grand_warlock_nethekurseAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            m_bIntroOnce = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        bool m_bIntroOnce;
+        bool m_bIsIntroEvent;
+        bool m_bIsMainEvent;
+        bool m_bSpinOnce;
+        // bool m_bHasTaunted;
+        bool m_bPhase;
+
+        uint32 m_uiPeonEngagedCount;
+        uint32 m_uiPeonKilledCount;
+
+        uint32 m_uiIntroEventTimer;
+        uint32 m_uiDeathCoilTimer;
+        uint32 m_uiShadowFissureTimer;
+        uint32 m_uiCleaveTimer;
+
+        ObjectGuid m_lastEventInvokerGuid;
+
+        void Reset() override
+        {
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+            m_bIsIntroEvent = false;
+            m_bIsMainEvent = false;
+            // m_bHasTaunted = false;
+            m_bSpinOnce = false;
+            m_bPhase = false;
+
+            m_uiPeonEngagedCount = 0;
+            m_uiPeonKilledCount = 0;
+
+            m_uiIntroEventTimer = 90000;                        // how long before getting bored and kills his minions?
+            m_uiDeathCoilTimer = 20000;
+            m_uiShadowFissureTimer = 8000;
+            m_uiCleaveTimer = 5000;
+
+            m_lastEventInvokerGuid.Clear();
+        }
+
+        void DoYellForPeonAggro(Unit* pWho)
+        {
+            if (m_uiPeonEngagedCount >= 4)
+            {
+                return;
+            }
+
+            DoScriptText(PeonAttacked[m_uiPeonEngagedCount].id, m_creature);
+            ++m_uiPeonEngagedCount;
+
+            if (pWho)
+            {
+                m_lastEventInvokerGuid = pWho->GetObjectGuid();
+            }
+        }
+
+        void DoYellForPeonDeath(Unit* pKiller)
+        {
+            if (m_uiPeonKilledCount >= 4)
+            {
+                return;
+            }
+
+            DoScriptText(PeonDies[m_uiPeonKilledCount].id, m_creature);
+            ++m_uiPeonKilledCount;
+
+            if (m_uiPeonKilledCount == 4)
+            {
+                m_bIsIntroEvent = false;
+                m_bIsMainEvent = true;
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+                if (pKiller)
+                {
+                    AttackStart(pKiller);
+                }
+            }
+        }
+
+        void DoTauntPeons()
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_TAUNT_1, m_creature); break;
+            case 1: DoScriptText(SAY_TAUNT_2, m_creature); break;
+            case 2: DoScriptText(SAY_TAUNT_3, m_creature); break;
+            }
+
+            std::list<Creature*> lFelConverts;
+            GetCreatureListWithEntryInGrid(lFelConverts, m_creature, NPC_FEL_ORC_CONVERT, 40.0f);
+            for (std::list<Creature*>::iterator itr = lFelConverts.begin(); itr != lFelConverts.end(); ++itr)
+            {
+                (*itr)->DealDamage(*itr, (*itr)->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+            }
+
+            m_bIsIntroEvent = false;
+            m_uiPeonEngagedCount = 4;
+            m_uiPeonKilledCount = 4;
+            m_bIsMainEvent = true;
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+            if (Unit* pEnemy = m_creature->GetMap()->GetUnit(m_lastEventInvokerGuid))
+            {
+                AttackStart(pEnemy);
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_bIsIntroEvent || !m_bIsMainEvent)
+            {
+                return;
+            }
+
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+
+                if (m_bPhase)
+                {
+                    DoStartNoMovement(pWho);
+                }
+                else
+                {
+                    DoStartMovement(pWho);
+                }
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bIntroOnce && pWho->GetTypeId() == TYPEID_PLAYER && !((Player*)pWho)->isGameMaster() && m_creature->IsWithinDistInMap(pWho, 50.0f) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                DoScriptText(SAY_INTRO, m_creature);
+                m_bIntroOnce = true;
+                m_bIsIntroEvent = true;
+
+                m_lastEventInvokerGuid = pWho->GetObjectGuid();
+
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_NETHEKURSE, IN_PROGRESS);
+                }
+            }
+
+            if (m_bIsIntroEvent || !m_bIsMainEvent)
+            {
+                return;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO_1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO_2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // ToDo: this should be done in DB
+            pSummoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+            pSummoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+            pSummoned->CastSpell(pSummoned, SPELL_CONSUMPTION, false, NULL, NULL, m_creature->GetObjectGuid());
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DIE, m_creature);
+
+            if (!m_pInstance)
+            {
+                return;
+            }
+
+            m_pInstance->SetData(TYPE_NETHEKURSE, DONE);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_NETHEKURSE, FAIL);
+            }
+
+            std::list<Creature*> lFelConverts;
+            GetCreatureListWithEntryInGrid(lFelConverts, m_creature, NPC_FEL_ORC_CONVERT, 40.0f);
+            for (std::list<Creature*>::iterator itr = lFelConverts.begin(); itr != lFelConverts.end(); ++itr)
+            {
+                if (!(*itr)->IsAlive())
+                {
+                    (*itr)->Respawn();
+                }
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit *pInvoker, uint32 /*data*/) override
+        {
+            if (pSender->GetEntry() == NPC_FEL_ORC_CONVERT)
+            {
+                switch (eventType)
+                {
+                case AI_EVENT_CUSTOM_A:
+                    DoYellForPeonAggro(pInvoker);
+                    break;
+                case AI_EVENT_CUSTOM_B:
+                    DoYellForPeonDeath(pInvoker);
+                    break;
+                default:
+                    break;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_bIsIntroEvent)
+            {
+                if (!m_pInstance)
+                {
+                    return;
+                }
+
+                if (m_pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS)
+                {
+                    if (m_uiIntroEventTimer < uiDiff)
+                    {
+                        DoTauntPeons();
+                    }
+                    else
+                    {
+                        m_uiIntroEventTimer -= uiDiff;
+                    }
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (!m_bIsMainEvent)
+            {
+                return;
+            }
+
+            if (m_bPhase)
+            {
+                if (!m_bSpinOnce)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_DARK_SPIN);
+                    m_bSpinOnce = true;
+                }
+
+                if (m_uiCleaveTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_SHADOW_CLEAVE : SPELL_SHADOW_SLAM_H);
+                    m_uiCleaveTimer = urand(6000, 8500);
+                }
+                else
+                {
+                    m_uiCleaveTimer -= uiDiff;
+                }
+            }
+            else
+            {
+                if (m_uiShadowFissureTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        DoCastSpellIfCan(pTarget, SPELL_SHADOW_FISSURE);
+                    }
+                    m_uiShadowFissureTimer = urand(7500, 15000);
+                }
+                else
+                {
+                    m_uiShadowFissureTimer -= uiDiff;
+                }
+
+                if (m_uiDeathCoilTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        DoCastSpellIfCan(pTarget, SPELL_DEATH_COIL);
+                    }
+                    m_uiDeathCoilTimer = urand(15000, 20000);
+                }
+                else
+                {
+                    m_uiDeathCoilTimer -= uiDiff;
+                }
+
+                if (m_creature->GetHealthPercent() <= 20.0f)
+                {
+                    m_bPhase = true;
+                }
+
+                DoMeleeAttackIfReady();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_grand_warlock_nethekurseAI(pCreature);
+    }
+};
+
+struct mob_fel_orc_convert : public CreatureScript
+{
+    mob_fel_orc_convert() : CreatureScript("mob_fel_orc_convert") {}
+
+    struct mob_fel_orc_convertAI : public ScriptedAI
+    {
+        mob_fel_orc_convertAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+        uint32 m_uiHemorrhageTimer;
+
+        void Reset() override
+        {
+            m_creature->SetNoCallAssistance(true);              // we don't want any assistance (WE R HEROZ!)
+            m_uiHemorrhageTimer = 3000;
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override
+        {
+            return;
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (m_pInstance)
+            {
+                Creature* pKurse = m_pInstance->GetSingleCreatureFromStorage(NPC_NETHEKURSE);
+                if (pKurse && m_creature->IsWithinDist(pKurse, 45.0f))
+                {
+                    SendAIEvent(AI_EVENT_CUSTOM_A, pWho, pKurse);
+
+                    if (m_pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        m_pInstance->SetData(TYPE_NETHEKURSE, IN_PROGRESS);
+                    }
+                }
+            }
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            if (m_pInstance)
+            {
+                if (m_pInstance->GetData(TYPE_NETHEKURSE) != IN_PROGRESS)
+                {
+                    return;
+                }
+                if (Creature* pKurse = m_pInstance->GetSingleCreatureFromStorage(NPC_NETHEKURSE))
+                {
+                    SendAIEvent(AI_EVENT_CUSTOM_B, pKiller, pKurse);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiHemorrhageTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_HEMORRHAGE);
+                m_uiHemorrhageTimer = 15000;
+            }
+            else
+            {
+                m_uiHemorrhageTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_fel_orc_convertAI(pCreature);
+    }
+};
+
+// NOTE: this creature are also summoned by other spells, for different creatures
+struct mob_lesser_shadow_fissure : public CreatureScript
+{
+    mob_lesser_shadow_fissure() : CreatureScript("mob_lesser_shadow_fissure") {}
+
+    struct mob_lesser_shadow_fissureAI : public Scripted_NoMovementAI
+    {
+        mob_lesser_shadow_fissureAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_lesser_shadow_fissureAI(pCreature);
+    }
+};
+
+void AddSC_boss_grand_warlock_nethekurse()
+{
+    Script* s;
+
+    s = new boss_grand_warlock_nethekurse();
+    s->RegisterSelf();
+    s = new mob_fel_orc_convert();
+    s->RegisterSelf();
+    s = new mob_lesser_shadow_fissure();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_grand_warlock_nethekurse";
+    //pNewScript->GetAI = &GetAI_boss_grand_warlock_nethekurse;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_fel_orc_convert";
+    //pNewScript->GetAI = &GetAI_mob_fel_orc_convert;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_lesser_shadow_fissure";
+    //pNewScript->GetAI = &GetAI_mob_lesser_shadow_fissure;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
new file mode 100644
index 000000000..6f8572c93
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
@@ -0,0 +1,491 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Warbringer_Omrogg
+SD%Complete: 85
+SDComment: Heroic enabled. Spell timing may need additional tweaks
+SDCategory: Hellfire Citadel, Shattered Halls
+EndScriptData */
+
+/* ContentData
+mob_omrogg_heads
+boss_warbringer_omrogg
+EndContentData */
+
+#include "precompiled.h"
+#include "shattered_halls.h"
+
+enum
+{
+    YELL_DIE_L                  = -1540039,
+    YELL_DIE_R                  = -1540040,
+    EMOTE_ENRAGE                = -1540041,
+
+    SPELL_BLAST_WAVE            = 30600,
+    SPELL_FEAR                  = 30584,
+    SPELL_THUNDERCLAP           = 30633,
+
+    SPELL_BURNING_MAUL          = 30598,
+    SPELL_BURNING_MAUL_H        = 36056,
+
+    NPC_LEFT_HEAD               = 19523,
+    NPC_RIGHT_HEAD              = 19524
+};
+
+struct Yell
+{
+    int32 id;
+    uint32 creature;
+};
+
+static Yell GoCombat[] =
+{
+    { -1540018, NPC_LEFT_HEAD},
+    { -1540019, NPC_LEFT_HEAD},
+    { -1540020, NPC_LEFT_HEAD},
+};
+static Yell GoCombatDelay[] =
+{
+    { -1540021, NPC_RIGHT_HEAD},
+    { -1540022, NPC_RIGHT_HEAD},
+    { -1540023, NPC_RIGHT_HEAD},
+};
+
+static Yell Threat[] =
+{
+    { -1540024, NPC_LEFT_HEAD},
+    { -1540025, NPC_RIGHT_HEAD},
+    { -1540026, NPC_LEFT_HEAD},
+    { -1540027, NPC_LEFT_HEAD},
+};
+static Yell ThreatDelay1[] =
+{
+    { -1540028, NPC_RIGHT_HEAD},
+    { -1540029, NPC_LEFT_HEAD},
+    { -1540030, NPC_RIGHT_HEAD},
+    { -1540031, NPC_RIGHT_HEAD},
+};
+static Yell ThreatDelay2[] =
+{
+    { -1540032, NPC_LEFT_HEAD},
+    { -1540033, NPC_RIGHT_HEAD},
+    { -1540034, NPC_LEFT_HEAD},
+    { -1540035, NPC_LEFT_HEAD},
+};
+
+static Yell Killing[] =
+{
+    { -1540036, NPC_LEFT_HEAD},
+    { -1540037, NPC_RIGHT_HEAD},
+};
+static Yell KillingDelay[] =
+{
+    { -1540038, NPC_RIGHT_HEAD},
+    { -1000000, NPC_LEFT_HEAD},
+};
+
+struct mob_omrogg_heads : public CreatureScript
+{
+    mob_omrogg_heads() : CreatureScript("mob_omrogg_heads") {}
+
+    struct mob_omrogg_headsAI : public ScriptedAI
+    {
+        mob_omrogg_headsAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiDeathTimer;
+        bool m_bDeathYell;
+
+        void Reset() override
+        {
+            m_uiDeathTimer = 2000;
+            m_bDeathYell = false;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit* pInvoker, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender->GetEntry() == NPC_WARBRINGER_OMROGG)
+                m_bDeathYell = true;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_bDeathYell)
+            {
+                return;
+            }
+
+            if (m_uiDeathTimer < uiDiff)
+            {
+                DoScriptText(YELL_DIE_R, m_creature);
+                m_uiDeathTimer = 10000;
+                m_creature->ForcedDespawn(1000);
+            }
+            else
+            {
+                m_uiDeathTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_omrogg_headsAI(pCreature);
+    }
+};
+
+struct boss_warbringer_omrogg : public CreatureScript
+{
+    boss_warbringer_omrogg() : CreatureScript("boss_warbringer_omrogg") {}
+
+    struct boss_warbringer_omroggAI : public ScriptedAI
+    {
+        boss_warbringer_omroggAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        ObjectGuid m_leftHeadGuid;
+        ObjectGuid m_rightHeadGuid;
+
+        int m_iAggro;
+        int m_iThreat;
+        int m_iKilling;
+
+        bool m_bAggroYell;
+        bool m_bThreatYell;
+        bool m_bThreatYell2;
+        bool m_bKillingYell;
+
+        uint32 m_uiDelayTimer;
+        uint32 m_uiBlastWaveTimer;
+        uint32 m_uiBlastCount;
+        uint32 m_uiFearTimer;
+        uint32 m_uiBurningMaulTimer;
+        uint32 m_uiThunderClapTimer;
+        uint32 m_uiResetThreatTimer;
+
+        void Reset() override
+        {
+            m_bAggroYell = false;
+            m_bThreatYell = false;
+            m_bThreatYell2 = false;
+            m_bKillingYell = false;
+
+            m_uiDelayTimer = 4000;
+            m_uiBlastWaveTimer = 0;
+            m_uiBlastCount = 0;
+            m_uiFearTimer = 8000;
+            m_uiBurningMaulTimer = 25000;
+            m_uiThunderClapTimer = 15000;
+            m_uiResetThreatTimer = 30000;
+        }
+
+        void DoYellForThreat()
+        {
+            Creature* pLeftHead = m_creature->GetMap()->GetCreature(m_leftHeadGuid);
+            Creature* pRightHead = m_creature->GetMap()->GetCreature(m_rightHeadGuid);
+
+            if (!pLeftHead || !pRightHead)
+            {
+                return;
+            }
+
+            m_iThreat = irand(0, 3);
+
+            Unit* pSource = (pLeftHead->GetEntry() == Threat[m_iThreat].creature ? pLeftHead : pRightHead);
+
+            DoScriptText(Threat[m_iThreat].id, pSource);
+
+            m_uiDelayTimer = 3500;
+            m_bThreatYell = true;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            m_creature->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
+            m_creature->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
+
+            if (Creature* pLeftHead = m_creature->GetMap()->GetCreature(m_leftHeadGuid))
+            {
+                m_iAggro = irand(0, 2);
+
+                DoScriptText(GoCombat[m_iAggro].id, pLeftHead);
+
+                m_uiDelayTimer = 3500;
+                m_bAggroYell = true;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OMROGG, IN_PROGRESS);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_LEFT_HEAD)
+            {
+                m_leftHeadGuid = pSummoned->GetObjectGuid();
+            }
+            else if (pSummoned->GetEntry() == NPC_RIGHT_HEAD)
+            {
+                m_rightHeadGuid = pSummoned->GetObjectGuid();
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            Creature* pLeftHead = m_creature->GetMap()->GetCreature(m_leftHeadGuid);
+            Creature* pRightHead = m_creature->GetMap()->GetCreature(m_rightHeadGuid);
+
+            if (!pLeftHead || !pRightHead)
+            {
+                return;
+            }
+
+            m_iKilling = irand(0, 1);
+
+            Creature* pSource = (pLeftHead->GetEntry() == Killing[m_iKilling].creature ? pLeftHead : pRightHead);
+
+            switch (m_iKilling)
+            {
+            case 0:
+                DoScriptText(Killing[m_iKilling].id, pSource);
+                m_uiDelayTimer = 3500;
+                m_bKillingYell = true;
+                break;
+            case 1:
+                DoScriptText(Killing[m_iKilling].id, pSource);
+                m_bKillingYell = false;
+                break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            Creature* pLeftHead = m_creature->GetMap()->GetCreature(m_leftHeadGuid);
+            Creature* pRightHead = m_creature->GetMap()->GetCreature(m_rightHeadGuid);
+
+            if (!pLeftHead || !pRightHead)
+            {
+                return;
+            }
+
+            DoScriptText(YELL_DIE_L, pLeftHead);
+            pLeftHead->ForcedDespawn(1000);
+
+            SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, pRightHead);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OMROGG, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (Creature* pLeftHead = m_creature->GetMap()->GetCreature(m_leftHeadGuid))
+            {
+                pLeftHead->ForcedDespawn();
+                m_leftHeadGuid.Clear();
+            }
+
+            if (Creature* pRightHead = m_creature->GetMap()->GetCreature(m_rightHeadGuid))
+            {
+                pRightHead->ForcedDespawn();
+                m_rightHeadGuid.Clear();
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_OMROGG, FAIL);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiDelayTimer < uiDiff)
+            {
+                m_uiDelayTimer = 3500;
+
+                Creature* pLeftHead = m_creature->GetMap()->GetCreature(m_leftHeadGuid);
+                Creature* pRightHead = m_creature->GetMap()->GetCreature(m_rightHeadGuid);
+
+                if (!pLeftHead || !pRightHead)
+                {
+                    return;
+                }
+
+                if (m_bAggroYell)
+                {
+                    DoScriptText(GoCombatDelay[m_iAggro].id, pRightHead);
+                    m_bAggroYell = false;
+                }
+
+                if (m_bThreatYell2)
+                {
+                    Creature* pSource = (pLeftHead->GetEntry() == ThreatDelay2[m_iThreat].creature ? pLeftHead : pRightHead);
+
+                    DoScriptText(ThreatDelay2[m_iThreat].id, pSource);
+                    m_bThreatYell2 = false;
+                }
+
+                if (m_bThreatYell)
+                {
+                    Creature* pSource = (pLeftHead->GetEntry() == ThreatDelay1[m_iThreat].creature ? pLeftHead : pRightHead);
+
+                    DoScriptText(ThreatDelay1[m_iThreat].id, pSource);
+                    m_bThreatYell = false;
+                    m_bThreatYell2 = true;
+                }
+
+                if (m_bKillingYell)
+                {
+                    Creature* pSource = (pLeftHead->GetEntry() == KillingDelay[m_iKilling].creature ? pLeftHead : pRightHead);
+
+                    DoScriptText(KillingDelay[m_iKilling].id, pSource);
+                    m_bKillingYell = false;
+                }
+            }
+            else
+            {
+                m_uiDelayTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiBlastCount && m_uiBlastWaveTimer)
+            {
+                if (m_uiBlastWaveTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BLAST_WAVE) == CAST_OK)
+                    {
+                        m_uiBlastWaveTimer = 5000;
+                        ++m_uiBlastCount;
+
+                        if (m_uiBlastCount == 3)
+                        {
+                            m_uiBlastCount = 0;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiBlastWaveTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiBurningMaulTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_BURNING_MAUL : SPELL_BURNING_MAUL_H) == CAST_OK)
+                {
+                    DoScriptText(EMOTE_ENRAGE, m_creature);
+                    m_uiBurningMaulTimer = 40000;
+                    m_uiBlastWaveTimer = 16000;
+                    m_uiBlastCount = 1;
+                }
+            }
+            else
+            {
+                m_uiBurningMaulTimer -= uiDiff;
+            }
+
+            if (m_uiResetThreatTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    DoYellForThreat();
+                    DoResetThreat();
+                    AttackStart(pTarget);
+                }
+                m_uiResetThreatTimer = urand(25000, 40000);
+            }
+            else
+            {
+                m_uiResetThreatTimer -= uiDiff;
+            }
+
+            if (m_uiFearTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FEAR) == CAST_OK)
+                {
+                    m_uiFearTimer = urand(15000, 35000);
+                }
+            }
+            else
+            {
+                m_uiFearTimer -= uiDiff;
+            }
+
+            if (m_uiThunderClapTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_THUNDERCLAP) == CAST_OK)
+                {
+                    m_uiThunderClapTimer = urand(15000, 30000);
+                }
+            }
+            else
+            {
+                m_uiThunderClapTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_warbringer_omroggAI(pCreature);
+    }
+};
+
+void AddSC_boss_warbringer_omrogg()
+{
+    Script* s;
+
+    s = new mob_omrogg_heads();
+    s->RegisterSelf();
+    s = new boss_warbringer_omrogg();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_warbringer_omrogg";
+    //pNewScript->GetAI = &GetAI_boss_warbringer_omrogg;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_omrogg_heads";
+    //pNewScript->GetAI = &GetAI_mob_omrogg_heads;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
new file mode 100644
index 000000000..b81cdc137
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
@@ -0,0 +1,371 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Warchief_Kargath_Bladefist
+SD%Complete: 90
+SDComment:
+SDCategory: Hellfire Citadel, Shattered Halls
+EndScriptData */
+
+/* ContentData
+boss_warchief_kargath_bladefist
+EndContentData */
+
+#include "precompiled.h"
+#include "shattered_halls.h"
+
+enum
+{
+    SAY_AGGRO1                      = -1540042,
+    SAY_AGGRO2                      = -1540043,
+    SAY_AGGRO3                      = -1540044,
+    SAY_SLAY1                       = -1540045,
+    SAY_SLAY2                       = -1540046,
+    SAY_DEATH                       = -1540047,
+    SAY_EVADE                       = -1540048,
+
+    SPELL_BLADE_DANCE               = 30739,
+    SPELL_CHARGE_H                  = 25821,
+
+    TARGET_NUM                      = 5,
+
+    NPC_SHATTERED_ASSASSIN          = 17695,
+    NPC_HEARTHEN_GUARD              = 17621,
+    NPC_SHARPSHOOTER_GUARD          = 17622,
+    NPC_REAVER_GUARD                = 17623,
+};
+
+float AssassEntrance[3] = {275.136f, -84.29f, 2.3f};        // y -8
+float AssassExit[3] = {184.233f, -84.29f, 2.3f};            // y -8
+float AddsEntrance[3] = {306.036f, -84.29f, 1.93f};
+
+struct boss_warchief_kargath_bladefist : public CreatureScript
+{
+    boss_warchief_kargath_bladefist() : CreatureScript("boss_warchief_kargath_bladefist") {}
+
+    struct boss_warchief_kargath_bladefistAI : public ScriptedAI
+    {
+        boss_warchief_kargath_bladefistAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        GuidVector m_vAddGuids;
+        GuidVector m_vAssassinGuids;
+
+        uint32 m_uiChargeTimer;
+        uint32 m_uiBladeDanceTimer;
+        uint32 m_uiSummonAssistantTimer;
+        uint32 m_uiWaitTimer;
+
+        uint32 m_uiAssassinsTimer;
+
+        uint32 m_uiSummoned;
+        bool m_bInBlade;
+
+        uint32 m_uiTargetNum;
+
+        void Reset() override
+        {
+            m_creature->SetSpeedRate(MOVE_RUN, 2.0f);
+
+            m_uiSummoned = 2;
+            m_bInBlade = false;
+            m_uiWaitTimer = 0;
+
+            m_uiChargeTimer = 0;
+            m_uiBladeDanceTimer = 45000;
+            m_uiSummonAssistantTimer = 30000;
+            m_uiAssassinsTimer = 5000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_AGGRO1, m_creature); break;
+            case 1: DoScriptText(SAY_AGGRO2, m_creature); break;
+            case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BLADEFIST, IN_PROGRESS);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_HEARTHEN_GUARD:
+            case NPC_SHARPSHOOTER_GUARD:
+            case NPC_REAVER_GUARD:
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+
+                m_vAddGuids.push_back(pSummoned->GetObjectGuid());
+                break;
+            case NPC_SHATTERED_ASSASSIN:
+                m_vAssassinGuids.push_back(pSummoned->GetObjectGuid());
+                break;
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+            DoDespawnAdds();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BLADEFIST, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            DoDespawnAdds();
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_BLADEFIST, FAIL);
+            }
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (m_bInBlade)
+            {
+                if (uiType != POINT_MOTION_TYPE)
+                {
+                    return;
+                }
+
+                if (uiPointId != 1)
+                {
+                    return;
+                }
+
+                if (m_uiTargetNum > 0) // to prevent loops
+                {
+                    m_uiWaitTimer = 1;
+                    DoCastSpellIfCan(m_creature, SPELL_BLADE_DANCE, CAST_TRIGGERED);
+                    --m_uiTargetNum;
+                }
+            }
+        }
+
+        // Note: this should be done by creature linkin in core
+        void DoDespawnAdds()
+        {
+            for (GuidVector::const_iterator itr = m_vAddGuids.begin(); itr != m_vAddGuids.end(); ++itr)
+            {
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pTemp->ForcedDespawn();
+                }
+            }
+
+            m_vAddGuids.clear();
+
+            for (GuidVector::const_iterator itr = m_vAssassinGuids.begin(); itr != m_vAssassinGuids.end(); ++itr)
+            {
+                if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr))
+                {
+                    pTemp->ForcedDespawn();
+                }
+            }
+
+            m_vAssassinGuids.clear();
+        }
+
+        void SpawnAssassin()
+        {
+            m_creature->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1] + 8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 24000);
+            m_creature->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1] - 8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 24000);
+            m_creature->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1] + 8, AssassExit[2], 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 24000);
+            m_creature->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1] - 8, AssassExit[2], 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 24000);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Check if out of range
+            if (EnterEvadeIfOutOfCombatArea(uiDiff))
+            {
+                DoScriptText(SAY_EVADE, m_creature);
+                return;
+            }
+
+            if (m_uiAssassinsTimer)
+            {
+                if (m_uiAssassinsTimer <= uiDiff)
+                {
+                    SpawnAssassin();
+                    m_uiAssassinsTimer = 0;
+                }
+                else
+                {
+                    m_uiAssassinsTimer -= uiDiff;
+                }
+            }
+
+            if (m_bInBlade)
+            {
+                if (m_uiWaitTimer)
+                {
+                    if (m_uiWaitTimer <= uiDiff)
+                    {
+                        if (m_uiTargetNum == 0)
+                        {
+                            // stop bladedance
+                            m_bInBlade = false;
+                            m_creature->SetSpeedRate(MOVE_RUN, 2.0f);
+                            m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                            m_uiWaitTimer = 0;
+                            if (!m_bIsRegularMode)
+                            {
+                                m_uiChargeTimer = 5000;
+                            }
+                        }
+                        else
+                        {
+                            // move in bladedance
+                            float x, y, randx, randy;
+                            randx = (rand() % 40);
+                            randy = (rand() % 40);
+                            x = 210 + randx;
+                            y = -60 - randy;
+                            m_creature->GetMotionMaster()->MovePoint(1, x, y, m_creature->GetPositionZ());
+                            m_uiWaitTimer = 0;
+                        }
+                    }
+                    else
+                    {
+                        m_uiWaitTimer -= uiDiff;
+                    }
+                }
+            }
+            else                                                // !m_bInBlade
+            {
+                if (m_uiBladeDanceTimer < uiDiff)
+                {
+                    m_uiTargetNum = TARGET_NUM;
+                    m_uiWaitTimer = 1;
+                    m_bInBlade = true;
+                    m_uiBladeDanceTimer = 30000;
+                    m_creature->SetSpeedRate(MOVE_RUN, 4.0f);
+                    return;
+                }
+                else
+                {
+                    m_uiBladeDanceTimer -= uiDiff;
+                }
+
+                if (m_uiChargeTimer)
+                {
+                    if (m_uiChargeTimer <= uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        {
+                            DoCastSpellIfCan(pTarget, SPELL_CHARGE_H);
+                        }
+
+                        m_uiChargeTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiChargeTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiSummonAssistantTimer < uiDiff)
+                {
+                    for (uint32 i = 0; i < m_uiSummoned; ++i)
+                    {
+                        switch (urand(0, 2))
+                        {
+                        case 0: m_creature->SummonCreature(NPC_HEARTHEN_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000); break;
+                        case 1: m_creature->SummonCreature(NPC_SHARPSHOOTER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000); break;
+                        case 2: m_creature->SummonCreature(NPC_REAVER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 20000); break;
+                        }
+                    }
+
+                    if (!urand(0, 4))
+                    {
+                        ++m_uiSummoned;
+                    }
+
+                    m_uiSummonAssistantTimer = urand(25000, 35000);
+                }
+                else
+                {
+                    m_uiSummonAssistantTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_warchief_kargath_bladefistAI(pCreature);
+    }
+};
+
+void AddSC_boss_warchief_kargath_bladefist()
+{
+    Script* s;
+
+    s = new boss_warchief_kargath_bladefist();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_warchief_kargath_bladefist";
+    //pNewScript->GetAI = &GetAI_boss_warchief_kargath_bladefist;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp b/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
new file mode 100644
index 000000000..5f4e51149
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
@@ -0,0 +1,440 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Shattered_Halls
+SD%Complete: 50
+SDComment: currently missing info about door. instance not complete
+SDCategory: Hellfire Citadel, Shattered Halls
+EndScriptData */
+
+#include "precompiled.h"
+#include "shattered_halls.h"
+
+struct SpawnLocation
+{
+    uint32 m_uiAllianceEntry, m_uiHordeEntry;
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+const float afExecutionerLoc[4] = { 151.443f, -84.439f, 1.938f, 6.283f };
+
+static SpawnLocation aSoldiersLocs[] =
+{
+    { 0, NPC_SOLDIER_HORDE_1, 119.609f, 256.127f, -45.254f, 5.133f },
+    { NPC_SOLDIER_ALLIANCE_1, 0, 131.106f, 254.520f, -45.236f, 3.951f },
+    { NPC_SOLDIER_ALLIANCE_3, NPC_SOLDIER_HORDE_3, 151.040f, -91.558f, 1.936f, 1.559f },
+    { NPC_SOLDIER_ALLIANCE_2, NPC_SOLDIER_HORDE_2, 150.669f, -77.015f, 1.933f, 4.705f },
+    { NPC_OFFICER_ALLIANCE, NPC_OFFICER_HORDE, 138.241f, -84.198f, 1.907f, 0.055f }
+};
+
+struct is_shattered_halls : public InstanceScript
+{
+    is_shattered_halls() : InstanceScript("instance_shattered_halls") {}
+
+    class instance_shattered_halls : public ScriptedInstance
+    {
+    public:
+        instance_shattered_halls(Map* pMap) : ScriptedInstance(pMap),
+            m_uiExecutionTimer(55 * MINUTE* IN_MILLISECONDS),
+            m_uiTeam(0),
+            m_uiExecutionStage(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            // Only on heroic
+            if (instance->IsRegularDifficulty() || m_uiTeam)
+            {
+                return;
+            }
+
+            m_uiTeam = pPlayer->GetTeam();
+
+            if (m_uiTeam == ALLIANCE)
+            {
+                pPlayer->SummonCreature(aSoldiersLocs[1].m_uiAllianceEntry, aSoldiersLocs[1].m_fX, aSoldiersLocs[1].m_fY, aSoldiersLocs[1].m_fZ, aSoldiersLocs[1].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+            else
+            {
+                pPlayer->SummonCreature(aSoldiersLocs[0].m_uiHordeEntry, aSoldiersLocs[0].m_fX, aSoldiersLocs[0].m_fY, aSoldiersLocs[0].m_fZ, aSoldiersLocs[0].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_NETHEKURSE_DOOR:
+                if (m_auiEncounter[TYPE_NETHEKURSE] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_NETHEKURSE_ENTER_DOOR:
+                if (m_auiEncounter[TYPE_NETHEKURSE] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+
+            default:
+                return;
+            }
+
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_NETHEKURSE:
+            case NPC_KARGATH_BLADEFIST:
+            case NPC_EXECUTIONER:
+            case NPC_SOLDIER_ALLIANCE_2:
+            case NPC_SOLDIER_ALLIANCE_3:
+            case NPC_OFFICER_ALLIANCE:
+            case NPC_SOLDIER_HORDE_2:
+            case NPC_SOLDIER_HORDE_3:
+            case NPC_OFFICER_HORDE:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_EXECUTIONER)
+            {
+                SetData(TYPE_EXECUTION, DONE);
+            }
+        }
+
+        void OnCreatureEvade(Creature* pCreature) override
+        {
+            // If npc evades continue the counting
+            if (pCreature->GetEntry() == NPC_EXECUTIONER)
+            {
+                SetData(TYPE_EXECUTION, IN_PROGRESS);
+            }
+        }
+
+        void OnCreatureEnterCombat(Creature* pCreature) override
+        {
+            // Set data to special in order to pause the event timer
+            // This is according to the blizz comments which say that it is possible to complete the event if you engage the npc while you have only a few seconds left
+            if (pCreature->GetEntry() == NPC_EXECUTIONER)
+            {
+                SetData(TYPE_EXECUTION, SPECIAL);
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_NETHEKURSE:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_NETHEKURSE_DOOR);
+                    DoUseDoorOrButton(GO_NETHEKURSE_ENTER_DOOR);
+                }
+                break;
+            case TYPE_OMROGG:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_BLADEFIST:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    // Make executioner attackable only after the final boss is dead
+                    if (Creature* pExecutioner = GetSingleCreatureFromStorage(NPC_EXECUTIONER, true))
+                    {
+                        pExecutioner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
+                    }
+                }
+                break;
+            case TYPE_EXECUTION:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == IN_PROGRESS && !GetSingleCreatureFromStorage(NPC_EXECUTIONER, true))
+                {
+                    if (Player* pPlayer = GetPlayerInMap())
+                    {
+                        // summon the 3 npcs for execution
+                        for (uint8 i = 2; i < 5; ++i)
+                        {
+                            pPlayer->SummonCreature(m_uiTeam == ALLIANCE ? aSoldiersLocs[i].m_uiAllianceEntry : aSoldiersLocs[i].m_uiHordeEntry, aSoldiersLocs[i].m_fX, aSoldiersLocs[i].m_fY, aSoldiersLocs[i].m_fZ, aSoldiersLocs[i].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+                        }
+
+                        // Summon the executioner; Note: according to wowhead he shouldn't be targetable until Kargath encounter is finished
+                        if (Creature* pExecutioner = pPlayer->SummonCreature(NPC_EXECUTIONER, afExecutionerLoc[0], afExecutionerLoc[1], afExecutionerLoc[2], afExecutionerLoc[3], TEMPSUMMON_DEAD_DESPAWN, 0, true))
+                        {
+                            pExecutioner->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
+                        }
+
+                        // cast the execution spell
+                        DoCastGroupDebuff(SPELL_KARGATH_EXECUTIONER_1);
+                    }
+                }
+                if (uiData == DONE)
+                {
+                    // If the officer is already killed, then skip the quest completion
+                    if (m_uiExecutionStage)
+                    {
+                        break;
+                    }
+
+                    // Complete quest 9524 or 9525
+                    if (Creature* pOfficer = GetSingleCreatureFromStorage(m_uiTeam == ALLIANCE ? NPC_OFFICER_ALLIANCE : NPC_OFFICER_HORDE))
+                    {
+                        Map::PlayerList const& lPlayers = instance->GetPlayers();
+
+                        for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
+                        {
+                            if (Player* pPlayer = itr->getSource())
+                            {
+                                pPlayer->KilledMonsterCredit(pOfficer->GetEntry(), pOfficer->GetObjectGuid());
+                            }
+                        }
+                    }
+                }
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3];
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        bool CheckConditionCriteriaMeet(Player const* pPlayer, uint32 uiInstanceConditionId, WorldObject const* pConditionSource, uint32 conditionSourceType) const override
+        {
+            switch (uiInstanceConditionId)
+            {
+            case INSTANCE_CONDITION_ID_NORMAL_MODE:             // No soldier alive
+            case INSTANCE_CONDITION_ID_HARD_MODE:               // One soldier alive
+            case INSTANCE_CONDITION_ID_HARD_MODE_2:             // Two soldier alive
+            case INSTANCE_CONDITION_ID_HARD_MODE_3:             // Three soldier alive
+                return uiInstanceConditionId == uint32(INSTANCE_CONDITION_ID_HARD_MODE_3 - m_uiExecutionStage);
+            }
+
+            script_error_log("instance_shattered_halls::CheckConditionCriteriaMeet called with unsupported Id %u. Called with param plr %s, src %s, condition source type %u",
+                uiInstanceConditionId, pPlayer ? pPlayer->GetGuidStr().c_str() : "NULL", pConditionSource ? pConditionSource->GetGuidStr().c_str() : "NULL", conditionSourceType);
+            return false;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_auiEncounter[TYPE_EXECUTION] != IN_PROGRESS)
+            {
+                return;
+            }
+
+            if (m_uiExecutionTimer < uiDiff)
+            {
+                switch (m_uiExecutionStage)
+                {
+                case 0:
+                    // Kill the officer
+                    if (Creature* pSoldier = GetSingleCreatureFromStorage(m_uiTeam == ALLIANCE ? NPC_OFFICER_ALLIANCE : NPC_OFFICER_HORDE))
+                    {
+                        pSoldier->DealDamage(pSoldier, pSoldier->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                    }
+
+                    // Make Kargath yell
+                    DoOrSimulateScriptTextForThisInstance(m_uiTeam == ALLIANCE ? SAY_KARGATH_EXECUTE_ALLY : SAY_KARGATH_EXECUTE_HORDE, NPC_KARGATH_BLADEFIST);
+
+                    // Set timer for the next execution
+                    DoCastGroupDebuff(SPELL_KARGATH_EXECUTIONER_2);
+                    m_uiExecutionTimer = 10 * MINUTE * IN_MILLISECONDS;
+                    break;
+                case 1:
+                    if (Creature* pSoldier = GetSingleCreatureFromStorage(m_uiTeam == ALLIANCE ? NPC_SOLDIER_ALLIANCE_2 : NPC_SOLDIER_HORDE_2))
+                    {
+                        pSoldier->DealDamage(pSoldier, pSoldier->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                    }
+
+                    DoCastGroupDebuff(SPELL_KARGATH_EXECUTIONER_3);
+                    m_uiExecutionTimer = 15 * MINUTE * IN_MILLISECONDS;
+                    break;
+                case 2:
+                    if (Creature* pSoldier = GetSingleCreatureFromStorage(m_uiTeam == ALLIANCE ? NPC_SOLDIER_ALLIANCE_3 : NPC_SOLDIER_HORDE_3))
+                    {
+                        pSoldier->DealDamage(pSoldier, pSoldier->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                    }
+
+                    SetData(TYPE_EXECUTION, FAIL);
+                    m_uiExecutionTimer = 0;
+                    break;
+                }
+                ++m_uiExecutionStage;
+            }
+            else
+            {
+                m_uiExecutionTimer -= uiDiff;
+            }
+        }
+
+    private:
+        // Add debuff to all players in the instance
+        void DoCastGroupDebuff(uint32 uiSpellId)
+        {
+            Map::PlayerList const& lPlayers = instance->GetPlayers();
+
+            for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
+            {
+                Player* pPlayer = itr->getSource();
+                if (pPlayer && !pPlayer->HasAura(uiSpellId))
+                {
+                    pPlayer->CastSpell(pPlayer, uiSpellId, true);
+                }
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiExecutionTimer;
+        uint32 m_uiTeam;
+        uint8 m_uiExecutionStage;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_shattered_halls(pMap);
+    }
+};
+
+struct at_shattered_halls : public AreaTriggerScript
+{
+    at_shattered_halls() : AreaTriggerScript("at_shattered_halls") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*pAt*/) override
+    {
+        if (pPlayer->isGameMaster() || !pPlayer->IsAlive())
+        {
+            return false;
+        }
+
+        InstanceData* pInstance = pPlayer->GetInstanceData();
+
+        if (!pInstance)
+        {
+            return false;
+        }
+
+        // Only on heroic
+        if (pInstance->instance->IsRegularDifficulty())
+        {
+            return false;
+        }
+
+        // Don't allow players to cheat
+        if (pInstance->GetData(TYPE_BLADEFIST) == DONE || pInstance->GetData(TYPE_OMROGG) == DONE)
+        {
+            return false;
+        }
+
+        if (pInstance->GetData(TYPE_EXECUTION) == NOT_STARTED)
+        {
+            pInstance->SetData(TYPE_EXECUTION, IN_PROGRESS);
+        }
+
+        return true;
+    }
+};
+
+void AddSC_instance_shattered_halls()
+{
+    Script* s;
+
+    s = new is_shattered_halls();
+    s->RegisterSelf();
+    s = new at_shattered_halls();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_shattered_halls";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_shattered_halls;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_shattered_halls";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_shattered_halls;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.h b/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.h
new file mode 100644
index 000000000..b2a1b31b5
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.h
@@ -0,0 +1,68 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_SHATTERED_H
+#define DEF_SHATTERED_H
+
+enum
+{
+    MAX_ENCOUNTER               = 4,
+
+    TYPE_NETHEKURSE             = 0,
+    TYPE_OMROGG                 = 1,
+    TYPE_BLADEFIST              = 2,                        // Note: if players skip Omrogg and go straight to Karagth then Omrogg comes to aid Karagth
+    TYPE_EXECUTION              = 3,
+
+    NPC_NETHEKURSE              = 16807,
+    NPC_KARGATH_BLADEFIST       = 16808,
+    NPC_WARBRINGER_OMROGG       = 16809,
+    NPC_EXECUTIONER             = 17301,                    // must be killed for the executioner event
+
+    NPC_SOLDIER_ALLIANCE_1      = 17288,                    // quest giver for 9524
+    NPC_SOLDIER_ALLIANCE_2      = 17289,
+    NPC_SOLDIER_ALLIANCE_3      = 17292,
+    NPC_OFFICER_ALLIANCE        = 17290,                    // quest objective
+
+    NPC_SOLDIER_HORDE_1         = 17294,                    // quest giver for 9525
+    NPC_SOLDIER_HORDE_2         = 17295,
+    NPC_SOLDIER_HORDE_3         = 17297,
+    NPC_OFFICER_HORDE           = 17296,                    // quest objective
+
+    GO_NETHEKURSE_DOOR          = 182540,
+    GO_NETHEKURSE_ENTER_DOOR    = 182539,
+
+    SPELL_KARGATH_EXECUTIONER_1 = 39288,                    // 55 min - first prisoner - officer
+    SPELL_KARGATH_EXECUTIONER_2 = 39289,                    // 10 min - second prisoner
+    SPELL_KARGATH_EXECUTIONER_3 = 39290,                    // 15 min - last prisoner
+
+    // I'm not sure if these texts are used at the execution but this is most likely they are used to
+    SAY_KARGATH_EXECUTE_ALLY    = -1540049,
+    SAY_KARGATH_EXECUTE_HORDE   = -1540050,
+
+    // AT_NETHEKURSE               = 4524,                  // Area trigger used for the execution event
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/outland/hellfire_peninsula.cpp b/src/modules/SD3/scripts/outland/hellfire_peninsula.cpp
new file mode 100644
index 000000000..871e859ea
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/hellfire_peninsula.cpp
@@ -0,0 +1,1300 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Hellfire_Peninsula
+SD%Complete: 100
+SDComment: Quest support: 9375, 9410, 9418, 10629, 10838, 10935.
+SDCategory: Hellfire Peninsula
+EndScriptData */
+
+/* ContentData
+npc_aeranas
+npc_ancestral_wolf
+npc_demoniac_scryer
+npc_wounded_blood_elf
+npc_fel_guard_hound
+npc_anchorite_barada
+npc_colonel_jules
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "pet_ai.h"
+
+/*######
+## npc_aeranas
+######*/
+
+enum
+{
+    SAY_SUMMON                      = -1000138,
+    SAY_FREE                        = -1000139,
+
+    FACTION_HOSTILE                 = 16,
+    FACTION_FRIENDLY                = 35,
+
+    SPELL_ENVELOPING_WINDS          = 15535,
+    SPELL_SHOCK                     = 12553,
+};
+
+struct npc_aeranas : public CreatureScript
+{
+    npc_aeranas() : CreatureScript("npc_aeranas") {}
+
+    struct npc_aeranasAI : public ScriptedAI
+    {
+        npc_aeranasAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiFactionTimer;
+        uint32 m_uiEnvelopingWindsTimer;
+        uint32 m_uiShockTimer;
+
+        void Reset() override
+        {
+            m_uiFactionTimer = 8000;
+            m_uiEnvelopingWindsTimer = 9000;
+            m_uiShockTimer = 5000;
+
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+
+            DoScriptText(SAY_SUMMON, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiFactionTimer)
+            {
+                if (m_uiFactionTimer <= uiDiff)
+                {
+                    m_creature->SetFactionTemporary(FACTION_HOSTILE, TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_RESTORE_COMBAT_STOP);
+                    m_uiFactionTimer = 0;
+                }
+                else
+                {
+                    m_uiFactionTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->GetHealthPercent() < 30.0f)
+            {
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                m_creature->RemoveAllAuras();
+                m_creature->DeleteThreatList();
+                m_creature->CombatStop(true);
+                DoScriptText(SAY_FREE, m_creature);
+                return;
+            }
+
+            if (m_uiShockTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHOCK);
+                m_uiShockTimer = 10000;
+            }
+            else
+            {
+                m_uiShockTimer -= uiDiff;
+            }
+
+            if (m_uiEnvelopingWindsTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_ENVELOPING_WINDS);
+                m_uiEnvelopingWindsTimer = 25000;
+            }
+            else
+            {
+                m_uiEnvelopingWindsTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_aeranasAI(pCreature);
+    }
+};
+
+/*######
+## npc_ancestral_wolf
+######*/
+
+enum
+{
+    EMOTE_WOLF_LIFT_HEAD            = -1000496,
+    EMOTE_WOLF_HOWL                 = -1000497,
+    SAY_WOLF_WELCOME                = -1000498,
+
+    SPELL_ANCESTRAL_WOLF_BUFF       = 29981,
+
+    NPC_RYGA                        = 17123
+};
+
+struct npc_ancestral_wolf : public CreatureScript
+{
+    npc_ancestral_wolf() : CreatureScript("npc_ancestral_wolf") {}
+
+    struct npc_ancestral_wolfAI : public npc_escortAI
+    {
+        npc_ancestral_wolfAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            if (pCreature->GetOwner() && pCreature->GetOwner()->GetTypeId() == TYPEID_PLAYER)
+            {
+                Start(false, (Player*)pCreature->GetOwner());
+            }
+            else
+            {
+                script_error_log("npc_ancestral_wolf can not obtain owner or owner is not a player.");
+            }
+        }
+
+        void Reset() override
+        {
+            m_creature->CastSpell(m_creature, SPELL_ANCESTRAL_WOLF_BUFF, true);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                DoScriptText(EMOTE_WOLF_LIFT_HEAD, m_creature);
+                break;
+            case 2:
+                DoScriptText(EMOTE_WOLF_HOWL, m_creature);
+                break;
+            case 50:
+                Creature* pRyga = GetClosestCreatureWithEntry(m_creature, NPC_RYGA, 30.0f);
+                if (pRyga && pRyga->IsAlive() && !pRyga->IsInCombat())
+                {
+                    DoScriptText(SAY_WOLF_WELCOME, pRyga);
+                }
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_ancestral_wolfAI(pCreature);
+    }
+};
+
+/*######
+## npc_demoniac_scryer
+######*/
+//TODO prepare localisation
+#define GOSSIP_ITEM_ATTUNE          "Yes, Scryer. You may possess me."
+
+enum
+{
+    GOSSIP_TEXTID_PROTECT           = 10659,
+    GOSSIP_TEXTID_ATTUNED           = 10643,
+
+    QUEST_DEMONIAC                  = 10838,
+    NPC_HELLFIRE_WARDLING           = 22259,
+    NPC_BUTTRESS                    = 22267,                // the 4x nodes
+    NPC_SPAWNER                     = 22260,                // just a dummy, not used
+
+    MAX_BUTTRESS                    = 4,
+    TIME_TOTAL                      = MINUTE * 10 * IN_MILLISECONDS,
+
+    SPELL_SUMMONED_DEMON            = 7741,                 // visual spawn-in for demon
+    SPELL_DEMONIAC_VISITATION       = 38708,                // create item
+
+    SPELL_BUTTRESS_APPERANCE        = 38719,                // visual on 4x bunnies + the flying ones
+    SPELL_SUCKER_CHANNEL            = 38721,                // channel to the 4x nodes
+    SPELL_SUCKER_DESPAWN_MOB        = 38691
+};
+
+// script is basic support, details like end event are not implemented
+struct npc_demoniac_scryer : public CreatureScript
+{
+    npc_demoniac_scryer() : CreatureScript("npc_demoniac_scryer") {}
+
+    struct npc_demoniac_scryerAI : public ScriptedAI
+    {
+        npc_demoniac_scryerAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bIsComplete = false;
+            m_uiSpawnDemonTimer = 15000;
+            m_uiSpawnButtressTimer = 45000;
+            m_uiButtressCount = 0;
+        }
+
+        bool m_bIsComplete;
+
+        uint32 m_uiSpawnDemonTimer;
+        uint32 m_uiSpawnButtressTimer;
+        uint32 m_uiButtressCount;
+
+        // we don't want anything to happen when attacked
+        void AttackedBy(Unit* /*pEnemy*/) override {}
+        void AttackStart(Unit* /*pEnemy*/) override {}
+
+        void DoSpawnButtress()
+        {
+            ++m_uiButtressCount;
+
+            float fAngle = 0.0f;
+
+            switch (m_uiButtressCount)
+            {
+            case 1: fAngle = 0.0f; break;
+            case 2: fAngle = M_PI_F + M_PI_F / 2; break;
+            case 3: fAngle = M_PI_F / 2; break;
+            case 4: fAngle = M_PI_F; break;
+            }
+
+            float fX, fY, fZ;
+            m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0.0f, 5.0f, fAngle);
+
+            uint32 uiTime = TIME_TOTAL - (m_uiSpawnButtressTimer * m_uiButtressCount);
+            m_creature->SummonCreature(NPC_BUTTRESS, fX, fY, fZ, m_creature->GetAngle(fX, fY), TEMPSUMMON_TIMED_DESPAWN, uiTime);
+        }
+
+        void DoSpawnDemon()
+        {
+            float fX, fY, fZ;
+            m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 20.0f, fX, fY, fZ);
+
+            m_creature->SummonCreature(NPC_HELLFIRE_WARDLING, fX, fY, fZ, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_HELLFIRE_WARDLING)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_SUMMONED_DEMON, false);
+                pSummoned->AI()->AttackStart(m_creature);
+            }
+            else
+            {
+                if (pSummoned->GetEntry() == NPC_BUTTRESS)
+                {
+                    pSummoned->CastSpell(pSummoned, SPELL_BUTTRESS_APPERANCE, false);
+                    pSummoned->CastSpell(m_creature, SPELL_SUCKER_CHANNEL, true);
+                }
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            if (pTarget->GetEntry() == NPC_HELLFIRE_WARDLING && pSpell->Id == SPELL_SUCKER_DESPAWN_MOB)
+            {
+                ((Creature*)pTarget)->ForcedDespawn();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_bIsComplete || !m_creature->IsAlive())
+            {
+                return;
+            }
+
+            if (m_uiSpawnButtressTimer <= uiDiff)
+            {
+                if (m_uiButtressCount >= MAX_BUTTRESS)
+                {
+                    m_creature->CastSpell(m_creature, SPELL_SUCKER_DESPAWN_MOB, false);
+
+                    if (m_creature->IsInCombat())
+                    {
+                        m_creature->DeleteThreatList();
+                        m_creature->CombatStop();
+                    }
+
+                    m_bIsComplete = true;
+                    return;
+                }
+
+                m_uiSpawnButtressTimer = 45000;
+                DoSpawnButtress();
+            }
+            else
+            {
+                m_uiSpawnButtressTimer -= uiDiff;
+            }
+
+            if (m_uiSpawnDemonTimer <= uiDiff)
+            {
+                DoSpawnDemon();
+                m_uiSpawnDemonTimer = 15000;
+            }
+            else
+            {
+                m_uiSpawnDemonTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_demoniac_scryerAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (npc_demoniac_scryerAI* pScryerAI = dynamic_cast<npc_demoniac_scryerAI*>(pCreature->AI()))
+        {
+            if (pScryerAI->m_bIsComplete)
+            {
+                if (pPlayer->GetQuestStatus(QUEST_DEMONIAC) == QUEST_STATUS_INCOMPLETE)
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ATTUNE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                }
+
+                pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ATTUNED, pCreature->GetObjectGuid());
+                return true;
+            }
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_PROTECT, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pCreature->CastSpell(pPlayer, SPELL_DEMONIAC_VISITATION, false);
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_wounded_blood_elf
+######*/
+
+enum
+{
+    SAY_ELF_START               = -1000117,
+    SAY_ELF_SUMMON1             = -1000118,
+    SAY_ELF_RESTING             = -1000119,
+    SAY_ELF_SUMMON2             = -1000120,
+    SAY_ELF_COMPLETE            = -1000121,
+    SAY_ELF_AGGRO               = -1000122,
+
+    NPC_WINDWALKER              = 16966,
+    NPC_TALONGUARD              = 16967,
+
+    QUEST_ROAD_TO_FALCON_WATCH  = 9375,
+};
+
+struct npc_wounded_blood_elf : public CreatureScript
+{
+    npc_wounded_blood_elf() : CreatureScript("npc_wounded_blood_elf") {}
+
+    struct npc_wounded_blood_elfAI : public npc_escortAI
+    {
+        npc_wounded_blood_elfAI(Creature* pCreature) : npc_escortAI(pCreature) { Reset(); }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 0:
+                DoScriptText(SAY_ELF_START, m_creature, pPlayer);
+                break;
+            case 9:
+                DoScriptText(SAY_ELF_SUMMON1, m_creature, pPlayer);
+                // Spawn two Haal'eshi Talonguard
+                DoSpawnCreature(NPC_WINDWALKER, -15, -15, 0, 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                DoSpawnCreature(NPC_WINDWALKER, -17, -17, 0, 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                break;
+            case 13:
+                DoScriptText(SAY_ELF_RESTING, m_creature, pPlayer);
+                break;
+            case 14:
+                DoScriptText(SAY_ELF_SUMMON2, m_creature, pPlayer);
+                // Spawn two Haal'eshi Windwalker
+                DoSpawnCreature(NPC_WINDWALKER, -15, -15, 0, 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                DoSpawnCreature(NPC_WINDWALKER, -17, -17, 0, 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+                break;
+            case 27:
+                DoScriptText(SAY_ELF_COMPLETE, m_creature, pPlayer);
+                // Award quest credit
+                pPlayer->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH, m_creature);
+                break;
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                DoScriptText(SAY_ELF_AGGRO, m_creature);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_wounded_blood_elfAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH)
+        {
+            // Change faction so mobs attack
+            pCreature->SetFactionTemporary(FACTION_ESCORT_H_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+
+            if (npc_wounded_blood_elfAI* pEscortAI = dynamic_cast<npc_wounded_blood_elfAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_fel_guard_hound
+######*/
+
+enum
+{
+    SPELL_CREATE_POODAD         = 37688,
+    SPELL_FAKE_DOG_SPART        = 37692,
+    SPELL_INFORM_DOG            = 37689,
+
+    NPC_DERANGED_HELBOAR        = 16863,
+};
+
+struct npc_fel_guard_hound : public CreatureScript
+{
+    npc_fel_guard_hound() : CreatureScript("npc_fel_guard_hound") {}
+
+    struct npc_fel_guard_houndAI : public ScriptedPetAI
+    {
+        npc_fel_guard_houndAI(Creature* pCreature) : ScriptedPetAI(pCreature) { }
+
+        uint32 m_uiPoodadTimer;
+
+        bool m_bIsPooActive;
+
+        void Reset() override
+        {
+            m_uiPoodadTimer = 0;
+            m_bIsPooActive = false;
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+            {
+                return;
+            }
+
+            if (DoCastSpellIfCan(m_creature, SPELL_FAKE_DOG_SPART) == CAST_OK)
+            {
+                m_uiPoodadTimer = 2000;
+            }
+        }
+
+        // Function to allow the boar to move to target
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit *pInvoker, uint32 /*data*/) override //DoMoveToCorpse(Unit* pBoar)
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+            {
+                if (!pInvoker)
+                {
+                    return;
+                }
+
+                m_bIsPooActive = true;
+                m_creature->GetMotionMaster()->MovePoint(1, pInvoker->GetPositionX(), pInvoker->GetPositionY(), pInvoker->GetPositionZ());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiPoodadTimer)
+            {
+                if (m_uiPoodadTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_CREATE_POODAD) == CAST_OK)
+                    {
+                        m_uiPoodadTimer = 0;
+                        m_bIsPooActive = false;
+                    }
+                }
+                else
+                {
+                    m_uiPoodadTimer -= uiDiff;
+                }
+            }
+
+            if (!m_bIsPooActive)
+            {
+                ScriptedPetAI::UpdateAI(uiDiff);
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_fel_guard_houndAI(pCreature);
+    }
+};
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+struct spell_inform_dog : public SpellScript
+{
+    spell_inform_dog() : SpellScript("spell_inform_dog") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_INFORM_DOG && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            if (pCaster->GetEntry() == NPC_DERANGED_HELBOAR)
+            {
+                if (CreatureAI* pHoundAI = pCreatureTarget->AI())
+                {
+                    pHoundAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pCreatureTarget, pCaster, 0);
+                }
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+#endif
+
+/*######
+## npc_anchorite_barada
+######*/
+
+enum
+{
+    SAY_EXORCISM_1                  = -1000981,
+    SAY_EXORCISM_2                  = -1000982,
+    SAY_EXORCISM_3                  = -1000983,
+    SAY_EXORCISM_4                  = -1000984,
+    SAY_EXORCISM_5                  = -1000985,
+    SAY_EXORCISM_6                  = -1000986,
+
+    SPELL_BARADA_COMMANDS           = 39277,
+    SPELL_BARADA_FALTERS            = 39278,
+
+    SPELL_JULES_THREATENS           = 39284,
+    SPELL_JULES_GOES_UPRIGHT        = 39294,
+    SPELL_JULES_VOMITS              = 39295,
+    SPELL_JULES_RELEASE_DARKNESS    = 39306,                // periodic trigger missing spell 39305
+
+    NPC_ANCHORITE_BARADA            = 22431,
+    NPC_COLONEL_JULES               = 22432,
+    NPC_DARKNESS_RELEASED           = 22507,                // summoned by missing spell 39305
+
+    GOSSIP_ITEM_EXORCISM            = -3000111,
+    QUEST_ID_EXORCISM               = 10935,
+
+    TEXT_ID_CLEANSED                = 10706,
+    TEXT_ID_POSSESSED               = 10707,
+    TEXT_ID_ANCHORITE               = 10683,
+};
+
+static const DialogueEntry aExorcismDialogue[] =
+{
+    {SAY_EXORCISM_1,        NPC_ANCHORITE_BARADA,   3000},
+    {SAY_EXORCISM_2,        NPC_ANCHORITE_BARADA,   2000},
+    {QUEST_ID_EXORCISM,     0,                      0},         // start wp movemnet
+    {SAY_EXORCISM_3,        NPC_COLONEL_JULES,      3000},
+    {SPELL_BARADA_COMMANDS, 0,                      10000},
+    {SAY_EXORCISM_4,        NPC_ANCHORITE_BARADA,   10000},
+    {SAY_EXORCISM_5,        NPC_COLONEL_JULES,      10000},
+    {SPELL_BARADA_FALTERS,  0,                      2000},
+    {SPELL_JULES_THREATENS, 0,                      15000},     // start levitating
+    {NPC_COLONEL_JULES,     0,                      15000},
+    {NPC_ANCHORITE_BARADA,  0,                      15000},
+    {NPC_COLONEL_JULES,     0,                      15000},
+    {NPC_ANCHORITE_BARADA,  0,                      15000},
+    {SPELL_JULES_GOES_UPRIGHT, 0,                   3000},
+    {SPELL_JULES_VOMITS,    0,                      7000},      // start moving around the room
+    {NPC_COLONEL_JULES,     0,                      10000},
+    {NPC_ANCHORITE_BARADA,  0,                      10000},
+    {NPC_COLONEL_JULES,     0,                      10000},
+    {NPC_ANCHORITE_BARADA,  0,                      10000},
+    {NPC_COLONEL_JULES,     0,                      10000},
+    {NPC_ANCHORITE_BARADA,  0,                      10000},
+    {NPC_COLONEL_JULES,     0,                      10000},
+    {NPC_ANCHORITE_BARADA,  0,                      10000},
+    {NPC_DARKNESS_RELEASED, 0,                      5000},      // event finished
+    {SAY_EXORCISM_6,        NPC_ANCHORITE_BARADA,   3000},
+    {TEXT_ID_CLEANSED,      0,                      0},
+    {0, 0, 0},
+};
+
+static const int32 aAnchoriteTexts[3] = { -1000987, -1000988, -1000989 };
+static const int32 aColonelTexts[3] = { -1000990, -1000991, -1000992 };
+
+// Note: script is highly dependent on DBscript implementation
+struct npc_anchorite_barada : public CreatureScript
+{
+    npc_anchorite_barada() : CreatureScript("npc_anchorite_barada") {}
+
+    struct npc_anchorite_baradaAI : public ScriptedAI, private DialogueHelper
+    {
+        npc_anchorite_baradaAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aExorcismDialogue)
+        {
+        }
+
+        bool m_bEventComplete;
+        bool m_bEventInProgress;
+
+        ObjectGuid m_colonelGuid;
+
+        void Reset() override
+        {
+            m_bEventComplete = false;
+            m_bEventInProgress = false;
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            // no attack during the exorcism
+            if (m_bEventInProgress)
+                return;
+
+            ScriptedAI::AttackStart(pWho);
+        }
+
+        void EnterEvadeMode() override
+        {
+            // no evade during the exorcism
+            if (m_bEventInProgress)
+                return;
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        bool IsExorcismComplete() { return m_bEventComplete; }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                switch (eventType)
+                {
+                case AI_EVENT_START_EVENT:  // start the actuall exorcism
+                    if (Creature* pColonel = GetClosestCreatureWithEntry(m_creature, NPC_COLONEL_JULES, 15.0f))
+                        m_colonelGuid = pColonel->GetObjectGuid();
+
+                    m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                    m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+
+                    StartNextDialogueText(SAY_EXORCISM_1);
+                    break;
+                case AI_EVENT_CUSTOM_A: // event complete - give credit and reset, TODO rethink code distribution between this and the caller
+                    if (IsExorcismComplete())
+                    {
+                        // kill credit
+                        ((Player*)pInvoker)->RewardPlayerAndGroupAtEvent(pSender->GetEntry(), pSender);
+
+                        // reset Anchorite and Colonel
+                        pSender->AI()->EnterEvadeMode();
+
+                        m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                        ((Player*)pInvoker)->SEND_GOSSIP_MENU(TEXT_ID_CLEANSED, pSender->GetObjectGuid());
+                        EnterEvadeMode();
+                    }
+                    break;
+                default:
+                    break;
+                }
+            }
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != WAYPOINT_MOTION_TYPE)
+                return;
+
+            switch (uiPointId)
+            {
+            case 3:
+                // pause wp and resume dialogue
+                m_creature->addUnitState(UNIT_STAT_WAYPOINT_PAUSED);
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                m_bEventInProgress = true;
+
+                if (Creature* pColonel = m_creature->GetMap()->GetCreature(m_colonelGuid))
+                {
+                    m_creature->SetFacingToObject(pColonel);
+                    pColonel->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                }
+
+                StartNextDialogueText(SAY_EXORCISM_3);
+                break;
+            case 6:
+                // event completed - wait for player to get quest credit by gossip
+                if (Creature* pColonel = m_creature->GetMap()->GetCreature(m_colonelGuid))
+                    m_creature->SetFacingToObject(pColonel);
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                m_bEventComplete = true;
+                break;
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case QUEST_ID_EXORCISM:
+                m_creature->GetMotionMaster()->MoveWaypoint();
+                break;
+            case SPELL_BARADA_COMMANDS:
+                DoCastSpellIfCan(m_creature, SPELL_BARADA_COMMANDS);
+                break;
+            case SPELL_BARADA_FALTERS:
+                DoCastSpellIfCan(m_creature, SPELL_BARADA_FALTERS);
+                // start levitating
+                if (Creature* pColonel = m_creature->GetMap()->GetCreature(m_colonelGuid))
+                {
+                    pColonel->SetLevitate(true);
+                    pColonel->GetMotionMaster()->MovePoint(0, pColonel->GetPositionX(), pColonel->GetPositionY(), pColonel->GetPositionZ() + 2.0f);
+                }
+                break;
+            case SPELL_JULES_THREATENS:
+                if (Creature* pColonel = m_creature->GetMap()->GetCreature(m_colonelGuid))
+                {
+                    pColonel->CastSpell(pColonel, SPELL_JULES_THREATENS, true);
+                    pColonel->CastSpell(pColonel, SPELL_JULES_RELEASE_DARKNESS, true);
+                    pColonel->SetFacingTo(0);
+                }
+                break;
+            case SPELL_JULES_GOES_UPRIGHT:
+                if (Creature* pColonel = m_creature->GetMap()->GetCreature(m_colonelGuid))
+                {
+                    pColonel->InterruptNonMeleeSpells(false);
+                    pColonel->CastSpell(pColonel, SPELL_JULES_GOES_UPRIGHT, false);
+                }
+                break;
+            case SPELL_JULES_VOMITS:
+                if (Creature* pColonel = m_creature->GetMap()->GetCreature(m_colonelGuid))
+                {
+                    pColonel->CastSpell(pColonel, SPELL_JULES_VOMITS, true);
+                    pColonel->GetMotionMaster()->MoveRandomAroundPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() + 3.0f, 5.0f);
+                }
+                break;
+            case NPC_COLONEL_JULES:
+                if (Creature* pColonel = m_creature->GetMap()->GetCreature(m_colonelGuid))
+                    DoScriptText(aColonelTexts[urand(0, 2)], pColonel);
+                break;
+            case NPC_ANCHORITE_BARADA:
+                DoScriptText(aAnchoriteTexts[urand(0, 2)], m_creature);
+                break;
+            case NPC_DARKNESS_RELEASED:
+                if (Creature* pColonel = m_creature->GetMap()->GetCreature(m_colonelGuid))
+                {
+                    pColonel->RemoveAurasDueToSpell(SPELL_JULES_THREATENS);
+                    pColonel->RemoveAurasDueToSpell(SPELL_JULES_RELEASE_DARKNESS);
+                    pColonel->RemoveAurasDueToSpell(SPELL_JULES_VOMITS);
+                    pColonel->GetMotionMaster()->MoveTargetedHome();
+                    pColonel->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                }
+                break;
+            case TEXT_ID_CLEANSED:
+                if (Creature* pColonel = m_creature->GetMap()->GetCreature(m_colonelGuid))
+                {
+                    pColonel->RemoveAurasDueToSpell(SPELL_JULES_GOES_UPRIGHT);
+                    pColonel->SetLevitate(false);
+                }
+                // resume wp movemnet
+                m_creature->RemoveAllAuras();
+                m_creature->clearUnitState(UNIT_STAT_WAYPOINT_PAUSED);
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                break;
+            }
+        }
+
+        Creature* GetSpeakerByEntry(uint32 uiEntry) override
+        {
+            switch (uiEntry)
+            {
+            case NPC_ANCHORITE_BARADA:      return m_creature;
+            case NPC_COLONEL_JULES:         return m_creature->GetMap()->GetCreature(m_colonelGuid);
+
+            default:
+                return NULL;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_anchorite_baradaAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        // check if quest is active but not completed
+        if (pPlayer->IsCurrentQuest(QUEST_ID_EXORCISM, 1))
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EXORCISM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+
+        pPlayer->SEND_GOSSIP_MENU(TEXT_ID_ANCHORITE, pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_EVENT, pPlayer, pCreature);
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_colonel_jules
+######*/
+
+struct npc_colonel_jules : public CreatureScript
+{
+    npc_colonel_jules() : CreatureScript("npc_colonel_jules") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        // quest already completed
+        if (pPlayer->GetQuestStatus(QUEST_ID_EXORCISM) == QUEST_STATUS_COMPLETE)
+        {
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_CLEANSED, pCreature->GetObjectGuid());
+            return true;
+        }
+        // quest active but not complete
+        else if (pPlayer->IsCurrentQuest(QUEST_ID_EXORCISM, 1))
+        {
+            Creature* pAnchorite = GetClosestCreatureWithEntry(pCreature, NPC_ANCHORITE_BARADA, 15.0f);
+            if (!pAnchorite)
+                return true;
+
+            pCreature->AI()->SendAIEvent(AI_EVENT_CUSTOM_A, pPlayer, pAnchorite);
+            return true;
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(TEXT_ID_POSSESSED, pCreature->GetObjectGuid());
+        return true;
+    }
+};
+
+struct spell_just_release_darkness : public SpellScript
+{
+    spell_just_release_darkness() : SpellScript("spell_just_release_darkness") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_JULES_RELEASE_DARKNESS && uiEffIndex == EFFECT_INDEX_0 && pTarget->GetEntry() == NPC_COLONEL_JULES)
+        {
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            Creature* pAnchorite = GetClosestCreatureWithEntry(pCreatureTarget, NPC_ANCHORITE_BARADA, 15.0f);
+            if (!pAnchorite)
+                return false;
+
+            // get random point around the Anchorite
+            float fX, fY, fZ;
+            pCreatureTarget->GetNearPoint(pCreatureTarget, fX, fY, fZ, 5.0f, 10.0f, frand(0, M_PI_F / 2));
+
+            // spawn a Darkness Released npc and move around the room
+            if (Creature* pDarkness = pCreatureTarget->SummonCreature(NPC_DARKNESS_RELEASED, 0, 0, 0, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 20000))
+                pDarkness->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_caretaker_dilandrus
+######*/
+
+static const float aGraveYardLocation[11][4] =
+{
+    {-807.52f, 2694.01f, 105.149f, 2.58f},     // spawn point
+    {-807.922f, 2692.816f, 104.837f, 2.76f},   // grave location
+    {-805.451f, 2696.972f, 105.671f, 2.42f},   // grave location
+    {-802.575f, 2702.187f, 106.645f, 2.64f},   // grave location
+    {-811.831f, 2699.465f, 106.544f, 2.84f},   // grave location
+    {-806.366f, 2708.088f, 108.162f, 2.79f},   // grave location
+    {-820.038f, 2701.316f, 107.491f, 2.82f},   // grave location
+    {-818.042f, 2705.911f, 108.371f, 2.69f},   // grave location
+    {-815.989f, 2709.199f, 108.973f, 2.59f},   // grave location
+    {-814.213f, 2712.847f, 109.612f, 2.26f},   // grave location
+    {-810.533f, 2718.717f, 110.509f, 2.78f}    // grave location
+};
+
+struct npc_caretaker_dilandrus : public CreatureScript
+{        
+       npc_caretaker_dilandrus() : CreatureScript("npc_caretaker_dilandrus") {}
+
+    struct npc_caretaker_dilandrusAI : public ScriptedAI
+    {
+        npc_caretaker_dilandrusAI(Creature* pCreature) : ScriptedAI(pCreature) 
+        { 
+            Reset(); 
+        }
+        
+        uint32 uVisitGraveTimer, uCurrentStage, uLastGraveVisited;
+
+        void Reset() override 
+        {
+            uVisitGraveTimer = 0; 
+            uCurrentStage = 1;    
+            uLastGraveVisited = 0;
+        }
+
+        void UpdateAI(const uint32 uiDiff)
+        {
+            if (uVisitGraveTimer <= uiDiff)
+            {
+                uint32 uGraveNumber = 0;
+                if (uCurrentStage == 1) // walk to grave
+                {
+                    // time to visit grave
+                    uGraveNumber = rand() % 9 + 1;
+                    m_creature->GetMotionMaster()->MovePoint(0, aGraveYardLocation[uGraveNumber][0], aGraveYardLocation[uGraveNumber][1], aGraveYardLocation[uGraveNumber][2]);
+                    uLastGraveVisited = uGraveNumber;
+                    uCurrentStage = 2;
+                    uVisitGraveTimer = 10000;
+                }
+                else if (uCurrentStage == 2) // face gravestone
+                {
+                    m_creature->SetFacingTo(aGraveYardLocation[uGraveNumber][3]);
+                    uCurrentStage = 3;
+                    uVisitGraveTimer = 3000;
+                }
+                else if (uCurrentStage == 3) // kneel for a few second
+                {
+                    if (rand() % 3 == 0)
+                    {
+                        m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                        uVisitGraveTimer = 5000;
+                    }
+                    else uVisitGraveTimer = 0;
+                    uCurrentStage = 4;
+                }
+                else if (uCurrentStage == 4)
+                {
+                    // lay wreath - spawn it
+
+                    m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                    uCurrentStage = 5;
+                    uVisitGraveTimer = 5000;
+                }
+                else if (uCurrentStage == 5)
+                {
+                    if (rand() % 3 == 0)
+                    {
+                        m_creature->HandleEmote(EMOTE_ONESHOT_SALUTE);
+                    }
+                    else if (rand() % 6 == 0)
+                    {
+                        m_creature->HandleEmote(EMOTE_ONESHOT_CRY);
+                    }
+                    else uVisitGraveTimer = 5000;
+                    uCurrentStage = 6;
+                }
+                else if (uCurrentStage == 6) // go back to start
+                {
+                    m_creature->GetMotionMaster()->MovePoint(0, aGraveYardLocation[0][0], aGraveYardLocation[0][1], aGraveYardLocation[0][2]);
+                    m_creature->SetFacingTo(aGraveYardLocation[0][3]);
+                    uVisitGraveTimer = 900000; // visit a grave every 15 minutes
+                    uCurrentStage = 1;
+                }
+
+            }
+            else
+            {
+                uVisitGraveTimer -= uiDiff;
+            }
+
+        }
+
+    };
+        
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_caretaker_dilandrusAI(pCreature);
+    }
+};
+#if defined (WOTLK) || defined (CATA)
+/*######
+## npc_magister_aledis
+######*/
+
+enum
+{
+    SAY_ALEDIS_DEFEAT               = -1001172,
+
+    SPELL_PYROBLAST                 = 33975,
+    SPELL_FROST_NOVA                = 11831,
+    SPELL_FIREBALL                  = 20823,
+};
+
+struct npc_magister_aledis : public CreatureScript
+{
+    npc_magister_aledis() : CreatureScript("npc_magister_aledis") {}
+
+struct  npc_magister_aledisAI : public ScriptedAI
+{
+    npc_magister_aledisAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_bIsDefeated = false;
+        Reset();
+    }
+
+    uint32 m_uiPyroblastTimer;
+    uint32 m_uiFrostNovaTimer;
+    uint32 m_uiFireballTimer;
+
+    bool m_bIsDefeated;
+
+    void Reset() override
+    {
+        m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+
+        m_uiPyroblastTimer      = urand(10000, 14000);
+        m_uiFrostNovaTimer      = 0;
+        m_uiFireballTimer       = 1000;
+    }
+
+    void AttackStart(Unit* pWho) override
+    {
+        if (m_creature->Attack(pWho, false))
+        {
+            m_creature->AddThreat(pWho);
+            m_creature->SetInCombatWith(pWho);
+            pWho->SetInCombatWith(m_creature);
+            DoStartMovement(pWho, 10.0f);
+        }
+    }
+
+    void EnterEvadeMode() override
+    {
+        m_creature->RemoveAllAurasOnEvade();
+        m_creature->DeleteThreatList();
+        m_creature->CombatStop(true);
+
+        if (!m_bIsDefeated)
+            m_creature->LoadCreatureAddon(true);
+
+        if (m_creature->IsAlive())
+        {
+            if (!m_bIsDefeated)
+            {
+                m_creature->SetWalk(true);
+                m_creature->GetMotionMaster()->MoveWaypoint();
+            }
+            else
+                m_creature->GetMotionMaster()->MoveIdle();
+        }
+
+        m_creature->SetLootRecipient(NULL);
+
+        Reset();
+    }
+
+    void UpdateAI(const uint32 uiDiff) override
+    {
+        if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            return;
+
+        if (!m_bIsDefeated && m_creature->GetHealthPercent() < 25.0f)
+        {
+            // evade when defeated; faction is reset automatically
+            m_bIsDefeated = true;
+            EnterEvadeMode();
+
+            m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+            DoScriptText(SAY_ALEDIS_DEFEAT, m_creature);
+            m_creature->ForcedDespawn(60000);
+            return;
+        }
+
+        if (m_uiPyroblastTimer < uiDiff)
+        {
+            if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_PYROBLAST) == CAST_OK)
+                m_uiPyroblastTimer = urand(18000, 21000);
+        }
+        else
+            m_uiPyroblastTimer -= uiDiff;
+
+        if (m_uiFireballTimer < uiDiff)
+        {
+            if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FIREBALL) == CAST_OK)
+                m_uiFireballTimer = urand(3000, 4000);
+        }
+        else
+            m_uiFireballTimer -= uiDiff;
+
+        if (m_uiFrostNovaTimer < uiDiff)
+        {
+            if (DoCastSpellIfCan(m_creature, SPELL_FROST_NOVA) == CAST_OK)
+                m_uiFrostNovaTimer = urand(12000, 16000);
+        }
+        else
+            m_uiFrostNovaTimer -= uiDiff;
+
+        DoMeleeAttackIfReady();
+    }  
+};
+
+CreatureAI* GetAI_npc_magister_aledis(Creature* pCreature)
+{
+    return new npc_magister_aledisAI(pCreature);
+}
+};
+#endif
+
+void AddSC_hellfire_peninsula()
+{
+    Script* s;
+
+    s = new npc_aeranas();
+    s->RegisterSelf();
+    s = new npc_ancestral_wolf();
+    s->RegisterSelf();
+    s = new npc_demoniac_scryer();
+    s->RegisterSelf();
+    s = new npc_wounded_blood_elf();
+    s->RegisterSelf();
+    s = new npc_fel_guard_hound();
+    s->RegisterSelf();
+    s = new npc_anchorite_barada();
+    s->RegisterSelf();
+    s = new npc_colonel_jules();
+    s->RegisterSelf();
+    s = new spell_just_release_darkness();
+    s->RegisterSelf();
+    s = new npc_caretaker_dilandrus();
+    s->RegisterSelf();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+    s = new spell_inform_dog();
+    s->RegisterSelf();
+#endif
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_aeranas";
+    //pNewScript->GetAI = &GetAI_npc_aeranas;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_ancestral_wolf";
+    //pNewScript->GetAI = &GetAI_npc_ancestral_wolf;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_demoniac_scryer";
+    //pNewScript->GetAI = &GetAI_npc_demoniac_scryer;
+    //pNewScript->pGossipHello = &GossipHello_npc_demoniac_scryer;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_demoniac_scryer;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_wounded_blood_elf";
+    //pNewScript->GetAI = &GetAI_npc_wounded_blood_elf;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_wounded_blood_elf;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_fel_guard_hound";
+    //pNewScript->GetAI = &GetAI_npc_fel_guard_hound;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_fel_guard_hound;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_anchorite_barada";
+    //pNewScript->GetAI = &GetAI_npc_anchorite_barada;
+    //pNewScript->pGossipHello = &GossipHello_npc_anchorite_barada;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_anchorite_barada;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_colonel_jules";
+    //pNewScript->pGossipHello = &GossipHello_npc_colonel_jules;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_colonel_jules;
+    //pNewScript->RegisterSelf();
+    
+#if defined (WOTLK) || defined (CATA)
+    s = new npc_magister_aledis();
+    s->RegisterSelf();
+    
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_magister_aledis";
+    //pNewScript->GetAI = &GetAI_npc_magister_aledis;
+    //pNewScript->RegisterSelf();
+#endif
+}
diff --git a/src/modules/SD3/scripts/outland/nagrand.cpp b/src/modules/SD3/scripts/outland/nagrand.cpp
new file mode 100644
index 000000000..c81f85c74
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/nagrand.cpp
@@ -0,0 +1,639 @@
+/**
+ * ScriptDev2 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Nagrand
+SD%Complete: 90
+SDComment: Quest support: 9868, 9879, 9918, 10085, 10646, 11090.
+SDCategory: Nagrand
+EndScriptData */
+
+/* ContentData
+mob_lump
+npc_nagrand_captive
+npc_creditmarker_visit_with_ancestors
+npc_rethhedron
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## mob_lump
+######*/
+
+enum
+{
+    SAY_LUMP_AGGRO_1            = -1000190,
+    SAY_LUMP_AGGRO_2            = -1000191,
+    SAY_LUMP_DEFEAT             = -1000192,
+
+    SPELL_VISUAL_SLEEP          = 16093,
+    SPELL_SPEAR_THROW           = 32248,
+
+    FACTION_FRIENDLY            = 35
+};
+
+struct mob_lump : public CreatureScript
+{
+    mob_lump() : CreatureScript("mob_lump") {}
+
+    struct mob_lumpAI : public ScriptedAI
+    {
+        mob_lumpAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_bReset = false;
+        }
+
+        uint32 m_uiResetTimer;
+        uint32 m_uiSpearThrowTimer;
+        bool m_bReset;
+
+        void Reset() override
+        {
+            m_uiResetTimer = MINUTE * IN_MILLISECONDS;
+            m_uiSpearThrowTimer = 2000;
+        }
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            if (m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->IsFriendlyTo(pAttacker))
+            {
+                return;
+            }
+
+            AttackStart(pAttacker);
+        }
+
+        void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override
+        {
+            if (m_creature->GetHealth() < uiDamage || (m_creature->GetHealth() - uiDamage) * 100 / m_creature->GetMaxHealth() < 30)
+            {
+                uiDamage = 0;                               // Take 0 damage
+
+                m_creature->RemoveAllAuras();
+                m_creature->DeleteThreatList();
+                m_creature->CombatStop(true);
+
+                // should get unit_flags UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_PASSIVE at faction change, but unclear why/for what reason, skipped (no flags expected as default)
+                m_creature->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_REACH_HOME);
+
+                m_creature->SetStandState(UNIT_STAND_STATE_SIT);
+                DoScriptText(SAY_LUMP_DEFEAT, m_creature);
+
+                m_bReset = true;
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (m_creature->HasAura(SPELL_VISUAL_SLEEP, EFFECT_INDEX_0))
+            {
+                m_creature->RemoveAurasDueToSpell(SPELL_VISUAL_SLEEP);
+            }
+
+            if (!m_creature->IsStandState())
+            {
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_LUMP_AGGRO_1 : SAY_LUMP_AGGRO_2, m_creature, pWho);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Check if we waiting for a reset
+            if (m_bReset)
+            {
+                if (m_uiResetTimer < uiDiff)
+                {
+                    EnterEvadeMode();
+                    m_bReset = false;
+                }
+                else
+                {
+                    m_uiResetTimer -= uiDiff;
+                }
+            }
+
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // SpearThrow Timer
+            if (m_uiSpearThrowTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_SPEAR_THROW);
+                m_uiSpearThrowTimer = 20000;
+            }
+            else
+            {
+                m_uiSpearThrowTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_lumpAI(pCreature);
+    }
+};
+
+/*######
+## npc_nagrand_captive
+#####*/
+
+enum
+{
+    SAY_MAG_START               = -1000482,
+    SAY_MAG_NO_ESCAPE           = -1000483,
+    SAY_MAG_MORE                = -1000484,
+    SAY_MAG_MORE_REPLY          = -1000485,
+    SAY_MAG_LIGHTNING           = -1000486,
+    SAY_MAG_SHOCK               = -1000487,
+    SAY_MAG_COMPLETE            = -1000488,
+
+    SAY_KUR_START               = -1001001,
+    SAY_KUR_AMBUSH_1            = -1001002,
+    SAY_KUR_AMBUSH_2            = -1001003,
+    SAY_KUR_COMPLETE_1          = -1001004,
+    SAY_KUR_COMPLETE_2          = -1001005,
+
+    SPELL_CHAIN_LIGHTNING       = 16006,
+    SPELL_EARTHBIND_TOTEM       = 15786,
+    SPELL_FROST_SHOCK           = 12548,
+    SPELL_HEALING_WAVE          = 12491,
+
+    QUEST_TOTEM_KARDASH_H       = 9868,
+    QUEST_TOTEM_KARDASH_A       = 9879,
+
+    NPC_KURENAI_CAPTIVE         = 18209,
+    NPC_MAGHAR_CAPTIVE          = 18210,
+    NPC_MURK_RAIDER             = 18203,
+    NPC_MURK_BRUTE              = 18211,
+    NPC_MURK_SCAVENGER          = 18207,
+    NPC_MURK_PUTRIFIER          = 18202
+};
+
+static float m_afAmbushA[] = { -1568.805786f, 8533.873047f, 1.958f};
+static float m_afAmbushB[] = { -1491.554321f, 8506.483398f, 1.248f};
+
+struct npc_nagrand_captive : public CreatureScript
+{
+    npc_nagrand_captive() : CreatureScript("npc_nagrand_captive") {}
+
+    struct npc_nagrand_captiveAI : public npc_escortAI
+    {
+        npc_nagrand_captiveAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        uint32 m_uiChainLightningTimer;
+        uint32 m_uiHealTimer;
+        uint32 m_uiFrostShockTimer;
+
+        void Reset() override
+        {
+            m_uiChainLightningTimer = 1000;
+            m_uiHealTimer = 0;
+            m_uiFrostShockTimer = 6000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_EARTHBIND_TOTEM);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (m_creature->GetEntry() == NPC_MAGHAR_CAPTIVE)
+                {
+                    m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                    m_creature->SetFactionTemporary(FACTION_ESCORT_H_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+
+                    DoScriptText(SAY_MAG_START, m_creature);
+
+                    m_creature->SummonCreature(NPC_MURK_RAIDER, m_afAmbushA[0] + 2.5f, m_afAmbushA[1] - 2.5f, m_afAmbushA[2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                    m_creature->SummonCreature(NPC_MURK_PUTRIFIER, m_afAmbushA[0] - 2.5f, m_afAmbushA[1] + 2.5f, m_afAmbushA[2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                    m_creature->SummonCreature(NPC_MURK_BRUTE, m_afAmbushA[0], m_afAmbushA[1], m_afAmbushA[2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                }
+                else if (m_creature->GetEntry() == NPC_KURENAI_CAPTIVE)
+                {
+                    m_creature->SetFactionTemporary(FACTION_ESCORT_A_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+
+                    DoScriptText(SAY_KUR_START, m_creature);
+
+                    m_creature->SummonCreature(NPC_MURK_RAIDER, -1509.606f, 8484.284f, -3.841f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                    m_creature->SummonCreature(NPC_MURK_PUTRIFIER, -1532.475f, 8454.706f, -4.102f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                    m_creature->SummonCreature(NPC_MURK_BRUTE, -1525.484f, 8475.383f, -2.482f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                }
+
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 7:
+                if (m_creature->GetEntry() == NPC_MAGHAR_CAPTIVE)
+                    DoScriptText(SAY_MAG_MORE, m_creature);
+                else if (m_creature->GetEntry() == NPC_KURENAI_CAPTIVE)
+                    DoScriptText(urand(0, 1) ? SAY_KUR_AMBUSH_1 : SAY_KUR_AMBUSH_2, m_creature);
+
+                if (Creature* pTemp = m_creature->SummonCreature(NPC_MURK_PUTRIFIER, m_afAmbushB[0], m_afAmbushB[1], m_afAmbushB[2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000))
+                {
+                    DoScriptText(SAY_MAG_MORE_REPLY, pTemp);
+                }
+
+                m_creature->SummonCreature(NPC_MURK_PUTRIFIER, m_afAmbushB[0] - 2.5f, m_afAmbushB[1] - 2.5f, m_afAmbushB[2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+
+                m_creature->SummonCreature(NPC_MURK_SCAVENGER, m_afAmbushB[0] + 2.5f, m_afAmbushB[1] + 2.5f, m_afAmbushB[2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                m_creature->SummonCreature(NPC_MURK_SCAVENGER, m_afAmbushB[0] + 2.5f, m_afAmbushB[1] - 2.5f, m_afAmbushB[2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                break;
+            case 16:
+                if (m_creature->GetEntry() == NPC_MAGHAR_CAPTIVE)
+                    DoScriptText(SAY_MAG_COMPLETE, m_creature);
+                else if (m_creature->GetEntry() == NPC_KURENAI_CAPTIVE)
+                    DoScriptText(urand(0, 1) ? SAY_KUR_COMPLETE_1 : SAY_KUR_COMPLETE_2, m_creature);
+
+                if (Player* pPlayer = GetPlayerForEscort())
+                    pPlayer->GroupEventHappens(m_creature->GetEntry() == NPC_MAGHAR_CAPTIVE ? QUEST_TOTEM_KARDASH_H : QUEST_TOTEM_KARDASH_A, m_creature);
+
+                SetRun();
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_MURK_BRUTE)
+            {
+                DoScriptText(SAY_MAG_NO_ESCAPE, pSummoned);
+            }
+
+            if (pSummoned->IsTotem())
+            {
+                return;
+            }
+
+            pSummoned->SetWalk(false);
+            pSummoned->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+        }
+
+        void SpellHitTarget(Unit* /*pTarget*/, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_CHAIN_LIGHTNING)
+            {
+                if (urand(0, 9))
+                {
+                    return;
+                }
+
+                DoScriptText(SAY_MAG_LIGHTNING, m_creature);
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiChainLightningTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CHAIN_LIGHTNING) == CAST_OK)
+                    m_uiChainLightningTimer = urand(7000, 14000);
+            }
+            else
+            {
+                m_uiChainLightningTimer -= uiDiff;
+            }
+
+            if (m_creature->GetHealthPercent() < 30.0f)
+            {
+                if (m_uiHealTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_HEALING_WAVE) == CAST_OK)
+                        m_uiHealTimer = 5000;
+                }
+                else
+                {
+                    m_uiHealTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiFrostShockTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROST_SHOCK) == CAST_OK)
+                    m_uiFrostShockTimer = urand(7500, 15000);
+            }
+            else
+            {
+                m_uiFrostShockTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_TOTEM_KARDASH_H || pQuest->GetQuestId() == QUEST_TOTEM_KARDASH_A)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_nagrand_captiveAI(pCreature);
+    }
+};
+
+/*######
+## npc_creditmarker_visist_with_ancestors (Quest 10085)
+######*/
+
+enum
+{
+    QUEST_VISIT_WITH_ANCESTORS  = 10085
+};
+
+struct npc_creditmarker_visit_with_ancestors : public CreatureScript
+{
+    npc_creditmarker_visit_with_ancestors() : CreatureScript("npc_creditmarker_visit_with_ancestors") {}
+
+    struct npc_creditmarker_visit_with_ancestorsAI : public ScriptedAI
+    {
+        npc_creditmarker_visit_with_ancestorsAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 30.0f))
+            {
+                if (((Player*)pWho)->GetQuestStatus(QUEST_VISIT_WITH_ANCESTORS) == QUEST_STATUS_INCOMPLETE)
+                {
+                    uint32 creditMarkerId = m_creature->GetEntry();
+                    if ((creditMarkerId >= 18840) && (creditMarkerId <= 18843))
+                    {
+                        // 18840: Sunspring, 18841: Laughing, 18842: Garadar, 18843: Bleeding
+                        if (!((Player*)pWho)->GetReqKillOrCastCurrentCount(QUEST_VISIT_WITH_ANCESTORS, creditMarkerId))
+                        {
+                            ((Player*)pWho)->KilledMonsterCredit(creditMarkerId, m_creature->GetObjectGuid());
+                        }
+                    }
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_creditmarker_visit_with_ancestorsAI(pCreature);
+    }
+};
+
+/*######
+## npc_rethhedron
+######*/
+
+enum
+{
+    SAY_LOW_HP                      = -1000966,
+    SAY_EVENT_END                   = -1000967,
+
+    SPELL_CRIPPLE                   = 41281,
+    SPELL_SHADOW_BOLT               = 41280,
+    SPELL_ABYSSAL_TOSS              = 41283,                // summon npc 23416 at target position
+    SPELL_ABYSSAL_IMPACT            = 41284,
+    // SPELL_GROUND_AIR_PULSE       = 41270,                // spell purpose unk
+    // SPELL_AGGRO_CHECK            = 41285,                // spell purpose unk
+    // SPELL_AGGRO_BURST            = 41286,                // spell purpose unk
+
+    SPELL_COSMETIC_LEGION_RING      = 41339,
+    SPELL_QUEST_COMPLETE            = 41340,
+
+    NPC_SPELLBINDER                 = 22342,
+    NPC_RETHHEDRONS_TARGET          = 23416,
+
+    POINT_ID_PORTAL_FRONT           = 0,
+    POINT_ID_PORTAL                 = 1,
+};
+
+static const float afRethhedronPos[2][3] =
+{
+    { -1502.39f, 9772.33f, 200.421f},
+    { -1557.93f, 9834.34f, 200.949f}
+};
+
+struct npc_rethhedron : public CreatureScript
+{
+    npc_rethhedron() : CreatureScript("npc_rethhedron") {}
+
+    struct npc_rethhedronAI : public ScriptedAI
+    {
+        npc_rethhedronAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiCrippleTimer;
+        uint32 m_uiShadowBoltTimer;
+        uint32 m_uiAbyssalTossTimer;
+        uint32 m_uiDelayTimer;
+
+        bool m_bLowHpYell;
+        bool m_bEventFinished;
+
+        void Reset() override
+        {
+            m_uiCrippleTimer = urand(5000, 9000);
+            m_uiShadowBoltTimer = urand(1000, 3000);
+            m_uiAbyssalTossTimer = 0;
+            m_uiDelayTimer = 0;
+
+            m_bLowHpYell = false;
+            m_bEventFinished = false;
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                DoStartMovement(pWho, 30.0f);
+            }
+        }
+
+        void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override
+        {
+            // go to epilog at 10% health
+            if (!m_bEventFinished && m_creature->GetHealthPercent() < 10.0f)
+            {
+                m_creature->InterruptNonMeleeSpells(false);
+                m_creature->GetMotionMaster()->Clear();
+                m_creature->GetMotionMaster()->MovePoint(POINT_ID_PORTAL_FRONT, afRethhedronPos[0][0], afRethhedronPos[0][1], afRethhedronPos[0][2]);
+                m_bEventFinished = true;
+            }
+
+            // npc is not allowed to die
+            if (m_creature->GetHealth() < uiDamage)
+                uiDamage = 0;
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE)
+                return;
+
+            if (uiPointId == POINT_ID_PORTAL_FRONT)
+            {
+                DoScriptText(SAY_EVENT_END, m_creature);
+                m_creature->GetMotionMaster()->MoveIdle();
+                m_uiDelayTimer = 2000;
+            }
+            else if (uiPointId == POINT_ID_PORTAL)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_COSMETIC_LEGION_RING, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_QUEST_COMPLETE, CAST_TRIGGERED);
+                m_creature->GetMotionMaster()->MoveIdle();
+                m_creature->ForcedDespawn(2000);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_RETHHEDRONS_TARGET)
+                pSummoned->CastSpell(pSummoned, SPELL_ABYSSAL_IMPACT, true);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiDelayTimer)
+            {
+                if (m_uiDelayTimer <= uiDiff)
+                {
+                    m_creature->GetMotionMaster()->Clear();
+                    m_creature->GetMotionMaster()->MovePoint(POINT_ID_PORTAL, afRethhedronPos[1][0], afRethhedronPos[1][1], afRethhedronPos[1][2]);
+                    m_uiDelayTimer = 0;
+                }
+                else
+                    m_uiDelayTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_bEventFinished)
+                return;
+
+            if (m_uiCrippleTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CRIPPLE) == CAST_OK)
+                    m_uiCrippleTimer = urand(20000, 30000);
+            }
+            else
+                m_uiCrippleTimer -= uiDiff;
+
+            if (m_uiShadowBoltTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHADOW_BOLT) == CAST_OK)
+                    m_uiShadowBoltTimer = urand(3000, 5000);
+            }
+            else
+                m_uiShadowBoltTimer -= uiDiff;
+
+            if (m_uiAbyssalTossTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ABYSSAL_TOSS) == CAST_OK)
+                    m_uiAbyssalTossTimer = urand(500, 2000);
+            }
+            else
+                m_uiAbyssalTossTimer -= uiDiff;
+
+            if (!m_bLowHpYell && m_creature->GetHealthPercent() < 40.0f)
+            {
+                DoScriptText(SAY_LOW_HP, m_creature);
+                m_bLowHpYell = true;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_rethhedronAI(pCreature);
+    }
+};
+
+void AddSC_nagrand()
+{
+    Script* s;
+
+    s = new mob_lump();
+    s->RegisterSelf();
+    s = new npc_nagrand_captive();
+    s->RegisterSelf();
+    s = new npc_creditmarker_visit_with_ancestors();
+    s->RegisterSelf();
+    s = new npc_rethhedron();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_lump";
+    //pNewScript->GetAI = &GetAI_mob_lump;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_nagrand_captive";
+    //pNewScript->GetAI = &GetAI_npc_nagrand_captive;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_nagrand_captive;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_creditmarker_visit_with_ancestors";
+    //pNewScript->GetAI = &GetAI_npc_creditmarker_visit_with_ancestors;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_rethhedron";
+    //pNewScript->GetAI = &GetAI_npc_rethhedron;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/netherstorm.cpp b/src/modules/SD3/scripts/outland/netherstorm.cpp
new file mode 100644
index 000000000..56a1b53eb
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/netherstorm.cpp
@@ -0,0 +1,1840 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Netherstorm
+SD%Complete: 80
+SDComment: Quest support: 10191, 10198, 10299, 10310, 10321, 10322, 10323, 10329, 10330, 10337, 10338, 10365(Shutting Down Manaforge), 10406, 10425, 10438, 10924.
+SDCategory: Netherstorm
+EndScriptData */
+
+/* ContentData
+npc_manaforge_control_console
+go_manaforge_control_console
+npc_commander_dawnforge
+npc_bessy
+npc_maxx_a_million
+npc_zeppit
+npc_protectorate_demolitionist
+npc_captured_vanguard
+npc_drijya
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "pet_ai.h"
+
+/*######
+## npc_manaforge_control_console
+######*/
+enum
+{
+    EMOTE_START                  = -1000211,
+    EMOTE_60                     = -1000212,
+    EMOTE_30                     = -1000213,
+    EMOTE_10                     = -1000214,
+    EMOTE_COMPLETE               = -1000215,
+    EMOTE_ABORT                  = -1000216,
+
+    NPC_BNAAR_C_CONSOLE          = 20209,
+    NPC_CORUU_C_CONSOLE          = 20417,
+    NPC_DURO_C_CONSOLE           = 20418,
+    NPC_ARA_C_CONSOLE            = 20440,
+
+    NPC_SUNFURY_TECH             = 20218,
+    NPC_SUNFURY_PROT             = 20436,
+
+    NPC_ARA_TECH                 = 20438,
+    NPC_ARA_ENGI                 = 20439,
+    NPC_ARA_GORKLONN             = 20460,
+
+    QUEST_SHUTDOWN_BNAAR_ALDOR   = 10299,
+    QUEST_SHUTDOWN_BNAAR_SCRYERS = 10329,
+    QUEST_SHUTDOWN_CORUU_ALDOR   = 10321,
+    QUEST_SHUTDOWN_CORUU_SCRYERS = 10330,
+    QUEST_SHUTDOWN_DURO_ALDOR    = 10322,
+    QUEST_SHUTDOWN_DURO_SCRYERS  = 10338,
+    QUEST_SHUTDOWN_ARA_ALDOR     = 10323,
+    QUEST_SHUTDOWN_ARA_SCRYERS   = 10365,
+
+    ITEM_BNAAR_ACESS_CRYSTAL     = 29366,
+    ITEM_CORUU_ACESS_CRYSTAL     = 29396,
+    ITEM_DURO_ACESS_CRYSTAL      = 29397,
+    ITEM_ARA_ACESS_CRYSTAL       = 29411,
+
+    SPELL_DISABLE_VISUAL         = 35031,
+    SPELL_INTERRUPT_1            = 35016,                   // ACID mobs should cast this
+    SPELL_INTERRUPT_2            = 35176,                   // ACID mobs should cast this (Manaforge Ara-version)
+};
+
+struct npc_manaforge_control_console : public CreatureScript
+{
+    npc_manaforge_control_console() : CreatureScript("npc_manaforge_control_console") {}
+
+    struct npc_manaforge_control_consoleAI : public ScriptedAI
+    {
+        npc_manaforge_control_consoleAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_playerGuid;
+        ObjectGuid m_consoleGuid;
+        uint32 m_uiEventTimer;
+        uint32 m_uiWaveTimer;
+        uint32 m_uiPhase;
+        bool   m_bWave;
+
+        void Reset() override
+        {
+            m_playerGuid.Clear();
+            m_consoleGuid.Clear();
+            m_uiEventTimer = 3000;
+            m_uiWaveTimer = 0;
+            m_uiPhase = 1;
+            m_bWave = false;
+        }
+
+        /*void SpellHit(Unit *caster, const SpellEntry *spell) override
+        {
+        // we have no way of telling the creature was hit by spell -> got aura applied after 10-12 seconds
+        // then no way for the mobs to actually stop the shutdown as intended.
+        // ** NO, we have such way with Unit::m_Events event processor
+        if (spell->Id == SPELL_INTERRUPT_1)
+        ...
+        }*/
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(EMOTE_ABORT, m_creature);
+
+            Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+
+            if (pPlayer)
+            {
+                switch (m_creature->GetEntry())
+                {
+                case NPC_BNAAR_C_CONSOLE:
+                    pPlayer->FailQuest(QUEST_SHUTDOWN_BNAAR_ALDOR);
+                    pPlayer->FailQuest(QUEST_SHUTDOWN_BNAAR_SCRYERS);
+                    break;
+                case NPC_CORUU_C_CONSOLE:
+                    pPlayer->FailQuest(QUEST_SHUTDOWN_CORUU_ALDOR);
+                    pPlayer->FailQuest(QUEST_SHUTDOWN_CORUU_SCRYERS);
+                    break;
+                case NPC_DURO_C_CONSOLE:
+                    pPlayer->FailQuest(QUEST_SHUTDOWN_DURO_ALDOR);
+                    pPlayer->FailQuest(QUEST_SHUTDOWN_DURO_SCRYERS);
+                    break;
+                case NPC_ARA_C_CONSOLE:
+                    pPlayer->FailQuest(QUEST_SHUTDOWN_ARA_ALDOR);
+                    pPlayer->FailQuest(QUEST_SHUTDOWN_ARA_SCRYERS);
+                    break;
+                }
+            }
+
+            if (GameObject* pGo = m_creature->GetMap()->GetGameObject(m_consoleGuid))
+            {
+                pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
+            }
+        }
+
+        void JustSummoned(GameObject* pGo) override
+        {
+            // supposing no GO summon really happens, this is used just as an interface to transfer GO guid
+            // in other case, we should ensure correct GO by checking GO entry or script
+            m_consoleGuid = pGo->GetObjectGuid();
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32/*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature && pInvoker->GetTypeId() == TYPEID_PLAYER)
+                m_playerGuid = pInvoker->GetObjectGuid();
+        }
+
+        void DoWaveSpawnForCreature(Creature* pCreature)
+        {
+            Creature* pAdd = NULL;
+
+            switch (pCreature->GetEntry())
+            {
+            case NPC_BNAAR_C_CONSOLE:
+                if (urand(0, 1))
+                {
+                    if (pAdd = m_creature->SummonCreature(NPC_SUNFURY_TECH, 2933.68f, 4162.55f, 164.00f, 1.60f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                    {
+                        pAdd->GetMotionMaster()->MovePoint(0, 2927.36f, 4212.97f, 164.00f);
+                    }
+                }
+                else
+                {
+                    if (pAdd = m_creature->SummonCreature(NPC_SUNFURY_TECH, 2927.36f, 4212.97f, 164.00f, 4.94f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                    {
+                        pAdd->GetMotionMaster()->MovePoint(0, 2933.68f, 4162.55f, 164.00f);
+                    }
+                }
+                m_uiWaveTimer = 30000;
+                break;
+            case NPC_CORUU_C_CONSOLE:
+                if (pAdd = m_creature->SummonCreature(NPC_SUNFURY_TECH, 2445.21f, 2765.26f, 134.49f, 3.93f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                {
+                    pAdd->GetMotionMaster()->MovePoint(0, 2424.21f, 2740.15f, 133.81f);
+                }
+                if (pAdd = m_creature->SummonCreature(NPC_SUNFURY_TECH, 2429.86f, 2731.85f, 134.53f, 1.31f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                {
+                    pAdd->GetMotionMaster()->MovePoint(0, 2435.37f, 2766.04f, 133.81f);
+                }
+                m_uiWaveTimer = 20000;
+                break;
+            case NPC_DURO_C_CONSOLE:
+                if (pAdd = m_creature->SummonCreature(NPC_SUNFURY_TECH, 2986.80f, 2205.36f, 165.37f, 3.74f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                {
+                    pAdd->GetMotionMaster()->MovePoint(0, 2985.15f, 2197.32f, 164.79f);
+                }
+                if (pAdd = m_creature->SummonCreature(NPC_SUNFURY_TECH, 2952.91f, 2191.20f, 165.32f, 0.22f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                {
+                    pAdd->GetMotionMaster()->MovePoint(0, 2060.01f, 2185.27f, 164.67f);
+                }
+                m_uiWaveTimer = 15000;
+                break;
+            case NPC_ARA_C_CONSOLE:
+                if (urand(0, 1))
+                {
+                    if (pAdd = m_creature->SummonCreature(NPC_ARA_TECH, 4035.11f, 4038.97f, 194.27f, 2.57f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                    {
+                        pAdd->GetMotionMaster()->MovePoint(0, 4003.42f, 4040.19f, 193.49f);
+                    }
+                    if (pAdd = m_creature->SummonCreature(NPC_ARA_TECH, 4033.66f, 4036.79f, 194.28f, 2.57f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                    {
+                        pAdd->GetMotionMaster()->MovePoint(0, 4003.42f, 4040.19f, 193.49f);
+                    }
+                    if (pAdd = m_creature->SummonCreature(NPC_ARA_TECH, 4037.13f, 4037.30f, 194.23f, 2.57f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                    {
+                        pAdd->GetMotionMaster()->MovePoint(0, 4003.42f, 4040.19f, 193.49f);
+                    }
+                }
+                else
+                {
+                    if (pAdd = m_creature->SummonCreature(NPC_ARA_TECH, 3099.59f, 4049.30f, 194.22f, 0.05f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                    {
+                        pAdd->GetMotionMaster()->MovePoint(0, 4028.01f, 4035.17f, 193.59f);
+                    }
+                    if (pAdd = m_creature->SummonCreature(NPC_ARA_TECH, 3999.72f, 4046.75f, 194.22f, 0.05f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                    {
+                        pAdd->GetMotionMaster()->MovePoint(0, 4028.01f, 4035.17f, 193.59f);
+                    }
+                    if (pAdd = m_creature->SummonCreature(NPC_ARA_TECH, 3996.81f, 4048.26f, 194.22f, 0.05f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                    {
+                        pAdd->GetMotionMaster()->MovePoint(0, 4028.01f, 4035.17f, 193.59f);
+                    }
+                }
+                m_uiWaveTimer = 15000;
+                break;
+            }
+        }
+
+        void DoFinalSpawnForCreature(Creature* pCreature)
+        {
+            Creature* pAdd = NULL;
+
+            switch (pCreature->GetEntry())
+            {
+            case NPC_BNAAR_C_CONSOLE:
+                if (pAdd = m_creature->SummonCreature(NPC_SUNFURY_TECH, 2946.52f, 4201.42f, 163.47f, 3.54f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                {
+                    pAdd->GetMotionMaster()->MovePoint(0, 2927.49f, 4192.81f, 163.00f);
+                }
+                break;
+            case NPC_CORUU_C_CONSOLE:
+                if (pAdd = m_creature->SummonCreature(NPC_SUNFURY_TECH, 2453.88f, 2737.85f, 133.27f, 2.59f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                {
+                    pAdd->GetMotionMaster()->MovePoint(0, 2433.96f, 2751.53f, 133.85f);
+                }
+                if (pAdd = m_creature->SummonCreature(NPC_SUNFURY_TECH, 2441.62f, 2735.32f, 134.49f, 1.97f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                {
+                    pAdd->GetMotionMaster()->MovePoint(0, 2433.96f, 2751.53f, 133.85f);
+                }
+                if (pAdd = m_creature->SummonCreature(NPC_SUNFURY_TECH, 2450.73f, 2754.50f, 134.49f, 3.29f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                {
+                    pAdd->GetMotionMaster()->MovePoint(0, 2433.96f, 2751.53f, 133.85f);
+                }
+                break;
+            case NPC_DURO_C_CONSOLE:
+                if (pAdd = m_creature->SummonCreature(NPC_SUNFURY_TECH, 2956.18f, 2202.85f, 165.32f, 5.45f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                {
+                    pAdd->GetMotionMaster()->MovePoint(0, 2972.27f, 2193.22f, 164.48f);
+                }
+                if (pAdd = m_creature->SummonCreature(NPC_SUNFURY_TECH, 2975.30f, 2211.50f, 165.32f, 4.55f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                {
+                    pAdd->GetMotionMaster()->MovePoint(0, 2972.27f, 2193.22f, 164.48f);
+                }
+                if (pAdd = m_creature->SummonCreature(NPC_SUNFURY_PROT, 2965.02f, 2217.45f, 164.16f, 4.96f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                {
+                    pAdd->GetMotionMaster()->MovePoint(0, 2972.27f, 2193.22f, 164.48f);
+                }
+                break;
+            case NPC_ARA_C_CONSOLE:
+                if (pAdd = m_creature->SummonCreature(NPC_ARA_ENGI, 3994.51f, 4020.46f, 192.18f, 0.91f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                {
+                    pAdd->GetMotionMaster()->MovePoint(0, 4008.35f, 4035.04f, 192.70f);
+                }
+                if (pAdd = m_creature->SummonCreature(NPC_ARA_GORKLONN, 4021.56f, 4059.35f, 193.59f, 4.44f, TEMPSUMMON_TIMED_OOC_DESPAWN, 120000))
+                {
+                    pAdd->GetMotionMaster()->MovePoint(0, 4016.62f, 4039.89f, 193.46f);
+                }
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiEventTimer < uiDiff)
+            {
+                Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+
+                if (!pPlayer)
+                {
+                    // Reset Event
+                    if (GameObject* pGo = m_creature->GetMap()->GetGameObject(m_consoleGuid))
+                    {
+                        pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
+                    }
+
+                    m_creature->ForcedDespawn();
+                    return;
+                }
+
+                switch (m_uiPhase)
+                {
+                case 1:
+                    DoScriptText(EMOTE_START, m_creature, pPlayer);
+                    m_uiEventTimer = 60000;
+                    m_bWave = true;
+                    ++m_uiPhase;
+                    break;
+                case 2:
+                    DoScriptText(EMOTE_60, m_creature, pPlayer);
+                    m_uiEventTimer = 30000;
+                    ++m_uiPhase;
+                    break;
+                case 3:
+                    DoScriptText(EMOTE_30, m_creature, pPlayer);
+                    m_uiEventTimer = 20000;
+                    DoFinalSpawnForCreature(m_creature);
+                    ++m_uiPhase;
+                    break;
+                case 4:
+                    DoScriptText(EMOTE_10, m_creature, pPlayer);
+                    m_uiEventTimer = 10000;
+                    m_bWave = false;
+                    ++m_uiPhase;
+                    break;
+                case 5:
+                    DoScriptText(EMOTE_COMPLETE, m_creature, pPlayer);
+                    pPlayer->KilledMonsterCredit(m_creature->GetEntry(), m_creature->GetObjectGuid());
+                    DoCastSpellIfCan(m_creature, SPELL_DISABLE_VISUAL);
+
+                    if (GameObject* pGo = m_creature->GetMap()->GetGameObject(m_consoleGuid))
+                    {
+                        pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
+                    }
+
+                    ++m_uiPhase;
+                    break;
+                }
+            }
+            else
+            {
+                m_uiEventTimer -= uiDiff;
+            }
+
+            if (m_bWave)
+            {
+                if (m_uiWaveTimer < uiDiff)
+                {
+                    DoWaveSpawnForCreature(m_creature);
+                }
+                else
+                {
+                    m_uiWaveTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_manaforge_control_consoleAI(pCreature);
+    }
+};
+
+/*######
+## go_manaforge_control_console
+######*/
+
+// TODO: clean up this workaround when mangos adds support to do it properly (with gossip selections instead of instant summon)
+struct go_manaforge_control_console : public GameObjectScript
+{
+    go_manaforge_control_console() : GameObjectScript("go_manaforge_control_console") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        if (pGo->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
+        {
+            pPlayer->PrepareQuestMenu(pGo->GetObjectGuid());
+            pPlayer->SendPreparedQuest(pGo->GetObjectGuid());
+        }
+
+        Creature* pManaforge = NULL;
+
+        switch (pGo->GetAreaId())
+        {
+        case 3726:                                          // b'naar
+            if ((pPlayer->GetQuestStatus(QUEST_SHUTDOWN_BNAAR_ALDOR) == QUEST_STATUS_INCOMPLETE
+                || pPlayer->GetQuestStatus(QUEST_SHUTDOWN_BNAAR_SCRYERS) == QUEST_STATUS_INCOMPLETE)
+                && pPlayer->HasItemCount(ITEM_BNAAR_ACESS_CRYSTAL, 1))
+            {
+                pManaforge = pPlayer->SummonCreature(NPC_BNAAR_C_CONSOLE, 2918.95f, 4189.98f, 161.88f, 0.34f, TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN, 125000);
+            }
+            break;
+        case 3730:                                          // coruu
+            if ((pPlayer->GetQuestStatus(QUEST_SHUTDOWN_CORUU_ALDOR) == QUEST_STATUS_INCOMPLETE
+                || pPlayer->GetQuestStatus(QUEST_SHUTDOWN_CORUU_SCRYERS) == QUEST_STATUS_INCOMPLETE)
+                && pPlayer->HasItemCount(ITEM_CORUU_ACESS_CRYSTAL, 1))
+            {
+                pManaforge = pPlayer->SummonCreature(NPC_CORUU_C_CONSOLE, 2426.77f, 2750.38f, 133.24f, 2.14f, TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN, 125000);
+            }
+            break;
+        case 3734:                                          // duro
+            if ((pPlayer->GetQuestStatus(QUEST_SHUTDOWN_DURO_ALDOR) == QUEST_STATUS_INCOMPLETE
+                || pPlayer->GetQuestStatus(QUEST_SHUTDOWN_DURO_SCRYERS) == QUEST_STATUS_INCOMPLETE)
+                && pPlayer->HasItemCount(ITEM_DURO_ACESS_CRYSTAL, 1))
+            {
+                pManaforge = pPlayer->SummonCreature(NPC_DURO_C_CONSOLE, 2976.48f, 2183.29f, 163.20f, 1.85f, TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN, 125000);
+            }
+            break;
+        case 3722:                                          // ara
+            if ((pPlayer->GetQuestStatus(QUEST_SHUTDOWN_ARA_ALDOR) == QUEST_STATUS_INCOMPLETE
+                || pPlayer->GetQuestStatus(QUEST_SHUTDOWN_ARA_SCRYERS) == QUEST_STATUS_INCOMPLETE)
+                && pPlayer->HasItemCount(ITEM_ARA_ACESS_CRYSTAL, 1))
+            {
+                pManaforge = pPlayer->SummonCreature(NPC_ARA_C_CONSOLE, 4013.71f, 4028.76f, 192.10f, 1.25f, TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN, 125000);
+            }
+            break;
+        }
+
+        if (pManaforge)
+        {
+            if (CreatureAI* pManaforgeAI = pManaforge->AI())
+            {
+                pManaforgeAI->JustSummoned(pGo);    //a weird way to transfer GO guid, isn't it?
+                pManaforgeAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pManaforge, pPlayer, 0);
+            }
+
+            pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
+        }
+        return true;
+    }
+};
+
+/*######
+## npc_commander_dawnforge
+######*/
+
+// The Speech of Dawnforge, Ardonis & Pathaleon
+enum
+{
+    SAY_COMMANDER_DAWNFORGE_1              = -1000128,
+    SAY_ARCANIST_ARDONIS_1                 = -1000129,
+    SAY_COMMANDER_DAWNFORGE_2              = -1000130,
+    SAY_PATHALEON_THE_CALCULATOR_IMAGE_1   = -1000131,
+    SAY_COMMANDER_DAWNFORGE_3              = -1000132,
+    SAY_PATHALEON_THE_CALCULATOR_IMAGE_2   = -1000133,
+    SAY_PATHALEON_THE_CALCULATOR_IMAGE_2_1 = -1000134,
+    SAY_PATHALEON_THE_CALCULATOR_IMAGE_2_2 = -1000135,
+    SAY_COMMANDER_DAWNFORGE_4              = -1000136,
+    SAY_ARCANIST_ARDONIS_2                 = -1000136,
+    SAY_COMMANDER_DAWNFORGE_5              = -1000137,
+
+    QUEST_INFO_GATHERING                   = 10198,
+    SPELL_SUNFURY_DISGUISE                 = 34603,
+
+    NPC_ARCANIST_ARDONIS                   = 19830,
+    NPC_COMMANDER_DAWNFORGE                = 19831,
+    NPC_PATHALEON_THE_CALCULATOR_IMAGE     = 21504
+};
+
+struct npc_commander_dawnforge : public CreatureScript
+{
+    npc_commander_dawnforge() : CreatureScript("npc_commander_dawnforge") {}
+
+    struct npc_commander_dawnforgeAI : public ScriptedAI
+    {
+        npc_commander_dawnforgeAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_playerGuid;
+        ObjectGuid m_ardonisGuid;
+        ObjectGuid m_pathaleonGuid;
+
+        uint32 m_uiPhase;
+        uint32 m_uiPhaseSubphase;
+        uint32 m_uiPhaseTimer;
+        bool   m_bIsEvent;
+
+        void Reset() override
+        {
+            m_playerGuid.Clear();
+            m_ardonisGuid.Clear();
+            m_pathaleonGuid.Clear();
+
+            m_uiPhase = 1;
+            m_uiPhaseSubphase = 0;
+            m_uiPhaseTimer = 4000;
+            m_bIsEvent = false;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_PATHALEON_THE_CALCULATOR_IMAGE)
+            {
+                m_pathaleonGuid = pSummoned->GetObjectGuid();
+            }
+        }
+
+        void TurnToPathaleonsImage()
+        {
+            Creature* pArdonis = m_creature->GetMap()->GetCreature(m_ardonisGuid);
+            Creature* pPathaleon = m_creature->GetMap()->GetCreature(m_pathaleonGuid);
+            Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+
+            if (!pArdonis || !pPathaleon || !pPlayer)
+            {
+                return;
+            }
+
+            m_creature->SetFacingToObject(pPathaleon);
+            pArdonis->SetFacingToObject(pPathaleon);
+
+            // the boss is there kneel before him
+            m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+            pArdonis->SetStandState(UNIT_STAND_STATE_KNEEL);
+        }
+
+        void TurnToEachOther()
+        {
+            if (Creature* pArdonis = m_creature->GetMap()->GetCreature(m_ardonisGuid))
+            {
+                Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+
+                if (!pPlayer)
+                {
+                    return;
+                }
+
+                m_creature->SetFacingToObject(pArdonis);
+                pArdonis->SetFacingToObject(m_creature);
+
+                // get up
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                pArdonis->SetStandState(UNIT_STAND_STATE_STAND);
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit *pInvoker, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature && pInvoker->GetTypeId() == TYPEID_PLAYER)
+                CanStartEvent((Player*)pInvoker);
+        }
+
+        bool CanStartEvent(Player* pPlayer)
+        {
+            if (!m_bIsEvent)
+            {
+                Creature* pArdonis = GetClosestCreatureWithEntry(m_creature, NPC_ARCANIST_ARDONIS, 10.0f);
+
+                if (!pArdonis)
+                {
+                    return false;
+                }
+
+                m_ardonisGuid = pArdonis->GetObjectGuid();
+                m_playerGuid = pPlayer->GetObjectGuid();
+
+                m_bIsEvent = true;
+
+                TurnToEachOther();
+                return true;
+            }
+
+            debug_log("SD3: npc_commander_dawnforge event already in progress, need to wait.");
+            return false;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Is event even running?
+            if (!m_bIsEvent)
+            {
+                return;
+            }
+
+            // Phase timing
+            if (m_uiPhaseTimer >= uiDiff)
+            {
+                m_uiPhaseTimer -= uiDiff;
+                return;
+            }
+
+            Creature* pArdonis = m_creature->GetMap()->GetCreature(m_ardonisGuid);
+            Creature* pPathaleon = m_creature->GetMap()->GetCreature(m_pathaleonGuid);
+            Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+
+            if (!pArdonis || !pPlayer)
+            {
+                Reset();
+                return;
+            }
+
+            if (m_uiPhase > 4 && !pPathaleon)
+            {
+                Reset();
+                return;
+            }
+
+            switch (m_uiPhase)
+            {
+            case 1:
+                DoScriptText(SAY_COMMANDER_DAWNFORGE_1, m_creature);
+                ++m_uiPhase;
+                m_uiPhaseTimer = 16000;
+                break;
+            case 2:
+                DoScriptText(SAY_ARCANIST_ARDONIS_1, pArdonis);
+                ++m_uiPhase;
+                m_uiPhaseTimer = 16000;
+                break;
+            case 3:
+                DoScriptText(SAY_COMMANDER_DAWNFORGE_2, m_creature);
+                ++m_uiPhase;
+                m_uiPhaseTimer = 16000;
+                break;
+            case 4:
+                // spawn pathaleon's image
+                m_creature->SummonCreature(NPC_PATHALEON_THE_CALCULATOR_IMAGE, 2325.851563f, 2799.534668f, 133.084229f, 6.038996f, TEMPSUMMON_TIMED_DESPAWN, 90000);
+                ++m_uiPhase;
+                m_uiPhaseTimer = 500;
+                break;
+            case 5:
+                DoScriptText(SAY_PATHALEON_THE_CALCULATOR_IMAGE_1, pPathaleon);
+                ++m_uiPhase;
+                m_uiPhaseTimer = 6000;
+                break;
+            case 6:
+                switch (m_uiPhaseSubphase)
+                {
+                case 0:
+                    TurnToPathaleonsImage();
+                    ++m_uiPhaseSubphase;
+                    m_uiPhaseTimer = 8000;
+                    break;
+                case 1:
+                    DoScriptText(SAY_COMMANDER_DAWNFORGE_3, m_creature);
+                    m_uiPhaseSubphase = 0;
+                    ++m_uiPhase;
+                    m_uiPhaseTimer = 8000;
+                    break;
+                }
+                break;
+            case 7:
+                switch (m_uiPhaseSubphase)
+                {
+                case 0:
+                    DoScriptText(SAY_PATHALEON_THE_CALCULATOR_IMAGE_2, pPathaleon);
+                    ++m_uiPhaseSubphase;
+                    m_uiPhaseTimer = 12000;
+                    break;
+                case 1:
+                    DoScriptText(SAY_PATHALEON_THE_CALCULATOR_IMAGE_2_1, pPathaleon);
+                    ++m_uiPhaseSubphase;
+                    m_uiPhaseTimer = 16000;
+                    break;
+                case 2:
+                    DoScriptText(SAY_PATHALEON_THE_CALCULATOR_IMAGE_2_2, pPathaleon);
+                    m_uiPhaseSubphase = 0;
+                    ++m_uiPhase;
+                    m_uiPhaseTimer = 10000;
+                    break;
+                }
+                break;
+            case 8:
+                DoScriptText(SAY_COMMANDER_DAWNFORGE_4, m_creature);
+                DoScriptText(SAY_ARCANIST_ARDONIS_2, pArdonis);
+                ++m_uiPhase;
+                m_uiPhaseTimer = 4000;
+                break;
+            case 9:
+                TurnToEachOther();
+                // hide pathaleon, unit will despawn shortly
+                pPathaleon->SetVisibility(VISIBILITY_OFF);
+                m_uiPhaseSubphase = 0;
+                ++m_uiPhase;
+                m_uiPhaseTimer = 3000;
+                break;
+            case 10:
+                DoScriptText(SAY_COMMANDER_DAWNFORGE_5, m_creature);
+                pPlayer->AreaExploredOrEventHappens(QUEST_INFO_GATHERING);
+                Reset();
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_commander_dawnforgeAI(pCreature);
+    }
+};
+
+struct at_commander_dawnforge : public AreaTriggerScript
+{
+    at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*pAt*/) override
+    {
+        // if player lost aura or not have at all, we should not try start event.
+        if (!pPlayer->HasAura(SPELL_SUNFURY_DISGUISE, EFFECT_INDEX_0))
+        {
+            return false;
+        }
+
+        if (pPlayer->IsAlive() && pPlayer->GetQuestStatus(QUEST_INFO_GATHERING) == QUEST_STATUS_INCOMPLETE)
+        {
+            Creature* pDawnforge = GetClosestCreatureWithEntry(pPlayer, NPC_COMMANDER_DAWNFORGE, 30.0f);
+
+            if (!pDawnforge)
+            {
+                return false;
+            }
+
+            if (CreatureAI* pDawnforgeAI = pDawnforge->AI())
+            {
+                pDawnforgeAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pDawnforge, pPlayer, 0);
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+/*######
+## npc_bessy
+######*/
+
+enum
+{
+    QUEST_COWS_COME_HOME = 10337,
+
+    NPC_THADELL          = 20464,
+    NPC_TORMENTED_SOUL   = 20512,
+    NPC_SEVERED_SPIRIT   = 19881
+};
+
+struct npc_bessy : public CreatureScript
+{
+    npc_bessy() : CreatureScript("npc_bessy") {}
+
+    struct npc_bessyAI : public npc_escortAI
+    {
+        npc_bessyAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 3:
+                m_creature->SummonCreature(NPC_TORMENTED_SOUL, 2449.67f, 2183.11f, 96.85f, 6.20f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                m_creature->SummonCreature(NPC_TORMENTED_SOUL, 2449.53f, 2184.43f, 96.36f, 6.27f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                m_creature->SummonCreature(NPC_TORMENTED_SOUL, 2449.85f, 2186.34f, 97.57f, 6.08f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                break;
+            case 7:
+                m_creature->SummonCreature(NPC_SEVERED_SPIRIT, 2309.64f, 2186.24f, 92.25f, 6.06f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                m_creature->SummonCreature(NPC_SEVERED_SPIRIT, 2309.25f, 2183.46f, 91.75f, 6.22f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                break;
+            case 12:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_COWS_COME_HOME, m_creature);
+                }
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_COWS_COME_HOME)
+        {
+            pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_TOGGLE_NON_ATTACKABLE);
+
+            if (npc_bessyAI* pBessyAI = dynamic_cast<npc_bessyAI*>(pCreature->AI()))
+            {
+                pBessyAI->Start(true, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_bessyAI(pCreature);
+    }
+};
+
+/*######
+## npc_maxx_a_million
+######*/
+
+enum
+{
+    QUEST_MARK_V_IS_ALIVE       = 10191,
+    NPC_BOT_SPECIALIST_ALLEY    = 19578,
+    GO_DRAENEI_MACHINE          = 183771,
+
+    SAY_START                   = -1000621,
+    SAY_ALLEY_FAREWELL          = -1000622,
+    SAY_CONTINUE                = -1000623,
+    SAY_ALLEY_FINISH            = -1000624
+};
+
+struct npc_maxx_a_million_escort : public CreatureScript
+{
+    npc_maxx_a_million_escort() : CreatureScript("npc_maxx_a_million") {}
+
+    struct npc_maxx_a_million_escortAI : public npc_escortAI
+    {
+        npc_maxx_a_million_escortAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        uint8 m_uiSubEvent;
+        uint32 m_uiSubEventTimer;
+        ObjectGuid m_alleyGuid;
+        ObjectGuid m_lastDraeneiMachineGuid;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiSubEvent = 0;
+                m_uiSubEventTimer = 0;
+                m_alleyGuid.Clear();
+                m_lastDraeneiMachineGuid.Clear();
+
+                // Reset fields, that were changed on escort-start
+                m_creature->HandleEmote(EMOTE_STATE_STUN);
+            }
+        }
+
+        void WaypointReached(uint32 uiPoint) override
+        {
+            switch (uiPoint)
+            {
+            case 1:
+                // turn 90 degrees , towards doorway.
+                m_creature->SetFacingTo(m_creature->GetOrientation() + (M_PI_F / 2));
+                DoScriptText(SAY_START, m_creature);
+                m_uiSubEventTimer = 3000;
+                m_uiSubEvent = 1;
+                break;
+            case 7:
+            case 17:
+            case 29:
+                if (GameObject* pMachine = GetClosestGameObjectWithEntry(m_creature, GO_DRAENEI_MACHINE, INTERACTION_DISTANCE))
+                {
+                    m_creature->SetFacingToObject(pMachine);
+                    m_lastDraeneiMachineGuid = pMachine->GetObjectGuid();
+                    m_uiSubEvent = 2;
+                    m_uiSubEventTimer = 1000;
+                }
+                else
+                {
+                    m_lastDraeneiMachineGuid.Clear();
+                }
+
+                break;
+            case 36:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_MARK_V_IS_ALIVE, m_creature);
+                }
+
+                if (Creature* pAlley = m_creature->GetMap()->GetCreature(m_alleyGuid))
+                {
+                    DoScriptText(SAY_ALLEY_FINISH, pAlley);
+                }
+
+                break;
+            }
+        }
+
+        void WaypointStart(uint32 uiPoint) override
+        {
+            switch (uiPoint)
+            {
+            case 8:
+            case 18:
+            case 30:
+                DoScriptText(SAY_CONTINUE, m_creature);
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (m_uiSubEventTimer)
+                {
+                    if (m_uiSubEventTimer <= uiDiff)
+                    {
+                        switch (m_uiSubEvent)
+                        {
+                        case 1:                             // Wait time before Say
+                            if (Creature* pAlley = GetClosestCreatureWithEntry(m_creature, NPC_BOT_SPECIALIST_ALLEY, INTERACTION_DISTANCE * 2))
+                            {
+                                m_alleyGuid = pAlley->GetObjectGuid();
+                                DoScriptText(SAY_ALLEY_FAREWELL, pAlley);
+                            }
+                            m_uiSubEventTimer = 0;
+                            m_uiSubEvent = 0;
+                            break;
+                        case 2:                             // Short wait time after reached WP at machine
+                            m_creature->HandleEmote(EMOTE_ONESHOT_ATTACKUNARMED);
+                            m_uiSubEventTimer = 2000;
+                            m_uiSubEvent = 3;
+                            break;
+                        case 3:                             // Despawn machine after 2s
+                            if (GameObject* pMachine = m_creature->GetMap()->GetGameObject(m_lastDraeneiMachineGuid))
+                            {
+                                pMachine->Use(m_creature);
+                            }
+
+                            m_lastDraeneiMachineGuid.Clear();
+                            m_uiSubEventTimer = 0;
+                            m_uiSubEvent = 0;
+                            break;
+                        default:
+                            m_uiSubEventTimer = 0;
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        m_uiSubEventTimer -= uiDiff;
+                    }
+                }
+            }
+            else
+            {
+                DoMeleeAttackIfReady();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_maxx_a_million_escortAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_MARK_V_IS_ALIVE)
+        {
+            if (npc_maxx_a_million_escortAI* pEscortAI = dynamic_cast<npc_maxx_a_million_escortAI*>(pCreature->AI()))
+            {
+                // Set Faction to Escort Faction
+                pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN | TEMPFACTION_TOGGLE_OOC_NOT_ATTACK | TEMPFACTION_TOGGLE_PASSIVE);
+                // Set emote-state to 0 (is EMOTE_STATE_STUN by default)
+                pCreature->HandleEmote(EMOTE_ONESHOT_NONE);
+
+                pEscortAI->Start(false, pPlayer, pQuest, true);
+            }
+        }
+        return true;
+    }
+};
+
+/*######
+## npc_zeppit
+######*/
+
+enum
+{
+    EMOTE_GATHER_BLOOD          = -1000625,
+    NPC_WARP_CHASER             = 18884,
+    SPELL_GATHER_WARP_BLOOD     = 39244,                    // for quest 10924
+};
+
+struct npc_zeppit : public CreatureScript
+{
+    npc_zeppit() : CreatureScript("npc_zeppit") {}
+
+    struct npc_zeppitAI : public ScriptedPetAI
+    {
+        npc_zeppitAI(Creature* pCreature) : ScriptedPetAI(pCreature) { }
+
+        void OwnerKilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_UNIT && pVictim->GetEntry() == NPC_WARP_CHASER)
+            {
+                // Distance not known, be assumed to be ~10 yards, possibly a bit less.
+                if (m_creature->IsWithinDistInMap(pVictim, 10.0f))
+                {
+                    DoScriptText(EMOTE_GATHER_BLOOD, m_creature);
+                    m_creature->CastSpell(m_creature, SPELL_GATHER_WARP_BLOOD, false);
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_zeppitAI(pCreature);
+    }
+};
+
+/*######
+## npc_protectorate_demolitionist
+######*/
+
+enum
+{
+    SAY_INTRO                       = -1000891,
+    SAY_ATTACKED_1                  = -1000892,
+    SAY_ATTACKED_2                  = -1000893,
+    SAY_STAGING_GROUNDS             = -1000894,
+    SAY_TOXIC_HORROR                = -1000895,
+    SAY_SALHADAAR                   = -1000896,
+    SAY_DISRUPTOR                   = -1000897,
+    SAY_NEXUS_PROTECT               = -1000898,
+    SAY_FINISH_1                    = -1000899,
+    SAY_FINISH_2                    = -1000900,
+
+    SPELL_ETHEREAL_TELEPORT         = 34427,
+    SPELL_PROTECTORATE              = 35679,                // dummy aura applied on player
+
+    NPC_NEXUS_STALKER               = 20474,
+    NPC_ARCHON                      = 20458,
+
+    FACTION_FRIENDLY                = 35,
+
+    QUEST_ID_DELIVERING_MESSAGE     = 10406,
+};
+
+struct npc_protectorate_demolitionist : public CreatureScript
+{
+    npc_protectorate_demolitionist() : CreatureScript("npc_protectorate_demolitionist") {}
+
+    struct npc_protectorate_demolitionistAI : public npc_escortAI
+    {
+        npc_protectorate_demolitionistAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        uint32 m_uiEventTimer;
+        uint8 m_uiEventStage;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiEventTimer = 0;
+                m_uiEventStage = 0;
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_ATTACKED_1 : SAY_ATTACKED_2, m_creature);
+        }
+
+        // No attack done by this npc
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                return;
+            }
+
+            // Star the escort
+            if (pWho->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (pWho->HasAura(SPELL_PROTECTORATE) && ((Player*)pWho)->GetQuestStatus(QUEST_ID_DELIVERING_MESSAGE) == QUEST_STATUS_INCOMPLETE)
+                {
+                    if (m_creature->IsWithinDistInMap(pWho, 10.0f))
+                    {
+                        m_creature->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN);
+                        Start(false, (Player*)pWho);
+                    }
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_NEXUS_STALKER)
+            {
+                DoScriptText(SAY_NEXUS_PROTECT, pSummoned);
+            }
+            else if (pSummoned->GetEntry() == NPC_ARCHON)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_ETHEREAL_TELEPORT, true);
+            }
+
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                DoScriptText(SAY_INTRO, m_creature);
+                break;
+            case 3:
+                DoScriptText(SAY_STAGING_GROUNDS, m_creature);
+                break;
+            case 4:
+                DoScriptText(SAY_TOXIC_HORROR, m_creature);
+                break;
+            case 9:
+                DoScriptText(SAY_SALHADAAR, m_creature);
+                break;
+            case 12:
+                DoScriptText(SAY_DISRUPTOR, m_creature);
+                SetEscortPaused(true);
+                m_uiEventTimer = 5000;
+                break;
+            case 13:
+                DoScriptText(SAY_FINISH_2, m_creature);
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    m_creature->SetFacingToObject(pPlayer);
+                    pPlayer->GroupEventHappens(QUEST_ID_DELIVERING_MESSAGE, m_creature);
+                }
+                SetEscortPaused(true);
+                m_uiEventTimer = 6000;
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (m_uiEventTimer)
+            {
+                if (m_uiEventTimer <= uiDiff)
+                {
+                    switch (m_uiEventStage)
+                    {
+                    case 0:
+                        m_creature->SummonCreature(NPC_ARCHON, 3875.69f, 2308.72f, 115.80f, 1.48f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                        m_uiEventTimer = 4000;
+                        break;
+                    case 1:
+                        m_creature->SummonCreature(NPC_NEXUS_STALKER, 3884.06f, 2325.22f, 111.37f, 3.45f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                        m_creature->SummonCreature(NPC_NEXUS_STALKER, 3861.54f, 2320.44f, 111.48f, 0.32f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000);
+                        m_uiEventTimer = 9000;
+                        break;
+                    case 2:
+                        DoScriptText(SAY_FINISH_1, m_creature);
+                        SetRun();
+                        SetEscortPaused(false);
+                        m_uiEventTimer = 0;
+                        break;
+                    case 3:
+                        if (DoCastSpellIfCan(m_creature, SPELL_ETHEREAL_TELEPORT, CAST_TRIGGERED) == CAST_OK)
+                        {
+                            m_creature->ForcedDespawn(1000);
+                        }
+                        m_uiEventTimer = 0;
+                        break;
+                    }
+                    ++m_uiEventStage;
+                }
+                else
+                {
+                    m_uiEventTimer -= uiDiff;
+                }
+            }
+
+            // ToDo: research if the npc uses spells or melee for combat
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_protectorate_demolitionistAI(pCreature);
+    }
+};
+
+/*######
+## npc_captured_vanguard
+######*/
+
+enum
+{
+    SAY_VANGUARD_INTRO              = -1000901,
+    SAY_VANGUARD_START              = -1000902,
+    SAY_VANGUARD_FINISH             = -1000903,
+    EMOTE_VANGUARD_FINISH           = -1000904,
+
+    SPELL_GLAIVE                    = 36500,
+    SPELL_HAMSTRING                 = 31553,
+
+    NPC_COMMANDER_AMEER             = 20448,
+
+    QUEST_ID_ESCAPE_STAGING_GROUNDS = 10425,
+};
+
+struct npc_captured_vanguard : public CreatureScript
+{
+    npc_captured_vanguard() : CreatureScript("npc_captured_vanguard") {}
+
+    struct npc_captured_vanguardAI : public npc_escortAI
+    {
+        npc_captured_vanguardAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        uint32 m_uiGlaiveTimer;
+        uint32 m_uiHamstringTimer;
+
+        void Reset() override
+        {
+            m_uiGlaiveTimer = urand(4000, 8000);
+            m_uiHamstringTimer = urand(8000, 13000);
+        }
+
+        void JustReachedHome() override
+        {
+            // Happens only if the player helps the npc in the fight - otherwise he dies
+            DoScriptText(SAY_VANGUARD_INTRO, m_creature);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 15:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_ID_ESCAPE_STAGING_GROUNDS, m_creature);
+                }
+                break;
+            case 16:
+                DoScriptText(SAY_VANGUARD_FINISH, m_creature);
+                SetRun();
+                break;
+            case 17:
+                if (Creature* pAmeer = GetClosestCreatureWithEntry(m_creature, NPC_COMMANDER_AMEER, 5.0f))
+                {
+                    DoScriptText(EMOTE_VANGUARD_FINISH, m_creature, pAmeer);
+                }
+                break;
+            case 18:
+                if (DoCastSpellIfCan(m_creature, SPELL_ETHEREAL_TELEPORT, CAST_TRIGGERED) == CAST_OK)
+                {
+                    m_creature->ForcedDespawn(1000);
+                }
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiGlaiveTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_GLAIVE) == CAST_OK)
+                {
+                    m_uiGlaiveTimer = urand(5000, 9000);
+                }
+            }
+            else
+            {
+                m_uiGlaiveTimer -= uiDiff;
+            }
+
+            if (m_uiHamstringTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_HAMSTRING) == CAST_OK)
+                {
+                    m_uiHamstringTimer = urand(10000, 16000);
+                }
+            }
+            else
+            {
+                m_uiHamstringTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_captured_vanguardAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_ESCAPE_STAGING_GROUNDS)
+        {
+            if (npc_captured_vanguardAI* pEscortAI = dynamic_cast<npc_captured_vanguardAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+
+            DoScriptText(SAY_VANGUARD_START, pCreature, pPlayer);
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_drijya
+######*/
+
+enum
+{
+    SAY_DRIJYA_START        = -1000968,
+    SAY_DRIJYA_1            = -1000969,
+    SAY_DRIJYA_2            = -1000970,
+    SAY_DRIJYA_3            = -1000971,
+    SAY_DRIJYA_4            = -1000972,
+    SAY_DRIJYA_5            = -1000973,
+    SAY_DRIJYA_6            = -1000974,
+    SAY_DRIJYA_7            = -1000975,
+    SAY_DRIJYA_COMPLETE     = -1000976,
+
+    SPELL_SUMMON_SMOKE      = 42456,                        // summon temp GO 185318
+    SPELL_SUMMON_FIRE       = 42467,                        // summon temp GO 185319
+    SPELL_EXPLOSION_VISUAL  = 42458,
+
+    NPC_EXPLODE_TRIGGER     = 20296,
+    NPC_TERROR_IMP          = 20399,
+    NPC_LEGION_TROOPER      = 20402,
+    NPC_LEGION_DESTROYER    = 20403,
+
+    // GO_SMOKE             = 185318,
+    // GO_FIRE              = 185317,                       // not sure if this one is used
+    // GO_BIG_FIRE          = 185319,
+
+    QUEST_ID_WARP_GATE      = 10310,
+
+    MAX_TROOPERS            = 9,
+    MAX_IMPS                = 6,
+};
+
+struct npc_drijya : public CreatureScript
+{
+    npc_drijya() : CreatureScript("npc_drijya") {}
+
+    struct npc_drijyaAI : public npc_escortAI
+    {
+        npc_drijyaAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        uint8 m_uiSpawnCount;
+        uint32 m_uiSpawnImpTimer;
+        uint32 m_uiSpawnTrooperTimer;
+        uint32 m_uiSpawnDestroyerTimer;
+        uint32 m_uiDestroyingTimer;
+
+        ObjectGuid m_explodeTriggerGuid;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiSpawnCount = 0;
+                m_uiSpawnImpTimer = 0;
+                m_uiSpawnTrooperTimer = 0;
+                m_uiSpawnDestroyerTimer = 0;
+                m_uiDestroyingTimer = 0;
+            }
+        }
+
+        void AttackedBy(Unit* pWho) override
+        {
+            if (pWho->GetEntry() == NPC_TERROR_IMP || pWho->GetEntry() == NPC_LEGION_TROOPER || pWho->GetEntry() == NPC_LEGION_DESTROYER)
+            {
+                if (urand(0, 1))
+                    DoScriptText(SAY_DRIJYA_3, m_creature);
+            }
+        }
+
+        void DoSpawnCreature(uint32 uiEntry)
+        {
+            if (Creature* pTrigger = m_creature->GetMap()->GetCreature(m_explodeTriggerGuid))
+                m_creature->SummonCreature(uiEntry, pTrigger->GetPositionX(), pTrigger->GetPositionY(), pTrigger->GetPositionZ(), pTrigger->GetOrientation(), TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 10000);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_TERROR_IMP:
+            case NPC_LEGION_TROOPER:
+            case NPC_LEGION_DESTROYER:
+                pSummoned->AI()->AttackStart(m_creature);
+                break;
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                DoScriptText(SAY_DRIJYA_START, m_creature);
+                SetRun();
+                break;
+            case 1:
+                DoScriptText(SAY_DRIJYA_1, m_creature);
+                break;
+            case 5:
+                DoScriptText(SAY_DRIJYA_2, m_creature);
+                break;
+            case 7:
+                SetEscortPaused(true);
+                m_uiDestroyingTimer = 60000;
+                m_uiSpawnImpTimer = 15000;
+                m_uiSpawnCount = 0;
+                m_creature->HandleEmoteCommand(EMOTE_STATE_WORK);
+                if (Creature* pTrigger = GetClosestCreatureWithEntry(m_creature, NPC_EXPLODE_TRIGGER, 30.0f))
+                    m_explodeTriggerGuid = pTrigger->GetObjectGuid();
+                break;
+            case 8:
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_SMOKE) == CAST_OK)
+                {
+                    if (Player* pPlayer = GetPlayerForEscort())
+                        m_creature->SetFacingToObject(pPlayer);
+
+                    DoScriptText(SAY_DRIJYA_4, m_creature);
+                }
+                break;
+            case 12:
+                SetEscortPaused(true);
+                m_uiDestroyingTimer = 60000;
+                m_uiSpawnTrooperTimer = 15000;
+                m_uiSpawnCount = 0;
+                m_creature->HandleEmoteCommand(EMOTE_STATE_WORK);
+                break;
+            case 13:
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_SMOKE) == CAST_OK)
+                {
+                    if (Player* pPlayer = GetPlayerForEscort())
+                        m_creature->SetFacingToObject(pPlayer);
+
+                    DoScriptText(SAY_DRIJYA_5, m_creature);
+                }
+                break;
+            case 17:
+                SetEscortPaused(true);
+                m_uiDestroyingTimer = 60000;
+                m_uiSpawnDestroyerTimer = 15000;
+                m_creature->HandleEmoteCommand(EMOTE_STATE_WORK);
+                break;
+            case 18:
+                if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_SMOKE) == CAST_OK)
+                {
+                    if (Creature* pTrigger = m_creature->GetMap()->GetCreature(m_explodeTriggerGuid))
+                        m_creature->SetFacingToObject(pTrigger);
+
+                    DoScriptText(SAY_DRIJYA_6, m_creature);
+                }
+                break;
+            case 19:
+                if (Creature* pTrigger = m_creature->GetMap()->GetCreature(m_explodeTriggerGuid))
+                {
+                    pTrigger->CastSpell(pTrigger, SPELL_SUMMON_FIRE, true);
+                    pTrigger->CastSpell(pTrigger, SPELL_EXPLOSION_VISUAL, true);
+                }
+                break;
+            case 20:
+                DoScriptText(SAY_DRIJYA_7, m_creature);
+                break;
+            case 23:
+                SetRun(false);
+                break;
+            case 27:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_DRIJYA_COMPLETE, m_creature, pPlayer);
+                    pPlayer->GroupEventHappens(QUEST_ID_WARP_GATE, m_creature);
+                }
+                break;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                m_creature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue), true);
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (m_uiSpawnImpTimer)
+            {
+                if (m_uiSpawnImpTimer <= uiDiff)
+                {
+                    DoSpawnCreature(NPC_TERROR_IMP);
+                    ++m_uiSpawnCount;
+
+                    if (m_uiSpawnCount == MAX_IMPS)
+                        m_uiSpawnImpTimer = 0;
+                    else
+                        m_uiSpawnImpTimer = 3500;
+                }
+                else
+                    m_uiSpawnImpTimer -= uiDiff;
+            }
+
+            if (m_uiSpawnTrooperTimer)
+            {
+                if (m_uiSpawnTrooperTimer <= uiDiff)
+                {
+                    DoSpawnCreature(NPC_LEGION_TROOPER);
+                    ++m_uiSpawnCount;
+
+                    if (m_uiSpawnCount == MAX_TROOPERS)
+                        m_uiSpawnTrooperTimer = 0;
+                    else
+                        m_uiSpawnTrooperTimer = 3500;
+                }
+                else
+                    m_uiSpawnTrooperTimer -= uiDiff;
+            }
+
+            if (m_uiSpawnDestroyerTimer)
+            {
+                if (m_uiSpawnDestroyerTimer <= uiDiff)
+                {
+                    DoSpawnCreature(NPC_LEGION_DESTROYER);
+                    m_uiSpawnDestroyerTimer = 0;
+                }
+                else
+                    m_uiSpawnDestroyerTimer -= uiDiff;
+            }
+
+            if (m_uiDestroyingTimer)
+            {
+                if (m_uiDestroyingTimer <= uiDiff)
+                {
+                    SetEscortPaused(false);
+                    m_creature->HandleEmoteCommand(EMOTE_STATE_NONE);
+                    m_uiDestroyingTimer = 0;
+                }
+                else
+                    m_uiDestroyingTimer -= uiDiff;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_drijyaAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_WARP_GATE)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+#if defined (WOTLK) || defined (CATA)
+/*######
+## npc_dimensius
+######*/
+
+enum
+{
+    SAY_AGGRO                   = -1001170,
+    SAY_SUMMON                  = -1001171,
+
+    SPELL_DIMENSIUS_FEEDING     = 37450,
+    SPELL_SHADOW_SPIRAL         = 37500,
+    SPELL_SHADOW_VAULT          = 37412,
+
+    NPC_SPAWN_OF_DIMENSIUS      = 21780,
+    NPC_CAPTAIN_SAEED           = 20985,
+    MODEL_ID_DIMENSIUS_CLOUD    = 20011,
+};
+
+// order based on the increasing range of damage
+static const uint32 auiShadowRainSpells[5] = { 37399, 37405, 37397, 37396, 37409 };
+
+
+
+struct npc_dimensius : public CreatureScript
+{
+    npc_dimensius() : CreatureScript("npc_dimensius") {}
+
+struct  npc_dimensiusAI : public Scripted_NoMovementAI
+{
+    npc_dimensiusAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+    uint32 m_uiSpiralTimer;
+    uint32 m_uiVaultTimer;
+    uint32 m_uiRainTimer;
+    uint8 m_uiRainIndex;
+    uint8 m_uiSpawnsDead;
+
+    bool m_bSpawnsFeeding;
+
+    void Reset() override
+    {
+        m_uiSpiralTimer = 1000;
+        m_uiVaultTimer  = urand(5000, 10000);
+        m_uiRainTimer   = 0;
+        m_uiRainIndex   = urand(0, 4);
+        m_uiSpawnsDead  = 0;
+
+        m_bSpawnsFeeding = false;
+
+        m_creature->SetDisplayId(MODEL_ID_DIMENSIUS_CLOUD);
+        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PASSIVE);
+    }
+
+    void Aggro(Unit* /*pWho*/) override
+    {
+        DoScriptText(SAY_AGGRO, m_creature);
+    }
+
+    void JustSummoned(Creature* pSummoned) override
+    {
+        if (pSummoned->GetEntry() == NPC_SPAWN_OF_DIMENSIUS)
+            pSummoned->CastSpell(m_creature, SPELL_DIMENSIUS_FEEDING, true);
+    }
+
+    void SummonedCreatureJustDied(Creature* pSummoned) override
+    {
+        if (pSummoned->GetEntry() == NPC_SPAWN_OF_DIMENSIUS)
+        {
+            // interrupt the shadow rain when all spawns are dead
+            ++m_uiSpawnsDead;
+            if (m_uiSpawnsDead == 4)
+            {
+                m_creature->InterruptNonMeleeSpells(false);
+                m_uiRainTimer = 0;
+            }
+        }
+    }
+
+    void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* /*pInvoker*/, uint32 /*uiMiscValue*/) override
+    {
+        // event is sent by dbscript
+        if (eventType == AI_EVENT_CUSTOM_EVENTAI_B && pSender->GetEntry() == NPC_CAPTAIN_SAEED)
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PASSIVE);
+    }
+
+    void UpdateAI(const uint32 uiDiff) override
+    {
+        if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            return;
+
+        if (!m_bSpawnsFeeding && m_creature->GetHealthPercent() < 75.0f)
+        {
+            DoScriptText(SAY_SUMMON, m_creature);
+
+            float fX, fY, fZ;
+            for (uint8 i = 0; i < 4; ++i)
+            {
+                m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, 30.0f, i * (M_PI_F / 2));
+                m_creature->SummonCreature(NPC_SPAWN_OF_DIMENSIUS, fX, fY, fZ, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 120000);
+            }
+
+            m_uiRainTimer = 5000;
+            m_bSpawnsFeeding = true;
+        }
+
+        if (m_uiRainTimer)
+        {
+            if (m_uiRainTimer <= uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, auiShadowRainSpells[m_uiRainIndex], CAST_INTERRUPT_PREVIOUS) == CAST_OK)
+                {
+                    m_uiRainIndex = urand(0, 4);
+                    m_uiRainTimer = 5000;
+                }
+            }
+            else
+                m_uiRainTimer -= uiDiff;
+
+            return;
+        }
+
+        if (m_uiSpiralTimer < uiDiff)
+        {
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_SPIRAL) == CAST_OK)
+                    m_uiSpiralTimer = urand(3000, 4000);
+            }
+        }
+        else
+            m_uiSpiralTimer -= uiDiff;
+
+        if (m_uiVaultTimer < uiDiff)
+        {
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_VAULT) == CAST_OK)
+                    m_uiVaultTimer = urand(20000, 30000);
+            }
+        }
+        else
+            m_uiVaultTimer -= uiDiff;
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+CreatureAI* GetAI_npc_dimensius(Creature* pCreature)
+{
+    return new npc_dimensiusAI(pCreature);
+}
+};
+
+#endif
+
+void AddSC_netherstorm()
+{
+    Script* s;
+
+    s = new go_manaforge_control_console();
+    s->RegisterSelf();
+    s = new npc_manaforge_control_console();
+    s->RegisterSelf();
+    s = new npc_commander_dawnforge();
+    s->RegisterSelf();
+    s = new at_commander_dawnforge();
+    s->RegisterSelf();
+    s = new npc_bessy();
+    s->RegisterSelf();
+    s = new npc_maxx_a_million_escort();
+    s->RegisterSelf();
+    s = new npc_zeppit();
+    s->RegisterSelf();
+    s = new npc_protectorate_demolitionist();
+    s->RegisterSelf();
+    s = new npc_captured_vanguard();
+    s->RegisterSelf();
+    s = new npc_drijya();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_manaforge_control_console";
+    //pNewScript->pGOUse = &GOUse_go_manaforge_control_console;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_manaforge_control_console";
+    //pNewScript->GetAI = &GetAI_npc_manaforge_control_console;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_commander_dawnforge";
+    //pNewScript->GetAI = GetAI_npc_commander_dawnforge;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_commander_dawnforge";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_commander_dawnforge;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_bessy";
+    //pNewScript->GetAI = &GetAI_npc_bessy;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_bessy;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_maxx_a_million";
+    //pNewScript->GetAI = &GetAI_npc_maxx_a_million;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_maxx_a_million;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_zeppit";
+    //pNewScript->GetAI = &GetAI_npc_zeppit;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_protectorate_demolitionist";
+    //pNewScript->GetAI = &GetAI_npc_protectorate_demolitionist;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_captured_vanguard";
+    //pNewScript->GetAI = &GetAI_npc_captured_vanguard;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_captured_vanguard;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_drijya";
+    //pNewScript->GetAI = &GetAI_npc_drijya;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_drijya;
+    //pNewScript->RegisterSelf();
+
+#if defined (WOTLK)    
+    s = new npc_dimensius();
+    s->RegisterSelf();
+
+    /*pNewScript = new Script;
+    pNewScript->Name = "npc_dimensius";
+    pNewScript->GetAI = &GetAI_npc_dimensius;
+    pNewScript->RegisterSelf();*/
+#endif
+}
diff --git a/src/modules/SD3/scripts/outland/shadowmoon_valley.cpp b/src/modules/SD3/scripts/outland/shadowmoon_valley.cpp
new file mode 100644
index 000000000..12f6e5f91
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/shadowmoon_valley.cpp
@@ -0,0 +1,2409 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Shadowmoon_Valley
+SD%Complete: 100
+SDComment: Quest support: 11020, 10451, 10458, 10480, 10481, 10514, 10540, 10588, 10781, 10804, 10854.
+SDCategory: Shadowmoon Valley
+EndScriptData */
+
+/* ContentData
+mob_mature_netherwing_drake
+mob_enslaved_netherwing_drake
+npc_dragonmaw_peon
+npc_wilda
+mob_torloth
+npc_lord_illidan_stormrage
+npc_totem_of_spirits
+event_spell_soul_captured_credit
+go_crystal_prison
+npc_spawned_oronok_tornheart
+npc_domesticated_felboar
+npc_veneratus_spawn_node
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "pet_ai.h"
+
+/*#####
+# mob_mature_netherwing_drake
+#####*/
+
+enum
+{
+    SAY_JUST_EATEN              = -1000175,
+
+    SPELL_PLACE_CARCASS         = 38439,
+    SPELL_JUST_EATEN            = 38502,
+    SPELL_NETHER_BREATH         = 38467,
+
+    QUEST_KINDNESS              = 10804,
+    NPC_EVENT_PINGER            = 22131,
+
+    GO_FLAYER_CARCASS           = 185155,
+};
+
+struct mob_mature_netherwing_drake : public CreatureScript
+{
+    mob_mature_netherwing_drake() : CreatureScript("mob_mature_netherwing_drake") {}
+
+    struct mob_mature_netherwing_drakeAI : public ScriptedAI
+    {
+        mob_mature_netherwing_drakeAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_playerGuid;
+
+        uint32 m_uiEatTimer;
+        uint32 m_uiCreditTimer;
+        uint32 m_uiCastTimer;
+
+        void Reset() override
+        {
+            m_playerGuid.Clear();
+
+            m_uiEatTimer = 0;
+            m_uiCreditTimer = 0;
+            m_uiCastTimer = 5000;
+        }
+
+        void SpellHit(Unit* pCaster, SpellEntry const* pSpell) override
+        {
+            if (m_uiEatTimer || m_uiCreditTimer)
+            {
+                return;
+            }
+
+            if (pCaster->GetTypeId() == TYPEID_PLAYER && pSpell->Id == SPELL_PLACE_CARCASS && !m_creature->HasAura(SPELL_JUST_EATEN))
+            {
+                m_playerGuid = pCaster->GetObjectGuid();
+                m_uiEatTimer = 5000;
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            if (uiPointId)
+            {
+                m_uiCreditTimer = 7000;
+                m_creature->SetLevitate(false);
+                m_creature->HandleEmote(EMOTE_ONESHOT_ATTACKUNARMED);
+                m_creature->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiEatTimer)
+            {
+                if (m_uiEatTimer <= uiDiff)
+                {
+                    if (GameObject* pGo = GetClosestGameObjectWithEntry(m_creature, GO_FLAYER_CARCASS, 80.0f))
+                    {
+                        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
+                        {
+                            m_creature->GetMotionMaster()->MovementExpired();
+                        }
+
+                        m_creature->GetMotionMaster()->MoveIdle();
+
+                        float fX, fY, fZ;
+                        pGo->GetContactPoint(m_creature, fX, fY, fZ, CONTACT_DISTANCE);
+
+                        m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                    }
+                    m_uiEatTimer = 0;
+                }
+                else
+                {
+                    m_uiEatTimer -= uiDiff;
+                }
+
+                return;
+            }
+
+            if (m_uiCreditTimer)
+            {
+                if (m_uiCreditTimer <= uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_JUST_EATEN);
+                    DoScriptText(SAY_JUST_EATEN, m_creature);
+
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                    {
+                        pPlayer->KilledMonsterCredit(NPC_EVENT_PINGER, m_creature->GetObjectGuid());
+                    }
+
+                    Reset();
+                    m_creature->SetLevitate(true);
+                    m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_FLY_ANIM);
+                    m_creature->GetMotionMaster()->Clear();
+                    m_uiCreditTimer = 0;
+                }
+                else
+                {
+                    m_uiCreditTimer -= uiDiff;
+                }
+
+                return;
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiCastTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_NETHER_BREATH);
+                m_uiCastTimer = 5000;
+            }
+            else
+            {
+                m_uiCastTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_mature_netherwing_drakeAI(pCreature);
+    }
+};
+
+/*###
+# mob_enslaved_netherwing_drake
+####*/
+
+enum
+{
+    FACTION_FRIENDLY                = 1840,                 // Not sure if this is correct, it was taken off of Mordenai.
+
+    SPELL_HIT_FORCE_OF_NELTHARAKU   = 38762,
+    SPELL_FORCE_OF_NELTHARAKU       = 38775,
+
+    QUEST_FORCE_OF_NELT             = 10854,
+    NPC_DRAGONMAW_SUBJUGATOR        = 21718,
+    NPC_ESCAPE_DUMMY                = 21348
+};
+
+struct mob_enslaved_netherwing_drake : public CreatureScript
+{
+    mob_enslaved_netherwing_drake() : CreatureScript("mob_enslaved_netherwing_drake") {}
+
+    struct mob_enslaved_netherwing_drakeAI : public ScriptedAI
+    {
+        mob_enslaved_netherwing_drakeAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_uiFlyTimer = 0;
+        }
+
+        ObjectGuid m_playerGuid;
+        uint32 m_uiFlyTimer;
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_HIT_FORCE_OF_NELTHARAKU && !m_uiFlyTimer)
+            {
+                if (Player* pPlayer = pCaster->GetCharmerOrOwnerPlayerOrPlayerItself())
+                {
+                    m_uiFlyTimer = 2500;
+                    m_playerGuid = pPlayer->GetObjectGuid();
+
+                    m_creature->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN);
+
+                    if (Creature* pDragonmaw = GetClosestCreatureWithEntry(m_creature, NPC_DRAGONMAW_SUBJUGATOR, 50.0f))
+                    {
+                        AttackStart(pDragonmaw);
+                    }
+                }
+            }
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            if (uiPointId)
+            {
+                m_creature->ForcedDespawn();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (m_uiFlyTimer)
+                {
+                    if (m_uiFlyTimer <= uiDiff)
+                    {
+                        if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                        {
+                            if (pPlayer->GetQuestStatus(QUEST_FORCE_OF_NELT) == QUEST_STATUS_INCOMPLETE)
+                            {
+                                DoCastSpellIfCan(pPlayer, SPELL_FORCE_OF_NELTHARAKU, CAST_TRIGGERED);
+                                m_playerGuid.Clear();
+
+                                float fX, fY, fZ;
+
+                                // Get an escape position
+                                if (Creature* pEscapeDummy = GetClosestCreatureWithEntry(m_creature, NPC_ESCAPE_DUMMY, 50.0f))
+                                {
+                                    pEscapeDummy->GetPosition(fX, fY, fZ);
+                                }
+                                else
+                                {
+                                    m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 20.0f, fX, fY, fZ);
+                                    fZ += 25;
+                                }
+
+                                m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+                            }
+                        }
+                        m_uiFlyTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiFlyTimer -= uiDiff;
+                    }
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_enslaved_netherwing_drakeAI(pCreature);
+    }
+};
+
+/*#####
+# npc_dragonmaw_peon
+#####*/
+
+enum
+{
+    SAY_PEON_1                      = -1000652,
+    SAY_PEON_2                      = -1000653,
+    SAY_PEON_3                      = -1000654,
+    SAY_PEON_4                      = -1000655,
+    SAY_PEON_5                      = -1000656,
+
+    SPELL_SERVING_MUTTON            = 40468,
+    NPC_DRAGONMAW_KILL_CREDIT       = 23209,
+    EQUIP_ID_MUTTON                 = 2202,
+    POINT_DEST                      = 1
+};
+
+struct npc_dragonmaw_peon : public CreatureScript
+{
+    npc_dragonmaw_peon() : CreatureScript("npc_dragonmaw_peon") {}
+
+    struct npc_dragonmaw_peonAI : public ScriptedAI
+    {
+        npc_dragonmaw_peonAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_playerGuid;
+        uint32 m_uiPoisonTimer;
+        uint32 m_uiMoveTimer;
+        uint32 m_uiEatTimer;
+
+        void Reset() override
+        {
+            m_playerGuid.Clear();
+            m_uiPoisonTimer = 0;
+            m_uiMoveTimer = 0;
+            m_uiEatTimer = 0;
+
+            SetEquipmentSlots(true);
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (m_playerGuid)
+                    return;
+
+                m_playerGuid = pInvoker->GetObjectGuid();
+                m_uiMoveTimer = 500;
+                m_creature->HandleEmote(EMOTE_ONESHOT_NONE);
+            }
+        }
+
+        bool SetPlayerTarget(ObjectGuid playerGuid)
+        {
+            // Check if event already started
+        }
+
+        void MovementInform(uint32 uiType, uint32 uiPointId) override
+        {
+            if (uiType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            if (uiPointId == POINT_DEST)
+            {
+                m_uiEatTimer = 2000;
+                m_uiPoisonTimer = 3000;
+
+                switch (urand(0, 4))
+                {
+                case 0: DoScriptText(SAY_PEON_1, m_creature); break;
+                case 1: DoScriptText(SAY_PEON_2, m_creature); break;
+                case 2: DoScriptText(SAY_PEON_3, m_creature); break;
+                case 3: DoScriptText(SAY_PEON_4, m_creature); break;
+                case 4: DoScriptText(SAY_PEON_5, m_creature); break;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiMoveTimer)
+            {
+                if (m_uiMoveTimer <= uiDiff)
+                {
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                    {
+                        GameObject* pMutton = pPlayer->GetGameObject(SPELL_SERVING_MUTTON);
+
+                        // Workaround for broken function GetGameObject
+                        if (!pMutton)
+                        {
+                            const SpellEntry* pSpell = GetSpellStore()->LookupEntry(SPELL_SERVING_MUTTON);
+
+#if defined (CATA)
+                            uint32 uiGameobjectEntry = pSpell->GetEffectMiscValue(EFFECT_INDEX_0);
+#else
+                            uint32 uiGameobjectEntry = pSpell->EffectMiscValue[EFFECT_INDEX_0];
+#endif
+                            // this can fail, but very low chance
+                            pMutton = GetClosestGameObjectWithEntry(pPlayer, uiGameobjectEntry, 2 * INTERACTION_DISTANCE);
+                        }
+
+                        if (pMutton)
+                        {
+                            float fX, fY, fZ;
+                            pMutton->GetContactPoint(m_creature, fX, fY, fZ, CONTACT_DISTANCE);
+
+                            m_creature->SetWalk(false);
+                            m_creature->GetMotionMaster()->MovePoint(POINT_DEST, fX, fY, fZ);
+                        }
+                    }
+
+                    m_uiMoveTimer = 0;
+                }
+                else
+                {
+                    m_uiMoveTimer -= uiDiff;
+                }
+            }
+            else if (m_uiEatTimer)
+            {
+                if (m_uiEatTimer <= uiDiff)
+                {
+                    SetEquipmentSlots(false, EQUIP_ID_MUTTON, EQUIP_UNEQUIP);
+                    m_creature->HandleEmote(EMOTE_ONESHOT_EAT_NOSHEATHE);
+                    m_uiEatTimer = 0;
+                }
+                else
+                {
+                    m_uiEatTimer -= uiDiff;
+                }
+            }
+            else if (m_uiPoisonTimer)
+            {
+                if (m_uiPoisonTimer <= uiDiff)
+                {
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                    {
+                        pPlayer->KilledMonsterCredit(NPC_DRAGONMAW_KILL_CREDIT, m_creature->GetObjectGuid());
+                    }
+
+                    m_uiPoisonTimer = 0;
+
+                    // dies
+                    m_creature->SetDeathState(JUST_DIED);
+                    m_creature->SetHealth(0);
+                }
+                else
+                {
+                    m_uiPoisonTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_dragonmaw_peonAI(pCreature);
+    }
+};
+
+struct spell_serving_mutton : public SpellScript
+{
+    spell_serving_mutton() : SpellScript("spell_serving_mutton") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiEffIndex != EFFECT_INDEX_1 || uiSpellId != SPELL_SERVING_MUTTON || pCaster->GetTypeId() != TYPEID_PLAYER)
+        {
+            return false;
+        }
+        Creature* pCreatureTarget = pTarget->ToCreature();
+        CreatureAI* pPeonAI = pCreatureTarget->AI();
+
+        if (pPeonAI)
+        {
+            pPeonAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pCreatureTarget, pCaster, 0);
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+# npc_wilda
+######*/
+
+enum
+{
+    SAY_WIL_START               = -1000381,
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+    SAY_WIL_AGGRO1              = -1000382,
+    SAY_WIL_AGGRO2              = -1000383,
+    SAY_WIL_PROGRESS1           = -1000384,
+    SAY_WIL_PROGRESS2           = -1000385,
+#endif
+#if defined (WOTLK) || defined (CATA)
+    SAY_WIL_AGGRO_1             = -1000382,
+    SAY_WIL_AGGRO_2             = -1000383,
+    SAY_WIL_FREE_SPIRITS        = -1000384,
+#endif
+    SAY_WIL_FIND_EXIT           = -1000386,
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+    SAY_WIL_PROGRESS4           = -1000387,
+    SAY_WIL_PROGRESS5           = -1000388,
+#endif
+#if defined (WOTLK) || defined (CATA)
+    SAY_WIL_PROGRESS_1          = -1000385,
+    SAY_WIL_PROGRESS_2          = -1000387,
+    SAY_WIL_PROGRESS_3          = -1000388,
+    SAY_WIL_PROGRESS_4          = -1001168,
+    SAY_WIL_PROGRESS_5          = -1001169,
+#endif
+    SAY_WIL_JUST_AHEAD          = -1000389,
+    SAY_WIL_END                 = -1000390,
+
+    SPELL_CHAIN_LIGHTNING       = 16006,
+    SPELL_EARTHBING_TOTEM       = 15786,
+    SPELL_FROST_SHOCK           = 12548,
+    SPELL_HEALING_WAVE          = 12491,
+#if defined (WOTLK) || defined (CATA)
+    SPELL_WATER_BUBBLE          = 35929,
+#endif
+
+    QUEST_ESCAPE_COILSCAR       = 10451,
+    NPC_COILSKAR_ASSASSIN       = 21044,
+#if defined (CLASSIC) || defined (TBC) || defined (WOTLK) || defined (CATA)
+    FACTION_EARTHEN             = 1726,                      // guessed
+#endif
+#if defined (WOTLK) || defined (CATA)
+    NPC_CAPTURED_WATER_SPIRIT   = 21029,
+#endif
+};
+
+// this script needs verification
+struct npc_wilda : public CreatureScript
+{
+    npc_wilda() : CreatureScript("npc_wilda") {}
+
+    struct npc_wildaAI : public npc_escortAI
+    {
+        npc_wildaAI(Creature* pCreature) : npc_escortAI(pCreature) { 
+#if defined (WOTLK) || defined (CATA)
+        // the creature is floating in a prison; no quest available first;
+        // the floating prison setup and quest flag restore is handled by DB
+        m_creature->SetLevitate(true);
+        m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+#endif
+    }
+        uint32 m_uiHealingTimer;
+#if defined (WOTLK) || defined (CATA)
+        uint32 m_uiShockTimer;
+        uint32 m_uiLightningTimer;
+#endif
+
+        void Reset() override
+        {
+            m_uiHealingTimer = 0;
+#if defined (WOTLK) || defined (CATA)
+            m_uiShockTimer = 1000;
+            m_uiLightningTimer = 2000;
+#endif
+        }
+
+#if defined (WOTLK) || defined (CATA)
+    void Aggro(Unit* pWho) override
+    {
+        if (roll_chance_i(30))
+            DoCastSpellIfCan(m_creature, SPELL_EARTHBING_TOTEM);
+    }
+    
+    void AttackStart(Unit* pWho) override
+    {
+        if (m_creature->Attack(pWho, true))
+        {
+            m_creature->AddThreat(pWho);
+            m_creature->SetInCombatWith(pWho);
+            pWho->SetInCombatWith(m_creature);
+            DoStartMovement(pWho, 10.0f);
+        }
+    }
+#endif
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+        void WaypointReached(uint32 uiPointId) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case 13:
+                DoScriptText(SAY_WIL_PROGRESS1, m_creature, pPlayer);
+                DoSpawnAssassin();
+                break;
+            case 14:
+                DoSpawnAssassin();
+                break;
+            case 15:
+                DoScriptText(SAY_WIL_FIND_EXIT, m_creature, pPlayer);
+                break;
+            case 19:
+                DoRandomSay();
+                break;
+            case 20:
+                DoSpawnAssassin();
+                break;
+            case 26:
+                DoRandomSay();
+                break;
+            case 27:
+                DoSpawnAssassin();
+                break;
+            case 33:
+                DoRandomSay();
+                break;
+            case 34:
+                DoSpawnAssassin();
+                break;
+            case 37:
+                DoRandomSay();
+                break;
+            case 38:
+                DoSpawnAssassin();
+                break;
+            case 39:
+                DoScriptText(SAY_WIL_JUST_AHEAD, m_creature, pPlayer);
+                break;
+            case 43:
+                DoRandomSay();
+                break;
+            case 44:
+                DoSpawnAssassin();
+                break;
+            case 50:
+                DoScriptText(SAY_WIL_END, m_creature, pPlayer);
+                pPlayer->GroupEventHappens(QUEST_ESCAPE_COILSCAR, m_creature);
+                break;
+            }
+#endif
+#if defined (WOTLK) || defined (CATA)
+            switch (uiPointId)
+            {
+                case 8:
+                case 26:
+                case 30:
+                case 32:
+                case 39:
+                case 43:
+                case 51:
+                    DoSpawnAssassin();
+                    break;
+                case 13:
+                    if (Player* pPlayer = GetPlayerForEscort())
+                        DoScriptText(SAY_WIL_FREE_SPIRITS, m_creature, pPlayer);
+                    DoFreeSpirits();
+                    break;
+                case 14:
+                    DoScriptText(SAY_WIL_FIND_EXIT, m_creature);
+                    break;
+                case 15:
+                    DoSpawnAssassin(2);
+                    break;
+                case 40:
+                    if (Player* pPlayer = GetPlayerForEscort())
+                        DoScriptText(SAY_WIL_JUST_AHEAD, m_creature, pPlayer);
+                    break;
+                case 52:
+                    if (Player* pPlayer = GetPlayerForEscort())
+                    {
+                        DoDespawnSpirits();
+                        m_creature->SetFacingToObject(pPlayer);
+                        DoScriptText(SAY_WIL_END, m_creature, pPlayer);
+                        pPlayer->GroupEventHappens(QUEST_ESCAPE_COILSCAR, m_creature);
+                    }
+                    break;
+            }
+#endif
+        }
+
+#if defined (TBC) 
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_COILSKAR_ASSASSIN)
+            {
+                pSummoned->AI()->AttackStart(m_creature);
+            }
+        }
+#endif
+#if defined (TBC)  || defined (WOTLK) || defined (CATA)
+
+        // this is very unclear, random say without no real relevance to script/event
+        void DoRandomSay()
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_WIL_PROGRESS2, m_creature); break;
+            case 1: DoScriptText(SAY_WIL_PROGRESS4, m_creature); break;
+            case 2: DoScriptText(SAY_WIL_PROGRESS5, m_creature); break;
+            }
+        }
+#endif
+#if defined (WOTLK) || defined (CATA)
+    void JustSummoned(Creature* pSummoned) override
+    {
+        if (pSummoned->GetEntry() == NPC_COILSKAR_ASSASSIN)
+        {
+            if (Player* pPlayer = GetPlayerForEscort())
+                pSummoned->AI()->AttackStart(pPlayer);
+        }
+    }
+#endif
+#if defined (TBC) 
+        void DoSpawnAssassin()
+        {
+            // unknown where they actually appear
+            float fX, fY, fZ;
+            m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 15.0f, fX, fY, fZ);
+
+            m_creature->SummonCreature(NPC_COILSKAR_ASSASSIN, fX, fY, fZ, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000);
+        }
+#endif
+#if defined (WOTLK) || defined (CATA)
+    // wrapper to spawn assassin and do text
+    void DoSpawnAssassin(uint8 uiCount = 1)
+    {
+        // unknown where they actually appear
+        float fX, fY, fZ;
+        for (uint8 i = 0; i < uiCount; ++i)
+        {
+            m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 10.0f, fX, fY, fZ);
+            m_creature->SummonCreature(NPC_COILSKAR_ASSASSIN, fX, fY, fZ, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 10000);
+        }
+
+        // random chance to yell
+        if (roll_chance_i(20))
+            return;
+        
+        // random text when assassin is summoned
+        switch (urand(0, 6))
+        {
+            case 0: DoScriptText(SAY_WIL_PROGRESS_1, m_creature); break;
+            case 1: DoScriptText(SAY_WIL_PROGRESS_2, m_creature); break;
+            case 2: DoScriptText(SAY_WIL_PROGRESS_3, m_creature); break;
+            case 3: DoScriptText(SAY_WIL_PROGRESS_4, m_creature); break;
+            case 4: DoScriptText(SAY_WIL_PROGRESS_5, m_creature); break;
+            case 5: DoScriptText(SAY_WIL_AGGRO_1, m_creature); break;
+            case 6: DoScriptText(SAY_WIL_AGGRO_2, m_creature); break;
+        }
+    }
+#endif
+
+#if defined (TBC)
+        void Aggro(Unit* pWho) override
+        {
+            // don't always use
+            if (urand(0, 4))
+            {
+                return;
+            }
+
+            // only aggro text if not player
+            if (pWho->GetTypeId() != TYPEID_PLAYER)
+            {
+                // appears to be random
+                switch (urand(0, 3))
+                {
+                case 0: DoScriptText(SAY_WIL_AGGRO1, m_creature, pWho); break;
+                case 1: DoScriptText(SAY_WIL_AGGRO2, m_creature, pWho); break;
+                }
+            }
+        }
+#endif
+
+#if defined (WOTLK) || defined (CATA)
+    // free the water spirits
+    void DoFreeSpirits()
+    {
+        std::list<Creature*> lSpiritsInRange;
+        GetCreatureListWithEntryInGrid(lSpiritsInRange, m_creature, NPC_CAPTURED_WATER_SPIRIT, 50.0f);
+        
+        if (lSpiritsInRange.empty())
+            return;
+
+        // all spirits follow
+        for (std::list<Creature*>::const_iterator itr = lSpiritsInRange.begin(); itr != lSpiritsInRange.end(); ++itr)
+        {
+            (*itr)->RemoveAurasDueToSpell(SPELL_WATER_BUBBLE);
+            (*itr)->GetMotionMaster()->MoveFollow(m_creature, m_creature->GetDistance(*itr) * 0.25f, M_PI_F/2 + m_creature->GetAngle(*itr));
+            (*itr)->SetLevitate(false);
+        }
+    }
+    
+    void DoDespawnSpirits()
+    {
+        std::list<Creature*> lSpiritsInRange;
+        GetCreatureListWithEntryInGrid(lSpiritsInRange, m_creature, NPC_CAPTURED_WATER_SPIRIT, 50.0f);
+        
+        if (lSpiritsInRange.empty())
+            return;
+        
+        // all spirits follow
+        for (std::list<Creature*>::const_iterator itr = lSpiritsInRange.begin(); itr != lSpiritsInRange.end(); ++itr)
+            (*itr)->ForcedDespawn(6000);
+    }
+#endif
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // TODO: add more abilities
+#if defined (WOTLK) || defined (CATA)
+            if (m_uiLightningTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CHAIN_LIGHTNING) == CAST_OK)
+                    m_uiLightningTimer = 4000;
+            }
+            else
+                m_uiLightningTimer -= uiDiff;
+
+            if (m_uiShockTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROST_SHOCK) == CAST_OK)
+                    m_uiShockTimer = 10000;
+            }
+            else
+                m_uiShockTimer -= uiDiff;
+#endif
+
+            if (m_creature->GetHealthPercent() <= 30.0f)
+            {
+                if (m_uiHealingTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_HEALING_WAVE);
+                    m_uiHealingTimer = 15000;
+                }
+                else
+                {
+                    m_uiHealingTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_wildaAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ESCAPE_COILSCAR)
+        {
+            DoScriptText(SAY_WIL_START, pCreature, pPlayer);
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+            pCreature->SetFactionTemporary(FACTION_EARTHEN, TEMPFACTION_RESTORE_RESPAWN);
+#endif
+#if defined (WOTLK) || defined (CATA)
+            pCreature->SetFactionTemporary(FACTION_ESCORT_A_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+            pCreature->SetLevitate(false);
+#endif
+
+            if (npc_wildaAI* pEscortAI = dynamic_cast<npc_wildaAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+};
+
+/*#####
+# Quest: Battle of the Crimson Watch
+#####*/
+
+enum
+{
+    QUEST_BATTLE_OF_THE_CRIMSON_WATCH = 10781,
+
+    EVENT_COOLDOWN                    = 30000,
+
+    SAY_TORLOTH_DIALOGUE1             = -1000532,
+    SAY_TORLOTH_DIALOGUE2             = -1000533,
+    SAY_TORLOTH_DIALOGUE3             = -1000534,
+    SAY_ILLIDAN_DIALOGUE              = -1000535,
+    SAY_ILLIDAN_SUMMON1               = -1000536,
+    SAY_ILLIDAN_SUMMON2               = -1000537,
+    SAY_ILLIDAN_SUMMON3               = -1000538,
+    SAY_ILLIDAN_SUMMON4               = -1000539,
+    SAY_EVENT_COMPLETED               = -1000540,
+
+    MODEL_ID_FELGUARD                 = 18654,
+    MODEL_ID_DREADLORD                = 19991,
+
+    NPC_ILLIDARI_SOLDIER              = 22075,
+    NPC_ILLIDARI_MIND_BREAKER         = 22074,
+    NPC_ILLIDARI_HIGHLORD             = 19797,
+    NPC_TORLOTH_THE_MAGNIFICENT       = 22076,
+    NPC_LORD_ILLIDAN                  = 22083
+};
+
+enum CinematicCreature
+{
+    LORD_ILLIDAN = 1,
+    TORLOTH      = 0
+};
+
+const float EVENT_AREA_RADIUS = 65.0;
+
+struct TorlothCinematic
+{
+    int32  iTextId;
+    uint32 uiCreature;
+    uint32 uiTimer;
+};
+
+static TorlothCinematic TorlothAnim[] =
+{
+    {SAY_TORLOTH_DIALOGUE1, TORLOTH, 2000},
+    {SAY_ILLIDAN_DIALOGUE, LORD_ILLIDAN, 7000},
+    {SAY_TORLOTH_DIALOGUE2, TORLOTH, 3000},
+    {0, TORLOTH, 2000},                                  // Torloth stand
+    {SAY_TORLOTH_DIALOGUE3, TORLOTH, 1000},
+    {0, TORLOTH, 3000},
+    {0, TORLOTH, 0}
+};
+
+struct Location
+{
+    float fLocX;
+    float fLocY;
+    float fLocZ;
+    float fOrient;
+};
+
+static Location SpawnLocation[] =
+{
+    { -4615.8556f, 1342.2532f, 139.9f, 1.612f},             // Illidari Soldier
+    { -4598.9365f, 1377.3182f, 139.9f, 3.917f},             // Illidari Soldier
+    { -4598.4697f, 1360.8999f, 139.9f, 2.427f},             // Illidari Soldier
+    { -4589.3599f, 1369.1061f, 139.9f, 3.165f},             // Illidari Soldier
+    { -4608.3477f, 1386.0076f, 139.9f, 4.108f},             // Illidari Soldier
+    { -4633.1889f, 1359.8033f, 139.9f, 0.949f},             // Illidari Soldier
+    { -4623.5791f, 1351.4574f, 139.9f, 0.971f},             // Illidari Soldier
+    { -4607.2988f, 1351.6099f, 139.9f, 2.416f},             // Illidari Soldier
+    { -4633.7764f, 1376.0417f, 139.9f, 5.608f},             // Illidari Soldier
+    { -4600.2461f, 1369.1240f, 139.9f, 3.056f},             // Illidari Mind Breaker
+    { -4631.7808f, 1367.9459f, 139.9f, 0.020f},             // Illidari Mind Breaker
+    { -4600.2461f, 1369.1240f, 139.9f, 3.056f},             // Illidari Highlord
+    { -4631.7808f, 1367.9459f, 139.9f, 0.020f},             // Illidari Highlord
+    { -4615.5586f, 1353.0031f, 139.9f, 1.540f},             // Illidari Highlord
+    { -4616.4736f, 1384.2170f, 139.9f, 4.971f},             // Illidari Highlord
+    { -4627.1240f, 1378.8752f, 139.9f, 2.544f}              // Torloth The Magnificent
+};
+
+struct WaveData
+{
+    uint8  uiSpawnCount;
+    uint8  uiUsedSpawnPoint;
+    uint32 uiCreatureId;
+    uint32 uiSpawnTimer;
+    uint32 uiYellTimer;
+    int32  iTextId;
+};
+
+static WaveData WavesInfo[] =
+{
+    // Illidari Soldier
+    {9, 0, NPC_ILLIDARI_SOLDIER, 10000, 7000, SAY_ILLIDAN_SUMMON1},
+    // Illidari Mind Breaker
+    {2, 9, NPC_ILLIDARI_MIND_BREAKER, 10000, 7000, SAY_ILLIDAN_SUMMON2},
+    // Illidari Highlord
+    {4, 11, NPC_ILLIDARI_HIGHLORD, 10000, 7000, SAY_ILLIDAN_SUMMON3},
+    // Torloth The Magnificent
+    {1, 15, NPC_TORLOTH_THE_MAGNIFICENT, 10000, 7000, SAY_ILLIDAN_SUMMON4}
+};
+
+/*######
+# mob_torloth
+#####*/
+
+enum
+{
+    SPELL_CLEAVE           = 15284,
+    SPELL_SHADOWFURY       = 39082,
+    SPELL_SPELL_REFLECTION = 33961
+};
+
+struct mob_torloth : public CreatureScript
+{
+    mob_torloth() : CreatureScript("mob_torloth") {}
+
+    struct mob_torlothAI : public ScriptedAI
+    {
+        mob_torlothAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_lordIllidanGuid;
+        ObjectGuid m_playerGuid;
+
+        uint32 m_uiCleaveTimer;
+        uint32 m_uiShadowfuryTimer;
+        uint32 m_uiSpellReflectionTimer;
+        uint8  m_uiAnimationCount;
+        uint32 m_uiAnimationTimer;
+
+        void Reset() override
+        {
+            m_lordIllidanGuid.Clear();
+            m_playerGuid.Clear();
+
+            m_uiAnimationCount = 0;
+            m_uiAnimationTimer = 4000;
+            m_uiCleaveTimer = 10000;
+            m_uiShadowfuryTimer = 18000;
+            m_uiSpellReflectionTimer = 25000;
+
+            // make him not attackable for the time of animation
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+            SetCombatMovement(false);
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->ForcedDespawn();
+        }
+
+        void HandleAnimation()
+        {
+            Creature* pCreature = m_creature;
+
+            if (TorlothAnim[m_uiAnimationCount].uiCreature == LORD_ILLIDAN)
+            {
+                pCreature = m_creature->GetMap()->GetCreature(m_lordIllidanGuid);
+
+                if (!pCreature)
+                {
+                    m_creature->ForcedDespawn();
+                    return;
+                }
+            }
+
+            if (TorlothAnim[m_uiAnimationCount].iTextId)
+            {
+                DoScriptText(TorlothAnim[m_uiAnimationCount].iTextId, pCreature);
+            }
+
+            m_uiAnimationTimer = TorlothAnim[m_uiAnimationCount].uiTimer;
+
+            switch (m_uiAnimationCount)
+            {
+            case 0:
+                m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+                break;
+            case 3:
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                break;
+            case 5:
+                if (Player* pTarget = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                {
+                    m_creature->AddThreat(pTarget);
+                    m_creature->SetFacingToObject(pTarget);
+                    m_creature->HandleEmote(EMOTE_ONESHOT_POINT);
+                }
+                break;
+            case 6:
+            {
+                      if (Player* pTarget = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                      {
+                          SetCombatMovement(true);
+                          m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                          float fLocX, fLocY, fLocZ;
+                          pTarget->GetPosition(fLocX, fLocY, fLocZ);
+                          m_creature->GetMotionMaster()->MovePoint(0, fLocX, fLocY, fLocZ);
+                      }
+                      break;
+            }
+            }
+
+            ++m_uiAnimationCount;
+        }
+
+        void JustDied(Unit* pKiller) override
+        {
+            if (Player* pPlayer = pKiller->GetCharmerOrOwnerPlayerOrPlayerItself())
+            {
+                pPlayer->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, m_creature);
+
+                if (Creature* pLordIllidan = m_creature->GetMap()->GetCreature(m_lordIllidanGuid))
+                {
+                    DoScriptText(SAY_EVENT_COMPLETED, pLordIllidan, pPlayer);
+                    pLordIllidan->AI()->EnterEvadeMode();
+                }
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                m_lordIllidanGuid = pSender->GetObjectGuid();
+                m_playerGuid = pInvoker->GetObjectGuid();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiAnimationCount < 7)
+            {
+                if (m_uiAnimationTimer < uiDiff)
+                {
+                    HandleAnimation();
+                }
+                else
+                {
+                    m_uiAnimationTimer -= uiDiff;
+                }
+            }
+            else
+            {
+                if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                {
+                    return;
+                }
+
+                if (m_uiCleaveTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_CLEAVE);
+                    m_uiCleaveTimer = 15000;
+                }
+                else
+                {
+                    m_uiCleaveTimer -= uiDiff;
+                }
+
+                if (m_uiShadowfuryTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_SHADOWFURY);
+                    m_uiShadowfuryTimer = 20000;
+                }
+                else
+                {
+                    m_uiShadowfuryTimer -= uiDiff;
+                }
+
+                if (m_uiSpellReflectionTimer < uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_SPELL_REFLECTION);
+                    m_uiSpellReflectionTimer = 30000;
+                }
+                else
+                {
+                    m_uiSpellReflectionTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_torlothAI(pCreature);
+    }
+};
+
+/*#####
+# npc_lord_illidan_stormrage
+#####*/
+
+struct npc_lord_illidan_stormrage : public CreatureScript
+{
+    npc_lord_illidan_stormrage() : CreatureScript("npc_lord_illidan_stormrage") {}
+
+    struct npc_lord_illidan_stormrageAI : public Scripted_NoMovementAI
+    {
+        npc_lord_illidan_stormrageAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        ObjectGuid m_playerGuid;
+        uint32 m_uiWaveTimer;
+        uint32 m_uiAnnounceTimer;
+        uint32 m_uiCheckTimer;
+        uint8  m_uiMobCount;
+        uint8  m_uiWaveCount;
+
+        bool m_bEventStarted;
+        bool m_bEventFailed;
+        bool m_bWaveAnnounced;
+
+        void Reset() override
+        {
+            m_playerGuid.Clear();
+
+            m_uiWaveTimer = 10000;
+            m_uiAnnounceTimer = 7000;
+            m_uiCheckTimer = 2000;
+
+            m_uiMobCount = 0;
+            m_uiWaveCount = 0;
+
+            m_bEventStarted = false;
+            m_bEventFailed = false;
+            m_bWaveAnnounced = false;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*data*/) override
+        {
+            if (!m_bEventStarted && eventType == AI_EVENT_CUSTOM_A && pSender == m_creature && pInvoker->GetTypeId() == TYPEID_PLAYER)
+                StartEvent((Player*)pInvoker);
+        }
+
+        void StartEvent(Player* pPlayer)
+        {
+            m_bEventStarted = true;
+            m_playerGuid = pPlayer->GetObjectGuid();
+        }
+
+        void SummonWave()
+        {
+            uint8 uiCount = WavesInfo[m_uiWaveCount].uiSpawnCount;
+            uint8 uiLocIndex = WavesInfo[m_uiWaveCount].uiUsedSpawnPoint;
+            uint8 uiFelguardCount = 0;
+            uint8 uiDreadlordCount = 0;
+
+            for (uint8 i = 0; i < uiCount; ++i)
+            {
+                float fLocX, fLocY, fLocZ, fOrient;
+                fLocX = SpawnLocation[uiLocIndex + i].fLocX;
+                fLocY = SpawnLocation[uiLocIndex + i].fLocY;
+                fLocZ = SpawnLocation[uiLocIndex + i].fLocZ;
+                fOrient = SpawnLocation[uiLocIndex + i].fOrient;
+
+                if (Creature* pSpawn = m_creature->SummonCreature(WavesInfo[m_uiWaveCount].uiCreatureId, fLocX, fLocY, fLocZ, fOrient, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000))
+                {
+
+                    if (m_uiWaveCount)                          // only in first wave
+                    {
+                        continue;
+                    }
+
+                    if (!urand(0, 2) && uiFelguardCount < 2)
+                    {
+                        pSpawn->SetDisplayId(MODEL_ID_FELGUARD);
+                        ++uiFelguardCount;
+                    }
+                    else if (uiDreadlordCount < 3)
+                    {
+                        pSpawn->SetDisplayId(MODEL_ID_DREADLORD);
+                        ++uiDreadlordCount;
+                    }
+                    else if (uiFelguardCount < 2)
+                    {
+                        pSpawn->SetDisplayId(MODEL_ID_FELGUARD);
+                        ++uiFelguardCount;
+                    }
+                }
+            }
+
+            ++m_uiWaveCount;
+            m_uiWaveTimer = WavesInfo[m_uiWaveCount].uiSpawnTimer;
+            m_uiAnnounceTimer = WavesInfo[m_uiWaveCount].uiYellTimer;
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // increment mob count
+            ++m_uiMobCount;
+
+            Player* p = m_creature->GetMap()->GetPlayer(m_playerGuid);
+            if (!p)
+            {
+                return;
+            }
+
+            if (pSummoned->GetEntry() == NPC_TORLOTH_THE_MAGNIFICENT)
+            {
+                if (CreatureAI* pTorlothAI = pSummoned->AI())
+                {
+                    SendAIEvent(AI_EVENT_CUSTOM_A, p, pSummoned);
+                }
+            }
+            else
+            {
+                float fLocX, fLocY, fLocZ;
+                p->GetPosition(fLocX, fLocY, fLocZ);
+                pSummoned->GetMotionMaster()->MovePoint(0, fLocX, fLocY, fLocZ);
+            }
+        }
+
+        void SummonedCreatureDespawn(Creature* /*pCreature*/) override
+        {
+            // decrement mob count
+            --m_uiMobCount;
+
+            if (!m_uiMobCount)
+            {
+                m_bWaveAnnounced = false;
+            }
+        }
+
+        void CheckEventFail()
+        {
+            Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            if (Group* pEventGroup = pPlayer->GetGroup())
+            {
+                uint8 uiDeadMemberCount = 0;
+                uint8 uiFailedMemberCount = 0;
+
+                for (GroupReference* pRef = pEventGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
+                {
+                    if (Player* pMember = pRef->getSource())
+                    {
+                        if (!pMember->IsAlive())
+                        {
+                            ++uiDeadMemberCount;
+                        }
+
+                        // if we already failed no need to check other things
+                        if (pMember->GetQuestStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) == QUEST_STATUS_FAILED)
+                        {
+                            ++uiFailedMemberCount;
+                            continue;
+                        }
+
+                        // we left event area fail quest
+                        if (!pMember->IsWithinDistInMap(m_creature, EVENT_AREA_RADIUS))
+                        {
+                            pMember->FailQuest(QUEST_BATTLE_OF_THE_CRIMSON_WATCH);
+                            ++uiFailedMemberCount;
+                        }
+                    }
+                }
+
+                if (pEventGroup->GetMembersCount() == uiFailedMemberCount)
+                {
+                    m_bEventFailed = true;
+                    return;
+                }
+
+                if (pEventGroup->GetMembersCount() == uiDeadMemberCount)
+                {
+                    for (GroupReference* pRef = pEventGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
+                    {
+                        if (Player* pMember = pRef->getSource())
+                        {
+                            if (pMember->GetQuestStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) == QUEST_STATUS_INCOMPLETE)
+                            {
+                                pMember->FailQuest(QUEST_BATTLE_OF_THE_CRIMSON_WATCH);
+                            }
+                        }
+                    }
+
+                    m_bEventFailed = true;
+                }
+            }
+            else if (pPlayer->IsDead() || !pPlayer->IsWithinDistInMap(m_creature, EVENT_AREA_RADIUS))
+            {
+                pPlayer->FailQuest(QUEST_BATTLE_OF_THE_CRIMSON_WATCH);
+                m_bEventFailed = true;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_playerGuid || !m_bEventStarted)
+            {
+                return;
+            }
+
+            if (!m_uiMobCount && m_uiWaveCount < 4)
+            {
+                if (!m_bWaveAnnounced && m_uiAnnounceTimer < uiDiff)
+                {
+                    DoScriptText(WavesInfo[m_uiWaveCount].iTextId, m_creature);
+                    m_bWaveAnnounced = true;
+                }
+                else
+                {
+                    m_uiAnnounceTimer -= uiDiff;
+                }
+
+                if (m_uiWaveTimer < uiDiff)
+                {
+                    SummonWave();
+                }
+                else
+                {
+                    m_uiWaveTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiCheckTimer < uiDiff)
+            {
+                CheckEventFail();
+                m_uiCheckTimer = 2000;
+            }
+            else
+            {
+                m_uiCheckTimer -= uiDiff;
+            }
+
+            if (m_bEventFailed)
+            {
+                Reset();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature * (pCreature)) override
+    {
+        return new npc_lord_illidan_stormrageAI(pCreature);
+    }
+};
+
+/*#####
+# go_crystal_prison : GameObject that begins the event and hands out quest
+######*/
+struct go_crystal_prison : public GameObjectScript
+{
+    go_crystal_prison() : GameObjectScript("go_crystal_prison") {}
+
+    bool OnQuestAccept(Player* pPlayer, GameObject* /*pGo*/, Quest const* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_BATTLE_OF_THE_CRIMSON_WATCH)
+        if (Creature* pLordIllidan = GetClosestCreatureWithEntry(pPlayer, NPC_LORD_ILLIDAN, 50.0))
+        if (CreatureAI* pIllidanAI = pLordIllidan->AI())
+            pIllidanAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pLordIllidan, pPlayer, 0);
+
+        return true;
+    }
+};
+
+/*######
+## npc_totem_of_spirits
+######*/
+
+enum
+{
+    QUEST_SPIRITS_FIRE_AND_EARTH        = 10458,
+    QUEST_SPIRITS_WATER                 = 10480,
+    QUEST_SPIRITS_AIR                   = 10481,
+
+    // quest 10458, 10480, 10481
+    SPELL_ELEMENTAL_SIEVE               = 36035,
+    SPELL_CALL_TO_THE_SPIRITS           = 36206,
+
+    SPELL_EARTH_CAPTURED                = 36025,            // dummies (having visual effects)
+    SPELL_FIERY_CAPTURED                = 36115,
+    SPELL_WATER_CAPTURED                = 36170,
+    SPELL_AIR_CAPTURED                  = 36181,
+
+    SPELL_EARTH_CAPTURED_CREDIT         = 36108,            // event 13513
+    SPELL_FIERY_CAPTURED_CREDIT         = 36117,            // event 13514
+    SPELL_WATER_CAPTURED_CREDIT         = 36171,            // event 13515
+    SPELL_AIR_CAPTURED_CREDIT           = 36182,            // event 13516
+
+    NPC_TOTEM_OF_SPIRITS                = 21071,
+    NPC_EARTH_SPIRIT                    = 21050,            // to be killed
+    NPC_FIERY_SPIRIT                    = 21061,
+    NPC_WATER_SPIRIT                    = 21059,
+    NPC_AIR_SPIRIT                      = 21060,
+
+    NPC_EARTHEN_SOUL                    = 21073,            // invisible souls summoned by the totem
+    NPC_FIERY_SOUL                      = 21097,
+    NPC_WATERY_SOUL                     = 21109,
+    NPC_AIRY_SOUL                       = 21116,
+
+    NPC_CREDIT_MARKER_EARTH             = 21092,            // quest objective npc's
+    NPC_CREDIT_MARKER_FIERY             = 21094,
+    NPC_CREDIT_MARKER_WATER             = 21095,
+    NPC_CREDIT_MARKER_AIR               = 21096,
+
+    EVENT_EARTH                         = 13513,            // credit events
+    EVENT_FIERY                         = 13514,
+    EVENT_WATER                         = 13515,
+    EVENT_AIR                           = 13516,
+};
+
+struct npc_totem_of_spirits : public CreatureScript
+{
+    npc_totem_of_spirits() : CreatureScript("npc_totem_of_spirits") {}
+
+    struct npc_totem_of_spiritsAI : public ScriptedPetAI
+    {
+        npc_totem_of_spiritsAI(Creature* pCreature) : ScriptedPetAI(pCreature) { }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override {}
+        void AttackedBy(Unit* /*pAttacker*/) override {}
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (pWho->GetTypeId() != TYPEID_UNIT)
+            {
+                return;
+            }
+
+            // Use the LoS function to check for the souls in range due to the fact that pets do not support SummonedMovementInform()
+            uint32 uiEntry = pWho->GetEntry();
+            if (uiEntry == NPC_EARTHEN_SOUL || uiEntry == NPC_FIERY_SOUL || uiEntry == NPC_WATERY_SOUL || uiEntry == NPC_AIRY_SOUL)
+            {
+                // Only when it's close to the totem
+                if (!pWho->IsWithinDistInMap(m_creature, 1.5f))
+                {
+                    return;
+                }
+
+                switch (uiEntry)
+                {
+                case NPC_EARTHEN_SOUL:
+                    pWho->CastSpell(m_creature, SPELL_EARTH_CAPTURED, true);
+                    break;
+                case NPC_FIERY_SOUL:
+                    pWho->CastSpell(m_creature, SPELL_FIERY_CAPTURED, true);
+                    break;
+                case NPC_WATERY_SOUL:
+                    pWho->CastSpell(m_creature, SPELL_WATER_CAPTURED, true);
+                    break;
+                case NPC_AIRY_SOUL:
+                    pWho->CastSpell(m_creature, SPELL_AIR_CAPTURED, true);
+                    break;
+                }
+
+                // Despawn the spirit soul after it's captured
+                ((Creature*)pWho)->ForcedDespawn();
+            }
+        }
+
+        void OwnerKilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_UNIT)
+            {
+                return;
+            }
+
+            uint32 uiEntry = pVictim->GetEntry();
+
+            // make elementals cast the sieve is only way to make it work properly, due to the spell target modes 22/7
+            if (uiEntry == NPC_EARTH_SPIRIT || uiEntry == NPC_FIERY_SPIRIT || uiEntry == NPC_WATER_SPIRIT || uiEntry == NPC_AIR_SPIRIT)
+            {
+                pVictim->CastSpell(pVictim, SPELL_ELEMENTAL_SIEVE, true);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // After summoning the spirit soul, make it move towards the totem
+            float fX, fY, fZ;
+            m_creature->GetContactPoint(pSummoned, fX, fY, fZ);
+            pSummoned->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_totem_of_spiritsAI(pCreature);
+    }
+};
+
+struct spell_totem_of_spirits : public SpellScript
+{
+    spell_totem_of_spirits() : SpellScript("spell_totem_of_spirits") {}
+
+    bool EffectDummy(Unit* /*pCaster*/, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiEffIndex != EFFECT_INDEX_0)
+        {
+            return false;
+        }
+        Creature* pCreatureTarget = pTarget->ToCreature();
+
+        switch (uiSpellId)
+        {
+        case SPELL_EARTH_CAPTURED:
+            pCreatureTarget->CastSpell(pCreatureTarget, SPELL_EARTH_CAPTURED_CREDIT, true);
+            return true;
+        case SPELL_FIERY_CAPTURED:
+            pCreatureTarget->CastSpell(pCreatureTarget, SPELL_FIERY_CAPTURED_CREDIT, true);
+            return true;
+        case SPELL_WATER_CAPTURED:
+            pCreatureTarget->CastSpell(pCreatureTarget, SPELL_WATER_CAPTURED_CREDIT, true);
+            return true;
+        case SPELL_AIR_CAPTURED:
+            pCreatureTarget->CastSpell(pCreatureTarget, SPELL_AIR_CAPTURED_CREDIT, true);
+            return true;
+        }
+
+        return false;
+    }
+};
+
+#if defined (TBC) || defined (WOTLK) 
+struct aura_elemental_sieve : public AuraScript
+{
+    aura_elemental_sieve() : AuraScript("aura_elemental_sieve") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() != SPELL_ELEMENTAL_SIEVE || pAura->GetEffIndex() != EFFECT_INDEX_0)
+        {
+            return false;
+        }
+
+        if (bApply)                                             // possible it should be some visual effects, using "enraged soul" npc and "Cosmetic: ... soul" spell
+        {
+            return true;
+        }
+
+        Creature* pCreature = (Creature*)pAura->GetTarget();
+        Unit* pCaster = pAura->GetCaster();
+
+        // aura only affect the spirit totem, since this is the one that need to be in range.
+        // It is possible though, that player is the one who should actually have the aura
+        // and check for presense of spirit totem, but then we can't script the dummy.
+        if (!pCreature || !pCreature->IsPet() || !pCaster)
+        {
+            return true;
+        }
+
+        // Summon the soul of the spirit and cast the visual
+        uint32 uiSoulEntry = 0;
+        switch (pCaster->GetEntry())
+        {
+        case NPC_EARTH_SPIRIT: uiSoulEntry = NPC_EARTHEN_SOUL; break;
+        case NPC_FIERY_SPIRIT: uiSoulEntry = NPC_FIERY_SOUL;   break;
+        case NPC_WATER_SPIRIT: uiSoulEntry = NPC_WATERY_SOUL;  break;
+        case NPC_AIR_SPIRIT:   uiSoulEntry = NPC_AIRY_SOUL;    break;
+        }
+
+        if (uiSoulEntry)
+        {
+            pCreature->CastSpell(pCreature, SPELL_CALL_TO_THE_SPIRITS, true);
+            pCreature->SummonCreature(uiSoulEntry, pCaster->GetPositionX(), pCaster->GetPositionY(), pCaster->GetPositionZ(), 0, TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN, 10000);
+        }
+
+        return true;
+    }
+};
+#endif
+
+struct event_spell_soul_captured_credit : public MapEventScript
+{
+    event_spell_soul_captured_credit() : MapEventScript("event_spell_soul_captured_credit") {}
+
+    bool OnReceived(uint32 uiEventId, Object* pSource, Object* /*pTarget*/, bool bIsStart) override
+    {
+        if (bIsStart && pSource->GetTypeId() == TYPEID_UNIT)
+        {
+            Player* pOwner = (Player*)((Creature*)pSource)->GetOwner();
+
+            if (!pOwner)
+            {
+                return true;
+            }
+
+            switch (uiEventId)
+            {
+            case EVENT_EARTH:
+                pOwner->KilledMonsterCredit(NPC_CREDIT_MARKER_EARTH);
+                return true;
+            case EVENT_FIERY:
+                pOwner->KilledMonsterCredit(NPC_CREDIT_MARKER_FIERY);
+                return true;
+            case EVENT_WATER:
+                pOwner->KilledMonsterCredit(NPC_CREDIT_MARKER_WATER);
+                return true;
+            case EVENT_AIR:
+                pOwner->KilledMonsterCredit(NPC_CREDIT_MARKER_AIR);
+                return true;
+            }
+        }
+
+        return false;
+    }
+};
+
+/*#####
+#npc_spawned_oronok_tornheart
+#####*/
+
+enum
+{
+    // texts
+    SAY_ORONOK_TOGETHER             = -1000803,
+    SAY_ORONOK_READY                = -1000804,
+    SAY_ORONOK_ELEMENTS             = -1000805,
+    SAY_ORONOK_EPILOGUE_1           = -1000806,
+    SAY_TORLOK_EPILOGUE_2           = -1000807,
+    SAY_ORONOK_EPILOGUE_3           = -1000808,
+    SAY_EARTH_EPILOGUE_4            = -1000809,
+    SAY_FIRE_EPILOGUE_5             = -1000810,
+    SAY_EARTH_EPILOGUE_6            = -1000811,
+    SAY_ORONOK_EPILOGUE_7           = -1000812,
+    EMOTE_GIVE_WEAPONS              = -1000813,
+    SAY_ORONOK_EPILOGUE_8           = -1000814,
+
+    GOSSIP_ITEM_FIGHT               = -3000109,
+    GOSSIP_TEXT_ID_ORONOK           = 10421,
+
+    // spells - some are already defined above
+    // SPELL_CHAIN_LIGHTNING         = 16006,
+    SPELL_EARTHBIND_TOTEM           = 15786,
+    // SPELL_FROST_SHOCK             = 12548,
+    // SPELL_HEALING_WAVE            = 12491,
+
+    // npcs
+    NPC_ORONOK_TORN_HEART           = 21685,
+    NPC_GROMTOR_SON_OF_ORONOK       = 21687,
+    NPC_BORAK_SON_OF_ORONOK         = 21686,
+    NPC_CYRUKH_THE_FIRELORD         = 21181,
+    // NPC_EARTH_SPIRIT              = 21050,
+    NPC_REDEEMED_SPIRIT_OF_EARTH    = 21739,
+    NPC_REDEEMED_SPIRIT_OF_FIRE     = 21740,
+    NPC_REDEEMED_SPIRIT_OF_AIR      = 21738,
+    NPC_REDEEMED_SPIRIT_OF_WATER    = 21741,
+    NPC_EARTHMENDER_TORLOK          = 21024,
+
+    GO_MARK_OF_KAELTHAS             = 185170,
+
+    QUEST_CIPHER_OF_DAMNATION       = 10588,
+
+    POINT_ID_ATTACK_READY           = 1,
+    POINT_ID_ELEMENTS               = 2,
+    POINT_ID_EPILOGUE               = 3,
+};
+
+static const DialogueEntry aOutroDialogue[] =
+{
+    {QUEST_CIPHER_OF_DAMNATION,     0,                              1000},
+    {NPC_CYRUKH_THE_FIRELORD,       0,                              0},
+    {NPC_EARTHMENDER_TORLOK,        0,                              1000},
+    {SAY_ORONOK_EPILOGUE_1,         NPC_ORONOK_TORN_HEART,          5000},
+    {SAY_TORLOK_EPILOGUE_2,         NPC_EARTHMENDER_TORLOK,         5000},
+    {NPC_REDEEMED_SPIRIT_OF_EARTH,  0,                              5000},
+    {SAY_ORONOK_EPILOGUE_3,         NPC_ORONOK_TORN_HEART,          5000},
+    {SAY_EARTH_EPILOGUE_4,          NPC_REDEEMED_SPIRIT_OF_EARTH,   5000},
+    {SAY_FIRE_EPILOGUE_5,           NPC_REDEEMED_SPIRIT_OF_FIRE,    14000},
+    {SAY_EARTH_EPILOGUE_6,          NPC_REDEEMED_SPIRIT_OF_EARTH,   6000},
+    {SAY_ORONOK_EPILOGUE_7,         NPC_ORONOK_TORN_HEART,          6000},
+    {EMOTE_GIVE_WEAPONS,            NPC_ORONOK_TORN_HEART,          6000},
+    {SAY_ORONOK_EPILOGUE_8,         NPC_ORONOK_TORN_HEART,          10000},
+    {NPC_ORONOK_TORN_HEART,         0,                              0},
+    {0, 0, 0},
+};
+
+struct EventLocations
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+const static EventLocations aDamnationLocations[] =
+{
+    { -3605.09f, 1885.47f, 47.24f, 1.81f},     // 0 fire spirit summon loc
+    { -3600.68f, 1886.58f, 47.24f, 1.81f},     // 1 earth spirit summon loc
+    { -3597.19f, 1887.46f, 47.24f, 1.77f},     // 2 water spirit summon loc
+    { -3593.18f, 1888.27f, 47.24f, 1.77f},     // 3 air spirit summon loc
+#if defined (TBC)
+    { -3595.36f, 1869.78f, 47.24f},            // 4 fight ready move loc
+    { -3635.90f, 1860.94f, 52.93f},            // 5 elementals move loc
+    { -3599.71f, 1897.94f, 47.24f}             // 6 epilogue move loc
+#endif
+#if defined (WOTLK) || defined (CATA)
+    { -3595.36f, 1869.78f, 47.24f, 0},            // 4 fight ready move loc
+    { -3635.90f, 1860.94f, 52.93f, 0},            // 5 elementals move loc
+    { -3599.71f, 1897.94f, 47.24f, 0}             // 6 epilogue move loc
+#endif
+};
+
+struct npc_spawned_oronok_tornheart : public CreatureScript
+{
+    npc_spawned_oronok_tornheart() : CreatureScript("npc_spawned_oronok_tornheart") {}
+
+    struct npc_spawned_oronok_tornheartAI : public ScriptedAI, private DialogueHelper
+    {
+        npc_spawned_oronok_tornheartAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aOutroDialogue)
+        {
+            StartNextDialogueText(QUEST_CIPHER_OF_DAMNATION);
+        }
+
+        uint32 m_uiLightningTimer;
+        uint32 m_uiTotemTimer;
+        uint32 m_uiFrostTimer;
+        uint32 m_uiHealTimer;
+
+        ObjectGuid m_torlokGuid;
+        ObjectGuid m_fireSpiritGuid;
+        ObjectGuid m_earthSpiritGuid;
+        ObjectGuid m_borakGuid;
+        ObjectGuid m_gromtorGuid;
+        ObjectGuid m_cyrukhGuid;
+
+        bool m_bHasAttackStart;
+
+        void Reset() override
+        {
+            m_uiLightningTimer = 15000;
+            m_uiTotemTimer = 10000;
+            m_uiFrostTimer = 20000;
+            m_uiHealTimer = 8000;
+
+            m_bHasAttackStart = false;
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case NPC_CYRUKH_THE_FIRELORD:
+                // Set them in motion
+                m_creature->SetWalk(false);
+                m_creature->GetMotionMaster()->MovePoint(POINT_ID_ATTACK_READY, aDamnationLocations[4].m_fX, aDamnationLocations[4].m_fY, aDamnationLocations[4].m_fZ);
+                if (Creature* pBorak = GetClosestCreatureWithEntry(m_creature, NPC_BORAK_SON_OF_ORONOK, 10.0f))
+                {
+                    m_borakGuid = pBorak->GetObjectGuid();
+                    pBorak->GetMotionMaster()->MoveFollow(m_creature, 5.0f, -M_PI_F / 2);
+                }
+                if (Creature* pGromtor = GetClosestCreatureWithEntry(m_creature, NPC_GROMTOR_SON_OF_ORONOK, 10.0f))
+                {
+                    m_gromtorGuid = pGromtor->GetObjectGuid();
+                    pGromtor->GetMotionMaster()->MoveFollow(m_creature, 5.0f, M_PI_F / 2);
+                }
+                break;
+            case NPC_EARTHMENDER_TORLOK:
+                if (Creature* pTorlok = GetClosestCreatureWithEntry(m_creature, NPC_EARTHMENDER_TORLOK, 25.0f))
+                {
+                    m_torlokGuid = pTorlok->GetObjectGuid();
+                    m_creature->SetFacingToObject(pTorlok);
+                }
+                break;
+            case NPC_REDEEMED_SPIRIT_OF_EARTH:
+                m_creature->SetFacingTo(4.9f);
+                m_creature->SummonCreature(NPC_REDEEMED_SPIRIT_OF_FIRE, aDamnationLocations[0].m_fX, aDamnationLocations[0].m_fY, aDamnationLocations[0].m_fZ, aDamnationLocations[0].m_fO, TEMPSUMMON_TIMED_DESPAWN, 32000);
+                m_creature->SummonCreature(NPC_REDEEMED_SPIRIT_OF_EARTH, aDamnationLocations[1].m_fX, aDamnationLocations[1].m_fY, aDamnationLocations[1].m_fZ, aDamnationLocations[1].m_fO, TEMPSUMMON_TIMED_DESPAWN, 32000);
+                m_creature->SummonCreature(NPC_REDEEMED_SPIRIT_OF_WATER, aDamnationLocations[2].m_fX, aDamnationLocations[2].m_fY, aDamnationLocations[2].m_fZ, aDamnationLocations[2].m_fO, TEMPSUMMON_TIMED_DESPAWN, 32000);
+                m_creature->SummonCreature(NPC_REDEEMED_SPIRIT_OF_AIR, aDamnationLocations[3].m_fX, aDamnationLocations[3].m_fY, aDamnationLocations[3].m_fZ, aDamnationLocations[3].m_fO, TEMPSUMMON_TIMED_DESPAWN, 32000);
+                break;
+            case SAY_ORONOK_EPILOGUE_7:
+                if (Creature* pTorlok = m_creature->GetMap()->GetCreature(m_torlokGuid))
+                {
+                    m_creature->SetFacingToObject(pTorlok);
+                }
+                break;
+            case NPC_ORONOK_TORN_HEART:
+                if (GameObject* pMark = GetClosestGameObjectWithEntry(m_creature, GO_MARK_OF_KAELTHAS, 30.0f))
+                {
+                    pMark->SetRespawnTime(5 * MINUTE);
+                    pMark->Refresh();
+                }
+                if (Creature* pBorak = m_creature->GetMap()->GetCreature(m_borakGuid))
+                {
+                    pBorak->ForcedDespawn();
+                }
+                if (Creature* pGromtor = m_creature->GetMap()->GetCreature(m_gromtorGuid))
+                {
+                    pGromtor->ForcedDespawn();
+                }
+                m_creature->ForcedDespawn();
+                break;
+            }
+        }
+
+        Creature* GetSpeakerByEntry(uint32 uiEntry) override
+        {
+            switch (uiEntry)
+            {
+            case NPC_ORONOK_TORN_HEART:         return m_creature;
+            case NPC_EARTHMENDER_TORLOK:        return m_creature->GetMap()->GetCreature(m_torlokGuid);
+            case NPC_REDEEMED_SPIRIT_OF_EARTH:  return m_creature->GetMap()->GetCreature(m_earthSpiritGuid);
+            case NPC_REDEEMED_SPIRIT_OF_FIRE:   return m_creature->GetMap()->GetCreature(m_fireSpiritGuid);
+
+            default:
+                return NULL;
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (!m_bHasAttackStart && pWho->GetEntry() == NPC_EARTH_SPIRIT)
+            {
+                // Cyrukh starts to attack
+                if (Creature* pCyrukh = m_creature->GetMap()->GetCreature(m_cyrukhGuid))
+                {
+                    pCyrukh->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                    pCyrukh->AI()->AttackStart(m_creature);
+                    AttackStart(pCyrukh);
+                    m_bHasAttackStart = true;
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_REDEEMED_SPIRIT_OF_FIRE:
+                m_fireSpiritGuid = pSummoned->GetObjectGuid();
+                break;
+            case NPC_REDEEMED_SPIRIT_OF_EARTH:
+                m_earthSpiritGuid = pSummoned->GetObjectGuid();
+                break;
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+
+            if (!m_creature->IsAlive())
+            {
+                return;
+            }
+
+            if (Creature* pCyrukh = m_creature->GetMap()->GetCreature(m_cyrukhGuid))
+            {
+                if (!pCyrukh->IsAlive())
+                {
+                    m_creature->GetMotionMaster()->MovePoint(POINT_ID_EPILOGUE, aDamnationLocations[6].m_fX, aDamnationLocations[6].m_fY, aDamnationLocations[6].m_fZ);
+                }
+            }
+            else
+            {
+                script_error_log("Npc %u couldn't be found or something really bad happened. Epilogue event for quest %u will stop.", NPC_CYRUKH_THE_FIRELORD, QUEST_CIPHER_OF_DAMNATION);
+                m_creature->GetMotionMaster()->MoveTargetedHome();
+            }
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case POINT_ID_ATTACK_READY:
+                // Get Cyrukh guid now, because we are at a closer distance
+                if (Creature* pCyrukh = GetClosestCreatureWithEntry(m_creature, NPC_CYRUKH_THE_FIRELORD, 70.0f))
+                {
+                    m_cyrukhGuid = pCyrukh->GetObjectGuid();
+                }
+
+                m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                DoScriptText(SAY_ORONOK_READY, m_creature);
+                break;
+            case POINT_ID_ELEMENTS:
+                // Attack the closest earth element
+                if (Creature* pElement = GetClosestCreatureWithEntry(m_creature, NPC_EARTH_SPIRIT, 50.0f))
+                {
+                    AttackStart(pElement);
+                }
+                break;
+            case POINT_ID_EPILOGUE:
+                StartNextDialogueText(NPC_EARTHMENDER_TORLOK);
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiLightningTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_CHAIN_LIGHTNING) == CAST_OK)
+                    {
+                        m_uiLightningTimer = urand(9000, 15000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiLightningTimer -= uiDiff;
+            }
+
+            if (m_uiTotemTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_EARTHBIND_TOTEM) == CAST_OK)
+                {
+                    m_uiTotemTimer = urand(40000, 60000);
+                }
+            }
+            else
+            {
+                m_uiTotemTimer -= uiDiff;
+            }
+
+            if (m_uiFrostTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROST_SHOCK) == CAST_OK)
+                {
+                    m_uiFrostTimer = urand(14000, 18000);
+                }
+            }
+            else
+            {
+                m_uiFrostTimer -= uiDiff;
+            }
+
+            if (m_uiHealTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_HEALING_WAVE) == CAST_OK)
+                {
+                    m_uiHealTimer = urand(6000, 10000);
+                }
+            }
+            else
+            {
+                m_uiHealTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_spawned_oronok_tornheartAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_CIPHER_OF_DAMNATION) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_ID_ORONOK, pCreature->GetObjectGuid());
+        }
+        else
+        {
+            pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        }
+
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            // Note: this movement expects MMaps.
+            DoScriptText(SAY_ORONOK_ELEMENTS, pCreature);
+            pCreature->GetMotionMaster()->MovePoint(POINT_ID_ELEMENTS, aDamnationLocations[5].m_fX, aDamnationLocations[5].m_fY, aDamnationLocations[5].m_fZ);
+            pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_domesticated_felboar
+######*/
+
+enum
+{
+    EMOTE_SNIFF_AIR             = -1000907,
+    EMOTE_START_DIG             = -1000908,
+    EMOTE_SQUEAL                = -1000909,
+
+    SPELL_SHADOWMOON_TUBER      = 36462,
+    SPELL_SPECIAL_UNARMED       = 33334,
+    SPELL_TUBER_WHISTLE         = 36652,
+
+    NPC_DOMESTICATED_FELBOAR    = 21195,
+    NPC_SHADOWMOON_TUBER_NODE   = 21347,
+    GO_SHADOWMOON_TUBER_MOUND   = 184701,
+};
+
+struct npc_domesticated_felboar : public CreatureScript
+{
+    npc_domesticated_felboar() : CreatureScript("npc_domesticated_felboar") {}
+
+    struct npc_domesticated_felboarAI : public ScriptedAI
+    {
+        npc_domesticated_felboarAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiTuberTimer;
+        uint8 m_uiTuberStage;
+
+        void Reset() override
+        {
+            m_uiTuberTimer = 0;
+            m_uiTuberStage = 0;
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+            {
+                return;
+            }
+
+            if (DoCastSpellIfCan(m_creature, SPELL_SPECIAL_UNARMED) == CAST_OK)
+            {
+                DoScriptText(EMOTE_START_DIG, m_creature);
+                m_uiTuberTimer = 2000;
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_START_EVENT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoScriptText(EMOTE_SNIFF_AIR, m_creature);
+
+                float fX, fY, fZ;
+                m_creature->SetWalk(false);
+                m_creature->GetMotionMaster()->MoveIdle();
+                pSender->GetContactPoint(m_creature, fX, fY, fZ);
+                m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiTuberTimer)
+            {
+                if (m_uiTuberTimer <= uiDiff)
+                {
+                    switch (m_uiTuberStage)
+                    {
+                    case 0:
+                        if (DoCastSpellIfCan(m_creature, SPELL_SPECIAL_UNARMED) == CAST_OK)
+                        {
+                            m_uiTuberTimer = 2000;
+                        }
+                        break;
+                    case 1:
+                        if (DoCastSpellIfCan(m_creature, SPELL_SHADOWMOON_TUBER) == CAST_OK)
+                        {
+                            // Despawn current tuber
+                            if (GameObject* pTuber = GetClosestGameObjectWithEntry(m_creature, GO_SHADOWMOON_TUBER_MOUND, 3.0f))
+                            {
+                                pTuber->SetLootState(GO_JUST_DEACTIVATED);
+                            }
+
+                            DoScriptText(EMOTE_SQUEAL, m_creature);
+                            m_uiTuberTimer = 2000;
+                        }
+                        break;
+                    case 2:
+                        EnterEvadeMode();
+                        break;
+                    }
+                    ++m_uiTuberStage;
+                }
+                else
+                {
+                    m_uiTuberTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_domesticated_felboarAI(pCreature);
+    }
+};
+
+struct spell_tuber_whistle : public SpellScript
+{
+    spell_tuber_whistle() : SpellScript("spell_tuber_whistle") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_TUBER_WHISTLE && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature* pCreatureTarget = pTarget->ToCreature();
+            if (pCreatureTarget->GetEntry() == NPC_SHADOWMOON_TUBER_NODE)
+            {
+                // Check if tuber mound exists or it's spawned
+                GameObject* pTuber = GetClosestGameObjectWithEntry(pCreatureTarget, GO_SHADOWMOON_TUBER_MOUND, 1.0f);
+                if (!pTuber || !pTuber->isSpawned())
+                {
+                    return true;
+                }
+
+                // Call nearby felboar
+                if (Creature* pBoar = GetClosestCreatureWithEntry(pCreatureTarget, NPC_DOMESTICATED_FELBOAR, 40.0f))
+                {
+                    pCreatureTarget->AI()->SendAIEvent(AI_EVENT_START_EVENT, pCaster, pBoar);
+                }
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## npc_veneratus_spawn_node
+######*/
+
+enum
+{
+    SAY_VENERATUS_SPAWN         = -1000579,
+
+    NPC_VENERATUS               = 20427,
+    NPC_SPIRIT_HUNTER           = 21332,
+};
+
+struct npc_veneratus_spawn_node : public CreatureScript
+{
+    npc_veneratus_spawn_node() : CreatureScript("npc_veneratus_spawn_node") {}
+
+    struct npc_veneratus_spawn_nodeAI : public Scripted_NoMovementAI
+    {
+        npc_veneratus_spawn_nodeAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            // Check for the spirit hunter in order to spawn Veneratus; this will replace missing spells 36614 (dummy periodic spell) and 36616 (summon spell)
+            if (pWho->GetEntry() == NPC_SPIRIT_HUNTER && m_creature->IsWithinDistInMap(pWho, 40.0f) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                DoScriptText(SAY_VENERATUS_SPAWN, pWho);
+                DoSpawnCreature(NPC_VENERATUS, 0, 0, 0, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->ForcedDespawn();
+            }
+        }
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+        void UpdateAI(const uint32 uiDiff) override { }
+#endif
+//#if defined (WOTLK) || defined (CATA)
+//    void UpdateAI(const uint32 /* uiDiff */) override { }
+//
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_veneratus_spawn_nodeAI(pCreature);
+    }
+};
+
+void AddSC_shadowmoon_valley()
+{
+    Script* s;
+
+    s = new mob_mature_netherwing_drake();
+    s->RegisterSelf();
+    s = new mob_enslaved_netherwing_drake();
+    s->RegisterSelf();
+    s = new npc_dragonmaw_peon();
+    s->RegisterSelf();
+    s = new npc_wilda();
+    s->RegisterSelf();
+    s = new npc_lord_illidan_stormrage();
+    s->RegisterSelf();
+    s = new mob_torloth();
+    s->RegisterSelf();
+    s = new npc_totem_of_spirits();
+    s->RegisterSelf();
+    s = new event_spell_soul_captured_credit();
+    s->RegisterSelf();
+    s = new go_crystal_prison();
+    s->RegisterSelf();
+    s = new npc_spawned_oronok_tornheart();
+    s->RegisterSelf();
+    s = new npc_domesticated_felboar();
+    s->RegisterSelf();
+    s = new npc_veneratus_spawn_node();
+    s->RegisterSelf();
+    s = new spell_tuber_whistle();
+    s->RegisterSelf();
+    s = new spell_totem_of_spirits();
+    s->RegisterSelf();
+#if defined (TBC) || defined (WOTLK) 
+    s = new aura_elemental_sieve();
+    s->RegisterSelf();
+#endif
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_mature_netherwing_drake";
+    //pNewScript->GetAI = &GetAI_mob_mature_netherwing_drake;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_enslaved_netherwing_drake";
+    //pNewScript->GetAI = &GetAI_mob_enslaved_netherwing_drake;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_dragonmaw_peon";
+    //pNewScript->GetAI = &GetAI_npc_dragonmaw_peon;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_dragonmaw_peon;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_wilda";
+    //pNewScript->GetAI = &GetAI_npc_wilda;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_wilda;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_lord_illidan_stormrage";
+    //pNewScript->GetAI = &GetAI_npc_lord_illidan_stormrage;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_torloth";
+    //pNewScript->GetAI = &GetAI_mob_torloth;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_totem_of_spirits";
+    //pNewScript->GetAI = &GetAI_npc_totem_of_spirits;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_totem_of_spirits;
+    //pNewScript->pEffectAuraDummy = &EffectAuraDummy_npc_totem_of_spirits;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_spell_soul_captured_credit";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_spell_soul_captured_credit;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_crystal_prison";
+    //pNewScript->pQuestAcceptGO = &GOQuestAccept_GO_crystal_prison;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_spawned_oronok_tornheart";
+    //pNewScript->GetAI = &GetAI_npc_spawned_oronok_tornheart;
+    //pNewScript->pGossipHello =  &GossipHello_npc_spawned_oronok_tornheart;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_spawned_oronok_tornheart;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_domesticated_felboar";
+    //pNewScript->GetAI = &GetAI_npc_domesticated_felboar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_shadowmoon_tuber_node";
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_shadowmoon_tuber_node;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_veneratus_spawn_node";
+    //pNewScript->GetAI = &GetAI_npc_veneratus_spawn_node;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/shattrath_city.cpp b/src/modules/SD3/scripts/outland/shattrath_city.cpp
new file mode 100644
index 000000000..03c7ce8d6
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/shattrath_city.cpp
@@ -0,0 +1,741 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Shattrath_City
+SD%Complete: 100
+SDComment: Quest support: 10004, 10231.
+SDCategory: Shattrath City
+EndScriptData */
+
+/* ContentData
+npc_dirty_larry
+npc_ishanah
+npc_khadgars_servant
+npc_salsalabim
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+enum
+{
+    SAY_START               = -1000274,
+    SAY_COUNT               = -1000275,
+    SAY_COUNT_1             = -1000276,
+    SAY_COUNT_2             = -1000277,
+    SAY_ATTACK              = -1000278,
+    SAY_GIVEUP              = -1000279,
+    QUEST_WHAT_BOOK         = 10231,
+    ENTRY_CREEPJACK         = 19726,
+    ENTRY_MALONE            = 19725,
+    GOSSIP_ITEM_BOOK        = -3000105,
+};
+
+struct npc_dirty_larry : public CreatureScript
+{
+    npc_dirty_larry() : CreatureScript("npc_dirty_larry") {}
+
+    struct npc_dirty_larryAI : public ScriptedAI
+    {
+        npc_dirty_larryAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_uiNpcFlags = pCreature->GetUInt32Value(UNIT_NPC_FLAGS);
+        }
+
+        uint32 m_uiNpcFlags;
+
+        ObjectGuid m_creepjackGuid;
+        ObjectGuid m_maloneGuid;
+        ObjectGuid m_playerGuid;
+
+        bool bEvent;
+        bool bActiveAttack;
+
+        uint32 m_uiSayTimer;
+        uint32 m_uiStep;
+
+        void Reset() override
+        {
+            m_creature->SetUInt32Value(UNIT_NPC_FLAGS, m_uiNpcFlags);
+
+            m_playerGuid.Clear();
+            m_creepjackGuid.Clear();
+            m_maloneGuid.Clear();
+
+            bEvent = false;
+            bActiveAttack = false;
+
+            m_uiSayTimer = 1000;
+            m_uiStep = 0;
+
+            // expect database to have correct faction (1194) and then only unit flags set/remove needed
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+        }
+
+        void SetRuffies(ObjectGuid guid, bool bAttack, bool bReset)
+        {
+            Creature* pCreature = m_creature->GetMap()->GetCreature(guid);
+
+            if (!pCreature)
+            {
+                return;
+            }
+
+            if (bReset)
+            {
+                if (!pCreature->IsInEvadeMode() && pCreature->IsAlive())
+                {
+                    pCreature->AI()->EnterEvadeMode();
+                }
+
+                pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+            }
+            else
+            {
+                pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+
+                if (!pCreature->IsAlive())
+                {
+                    return;
+                }
+
+                pCreature->SetStandState(UNIT_STAND_STATE_STAND);
+
+                if (bAttack)
+                {
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                    {
+                        if (pPlayer->IsAlive())
+                        {
+                            pCreature->AI()->AttackStart(pPlayer);
+                        }
+                    }
+                }
+            }
+        }
+
+        void StartEvent(Player* pPlayer)
+        {
+            m_playerGuid = pPlayer->GetObjectGuid();
+
+            m_creature->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+
+            if (Creature* pCreepjack = GetClosestCreatureWithEntry(m_creature, ENTRY_CREEPJACK, 20.0f))
+            {
+                m_creepjackGuid = pCreepjack->GetObjectGuid();
+            }
+
+            if (Creature* pMalone = GetClosestCreatureWithEntry(m_creature, ENTRY_MALONE, 20.0f))
+            {
+                m_maloneGuid = pMalone->GetObjectGuid();
+            }
+
+            bEvent = true;
+        }
+
+        uint32 NextStep(uint32 uiStep)
+        {
+            Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+
+            if (!pPlayer)
+            {
+                SetRuffies(m_creepjackGuid, false, true);
+                SetRuffies(m_maloneGuid, false, true);
+                EnterEvadeMode();
+                return 0;
+            }
+
+            switch (uiStep)
+            {
+            case 1:
+                DoScriptText(SAY_START, m_creature, pPlayer);
+                SetRuffies(m_creepjackGuid, false, false);
+                SetRuffies(m_maloneGuid, false, false);
+                return 3000;
+            case 2: DoScriptText(SAY_COUNT, m_creature, pPlayer);   return 5000;
+            case 3: DoScriptText(SAY_COUNT_1, m_creature, pPlayer); return 3000;
+            case 4: DoScriptText(SAY_COUNT_2, m_creature, pPlayer); return 3000;
+            case 5: DoScriptText(SAY_ATTACK, m_creature, pPlayer);  return 3000;
+            case 6:
+                if (!m_creature->IsInCombat() && pPlayer->IsAlive())
+                {
+                    AttackStart(pPlayer);
+                }
+
+                SetRuffies(m_creepjackGuid, true, false);
+                SetRuffies(m_maloneGuid, true, false);
+                bActiveAttack = true;
+                return 2000;
+            default:
+                return 0;
+            }
+        }
+
+        void AttackedBy(Unit* pAttacker) override
+        {
+            if (m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (!bActiveAttack)
+            {
+                return;
+            }
+
+            AttackStart(pAttacker);
+        }
+
+        void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override
+        {
+            if (uiDamage < m_creature->GetHealth())
+            {
+                return;
+            }
+
+            // damage will kill, this is pretty much the same as 1%HP left
+            if (bEvent)
+            {
+                uiDamage = 0;
+
+                if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                {
+                    DoScriptText(SAY_GIVEUP, m_creature, pPlayer);
+                    pPlayer->GroupEventHappens(QUEST_WHAT_BOOK, m_creature);
+                }
+
+                SetRuffies(m_creepjackGuid, false, true);
+                SetRuffies(m_maloneGuid, false, true);
+                EnterEvadeMode();
+            }
+        }
+
+        void UpdateAI(const uint32 diff) override
+        {
+            if (bEvent && !bActiveAttack)
+            {
+                if (m_uiSayTimer < diff)
+                {
+                    m_uiSayTimer = NextStep(++m_uiStep);
+                }
+                else
+                {
+                    m_uiSayTimer -= diff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+
+        if (pPlayer->GetQuestStatus(QUEST_WHAT_BOOK) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->ADD_GOSSIP_ITEM_ID(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BOOK, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
+        {
+            if (npc_dirty_larryAI* pLarryAI = dynamic_cast<npc_dirty_larryAI*>(pCreature->AI()))
+            {
+                pLarryAI->StartEvent(pPlayer);
+            }
+
+            pPlayer->CLOSE_GOSSIP_MENU();
+        }
+
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_dirty_larryAI(pCreature);
+    }
+};
+
+/*######
+## npc_khadgars_servant
+######*/
+
+enum
+{
+    SAY_KHAD_START          = -1000489,
+    SAY_KHAD_SERV_0         = -1000234,
+
+    SAY_KHAD_SERV_1         = -1000235,
+    SAY_KHAD_SERV_2         = -1000236,
+    SAY_KHAD_SERV_3         = -1000237,
+    SAY_KHAD_SERV_4         = -1000238,
+
+    SAY_KHAD_SERV_5         = -1000239,
+    SAY_KHAD_SERV_6         = -1000240,
+    SAY_KHAD_SERV_7         = -1000241,
+
+    SAY_KHAD_SERV_8         = -1000242,
+    SAY_KHAD_SERV_9         = -1000243,
+    SAY_KHAD_SERV_10        = -1000244,
+    SAY_KHAD_SERV_11        = -1000245,
+
+    SAY_KHAD_SERV_12        = -1000246,
+    SAY_KHAD_SERV_13        = -1000247,
+
+    SAY_KHAD_SERV_14        = -1000248,
+    SAY_KHAD_SERV_15        = -1000249,
+    SAY_KHAD_SERV_16        = -1000250,
+    SAY_KHAD_SERV_17        = -1000251,
+
+    SAY_KHAD_SERV_18        = -1000252,
+    SAY_KHAD_SERV_19        = -1000253,
+    SAY_KHAD_SERV_20        = -1000254,
+    SAY_KHAD_SERV_21        = -1000255,
+
+    SAY_KHAD_INJURED        = -1000490,
+    SAY_KHAD_MIND_YOU       = -1000491,
+    SAY_KHAD_MIND_ALWAYS    = -1000492,
+    SAY_KHAD_ALDOR_GREET    = -1000493,
+    SAY_KHAD_SCRYER_GREET   = -1000494,
+    SAY_KHAD_HAGGARD        = -1000495,
+
+    NPC_KHADGAR             = 18166,
+    NPC_SHANIR              = 18597,
+    NPC_IZZARD              = 18622,
+    NPC_ADYRIA              = 18596,
+    NPC_ANCHORITE           = 19142,
+    NPC_ARCANIST            = 18547,
+    NPC_HAGGARD             = 19684,
+
+    QUEST_CITY_LIGHT        = 10211
+};
+
+struct npc_khadgars_servant : public CreatureScript
+{
+    npc_khadgars_servant() : CreatureScript("npc_khadgars_servant") {}
+
+    struct npc_khadgars_servantAI : public npc_escortAI
+    {
+        npc_khadgars_servantAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            if (pCreature->GetOwner() && pCreature->GetOwner()->GetTypeId() == TYPEID_PLAYER)
+            {
+                Start(false, (Player*)pCreature->GetOwner());
+            }
+            else
+            {
+                script_error_log("npc_khadgars_servant can not obtain owner or owner is not a player.");
+            }
+        }
+
+        uint32 m_uiPointId;
+        uint32 m_uiTalkTimer;
+        uint32 m_uiTalkCount;
+        uint32 m_uiRandomTalkCooldown;
+
+        void Reset() override
+        {
+            m_uiTalkTimer = 2500;
+            m_uiTalkCount = 0;
+            m_uiPointId = 0;
+            m_uiRandomTalkCooldown = 0;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_uiRandomTalkCooldown && pWho->GetTypeId() == TYPEID_UNIT && m_creature->IsWithinDistInMap(pWho, 10.0f))
+            {
+                switch (pWho->GetEntry())
+                {
+                case NPC_HAGGARD:
+                    if (Player* pPlayer = GetPlayerForEscort())
+                    {
+                        DoScriptText(SAY_KHAD_HAGGARD, pWho, pPlayer);
+                    }
+                    m_uiRandomTalkCooldown = 7500;
+                    break;
+                case NPC_ANCHORITE:
+                    if (Player* pPlayer = GetPlayerForEscort())
+                    {
+                        DoScriptText(SAY_KHAD_ALDOR_GREET, pWho, pPlayer);
+                    }
+                    m_uiRandomTalkCooldown = 7500;
+                    break;
+                case NPC_ARCANIST:
+                    if (Player* pPlayer = GetPlayerForEscort())
+                    {
+                        DoScriptText(SAY_KHAD_SCRYER_GREET, pWho, pPlayer);
+                    }
+                    m_uiRandomTalkCooldown = 7500;
+                    break;
+                }
+            }
+        }
+
+        void WaypointStart(uint32 uiPointId) override
+        {
+            if (uiPointId == 2)
+            {
+                DoScriptText(SAY_KHAD_SERV_0, m_creature);
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            m_uiPointId = uiPointId;
+
+            switch (uiPointId)
+            {
+            case 0:
+                if (Creature* pKhadgar = GetClosestCreatureWithEntry(m_creature, NPC_KHADGAR, 10.0f))
+                {
+                    DoScriptText(SAY_KHAD_START, pKhadgar);
+                }
+                break;
+            case 5:
+            case 24:
+            case 50:
+            case 63:
+            case 74:
+            case 75:
+                SetEscortPaused(true);
+                break;
+            case 34:
+                if (Creature* pIzzard = GetClosestCreatureWithEntry(m_creature, NPC_IZZARD, 10.0f))
+                {
+                    DoScriptText(SAY_KHAD_MIND_YOU, pIzzard);
+                }
+                break;
+            case 35:
+                if (Creature* pAdyria = GetClosestCreatureWithEntry(m_creature, NPC_ADYRIA, 10.0f))
+                {
+                    DoScriptText(SAY_KHAD_MIND_ALWAYS, pAdyria);
+                }
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (m_uiRandomTalkCooldown)
+            {
+                if (m_uiRandomTalkCooldown <= uiDiff)
+                {
+                    m_uiRandomTalkCooldown = 0;
+                }
+                else
+                {
+                    m_uiRandomTalkCooldown -= uiDiff;
+                }
+            }
+
+            if (HasEscortState(STATE_ESCORT_PAUSED))
+            {
+                if (m_uiTalkTimer <= uiDiff)
+                {
+                    ++m_uiTalkCount;
+                    m_uiTalkTimer = 7500;
+
+                    Player* pPlayer = GetPlayerForEscort();
+
+                    if (!pPlayer)
+                    {
+                        return;
+                    }
+
+                    switch (m_uiPointId)
+                    {
+                    case 5:                                 // to lower city
+                    {
+                                                                switch (m_uiTalkCount)
+                                                                {
+                                                                case 1:
+                                                                    DoScriptText(SAY_KHAD_SERV_1, m_creature, pPlayer);
+                                                                    break;
+                                                                case 2:
+                                                                    DoScriptText(SAY_KHAD_SERV_2, m_creature, pPlayer);
+                                                                    break;
+                                                                case 3:
+                                                                    DoScriptText(SAY_KHAD_SERV_3, m_creature, pPlayer);
+                                                                    break;
+                                                                case 4:
+                                                                    DoScriptText(SAY_KHAD_SERV_4, m_creature, pPlayer);
+                                                                    SetEscortPaused(false);
+                                                                    break;
+                                                                }
+                                                                break;
+                    }
+                    case 24:                                // in lower city
+                    {
+                                                                switch (m_uiTalkCount)
+                                                                {
+                                                                case 5:
+                                                                    if (Creature* pShanir = GetClosestCreatureWithEntry(m_creature, NPC_SHANIR, 15.0f))
+                                                                    {
+                                                                        DoScriptText(SAY_KHAD_INJURED, pShanir, pPlayer);
+                                                                    }
+
+                                                                    DoScriptText(SAY_KHAD_SERV_5, m_creature, pPlayer);
+                                                                    break;
+                                                                case 6:
+                                                                    DoScriptText(SAY_KHAD_SERV_6, m_creature, pPlayer);
+                                                                    break;
+                                                                case 7:
+                                                                    DoScriptText(SAY_KHAD_SERV_7, m_creature, pPlayer);
+                                                                    SetEscortPaused(false);
+                                                                    break;
+                                                                }
+                                                                break;
+                    }
+                    case 50:                                // outside
+                    {
+                                                                switch (m_uiTalkCount)
+                                                                {
+                                                                case 8:
+                                                                    DoScriptText(SAY_KHAD_SERV_8, m_creature, pPlayer);
+                                                                    break;
+                                                                case 9:
+                                                                    DoScriptText(SAY_KHAD_SERV_9, m_creature, pPlayer);
+                                                                    break;
+                                                                case 10:
+                                                                    DoScriptText(SAY_KHAD_SERV_10, m_creature, pPlayer);
+                                                                    break;
+                                                                case 11:
+                                                                    DoScriptText(SAY_KHAD_SERV_11, m_creature, pPlayer);
+                                                                    SetEscortPaused(false);
+                                                                    break;
+                                                                }
+                                                                break;
+                    }
+                    case 63:                                // scryer
+                    {
+                                                                switch (m_uiTalkCount)
+                                                                {
+                                                                case 12:
+                                                                    DoScriptText(SAY_KHAD_SERV_12, m_creature, pPlayer);
+                                                                    break;
+                                                                case 13:
+                                                                    DoScriptText(SAY_KHAD_SERV_13, m_creature, pPlayer);
+                                                                    SetEscortPaused(false);
+                                                                    break;
+                                                                }
+                                                                break;
+                    }
+                    case 74:                                // aldor
+                    {
+                                                                switch (m_uiTalkCount)
+                                                                {
+                                                                case 14:
+                                                                    DoScriptText(SAY_KHAD_SERV_14, m_creature, pPlayer);
+                                                                    break;
+                                                                case 15:
+                                                                    DoScriptText(SAY_KHAD_SERV_15, m_creature, pPlayer);
+                                                                    break;
+                                                                case 16:
+                                                                    DoScriptText(SAY_KHAD_SERV_16, m_creature, pPlayer);
+                                                                    break;
+                                                                case 17:
+                                                                    DoScriptText(SAY_KHAD_SERV_17, m_creature, pPlayer);
+                                                                    SetEscortPaused(false);
+                                                                    break;
+                                                                }
+                                                                break;
+                    }
+                    case 75:                                // a'dal
+                    {
+                                                                switch (m_uiTalkCount)
+                                                                {
+                                                                case 18:
+                                                                    DoScriptText(SAY_KHAD_SERV_18, m_creature, pPlayer);
+                                                                    break;
+                                                                case 19:
+                                                                    DoScriptText(SAY_KHAD_SERV_19, m_creature, pPlayer);
+                                                                    break;
+                                                                case 20:
+                                                                    DoScriptText(SAY_KHAD_SERV_20, m_creature, pPlayer);
+                                                                    break;
+                                                                case 21:
+                                                                    DoScriptText(SAY_KHAD_SERV_21, m_creature, pPlayer);
+                                                                    pPlayer->AreaExploredOrEventHappens(QUEST_CITY_LIGHT);
+                                                                    SetEscortPaused(false);
+                                                                    break;
+                                                                }
+                                                                break;
+                    }
+                    }
+                }
+                else
+                {
+                    m_uiTalkTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_khadgars_servantAI(pCreature);
+    }
+};
+
+/*######
+# npc_salsalabim
+######*/
+
+enum
+{
+    FACTION_HOSTILE_SA              = 90,
+    QUEST_10004                     = 10004,
+
+    SPELL_MAGNETIC_PULL             = 31705,
+};
+
+struct npc_salsalabim : public CreatureScript
+{
+    npc_salsalabim() : CreatureScript("npc_salsalabim") {}
+
+    struct npc_salsalabimAI : public ScriptedAI
+    {
+        npc_salsalabimAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiMagneticPullTimer;
+
+        void Reset() override
+        {
+            m_uiMagneticPullTimer = 15000;
+        }
+
+        void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override
+        {
+            if (pDoneBy->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (m_creature->GetHealthPercent() < 20.0f)
+                {
+                    ((Player*)pDoneBy)->GroupEventHappens(QUEST_10004, m_creature);
+                    uiDamage = 0;
+                    EnterEvadeMode();
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiMagneticPullTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_MAGNETIC_PULL);
+                m_uiMagneticPullTimer = 15000;
+            }
+            else
+            {
+                m_uiMagneticPullTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_salsalabimAI(pCreature);
+    }
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_10004) == QUEST_STATUS_INCOMPLETE)
+        {
+            pCreature->SetFactionTemporary(FACTION_HOSTILE_SA, TEMPFACTION_RESTORE_REACH_HOME);
+            pCreature->AI()->AttackStart(pPlayer);
+        }
+        else
+        {
+            if (pCreature->IsQuestGiver())
+            {
+                pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+            }
+
+            pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        }
+
+        return true;
+    }
+};
+
+void AddSC_shattrath_city()
+{
+    Script* s;
+
+    s = new npc_dirty_larry();
+    s->RegisterSelf();
+    s = new npc_khadgars_servant();
+    s->RegisterSelf();
+    s = new npc_salsalabim();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_dirty_larry";
+    //pNewScript->GetAI = &GetAI_npc_dirty_larry;
+    //pNewScript->pGossipHello = &GossipHello_npc_dirty_larry;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_dirty_larry;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_khadgars_servant";
+    //pNewScript->GetAI = &GetAI_npc_khadgars_servant;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_salsalabim";
+    //pNewScript->GetAI = &GetAI_npc_salsalabim;
+    //pNewScript->pGossipHello = &GossipHello_npc_salsalabim;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp b/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp
new file mode 100644
index 000000000..1d5c8eef3
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp
@@ -0,0 +1,422 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Arcatraz
+SD%Complete: 60
+SDComment: Warden Mellichar, event controller for Skyriss event. Millhouse Manastorm. TODO: make better combatAI for Millhouse.
+SDCategory: Tempest Keep, The Arcatraz
+EndScriptData */
+
+/* ContentData
+npc_millhouse_manastorm
+npc_warden_mellichar
+mob_zerekethvoidzone
+EndContentData */
+
+#include "precompiled.h"
+#include "arcatraz.h"
+
+/*#####
+# npc_millhouse_manastorm
+#####*/
+
+enum
+{
+    SAY_INTRO_1                     = -1552010,
+    SAY_INTRO_2                     = -1552011,
+    SAY_WATER                       = -1552012,
+    SAY_BUFFS                       = -1552013,
+    SAY_DRINK                       = -1552014,
+    SAY_READY                       = -1552015,
+    SAY_KILL_1                      = -1552016,
+    SAY_KILL_2                      = -1552017,
+    SAY_PYRO                        = -1552018,
+    SAY_ICEBLOCK                    = -1552019,
+    SAY_LOWHP                       = -1552020,
+    SAY_DEATH                       = -1552021,
+
+    SPELL_CONJURE_WATER             = 36879,
+    SPELL_ARCANE_INTELLECT          = 36880,
+    SPELL_ICE_ARMOR                 = 36881,
+    SPELL_DRINK                     = 30024,
+
+    SPELL_ARCANE_MISSILES           = 33833,
+    SPELL_CONE_OF_COLD              = 12611,
+    SPELL_FIRE_BLAST                = 13341,
+    SPELL_FIREBALL                  = 14034,
+    SPELL_FROSTBOLT                 = 15497,
+    SPELL_PYROBLAST                 = 33975,
+    SPELL_ICE_BLOCK                 = 36911,
+
+    POINT_ID_CENTER                 = 1,
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {NPC_MILLHOUSE,   0,             2000},
+    {SAY_INTRO_1,     NPC_MILLHOUSE, 10000},
+    {TYPE_WARDEN_2,   0,             10000},
+    {SAY_INTRO_2,     NPC_MILLHOUSE, 18000},
+    {SAY_WATER,       NPC_MILLHOUSE, 7000},
+    {SAY_BUFFS,       NPC_MILLHOUSE, 6000},
+    {SPELL_ICE_ARMOR, 0,             1000},
+    {SAY_DRINK,       NPC_MILLHOUSE, 7000},
+    {SAY_READY,       NPC_MILLHOUSE, 6000},
+    {POINT_ID_CENTER, 0,             0},
+    {0, 0, 0},
+};
+
+static const float fRoomCenterCoords[3] = {445.8804f, -158.7055f, 43.06898f};
+
+struct npc_millhouse_manastorm : public CreatureScript
+{
+    npc_millhouse_manastorm() : CreatureScript("npc_millhouse_manastorm") {}
+
+    struct npc_millhouse_manastormAI : public ScriptedAI, private DialogueHelper
+    {
+        npc_millhouse_manastormAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            InitializeDialogueHelper(m_pInstance);
+            m_attackDistance = 25.0f;
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        bool m_bHasLowHp;
+        uint32 m_uiPyroblastTimer;
+        uint32 m_uiFireballTimer;
+        uint32 m_uiFrostBoltTimer;
+        uint32 m_uiFireBlastTimer;
+        uint32 m_uiConeColtTimer;
+        uint32 m_uiArcaneMissileTimer;
+
+        void Reset() override
+        {
+            m_bHasLowHp = false;
+            m_uiPyroblastTimer = urand(6000, 9000);
+            m_uiFireballTimer = urand(2500, 4000);
+            m_uiFrostBoltTimer = urand(3000, 5000);
+            m_uiFireBlastTimer = urand(6000, 14000);
+            m_uiConeColtTimer = urand(7000, 12000);
+            m_uiArcaneMissileTimer = urand(5000, 8000);
+
+            StartNextDialogueText(NPC_MILLHOUSE);
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                HandleMovementOnAttackStart(pWho);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL_1 : SAY_KILL_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            /*for questId 10886 (heroic mode only)
+            if (m_pInstance && m_pInstance->GetData(TYPE_HARBINGERSKYRISS) != DONE)
+            ->FailQuest();*/
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            // Boss should evade in the center of the room
+            if (m_creature->IsAlive())
+            {
+                m_creature->GetMotionMaster()->MovePoint(1, fRoomCenterCoords[0], fRoomCenterCoords[1], fRoomCenterCoords[2]);
+            }
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            switch (iEntry)
+            {
+            case TYPE_WARDEN_2:
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_WARDEN_2, DONE);
+                }
+                break;
+            case SAY_WATER:
+                DoCastSpellIfCan(m_creature, SPELL_CONJURE_WATER);
+                break;
+            case SAY_BUFFS:
+                DoCastSpellIfCan(m_creature, SPELL_ARCANE_INTELLECT);
+                break;
+            case SPELL_ICE_ARMOR:
+                DoCastSpellIfCan(m_creature, SPELL_ICE_ARMOR);
+                break;
+            case SAY_DRINK:
+                DoCastSpellIfCan(m_creature, SPELL_DRINK);
+                break;
+            case POINT_ID_CENTER:
+                m_creature->SetWalk(false);
+                m_creature->GetMotionMaster()->MovePoint(1, fRoomCenterCoords[0], fRoomCenterCoords[1], fRoomCenterCoords[2]);
+                break;
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (!m_bHasLowHp && m_creature->GetHealthPercent() < 20.0f)
+            {
+                DoScriptText(SAY_LOWHP, m_creature);
+                m_bHasLowHp = true;
+            }
+
+            if (m_uiPyroblastTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_PYROBLAST) == CAST_OK)
+                {
+                    m_uiPyroblastTimer = 40000;
+                    DoScriptText(SAY_PYRO, m_creature);
+                }
+            }
+            else
+            {
+                m_uiPyroblastTimer -= uiDiff;
+            }
+
+            if (m_uiFireballTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FIREBALL) == CAST_OK)
+                {
+                    m_uiFireballTimer = 4000;
+                }
+            }
+            else
+            {
+                m_uiFireballTimer -= uiDiff;
+            }
+
+            if (m_uiFrostBoltTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROSTBOLT) == CAST_OK)
+                {
+                    m_uiFrostBoltTimer = urand(4000, 6000);
+                }
+            }
+            else
+            {
+                m_uiFrostBoltTimer -= uiDiff;
+            }
+
+            if (m_uiConeColtTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_CONE_OF_COLD) == CAST_OK)
+                {
+                    m_uiConeColtTimer = urand(7000, 12000);
+                }
+            }
+            else
+            {
+                m_uiConeColtTimer -= uiDiff;
+            }
+
+            if (m_uiFireBlastTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FIRE_BLAST) == CAST_OK)
+                {
+                    m_uiFireBlastTimer = urand(5000, 16000);
+                }
+            }
+            else
+            {
+                m_uiFireBlastTimer -= uiDiff;
+            }
+
+            if (m_uiArcaneMissileTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ARCANE_MISSILES) == CAST_OK)
+                {
+                    m_uiArcaneMissileTimer = urand(5000, 8000);
+                }
+            }
+            else
+            {
+                m_uiArcaneMissileTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_millhouse_manastormAI(pCreature);
+    }
+};
+
+/*#####
+# npc_warden_mellichar
+#####*/
+
+enum
+{
+    SPELL_BUBBLE_VISUAL     = 36849,
+    SPELL_SIMPLE_TELEPORT   = 12980,
+};
+
+struct npc_warden_mellichar : public CreatureScript
+{
+    npc_warden_mellichar() : CreatureScript("npc_warden_mellichar") {}
+
+    struct npc_warden_mellicharAI : public ScriptedAI
+    {
+        npc_warden_mellicharAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiIntroTimer;
+        ObjectGuid m_targetPlayerGuid;
+
+        void Reset() override
+        {
+            m_uiIntroTimer = 5000;
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+        }
+
+        void AttackStart(Unit* /*pWho*/) override {}
+
+        void Aggro(Unit* pWho) override
+        {
+            m_creature->InterruptNonMeleeSpells(false);
+            m_creature->SetFacingToObject(pWho);
+            m_targetPlayerGuid = pWho->GetObjectGuid();
+
+            DoCastSpellIfCan(m_creature, SPELL_BUBBLE_VISUAL);
+
+            // In theory the Seal Sphere should protect the npc from being attacked, but because LoS isn't enabled for Gameobjects we have to use this workaround
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HARBINGERSKYRISS, IN_PROGRESS);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->CastSpell(pSummoned, SPELL_SIMPLE_TELEPORT, false);
+
+            if (pSummoned->GetEntry() != NPC_MILLHOUSE && pSummoned->GetEntry() != NPC_SKYRISS)
+            {
+                if (Unit* pTarget = m_creature->GetMap()->GetUnit(m_targetPlayerGuid))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                if (Creature* pSkyriss = m_pInstance->GetSingleCreatureFromStorage(NPC_SKYRISS))
+                {
+                    if (Unit* pTarget = m_creature->GetMap()->GetUnit(m_targetPlayerGuid))
+                    {
+                        pSkyriss->AI()->AttackStart(pTarget);
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Set the visual intro on OOC timer
+            if (m_uiIntroTimer)
+            {
+                if (m_uiIntroTimer <= uiDiff)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_TARGET_OMEGA);
+                    m_uiIntroTimer = 0;
+                }
+                else
+                {
+                    m_uiIntroTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_warden_mellicharAI(pCreature);
+    }
+};
+
+void AddSC_arcatraz()
+{
+    Script* s;
+
+    s = new npc_millhouse_manastorm();
+    s->RegisterSelf();
+    s = new npc_warden_mellichar();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_millhouse_manastorm";
+    //pNewScript->GetAI = &GetAI_npc_millhouse_manastorm;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_warden_mellichar";
+    //pNewScript->GetAI = &GetAI_npc_warden_mellichar;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/arcatraz.h b/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/arcatraz.h
new file mode 100644
index 000000000..a41ba4b06
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/arcatraz.h
@@ -0,0 +1,86 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_ARCATRAZ_H
+#define DEF_ARCATRAZ_H
+
+enum
+{
+    MAX_ENCOUNTER                   = 10,
+    MAX_WARDENS                     = 7,
+
+    TYPE_ENTRANCE                   = 0,
+    TYPE_ZEREKETH                   = 1,
+    TYPE_DALLIAH                    = 2,
+    TYPE_SOCCOTHRATES               = 3,
+    TYPE_HARBINGERSKYRISS           = 4,                    // Handled with ACID (FAIL of 20905, 20906, 20908, 20909, 20910, 20911)
+    TYPE_WARDEN_1                   = 5,                    // Handled with ACID (20905 - Blazing Trickster, 20906 - Phase-Hunter)
+    TYPE_WARDEN_2                   = 6,
+    TYPE_WARDEN_3                   = 7,                    // Handled with ACID (20908 - Akkiris Lightning-Waker, 20909 - Sulfuron Magma-Thrower)
+    TYPE_WARDEN_4                   = 8,                    // Handled with ACID (20910 - Twilight Drakonaar, 20911 - Blackwing Drakonaar)
+    TYPE_WARDEN_5                   = 9,
+
+    NPC_DALLIAH                     = 20885,
+    NPC_SOCCOTHRATES                = 20886,
+    NPC_MELLICHAR                   = 20904,                // Skyriss will kill this unit
+    NPC_PRISON_APHPA_POD            = 21436,
+    NPC_PRISON_BETA_POD             = 21437,
+    NPC_PRISON_DELTA_POD            = 21438,
+    NPC_PRISON_GAMMA_POD            = 21439,
+    NPC_PRISON_BOSS_POD             = 21440,
+
+    // intro event related
+    NPC_PROTEAN_NIGHTMARE           = 20864,
+    NPC_PROTEAN_HORROR              = 20865,
+    NPC_ARCATRAZ_WARDEN             = 20859,
+    NPC_ARCATRAZ_DEFENDER           = 20857,
+
+    // Harbinger Skyriss event related (trash mobs are scripted in ACID)
+    NPC_BLAZING_TRICKSTER           = 20905,                // phase 1
+    NPC_PHASE_HUNTER                = 20906,
+    NPC_MILLHOUSE                   = 20977,                // phase 2
+    NPC_AKKIRIS                     = 20908,                // phase 3
+    NPC_SULFURON                    = 20909,
+    NPC_TW_DRAKONAAR                = 20910,                // phase 4
+    NPC_BL_DRAKONAAR                = 20911,
+    NPC_SKYRISS                     = 20912,                // phase 5
+
+    GO_CORE_SECURITY_FIELD_ALPHA    = 184318,               // Door opened when Wrath-Scryer Soccothrates dies
+    GO_CORE_SECURITY_FIELD_BETA     = 184319,               // Door opened when Dalliah the Doomsayer dies
+    GO_SEAL_SPHERE                  = 184802,               // Shield 'protecting' mellichar
+    GO_POD_ALPHA                    = 183961,               // Pod first boss wave
+    GO_POD_BETA                     = 183963,               // Pod second boss wave
+    GO_POD_DELTA                    = 183964,               // Pod third boss wave
+    GO_POD_GAMMA                    = 183962,               // Pod fourth boss wave
+    GO_POD_OMEGA                    = 183965,               // Pod fifth boss wave
+
+    SPELL_TARGET_OMEGA              = 36852,                // Visual spell used by Mellichar
+};
+
+static const float aDalliahStartPos[4] = {118.6038f, 96.84682f, 22.44115f, 1.012f};
+static const float aSoccotharesStartPos[4] = {122.1035f, 192.7203f, 22.44115f, 5.235f};
+
+#endif
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/boss_dalliah.cpp b/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/boss_dalliah.cpp
new file mode 100644
index 000000000..78ea49af0
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/boss_dalliah.cpp
@@ -0,0 +1,260 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_dalliah
+SD%Complete: 100
+SDComment:
+SDCategory: Tempest Keep, The Arcatraz
+EndScriptData */
+
+#include "precompiled.h"
+#include "arcatraz.h"
+
+enum
+{
+    SAY_AGGRO                       = -1552031,
+    SAY_SOCCOTHRATES_TAUNT_1        = -1552040,
+    SAY_SOCCOTHRATES_TAUNT_2        = -1552041,
+    SAY_SOCCOTHRATES_TAUNT_3        = -1552042,
+    SAY_HEAL_1                      = -1552032,
+    SAY_HEAL_2                      = -1552033,
+    SAY_KILL_1                      = -1552034,
+    SAY_KILL_2                      = -1552035,
+    SAY_WHIRLWIND_1                 = -1552036,
+    SAY_WHIRLWIND_2                 = -1552037,
+    SAY_DEATH                       = -1552038,
+
+    SPELL_GIFT_DOOMSAYER            = 36173,
+    SPELL_GIFT_DOOMSAYER_H          = 39009,
+    SPELL_HEAL                      = 36144,
+    SPELL_HEAL_H                    = 39013,
+    SPELL_WHIRLWIND                 = 36142,
+    SPELL_SHADOW_WAVE               = 39016,                // heroic spell only
+};
+
+struct boss_dalliah : public CreatureScript
+{
+    boss_dalliah() : CreatureScript("boss_dalliah") {}
+
+    struct boss_dalliahAI : public ScriptedAI
+    {
+        boss_dalliahAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiGiftDoomsayerTimer;
+        uint32 m_uiHealTimer;
+        uint32 m_uiWhirlwindTimer;
+        uint32 m_uiShadowWaveTimer;
+
+        bool m_bHasTaunted;
+
+        void Reset() override
+        {
+            m_uiGiftDoomsayerTimer = urand(4000, 7000);
+            m_uiHealTimer = 0;
+            m_uiWhirlwindTimer = 15000;
+            m_uiShadowWaveTimer = urand(9000, 13000);
+
+            m_bHasTaunted = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_DALLIAH, IN_PROGRESS);
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL_1 : SAY_KILL_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_DALLIAH, DONE);
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            // should evade to the attack position
+            if (m_creature->IsAlive())
+            {
+                m_creature->GetMotionMaster()->MovePoint(1, aDalliahStartPos[0], aDalliahStartPos[1], aDalliahStartPos[2]);
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_DALLIAH, FAIL);
+            }
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            // Adjust orientation
+            if (uiPointId)
+            {
+                m_creature->SetFacingTo(aDalliahStartPos[3]);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiGiftDoomsayerTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_GIFT_DOOMSAYER : SPELL_GIFT_DOOMSAYER_H) == CAST_OK)
+                {
+                    m_uiGiftDoomsayerTimer = urand(14000, 19000);
+                }
+            }
+            else
+            {
+                m_uiGiftDoomsayerTimer -= uiDiff;
+            }
+
+            if (m_uiWhirlwindTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WHIRLWIND) == CAST_OK)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_WHIRLWIND_1 : SAY_WHIRLWIND_2, m_creature);
+                    m_uiWhirlwindTimer = urand(25000, 30000);
+                    m_uiHealTimer = urand(6000, 10000);
+                }
+            }
+            else
+            {
+                m_uiWhirlwindTimer -= uiDiff;
+            }
+
+            if (m_uiHealTimer)
+            {
+                if (m_uiHealTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_HEAL : SPELL_HEAL_H) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_HEAL_1 : SAY_HEAL_2, m_creature);
+                        m_uiHealTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiHealTimer -= uiDiff;
+                }
+            }
+
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiShadowWaveTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_SHADOW_WAVE) == CAST_OK)
+                        {
+                            m_uiShadowWaveTimer = urand(13000, 17000);
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiShadowWaveTimer -= uiDiff;
+                }
+            }
+
+            if (!m_bHasTaunted && m_creature->GetHealthPercent() < 25.0f)
+            {
+                // Taunt if Soccothares isn't dead yet
+                if (m_pInstance && m_pInstance->GetData(TYPE_SOCCOTHRATES) != DONE)
+                {
+                    if (Creature* pSoccothares = m_pInstance->GetSingleCreatureFromStorage(NPC_SOCCOTHRATES))
+                    {
+                        switch (urand(0, 2))
+                        {
+                        case 0: DoScriptText(SAY_SOCCOTHRATES_TAUNT_1, pSoccothares); break;
+                        case 1: DoScriptText(SAY_SOCCOTHRATES_TAUNT_2, pSoccothares); break;
+                        case 2: DoScriptText(SAY_SOCCOTHRATES_TAUNT_3, pSoccothares); break;
+                        }
+                    }
+                }
+
+                m_bHasTaunted = true;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_dalliahAI(pCreature);
+    }
+};
+
+void AddSC_boss_dalliah()
+{
+    Script* s;
+
+    s = new boss_dalliah();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_dalliah";
+    //pNewScript->GetAI = &GetAI_boss_dalliah;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp b/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
new file mode 100644
index 000000000..ad08d5963
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
@@ -0,0 +1,235 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Harbinger_Skyriss
+SD%Complete: 95
+SDComment: Timers will need adjustments.
+SDCategory: Tempest Keep, The Arcatraz
+EndScriptData */
+
+#include "precompiled.h"
+#include "arcatraz.h"
+
+enum
+{
+    SAY_KILL_1                  = -1552002,
+    SAY_KILL_2                  = -1552003,
+    SAY_MIND_1                  = -1552004,
+    SAY_MIND_2                  = -1552005,
+    SAY_FEAR_1                  = -1552006,
+    SAY_FEAR_2                  = -1552007,
+    SAY_IMAGE                   = -1552008,
+    SAY_DEATH                   = -1552009,
+
+    SPELL_FEAR                  = 39415,
+    SPELL_MIND_REND             = 36924,
+    SPELL_MIND_REND_H           = 39017,
+    SPELL_DOMINATION            = 37162,
+    SPELL_DOMINATION_H          = 39019,
+    SPELL_MANA_BURN_H           = 39020,
+    SPELL_66_ILLUSION           = 36931,                    // Summons 21466
+    SPELL_33_ILLUSION           = 36932,                    // Summons 21467
+};
+
+struct boss_harbinger_skyriss : public CreatureScript
+{
+    boss_harbinger_skyriss() : CreatureScript("boss_harbinger_skyriss") {}
+
+    struct boss_harbinger_skyrissAI : public ScriptedAI
+    {
+        boss_harbinger_skyrissAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint8 m_uiSplitPhase;
+        uint32 m_uiMindRendTimer;
+        uint32 m_uiFearTimer;
+        uint32 m_uiDominationTimer;
+        uint32 m_uiManaBurnTimer;
+
+        void Reset() override
+        {
+            m_uiSplitPhase = 1;
+            m_uiMindRendTimer = 3000;
+            m_uiFearTimer = 15000;
+            m_uiDominationTimer = 30000;
+            m_uiManaBurnTimer = 25000;
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HARBINGERSKYRISS, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_HARBINGERSKYRISS, FAIL);
+            }
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            // won't yell killing pet/other unit
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            DoScriptText(urand(0, 1) ? SAY_KILL_1 : SAY_KILL_2, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (m_creature->getVictim())
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Check if creature is below 66% or 33%; Also don't allow it to split the third time
+            if (m_creature->GetHealthPercent() < 100 - 33 * m_uiSplitPhase && m_creature->GetHealthPercent() > 5.0f)
+            {
+                DoCastSpellIfCan(m_creature, m_uiSplitPhase == 1 ? SPELL_66_ILLUSION : SPELL_33_ILLUSION, CAST_INTERRUPT_PREVIOUS);
+                DoScriptText(SAY_IMAGE, m_creature);
+                ++m_uiSplitPhase;
+            }
+
+            if (m_uiMindRendTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+                if (!pTarget)
+                {
+                    pTarget = m_creature->getVictim();
+                }
+
+                if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_MIND_REND : SPELL_MIND_REND_H) == CAST_OK)
+                {
+                    m_uiMindRendTimer = 8000;
+                }
+            }
+            else
+            {
+                m_uiMindRendTimer -= uiDiff;
+            }
+
+            if (m_uiFearTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+                if (!pTarget)
+                {
+                    pTarget = m_creature->getVictim();
+                }
+
+                if (DoCastSpellIfCan(pTarget, SPELL_FEAR) == CAST_OK)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_FEAR_1 : SAY_FEAR_2, m_creature);
+                    m_uiFearTimer = 25000;
+                }
+            }
+            else
+            {
+                m_uiFearTimer -= uiDiff;
+            }
+
+            if (m_uiDominationTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, uint32(0), SELECT_FLAG_PLAYER))
+                {
+                    if (DoCastSpellIfCan(pTarget, m_bIsRegularMode ? SPELL_DOMINATION : SPELL_DOMINATION_H) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_MIND_1 : SAY_MIND_2, m_creature);
+                        m_uiDominationTimer = urand(16000, 32000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiDominationTimer -= uiDiff;
+            }
+
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiManaBurnTimer < uiDiff)
+                {
+                    Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+                    if (!pTarget)
+                    {
+                        pTarget = m_creature->getVictim();
+                    }
+
+                    if (DoCastSpellIfCan(pTarget, SPELL_MANA_BURN_H) == CAST_OK)
+                    {
+                        m_uiManaBurnTimer = urand(16000, 32000);
+                    }
+                }
+                else
+                {
+                    m_uiManaBurnTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_harbinger_skyrissAI(pCreature);
+    }
+};
+
+void AddSC_boss_harbinger_skyriss()
+{
+    Script* s;
+
+    s = new boss_harbinger_skyriss();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_harbinger_skyriss";
+    //pNewScript->GetAI = &GetAI_boss_harbinger_skyriss;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/boss_soccothrates.cpp b/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/boss_soccothrates.cpp
new file mode 100644
index 000000000..158727340
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/boss_soccothrates.cpp
@@ -0,0 +1,297 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_soccothrates
+SD%Complete: 80
+SDComment: Spell Felfire Line Up and Wrath-Scryer's Felfire npc are summoning are NYI and they need additional research.
+SDCategory: Tempest Keep, The Arcatraz
+EndScriptData */
+
+#include "precompiled.h"
+#include "arcatraz.h"
+
+enum
+{
+    // Intro yells
+    SAY_SOCCOTHRATES_INTRO_1        = -1552049,
+    SAY_DALLIAH_INTRO_2             = -1552050,
+    SAY_SOCCOTHRATES_INTRO_3        = -1552051,
+    SAY_DALLIAH_INTRO_4             = -1552052,
+    SAY_SOCCOTHRATES_INTRO_5        = -1552053,
+    SAY_DALLIAH_INTRO_6             = -1552054,
+    SAY_SOCCOTHRATES_INTRO_7        = -1552055,
+
+    SAY_AGGRO                       = -1552048,
+    SAY_KILL                        = -1552047,
+    SAY_DEATH                       = -1552046,
+    SAY_CHARGE_1                    = -1552044,
+    SAY_CHARGE_2                    = -1552045,
+
+    SPELL_IMMOLATION                = 36051,
+    SPELL_IMMOLATION_H              = 39007,
+    SPELL_KNOCK_AWAY                = 36512,
+    SPELL_FELFIRE_LINE_UP           = 35770,                // dummy spell - should summon a line of npcs - 20978 to the target
+    SPELL_CHARGE_TARGETING          = 36038,                // summons 21030 on target
+    SPELL_CHARGE                    = 35754,                // script target on 21030; also dummy effect area effect target on 20978 - makes the target cast 35769
+    SPELL_FELFIRE_SHOCK             = 35759,
+    SPELL_FELFIRE_SHOCK_H           = 39006,
+};
+
+static const DialogueEntry aIntroDialogue[] =
+{
+    {SAY_SOCCOTHRATES_INTRO_1,  NPC_SOCCOTHRATES,   3000},
+    {SAY_DALLIAH_INTRO_2,       NPC_DALLIAH,        2000},
+    {SAY_SOCCOTHRATES_INTRO_3,  NPC_SOCCOTHRATES,   4000},
+    {SAY_DALLIAH_INTRO_4,       NPC_DALLIAH,        5000},
+    {SAY_SOCCOTHRATES_INTRO_5,  NPC_SOCCOTHRATES,   3000},
+    {SAY_DALLIAH_INTRO_6,       NPC_DALLIAH,        3000},
+    {SAY_SOCCOTHRATES_INTRO_7,  NPC_SOCCOTHRATES,   0},
+    {0, 0, 0},
+};
+
+struct boss_soccothrates : public CreatureScript
+{
+    boss_soccothrates() : CreatureScript("boss_soccothrates") {}
+
+    struct boss_soccothratesAI : public ScriptedAI, private DialogueHelper
+    {
+        boss_soccothratesAI(Creature* pCreature) : ScriptedAI(pCreature),
+        DialogueHelper(aIntroDialogue)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+            InitializeDialogueHelper(m_pInstance);
+            m_bHasYelledIntro = false;
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiKnockAwayTimer;
+        uint32 m_uiFelfireShockTimer;
+        uint32 m_uiFelfireLineupTimer;
+        uint32 m_uiChargeTimer;
+
+        bool m_bHasYelledIntro;
+
+        void Reset() override
+        {
+            m_uiFelfireShockTimer = urand(10000, 13000);
+            m_uiKnockAwayTimer = urand(22000, 25000);
+            m_uiFelfireLineupTimer = 0;
+            m_uiChargeTimer = 0;
+
+            DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_IMMOLATION : SPELL_IMMOLATION_H);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SOCCOTHRATES, IN_PROGRESS);
+            }
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasYelledIntro && pWho->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(pWho, 75.0f) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                StartNextDialogueText(SAY_SOCCOTHRATES_INTRO_1);
+                m_bHasYelledIntro = true;
+            }
+
+            ScriptedAI::MoveInLineOfSight(pWho);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(SAY_KILL, m_creature);
+        }
+
+        void JustDied(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SOCCOTHRATES, DONE);
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            m_creature->RemoveAllAurasOnEvade();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_creature->LoadCreatureAddon(true);
+
+            // should evade to the attack position
+            if (m_creature->IsAlive())
+            {
+                m_creature->GetMotionMaster()->MovePoint(1, aSoccotharesStartPos[0], aSoccotharesStartPos[1], aSoccotharesStartPos[2]);
+            }
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SOCCOTHRATES, FAIL);
+            }
+
+            m_creature->SetLootRecipient(NULL);
+
+            Reset();
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            // Adjust orientation
+            if (uiPointId)
+            {
+                m_creature->SetFacingTo(aSoccotharesStartPos[3]);
+            }
+        }
+
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            // Move each of them to their places
+            if (iEntry == SAY_SOCCOTHRATES_INTRO_7)
+            {
+                m_creature->GetMotionMaster()->MovePoint(1, aSoccotharesStartPos[0], aSoccotharesStartPos[1], aSoccotharesStartPos[2]);
+
+                if (m_pInstance)
+                {
+                    if (Creature* pDalliah = m_pInstance->GetSingleCreatureFromStorage(NPC_DALLIAH))
+                    {
+                        pDalliah->GetMotionMaster()->MovePoint(1, aDalliahStartPos[0], aDalliahStartPos[1], aDalliahStartPos[2]);
+                    }
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiFelfireShockTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), m_bIsRegularMode ? SPELL_FELFIRE_SHOCK : SPELL_FELFIRE_SHOCK_H) == CAST_OK)
+                {
+                    m_uiFelfireShockTimer = urand(35000, 45000);
+                }
+            }
+            else
+            {
+                m_uiFelfireShockTimer -= uiDiff;
+            }
+
+            if (m_uiKnockAwayTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_KNOCK_AWAY) == CAST_OK)
+                {
+                    m_uiKnockAwayTimer = urand(30000, 35000);
+                    m_uiFelfireLineupTimer = 3000;
+                }
+            }
+            else
+            {
+                m_uiKnockAwayTimer -= uiDiff;
+            }
+
+            // Prepare the boss for charging
+            if (m_uiFelfireLineupTimer)
+            {
+                if (m_uiFelfireLineupTimer <= uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_CHARGE_TARGETING) == CAST_OK)
+                        {
+                            // ToDo: the Wrath-Scryer's Felfire npcs should be summoned at this point and aligned to the chosen target!
+                            DoCastSpellIfCan(m_creature, SPELL_FELFIRE_LINE_UP, CAST_TRIGGERED);
+                            DoScriptText(urand(0, 1) ? SAY_CHARGE_1 : SAY_CHARGE_2, m_creature);
+
+                            m_uiChargeTimer = 1500;
+                            m_uiFelfireLineupTimer = 0;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiFelfireLineupTimer -= uiDiff;
+                }
+            }
+
+            // Charge the target
+            if (m_uiChargeTimer)
+            {
+                if (m_uiChargeTimer <= uiDiff)
+                {
+                    // Note: this spell will also light up the Wrath-Scryer's Felfire npcs
+                    if (DoCastSpellIfCan(m_creature, SPELL_CHARGE) == CAST_OK)
+                    {
+                        m_uiChargeTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiChargeTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_soccothratesAI(pCreature);
+    }
+};
+
+void AddSC_boss_soccothrates()
+{
+    Script* s;
+
+    s = new boss_soccothrates();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_soccothrates";
+    //pNewScript->GetAI = &GetAI_boss_soccothrates;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp b/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
new file mode 100644
index 000000000..ee0a1e3e3
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
@@ -0,0 +1,606 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Arcatraz
+SD%Complete: 80
+SDComment: Mainly Harbringer Skyriss event
+SDCategory: Tempest Keep, The Arcatraz
+EndScriptData */
+
+#include "precompiled.h"
+#include "arcatraz.h"
+
+/* Arcatraz encounters:
+1 - Zereketh the Unbound event
+2 - Dalliah the Doomsayer event
+3 - Wrath-Scryer Soccothrates event
+4 - Harbinger Skyriss event, 5 sub-events
+*/
+
+enum
+{
+    SAY_SOCCOTHRATES_AGGRO          = -1552039,
+    SAY_SOCCOTHRATES_DEATH          = -1552043,
+
+    YELL_MELLICHAR_INTRO1           = -1552023,
+    YELL_MELLICHAR_INTRO2           = -1552024,
+    YELL_MELLICHAR_RELEASE1         = -1552025,
+    YELL_MELLICHAR_RELEASE2         = -1552026,
+    YELL_MELLICHAR_RELEASE3         = -1552027,
+    YELL_MELLICHAR_RELEASE4         = -1552028,
+    YELL_MELLICHAR_RELEASE5         = -1552029,
+    YELL_MELLICAR_WELCOME           = -1552030,
+    SAY_SKYRISS_INTRO               = -1552000,
+    SAY_SKYRISS_AGGRO               = -1552001,
+    SAY_MILLHOUSE_COMPLETE          = -1552022,
+
+    // Spells used by Mellichar during the dialogue
+    SPELL_TARGET_BETA               = 36854,
+    SPELL_TARGET_ALPHA              = 36856,
+    SPELL_TARGET_DELTA              = 36857,
+    SPELL_TARGET_GAMMA              = 36858,
+    SPELL_SIMPLE_TELEPORT           = 12980,
+    SPELL_MIND_REND                 = 36859,
+};
+
+static const DialogueEntry aArcatrazDialogue[] =
+{
+    // Soccothares taunts
+    {TYPE_DALLIAH,            0,             5000},
+    {SAY_SOCCOTHRATES_AGGRO,  NPC_SOCCOTHRATES, 0},
+    {TYPE_SOCCOTHRATES,       0,             5000},
+    {SAY_SOCCOTHRATES_DEATH,  NPC_SOCCOTHRATES, 0},
+    // Skyriss event
+    {YELL_MELLICHAR_INTRO1,   NPC_MELLICHAR, 22000},
+    {YELL_MELLICHAR_INTRO2,   NPC_MELLICHAR, 7000},
+    {SPELL_TARGET_ALPHA,      0,             7000},
+    {YELL_MELLICHAR_RELEASE1, NPC_MELLICHAR, 0},
+    {YELL_MELLICHAR_RELEASE2, NPC_MELLICHAR, 7000},
+    {SPELL_TARGET_BETA,       0,             7000},
+    {TYPE_WARDEN_2,           0,             0},
+    {YELL_MELLICHAR_RELEASE3, NPC_MELLICHAR, 7000},
+    {SPELL_TARGET_DELTA,      0,             7000},
+    {TYPE_WARDEN_3,           0,             0},
+    {YELL_MELLICHAR_RELEASE4, NPC_MELLICHAR, 7000},
+    {SPELL_TARGET_GAMMA,      0,             7000},
+    {TYPE_WARDEN_4,           0,             0},
+    {YELL_MELLICHAR_RELEASE5, NPC_MELLICHAR, 8000},
+    {TYPE_WARDEN_5,           0,             5000},
+    {SAY_SKYRISS_INTRO,       NPC_SKYRISS,   25000},
+    {YELL_MELLICAR_WELCOME,   NPC_MELLICHAR, 3000},
+    {SAY_SKYRISS_AGGRO,       NPC_SKYRISS,   0},
+    {0, 0, 0},
+};
+
+struct SpawnLocation
+{
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+static const SpawnLocation aSummonPosition[5] =
+{
+    { 478.326f, -148.505f, 42.56f, 3.19f },                   // Trickster or Phase Hunter
+    { 413.292f, -148.378f, 42.56f, 6.27f },                   // Millhouse
+    { 420.179f, -174.396f, 42.58f, 0.02f },                   // Akkiris or Sulfuron
+    { 471.795f, -174.58f, 42.58f, 3.06f },                   // Twilight or Blackwing Drakonaar
+    { 445.763f, -191.639f, 44.64f, 1.60f }                    // Skyriss
+};
+
+static const float aEntranceMoveLoc[3] = { 82.020f, 0.306f, -11.026f };
+static const float aEntranceSpawnLoc[4] = { 173.471f, -0.138f, -10.101f, 3.123f };
+
+struct is_arcatraz : public InstanceScript
+{
+    is_arcatraz() : InstanceScript("instance_arcatraz") {}
+
+    class instance_arcatraz : public ScriptedInstance, private DialogueHelper
+    {
+    public:
+        instance_arcatraz(Map* pMap) : ScriptedInstance(pMap), DialogueHelper(aArcatrazDialogue),
+            m_uiResetDelayTimer(0),
+            m_uiEntranceEventTimer(0),
+            m_uiKilledWardens(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+            InitializeDialogueHelper(this);
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            // Check encounter states
+            if (GetData(TYPE_ENTRANCE) == DONE || GetData(TYPE_ENTRANCE) == IN_PROGRESS)
+            {
+                return;
+            }
+
+            SetData(TYPE_ENTRANCE, IN_PROGRESS);
+            m_uiEntranceEventTimer = 1000;
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_CORE_SECURITY_FIELD_ALPHA:
+                if (m_auiEncounter[2] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_CORE_SECURITY_FIELD_BETA:
+                if (m_auiEncounter[1] == DONE)
+                {
+                    pGo->SetGoState(GO_STATE_ACTIVE);
+                }
+                break;
+            case GO_SEAL_SPHERE:
+            case GO_POD_ALPHA:
+            case GO_POD_BETA:
+            case GO_POD_DELTA:
+            case GO_POD_GAMMA:
+            case GO_POD_OMEGA:
+                break;
+            default:
+                return;
+            }
+            m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_SKYRISS:
+            case NPC_MILLHOUSE:
+                m_lSkyrissEventMobsGuidList.push_back(pCreature->GetObjectGuid());
+                // no break here because we want them in both lists
+            case NPC_PRISON_APHPA_POD:
+            case NPC_PRISON_BETA_POD:
+            case NPC_PRISON_DELTA_POD:
+            case NPC_PRISON_GAMMA_POD:
+            case NPC_PRISON_BOSS_POD:
+            case NPC_MELLICHAR:
+            case NPC_DALLIAH:
+            case NPC_SOCCOTHRATES:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_BLAZING_TRICKSTER:
+            case NPC_PHASE_HUNTER:
+            case NPC_AKKIRIS:
+            case NPC_SULFURON:
+            case NPC_TW_DRAKONAAR:
+            case NPC_BL_DRAKONAAR:
+                m_lSkyrissEventMobsGuidList.push_back(pCreature->GetObjectGuid());
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            if (pCreature->GetEntry() == NPC_ARCATRAZ_WARDEN || pCreature->GetEntry() == NPC_ARCATRAZ_DEFENDER)
+            {
+                ++m_uiKilledWardens;
+
+                // Stop the intro spawns when the wardens are killed
+                if (m_uiKilledWardens == MAX_WARDENS)
+                {
+                    SetData(TYPE_ENTRANCE, DONE);
+                    m_uiEntranceEventTimer = 0;
+                }
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_ENTRANCE:
+            case TYPE_ZEREKETH:
+                m_auiEncounter[uiType] = uiData;
+                break;
+
+            case TYPE_DALLIAH:
+                if (uiData == IN_PROGRESS)
+                {
+                    // Soccothares taunts after Dalliah gets aggro
+                    if (GetData(TYPE_SOCCOTHRATES) != DONE)
+                    {
+                        StartNextDialogueText(TYPE_DALLIAH);
+                    }
+                }
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_CORE_SECURITY_FIELD_BETA);
+
+                    // Soccothares taunts after Dalliah dies
+                    if (GetData(TYPE_SOCCOTHRATES) != DONE)
+                    {
+                        StartNextDialogueText(TYPE_SOCCOTHRATES);
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+
+            case TYPE_SOCCOTHRATES:
+                if (uiData == DONE)
+                {
+                    DoUseDoorOrButton(GO_CORE_SECURITY_FIELD_ALPHA);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+
+            case TYPE_HARBINGERSKYRISS:
+                if (uiData == FAIL)
+                {
+                    SetData(TYPE_WARDEN_1, NOT_STARTED);
+                    SetData(TYPE_WARDEN_2, NOT_STARTED);
+                    SetData(TYPE_WARDEN_3, NOT_STARTED);
+                    SetData(TYPE_WARDEN_4, NOT_STARTED);
+                    SetData(TYPE_WARDEN_5, NOT_STARTED);
+
+                    // Reset event in 1 min
+                    if (Creature* pMellichar = GetSingleCreatureFromStorage(NPC_MELLICHAR))
+                    {
+                        pMellichar->ForcedDespawn();
+                    }
+                    m_uiResetDelayTimer = 60000;
+
+                    // Despawn all the summons manually
+                    for (GuidList::const_iterator itr = m_lSkyrissEventMobsGuidList.begin(); itr != m_lSkyrissEventMobsGuidList.end(); ++itr)
+                    {
+                        if (Creature* pTemp = instance->GetCreature(*itr))
+                        {
+                            pTemp->ForcedDespawn();
+                        }
+                    }
+
+                    // Reset these objects, because they doesn't reset automatically
+                    if (GameObject* pGo = GetSingleGameObjectFromStorage(GO_POD_BETA))
+                    {
+                        pGo->ResetDoorOrButton();
+                    }
+                    if (GameObject* pGo = GetSingleGameObjectFromStorage(GO_POD_OMEGA))
+                    {
+                        pGo->ResetDoorOrButton();
+                    }
+                    if (GameObject* pGo = GetSingleGameObjectFromStorage(GO_SEAL_SPHERE))
+                    {
+                        pGo->ResetDoorOrButton();
+                    }
+                }
+                if (uiData == IN_PROGRESS)
+                {
+                    StartNextDialogueText(YELL_MELLICHAR_INTRO1);
+                    DoUseDoorOrButton(GO_SEAL_SPHERE);
+                }
+                if (uiData == DONE)
+                {
+                    if (Creature* pMillhouse = GetSingleCreatureFromStorage(NPC_MILLHOUSE))
+                    {
+                        DoScriptText(SAY_MILLHOUSE_COMPLETE, pMillhouse);
+                    }
+                }
+                m_auiEncounter[3] = uiData;
+                break;
+
+            case TYPE_WARDEN_1:
+                if (uiData == IN_PROGRESS)
+                {
+                    DoUseDoorOrButton(GO_POD_ALPHA);
+                }
+                if (uiData == DONE)
+                {
+                    StartNextDialogueText(YELL_MELLICHAR_RELEASE2);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+
+            case TYPE_WARDEN_2:
+                if (uiData == IN_PROGRESS)
+                {
+                    DoUseDoorOrButton(GO_POD_BETA);
+                }
+                if (uiData == DONE)
+                {
+                    StartNextDialogueText(YELL_MELLICHAR_RELEASE3);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+
+            case TYPE_WARDEN_3:
+                if (uiData == IN_PROGRESS)
+                {
+                    DoUseDoorOrButton(GO_POD_DELTA);
+                }
+                if (uiData == DONE)
+                {
+                    StartNextDialogueText(YELL_MELLICHAR_RELEASE4);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+
+            case TYPE_WARDEN_4:
+                if (uiData == IN_PROGRESS)
+                {
+                    DoUseDoorOrButton(GO_POD_GAMMA);
+                }
+                if (uiData == DONE)
+                {
+                    StartNextDialogueText(YELL_MELLICHAR_RELEASE5);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+
+            case TYPE_WARDEN_5:
+                if (uiData == IN_PROGRESS)
+                {
+                    DoUseDoorOrButton(GO_POD_OMEGA);
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            DialogueUpdate(uiDiff);
+
+            if (m_uiResetDelayTimer)
+            {
+                if (m_uiResetDelayTimer <= uiDiff)
+                {
+                    if (Creature* pMellichar = GetSingleCreatureFromStorage(NPC_MELLICHAR))
+                    {
+                        pMellichar->Respawn();
+                    }
+                    m_uiResetDelayTimer = 0;
+                }
+                else
+                {
+                    m_uiResetDelayTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiEntranceEventTimer)
+            {
+                if (m_uiEntranceEventTimer <= uiDiff)
+                {
+                    Player* pPlayer = GetPlayerInMap();
+                    if (!pPlayer)
+                    {
+                        return;
+                    }
+
+                    uint32 uiEntry = urand(0, 10) ? NPC_PROTEAN_HORROR : NPC_PROTEAN_NIGHTMARE;
+
+                    // Summon and move the intro creatures into combat positions
+                    if (Creature* pTemp = pPlayer->SummonCreature(uiEntry, aEntranceSpawnLoc[0], aEntranceSpawnLoc[1], aEntranceSpawnLoc[2], aEntranceSpawnLoc[3], TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 30000))
+                    {
+                        pTemp->SetWalk(false);
+                        pTemp->GetMotionMaster()->MovePoint(0, aEntranceMoveLoc[0], aEntranceMoveLoc[1], aEntranceMoveLoc[2]);
+                    }
+#if defined (CLASSIC) || defined (TBC) || defined (WOTLK) || defined (CATA)
+                    m_uiEntranceEventTimer = urand(0, 10) ? urand(1000, 2000) : urand(5000, 7000);
+#endif
+#if defined (WOTLK) || defined (CATA)
+                    m_uiEntranceEventTimer = urand(0, 10) ? urand(2000, 3500) : urand(5000, 7000);
+#endif
+
+                }
+                else
+                {
+                    m_uiEntranceEventTimer -= uiDiff;
+                }
+            }
+        }
+
+    private:
+        void JustDidDialogueStep(int32 iEntry) override
+        {
+            Creature* pMellichar = GetSingleCreatureFromStorage(NPC_MELLICHAR);
+            if (!pMellichar)
+            {
+                return;
+            }
+
+            switch (iEntry)
+            {
+            case SPELL_TARGET_ALPHA:
+                pMellichar->CastSpell(pMellichar, SPELL_TARGET_ALPHA, false);
+                if (Creature* pTarget = GetSingleCreatureFromStorage(NPC_PRISON_APHPA_POD))
+                {
+                    pMellichar->SetFacingToObject(pTarget);
+                }
+                SetData(TYPE_WARDEN_1, IN_PROGRESS);
+                break;
+            case YELL_MELLICHAR_RELEASE1:
+                pMellichar->SummonCreature(urand(0, 1) ? NPC_BLAZING_TRICKSTER : NPC_PHASE_HUNTER, aSummonPosition[0].m_fX, aSummonPosition[0].m_fY, aSummonPosition[0].m_fZ, aSummonPosition[0].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+                break;
+            case YELL_MELLICHAR_RELEASE2:
+                if (Creature* pTarget = GetSingleCreatureFromStorage(NPC_PRISON_BETA_POD))
+                {
+                    pMellichar->SetFacingToObject(pTarget);
+                }
+                break;
+            case SPELL_TARGET_BETA:
+                pMellichar->CastSpell(pMellichar, SPELL_TARGET_BETA, false);
+                SetData(TYPE_WARDEN_2, IN_PROGRESS);
+                break;
+            case TYPE_WARDEN_2:
+                pMellichar->SummonCreature(NPC_MILLHOUSE, aSummonPosition[1].m_fX, aSummonPosition[1].m_fY, aSummonPosition[1].m_fZ, aSummonPosition[1].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+                break;
+            case SPELL_TARGET_DELTA:
+                pMellichar->CastSpell(pMellichar, SPELL_TARGET_DELTA, false);
+                if (Creature* pTarget = GetSingleCreatureFromStorage(NPC_PRISON_DELTA_POD))
+                {
+                    pMellichar->SetFacingToObject(pTarget);
+                }
+                SetData(TYPE_WARDEN_3, IN_PROGRESS);
+                break;
+            case TYPE_WARDEN_3:
+                pMellichar->SummonCreature(urand(0, 1) ? NPC_AKKIRIS : NPC_SULFURON, aSummonPosition[2].m_fX, aSummonPosition[2].m_fY, aSummonPosition[2].m_fZ, aSummonPosition[2].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+                pMellichar->CastSpell(pMellichar, SPELL_TARGET_OMEGA, false);
+                if (Creature* pTarget = GetSingleCreatureFromStorage(NPC_PRISON_BOSS_POD))
+                {
+                    pMellichar->SetFacingToObject(pTarget);
+                }
+                break;
+            case YELL_MELLICHAR_RELEASE4:
+                pMellichar->InterruptNonMeleeSpells(false);
+                if (Creature* pTarget = GetSingleCreatureFromStorage(NPC_PRISON_GAMMA_POD))
+                {
+                    pMellichar->SetFacingToObject(pTarget);
+                }
+                break;
+            case SPELL_TARGET_GAMMA:
+                pMellichar->CastSpell(pMellichar, SPELL_TARGET_GAMMA, false);
+                if (Creature* pTarget = GetSingleCreatureFromStorage(NPC_PRISON_GAMMA_POD))
+                {
+                    pMellichar->SetFacingToObject(pTarget);
+                }
+                SetData(TYPE_WARDEN_4, IN_PROGRESS);
+                break;
+            case TYPE_WARDEN_4:
+                pMellichar->SummonCreature(urand(0, 1) ? NPC_TW_DRAKONAAR : NPC_BL_DRAKONAAR, aSummonPosition[3].m_fX, aSummonPosition[3].m_fY, aSummonPosition[3].m_fZ, aSummonPosition[3].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+                pMellichar->CastSpell(pMellichar, SPELL_TARGET_OMEGA, false);
+                if (Creature* pTarget = GetSingleCreatureFromStorage(NPC_PRISON_BOSS_POD))
+                {
+                    pMellichar->SetFacingToObject(pTarget);
+                }
+                break;
+            case YELL_MELLICHAR_RELEASE5:
+                pMellichar->InterruptNonMeleeSpells(false);
+                SetData(TYPE_WARDEN_5, IN_PROGRESS);
+                break;
+            case TYPE_WARDEN_5:
+                if (Creature* pSkyriss = pMellichar->SummonCreature(NPC_SKYRISS, aSummonPosition[4].m_fX, aSummonPosition[4].m_fY, aSummonPosition[4].m_fZ, aSummonPosition[4].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0))
+                {
+                    pSkyriss->CastSpell(pSkyriss, SPELL_SIMPLE_TELEPORT, false);
+                }
+                break;
+            case YELL_MELLICAR_WELCOME:
+                if (Creature* pSkyriss = GetSingleCreatureFromStorage(NPC_SKYRISS))
+                {
+                    pSkyriss->CastSpell(pSkyriss, SPELL_MIND_REND, false);
+                }
+                break;
+            case SAY_SKYRISS_AGGRO:
+                // Kill Mellichar and start combat
+                if (Creature* pSkyriss = GetSingleCreatureFromStorage(NPC_SKYRISS))
+                {
+                    pSkyriss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+                    pMellichar->DealDamage(pMellichar, pMellichar->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                }
+                DoUseDoorOrButton(GO_SEAL_SPHERE);
+                break;
+            }
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiResetDelayTimer;
+        uint32 m_uiEntranceEventTimer;
+        uint8 m_uiKilledWardens;
+
+        GuidList m_lSkyrissEventMobsGuidList;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_arcatraz(pMap);
+    }
+};
+
+void AddSC_instance_arcatraz()
+{
+    Script* s;
+
+    s = new is_arcatraz();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_arcatraz";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_arcatraz;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp b/src/modules/SD3/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
new file mode 100644
index 000000000..4f4d066b6
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
@@ -0,0 +1,247 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_High_Botanist_Freywinn
+SD%Complete: 90
+SDComment: Timers may need some fine adjustments
+SDCategory: Tempest Keep, The Botanica
+EndScriptData */
+
+#include "precompiled.h"
+
+enum
+{
+    SAY_AGGRO                   = -1553000,
+    SAY_KILL_1                  = -1553001,
+    SAY_KILL_2                  = -1553002,
+    SAY_TREE_1                  = -1553003,
+    SAY_TREE_2                  = -1553004,
+    SAY_DEATH                   = -1553005,
+
+    SPELL_TRANQUILITY           = 34550,
+    SPELL_TREE_FORM             = 34551,
+    SPELL_SUMMON_FRAYER         = 34557,
+    SPELL_PLANT_WHITE           = 34759,
+    SPELL_PLANT_GREEN           = 34761,
+    SPELL_PLANT_BLUE            = 34762,
+    SPELL_PLANT_RED             = 34763,
+
+    NPC_FRAYER_PROTECTOR        = 19953,
+};
+
+struct boss_high_botanist_freywinn : public CreatureScript
+{
+    boss_high_botanist_freywinn() : CreatureScript("boss_high_botanist_freywinn") {}
+
+    struct boss_high_botanist_freywinnAI : public ScriptedAI
+    {
+        boss_high_botanist_freywinnAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiSummonSeedlingTimer;
+        uint32 m_uiTreeFormTimer;
+        uint32 m_uiFrayerTimer;
+        uint32 m_uiTreeFormEndTimer;
+        uint8 m_uiFrayerAddsCount;
+        bool m_bCanMoveFree;
+
+        void Reset() override
+        {
+            m_uiSummonSeedlingTimer = 6000;
+            m_uiTreeFormTimer = 30000;
+            m_uiTreeFormEndTimer = 0;
+            m_uiFrayerAddsCount = 0;
+            m_uiFrayerTimer = 0;
+            m_bCanMoveFree = true;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_FRAYER_PROTECTOR)
+            {
+                ++m_uiFrayerAddsCount;
+            }
+
+            // Attack players
+            if (m_creature->getVictim())
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_FRAYER_PROTECTOR)
+            {
+                --m_uiFrayerAddsCount;
+
+                // When all 3 Frayers are killed stop the tree form action (if not done this already)
+                if (!m_uiFrayerAddsCount && !m_bCanMoveFree)
+                {
+                    m_uiTreeFormEndTimer = 0;
+
+                    if (m_creature->getVictim())
+                    {
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    }
+
+                    // Interrupt all spells and remove auras
+                    m_creature->InterruptNonMeleeSpells(true);
+                    m_creature->RemoveAllAuras();
+                    m_bCanMoveFree = true;
+                }
+            }
+        }
+
+        // Wrapper to summon one seedling
+        void DoSummonSeedling()
+        {
+            switch (urand(0, 3))
+            {
+            case 0: DoCastSpellIfCan(m_creature, SPELL_PLANT_WHITE); break;
+            case 1: DoCastSpellIfCan(m_creature, SPELL_PLANT_GREEN); break;
+            case 2: DoCastSpellIfCan(m_creature, SPELL_PLANT_BLUE);  break;
+            case 3: DoCastSpellIfCan(m_creature, SPELL_PLANT_RED);   break;
+            }
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_KILL_1 : SAY_KILL_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiTreeFormTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TRANQUILITY) == CAST_OK)
+                {
+                    // Note: This should remove only negative auras
+                    m_creature->RemoveAllAuras();
+
+                    DoCastSpellIfCan(m_creature, SPELL_TREE_FORM, CAST_TRIGGERED);
+                    DoScriptText(urand(0, 1) ? SAY_TREE_1 : SAY_TREE_2, m_creature);
+
+                    m_creature->GetMotionMaster()->MoveIdle();
+                    m_bCanMoveFree = false;
+                    m_uiFrayerTimer = 1000;
+                    m_uiTreeFormEndTimer = 45000;
+                    m_uiTreeFormTimer = 75000;
+                }
+            }
+            else
+            {
+                m_uiTreeFormTimer -= uiDiff;
+            }
+
+            // The Frayer is summoned after one second in the tree phase
+            if (m_uiFrayerTimer)
+            {
+                if (m_uiFrayerTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_FRAYER, CAST_TRIGGERED) == CAST_OK)
+                    {
+                        m_uiFrayerTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiFrayerTimer -= uiDiff;
+                }
+            }
+
+            // Tree phase will be removed when the timer expires;
+            if (m_uiTreeFormEndTimer)
+            {
+                if (m_uiTreeFormEndTimer <= uiDiff)
+                {
+                    if (m_creature->getVictim())
+                    {
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    }
+                    m_bCanMoveFree = true;
+                    m_uiTreeFormEndTimer = 0;
+                }
+                else
+                {
+                    m_uiTreeFormEndTimer -= uiDiff;
+                }
+            }
+
+            // Don't do any other actions during tree form
+            if (!m_bCanMoveFree)
+            {
+                return;
+            }
+
+            // one random seedling every 5 secs, but not in tree form
+            if (m_uiSummonSeedlingTimer < uiDiff)
+            {
+                DoSummonSeedling();
+                m_uiSummonSeedlingTimer = 6000;
+            }
+            else
+            {
+                m_uiSummonSeedlingTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_high_botanist_freywinnAI(pCreature);
+    }
+};
+
+void AddSC_boss_high_botanist_freywinn()
+{
+    Script* s;
+
+    s = new boss_high_botanist_freywinn();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_high_botanist_freywinn";
+    //pNewScript->GetAI = &GetAI_boss_high_botanist_freywinn;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/botanica/boss_laj.cpp b/src/modules/SD3/scripts/outland/tempest_keep/botanica/boss_laj.cpp
new file mode 100644
index 000000000..56235361b
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/botanica/boss_laj.cpp
@@ -0,0 +1,265 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Laj
+SD%Complete: 90
+SDComment: Immunities are wrong, must be adjusted to use resistance from creature_templates. Most spells require database support.
+SDCategory: Tempest Keep, The Botanica
+EndScriptData */
+
+#include "precompiled.h"
+
+enum
+{
+    EMOTE_SUMMON                = -1553006,
+
+    SPELL_ALLERGIC_REACTION     = 34697,
+    SPELL_TELEPORT_SELF         = 34673,
+    SPELL_TRASH                 = 3391,
+
+    SPELL_SUMMON_LASHER_1       = 34681,
+    SPELL_SUMMON_FLAYER_1       = 34682,
+    SPELL_SUMMON_LASHER_2       = 34684,
+    SPELL_SUMMON_FLAYER_2       = 34685,
+    SPELL_SUMMON_LASHER_3       = 34686,
+    SPELL_SUMMON_FLAYER_4       = 34687,
+    SPELL_SUMMON_LASHER_4       = 34688,
+    SPELL_SUMMON_FLAYER_3       = 34690,
+
+    MODEL_ID_DEFAULT            = 13109,
+    MODEL_ID_ARCANE             = 14213,
+    MODEL_ID_FIRE               = 13110,
+    MODEL_ID_FROST              = 14112,
+    MODEL_ID_NATURE             = 14214,
+};
+
+struct boss_laj : public CreatureScript
+{
+    boss_laj() : CreatureScript("boss_laj") {}
+
+    struct boss_lajAI : public ScriptedAI
+    {
+        boss_lajAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiTeleportTimer;
+        uint32 m_uiSummonTimer;
+        uint32 m_uiTransformTimer;
+        uint32 m_uiAllergicTimer;
+        uint32 m_uiTrashTimer;
+
+        void Reset() override
+        {
+            m_creature->SetDisplayId(MODEL_ID_DEFAULT);
+            m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, true);
+            m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, false);
+            m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, false);
+            m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, false);
+            m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, false);
+
+            m_uiTeleportTimer = urand(17000, 26000);
+            m_uiSummonTimer = 0;
+            m_uiTransformTimer = 30000;
+            m_uiAllergicTimer = urand(8500, 30000);
+            m_uiTrashTimer = urand(3600, 5000);
+        }
+
+        void DoTransform()
+        {
+            // Random transform into a different form
+            switch (urand(0, 4))
+            {
+            case 0:
+                m_creature->SetDisplayId(MODEL_ID_DEFAULT);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, true);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, false);
+                break;
+            case 1:
+                m_creature->SetDisplayId(MODEL_ID_ARCANE);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, true);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, false);
+                break;
+            case 2:
+                m_creature->SetDisplayId(MODEL_ID_FIRE);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, false);
+                break;
+            case 3:
+                m_creature->SetDisplayId(MODEL_ID_FROST);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, false);
+                break;
+            case 4:
+                m_creature->SetDisplayId(MODEL_ID_NATURE);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, false);
+                m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);
+                break;
+            }
+        }
+
+        void DoSummons()
+        {
+            switch (urand(0, 3))
+            {
+            case 0:
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_LASHER_1, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_FLAYER_1, CAST_TRIGGERED);
+                break;
+            case 1:
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_LASHER_2, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_FLAYER_2, CAST_TRIGGERED);
+                break;
+            case 2:
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_LASHER_3, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_FLAYER_3, CAST_TRIGGERED);
+                break;
+            case 3:
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_LASHER_4, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_FLAYER_4, CAST_TRIGGERED);
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+            {
+                pSummoned->AI()->AttackStart(pTarget);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiSummonTimer)
+            {
+                if (m_uiSummonTimer <= uiDiff)
+                {
+                    // Summon adds and restart chasing the victim
+                    DoSummons();
+                    DoScriptText(EMOTE_SUMMON, m_creature);
+
+                    if (m_creature->getVictim())
+                    {
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    }
+                    m_uiSummonTimer = 0;
+                }
+                else
+                {
+                    m_uiSummonTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiAllergicTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ALLERGIC_REACTION) == CAST_OK)
+                {
+                    m_uiAllergicTimer = urand(21000, 32000);
+                }
+            }
+            else
+            {
+                m_uiAllergicTimer -= uiDiff;
+            }
+
+            if (m_uiTeleportTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_TELEPORT_SELF) == CAST_OK)
+                {
+                    m_creature->GetMotionMaster()->MoveIdle();
+                    m_uiTeleportTimer = urand(25000, 33000);
+                    m_uiSummonTimer = 4000;
+                }
+            }
+            else
+            {
+                m_uiTeleportTimer -= uiDiff;
+            }
+
+            if (m_uiTransformTimer < uiDiff)
+            {
+                DoTransform();
+                m_uiTransformTimer = urand(25000, 40000);
+            }
+            else
+            {
+                m_uiTransformTimer -= uiDiff;
+            }
+
+            if (m_uiTrashTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_TRASH) == CAST_OK)
+                {
+                    m_uiTrashTimer = urand(10000, 24000);
+                }
+            }
+            else
+            {
+                m_uiTrashTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_lajAI(pCreature);
+    }
+};
+
+void AddSC_boss_laj()
+{
+    Script* s;
+
+    s = new boss_laj();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_laj";
+    //pNewScript->GetAI = &GetAI_boss_laj;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp b/src/modules/SD3/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp
new file mode 100644
index 000000000..8dae65196
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp
@@ -0,0 +1,236 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Warp_Splinter
+SD%Complete: 90
+SDComment: Timers may need adjustments
+SDCategory: Tempest Keep, The Botanica
+EndScriptData */
+
+#include "precompiled.h"
+
+/*#####
+# boss_warp_splinter
+#####*/
+
+enum
+{
+    SAY_AGGRO                   = -1553007,
+    SAY_SLAY_1                  = -1553008,
+    SAY_SLAY_2                  = -1553009,
+    SAY_SUMMON_1                = -1553010,
+    SAY_SUMMON_2                = -1553011,
+    SAY_DEATH                   = -1553012,
+
+    SPELL_WAR_STOMP             = 34716,
+    SPELL_SUMMON_SAPLINGS       = 34741,            // this will leech the health from all saplings
+    SPELL_ARCANE_VOLLEY         = 36705,
+    SPELL_ARCANE_VOLLEY_H       = 39133,
+
+    NPC_SAPLING                 = 19949,
+};
+
+// Summon Saplings spells (too many to declare them above)
+static const uint32 aSaplingsSummonSpells[10] = {34727, 34730, 34731, 34732, 34733, 34734, 34735, 34736, 34737, 34739};
+
+struct boss_warp_splinter : public CreatureScript
+{
+    boss_warp_splinter() : CreatureScript("boss_warp_splinter") {}
+
+    struct boss_warp_splinterAI : public ScriptedAI
+    {
+        boss_warp_splinterAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            // Add the summon spells to a vector for better handling
+            for (uint8 i = 0; i < 10; ++i)
+            {
+                m_vSummonSpells.push_back(aSaplingsSummonSpells[i]);
+            }
+
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        bool m_bIsRegularMode;
+
+        uint32 m_uiWarStompTimer;
+        uint32 m_uiSummonTreantsTimer;
+        uint32 m_uiArcaneVolleyTimer;
+
+        std::vector<uint32> m_vSummonSpells;
+
+        void Reset() override
+        {
+            m_uiWarStompTimer = urand(6000, 7000);
+            m_uiSummonTreantsTimer = urand(25000, 35000);
+            m_uiArcaneVolleyTimer = urand(12000, 14500);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SAPLING)
+            {
+                pSummoned->GetMotionMaster()->MoveFollow(m_creature, 0, 0);
+            }
+        }
+
+        // Wrapper to summon all Saplings
+        void SummonTreants()
+        {
+            // Choose 6 random spells out of 10
+            std::random_shuffle(m_vSummonSpells.begin(), m_vSummonSpells.end());
+            for (uint8 i = 0; i < 6; ++i)
+            {
+                DoCastSpellIfCan(m_creature, m_vSummonSpells[i], CAST_TRIGGERED);
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_SUMMON_SAPLINGS, CAST_TRIGGERED);
+            DoScriptText(urand(0, 1) ? SAY_SUMMON_1 : SAY_SUMMON_2, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // War Stomp
+            if (m_uiWarStompTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_WAR_STOMP) == CAST_OK)
+                {
+                    m_uiWarStompTimer = urand(17000, 38000);
+                }
+            }
+            else
+            {
+                m_uiWarStompTimer -= uiDiff;
+            }
+
+            // Arcane Volley
+            if (m_uiArcaneVolleyTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_ARCANE_VOLLEY : SPELL_ARCANE_VOLLEY_H) == CAST_OK)
+                {
+                    m_uiArcaneVolleyTimer = urand(16000, 38000);
+                }
+            }
+            else
+            {
+                m_uiArcaneVolleyTimer -= uiDiff;
+            }
+
+            // Summon Treants
+            if (m_uiSummonTreantsTimer < uiDiff)
+            {
+                SummonTreants();
+                m_uiSummonTreantsTimer = urand(37000, 55000);
+            }
+            else
+            {
+                m_uiSummonTreantsTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_warp_splinterAI(pCreature);
+    }
+};
+
+/*#####
+# mob_treant (Sapling)
+#####*/
+struct npc_sapling : public CreatureScript
+{
+    npc_sapling() : CreatureScript("mob_warp_splinter_treant") {}
+
+    struct npc_saplingAI : public ScriptedAI
+    {
+        npc_saplingAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void Reset() override
+        {
+            // ToDo: This one may need further reserch
+            // m_creature->SetSpeedRate(MOVE_RUN, 0.5f);
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_saplingAI(pCreature);
+    }
+};
+
+void AddSC_boss_warp_splinter()
+{
+    Script* s;
+
+    s = new boss_warp_splinter();
+    s->RegisterSelf();
+    s = new npc_sapling();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_warp_splinter";
+    //pNewScript->GetAI = &GetAI_boss_warp_splinter;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_warp_splinter_treant";
+    //pNewScript->GetAI = &GetAI_npc_sapling;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/the_eye/boss_alar.cpp b/src/modules/SD3/scripts/outland/tempest_keep/the_eye/boss_alar.cpp
new file mode 100644
index 000000000..b4965acc9
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/the_eye/boss_alar.cpp
@@ -0,0 +1,521 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: boss_alar
+SD%Complete: 90
+SDComment: Boss movement should be improved.
+SDCategory: Tempest Keep, The Eye
+EndScriptData */
+
+#include "precompiled.h"
+#include "the_eye.h"
+
+enum
+{
+    // spells
+    // phase 1
+    SPELL_FLAME_BUFFET      = 34121,        // if nobody is in range
+    SPELL_FLAME_QUILLS      = 34229,
+    SPELL_EMBER_BLAST       = 34341,        // usee when the boss dies first time
+    SPELL_REBIRTH           = 34342,
+
+    // phase 2
+    SPELL_MELT_ARMOR        = 35410,
+    SPELL_DIVE_BOMB_VISUAL  = 35367,        // visual transform to fire ball
+    SPELL_DIVE_BOMB         = 35181,        // dive bomb damage spell
+    SPELL_BOMB_REBIRTH      = 35369,        // used after the dive bomb - to transform back to phoenis
+    SPELL_CHARGE            = 35412,        // charge a random target
+    // SPELL_SUMMON_ADDS    = 18814,        // summons 3*19551 - Not sure if the spell is the right id
+    SPELL_BERSERK           = 27680,        // this spell is used only during phase II
+
+    NPC_EMBER_OF_ALAR       = 19551,        // scripted in Acid
+    NPC_FLAME_PATCH         = 20602,
+    SPELL_FLAME_PATCH       = 35380,
+
+    MAX_PLATFORMS           = 4,
+
+    POINT_ID_RESSURRECT     = 0,            // center of the hall
+    POINT_ID_PLATFORM       = 1,            // platform points
+    POINT_ID_QUILLS         = 2,            // center of the hall - in air
+
+    PHASE_ONE               = 1,
+    PHASE_REBIRTH           = 2,
+    PHASE_TWO               = 3,
+    PHASE_DIVE_BOMB         = 4,
+};
+
+struct EventLocation
+{
+    float m_fX, m_fY, m_fZ;
+};
+
+// Platform locations from left to right (as standing at the entrance)
+static const EventLocation aPlatformLocation[MAX_PLATFORMS] =
+{
+    {340.15f, 58.65f,  17.71f},
+    {388.09f, 31.54f,  20.18f},
+    {388.18f, -32.85f, 20.18f},
+    {340.29f, -60.19f, 17.72f}
+};
+
+static const EventLocation aCenterLocation[] =
+{
+    {331.0f, 0.01f, 39.0f},
+    {331.0, 0.01f, -2.39f},
+};
+
+struct boss_alar : public CreatureScript
+{
+    boss_alar() : CreatureScript("boss_alar") {}
+
+    struct boss_alarAI : public ScriptedAI
+    {
+        boss_alarAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = ((ScriptedInstance*)pCreature->GetInstanceData());
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint8 m_uiPhase;
+        uint8 m_uiCurrentPlatformId;
+        uint32 m_uiRangeCheckTimer;
+        uint32 m_uiBerserkTimer;
+
+        uint32 m_uiPlatformMoveTimer;
+        uint32 m_uiFlameQuillsTimer;
+        uint32 m_uiFlamePatchTimer;
+        uint32 m_uiDiveBombTimer;
+        uint32 m_uiChargeTimer;
+        uint32 m_uiRebirthTimer;
+        uint32 m_uiMeltArmorTimer;
+
+        bool m_bCanSummonEmber;
+
+        void Reset() override
+        {
+            // Start phase one and move to the closest platform
+            m_uiPhase = PHASE_ONE;
+            SetCombatMovement(false);
+
+            m_uiRangeCheckTimer = 0;
+            m_uiCurrentPlatformId = 0;
+            m_uiPlatformMoveTimer = 35000;
+            m_uiFlameQuillsTimer = 170000;                   // at the 5th platform
+
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS; // only after phase 2 starts
+            m_uiFlamePatchTimer = 20000;
+            m_uiDiveBombTimer = 30000;
+            m_uiMeltArmorTimer = 10000;
+            m_uiChargeTimer = 20000;
+            m_uiRebirthTimer = 0;
+
+            m_bCanSummonEmber = true;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ALAR, IN_PROGRESS);
+            }
+
+            // The boss will always move to the first platform from the left side; also set the movement to idle to stop the DB movement
+            m_creature->GetMotionMaster()->MoveIdle();
+            m_creature->GetMotionMaster()->MovePoint(POINT_ID_PLATFORM, aPlatformLocation[m_uiCurrentPlatformId].m_fX, aPlatformLocation[m_uiCurrentPlatformId].m_fY, aPlatformLocation[m_uiCurrentPlatformId].m_fZ);
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ALAR, FAIL);
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_ALAR, DONE);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_FLAME_PATCH)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_FLAME_PATCH, true);
+            }
+            else
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // drain 3% of boss health when the ember dies
+            if (pSummoned->GetEntry() == NPC_EMBER_OF_ALAR)
+            {
+                // Check first if we have enough health to drain
+                if (m_creature->GetMaxHealth()*.03f > m_creature->GetHealth())
+                {
+                    m_creature->DealDamage(m_creature, m_creature->GetMaxHealth()*.03f, NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                }
+            }
+        }
+
+        void EnterEvadeMode() override
+        {
+            // Don't evade if the boss has the ember blast invisibility aura
+            if (m_creature->HasAura(SPELL_EMBER_BLAST))
+            {
+                return;
+            }
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE)
+            {
+                return;
+            }
+
+            switch (uiPointId)
+            {
+            case POINT_ID_QUILLS:
+                if (m_uiPhase == PHASE_ONE)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FLAME_QUILLS) == CAST_OK)
+                    {
+                        // Set the platform id so the boss will move to the last or the first platform
+                        m_uiCurrentPlatformId = urand(0, 1) ? 2 : 3;
+                        m_uiPlatformMoveTimer = 10000;
+                    }
+                }
+                else if (m_uiPhase == PHASE_DIVE_BOMB)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DIVE_BOMB_VISUAL) == CAST_OK)
+                    {
+                        m_uiDiveBombTimer = 5000;
+                    }
+                }
+                break;
+            case POINT_ID_PLATFORM:
+                // When we reach the platform we start the range check and we can summon the embers
+                m_bCanSummonEmber = true;
+                m_uiRangeCheckTimer = 2000;
+                break;
+            case POINT_ID_RESSURRECT:
+                // remove the invisibility aura
+                if (m_creature->HasAura(SPELL_EMBER_BLAST))
+                {
+                    m_creature->RemoveAurasDueToSpell(SPELL_EMBER_BLAST);
+                }
+
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+
+                // cast rebirth and remove fake death
+                if (DoCastSpellIfCan(m_creature, SPELL_REBIRTH) == CAST_OK)
+                {
+                    DoResetThreat();
+
+                    // start following target
+                    SetCombatMovement(true);
+                    if (m_creature->getVictim())
+                    {
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    }
+
+                    m_uiPhase = PHASE_TWO;
+                }
+                break;
+            }
+        }
+
+        void DamageTaken(Unit* /*pKiller*/, uint32& uiDamage) override
+        {
+            // Only init fake in phase one
+            if (m_uiPhase != PHASE_ONE)
+            {
+                return;
+            }
+
+            if (uiDamage < m_creature->GetHealth())
+            {
+                return;
+            }
+
+            m_creature->InterruptNonMeleeSpells(true);
+            // We set the health to 1 in order to avoid the forced death stand flag - this way we can have the ressurrect animation
+            m_creature->SetHealth(1);
+            m_creature->StopMoving();
+            m_creature->ClearComboPointHolders();
+            m_creature->RemoveAllAurasOnDeath();
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            m_creature->ClearAllReactives();
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MoveIdle();
+            m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+
+            // Stop damage and stop checking for flame buffet.
+            uiDamage = 0;
+            m_uiRangeCheckTimer = 0;
+
+            if (DoCastSpellIfCan(m_creature, SPELL_EMBER_BLAST, CAST_TRIGGERED) == CAST_OK)
+            {
+                // Move to the center of the hall and ressurrect
+                m_uiPhase = PHASE_REBIRTH;
+                m_creature->GetMotionMaster()->MovePoint(POINT_ID_RESSURRECT, aCenterLocation[1].m_fX, aCenterLocation[1].m_fY, aCenterLocation[1].m_fZ);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Platform phase
+            if (m_uiPhase == PHASE_ONE)
+            {
+                if (m_uiFlameQuillsTimer < uiDiff)
+                {
+                    // Move to Flame Quills position; stop range check, platform moving and ember summoning
+                    m_creature->GetMotionMaster()->MovePoint(POINT_ID_QUILLS, aCenterLocation[0].m_fX, aCenterLocation[0].m_fY, aCenterLocation[0].m_fZ);
+                    m_uiRangeCheckTimer = 0;
+                    m_bCanSummonEmber = false;
+                    m_uiPlatformMoveTimer = 0;
+                    m_uiFlameQuillsTimer = 180000;
+                }
+                else
+                {
+                    m_uiFlameQuillsTimer -= uiDiff;
+                }
+
+                if (m_uiPlatformMoveTimer)
+                {
+                    if (m_uiPlatformMoveTimer <= uiDiff)
+                    {
+                        // go to next platform
+                        ++m_uiCurrentPlatformId;
+
+                        if (m_uiCurrentPlatformId == MAX_PLATFORMS)
+                        {
+                            m_uiCurrentPlatformId = 0;
+                        }
+
+                        // move to next platform and summon one ember only if moving on platforms (we avoid the summoning during the Flame Quills move)
+                        if (m_bCanSummonEmber)
+                        {
+                            m_creature->SummonCreature(NPC_EMBER_OF_ALAR, 0, 0, 0, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                        }
+
+                        m_creature->GetMotionMaster()->MovePoint(POINT_ID_PLATFORM, aPlatformLocation[m_uiCurrentPlatformId].m_fX, aPlatformLocation[m_uiCurrentPlatformId].m_fY, aPlatformLocation[m_uiCurrentPlatformId].m_fZ);
+
+                        m_uiRangeCheckTimer = 0;
+                        m_uiPlatformMoveTimer = 35000;
+                    }
+                    else
+                    {
+                        m_uiPlatformMoveTimer -= uiDiff;
+                    }
+                }
+            }
+            // Combat phase
+            else if (m_uiPhase == PHASE_TWO)
+            {
+                if (m_uiBerserkTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+
+                if (m_uiFlamePatchTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        m_creature->SummonCreature(NPC_FLAME_PATCH, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000);
+                        m_uiFlamePatchTimer = 30000;
+                    }
+                }
+                else
+                {
+                    m_uiFlamePatchTimer -= uiDiff;
+                }
+
+                if (m_uiMeltArmorTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MELT_ARMOR) == CAST_OK)
+                    {
+                        m_uiMeltArmorTimer = 60000;
+                    }
+                }
+                else
+                {
+                    m_uiMeltArmorTimer -= uiDiff;
+                }
+
+                if (m_uiChargeTimer < uiDiff)
+                {
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_CHARGE) == CAST_OK)
+                        {
+                            m_uiChargeTimer = 20000;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiChargeTimer -= uiDiff;
+                }
+
+                if (m_uiDiveBombTimer)
+                {
+                    if (m_uiDiveBombTimer <= uiDiff)
+                    {
+                        SetCombatMovement(false);
+                        m_creature->GetMotionMaster()->MovePoint(POINT_ID_QUILLS, aCenterLocation[0].m_fX, aCenterLocation[0].m_fY, aCenterLocation[0].m_fZ);
+                        m_uiPhase = PHASE_DIVE_BOMB;
+                        m_uiRangeCheckTimer = 0;
+                        m_uiDiveBombTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiDiveBombTimer -= uiDiff;
+                    }
+                }
+            }
+            // Dive Bomb event
+            else if (m_uiPhase == PHASE_DIVE_BOMB)
+            {
+                if (m_uiDiveBombTimer)
+                {
+                    if (m_uiDiveBombTimer <= uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        {
+                            if (DoCastSpellIfCan(pTarget, SPELL_DIVE_BOMB) == CAST_OK)
+                            {
+                                m_creature->Relocate(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ());
+                                m_uiRebirthTimer = 2000;
+                                m_uiDiveBombTimer = 0;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiDiveBombTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiRebirthTimer)
+                {
+                    if (m_uiRebirthTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_BOMB_REBIRTH) == CAST_OK)
+                        {
+                            m_creature->RemoveAurasDueToSpell(SPELL_DIVE_BOMB_VISUAL);
+                            SetCombatMovement(true, true);
+
+                            // Spawn 2 Embers of Alar
+                            float fX, fY, fZ;
+                            for (uint8 i = 0; i < 2; ++i)
+                            {
+                                m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 5.0f, fX, fY, fZ);
+                                m_creature->SummonCreature(NPC_EMBER_OF_ALAR, fX, fY, fZ, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                            }
+
+                            m_uiPhase = PHASE_TWO;
+                            m_uiRangeCheckTimer = 2000;
+                            m_uiDiveBombTimer = 30000;
+                            m_uiRebirthTimer = 0;
+                        }
+                    }
+                    else
+                    {
+                        m_uiRebirthTimer -= uiDiff;
+                    }
+                }
+            }
+
+            // only cast flame buffet when not in motion
+            if (m_uiRangeCheckTimer)
+            {
+                if (m_uiRangeCheckTimer <= uiDiff)
+                {
+                    if (!m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
+                    {
+                        DoCastSpellIfCan(m_creature, SPELL_FLAME_BUFFET);
+                    }
+                    m_uiRangeCheckTimer = 2000;
+                }
+                else
+                {
+                    m_uiRangeCheckTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_alarAI(pCreature);
+    }
+};
+
+void AddSC_boss_alar()
+{
+    Script* s;
+
+    s = new boss_alar();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_alar";
+    //pNewScript->GetAI = &GetAI_boss_alar;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp b/src/modules/SD3/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
new file mode 100644
index 000000000..cddf13175
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
@@ -0,0 +1,587 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Astromancer
+SD%Complete: 90
+SDComment: Check if the split phase has some spells involved
+SDCategory: Tempest Keep, The Eye
+EndScriptData */
+
+#include "precompiled.h"
+#include "the_eye.h"
+
+enum
+{
+    SAY_AGGRO                           = -1550007,
+    SAY_SUMMON1                         = -1550008,
+    SAY_SUMMON2                         = -1550009,
+    SAY_KILL1                           = -1550010,
+    SAY_KILL2                           = -1550011,
+    SAY_KILL3                           = -1550012,
+    SAY_DEATH                           = -1550013,
+    SAY_VOIDA                           = -1550014,
+    SAY_VOIDB                           = -1550015,
+
+    SPELL_ARCANE_MISSILES               = 33031,
+    SPELL_WRATH_OF_THE_ASTROMANCER      = 42783,
+    SPELL_BLINDING_LIGHT                = 33009,
+    SPELL_PSYHIC_SCREAM                 = 34322,
+    SPELL_SOLARIAN_TRANSFORM            = 39117,
+    SPELL_VOID_BOLT                     = 39329,
+    SPELL_MARK_OF_SOLARIAN              = 33023,            // acts as an enrage spell
+    // SPELL_ROTATE_ASTROMANCER          = 33283,           // purpose unk
+
+    // summoned creatures
+    NPC_SOLARIUM_AGENT                  = 18925,
+    NPC_SOLARIUM_PRIEST                 = 18806,
+    NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT  = 18928,
+    // NPC_ASTROMANCER_TRIGGER           = 18932,           // purpose unk
+
+    // summoned spells
+    SPELL_SPOTLIGHT                     = 25824,            // visual aura on the spotlights
+
+    SPELL_SOLARIUM_GREAT_HEAL           = 33387,
+    SPELL_SOLARIUM_HOLY_SMITE           = 25054,
+    SPELL_SOLARIUM_ARCANE_TORRENT       = 33390,
+
+    WV_ARMOR                            = 31000,            // ToDo: this value need to be checked
+
+    MAX_SPOTLIGHTS                      = 3,
+    MAX_AGENTS                          = 4,
+};
+
+// Spells used to summon the Spotlights on 2.4.3 - Astromancer Split
+// The boss had to choose 2 large radius split spells and 1 small radius split
+// Large radius spotlight: 33189,33281,33282,33347,33348,33349,33350,33351
+// Small radius spotlight: 33352,33353,33354,33355
+
+static const float fRoomCenter[4] = {432.909f, -373.424f, 17.9608f, 1.06421f};
+static const float fSpotlightRadius[2] = {13.0f, 25.0f};
+
+enum Phases
+{
+    PHASE_NORMAL        = 1,
+    PHASE_SPLIT         = 2,
+    PHASE_VOID          = 3,
+};
+
+struct boss_high_astromancer_solarian : public CreatureScript
+{
+    boss_high_astromancer_solarian() : CreatureScript("boss_high_astromancer_solarian") {}
+
+    struct boss_high_astromancer_solarianAI : public ScriptedAI
+    {
+        boss_high_astromancer_solarianAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_uiDefaultArmor = m_creature->GetArmor();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiArcaneMissilesTimer;
+        uint32 m_uiWrathOfTheAstromancerTimer;
+        uint32 m_uiBlindingLightTimer;
+        uint32 m_uiFearTimer;
+        uint32 m_uiVoidBoltTimer;
+        uint32 m_uiSplitTimer;
+        uint32 m_uiSummonAgentsTimer;
+        uint32 m_uiSummonPriestsTimer;
+        uint32 m_uiDelayTimer;
+        uint32 m_uiDefaultArmor;
+
+        Phases m_Phase;
+
+        GuidVector m_vSpotLightsGuidVector;
+
+        void Reset() override
+        {
+            m_uiArcaneMissilesTimer = 0;
+            m_uiWrathOfTheAstromancerTimer = urand(15000, 25000);
+            m_uiBlindingLightTimer = 35000;
+            m_uiFearTimer = 20000;
+            m_uiVoidBoltTimer = 10000;
+            m_uiSplitTimer = 50000;
+            m_uiSummonAgentsTimer = 0;
+            m_uiSummonPriestsTimer = 0;
+            m_uiDelayTimer = 0;
+            m_Phase = PHASE_NORMAL;
+
+            // The vector will store the summoned spotlights
+            m_vSpotLightsGuidVector.reserve(MAX_SPOTLIGHTS);
+
+            m_creature->SetArmor(m_uiDefaultArmor);
+            if (m_creature->GetVisibility() != VISIBILITY_ON)
+            {
+                m_creature->SetVisibility(VISIBILITY_ON);
+            }
+
+            SetCombatMovement(true);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_KILL1, m_creature); break;
+            case 1: DoScriptText(SAY_KILL2, m_creature); break;
+            case 2: DoScriptText(SAY_KILL3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SOLARIAN, DONE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SOLARIAN, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SOLARIAN, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            switch (pSummoned->GetEntry())
+            {
+            case NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT:
+                // Note: this should be moved to database
+                pSummoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                pSummoned->CastSpell(pSummoned, SPELL_SPOTLIGHT, false);
+                m_vSpotLightsGuidVector.push_back(pSummoned->GetObjectGuid());
+                break;
+            case NPC_SOLARIUM_AGENT:
+            case NPC_SOLARIUM_PRIEST:
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->AI()->AttackStart(pTarget);
+                }
+                break;
+            }
+        }
+
+        void DoSummonSpotlight(float fRadius, float fAngle, uint8 uiRandPoint)
+        {
+            float fX, fY, fZ;
+            m_creature->GetNearPoint(m_creature, fX, fY, fZ, 0, fRadius, fAngle * uiRandPoint);
+            m_creature->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, fX, fY, fZ, 0, TEMPSUMMON_TIMED_DESPAWN, 30000);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // When Solarian reaches 20% she will transform into a huge void walker.
+            if (m_Phase != PHASE_VOID && m_creature->GetHealthPercent() < 20.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SOLARIAN_TRANSFORM) == CAST_OK)
+                {
+                    DoScriptText(SAY_VOIDA, m_creature);
+                    m_uiDelayTimer = 2000;
+
+                    m_creature->SetArmor(WV_ARMOR);
+                    m_Phase = PHASE_VOID;
+
+                    if (m_creature->GetVisibility() != VISIBILITY_ON)
+                    {
+                        m_creature->SetVisibility(VISIBILITY_ON);
+                    }
+
+                    // Stop the combat for a small delay
+                    SetCombatMovement(false);
+                    m_creature->GetMotionMaster()->MoveIdle();
+                }
+            }
+
+            // Handle delays between combat phases
+            if (m_uiDelayTimer)
+            {
+                if (m_uiDelayTimer <= uiDiff)
+                {
+                    if (m_Phase == PHASE_SPLIT)
+                    {
+                        // select two different numbers between 0 and 7 so we will get different spawn points for the spotlights
+                        uint8 uiPos1 = urand(0, 7);
+                        uint8 uiPos2 = (uiPos1 + urand(1, 7)) % 8;
+
+                        // summon 3 spotlights
+                        m_vSpotLightsGuidVector.clear();
+                        DoSummonSpotlight(fSpotlightRadius[0], M_PI_F / 2, urand(0, 3));
+                        DoSummonSpotlight(fSpotlightRadius[1], M_PI_F / 4, uiPos1);
+                        DoSummonSpotlight(fSpotlightRadius[1], M_PI_F / 4, uiPos2);
+
+                        m_creature->SetVisibility(VISIBILITY_OFF);
+
+                        DoScriptText(urand(0, 1) ? SAY_SUMMON1 : SAY_SUMMON2, m_creature);
+                        m_uiSummonAgentsTimer = 6000;
+                    }
+                    else if (m_Phase == PHASE_VOID)
+                    {
+                        DoScriptText(SAY_VOIDB, m_creature);
+
+                        SetCombatMovement(true);
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                    }
+
+                    m_uiDelayTimer = 0;
+                }
+                else
+                {
+                    m_uiDelayTimer -= uiDiff;
+                }
+
+                // Combat is still on hold
+                return;
+            }
+
+            switch (m_Phase)
+            {
+            case PHASE_NORMAL:
+                // Wrath of the Astromancer targets a random player which will explode after 6 secondes
+                if (m_uiWrathOfTheAstromancerTimer < uiDiff)
+                {
+                    // Target the tank ?
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_WRATH_OF_THE_ASTROMANCER, SELECT_FLAG_PLAYER))
+                    {
+                        if (DoCastSpellIfCan(pTarget, SPELL_WRATH_OF_THE_ASTROMANCER) == CAST_OK)
+                        {
+                            m_uiWrathOfTheAstromancerTimer = urand(15000, 25000);
+                        }
+                    }
+                    else
+                    {
+                        m_uiWrathOfTheAstromancerTimer = 10000;
+                    }
+                }
+                else
+                {
+                    m_uiWrathOfTheAstromancerTimer -= uiDiff;
+                }
+
+                // Blinding Light Timer
+                if (m_uiBlindingLightTimer < uiDiff)
+                {
+                    // She casts this spell every 45 seconds. It is a kind of Moonfire spell, which she strikes down on the whole raid simultaneously. It hits everyone in the raid for 2280 to 2520 arcane damage.
+                    if (DoCastSpellIfCan(m_creature, SPELL_BLINDING_LIGHT) == CAST_OK)
+                    {
+                        m_uiBlindingLightTimer = 45000;
+                    }
+                }
+                else
+                {
+                    m_uiBlindingLightTimer -= uiDiff;
+                }
+
+                // Arcane Missiles Timer
+                if (m_uiArcaneMissilesTimer < uiDiff)
+                {
+                    // Solarian casts Arcane Missiles on on random targets in the raid.
+                    if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                    {
+                        if (!m_creature->HasInArc(2.5f, pTarget))
+                        {
+                            pTarget = m_creature->getVictim();
+                        }
+
+                        if (pTarget)
+                        {
+                            DoCastSpellIfCan(pTarget, SPELL_ARCANE_MISSILES);
+                        }
+                    }
+
+                    m_uiArcaneMissilesTimer = urand(3000, 4000);
+                }
+                else
+                {
+                    m_uiArcaneMissilesTimer -= uiDiff;
+                }
+
+                // Phase 1 Timer
+                if (m_uiSplitTimer < uiDiff)
+                {
+                    // ToDo: the timer of this ability is around 45-50 seconds. Please check if this is correct!
+                    DoCastSpellIfCan(m_creature, SPELL_MARK_OF_SOLARIAN, CAST_INTERRUPT_PREVIOUS);
+                    m_Phase = PHASE_SPLIT;
+
+                    // After these 50 seconds she portals to the middle of the room and disappears, leaving 3 light portals behind.
+                    // ToDo: check if there are some spells involved in this event!
+                    m_creature->GetMotionMaster()->MoveIdle();
+                    SetCombatMovement(false);
+                    m_creature->NearTeleportTo(fRoomCenter[0], fRoomCenter[1], fRoomCenter[2], fRoomCenter[3], true);
+
+                    m_uiDelayTimer = 1000;
+                    m_uiSplitTimer = 50000;
+                    // Do nothing more, if phase switched
+                    return;
+                }
+                else
+                {
+                    m_uiSplitTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+                break;
+
+            case PHASE_SPLIT:
+
+                // Summon 4 Agents on each portal
+                if (m_uiSummonAgentsTimer)
+                {
+                    if (m_uiSummonAgentsTimer <= uiDiff)
+                    {
+                        for (uint8 i = 0; i < MAX_SPOTLIGHTS; ++i)
+                        {
+                            if (Creature* pSpotlight = m_creature->GetMap()->GetCreature(m_vSpotLightsGuidVector[i]))
+                            {
+                                for (uint8 j = 0; j < MAX_AGENTS; ++j)
+                                {
+                                    m_creature->SummonCreature(NPC_SOLARIUM_AGENT, pSpotlight->GetPositionX(), pSpotlight->GetPositionY(), pSpotlight->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                                }
+                            }
+                        }
+                        m_uiSummonAgentsTimer = 0;
+                        m_uiSummonPriestsTimer = 15000;
+                    }
+                    else
+                    {
+                        m_uiSummonAgentsTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiSummonPriestsTimer)
+                {
+                    if (m_uiSummonPriestsTimer < uiDiff)
+                    {
+                        m_Phase = PHASE_NORMAL;
+                        // Randomize the portals
+                        std::random_shuffle(m_vSpotLightsGuidVector.begin(), m_vSpotLightsGuidVector.end());
+                        // Summon 2 priests
+                        for (uint8 i = 0; i < 2; ++i)
+                        {
+                            if (Creature* pSpotlight = m_creature->GetMap()->GetCreature(m_vSpotLightsGuidVector[i]))
+                            {
+                                m_creature->SummonCreature(NPC_SOLARIUM_PRIEST, pSpotlight->GetPositionX(), pSpotlight->GetPositionY(), pSpotlight->GetPositionZ(), 0, TEMPSUMMON_DEAD_DESPAWN, 0);
+                            }
+                        }
+                        // Teleport the boss at the last portal
+                        if (Creature* pSpotlight = m_creature->GetMap()->GetCreature(m_vSpotLightsGuidVector[2]))
+                        {
+                            m_creature->NearTeleportTo(pSpotlight->GetPositionX(), pSpotlight->GetPositionY(), pSpotlight->GetPositionZ(), pSpotlight->GetOrientation(), true);
+                        }
+
+                        SetCombatMovement(true);
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+
+                        // Set as visible and reset spells timers
+                        m_creature->SetVisibility(VISIBILITY_ON);
+                        m_uiArcaneMissilesTimer = 0;
+                        m_uiSummonPriestsTimer = 0;
+                        m_uiBlindingLightTimer = 35000;
+                        m_uiWrathOfTheAstromancerTimer = urand(15000, 25000);
+                    }
+                    else
+                    {
+                        m_uiSummonPriestsTimer -= uiDiff;
+                    }
+                }
+
+                break;
+
+            case PHASE_VOID:
+                // Fear Timer
+                if (m_uiFearTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_PSYHIC_SCREAM) == CAST_OK)
+                    {
+                        m_uiFearTimer = 20000;
+                    }
+                }
+                else
+                {
+                    m_uiFearTimer -= uiDiff;
+                }
+
+                // Void Bolt Timer
+                if (m_uiVoidBoltTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_VOID_BOLT) == CAST_OK)
+                    {
+                        m_uiVoidBoltTimer = 10000;
+                    }
+                }
+                else
+                {
+                    m_uiVoidBoltTimer -= uiDiff;
+                }
+
+                DoMeleeAttackIfReady();
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_high_astromancer_solarianAI(pCreature);
+    }
+};
+
+struct mob_solarium_priest : public CreatureScript
+{
+    mob_solarium_priest() : CreatureScript("mob_solarium_priest") {}
+
+    struct mob_solarium_priestAI : public ScriptedAI
+    {
+        mob_solarium_priestAI(Creature* pCreature) : ScriptedAI(pCreature)  { }
+
+        uint32 m_uiHealTimer;
+        uint32 m_uiHolySmiteTimer;
+        uint32 m_uiAoESilenceTimer;
+
+        void Reset() override
+        {
+            m_uiHealTimer = 9000;
+            m_uiHolySmiteTimer = 1;
+            m_uiAoESilenceTimer = 15000;
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                DoStartMovement(pWho, 25.0f);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiHealTimer < uiDiff)
+            {
+                if (Unit* pTarget = DoSelectLowestHpFriendly(50.0f))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SOLARIUM_GREAT_HEAL) == CAST_OK)
+                    {
+                        m_uiHealTimer = 9000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiHealTimer -= uiDiff;
+            }
+
+            if (m_uiHolySmiteTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_SOLARIUM_HOLY_SMITE) == CAST_OK)
+                    {
+                        m_uiHolySmiteTimer = 4000;
+                    }
+                }
+            }
+            else
+            {
+                m_uiHolySmiteTimer -= uiDiff;
+            }
+
+            if (m_uiAoESilenceTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SOLARIUM_ARCANE_TORRENT) == CAST_OK)
+                {
+                    m_uiAoESilenceTimer = 13000;
+                }
+            }
+            else
+            {
+                m_uiAoESilenceTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_solarium_priestAI(pCreature);
+    }
+};
+
+void AddSC_boss_high_astromancer_solarian()
+{
+    Script* s;
+
+    s = new boss_high_astromancer_solarian();
+    s->RegisterSelf();
+    s = new mob_solarium_priest();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_high_astromancer_solarian";
+    //pNewScript->GetAI = &GetAI_boss_high_astromancer_solarian;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_solarium_priest";
+    //pNewScript->GetAI = &GetAI_mob_solarium_priest;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp b/src/modules/SD3/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
new file mode 100644
index 000000000..27869ade7
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
@@ -0,0 +1,1518 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Kaelthas
+SD%Complete: 80
+SDComment: Timers; Transition phase is incomplete, some spells are unk.
+SDCategory: Tempest Keep, The Eye
+EndScriptData */
+
+#include "precompiled.h"
+#include "the_eye.h"
+
+enum
+{
+    // ***** Event yells ********
+    // kael'thas Speech
+    SAY_INTRO                           = -1550016,
+    SAY_INTRO_CAPERNIAN                 = -1550017,
+    SAY_INTRO_TELONICUS                 = -1550018,
+    SAY_INTRO_THALADRED                 = -1550019,
+    SAY_INTRO_SANGUINAR                 = -1550020,
+    SAY_PHASE2_WEAPON                   = -1550021,
+    SAY_PHASE3_ADVANCE                  = -1550022,
+    SAY_PHASE4_INTRO2                   = -1550023,
+    SAY_PHASE5_NUTS                     = -1550024,
+    SAY_SLAY1                           = -1550025,
+    SAY_SLAY2                           = -1550026,
+    SAY_SLAY3                           = -1550027,
+    SAY_MINDCONTROL1                    = -1550028,
+    SAY_MINDCONTROL2                    = -1550029,
+    SAY_GRAVITYLAPSE1                   = -1550030,
+    SAY_GRAVITYLAPSE2                   = -1550031,
+    SAY_SUMMON_PHOENIX1                 = -1550032,
+    SAY_SUMMON_PHOENIX2                 = -1550033,
+    SAY_DEATH                           = -1550034,
+    EMOTE_PYROBLAST                     = -1550044,
+
+    // Thaladred the Darkener speech
+    SAY_THALADRED_AGGRO                 = -1550035,
+    SAY_THALADRED_DEATH                 = -1550036,
+    EMOTE_THALADRED_GAZE                = -1550037,
+
+    // Lord Sanguinar speech
+    SAY_SANGUINAR_AGGRO                 = -1550038,
+    SAY_SANGUINAR_DEATH                 = -1550039,
+
+    // Grand Astromancer Capernian speech
+    SAY_CAPERNIAN_AGGRO                 = -1550040,
+    SAY_CAPERNIAN_DEATH                 = -1550041,
+
+    // Master Engineer Telonicus speech
+    SAY_TELONICUS_AGGRO                 = -1550042,
+    SAY_TELONICUS_DEATH                 = -1550043,
+
+    // ***** Kaelthas spells ********
+    // Phase 2 spells
+    SPELL_KAEL_PHASE_2                  = 36709,            // not sure if this is used in the right way
+    SPELL_SUMMON_WEAPONS                = 36976,
+    SPELL_SUMMON_WEAPONA                = 36958,
+    SPELL_SUMMON_WEAPONB                = 36959,
+    SPELL_SUMMON_WEAPONC                = 36960,
+    SPELL_SUMMON_WEAPOND                = 36961,
+    SPELL_SUMMON_WEAPONE                = 36962,
+    SPELL_SUMMON_WEAPONF                = 36963,
+    SPELL_SUMMON_WEAPONG                = 36964,
+    SPELL_RESURRECTION                  = 36450,
+
+    // Phase 4 spells
+    SPELL_FIREBALL                      = 36805,
+    SPELL_PYROBLAST                     = 36819,
+    SPELL_FLAME_STRIKE                  = 36735,            // summons 21369
+    SPELL_FLAME_STRIKE_DUMMY            = 36730,
+    SPELL_ARCANE_DISRUPTION             = 36834,
+    SPELL_SHOCK_BARRIER                 = 36815,
+    SPELL_PHOENIX_ANIMATION             = 36723,            // summons 21362
+    SPELL_MIND_CONTROL                  = 32830,
+
+    // Phase 5 spells
+    SPELL_GAIN_POWER                    = 36091,
+    SPELL_EXPLODE                       = 36092,
+    // SPELL_EXPLODE_1                   = 36354,           // it's not very clear what all these spells should do
+    SPELL_EXPLODE_2                     = 36373,
+    // SPELL_EXPLODE_3                   = 36375,
+    // SPELL_EXPLODE_4                   = 36376,
+    // SPELL_KAEL_STUN                   = 36185,           // purpose unk
+    SPELL_FULLPOWER                     = 36187,
+    SPELL_GRAVITY_LAPSE                 = 35941,
+    SPELL_GRAVITY_LAPSE_KNOCKBACK       = 34480,            // cast by players - damage effect
+    SPELL_GRAVITY_LAPSE_AURA            = 39432,            // cast by players - fly effect
+    SPELL_NETHER_BEAM                   = 35869,            // triggers 35873 on target
+    SPELL_NETHER_VAPOR_SUMMON           = 35865,            // script effect - probably related to 35879
+
+    // ***** Advisors spells ********
+    // Thaladred the Darkener spells
+    SPELL_PSYCHIC_BLOW                  = 36966,
+    SPELL_SILENCE                       = 30225,
+    SPELL_REND                          = 36965,
+
+    // Lord Sanguinar spells
+    SPELL_BELLOWING_ROAR                = 44863,
+
+    // Grand Astromancer Capernian spells
+    SPELL_CAPERNIAN_FIREBALL            = 36971,
+    SPELL_CONFLAGRATION                 = 37018,
+    SPELL_ARCANE_BURST                  = 36970,
+
+    // Master Engineer Telonicus spells
+    SPELL_BOMB                          = 37036,
+    SPELL_REMOTE_TOY                    = 37027,
+
+    // ***** Other summons spells ********
+    // Nether Vapor spell
+    SPELL_NETHER_VAPOR                  = 35858,
+    // Phoenix spell
+    SPELL_BURN                          = 36720,
+    SPELL_EMBER_BLAST                   = 34341,
+    SPELL_REBIRTH                       = 35369,
+
+    // ***** Creature Entries ********
+    NPC_FLAME_STRIKE_TRIGGER            = 21369,
+    NPC_PHOENIX                         = 21362,
+    NPC_PHOENIX_EGG                     = 21364,
+    NPC_NETHER_VAPOR                    = 21002,
+
+    // ***** Other ********
+    PHASE_0_NOT_BEGUN                   = 0,
+    PHASE_1_ADVISOR                     = 1,
+    PHASE_2_WEAPON                      = 2,
+    PHASE_3_ADVISOR_ALL                 = 3,
+    PHASE_4_SOLO                        = 4,
+    PHASE_5_WAITING                     = 5,
+    PHASE_6_FLYING                      = 6,
+    PHASE_7_GRAVITY                     = 7,
+
+    POINT_ID_CENTER                     = 1,
+    POINT_ID_AIR                        = 2,
+
+    MAX_WEAPONS                         = 7,
+    MAX_MIND_CONTROL                    = 3,
+};
+
+static const uint32 m_auiSpellSummonWeapon[MAX_WEAPONS] =
+{
+    SPELL_SUMMON_WEAPONA, SPELL_SUMMON_WEAPONB, SPELL_SUMMON_WEAPONC, SPELL_SUMMON_WEAPOND,
+    SPELL_SUMMON_WEAPONE, SPELL_SUMMON_WEAPONF, SPELL_SUMMON_WEAPONG
+};
+
+// teleport spells for gravity lapse event
+static const uint32 m_auiSpellGravityLapseTeleport[] =
+{
+    35966, 35967, 35968, 35969, 35970, 35971, 35972, 35973, 35974, 35975, 35976, 35977, 35978, 35979, 35980,
+    35981, 35982, 35983, 35984, 35985, 35986, 35987, 35988, 35989, 35990
+};
+
+static const float aCenterPos[3] = {795.00f, -0.46f, 48.72f};
+
+/*######
+## boss_kaelthas
+######*/
+
+struct boss_kaelthas : public CreatureScript
+{
+    boss_kaelthas() : CreatureScript("boss_kaelthas") {}
+
+    struct boss_kaelthasAI : public ScriptedAI
+    {
+        boss_kaelthasAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiFireballTimer;
+        uint32 m_uiArcaneDisruptionTimer;
+        uint32 m_uiPhoenixTimer;
+        uint32 m_uiFlameStrikeTimer;
+
+        uint32 m_uiPyroblastTimer;
+        uint32 m_uiShockBarrierTimer;
+        uint32 m_uiMindControlTimer;
+        uint32 m_uiExplodeTimer;
+
+        uint32 m_uiGravityLapseTimer;
+        uint32 m_uiGravityExpireTimer;
+        uint32 m_uiNetherBeamTimer;
+        uint32 m_uiNetherVaporTimer;
+        uint8 m_uiGravityIndex;
+
+        uint32 m_uiPhaseTimer;
+        uint8 m_uiPhase;
+        uint8 m_uiPhaseSubphase;
+
+        void Reset() override
+        {
+            // Phases
+            m_uiPhase = PHASE_0_NOT_BEGUN;
+            m_uiPhaseTimer = 23000;
+            m_uiPhaseSubphase = 0;
+
+            // Spells
+            m_uiFireballTimer = urand(1000, 3000);
+            m_uiArcaneDisruptionTimer = 45000;
+            m_uiPhoenixTimer = 50000;
+            m_uiFlameStrikeTimer = 30000;
+
+            m_uiShockBarrierTimer = 60000;
+            m_uiMindControlTimer = 40000;
+            m_uiPyroblastTimer = 0;
+            m_uiExplodeTimer = 0;
+
+            m_uiGravityLapseTimer = 12000;
+            m_uiGravityExpireTimer = 0;
+            m_uiNetherBeamTimer = 8000;
+            m_uiNetherVaporTimer = 10000;
+            m_uiGravityIndex = 0;
+
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+            SetCombatMovement(true);
+        }
+
+        void GetAIInformation(ChatHandler& reader) override
+        {
+            reader.PSendSysMessage("Kael'thas is currently in phase %u", m_uiPhase);
+        }
+
+        // Custom Move in LoS function
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_uiPhase == PHASE_0_NOT_BEGUN && pWho->GetTypeId() == TYPEID_PLAYER && !((Player*)pWho)->isGameMaster() &&
+                m_creature->IsWithinDistInMap(pWho, m_creature->GetAttackDistance(pWho)) && m_creature->IsWithinLOSInMap(pWho))
+            {
+                DoScriptText(SAY_INTRO, m_creature);
+                m_uiPhase = PHASE_1_ADVISOR;
+
+                // Set the player in combat with the boss
+                pWho->SetInCombatWith(m_creature);
+                m_creature->AddThreat(pWho);
+
+                if (m_pInstance)
+                {
+                    m_pInstance->SetData(TYPE_KAELTHAS, IN_PROGRESS);
+                }
+            }
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+                DoStartMovement(pWho, 25.0f);
+            }
+        }
+
+        void KilledUnit(Unit* /*pUnit*/) override
+        {
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KAELTHAS, DONE);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_KAELTHAS, FAIL);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_FLAME_STRIKE_TRIGGER)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_FLAME_STRIKE_DUMMY, false, NULL, NULL, m_creature->GetObjectGuid());
+            }
+            else if (pSummoned->GetEntry() == NPC_NETHER_VAPOR)
+            {
+                pSummoned->CastSpell(pSummoned, SPELL_NETHER_VAPOR, false, NULL, NULL, m_creature->GetObjectGuid());
+            }
+            // Start combat for Weapons of Phoenix
+            else
+            {
+                pSummoned->SetInCombatWithZone();
+            }
+        }
+
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
+        {
+            // Handle summon weapons event
+            if (pSpell->Id == SPELL_SUMMON_WEAPONS)
+            {
+                for (uint8 i = 0; i < MAX_WEAPONS; ++i)
+                {
+                    DoCastSpellIfCan(m_creature, m_auiSpellSummonWeapon[i], CAST_TRIGGERED);
+                }
+
+                m_uiPhase = PHASE_2_WEAPON;
+                m_uiPhaseTimer = 120000;
+            }
+        }
+
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            // Handle gravity lapse teleport - each player hit has his own teleport spell
+            if (pSpell->Id == SPELL_GRAVITY_LAPSE && pTarget->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoCastSpellIfCan(pTarget, m_auiSpellGravityLapseTeleport[m_uiGravityIndex], CAST_TRIGGERED);
+                pTarget->CastSpell(pTarget, SPELL_GRAVITY_LAPSE_KNOCKBACK, true, NULL, NULL, m_creature->GetObjectGuid());
+                pTarget->CastSpell(pTarget, SPELL_GRAVITY_LAPSE_AURA, true, NULL, NULL, m_creature->GetObjectGuid());
+                ++m_uiGravityIndex;
+            }
+        }
+
+        void MovementInform(uint32 uiMotionType, uint32 uiPointId) override
+        {
+            if (uiMotionType != POINT_MOTION_TYPE || !uiPointId)
+            {
+                return;
+            }
+
+            if (uiPointId == POINT_ID_CENTER)
+            {
+                if (m_uiPhase == PHASE_5_WAITING)
+                {
+                    // ToDo: also start channeling to the giant crystals nearby
+                    m_creature->SetLevitate(true);
+                    m_creature->GetMotionMaster()->MovePoint(POINT_ID_AIR, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() + 30.0f, false);
+                    m_uiPhaseTimer = 0;
+                    m_uiPhase = PHASE_6_FLYING;
+                }
+                else if (m_uiPhase == PHASE_6_FLYING)
+                {
+                    SetCombatMovement(true);
+                    m_creature->SetLevitate(false);
+                    m_creature->InterruptNonMeleeSpells(false);
+                    m_creature->GetMotionMaster()->Clear();
+                    DoStartMovement(m_creature->getVictim(), 25.0f);
+                    m_uiShockBarrierTimer = 10000;
+                    m_uiPhase = PHASE_7_GRAVITY;
+                }
+            }
+            if (uiPointId == POINT_ID_AIR)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_EXPLODE_2) == CAST_OK)
+                {
+                    // ToDo: start channeling some additional crystals
+                    // Also it's not very clear which other spells should be used here (which modifies his scale)
+                    m_uiExplodeTimer = 8000;
+                }
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature *pSender, Unit *pInvoker, uint32 /*data*/) override //AdvisorDefeated(uint32 uiEntry)
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+            {
+                if (m_uiPhase != PHASE_1_ADVISOR)
+                {
+                    return;
+                }
+
+                // Handle phase 1 end
+                if (pInvoker->GetEntry() == NPC_TELONICUS)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_SUMMON_WEAPONS) == CAST_OK)
+                    {
+                        DoScriptText(SAY_PHASE2_WEAPON, m_creature);
+                    }
+                }
+                else
+                {
+                    m_uiPhaseTimer = 1000;
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            switch (m_uiPhase)
+            {
+                // ***** Advisors phase ********
+            case PHASE_1_ADVISOR:
+                if (!m_uiPhaseTimer)
+                {
+                    return;
+                }
+
+                if (m_uiPhaseTimer <= uiDiff)
+                {
+                    if (!m_pInstance)
+                    {
+                        return;
+                    }
+
+                    switch (m_uiPhaseSubphase)
+                    {
+                    case 0:
+                        DoScriptText(SAY_INTRO_THALADRED, m_creature);
+                        m_uiPhaseTimer = 7000;
+                        break;
+
+                    case 1:
+                        if (Creature* pAdvisor = m_pInstance->GetSingleCreatureFromStorage(NPC_THALADRED))
+                        {
+                            pAdvisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                            pAdvisor->SetInCombatWithZone();
+                        }
+                        m_uiPhaseTimer = 0;
+                        break;
+
+                    case 2:
+                        DoScriptText(SAY_INTRO_SANGUINAR, m_creature);
+                        m_uiPhaseTimer = 12500;
+                        break;
+
+                    case 3:
+                        if (Creature* pAdvisor = m_pInstance->GetSingleCreatureFromStorage(NPC_SANGUINAR))
+                        {
+                            pAdvisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                            pAdvisor->SetInCombatWithZone();
+                        }
+                        m_uiPhaseTimer = 0;
+                        break;
+
+                    case 4:
+                        DoScriptText(SAY_INTRO_CAPERNIAN, m_creature);
+                        m_uiPhaseTimer = 7000;
+                        break;
+
+                    case 5:
+                        if (Creature* pAdvisor = m_pInstance->GetSingleCreatureFromStorage(NPC_CAPERNIAN))
+                        {
+                            pAdvisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                            pAdvisor->SetInCombatWithZone();
+                        }
+                        m_uiPhaseTimer = 0;
+                        break;
+
+                    case 6:
+                        DoScriptText(SAY_INTRO_TELONICUS, m_creature);
+                        m_uiPhaseTimer = 8400;
+                        break;
+
+                    case 7:
+                        if (Creature* pAdvisor = m_pInstance->GetSingleCreatureFromStorage(NPC_TELONICUS))
+                        {
+                            pAdvisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                            pAdvisor->SetInCombatWithZone();
+                        }
+                        m_uiPhaseTimer = 0;
+                        break;
+                    }
+
+                    ++m_uiPhaseSubphase;
+                }
+                else
+                {
+                    m_uiPhaseTimer -= uiDiff;
+                }
+
+                break;
+
+                // ***** Weapons phase ********
+            case PHASE_2_WEAPON:
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    // Switch to next phase, no matter if the weapons are killed or not
+                    if (DoCastSpellIfCan(m_creature, SPELL_RESURRECTION) == CAST_OK)
+                    {
+                        DoScriptText(SAY_PHASE3_ADVANCE, m_creature);
+                        m_uiPhaseSubphase = 0;
+                        m_uiPhaseTimer = 180000;
+                        m_uiPhase = PHASE_3_ADVISOR_ALL;
+                    }
+                }
+                else
+                {
+                    m_uiPhaseTimer -= uiDiff;
+                }
+
+                break;
+
+                // ***** All advisors phase ********
+            case PHASE_3_ADVISOR_ALL:
+                if (m_uiPhaseTimer < uiDiff)
+                {
+                    DoScriptText(SAY_PHASE4_INTRO2, m_creature);
+                    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                    DoResetThreat();
+                    m_creature->SetInCombatWithZone();
+                    m_uiPhase = PHASE_4_SOLO;
+                    m_uiPhaseTimer = 30000;
+                }
+                else
+                {
+                    m_uiPhaseTimer -= uiDiff;
+                }
+
+                break;
+
+                // ***** Solo phases ********
+            case PHASE_4_SOLO:
+            case PHASE_7_GRAVITY:
+                if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                {
+                    return;
+                }
+
+                if (m_uiGravityExpireTimer)
+                {
+                    if (m_uiNetherBeamTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_NETHER_BEAM) == CAST_OK)
+                        {
+                            m_uiNetherBeamTimer = urand(2000, 4000);
+                        }
+                    }
+                    else
+                    {
+                        m_uiNetherBeamTimer -= uiDiff;
+                    }
+
+                    // Switch to the other spells after gravity lapse expired
+                    if (m_uiGravityExpireTimer <= uiDiff)
+                    {
+                        m_uiGravityExpireTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiGravityExpireTimer -= uiDiff;
+                    }
+                }
+                else
+                {
+                    if (m_uiFireballTimer < uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        {
+                            if (DoCastSpellIfCan(pTarget, SPELL_FIREBALL) == CAST_OK)
+                            {
+                                m_uiFireballTimer = urand(3000, 5000);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiFireballTimer -= uiDiff;
+                    }
+
+                    if (m_uiArcaneDisruptionTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_DISRUPTION) == CAST_OK)
+                        {
+                            m_uiArcaneDisruptionTimer = 60000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiArcaneDisruptionTimer -= uiDiff;
+                    }
+
+                    if (m_uiFlameStrikeTimer < uiDiff)
+                    {
+                        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                        {
+                            if (DoCastSpellIfCan(pTarget, SPELL_FLAME_STRIKE) == CAST_OK)
+                            {
+                                m_uiFlameStrikeTimer = 30000;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m_uiFlameStrikeTimer -= uiDiff;
+                    }
+
+                    if (m_uiPhoenixTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_PHOENIX_ANIMATION) == CAST_OK)
+                        {
+                            DoScriptText(urand(0, 1) ? SAY_SUMMON_PHOENIX1 : SAY_SUMMON_PHOENIX2, m_creature);
+                            m_uiPhoenixTimer = 60000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiPhoenixTimer -= uiDiff;
+                    }
+                }
+
+                DoMeleeAttackIfReady();
+
+                // ***** Phase 4 specific actions ********
+                if (m_uiPhase == PHASE_4_SOLO)
+                {
+                    if (m_creature->GetHealthPercent() < 50.0f)
+                    {
+                        // ToDo: should he cast something here?
+                        m_creature->InterruptNonMeleeSpells(false);
+                        DoScriptText(SAY_PHASE5_NUTS, m_creature);
+
+                        SetCombatMovement(false);
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MovePoint(POINT_ID_CENTER, aCenterPos[0], aCenterPos[1], aCenterPos[2]);
+
+                        m_uiPhase = PHASE_5_WAITING;
+                    }
+
+                    if (m_uiShockBarrierTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_SHOCK_BARRIER) == CAST_OK)
+                        {
+                            m_uiPyroblastTimer = 1000;
+                            m_uiShockBarrierTimer = 60000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiShockBarrierTimer -= uiDiff;
+                    }
+
+                    if (m_uiPyroblastTimer)
+                    {
+                        if (m_uiPyroblastTimer <= uiDiff)
+                        {
+                            if (DoCastSpellIfCan(m_creature, SPELL_PYROBLAST) == CAST_OK)
+                            {
+                                DoScriptText(EMOTE_PYROBLAST, m_creature);
+                                m_uiPyroblastTimer = 0;
+                            }
+                        }
+                        else
+                        {
+                            m_uiPyroblastTimer -= uiDiff;
+                        }
+                    }
+
+                    if (m_uiMindControlTimer < uiDiff)
+                    {
+                        for (uint8 i = 0; i < MAX_MIND_CONTROL; ++i)
+                        {
+                            if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1, SPELL_MIND_CONTROL, SELECT_FLAG_PLAYER))
+                            {
+                                DoCastSpellIfCan(pTarget, SPELL_MIND_CONTROL);
+                            }
+                        }
+                        m_uiMindControlTimer = 60000;
+                    }
+                    else
+                    {
+                        m_uiMindControlTimer -= uiDiff;
+                    }
+                }
+
+                // ***** Phase 7 specific actions ********
+                if (m_uiPhase == PHASE_7_GRAVITY)
+                {
+                    if (m_uiGravityLapseTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_GRAVITY_LAPSE) == CAST_OK)
+                        {
+                            DoScriptText(urand(0, 1) ? SAY_GRAVITYLAPSE1 : SAY_GRAVITYLAPSE2, m_creature);;
+                            m_uiGravityIndex = 0;
+                            m_uiNetherBeamTimer = 8000;
+                            m_uiNetherVaporTimer = 4000;
+                            m_uiGravityExpireTimer = 30000;
+                            m_uiGravityLapseTimer = 90000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiGravityLapseTimer -= uiDiff;
+                    }
+
+                    if (m_uiShockBarrierTimer < uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_SHOCK_BARRIER) == CAST_OK)
+                        {
+                            m_uiShockBarrierTimer = 20000;
+                        }
+                    }
+                    else
+                    {
+                        m_uiShockBarrierTimer -= uiDiff;
+                    }
+
+                    if (m_uiNetherVaporTimer)
+                    {
+                        if (m_uiNetherVaporTimer <= uiDiff)
+                        {
+                            if (DoCastSpellIfCan(m_creature, SPELL_NETHER_VAPOR_SUMMON) == CAST_OK)
+                            {
+                                m_uiNetherVaporTimer = 0;
+                            }
+                        }
+                        else
+                        {
+                            m_uiNetherVaporTimer -= uiDiff;
+                        }
+                    }
+                }
+                // ***** Phase 5 - transition ********
+            case PHASE_5_WAITING:
+                // Nothing here; wait for boss to arive at point
+                break;
+                // ***** Phase 6 - explode the bridge ********
+            case PHASE_6_FLYING:
+                if (m_uiExplodeTimer)
+                {
+                    if (m_uiExplodeTimer <= uiDiff)
+                    {
+                        if (DoCastSpellIfCan(m_creature, SPELL_EXPLODE) == CAST_OK)
+                        {
+                            if (m_pInstance)
+                            {
+                                m_pInstance->DoUseDoorOrButton(GO_KAEL_STATUE_LEFT);
+                                m_pInstance->DoUseDoorOrButton(GO_KAEL_STATUE_RIGHT);
+                                m_pInstance->DoUseDoorOrButton(GO_BRIDGE_WINDOW);
+                            }
+                            // Note: also Kael casts some other unk spells here
+                            m_uiPhaseTimer = 5000;
+                            m_uiExplodeTimer = 0;
+                        }
+                    }
+                    else
+                    {
+                        m_uiExplodeTimer -= uiDiff;
+                    }
+                }
+
+                if (m_uiPhaseTimer)
+                {
+                    if (m_uiPhaseTimer <= uiDiff)
+                    {
+                        m_creature->GetMotionMaster()->Clear();
+                        m_creature->GetMotionMaster()->MovePoint(POINT_ID_CENTER, aCenterPos[0], aCenterPos[1], aCenterPos[2]);
+                        m_uiPhaseTimer = 0;
+                    }
+                    else
+                    {
+                        m_uiPhaseTimer -= uiDiff;
+                    }
+                }
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_kaelthasAI(pCreature);
+    }
+};
+
+struct spell_kael_phase_2 : public SpellScript
+{
+    spell_kael_phase_2() : SpellScript("spell_kael_phase_2") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if (uiSpellId == SPELL_KAEL_PHASE_2 && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            if (CreatureAI* pKaelAI = pCreatureTarget->AI())
+            {
+                pKaelAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pCreatureTarget, pCaster, 0);
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+
+/*######
+## advisor_base_ai : common AI part
+######*/
+
+struct advisor_base_ai : public ScriptedAI
+{
+    advisor_base_ai(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+    }
+
+    ScriptedInstance* m_pInstance;
+
+    bool m_bFakeDeath;
+    bool m_bCanFakeDeath;
+
+    void Reset() override
+    {
+        m_bCanFakeDeath = true;
+        m_bFakeDeath    = false;
+
+        m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+    }
+
+    void JustReachedHome() override
+    {
+        // Reset Kael if needed
+        if (m_pInstance)
+        {
+            if (Creature* pKael = m_pInstance->GetSingleCreatureFromStorage(NPC_KAELTHAS))
+            { pKael->AI()->EnterEvadeMode(); }
+
+            m_pInstance->SetData(TYPE_KAELTHAS, FAIL);
+        }
+    }
+
+    void DamageTaken(Unit* /*pDoneby*/, uint32& uiDamage) override
+    {
+        // Allow fake death only in the first phase
+        if (!m_bCanFakeDeath)
+        { return; }
+
+        if (uiDamage < m_creature->GetHealth())
+        { return; }
+
+        // Make sure it won't die by accident
+        if (m_bFakeDeath)
+        {
+            uiDamage = 0;
+            return;
+        }
+
+        uiDamage = 0;
+        m_bFakeDeath = true;
+
+        m_creature->InterruptNonMeleeSpells(true);
+        m_creature->SetHealth(0);
+        m_creature->StopMoving();
+        m_creature->ClearComboPointHolders();
+        m_creature->RemoveAllAurasOnDeath();
+        m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+        m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        m_creature->ClearAllReactives();
+        m_creature->GetMotionMaster()->Clear();
+        m_creature->GetMotionMaster()->MoveIdle();
+        m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+
+        DoCastSpellIfCan(m_creature, SPELL_KAEL_PHASE_2, CAST_TRIGGERED);
+    }
+
+    void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+    {
+        // Remove fake death
+        if (pSpell->Id == SPELL_RESURRECTION && pCaster->GetEntry() == NPC_KAELTHAS)
+        {
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
+            m_creature->GetMotionMaster()->Clear();
+            if (m_creature->GetEntry() == NPC_CAPERNIAN)
+            { DoStartMovement(m_creature->getVictim(), 20.0f); }
+            else
+            { DoStartMovement(m_creature->getVictim()); }
+            m_bCanFakeDeath = false;
+            m_bFakeDeath = false;
+        }
+    }
+};
+
+/*######
+## boss_thaladred_the_darkener
+######*/
+
+struct boss_thaladred_the_darkener : public CreatureScript
+{
+    boss_thaladred_the_darkener() : CreatureScript("boss_thaladred_the_darkener") {}
+
+    struct boss_thaladred_the_darkenerAI : public advisor_base_ai
+    {
+        boss_thaladred_the_darkenerAI(Creature* pCreature) : advisor_base_ai(pCreature) { }
+
+        uint32 m_uiGazeTimer;
+        uint32 m_uiRendTimer;
+        uint32 m_uiSilenceTimer;
+        uint32 m_uiPsychicBlowTimer;
+
+        void Reset() override
+        {
+            m_uiGazeTimer = 0;
+            m_uiRendTimer = urand(4000, 8000);
+            m_uiSilenceTimer = 5000;
+            m_uiPsychicBlowTimer = 25000;
+
+            advisor_base_ai::Reset();
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            DoScriptText(SAY_THALADRED_AGGRO, m_creature);
+            m_creature->TauntApply(pWho);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_THALADRED_DEATH, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Don't use abilities during fake death
+            if (m_bFakeDeath)
+            {
+                return;
+            }
+
+            if (m_uiGazeTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    DoResetThreat();
+                    m_creature->TauntApply(pTarget);
+                    DoScriptText(EMOTE_THALADRED_GAZE, m_creature, pTarget);
+                }
+                m_uiGazeTimer = 10000;
+            }
+            else
+            {
+                m_uiGazeTimer -= uiDiff;
+            }
+
+            if (m_uiRendTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_REND) == CAST_OK)
+                {
+                    m_uiRendTimer = urand(7000, 12000);
+                }
+            }
+            else
+            {
+                m_uiRendTimer -= uiDiff;
+            }
+
+            if (m_uiSilenceTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_SILENCE) == CAST_OK)
+                {
+                    m_uiSilenceTimer = urand(7000, 13000);
+                }
+            }
+            else
+            {
+                m_uiSilenceTimer -= uiDiff;
+            }
+
+            if (m_uiPsychicBlowTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_PSYCHIC_BLOW) == CAST_OK)
+                {
+                    m_uiPsychicBlowTimer = urand(20000, 25000);
+                }
+            }
+            else
+            {
+                m_uiPsychicBlowTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_thaladred_the_darkenerAI(pCreature);
+    }
+};
+
+/*######
+## boss_lord_sanguinar
+######*/
+
+struct boss_lord_sanguinar : public CreatureScript
+{
+    boss_lord_sanguinar() : CreatureScript("boss_lord_sanguinar") {}
+
+    struct boss_lord_sanguinarAI : public advisor_base_ai
+    {
+        boss_lord_sanguinarAI(Creature* pCreature) : advisor_base_ai(pCreature) { }
+
+        uint32 m_uiFearTimer;
+
+        void Reset() override
+        {
+            m_uiFearTimer = 10000;
+
+            advisor_base_ai::Reset();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_SANGUINAR_AGGRO, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_SANGUINAR_DEATH, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Don't use abilities during fake death
+            if (m_bFakeDeath)
+            {
+                return;
+            }
+
+            if (m_uiFearTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BELLOWING_ROAR) == CAST_OK)
+                {
+                    m_uiFearTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiFearTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_lord_sanguinarAI(pCreature);
+    }
+};
+
+/*######
+## boss_grand_astromancer_capernian
+######*/
+
+struct boss_grand_astromancer_capernian : public CreatureScript
+{
+    boss_grand_astromancer_capernian() : CreatureScript("boss_grand_astromancer_capernian") {}
+
+    struct boss_grand_astromancer_capernianAI : public advisor_base_ai
+    {
+        boss_grand_astromancer_capernianAI(Creature* pCreature) : advisor_base_ai(pCreature) { }
+
+        uint32 m_uiFireballTimer;
+        uint32 m_uiConflagrationTimer;
+        uint32 m_uiArcaneExplosionTimer;
+
+        void Reset() override
+        {
+            m_uiFireballTimer = 2000;
+            m_uiConflagrationTimer = 20000;
+            m_uiArcaneExplosionTimer = 5000;
+
+            advisor_base_ai::Reset();
+        }
+
+        void AttackStart(Unit* pWho) override
+        {
+            if (m_creature->Attack(pWho, true))
+            {
+                m_creature->AddThreat(pWho);
+                m_creature->SetInCombatWith(pWho);
+                pWho->SetInCombatWith(m_creature);
+
+                m_creature->GetMotionMaster()->MoveChase(pWho, 20.0f);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_CAPERNIAN_AGGRO, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_CAPERNIAN_DEATH, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Don't use abilities during fake death
+            if (m_bFakeDeath)
+            {
+                return;
+            }
+
+            if (m_uiFireballTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_CAPERNIAN_FIREBALL) == CAST_OK)
+                {
+                    m_uiFireballTimer = 4000;
+                }
+            }
+            else
+            {
+                m_uiFireballTimer -= uiDiff;
+            }
+
+            if (m_uiConflagrationTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0);
+
+                if (pTarget && m_creature->IsWithinDistInMap(pTarget, 30.0f))
+                {
+                    DoCastSpellIfCan(pTarget, SPELL_CONFLAGRATION);
+                }
+                else
+                {
+                    DoCastSpellIfCan(m_creature->getVictim(), SPELL_CONFLAGRATION);
+                }
+
+                m_uiConflagrationTimer = urand(10000, 15000);
+            }
+            else
+            {
+                m_uiConflagrationTimer -= uiDiff;
+            }
+
+            if (m_uiArcaneExplosionTimer < uiDiff)
+            {
+                if (m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0, SPELL_ARCANE_BURST, SELECT_FLAG_IN_MELEE_RANGE))
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_BURST) == CAST_OK)
+                    {
+                        m_uiArcaneExplosionTimer = urand(4000, 6000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiArcaneExplosionTimer -= uiDiff;
+            }
+
+            // Do NOT deal any melee damage.
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_grand_astromancer_capernianAI(pCreature);
+    }
+};
+
+/*######
+## boss_master_engineer_telonicus
+######*/
+
+struct boss_master_engineer_telonicus : public CreatureScript
+{
+    boss_master_engineer_telonicus() : CreatureScript("boss_master_engineer_telonicus") {}
+
+    struct boss_master_engineer_telonicusAI : public advisor_base_ai
+    {
+        boss_master_engineer_telonicusAI(Creature* pCreature) : advisor_base_ai(pCreature) { }
+
+        uint32 m_uiBombTimer;
+        uint32 m_uiRemoteToyTimer;
+
+        void Reset() override
+        {
+            m_uiBombTimer = 10000;
+            m_uiRemoteToyTimer = 5000;
+
+            advisor_base_ai::Reset();
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_TELONICUS_AGGRO, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_TELONICUS_DEATH, m_creature);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Don't use abilities during fake death
+            if (m_bFakeDeath)
+            {
+                return;
+            }
+
+            if (m_uiBombTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_BOMB) == CAST_OK)
+                {
+                    m_uiBombTimer = 25000;
+                }
+            }
+            else
+            {
+                m_uiBombTimer -= uiDiff;
+            }
+
+            if (m_uiRemoteToyTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_REMOTE_TOY) == CAST_OK)
+                    {
+                        m_uiRemoteToyTimer = urand(10000, 15000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiRemoteToyTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_master_engineer_telonicusAI(pCreature);
+    }
+};
+
+/*######
+## mob_phoenix_tk
+######*/
+
+struct mob_phoenix_tk : public CreatureScript
+{
+    mob_phoenix_tk() : CreatureScript("mob_phoenix_tk") {}
+
+    struct mob_phoenix_tkAI : public ScriptedAI
+    {
+        mob_phoenix_tkAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiCycleTimer;
+
+        bool m_bFakeDeath;
+
+        void Reset() override
+        {
+            m_uiCycleTimer = 2000;
+            m_bFakeDeath = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoCastSpellIfCan(m_creature, SPELL_BURN);
+        }
+
+        void EnterEvadeMode() override
+        {
+            // Don't evade during ember blast
+            if (m_bFakeDeath)
+            {
+                return;
+            }
+
+            ScriptedAI::EnterEvadeMode();
+        }
+
+        void DamageTaken(Unit* /*pKiller*/, uint32& uiDamage) override
+        {
+            if (uiDamage < m_creature->GetHealth())
+            {
+                return;
+            }
+
+            // Prevent glitch if in fake death
+            if (m_bFakeDeath)
+            {
+                uiDamage = 0;
+                return;
+            }
+
+            // prevent death
+            uiDamage = 0;
+            DoSetFakeDeath();
+        }
+
+        void DoSetFakeDeath()
+        {
+            m_bFakeDeath = true;
+
+            m_creature->InterruptNonMeleeSpells(false);
+            m_creature->SetHealth(1);
+            m_creature->StopMoving();
+            m_creature->ClearComboPointHolders();
+            m_creature->RemoveAllAurasOnDeath();
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
+            m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            m_creature->ClearAllReactives();
+            m_creature->SetTargetGuid(ObjectGuid());
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MoveIdle();
+            m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+
+            // Spawn egg and make invisible
+            DoCastSpellIfCan(m_creature, SPELL_EMBER_BLAST, CAST_TRIGGERED);
+            m_creature->SummonCreature(NPC_PHOENIX_EGG, 0, 0, 0, 0, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 15000);
+        }
+
+        void SummonedCreatureDespawn(Creature* /*pSummoned*/) override
+        {
+            // Remove fake death if the egg despawns after 15 secs
+            m_creature->RemoveAurasDueToSpell(SPELL_EMBER_BLAST);
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+            if (DoCastSpellIfCan(m_creature, SPELL_REBIRTH) == CAST_OK)
+            {
+                m_creature->SetHealth(m_creature->GetMaxHealth());
+                m_creature->GetMotionMaster()->Clear();
+                DoStartMovement(m_creature->getVictim());
+                m_bFakeDeath = false;
+
+                DoCastSpellIfCan(m_creature, SPELL_BURN, CAST_TRIGGERED);
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* /*pSummoned*/) override
+        {
+            // Self kill if the egg is killed
+            if (m_bFakeDeath)
+            {
+                m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_bFakeDeath)
+            {
+                return;
+            }
+
+            // ToDo: research if this is correct and how can this be done by spell
+            if (m_uiCycleTimer < uiDiff)
+            {
+                // spell Burn should possible do this, but it doesn't, so do this for now.
+                uint32 uiDmg = urand(4500, 5500);
+                if (uiDmg > m_creature->GetHealth())
+                {
+                    DoSetFakeDeath();
+                }
+                else
+                {
+                    m_creature->DealDamage(m_creature, uiDmg, 0, DOT, SPELL_SCHOOL_MASK_FIRE, NULL, false);
+                }
+
+                m_uiCycleTimer = 2000;
+            }
+            else
+            {
+                m_uiCycleTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_phoenix_tkAI(pCreature);
+    }
+};
+
+/*######
+## mob_phoenix_egg_tk
+######*/
+
+// TODO Remove this 'script' when combat movement can be proper prevented from core-side
+struct mob_phoenix_egg_tk : public CreatureScript
+{
+    mob_phoenix_egg_tk() : CreatureScript("mob_phoenix_egg_tk") {}
+
+    struct mob_phoenix_egg_tkAI : public Scripted_NoMovementAI
+    {
+        mob_phoenix_egg_tkAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+        void AttackStart(Unit* /*pWho*/) override { }
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_phoenix_egg_tkAI(pCreature);
+    }
+};
+
+void AddSC_boss_kaelthas()
+{
+    Script* s;
+
+    s = new boss_kaelthas();
+    s->RegisterSelf();
+    s = new boss_thaladred_the_darkener();
+    s->RegisterSelf();
+    s = new boss_lord_sanguinar();
+    s->RegisterSelf();
+    s = new boss_grand_astromancer_capernian();
+    s->RegisterSelf();
+    s = new boss_master_engineer_telonicus();
+    s->RegisterSelf();
+    s = new mob_phoenix_tk();
+    s->RegisterSelf();
+    s = new mob_phoenix_egg_tk();
+    s->RegisterSelf();
+    s = new spell_kael_phase_2();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_kaelthas";
+    //pNewScript->GetAI = &GetAI_boss_kaelthas;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_kael_phase_2;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_thaladred_the_darkener";
+    //pNewScript->GetAI = &GetAI_boss_thaladred_the_darkener;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_lord_sanguinar";
+    //pNewScript->GetAI = &GetAI_boss_lord_sanguinar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_grand_astromancer_capernian";
+    //pNewScript->GetAI = &GetAI_boss_grand_astromancer_capernian;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_master_engineer_telonicus";
+    //pNewScript->GetAI = &GetAI_boss_master_engineer_telonicus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_phoenix_tk";
+    //pNewScript->GetAI = &GetAI_mob_phoenix_tk;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_phoenix_egg_tk";
+    //pNewScript->GetAI = &GetAI_mob_phoenix_egg_tk;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp b/src/modules/SD3/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
new file mode 100644
index 000000000..0ef0e0aa6
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
@@ -0,0 +1,242 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Void_Reaver
+SD%Complete: 95
+SDComment: Small adjustments may be required
+SDCategory: Tempest Keep, The Eye
+EndScriptData */
+
+#include "precompiled.h"
+#include "the_eye.h"
+
+enum
+{
+    SAY_AGGRO                   = -1550000,
+    SAY_SLAY1                   = -1550001,
+    SAY_SLAY2                   = -1550002,
+    SAY_SLAY3                   = -1550003,
+    SAY_DEATH                   = -1550004,
+    SAY_POUNDING1               = -1550005,
+    SAY_POUNDING2               = -1550006,
+
+    SPELL_POUNDING              = 34162,
+    SPELL_ARCANE_ORB_MISSILE    = 34172,
+    SPELL_KNOCK_AWAY            = 25778,
+    SPELL_BERSERK               = 26662,
+
+    NPC_ARCANE_ORB_TARGET       = 19577,
+};
+
+struct boss_void_reaver : public CreatureScript
+{
+    boss_void_reaver() : CreatureScript("boss_void_reaver") {}
+
+    struct boss_void_reaverAI : public ScriptedAI
+    {
+        boss_void_reaverAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+        }
+
+        ScriptedInstance* m_pInstance;
+
+        uint32 m_uiPoundingTimer;
+        uint32 m_uiArcaneOrbTimer;
+        uint32 m_uiKnockAwayTimer;
+        uint32 m_uiBerserkTimer;
+
+        void Reset() override
+        {
+            m_uiPoundingTimer = 13000;
+            m_uiArcaneOrbTimer = 3000;
+            m_uiKnockAwayTimer = 30000;
+            m_uiBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() != TYPEID_PLAYER)
+            {
+                return;
+            }
+
+            switch (urand(0, 2))
+            {
+            case 0: DoScriptText(SAY_SLAY1, m_creature); break;
+            case 1: DoScriptText(SAY_SLAY2, m_creature); break;
+            case 2: DoScriptText(SAY_SLAY3, m_creature); break;
+            }
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VOIDREAVER, DONE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VOIDREAVER, IN_PROGRESS);
+            }
+        }
+
+        void JustReachedHome() override
+        {
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_VOIDREAVER, NOT_STARTED);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Cast the Arcane Orb missile on the npc, not on player
+            DoCastSpellIfCan(pSummoned, SPELL_ARCANE_ORB_MISSILE, CAST_TRIGGERED);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Pounding
+            if (m_uiPoundingTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_POUNDING) == CAST_OK)
+                {
+                    DoScriptText(urand(0, 1) ? SAY_POUNDING1 : SAY_POUNDING2, m_creature);
+                    m_uiPoundingTimer = 14000;
+                }
+            }
+            else
+            {
+                m_uiPoundingTimer -= uiDiff;
+            }
+
+            // Arcane Orb
+            if (m_uiArcaneOrbTimer < uiDiff)
+            {
+                // Search only for players which are not within 18 yards of the boss
+                std::vector<Unit*> suitableTargets;
+                ThreatList const& threatList = m_creature->GetThreatManager().getThreatList();
+
+                for (ThreatList::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
+                {
+                    if (Unit* pTarget = m_creature->GetMap()->GetUnit((*itr)->getUnitGuid()))
+                    {
+                        if (pTarget->GetTypeId() == TYPEID_PLAYER && !pTarget->IsWithinDist(m_creature, 18.0f))
+                        {
+                            suitableTargets.push_back(pTarget);
+                        }
+                    }
+                }
+
+                if (suitableTargets.empty())
+                {
+                    m_uiArcaneOrbTimer = 3000;
+                }
+                else
+                {
+                    Unit* pTarget = suitableTargets[urand(0, suitableTargets.size() - 1)];
+
+                    if (pTarget)
+                    {
+                        m_creature->SummonCreature(NPC_ARCANE_ORB_TARGET, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                    }
+
+                    m_uiArcaneOrbTimer = 3000;
+                }
+            }
+            else
+            {
+                m_uiArcaneOrbTimer -= uiDiff;
+            }
+
+            // Single Target knock back, reduces aggro
+            if (m_uiKnockAwayTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_KNOCK_AWAY) == CAST_OK)
+                {
+                    m_uiKnockAwayTimer = 30000;
+                }
+            }
+            else
+            {
+                m_uiKnockAwayTimer -= uiDiff;
+            }
+
+            // Berserk
+            if (m_uiBerserkTimer)
+            {
+                if (m_uiBerserkTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_BERSERK) == CAST_OK)
+                    {
+                        m_uiBerserkTimer = 0;
+                    }
+                }
+                else
+                {
+                    m_uiBerserkTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+
+            EnterEvadeIfOutOfCombatArea(uiDiff);
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_void_reaverAI(pCreature);
+    }
+};
+
+void AddSC_boss_void_reaver()
+{
+    Script* s;
+
+    s = new boss_void_reaver();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_void_reaver";
+    //pNewScript->GetAI = &GetAI_boss_void_reaver;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp b/src/modules/SD3/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
new file mode 100644
index 000000000..af74315c4
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
@@ -0,0 +1,184 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_The_Eye
+SD%Complete: 100
+SDComment:
+SDCategory: Tempest Keep, The Eye
+EndScriptData */
+
+#include "precompiled.h"
+#include "the_eye.h"
+
+struct is_the_eye : public InstanceScript
+{
+    is_the_eye() : InstanceScript("instance_the_eye") {}
+
+    class instance_the_eye : public ScriptedInstance
+    {
+    public:
+        instance_the_eye(Map* pMap) : ScriptedInstance(pMap),
+            m_uiKaelthasEventPhase(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        bool IsEncounterInProgress() const override
+        {
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_THALADRED:
+            case NPC_TELONICUS:
+            case NPC_CAPERNIAN:
+            case NPC_SANGUINAR:
+            case NPC_KAELTHAS:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            }
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            switch (pGo->GetEntry())
+            {
+            case GO_ARCANE_DOOR_HORIZ_3:
+            case GO_ARCANE_DOOR_HORIZ_4:
+            case GO_KAEL_STATUE_LEFT:
+            case GO_KAEL_STATUE_RIGHT:
+            case GO_BRIDGE_WINDOW:
+                m_mGoEntryGuidStore[pGo->GetEntry()] = pGo->GetObjectGuid();
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_ALAR:
+            case TYPE_SOLARIAN:
+            case TYPE_VOIDREAVER:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            case TYPE_KAELTHAS:
+                // Don't set the same data twice
+                if (m_auiEncounter[uiType] == uiData)
+                {
+                    break;
+                }
+                DoUseDoorOrButton(GO_ARCANE_DOOR_HORIZ_3);
+                DoUseDoorOrButton(GO_ARCANE_DOOR_HORIZ_4);
+                if (uiData == FAIL)
+                {
+                    if (GameObject* pGo = GetSingleGameObjectFromStorage(GO_KAEL_STATUE_LEFT))
+                    {
+                        pGo->ResetDoorOrButton();
+                    }
+                    if (GameObject* pGo = GetSingleGameObjectFromStorage(GO_KAEL_STATUE_RIGHT))
+                    {
+                        pGo->ResetDoorOrButton();
+                    }
+                    if (GameObject* pGo = GetSingleGameObjectFromStorage(GO_BRIDGE_WINDOW))
+                    {
+                        pGo->ResetDoorOrButton();
+                    }
+
+                    // Respawn or reset the advisors
+                    for (uint8 i = 0; i < MAX_ADVISORS; ++i)
+                    {
+                        if (Creature* pTemp = GetSingleCreatureFromStorage(aAdvisors[i]))
+                        {
+                            if (!pTemp->IsAlive())
+                            {
+                                pTemp->Respawn();
+                            }
+                            else
+                            {
+                                pTemp->AI()->EnterEvadeMode();
+                            }
+                        }
+                    }
+                }
+                m_auiEncounter[uiType] = uiData;
+                break;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        // No Save or Load needed to current knowledge
+
+    private:
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+
+        uint32 m_uiKaelthasEventPhase;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_the_eye(pMap);
+    }
+};
+
+void AddSC_instance_the_eye()
+{
+    Script* s;
+
+    s = new is_the_eye();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_the_eye";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_the_eye;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/the_eye/the_eye.h b/src/modules/SD3/scripts/outland/tempest_keep/the_eye/the_eye.h
new file mode 100644
index 000000000..72ec99d79
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/the_eye/the_eye.h
@@ -0,0 +1,61 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_THE_EYE_H
+#define DEF_THE_EYE_H
+
+enum
+{
+    MAX_ENCOUNTER               = 4,
+    MAX_ADVISORS                = 4,
+
+    TYPE_ALAR                   = 0,
+    TYPE_SOLARIAN               = 1,
+    TYPE_VOIDREAVER             = 2,
+    TYPE_KAELTHAS               = 3,
+
+    // NPC_ASTROMANCER           = 18805,
+    NPC_KAELTHAS                = 19622,
+
+    NPC_CAPERNIAN               = 20062,
+    NPC_SANGUINAR               = 20060,
+    NPC_TELONICUS               = 20063,
+    NPC_THALADRED               = 20064,
+
+    GO_ARCANE_DOOR_HORIZ_3      = 184325,               // combat doors for Kael
+    GO_ARCANE_DOOR_HORIZ_4      = 184324,
+    // GO_RAID_DOOR_4            = 184329,               // encounter doors - no longer used since 2.4.0
+    // GO_RAID_DOOR_3            = 184327,
+    // GO_ARCANE_DOOR_VERT_3     = 184326,
+    // GO_ARCANE_DOOR_VERT_4     = 184328,
+    GO_KAEL_STATUE_LEFT         = 184597,               // cosmetic objects for Kael encounter
+    GO_KAEL_STATUE_RIGHT        = 184596,
+    GO_BRIDGE_WINDOW            = 184069,
+};
+
+static const uint32 aAdvisors[MAX_ADVISORS] = {NPC_CAPERNIAN, NPC_SANGUINAR, NPC_TELONICUS, NPC_THALADRED};
+
+#endif
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/modules/SD3/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
new file mode 100644
index 000000000..57b8c4b5e
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
@@ -0,0 +1,191 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss_Nethermancer_Sepethrea
+SD%Complete: 95
+SDComment: May need some small adjustments
+SDCategory: Tempest Keep, The Mechanar
+EndScriptData */
+
+#include "precompiled.h"
+#include "mechanar.h"
+
+enum
+{
+    SAY_AGGRO                       = -1554013,
+    SAY_SUMMON                      = -1554014,
+    SAY_DRAGONS_BREATH_1            = -1554015,
+    SAY_DRAGONS_BREATH_2            = -1554016,
+    SAY_SLAY1                       = -1554017,
+    SAY_SLAY2                       = -1554018,
+    SAY_DEATH                       = -1554019,
+
+    SPELL_SUMMON_RAGING_FLAMES      = 35275,
+    SPELL_SUMMON_RAGING_FLAMES_H    = 39084,
+    SPELL_FROST_ATTACK              = 45195,
+    SPELL_ARCANE_BLAST              = 35314,
+    SPELL_DRAGONS_BREATH            = 35250,
+
+    NPC_RAGING_FLAMES               = 20481,
+};
+
+struct boss_nethermancer_sepethrea : public CreatureScript
+{
+    boss_nethermancer_sepethrea() : CreatureScript("boss_nethermancer_sepethrea") {}
+
+    struct boss_nethermancer_sepethreaAI : public ScriptedAI
+    {
+        boss_nethermancer_sepethreaAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiFrostAttackTimer;
+        uint32 m_uiArcaneBlastTimer;
+        uint32 m_uiDragonsBreathTimer;
+
+        void Reset() override
+        {
+            m_uiFrostAttackTimer = urand(8000, 17000);
+            m_uiArcaneBlastTimer = urand(14000, 25000);
+            m_uiDragonsBreathTimer = urand(20000, 26000);
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+            DoCastSpellIfCan(m_creature, m_bIsRegularMode ? SPELL_SUMMON_RAGING_FLAMES : SPELL_SUMMON_RAGING_FLAMES_H);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_SEPETHREA, DONE);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_RAGING_FLAMES)
+            {
+                pSummoned->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true);
+                pSummoned->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, true);
+
+                // ToDo: need to fixate target and make them walk!
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+                {
+                    pSummoned->GetMotionMaster()->MoveChase(pTarget);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Frost Attack
+            if (m_uiFrostAttackTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_FROST_ATTACK) == CAST_OK)
+                {
+                    m_uiFrostAttackTimer = urand(5000, 17000);
+                }
+            }
+            else
+            {
+                m_uiFrostAttackTimer -= uiDiff;
+            }
+
+            // Arcane Blast
+            if (m_uiArcaneBlastTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ARCANE_BLAST) == CAST_OK)
+                {
+                    m_uiArcaneBlastTimer = urand(15000, 30000);
+                }
+            }
+            else
+            {
+                m_uiArcaneBlastTimer -= uiDiff;
+            }
+
+            // Dragons Breath
+            if (m_uiDragonsBreathTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DRAGONS_BREATH) == CAST_OK)
+                {
+                    if (urand(0, 1))
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_DRAGONS_BREATH_1 : SAY_DRAGONS_BREATH_2, m_creature);
+                    }
+
+                    m_uiDragonsBreathTimer = urand(20000, 35000);
+                }
+            }
+            else
+            {
+                m_uiDragonsBreathTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_nethermancer_sepethreaAI(pCreature);
+    }
+};
+
+void AddSC_boss_nethermancer_sepethrea()
+{
+    Script* s;
+
+    s = new boss_nethermancer_sepethrea();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_nethermancer_sepethrea";
+    //pNewScript->GetAI = &GetAI_boss_nethermancer_sepethrea;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/modules/SD3/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
new file mode 100644
index 000000000..210c19014
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
@@ -0,0 +1,333 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Boss Pathaleon the Calculator
+SD%Complete: 95
+SDComment: Timers may need update.
+SDCategory: Tempest Keep, The Mechanar
+EndScriptData */
+
+#include "precompiled.h"
+#include "mechanar.h"
+
+enum
+{
+    SAY_AGGRO                       = -1554020,
+    SAY_DOMINATION_1                = -1554021,
+    SAY_DOMINATION_2                = -1554022,
+    SAY_SUMMON                      = -1554023,
+    SAY_ENRAGE                      = -1554024,
+    SAY_SLAY_1                      = -1554025,
+    SAY_SLAY_2                      = -1554026,
+    SAY_DEATH                       = -1554027,
+
+    // Spells to be casted
+    SPELL_MANA_TAP                  = 36021,
+    SPELL_ARCANE_TORRENT            = 36022,
+    SPELL_DOMINATION                = 35280,
+    SPELL_ARCANE_EXPLOSION_H        = 15453,
+    SPELL_FRENZY                    = 36992,
+    SPELL_SUICIDE                   = 35301,        // kill the Nether Wraiths
+    SPELL_DISGRUNTLED_ANGER         = 35289,        // empower a Nether Wraith
+
+    SPELL_SUMMON_NETHER_WRAITH_1    = 35285,
+    SPELL_SUMMON_NETHER_WRAITH_2    = 35286,
+    SPELL_SUMMON_NETHER_WRAITH_3    = 35287,
+    SPELL_SUMMON_NETHER_WRAITH_4    = 35288,
+
+    // Add Spells
+    SPELL_DETONATION                = 35058,
+    SPELL_ARCANE_BOLT               = 20720,
+};
+
+static const uint32 aWraithSummonSpells[4] = {SPELL_SUMMON_NETHER_WRAITH_1, SPELL_SUMMON_NETHER_WRAITH_2, SPELL_SUMMON_NETHER_WRAITH_3, SPELL_SUMMON_NETHER_WRAITH_4};
+
+struct boss_pathaleon_the_calculator : public CreatureScript
+{
+    boss_pathaleon_the_calculator() : CreatureScript("boss_pathaleon_the_calculator") {}
+
+    struct boss_pathaleon_the_calculatorAI : public ScriptedAI
+    {
+        boss_pathaleon_the_calculatorAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            m_bIsRegularMode = pCreature->GetMap()->IsRegularDifficulty();
+        }
+
+        ScriptedInstance* m_pInstance;
+        bool m_bIsRegularMode;
+
+        uint32 m_uiSummonTimer;
+        uint32 m_uiAngerTimer;
+        uint32 m_uiManaTapTimer;
+        uint32 m_uiArcaneTorrentTimer;
+        uint32 m_uiDominationTimer;
+        uint32 m_uiArcaneExplosionTimer;
+        bool m_bIsEnraged;
+
+        void Reset() override
+        {
+            m_uiSummonTimer = urand(12000, 23000);
+            m_uiAngerTimer = urand(31000, 42000);
+            m_uiManaTapTimer = urand(2000, 9000);
+            m_uiArcaneTorrentTimer = urand(11000, 24000);
+            m_uiDominationTimer = urand(25000, 40000);
+            m_uiArcaneExplosionTimer = urand(18000, 45000);
+            m_bIsEnraged = false;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_AGGRO, m_creature);
+        }
+
+        void KilledUnit(Unit* /*pVictim*/) override
+        {
+            DoScriptText(urand(0, 1) ? SAY_SLAY_1 : SAY_SLAY_2, m_creature);
+        }
+
+        void JustDied(Unit* /*pKiller*/) override
+        {
+            DoScriptText(SAY_DEATH, m_creature);
+
+            if (m_pInstance)
+            {
+                m_pInstance->SetData(TYPE_PATHALEON, DONE);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (m_creature->getVictim())
+            {
+                pSummoned->AI()->AttackStart(m_creature->getVictim());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiManaTapTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0, SPELL_MANA_TAP, SELECT_FLAG_POWER_MANA))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_MANA_TAP) == CAST_OK)
+                    {
+                        m_uiManaTapTimer = urand(16000, 34000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiManaTapTimer -= uiDiff;
+            }
+
+            if (m_uiArcaneTorrentTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_TORRENT) == CAST_OK)
+                {
+                    m_uiArcaneTorrentTimer = urand(40000, 52000);
+                }
+            }
+            else
+            {
+                m_uiArcaneTorrentTimer -= uiDiff;
+            }
+
+            if (m_uiDominationTimer < uiDiff)
+            {
+                if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1))
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_DOMINATION) == CAST_OK)
+                    {
+                        DoScriptText(urand(0, 1) ? SAY_DOMINATION_1 : SAY_DOMINATION_2, m_creature);
+                        m_uiDominationTimer = urand(25000, 30000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiDominationTimer -= uiDiff;
+            }
+
+            // Only casting if Heroic Mode is used
+            if (!m_bIsRegularMode)
+            {
+                if (m_uiArcaneExplosionTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_ARCANE_EXPLOSION_H) == CAST_OK)
+                    {
+                        m_uiArcaneExplosionTimer = urand(13000, 25000);
+                    }
+                }
+                else
+                {
+                    m_uiArcaneExplosionTimer -= uiDiff;
+                }
+            }
+
+            if (!m_bIsEnraged && m_creature->GetHealthPercent() < 21.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_FRENZY) == CAST_OK)
+                {
+                    DoCastSpellIfCan(m_creature, SPELL_SUICIDE, CAST_TRIGGERED);
+                    DoScriptText(SAY_ENRAGE, m_creature);
+                    m_bIsEnraged = true;
+                }
+            }
+            // Summon and empower Nether Wraiths only when not enraged
+            else
+            {
+                if (m_uiSummonTimer < uiDiff)
+                {
+                    uint8 uiMaxWraith = urand(3, 4);
+                    for (uint8 i = 0; i < uiMaxWraith; ++i)
+                    {
+                        DoCastSpellIfCan(m_creature, aWraithSummonSpells[i], CAST_TRIGGERED);
+                    }
+
+                    DoScriptText(SAY_SUMMON, m_creature);
+                    m_uiSummonTimer = urand(45000, 50000);
+                }
+                else
+                {
+                    m_uiSummonTimer -= uiDiff;
+                }
+
+                if (m_uiAngerTimer < uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_DISGRUNTLED_ANGER) == CAST_OK)
+                    {
+                        m_uiAngerTimer = urand(55000, 84000);
+                    }
+                }
+                else
+                {
+                    m_uiAngerTimer -= uiDiff;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_pathaleon_the_calculatorAI(pCreature);
+    }
+};
+
+struct mob_nether_wraith : public CreatureScript
+{
+    mob_nether_wraith() : CreatureScript("mob_nether_wraith") {}
+
+    struct mob_nether_wraithAI : public ScriptedAI
+    {
+        mob_nether_wraithAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        uint32 m_uiArcaneMissilesTimer;
+        bool m_bHasDetonated;
+
+        void Reset() override
+        {
+            m_uiArcaneMissilesTimer = urand(1000, 4000);
+            m_bHasDetonated = false;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiArcaneMissilesTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 1);
+                if (!pTarget)
+                {
+                    pTarget = m_creature->getVictim();
+                }
+
+                if (pTarget)
+                {
+                    if (DoCastSpellIfCan(pTarget, SPELL_ARCANE_BOLT) == CAST_OK)
+                    {
+                        m_uiArcaneMissilesTimer = urand(5000, 10000);
+                    }
+                }
+            }
+            else
+            {
+                m_uiArcaneMissilesTimer -= uiDiff;
+            }
+
+            if (!m_bHasDetonated && m_creature->GetHealthPercent() < 10.0f)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_DETONATION, CAST_TRIGGERED) == CAST_OK)
+                {
+                    // Selfkill after the detonation
+                    m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NONE, NULL, false);
+                    m_bHasDetonated = true;
+                    return;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_nether_wraithAI(pCreature);
+    }
+};
+
+void AddSC_boss_pathaleon_the_calculator()
+{
+    Script* s;
+
+    s = new boss_pathaleon_the_calculator();
+    s->RegisterSelf();
+    s = new mob_nether_wraith();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_pathaleon_the_calculator";
+    //pNewScript->GetAI = &GetAI_boss_pathaleon_the_calculator;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_nether_wraith";
+    //pNewScript->GetAI = &GetAI_mob_nether_wraith;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp b/src/modules/SD3/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
new file mode 100644
index 000000000..b316b1a1a
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
@@ -0,0 +1,335 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Instance_Mechanar
+SD%Complete: 70
+SDComment: Elevator needs core support
+SDCategory: Mechanar
+EndScriptData */
+
+#include "precompiled.h"
+#include "mechanar.h"
+
+struct SpawnLocation
+{
+    uint32 m_uiSpawnEntry;
+    float m_fX, m_fY, m_fZ, m_fO;
+};
+
+static const SpawnLocation aBridgeEventLocs[MAX_BRIDGE_LOCATIONS][4] =
+{
+    {
+        { NPC_ASTROMAGE, 243.9323f, -24.53621f, 26.3284f, 0 },
+        { NPC_ASTROMAGE, 240.5847f, -21.25438f, 26.3284f, 0 },
+        { NPC_PHYSICIAN, 238.4178f, -25.92982f, 26.3284f, 0 },
+        { NPC_CENTURION, 237.1122f, -19.14261f, 26.3284f, 0 },
+    },
+    {
+        { NPC_FORGE_DESTROYER, 199.945f, -22.85885f, 24.95783f, 0 },
+        { 0, 0, 0, 0, 0 },
+    },
+    {
+        { NPC_ENGINEER, 179.8642f, -25.84609f, 24.8745f, 0 },
+        { NPC_ENGINEER, 181.9983f, -17.56084f, 24.8745f, 0 },
+        { NPC_PHYSICIAN, 183.4078f, -22.46612f, 24.8745f, 0 },
+        { 0, 0, 0, 0, 0 },
+    },
+    {
+        { NPC_ENGINEER, 141.0496f, 37.86048f, 24.87399f, 4.65f },
+        { NPC_ASTROMAGE, 137.6626f, 34.89631f, 24.8742f, 4.65f },
+        { NPC_PHYSICIAN, 135.3587f, 38.03816f, 24.87417f, 4.65f },
+        { 0, 0, 0, 0, 0 },
+    },
+    {
+        { NPC_FORGE_DESTROYER, 137.8275f, 53.18128f, 24.95783f, 4.65f },
+        { 0, 0, 0, 0, 0 },
+    },
+    {
+        { NPC_PHYSICIAN, 134.3062f, 109.1506f, 26.45663f, 4.65f },
+        { NPC_ASTROMAGE, 135.3307f, 99.96439f, 26.45663f, 4.65f },
+        { NPC_NETHERBINDER, 141.3976f, 102.7863f, 26.45663f, 4.65f },
+        { NPC_ENGINEER, 140.8281f, 112.0363f, 26.45663f, 4.65f },
+    },
+    {
+        { NPC_PATHALEON, 139.5425f, 149.3192f, 25.65904f, 4.63f },
+        { 0, 0, 0, 0, 0 },
+    },
+};
+
+struct is_mechanar : public InstanceScript
+{
+    is_mechanar() : InstanceScript("instance_mechanar") {}
+
+    class instance_mechanar : public ScriptedInstance
+    {
+    public:
+        instance_mechanar(Map* pMap) : ScriptedInstance(pMap),
+            m_uiBridgeEventTimer(0),
+            m_uiBridgeEventPhase(0)
+        {
+            Initialize();
+        }
+
+        void Initialize() override
+        {
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+        }
+
+        void OnPlayerEnter(Player* pPlayer) override
+        {
+            // Check encounter states
+            if (GetData(TYPE_SEPETHREA) != DONE || GetData(TYPE_PATHALEON) == DONE)
+            {
+                return;
+            }
+
+            // Check if already summoned
+            if (GetSingleCreatureFromStorage(NPC_PATHALEON, true))
+            {
+                return;
+            }
+
+            pPlayer->SummonCreature(aBridgeEventLocs[6][0].m_uiSpawnEntry, aBridgeEventLocs[6][0].m_fX, aBridgeEventLocs[6][0].m_fY, aBridgeEventLocs[6][0].m_fZ, aBridgeEventLocs[6][0].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0);
+        }
+
+        void OnObjectCreate(GameObject* pGo) override
+        {
+            if (pGo->GetEntry() == GO_FACTORY_ELEVATOR)
+            {
+                // ToDo: activate elevator if TYPE_GYRO_KILL && TYPE_IRON_HAND && TYPE_CAPACITUS are DONE
+                m_mGoEntryGuidStore[GO_FACTORY_ELEVATOR] = pGo->GetObjectGuid();
+            }
+        }
+
+        void OnCreatureCreate(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_PATHALEON:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+                break;
+            case NPC_ASTROMAGE:
+            case NPC_PHYSICIAN:
+            case NPC_CENTURION:
+            case NPC_ENGINEER:
+            case NPC_NETHERBINDER:
+            case NPC_FORGE_DESTROYER:
+                if (pCreature->IsTemporarySummon())
+                {
+                    m_sBridgeTrashGuidSet.insert(pCreature->GetObjectGuid());
+                }
+                break;
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature) override
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_GYRO_KILL:      SetData(TYPE_GYRO_KILL, DONE); break;
+            case NPC_IRON_HAND:      SetData(TYPE_IRON_HAND, DONE); break;
+            case NPC_LORD_CAPACITUS: SetData(TYPE_CAPACITUS, DONE); break;
+
+            case NPC_ASTROMAGE:
+            case NPC_PHYSICIAN:
+            case NPC_CENTURION:
+            case NPC_ENGINEER:
+            case NPC_NETHERBINDER:
+            case NPC_FORGE_DESTROYER:
+                if (m_sBridgeTrashGuidSet.find(pCreature->GetObjectGuid()) != m_sBridgeTrashGuidSet.end())
+                {
+                    m_sBridgeTrashGuidSet.erase(pCreature->GetObjectGuid());
+
+                    if (m_sBridgeTrashGuidSet.empty())
+                    {
+                        // After the 3rd wave wait 10 seconds
+                        if (m_uiBridgeEventPhase == 3)
+                        {
+                            m_uiBridgeEventTimer = 10000;
+                        }
+                        else
+                        {
+                            DoSpawnBridgeWave();
+                        }
+                    }
+                }
+                break;
+            }
+        }
+
+        void SetData(uint32 uiType, uint32 uiData) override
+        {
+            switch (uiType)
+            {
+            case TYPE_GYRO_KILL:
+            case TYPE_IRON_HAND:
+            case TYPE_CAPACITUS:
+                m_auiEncounter[uiType] = uiData;
+                // ToDo: Activate the Elevator when all these 3 are done
+                break;
+            case TYPE_SEPETHREA:
+                m_auiEncounter[uiType] = uiData;
+                if (uiData == DONE)
+                {
+                    m_uiBridgeEventTimer = 10000;
+                }
+                break;
+            case TYPE_PATHALEON:
+                m_auiEncounter[uiType] = uiData;
+                break;
+            }
+
+            if (uiData == DONE)
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+
+                saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " "
+                    << m_auiEncounter[3] << " " << m_auiEncounter[4];
+
+                m_strInstData = saveStream.str();
+
+                SaveToDB();
+                OUT_SAVE_INST_DATA_COMPLETE;
+            }
+        }
+
+        uint32 GetData(uint32 uiType) const override
+        {
+            if (uiType < MAX_ENCOUNTER)
+            {
+                return m_auiEncounter[uiType];
+            }
+
+            return 0;
+        }
+
+        const char* Save() const override { return m_strInstData.c_str(); }
+        void Load(const char* chrIn) override
+        {
+            if (!chrIn)
+            {
+                OUT_LOAD_INST_DATA_FAIL;
+                return;
+            }
+
+            OUT_LOAD_INST_DATA(chrIn);
+
+            std::istringstream loadStream(chrIn);
+            loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
+                >> m_auiEncounter[4];
+
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            {
+                if (m_auiEncounter[i] == IN_PROGRESS)
+                {
+                    m_auiEncounter[i] = NOT_STARTED;
+                }
+            }
+
+            OUT_LOAD_INST_DATA_COMPLETE;
+        }
+
+        void Update(uint32 uiDiff) override
+        {
+            if (m_uiBridgeEventTimer)
+            {
+                if (m_uiBridgeEventTimer <= uiDiff)
+                {
+                    DoSpawnBridgeWave();
+                    m_uiBridgeEventTimer = 0;
+                }
+                else
+                {
+                    m_uiBridgeEventTimer -= uiDiff;
+                }
+            }
+        }
+
+    private:
+        void DoSpawnBridgeWave()
+        {
+            if (Player* pPlayer = GetPlayerInMap(true, false))
+            {
+                for (uint8 i = 0; i < MAX_BRIDGE_TRASH; ++i)
+                {
+                    // Skip the blank entries
+                    if (aBridgeEventLocs[m_uiBridgeEventPhase][i].m_uiSpawnEntry == 0)
+                    {
+                        break;
+                    }
+
+                    if (Creature* pTemp = pPlayer->SummonCreature(aBridgeEventLocs[m_uiBridgeEventPhase][i].m_uiSpawnEntry, aBridgeEventLocs[m_uiBridgeEventPhase][i].m_fX, aBridgeEventLocs[m_uiBridgeEventPhase][i].m_fY, aBridgeEventLocs[m_uiBridgeEventPhase][i].m_fZ, aBridgeEventLocs[m_uiBridgeEventPhase][i].m_fO, TEMPSUMMON_DEAD_DESPAWN, 0))
+                    {
+                        pTemp->CastSpell(pTemp, SPELL_ETHEREAL_TELEPORT, false);
+
+                        switch (m_uiBridgeEventPhase)
+                        {
+                        case 1:                                 // These waves should attack the player directly
+                        case 2:
+                        case 4:
+                        case 5:
+                            pTemp->AI()->AttackStart(pPlayer);
+                            break;
+                        case 6:                                 // Pathaleon
+                            DoScriptText(SAY_PATHALEON_INTRO, pTemp);
+                            break;
+                        }
+                    }
+                }
+            }
+            ++m_uiBridgeEventPhase;
+        }
+
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+        std::string m_strInstData;
+
+        uint32 m_uiBridgeEventTimer;
+        uint8 m_uiBridgeEventPhase;
+
+        GuidSet m_sBridgeTrashGuidSet;
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new instance_mechanar(pMap);
+    }
+};
+
+void AddSC_instance_mechanar()
+{
+    Script* s;
+
+    s = new is_mechanar();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "instance_mechanar";
+    //pNewScript->GetInstanceData = &GetInstanceData_instance_mechanar;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/tempest_keep/the_mechanar/mechanar.h b/src/modules/SD3/scripts/outland/tempest_keep/the_mechanar/mechanar.h
new file mode 100644
index 000000000..f2e64c3b2
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/tempest_keep/the_mechanar/mechanar.h
@@ -0,0 +1,63 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_MECHANAR_H
+#define DEF_MECHANAR_H
+
+enum
+{
+    MAX_ENCOUNTER           = 5,
+    MAX_BRIDGE_LOCATIONS    = 7,
+    MAX_BRIDGE_TRASH        = 4,
+
+    TYPE_GYRO_KILL          = 0,
+    TYPE_IRON_HAND          = 1,
+    TYPE_CAPACITUS          = 2,
+    TYPE_SEPETHREA          = 3,
+    TYPE_PATHALEON          = 4,
+
+    NPC_GYRO_KILL           = 19218,
+    NPC_IRON_HAND           = 19710,
+    NPC_LORD_CAPACITUS      = 19219,
+    // NPC_SEPETHREA         = 19221,
+    NPC_PATHALEON           = 19220,
+
+    // bridge event related
+    NPC_ASTROMAGE           = 19168,
+    NPC_PHYSICIAN           = 20990,
+    NPC_CENTURION           = 19510,
+    NPC_ENGINEER            = 20988,
+    NPC_NETHERBINDER        = 20059,
+    NPC_FORGE_DESTROYER     = 19735,
+
+    GO_FACTORY_ELEVATOR     = 183788,
+
+    SPELL_ETHEREAL_TELEPORT = 34427,
+
+    SAY_PATHALEON_INTRO     = -1554028,
+};
+
+#endif
diff --git a/src/modules/SD3/scripts/outland/terokkar_forest.cpp b/src/modules/SD3/scripts/outland/terokkar_forest.cpp
new file mode 100644
index 000000000..40e1a180a
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/terokkar_forest.cpp
@@ -0,0 +1,1508 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Terokkar_Forest
+SD%Complete: 80
+SDComment: Quest support: 9889, 10009, 10051, 10052, 10446/10447, 10852, 10873, 10887, 10896, 10898, 10922, 10988, 11085, 11093, 11096.
+SDCategory: Terokkar Forest
+EndScriptData */
+
+/* ContentData
+mob_unkor_the_ruthless
+mob_netherweb_victim
+npc_akuno
+npc_hungry_nether_ray
+npc_letoll
+npc_mana_bomb_exp_trigger
+go_mana_bomb
+go_veil_skith_cage
+npc_captive_child
+npc_isla_starmane
+npc_skywing
+npc_cenarion_sparrowhawk
+npc_skyguard_prisoner
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "pet_ai.h"
+
+/*######
+## mob_unkor_the_ruthless
+######*/
+
+enum
+{
+    SAY_SUBMIT                  = -1000194,
+
+    FACTION_FRIENDLY            = 35,
+
+    SPELL_PULVERIZE             = 2676,
+    SPELL_QUID9889              = 32174,
+};
+
+struct mob_unkor_the_ruthless : public CreatureScript
+{
+    mob_unkor_the_ruthless() : CreatureScript("mob_unkor_the_ruthless") {}
+
+    struct mob_unkor_the_ruthlessAI : public ScriptedAI
+    {
+        mob_unkor_the_ruthlessAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        bool m_bCanDoQuest;
+        uint32 m_uiUnfriendlyTimer;
+        uint32 m_uiPulverizeTimer;
+        uint32 m_uiFriendlyTimer;
+
+        void Reset() override
+        {
+            m_bCanDoQuest = false;
+            m_uiUnfriendlyTimer = 0;
+            m_uiFriendlyTimer = 0;
+            m_uiPulverizeTimer = 3000;
+            m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+        }
+
+        void DoNice()
+        {
+            DoScriptText(SAY_SUBMIT, m_creature);
+            m_creature->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_REACH_HOME);
+            m_creature->SetStandState(UNIT_STAND_STATE_SIT);
+            m_creature->RemoveAllAuras();
+            m_creature->DeleteThreatList();
+            m_creature->CombatStop(true);
+            m_uiUnfriendlyTimer = 60000;
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Reset npc on timer
+            if (m_uiUnfriendlyTimer)
+            {
+                if (m_uiUnfriendlyTimer <= uiDiff)
+                {
+                    EnterEvadeMode();
+                }
+                else
+                {
+                    m_uiUnfriendlyTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Do quest kill credit at 30%
+            if (!m_bCanDoQuest && m_creature->GetHealthPercent() < 30.0f)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_QUID9889, CAST_TRIGGERED);
+                m_uiFriendlyTimer = 1000;
+                m_bCanDoQuest = true;
+            }
+
+            // Set faction right after the spell is casted, in order to avoid any issues
+            if (m_uiFriendlyTimer)
+            {
+                if (m_uiFriendlyTimer <= uiDiff)
+                {
+                    DoNice();
+                    m_uiFriendlyTimer = 0;
+                }
+                else
+                {
+                    m_uiFriendlyTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiPulverizeTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_PULVERIZE);
+                m_uiPulverizeTimer = 9000;
+            }
+            else
+            {
+                m_uiPulverizeTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_unkor_the_ruthlessAI(pCreature);
+    }
+};
+
+/*######
+## mob_netherweb_victim
+######*/
+
+enum
+{
+    NPC_FREED_WARRIOR       = 22459,
+    QUEST_TAKEN_IN_NIGHT    = 10873
+                              // SPELL_FREE_WEBBED       = 38950
+};
+
+const uint32 netherwebVictims[6] =
+{
+    18470, 16805, 21242, 18452, 22482, 21285
+};
+
+struct mob_netherweb_victim : public CreatureScript
+{
+    mob_netherweb_victim() : CreatureScript("mob_netherweb_victim") {}
+
+    struct mob_netherweb_victimAI : public ScriptedAI
+    {
+        mob_netherweb_victimAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            SetCombatMovement(false);
+        }
+
+        void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+        void JustDied(Unit* pKiller) override
+        {
+            if (Player* pPlayer = pKiller->GetCharmerOrOwnerPlayerOrPlayerItself())
+            {
+                if (pPlayer->GetQuestStatus(QUEST_TAKEN_IN_NIGHT) == QUEST_STATUS_INCOMPLETE)
+                {
+                    if (!urand(0, 3))
+                    {
+                        m_creature->SummonCreature(NPC_FREED_WARRIOR, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 60000);
+                        pPlayer->KilledMonsterCredit(NPC_FREED_WARRIOR, m_creature->GetObjectGuid());
+                    }
+                    else
+                    {
+                        m_creature->SummonCreature(netherwebVictims[urand(0, 5)], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 60000);
+                    }
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new mob_netherweb_victimAI(pCreature);
+    }
+};
+
+/*#####
+## npc_akuno
+#####*/
+
+enum
+{
+    SAY_AKU_START           = -1000477,
+    SAY_AKU_AMBUSH_A        = -1000478,
+    SAY_AKU_AMBUSH_B        = -1000479,
+    SAY_AKU_AMBUSH_B_REPLY  = -1000480,
+    SAY_AKU_COMPLETE        = -1000481,
+
+    SPELL_CHAIN_LIGHTNING   = 39945,
+
+    QUEST_ESCAPING_TOMB     = 10887,
+    NPC_CABAL_SKIRMISHER    = 21661
+};
+
+static float m_afAmbushB1[] = { -2895.525879f, 5336.431641f, -11.800f};
+static float m_afAmbushB2[] = { -2890.604980f, 5331.938965f, -11.282f};
+
+struct npc_akuno : public CreatureScript
+{
+    npc_akuno() : CreatureScript("npc_akuno") {}
+
+    struct npc_akunoAI : public npc_escortAI
+    {
+        npc_akunoAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        uint32 m_uiChainLightningTimer;
+
+        void Reset() override
+        {
+            m_uiChainLightningTimer = 1000;
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 5:
+                DoScriptText(SAY_AKU_AMBUSH_A, m_creature);
+                m_creature->SummonCreature(NPC_CABAL_SKIRMISHER, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                break;
+            case 14:
+                DoScriptText(SAY_AKU_AMBUSH_B, m_creature);
+
+                if (Creature* pTemp = m_creature->SummonCreature(NPC_CABAL_SKIRMISHER, m_afAmbushB1[0], m_afAmbushB1[1], m_afAmbushB1[2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000))
+                {
+                    DoScriptText(SAY_AKU_AMBUSH_B_REPLY, pTemp);
+                }
+
+                m_creature->SummonCreature(NPC_CABAL_SKIRMISHER, m_afAmbushB2[0], m_afAmbushB2[1], m_afAmbushB2[2], 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 25000);
+                break;
+            case 15:
+                SetRun();
+                break;
+            case 18:
+                DoScriptText(SAY_AKU_COMPLETE, m_creature);
+
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_ESCAPING_TOMB, m_creature);
+                }
+
+                break;
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiChainLightningTimer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_CHAIN_LIGHTNING);
+                m_uiChainLightningTimer = urand(7000, 14000);
+            }
+            else
+            {
+                m_uiChainLightningTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ESCAPING_TOMB)
+        {
+            if (npc_akunoAI* pEscortAI = dynamic_cast<npc_akunoAI*>(pCreature->AI()))
+            {
+                pCreature->SetStandState(UNIT_STAND_STATE_STAND);
+                pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+
+                DoScriptText(SAY_AKU_START, pCreature);
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_akunoAI(pCreature);
+    }
+};
+
+/*######
+## npc_hungry_nether_ray
+######*/
+
+enum
+{
+    EMOTE_FEED                  = -1000628,
+    NPC_BLACK_WARP_CHASER       = 23219,
+    SPELL_FEED_CREDIT           = 41427,                    // credit for quest 11093
+};
+
+struct npc_hungry_nether_ray : public CreatureScript
+{
+    npc_hungry_nether_ray() : CreatureScript("npc_hungry_nether_ray") {}
+
+    struct npc_hungry_nether_rayAI : public ScriptedPetAI
+    {
+        npc_hungry_nether_rayAI(Creature* pCreature) : ScriptedPetAI(pCreature) { }
+
+        void OwnerKilledUnit(Unit* pVictim) override
+        {
+            if (pVictim->GetTypeId() == TYPEID_UNIT && pVictim->GetEntry() == NPC_BLACK_WARP_CHASER)
+            {
+                // Distance expected?
+                if (m_creature->IsWithinDistInMap(pVictim, 10.0f))
+                {
+                    DoScriptText(EMOTE_FEED, m_creature);
+                    m_creature->CastSpell(m_creature, SPELL_FEED_CREDIT, true);
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_hungry_nether_rayAI(pCreature);
+    }
+};
+
+/*######
+## npc_letoll
+######*/
+
+enum
+{
+    SAY_LE_START                    = -1000511,
+    SAY_LE_KEEP_SAFE                = -1000512,
+    SAY_LE_NORTH                    = -1000513,
+    SAY_LE_ARRIVE                   = -1000514,
+    SAY_LE_BURIED                   = -1000515,
+    SAY_LE_ALMOST                   = -1000516,
+    SAY_LE_DRUM                     = -1000517,
+    SAY_LE_DRUM_REPLY               = -1000518,
+    SAY_LE_DISCOVERY                = -1000519,
+    SAY_LE_DISCOVERY_REPLY          = -1000520,
+    SAY_LE_NO_LEAVE                 = -1000521,
+    SAY_LE_NO_LEAVE_REPLY1          = -1000522,
+    SAY_LE_NO_LEAVE_REPLY2          = -1000523,
+    SAY_LE_NO_LEAVE_REPLY3          = -1000524,
+    SAY_LE_NO_LEAVE_REPLY4          = -1000525,
+    SAY_LE_SHUT                     = -1000526,
+    SAY_LE_REPLY_HEAR               = -1000527,
+    SAY_LE_IN_YOUR_FACE             = -1000528,
+    SAY_LE_HELP_HIM                 = -1000529,
+    EMOTE_LE_PICK_UP                = -1000530,
+    SAY_LE_THANKS                   = -1000531,
+
+    QUEST_DIGGING_BONES             = 10922,
+
+    NPC_RESEARCHER                  = 22464,
+    NPC_BONE_SIFTER                 = 22466,
+
+    MAX_RESEARCHER                  = 4
+};
+
+// Some details still missing from here, and will also have issues if followers evade for any reason.
+struct npc_letoll : public CreatureScript
+{
+    npc_letoll() : CreatureScript("npc_letoll") {}
+
+    struct npc_letollAI : public npc_escortAI
+    {
+        npc_letollAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+            m_uiEventTimer = 5000;
+            m_uiEventCount = 0;
+        }
+
+        std::list<Creature*> m_lResearchersList;
+
+        uint32 m_uiEventTimer;
+        uint32 m_uiEventCount;
+
+        // will make them follow, but will only work until they enter combat with any unit
+        void SetFormation()
+        {
+            uint32 uiCount = 0;
+
+            for (std::list<Creature*>::iterator itr = m_lResearchersList.begin(); itr != m_lResearchersList.end(); ++itr)
+            {
+                float fAngle = uiCount < MAX_RESEARCHER ? M_PI / MAX_RESEARCHER - (uiCount * 2 * M_PI / MAX_RESEARCHER) : 0.0f;
+
+                if ((*itr)->IsAlive() && !(*itr)->IsInCombat())
+                {
+                    (*itr)->GetMotionMaster()->MoveFollow(m_creature, 2.5f, fAngle);
+                }
+
+                ++uiCount;
+            }
+        }
+
+        Creature* GetAvailableResearcher(uint8 uiListNum)
+        {
+            if (!m_lResearchersList.empty())
+            {
+                uint8 uiNum = 1;
+
+                for (std::list<Creature*>::iterator itr = m_lResearchersList.begin(); itr != m_lResearchersList.end(); ++itr)
+                {
+                    if (uiListNum && uiListNum != uiNum)
+                    {
+                        ++uiNum;
+                        continue;
+                    }
+
+                    if ((*itr)->IsAlive() && (*itr)->IsWithinDistInMap(m_creature, 20.0f))
+                    {
+                        return (*itr);
+                    }
+                }
+            }
+
+            return NULL;
+        }
+
+        void JustStartedEscort() override
+        {
+            m_uiEventTimer = 5000;
+            m_uiEventCount = 0;
+
+            m_lResearchersList.clear();
+
+            GetCreatureListWithEntryInGrid(m_lResearchersList, m_creature, NPC_RESEARCHER, 25.0f);
+
+            if (!m_lResearchersList.empty())
+            {
+                SetFormation();
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    DoScriptText(SAY_LE_KEEP_SAFE, m_creature, pPlayer);
+                }
+                break;
+            case 1:
+                DoScriptText(SAY_LE_NORTH, m_creature);
+                break;
+            case 10:
+                DoScriptText(SAY_LE_ARRIVE, m_creature);
+                break;
+            case 12:
+                DoScriptText(SAY_LE_BURIED, m_creature);
+                SetEscortPaused(true);
+                break;
+            case 13:
+                SetRun();
+                break;
+            }
+        }
+
+        void Aggro(Unit* pWho) override
+        {
+            if (pWho->IsInCombat() && pWho->GetTypeId() == TYPEID_UNIT && pWho->GetEntry() == NPC_BONE_SIFTER)
+            {
+                DoScriptText(SAY_LE_HELP_HIM, m_creature);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (pPlayer && pPlayer->IsAlive())
+            {
+                pSummoned->AI()->AttackStart(pPlayer);
+            }
+            else
+            {
+                pSummoned->AI()->AttackStart(m_creature);
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                if (HasEscortState(STATE_ESCORT_PAUSED))
+                {
+                    if (m_uiEventTimer < uiDiff)
+                    {
+                        m_uiEventTimer = 7000;
+
+                        switch (m_uiEventCount)
+                        {
+                        case 0:
+                            DoScriptText(SAY_LE_ALMOST, m_creature);
+                            break;
+                        case 1:
+                            DoScriptText(SAY_LE_DRUM, m_creature);
+                            break;
+                        case 2:
+                            if (Creature* pResearcher = GetAvailableResearcher(0))
+                            {
+                                DoScriptText(SAY_LE_DRUM_REPLY, pResearcher);
+                            }
+                            break;
+                        case 3:
+                            DoScriptText(SAY_LE_DISCOVERY, m_creature);
+                            break;
+                        case 4:
+                            if (Creature* pResearcher = GetAvailableResearcher(0))
+                            {
+                                DoScriptText(SAY_LE_DISCOVERY_REPLY, pResearcher);
+                            }
+                            break;
+                        case 5:
+                            DoScriptText(SAY_LE_NO_LEAVE, m_creature);
+                            break;
+                        case 6:
+                            if (Creature* pResearcher = GetAvailableResearcher(1))
+                            {
+                                DoScriptText(SAY_LE_NO_LEAVE_REPLY1, pResearcher);
+                            }
+                            break;
+                        case 7:
+                            if (Creature* pResearcher = GetAvailableResearcher(2))
+                            {
+                                DoScriptText(SAY_LE_NO_LEAVE_REPLY2, pResearcher);
+                            }
+                            break;
+                        case 8:
+                            if (Creature* pResearcher = GetAvailableResearcher(3))
+                            {
+                                DoScriptText(SAY_LE_NO_LEAVE_REPLY3, pResearcher);
+                            }
+                            break;
+                        case 9:
+                            if (Creature* pResearcher = GetAvailableResearcher(4))
+                            {
+                                DoScriptText(SAY_LE_NO_LEAVE_REPLY4, pResearcher);
+                            }
+                            break;
+                        case 10:
+                            DoScriptText(SAY_LE_SHUT, m_creature);
+                            break;
+                        case 11:
+                            if (Creature* pResearcher = GetAvailableResearcher(0))
+                            {
+                                DoScriptText(SAY_LE_REPLY_HEAR, pResearcher);
+                            }
+                            break;
+                        case 12:
+                            DoScriptText(SAY_LE_IN_YOUR_FACE, m_creature);
+                            m_creature->SummonCreature(NPC_BONE_SIFTER, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                            break;
+                        case 13:
+                            DoScriptText(EMOTE_LE_PICK_UP, m_creature);
+
+                            if (Player* pPlayer = GetPlayerForEscort())
+                            {
+                                DoScriptText(SAY_LE_THANKS, m_creature, pPlayer);
+                                pPlayer->GroupEventHappens(QUEST_DIGGING_BONES, m_creature);
+                            }
+
+                            SetEscortPaused(false);
+                            break;
+                        }
+
+                        ++m_uiEventCount;
+                    }
+                    else
+                    {
+                        m_uiEventTimer -= uiDiff;
+                    }
+                }
+
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_letollAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_DIGGING_BONES)
+        {
+            if (npc_letollAI* pEscortAI = dynamic_cast<npc_letollAI*>(pCreature->AI()))
+            {
+                DoScriptText(SAY_LE_START, pCreature);
+                pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+
+                pEscortAI->Start(false, pPlayer, pQuest, true);
+            }
+        }
+
+        return true;
+    }
+};
+
+/*######
+## npc_mana_bomb_exp_trigger
+######*/
+
+enum
+{
+    SAY_COUNT_1                 = -1000472,
+    SAY_COUNT_2                 = -1000473,
+    SAY_COUNT_3                 = -1000474,
+    SAY_COUNT_4                 = -1000475,
+    SAY_COUNT_5                 = -1000476,
+
+    SPELL_MANA_BOMB_LIGHTNING   = 37843,
+    SPELL_MANA_BOMB_EXPL        = 35513,
+
+    NPC_MANA_BOMB_EXPL_TRIGGER  = 20767,
+    NPC_MANA_BOMB_KILL_TRIGGER  = 21039
+};
+
+struct npc_mana_bomb_exp_trigger : public CreatureScript
+{
+    npc_mana_bomb_exp_trigger() : CreatureScript("npc_mana_bomb_exp_trigger") {}
+
+    struct npc_mana_bomb_exp_triggerAI : public ScriptedAI
+    {
+        npc_mana_bomb_exp_triggerAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        GameObject* pManaBomb;
+
+        bool m_bIsActivated;
+        uint32 m_uiEventTimer;
+        uint32 m_uiEventCounter;
+
+        void Reset() override
+        {
+            pManaBomb = NULL;
+            m_bIsActivated = false;
+            m_uiEventTimer = 1000;
+            m_uiEventCounter = 0;
+        }
+
+        void JustSummoned(GameObject* pGo)
+        {
+            //fictive use for GO guid transfer
+            pManaBomb = pGo;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*data*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (m_bIsActivated)
+                {
+                    return;
+                }
+
+                m_bIsActivated = true;
+
+                ((Player*)pInvoker)->KilledMonsterCredit(NPC_MANA_BOMB_KILL_TRIGGER);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_bIsActivated)
+            {
+                return;
+            }
+
+            if (m_uiEventTimer < uiDiff)
+            {
+                m_uiEventTimer = 1000;
+
+                if (m_uiEventCounter < 10)
+                {
+                    m_creature->CastSpell(m_creature, SPELL_MANA_BOMB_LIGHTNING, false);
+                }
+
+                switch (m_uiEventCounter)
+                {
+                case 5:
+                    if (pManaBomb)
+                    {
+                        pManaBomb->SetGoState(GO_STATE_ACTIVE);
+                    }
+
+                    DoScriptText(SAY_COUNT_1, m_creature);
+                    break;
+                case 6:
+                    DoScriptText(SAY_COUNT_2, m_creature);
+                    break;
+                case 7:
+                    DoScriptText(SAY_COUNT_3, m_creature);
+                    break;
+                case 8:
+                    DoScriptText(SAY_COUNT_4, m_creature);
+                    break;
+                case 9:
+                    DoScriptText(SAY_COUNT_5, m_creature);
+                    break;
+                case 10:
+                    m_creature->CastSpell(m_creature, SPELL_MANA_BOMB_EXPL, false);
+                    break;
+                case 30:
+                    if (pManaBomb)
+                    {
+                        pManaBomb->SetGoState(GO_STATE_READY);
+                    }
+
+                    Reset();
+                    break;
+                }
+
+                ++m_uiEventCounter;
+            }
+            else
+            {
+                m_uiEventTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_mana_bomb_exp_triggerAI(pCreature);
+    }
+};
+
+/*######
+## go_mana_bomb
+######*/
+
+struct go_mana_bomb : public GameObjectScript
+{
+    go_mana_bomb() : GameObjectScript("go_mana_bomb") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        if (Creature* pCreature = GetClosestCreatureWithEntry(pGo, NPC_MANA_BOMB_EXPL_TRIGGER, INTERACTION_DISTANCE))
+        {
+            if (CreatureAI* pBombAI = pCreature->AI())
+            {
+                pBombAI->JustSummoned(pGo);
+                pBombAI->ReceiveAIEvent(AI_EVENT_CUSTOM_A, pCreature, pPlayer, 0);
+            }
+        }
+
+        return true;
+    }
+};
+
+/*######
+## go_veil_skith_cage & npc_captive_child
+#####*/
+
+enum
+{
+    QUEST_MISSING_FRIENDS     = 10852,
+    NPC_CAPTIVE_CHILD         = 22314,
+    SAY_THANKS_1              = -1000590,
+    SAY_THANKS_2              = -1000591,
+    SAY_THANKS_3              = -1000592,
+    SAY_THANKS_4              = -1000593
+};
+
+struct go_veil_skith_cage : public GameObjectScript
+{
+    go_veil_skith_cage() : GameObjectScript("go_veil_skith_cage") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_MISSING_FRIENDS) == QUEST_STATUS_INCOMPLETE)
+        {
+            std::list<Creature*> lChildrenList;
+            GetCreatureListWithEntryInGrid(lChildrenList, pGo, NPC_CAPTIVE_CHILD, INTERACTION_DISTANCE);
+            for (std::list<Creature*>::const_iterator itr = lChildrenList.begin(); itr != lChildrenList.end(); ++itr)
+            {
+                pPlayer->KilledMonsterCredit(NPC_CAPTIVE_CHILD, (*itr)->GetObjectGuid());
+                switch (urand(0, 3))
+                {
+                case 0: DoScriptText(SAY_THANKS_1, *itr); break;
+                case 1: DoScriptText(SAY_THANKS_2, *itr); break;
+                case 2: DoScriptText(SAY_THANKS_3, *itr); break;
+                case 3: DoScriptText(SAY_THANKS_4, *itr); break;
+                }
+
+                (*itr)->GetMotionMaster()->Clear();
+                (*itr)->GetMotionMaster()->MovePoint(0, -2648.049f, 5274.573f, 1.691529f);
+            }
+        }
+        return false;
+    }
+};
+
+struct npc_captive_child : public CreatureScript
+{
+    npc_captive_child() : CreatureScript("npc_captive_child") {}
+
+    struct npc_captive_childAI : public ScriptedAI
+    {
+        npc_captive_childAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void MovementInform(uint32 uiMotionType, uint32 /*uiPointId*/) override
+        {
+            if (uiMotionType == POINT_MOTION_TYPE)
+            {
+                m_creature->ForcedDespawn();
+            }                    // we only have one waypoint
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_captive_childAI(pCreature);
+    }
+};
+
+/*#####
+## npc_isla_starmane
+##
+##  TODO: Verify SpellIDs, Research Timers, Finish Text?
+#####*/
+
+enum
+{
+    QUEST_ESCAPE_FROM_FIREWING_POINT_A  = 10051,
+    QUEST_ESCAPE_FROM_FIREWING_POINT_H  = 10052,
+
+    SAY_ISLA_PERIODIC_1                 = -1000629,
+    SAY_ISLA_PERIODIC_2                 = -1000630,
+    SAY_ISLA_PERIODIC_3                 = -1000631,
+    SAY_ISLA_START                      = -1000632,
+    SAY_ISLA_WAITING                    = -1000633,
+    SAY_ISLA_LEAVE_BUILDING             = -1000634,
+
+    GO_CAGE                             = 182794,
+
+    SPELL_ENTANGLING_ROOTS              = 33844,            // these spell IDs seem to deal not enough dmg, but are linked
+    SPELL_MOONFIRE                      = 15798,
+    SPELL_WRATH                         = 9739,
+    SPELL_TRAVELFORM                    = 32447             // guesswork
+};
+
+struct npc_isla_starmane : public CreatureScript
+{
+    npc_isla_starmane() : CreatureScript("npc_isla_starmane") {}
+
+    struct npc_isla_starmaneAI : public npc_escortAI
+    {
+        npc_isla_starmaneAI(Creature* pCreature) : npc_escortAI(pCreature)
+        {
+        }
+
+        uint32 m_uiPeriodicTalkTimer;
+        uint32 m_uiEntanglingRootsTimer;
+        uint32 m_uiMoonfireTimer;
+        uint32 m_uiWrathTimer;
+
+        void Reset() override
+        {
+            m_uiPeriodicTalkTimer = urand(20000, 40000);
+            m_uiEntanglingRootsTimer = 100;
+            m_uiMoonfireTimer = 1600;
+            m_uiWrathTimer = 2000;
+
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+            }
+        }
+
+        void JustStartedEscort() override
+        {
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
+            DoScriptText(SAY_ISLA_START, m_creature);
+            if (GameObject* pCage = GetClosestGameObjectWithEntry(m_creature, GO_CAGE, 2 * INTERACTION_DISTANCE))
+            {
+                pCage->Use(m_creature);
+            }
+        }
+
+        void WaypointStart(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 7:  DoScriptText(SAY_ISLA_LEAVE_BUILDING, m_creature); break;
+            case 68: DoCastSpellIfCan(m_creature, SPELL_TRAVELFORM);    break;
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 6:
+                DoScriptText(SAY_ISLA_WAITING, m_creature);
+                break;
+            case 61:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(pPlayer->GetTeam() == ALLIANCE ? QUEST_ESCAPE_FROM_FIREWING_POINT_A : QUEST_ESCAPE_FROM_FIREWING_POINT_H, m_creature);
+                }
+                break;
+            case 67:
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    m_creature->SetFacingToObject(pPlayer);
+                }
+                m_creature->HandleEmote(EMOTE_ONESHOT_WAVE);
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                if (m_uiPeriodicTalkTimer < uiDiff)
+                {
+                    m_uiPeriodicTalkTimer = urand(30000, 60000);
+                    switch (urand(0, 2))
+                    {
+                    case 0: DoScriptText(SAY_ISLA_PERIODIC_1, m_creature); break;
+                    case 1: DoScriptText(SAY_ISLA_PERIODIC_2, m_creature); break;
+                    case 2: DoScriptText(SAY_ISLA_PERIODIC_3, m_creature); break;
+                    }
+                }
+                else
+                {
+                    m_uiPeriodicTalkTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiEntanglingRootsTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_ENTANGLING_ROOTS) == CAST_OK)
+                {
+                    m_uiEntanglingRootsTimer = urand(8000, 16000);
+                }
+            }
+            else
+            {
+                m_uiEntanglingRootsTimer -= uiDiff;
+            }
+
+            if (m_uiMoonfireTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_MOONFIRE) == CAST_OK)
+                {
+                    m_uiMoonfireTimer = urand(6000, 12000);
+                }
+            }
+            else
+            {
+                m_uiMoonfireTimer -= uiDiff;
+            }
+
+            if (m_uiWrathTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature->getVictim(), SPELL_WRATH) == CAST_OK)
+                {
+                    m_uiWrathTimer = 2000;
+                }
+            }
+            else
+            {
+                m_uiWrathTimer -= uiDiff;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ESCAPE_FROM_FIREWING_POINT_A || pQuest->GetQuestId() == QUEST_ESCAPE_FROM_FIREWING_POINT_H)
+        {
+            if (npc_isla_starmaneAI* pEscortAI = dynamic_cast<npc_isla_starmaneAI*>(pCreature->AI()))
+            {
+                pCreature->SetFactionTemporary(pPlayer->GetTeam() == ALLIANCE ? FACTION_ESCORT_A_NEUTRAL_ACTIVE : FACTION_ESCORT_H_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_isla_starmaneAI(pCreature);
+    }
+};
+
+/*######
+## npc_skywing
+######*/
+
+enum
+{
+    SAY_SKYWING_START            = -1000797,
+    SAY_SKYWING_TREE_DOWN        = -1000798,
+    SAY_SKYWING_TREE_UP          = -1000799,
+    SAY_SKYWING_JUMP             = -1000800,
+    SAY_SKYWING_SUMMON           = -1000801,
+    SAY_SKYWING_END              = -1000802,
+
+    SPELL_FEATHERY_CYCLONE_BURST = 39166,           // triggered many times by server side spell - 39167 (channeled for 5 sec)
+    SPELL_RILAK_THE_REDEEMED     = 39179,
+
+    NPC_LUANGA_THE_IMPRISONER    = 18533,
+
+    QUEST_SKYWING                = 10898
+};
+
+static const float aLuangaSpawnCoords[3] = { -3507.203f, 4084.619f, 92.947f};
+
+struct npc_skywing : public CreatureScript
+{
+    npc_skywing() : CreatureScript("npc_skywing") {}
+
+    struct npc_skywingAI : public npc_escortAI
+    {
+        npc_skywingAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        uint32 m_uiCycloneTimer;
+        uint8 m_uiCycloneCounter;
+
+        void Reset() override
+        {
+            if (!HasEscortState(STATE_ESCORT_ESCORTING))
+            {
+                m_uiCycloneTimer = 0;
+                m_uiCycloneCounter = 0;
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 6:
+                DoScriptText(SAY_SKYWING_TREE_DOWN, m_creature);
+                break;
+            case 36:
+                DoScriptText(SAY_SKYWING_TREE_UP, m_creature);
+                break;
+            case 60:
+                DoScriptText(SAY_SKYWING_JUMP, m_creature);
+                m_creature->SetLevitate(true);
+                break;
+            case 61:
+                m_creature->SetLevitate(false);
+                break;
+            case 80:
+                DoScriptText(SAY_SKYWING_SUMMON, m_creature);
+                m_creature->SummonCreature(NPC_LUANGA_THE_IMPRISONER, aLuangaSpawnCoords[0], aLuangaSpawnCoords[1], aLuangaSpawnCoords[2], 0, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                break;
+            case 81:
+                // Start transformation
+                m_uiCycloneTimer = 100;
+                break;
+            case 82:
+                DoScriptText(SAY_SKYWING_END, m_creature);
+
+                if (Player* pPlayer = GetPlayerForEscort())
+                {
+                    pPlayer->GroupEventHappens(QUEST_SKYWING, m_creature);
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            pSummoned->AI()->AttackStart(m_creature);
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (m_uiCycloneTimer)
+            {
+                if (m_uiCycloneTimer <= uiDiff)
+                {
+                    if (DoCastSpellIfCan(m_creature, SPELL_FEATHERY_CYCLONE_BURST) == CAST_OK)
+                    {
+                        ++m_uiCycloneCounter;
+
+                        if (m_uiCycloneCounter == 30)
+                        {
+                            DoCastSpellIfCan(m_creature, SPELL_RILAK_THE_REDEEMED, CAST_TRIGGERED);
+                        }
+
+                        // Only cast this spell 50 times
+                        if (m_uiCycloneCounter == 50)
+                        {
+                            m_uiCycloneTimer = 0;
+                        }
+                        else
+                        {
+                            m_uiCycloneTimer = 100;
+                        }
+                    }
+                }
+                else
+                {
+                    m_uiCycloneTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_SKYWING)
+        {
+            if (npc_skywingAI* pEscortAI = dynamic_cast<npc_skywingAI*>(pCreature->AI()))
+            {
+                pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_RESTORE_RESPAWN);
+                DoScriptText(SAY_SKYWING_START, pCreature);
+
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_skywingAI(pCreature);
+    }
+};
+
+/*######
+## npc_cenarion_sparrowhawk
+######*/
+
+enum
+{
+    EMOTE_FOLLOW                = -1000963,
+    EMOTE_SURVEY                = -1000964,
+    EMOTE_LOCATE                = -1000965,
+
+    NPC_SKETTIS_RAVEN_STONE     = 22986,
+    GO_RAVEN_STONE              = 185541,
+};
+
+struct npc_cenarion_sparrowhawk : public CreatureScript
+{
+    npc_cenarion_sparrowhawk() : CreatureScript("npc_cenarion_sparrowhawk") {}
+
+    struct npc_cenarion_sparrowhawkAI : public ScriptedAI
+    {
+        npc_cenarion_sparrowhawkAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiSurveyTimer;
+        bool m_bFirstTimer;
+
+        ObjectGuid m_currentStone;
+
+        void Reset() override
+        {
+            m_uiSurveyTimer = 3000;
+            m_bFirstTimer = true;
+            DoScriptText(EMOTE_FOLLOW, m_creature);
+        }
+
+        void MovementInform(uint32 uiMoveType, uint32 uiPointId) override
+        {
+            if (uiMoveType != POINT_MOTION_TYPE || !uiPointId)
+                return;
+
+            // despawn the trigger and spawn the nearby stone
+            if (Creature* pStoneTrigger = m_creature->GetMap()->GetCreature(m_currentStone))
+                pStoneTrigger->ForcedDespawn();
+
+            if (GameObject* pStone = GetClosestGameObjectWithEntry(m_creature, GO_RAVEN_STONE, 5.0f))
+            {
+                pStone->SetRespawnTime(pStone->GetRespawnDelay());
+                pStone->Refresh();
+            }
+            DoScriptText(EMOTE_LOCATE, m_creature);
+
+            // check if we still have other stones in range
+            m_uiSurveyTimer = 5000;
+        }
+
+        void DoFindNearbyStones()
+        {
+            float fX, fY, fZ;
+            if (Creature* pStoneTrigger = GetClosestCreatureWithEntry(m_creature, NPC_SKETTIS_RAVEN_STONE, 80.0f))
+            {
+                m_currentStone = pStoneTrigger->GetObjectGuid();
+                pStoneTrigger->GetContactPoint(m_creature, fX, fY, fZ);
+
+                m_creature->SetWalk(false);
+                m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+            }
+            else
+                m_creature->ForcedDespawn(10000);
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiSurveyTimer)
+            {
+                if (m_uiSurveyTimer <= uiDiff)
+                {
+                    if (m_bFirstTimer)
+                    {
+                        DoScriptText(EMOTE_SURVEY, m_creature);
+                        m_bFirstTimer = false;
+                    }
+
+                    DoFindNearbyStones();
+                    m_uiSurveyTimer = 0;
+                }
+                else
+                    m_uiSurveyTimer -= uiDiff;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_cenarion_sparrowhawkAI(pCreature);
+    }
+};
+
+/*#####
+## npc_skyguard_prisoner
+#####*/
+
+enum
+{
+    SAY_ESCORT_START            = -1001006,
+    SAY_AMBUSH_END              = -1001007,
+    SAY_ESCORT_COMPLETE         = -1001008,
+    SAY_AMBUSH_1                = -1001009,
+    SAY_AMBUSH_2                = -1001010,
+    SAY_AMBUSH_3                = -1001011,
+    SAY_AMBUSH_4                = -1001012,
+
+    NPC_WING_GUARD              = 21644,
+    GO_PRISONER_CAGE            = 185952,
+
+    QUEST_ID_ESCAPE_SKETTIS     = 11085,
+};
+
+struct npc_skyguard_prisoner : public CreatureScript
+{
+    npc_skyguard_prisoner() : CreatureScript("npc_skyguard_prisoner") {}
+
+    struct npc_skyguard_prisonerAI : public npc_escortAI
+    {
+        npc_skyguard_prisonerAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                m_creature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+                Start(false, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue));
+
+                // ToDo: add additional WP when DB will support it
+                if (m_creature->GetPositionZ() < 310.0f)
+                {
+                    SetEscortPaused(true);
+                    //SetCurrentWaypoint(WP_ID_SPAWN_1);
+                    //SetEscortPaused(false);
+                    script_error_log("NPC entry %u, location %f, %f, %f does not have waypoints implemented for current spawn location. Please contact customer support!", m_creature->GetEntry(), m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+                }
+                else if (m_creature->GetPositionZ() < 330.0f)
+                {
+                    SetEscortPaused(true);
+                    //SetCurrentWaypoint(WP_ID_SPAWN_2);
+                    //SetEscortPaused(false);
+                    script_error_log("NPC entry %u, location %f, %f, %f does not have waypoints implemented for current spawn location. Please contact customer support!", m_creature->GetEntry(), m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
+                }
+                // else just use standard WP
+
+                // open cage
+                if (GameObject* pCage = GetClosestGameObjectWithEntry(m_creature, GO_PRISONER_CAGE, 10.0f))
+                    pCage->Use(m_creature);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_WING_GUARD)
+            {
+                pSummoned->AI()->AttackStart(m_creature);
+
+                switch (urand(0, 3))
+                {
+                case 0: DoScriptText(SAY_AMBUSH_1, pSummoned); break;
+                case 1: DoScriptText(SAY_AMBUSH_2, pSummoned); break;
+                case 2: DoScriptText(SAY_AMBUSH_3, pSummoned); break;
+                case 3: DoScriptText(SAY_AMBUSH_4, pSummoned); break;
+                }
+            }
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 0:
+                DoScriptText(SAY_ESCORT_START, m_creature);
+                break;
+            case 13:
+                m_creature->SummonCreature(NPC_WING_GUARD, -4179.043f, 3081.007f, 328.28f, 4.51f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_WING_GUARD, -4181.610f, 3081.289f, 328.32f, 4.52f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                break;
+            case 14:
+                DoScriptText(SAY_AMBUSH_END, m_creature);
+                break;
+            case 18:
+                DoScriptText(SAY_ESCORT_COMPLETE, m_creature);
+                SetRun();
+
+                if (Player* pPlayer = GetPlayerForEscort())
+                    pPlayer->GroupEventHappens(QUEST_ID_ESCAPE_SKETTIS, m_creature);
+                break;
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_skyguard_prisonerAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_ESCAPE_SKETTIS)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_terokkar_forest()
+{
+    Script* s;
+
+    s = new mob_unkor_the_ruthless();
+    s->RegisterSelf();
+    s = new mob_netherweb_victim();
+    s->RegisterSelf();
+    s = new npc_akuno();
+    s->RegisterSelf();
+    s = new npc_hungry_nether_ray();
+    s->RegisterSelf();
+    s = new npc_letoll();
+    s->RegisterSelf();
+    s = new npc_mana_bomb_exp_trigger();
+    s->RegisterSelf();
+    s = new go_mana_bomb();
+    s->RegisterSelf();
+    s = new go_veil_skith_cage();
+    s->RegisterSelf();
+    s = new npc_captive_child();
+    s->RegisterSelf();
+    s = new npc_isla_starmane();
+    s->RegisterSelf();
+    s = new npc_skywing();
+    s->RegisterSelf();
+    s = new npc_cenarion_sparrowhawk();
+    s->RegisterSelf();
+    s = new npc_skyguard_prisoner();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_unkor_the_ruthless";
+    //pNewScript->GetAI = &GetAI_mob_unkor_the_ruthless;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "mob_netherweb_victim";
+    //pNewScript->GetAI = &GetAI_mob_netherweb_victim;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_akuno";
+    //pNewScript->GetAI = &GetAI_npc_akuno;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_akuno;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_hungry_nether_ray";
+    //pNewScript->GetAI = &GetAI_npc_hungry_nether_ray;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_letoll";
+    //pNewScript->GetAI = &GetAI_npc_letoll;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_letoll;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_mana_bomb_exp_trigger";
+    //pNewScript->GetAI = &GetAI_npc_mana_bomb_exp_trigger;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_mana_bomb";
+    //pNewScript->pGOUse = &GOUse_go_mana_bomb;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_veil_skith_cage";
+    //pNewScript->pGOUse = &GOUse_go_veil_skith_cage;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_captive_child";
+    //pNewScript->GetAI = &GetAI_npc_captive_child;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_isla_starmane";
+    //pNewScript->GetAI = &GetAI_npc_isla_starmane;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_isla_starmane;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_skywing";
+    //pNewScript->GetAI = &GetAI_npc_skywing;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_skywing;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_cenarion_sparrowhawk";
+    //pNewScript->GetAI = &GetAI_npc_cenarion_sparrowhawk;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_skyguard_prisoner";
+    //pNewScript->GetAI = &GetAI_npc_skyguard_prisoner;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_skyguard_prisoner;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/outland/zangarmarsh.cpp b/src/modules/SD3/scripts/outland/zangarmarsh.cpp
new file mode 100644
index 000000000..744a2e47d
--- /dev/null
+++ b/src/modules/SD3/scripts/outland/zangarmarsh.cpp
@@ -0,0 +1,398 @@
+/**
+ * ScriptDev2 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/* ScriptData
+SDName: Zangarmarsh
+SD%Complete: 100
+SDComment: Quest support: 9729, 9752, 9785, 10009.
+SDCategory: Zangarmarsh
+EndScriptData */
+
+/* ContentData
+npc_cooshcoosh
+npc_kayra_longmane
+event_stormcrow
+npc_fhwoor
+EndContentData */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+
+/*######
+## npc_cooshcoosh
+######*/
+
+enum
+{
+    SPELL_LIGHTNING_BOLT    = 9532,
+};
+
+struct npc_cooshcoosh : public CreatureScript
+{
+    npc_cooshcoosh() : CreatureScript("npc_cooshcoosh") {}
+
+    struct npc_cooshcooshAI : public ScriptedAI
+    {
+        npc_cooshcooshAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_uiNormFaction = pCreature->getFaction();
+        }
+
+        uint32 m_uiNormFaction;
+        uint32 m_uiLightningBolt_Timer;
+
+        void Reset() override
+        {
+            m_uiLightningBolt_Timer = 2000;
+
+            if (m_creature->getFaction() != m_uiNormFaction)
+            {
+                m_creature->setFaction(m_uiNormFaction);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_uiLightningBolt_Timer < uiDiff)
+            {
+                DoCastSpellIfCan(m_creature->getVictim(), SPELL_LIGHTNING_BOLT);
+                m_uiLightningBolt_Timer = 5000;
+            }
+            else { m_uiLightningBolt_Timer -= uiDiff; }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_cooshcooshAI(pCreature);
+    }
+};
+
+/*#####
+## npc_kayra_longmane
+#####*/
+
+enum
+{
+    SAY_START           = -1000343,
+    SAY_AMBUSH1         = -1000344,
+    SAY_PROGRESS        = -1000345,
+    SAY_AMBUSH2         = -1000346,
+    SAY_END             = -1000347,
+
+    QUEST_ESCAPE_FROM   = 9752,
+    NPC_SLAVEBINDER     = 18042
+};
+
+struct npc_kayra_longmane : public CreatureScript
+{
+    npc_kayra_longmane() : CreatureScript("npc_kayra_longmane") {}
+
+    struct npc_kayra_longmaneAI : public npc_escortAI
+    {
+        npc_kayra_longmaneAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        void WaypointReached(uint32 i) override
+        {
+            Player* pPlayer = GetPlayerForEscort();
+
+            if (!pPlayer)
+            {
+                return;
+            }
+
+            switch (i)
+            {
+            case 4:
+                DoScriptText(SAY_AMBUSH1, m_creature, pPlayer);
+                DoSpawnCreature(NPC_SLAVEBINDER, -10.0f, -5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                DoSpawnCreature(NPC_SLAVEBINDER, -8.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                break;
+            case 5:
+                DoScriptText(SAY_PROGRESS, m_creature, pPlayer);
+                SetRun();
+                break;
+            case 16:
+                DoScriptText(SAY_AMBUSH2, m_creature, pPlayer);
+                DoSpawnCreature(NPC_SLAVEBINDER, -10.0f, -5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                DoSpawnCreature(NPC_SLAVEBINDER, -8.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+                break;
+            case 17:
+                DoScriptText(SAY_END, m_creature, pPlayer);
+                break;
+            case 25:
+                pPlayer->GroupEventHappens(QUEST_ESCAPE_FROM, m_creature);
+                break;
+            }
+        }
+    };
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ESCAPE_FROM)
+        {
+            DoScriptText(SAY_START, pCreature, pPlayer);
+
+            if (npc_kayra_longmaneAI* pEscortAI = dynamic_cast<npc_kayra_longmaneAI*>(pCreature->AI()))
+            {
+                pEscortAI->Start(false, pPlayer, pQuest);
+            }
+        }
+        return true;
+    }
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_kayra_longmaneAI(pCreature);
+    }
+};
+
+/*######
+## event_stormcrow
+######*/
+
+enum
+{
+    QUEST_AS_THE_CROW_FLIES = 9718,
+    EVENT_ID_STORMCROW      = 11225,
+};
+
+struct event_taxi_stormcrow : public MapEventScript
+{
+    event_taxi_stormcrow() : MapEventScript("event_taxi_stormcrow") {}
+
+    bool OnReceived(uint32 uiEventId, Object* pSource, Object* /*pTarget*/, bool bIsStart) override
+    {
+        if (uiEventId == EVENT_ID_STORMCROW && !bIsStart && pSource->GetTypeId() == TYPEID_PLAYER)
+        {
+            ((Player*)pSource)->SetDisplayId(((Player*)pSource)->GetNativeDisplayId());
+            ((Player*)pSource)->AreaExploredOrEventHappens(QUEST_AS_THE_CROW_FLIES);
+            return true;
+        }
+        return false;
+    }
+};
+
+/*#####
+## npc_fhwoor
+#####*/
+
+enum
+{
+    SAY_ESCORT_START            = -1000995,
+    SAY_PREPARE                 = -1000996,
+    SAY_CAMP_ENTER              = -1000997,
+    SAY_AMBUSH                  = -1000998,
+    SAY_AMBUSH_CLEARED          = -1000999,
+    SAY_ESCORT_COMPLETE         = -1001000,
+
+    SPELL_STOMP                 = 31277,
+    SPELL_THUNDERSHOCK          = 31964,
+
+    NPC_ENCHANTRESS             = 18088,
+    NPC_SLAVEDRIVER             = 18089,
+    NPC_SSSLITH                 = 18154,
+
+    GO_ARK_OF_SSSLITH           = 182082,
+
+    QUEST_ID_FHWOOR_SMASH       = 9729,
+};
+
+struct npc_fhwoor : public CreatureScript
+{
+    npc_fhwoor() : CreatureScript("npc_fhwoor") {}
+
+    struct npc_fhwoorAI : public npc_escortAI
+    {
+        npc_fhwoorAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        uint32 m_uiStompTimer;
+        uint32 m_uiShockTimer;
+
+        bool m_bIsAmbush;
+
+        void Reset() override
+        {
+            m_uiStompTimer = urand(3000, 7000);
+            m_uiShockTimer = urand(7000, 11000);
+            m_bIsAmbush = false;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* /*pSender*/, Unit* pInvoker, uint32 uiMiscValue) override
+        {
+            if (eventType == AI_EVENT_START_ESCORT && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoScriptText(SAY_ESCORT_START, m_creature, pInvoker);
+                m_creature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_ACTIVE, TEMPFACTION_RESTORE_RESPAWN);
+                Start(true, (Player*)pInvoker, GetQuestTemplateStore(uiMiscValue), true);
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // move summoned towards the creature
+            if (m_bIsAmbush)
+            {
+                float fX, fY, fZ;
+                m_creature->GetContactPoint(pSummoned, fX, fY, fZ);
+                pSummoned->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+            }
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            // resume escort
+            if (pSummoned->GetEntry() == NPC_SSSLITH)
+                SetEscortPaused(false);
+        }
+
+        void WaypointReached(uint32 uiPointId) override
+        {
+            switch (uiPointId)
+            {
+            case 24:
+                DoScriptText(SAY_PREPARE, m_creature);
+                break;
+            case 25:
+                DoScriptText(SAY_CAMP_ENTER, m_creature);
+                SetRun(false);
+                break;
+            case 46:
+                // despawn the Ark
+                if (GameObject* pArk = GetClosestGameObjectWithEntry(m_creature, GO_ARK_OF_SSSLITH, 10.0f))
+                    pArk->SetLootState(GO_JUST_DEACTIVATED);
+                // spawn npcs
+                m_creature->SummonCreature(NPC_ENCHANTRESS, 526.12f, 8136.96f, 21.64f, 0.57f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_SLAVEDRIVER, 524.09f, 8138.67f, 21.49f, 0.58f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_SLAVEDRIVER, 526.93f, 8133.88f, 21.56f, 0.58f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                break;
+            case 70:
+                DoScriptText(SAY_AMBUSH, m_creature);
+                // spawn npcs
+                m_bIsAmbush = true;
+                m_creature->SummonCreature(NPC_SSSLITH, 162.91f, 8192.08f, 22.55f, 5.98f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_ENCHANTRESS, 162.34f, 8193.99f, 22.85f, 5.98f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                m_creature->SummonCreature(NPC_SLAVEDRIVER, 163.07f, 8187.04f, 22.71f, 0.10f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, 60000);
+                SetEscortPaused(true);
+                break;
+            case 71:
+                DoScriptText(SAY_AMBUSH_CLEARED, m_creature);
+                SetRun();
+                break;
+            case 92:
+                SetRun(false);
+                break;
+            case 93:
+                DoScriptText(SAY_ESCORT_COMPLETE, m_creature);
+                if (Player* pPlayer = GetPlayerForEscort())
+                    pPlayer->GroupEventHappens(QUEST_ID_FHWOOR_SMASH, m_creature);
+                break;
+            }
+        }
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+                return;
+
+            if (m_uiStompTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_STOMP) == CAST_OK)
+                    m_uiStompTimer = urand(9000, 15000);
+            }
+            else
+                m_uiStompTimer -= uiDiff;
+
+            if (m_uiShockTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_THUNDERSHOCK) == CAST_OK)
+                    m_uiShockTimer = urand(15000, 20000);
+            }
+            else
+                m_uiShockTimer -= uiDiff;
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_fhwoorAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_ID_FHWOOR_SMASH)
+        {
+            pCreature->AI()->SendAIEvent(AI_EVENT_START_ESCORT, pPlayer, pCreature, pQuest->GetQuestId());
+            return true;
+        }
+
+        return false;
+    }
+};
+
+void AddSC_zangarmarsh()
+{
+    Script* s;
+
+    s = new npc_cooshcoosh();
+    s->RegisterSelf();
+    s = new npc_kayra_longmane();
+    s->RegisterSelf();
+    s = new event_taxi_stormcrow();
+    s->RegisterSelf();
+    s = new npc_fhwoor();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_cooshcoosh";
+    //pNewScript->GetAI = &GetAI_npc_cooshcoosh;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_kayra_longmane";
+    //pNewScript->GetAI = &GetAI_npc_kayra_longmane;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_kayra_longmane;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "event_taxi_stormcrow";
+    //pNewScript->pProcessEventId = &ProcessEventId_event_taxi_stormcrow;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_fhwoor";
+    //pNewScript->GetAI = &GetAI_npc_fhwoor;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_fhwoor;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/world/areatrigger_scripts.cpp b/src/modules/SD3/scripts/world/areatrigger_scripts.cpp
new file mode 100644
index 000000000..a55a47182
--- /dev/null
+++ b/src/modules/SD3/scripts/world/areatrigger_scripts.cpp
@@ -0,0 +1,600 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Areatrigger_Scripts
+ * SD%Complete: 100
+ * SDComment:   Quest support: 4291, 6681, 7632, 10589/10604
+ * SDCategory:  Areatrigger
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+#if defined (WOTLK)    
+ * at_aldurthar_gate                5284, 5285, 5286, 5287
+#endif
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+ * at_coilfang_waterfall            4591
+ * at_legion_teleporter             4560 Teleporter TO Invasion Point: Cataclysm
+#endif
+ * at_ravenholdt
+#if defined (WOTLK)    
+ * at_spearborn_encampment          5030
+ * at_warsong_farms
+ * at_stormwright_shelf             5108
+#endif
+ * at_childrens_week_spot           3546, 3547, 3548, 3549, 3550, 3552
+ * at_scent_larkorwi                1726, 1727, 1728, 1729, 1730, 1731, 1732, 1733, 1734, 1735, 1736, 1737, 1738, 1739, 1740
+ * at_murkdeep                      1966
+#if defined (WOTLK)    
+ * at_hot_on_the_trail              5710, 5711, 5712, 5714, 5715, 5716
+ * at_ancient_leaf                  3587
+#endif
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "world_map_scripts.h"
+
+static uint32 TriggerOrphanSpell[6][3] =
+{
+    {3546, 14305, 65056},                                   // The Bough of the Eternals
+    {3547, 14444, 65059},                                   // Lordaeron Throne Room
+    {3548, 14305, 65055},                                   // The Stonewrought Dam
+    {3549, 14444, 65058},                                   // Gateway to the Frontier
+    {3550, 14444, 65057},                                   // Down at the Docks
+    {3552, 14305, 65054}                                    // Spooky Lighthouse
+};
+
+struct at_childrens_week_spot : public AreaTriggerScript
+{
+    at_childrens_week_spot() : AreaTriggerScript("at_childrens_week_spot") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        for (uint8 i = 0; i < 6; ++i)
+        {
+            if (pAt->id == TriggerOrphanSpell[i][0] &&
+                pPlayer->GetMiniPet() && pPlayer->GetMiniPet()->GetEntry() == TriggerOrphanSpell[i][1])
+            {
+                pPlayer->CastSpell(pPlayer, TriggerOrphanSpell[i][2], true);
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+#if defined (WOTLK) || defined(CATA)
+/*######
+## Quest 13315/13351
+######*/
+
+enum
+{
+    TRIGGER_SOUTH               = 5284,
+    TRIGGER_CENTRAL             = 5285,
+    TRIGGER_NORTH               = 5286,
+    TRIGGER_NORTHWEST           = 5287,
+
+    NPC_SOUTH_GATE              = 32195,
+    NPC_CENTRAL_GATE            = 32196,
+    NPC_NORTH_GATE              = 32197,
+    NPC_NORTHWEST_GATE          = 32199
+};
+
+struct at_aldurthar_gate : public AreaTriggerScript
+{
+    at_aldurthar_gate() : AreaTriggerScript("at_aldurthar_gate") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        switch (pAt->id)
+        {
+            case TRIGGER_SOUTH:     pPlayer->KilledMonsterCredit(NPC_SOUTH_GATE);     break;
+            case TRIGGER_CENTRAL:   pPlayer->KilledMonsterCredit(NPC_CENTRAL_GATE);   break;
+            case TRIGGER_NORTH:     pPlayer->KilledMonsterCredit(NPC_NORTH_GATE);     break;
+            case TRIGGER_NORTHWEST: pPlayer->KilledMonsterCredit(NPC_NORTHWEST_GATE); break;
+        }
+        return false;
+    }
+};
+#endif
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+/*######
+## at_coilfang_waterfall
+######*/
+
+enum
+{
+    GO_COILFANG_WATERFALL   = 184212
+};
+
+struct at_coilfang_waterfall : public AreaTriggerScript
+{
+    at_coilfang_waterfall() : AreaTriggerScript("at_coilfang_waterfall") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*pAt*/) override
+    {
+        if (GameObject* pGo = GetClosestGameObjectWithEntry(pPlayer, GO_COILFANG_WATERFALL, 35.0f))
+        {
+            if (pGo->getLootState() == GO_READY)
+            {
+                pGo->UseDoorOrButton();
+            }
+        }
+        return false;
+    }
+};
+
+/*######
+## at_legion_teleporter
+######*/
+
+enum
+{
+    SPELL_TELE_A_TO         = 37387,
+    QUEST_GAINING_ACCESS_A  = 10589,
+
+    SPELL_TELE_H_TO         = 37389,
+    QUEST_GAINING_ACCESS_H  = 10604
+};
+
+struct at_legion_teleporter : public AreaTriggerScript
+{
+    at_legion_teleporter() : AreaTriggerScript("at_legion_teleporter") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*pAt*/) override
+    {
+        if (pPlayer->IsAlive() && !pPlayer->IsInCombat())
+        {
+            if (pPlayer->GetTeam() == ALLIANCE && pPlayer->GetQuestRewardStatus(QUEST_GAINING_ACCESS_A))
+            {
+                pPlayer->CastSpell(pPlayer, SPELL_TELE_A_TO, false);
+                return true;
+            }
+
+            if (pPlayer->GetTeam() == HORDE && pPlayer->GetQuestRewardStatus(QUEST_GAINING_ACCESS_H))
+            {
+                pPlayer->CastSpell(pPlayer, SPELL_TELE_H_TO, false);
+                return true;
+            }
+            return false;
+        }
+        return false;
+    }
+};
+#endif
+
+/*######
+## at_ravenholdt
+######*/
+
+enum
+{
+    QUEST_MANOR_RAVENHOLDT  = 6681,
+    NPC_RAVENHOLDT          = 13936
+};
+
+struct at_ravenholdt : public AreaTriggerScript
+{
+    at_ravenholdt() : AreaTriggerScript("at_ravenholdt") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*pAt*/) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_MANOR_RAVENHOLDT) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->KilledMonsterCredit(NPC_RAVENHOLDT);
+        }
+
+        return false;
+    }
+};
+
+#if defined (WOTLK) || defined (CATA)
+/*######
+## at_spearborn_encampment
+######*/
+
+enum
+{
+    QUEST_MISTWHISPER_TREASURE          = 12575,
+    NPC_TARTEK                          = 28105,
+};
+
+// 5030
+struct at_spearborn_encampment : public AreaTriggerScript
+{
+    at_spearborn_encampment() : AreaTriggerScript("at_spearborn_encampment") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+
+    {
+        if (pPlayer->GetQuestStatus(QUEST_MISTWHISPER_TREASURE) == QUEST_STATUS_INCOMPLETE &&
+                pPlayer->GetReqKillOrCastCurrentCount(QUEST_MISTWHISPER_TREASURE, NPC_TARTEK) == 0)
+        {
+            // can only spawn one at a time, it's not a too good solution
+            if (GetClosestCreatureWithEntry(pPlayer, NPC_TARTEK, 50.0f))
+                return false;
+
+            pPlayer->SummonCreature(NPC_TARTEK, pAt->x, pAt->y, pAt->z, 0.0f, TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN, MINUTE * IN_MILLISECONDS);
+        }
+
+        return false;
+    }
+};
+
+/*######
+## at_warsong_farms
+######*/
+
+enum
+{
+    QUEST_THE_WARSONG_FARMS     = 11686,
+    NPC_CREDIT_SLAUGHTERHOUSE   = 25672,
+    NPC_CREDIT_GRAINERY         = 25669,
+    NPC_CREDIT_TORP_FARM        = 25671,
+
+    AT_SLAUGHTERHOUSE           = 4873,
+    AT_GRAINERY                 = 4871,
+    AT_TORP_FARM                = 4872
+};
+
+struct at_warsong_farms : public AreaTriggerScript
+{
+    at_warsong_farms() : AreaTriggerScript("at_warsong_farms") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (!pPlayer->IsDead() && pPlayer->GetQuestStatus(QUEST_THE_WARSONG_FARMS) == QUEST_STATUS_INCOMPLETE)
+        {
+            switch (pAt->id)
+            {
+                case AT_SLAUGHTERHOUSE: pPlayer->KilledMonsterCredit(NPC_CREDIT_SLAUGHTERHOUSE); break;
+                case AT_GRAINERY:       pPlayer->KilledMonsterCredit(NPC_CREDIT_GRAINERY);       break;
+                case AT_TORP_FARM:      pPlayer->KilledMonsterCredit(NPC_CREDIT_TORP_FARM);      break;
+            }
+        }
+
+        return false;
+    }
+};
+
+/*######
+## Quest 12548
+######*/
+
+enum
+{
+    SPELL_SHOLOZAR_TO_UNGORO_TELEPORT = 52056,
+    SPELL_UNGORO_TO_SHOLOZAR_TELEPORT = 52057,
+    AT_WAYGATE_SHOLOZAR               = 5046,
+    AT_WAYGATE_UNGORO                 = 5047,
+    QUEST_THE_MARKERS_OVERLOOK        = 12613,
+    QUEST_THE_MARKERS_PERCH           = 12559
+};
+
+struct at_waygate : public AreaTriggerScript
+{
+    at_waygate() : AreaTriggerScript("at_waygate") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (!pPlayer->IsDead() && pPlayer->GetQuestStatus(QUEST_THE_MARKERS_OVERLOOK) == QUEST_STATUS_COMPLETE && pPlayer->GetQuestStatus(QUEST_THE_MARKERS_PERCH) == QUEST_STATUS_COMPLETE)
+        {
+            switch (pAt->id)
+            {
+                case AT_WAYGATE_SHOLOZAR: pPlayer->CastSpell(pPlayer, SPELL_SHOLOZAR_TO_UNGORO_TELEPORT, false); break;
+                case AT_WAYGATE_UNGORO: pPlayer->CastSpell(pPlayer, SPELL_UNGORO_TO_SHOLOZAR_TELEPORT, false); break;
+            }
+        }
+
+        return false;
+    }
+};
+
+
+/*######
+## Quest 12741
+######*/
+
+enum
+{
+    QUEST_STRENGTH_OF_THE_TEMPEST            = 12741,
+    SPELL_CREATE_TRUE_POWER_OF_THE_TEMPEST   = 53067
+};
+
+struct at_stormwright_shelf : public AreaTriggerScript
+{
+    at_stormwright_shelf() : AreaTriggerScript("at_stormwright_shelf") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*pAt*/) override
+    {
+        if (!pPlayer->IsDead() && pPlayer->GetQuestStatus(QUEST_STRENGTH_OF_THE_TEMPEST) == QUEST_STATUS_INCOMPLETE)
+        {
+            pPlayer->CastSpell(pPlayer, SPELL_CREATE_TRUE_POWER_OF_THE_TEMPEST, false);
+        }
+
+        return false;
+    }
+};
+#endif
+
+/*######
+## at_scent_larkorwi
+######*/
+
+enum
+{
+    QUEST_SCENT_OF_LARKORWI     = 4291,
+    NPC_LARKORWI_MATE           = 9683
+};
+
+struct at_scent_larkorwi : public AreaTriggerScript
+{
+    at_scent_larkorwi() : AreaTriggerScript("at_scent_larkorwi") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (pPlayer->IsAlive() && !pPlayer->isGameMaster() && pPlayer->GetQuestStatus(QUEST_SCENT_OF_LARKORWI) == QUEST_STATUS_INCOMPLETE)
+        {
+            if (!GetClosestCreatureWithEntry(pPlayer, NPC_LARKORWI_MATE, 25.0f, false, false))
+            {
+                pPlayer->SummonCreature(NPC_LARKORWI_MATE, pAt->x, pAt->y, pAt->z, 3.3f, TEMPSUMMON_TIMED_OOC_DESPAWN, 2 * MINUTE * IN_MILLISECONDS);
+            }
+        }
+
+        return false;
+    }
+};
+
+/*######
+## at_murkdeep
+######*/
+
+struct at_murkdeep : public AreaTriggerScript
+{
+    at_murkdeep() : AreaTriggerScript("at_murkdeep") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* /*pAt*/) override
+    {
+        // Handle Murkdeep event start
+        // The area trigger summons 3 Greymist Coastrunners; The rest of the event is handled by world map scripts
+        if (pPlayer->IsAlive() && !pPlayer->isGameMaster() && pPlayer->GetQuestStatus(QUEST_WANTED_MURKDEEP) == QUEST_STATUS_INCOMPLETE)
+        {
+            ScriptedMap* pScriptedMap = (ScriptedMap*)pPlayer->GetInstanceData();
+            if (!pScriptedMap)
+            {
+                return false;
+            }
+
+            // If Murkdeep is already spawned, skip the rest
+            if (pScriptedMap->GetSingleCreatureFromStorage(NPC_MURKDEEP, true))
+            {
+                return true;
+            }
+
+            // Check if there are already coastrunners (dead or alive) around the area
+            if (GetClosestCreatureWithEntry(pPlayer, NPC_GREYMIST_COASTRUNNNER, 60.0f, false, false))
+            {
+                return true;
+            }
+
+            float fX, fY, fZ;
+            for (uint8 i = 0; i < 3; ++i)
+            {
+                // Spawn locations are defined in World Maps Scripts.h
+                pPlayer->GetRandomPoint(aSpawnLocations[POS_IDX_MURKDEEP_SPAWN][0], aSpawnLocations[POS_IDX_MURKDEEP_SPAWN][1], aSpawnLocations[POS_IDX_MURKDEEP_SPAWN][2], 5.0f, fX, fY, fZ);
+
+                if (Creature* pTemp = pPlayer->SummonCreature(NPC_GREYMIST_COASTRUNNNER, fX, fY, fZ, aSpawnLocations[POS_IDX_MURKDEEP_SPAWN][3], TEMPSUMMON_DEAD_DESPAWN, 0))
+                {
+                    pTemp->SetWalk(false);
+                    pTemp->GetRandomPoint(aSpawnLocations[POS_IDX_MURKDEEP_MOVE][0], aSpawnLocations[POS_IDX_MURKDEEP_MOVE][1], aSpawnLocations[POS_IDX_MURKDEEP_MOVE][2], 5.0f, fX, fY, fZ);
+                    pTemp->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                }
+            }
+        }
+
+        return false;
+    }
+};
+
+#if defined (WOTLK) || defined (CATA)
+/*######
+## at_hot_on_the_trail
+######*/
+
+struct HotOnTrailData
+{
+    uint32 uiAtEntry, uiQuestEntry, uiCreditEntry, uiSpellEntry;
+};
+
+static const HotOnTrailData aHotOnTrailValues[6] =
+{
+    {5710, 24849, 38340, 71713},                    // Stormwind Bank
+    {5711, 24849, 38341, 71745},                    // Stormwind Auction House
+    {5712, 24849, 38342, 71752},                    // Stormwind Barber Shop
+    {5714, 24851, 38341, 71760},                    // Orgrimmar Auction House
+    {5715, 24851, 38340, 71759},                    // Orgrimmar Bank
+    {5716, 24851, 38342, 71758},                    // Orgrimmar Barber Shop
+};
+
+struct at_hot_on_the_trail : public AreaTriggerScript
+{
+    at_hot_on_the_trail() : AreaTriggerScript("at_hot_on_the_trail") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (pPlayer->isGameMaster() || !pPlayer->IsAlive())
+            return false;
+
+        for (uint8 i = 0; i < 6; ++i)
+        {
+            if (pAt->id == aHotOnTrailValues[i].uiAtEntry)
+            {
+                if (pPlayer->GetQuestStatus(aHotOnTrailValues[i].uiQuestEntry) == QUEST_STATUS_INCOMPLETE &&
+                    pPlayer->GetReqKillOrCastCurrentCount(aHotOnTrailValues[i].uiQuestEntry, aHotOnTrailValues[i].uiCreditEntry) == 0)
+                {
+                    pPlayer->CastSpell(pPlayer, aHotOnTrailValues[i].uiSpellEntry, true);
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+};
+
+/*######
+## at_ancient_leaf
+######*/
+
+enum
+{
+    QUEST_ANCIENT_LEAF              = 7632,
+
+    NPC_VARTRUS                     = 14524,
+    NPC_STOMA                       = 14525,
+    NPC_HASTAT                      = 14526,
+
+    MAX_ANCIENTS                    = 3,
+};
+
+struct AncientSpawn
+{
+    uint32 uiEntry;
+    float fX, fY, fZ, fO;
+};
+
+static const AncientSpawn afSpawnLocations[MAX_ANCIENTS] =
+{
+    { NPC_VARTRUS, 6204.051758f, -1172.575684f, 370.079224f, 0.86052f },    // Vartus the Ancient
+    { NPC_STOMA,   6246.953613f, -1155.985718f, 366.182953f, 2.90269f },    // Stoma the Ancient
+    { NPC_HASTAT,  6193.449219f, -1137.834106f, 366.260529f, 5.77332f },    // Hastat the Ancient
+};
+
+struct at_ancient_leaf : public AreaTriggerScript
+{
+    at_ancient_leaf() : AreaTriggerScript("at_ancient_leaf") {}
+
+    bool OnTrigger(Player* pPlayer, AreaTriggerEntry const* pAt) override
+    {
+        if (pPlayer->isGameMaster() || !pPlayer->IsAlive())
+            return false;
+
+        // Handle Call Ancients event start - The area trigger summons 3 ancients
+        if (pPlayer->GetQuestStatus(QUEST_ANCIENT_LEAF) == QUEST_STATUS_COMPLETE)
+        {
+            // If ancients are already spawned, skip the rest
+            if (GetClosestCreatureWithEntry(pPlayer, NPC_VARTRUS, 50.0f) || GetClosestCreatureWithEntry(pPlayer, NPC_STOMA, 50.0f) || GetClosestCreatureWithEntry(pPlayer, NPC_HASTAT, 50.0f))
+                return true;
+
+            for (uint8 i = 0; i < MAX_ANCIENTS; ++i)
+                pPlayer->SummonCreature(afSpawnLocations[i].uiEntry, afSpawnLocations[i].fX, afSpawnLocations[i].fY, afSpawnLocations[i].fZ, afSpawnLocations[i].fO, TEMPSUMMON_TIMED_DESPAWN, 5 * MINUTE * IN_MILLISECONDS);
+        }
+
+        return false;
+    }
+};
+#endif
+
+void AddSC_areatrigger_scripts()
+{
+    Script* s;
+    s = new at_childrens_week_spot();
+    s->RegisterSelf();
+
+#if defined (WOTLK) || defined (CATA)    
+    s = new at_aldurthar_gate();
+    s->RegisterSelf();
+#endif    
+    s = new at_ravenholdt();
+    s->RegisterSelf();
+
+#if defined (WOTLK) || defined (CATA)    
+    s = new at_spearborn_encampment();
+    s->RegisterSelf();
+
+    s = new at_warsong_farms();
+    s->RegisterSelf();
+
+    s = new at_waygate();
+    s->RegisterSelf();
+
+    s = new at_stormwright_shelf();
+    s->RegisterSelf();
+#endif
+
+    s = new at_scent_larkorwi();
+    s->RegisterSelf();
+    s = new at_murkdeep();
+    s->RegisterSelf();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    s = new at_coilfang_waterfall();
+    s->RegisterSelf();
+
+    s = new at_legion_teleporter();
+    s->RegisterSelf();
+#endif
+#if defined (WOTLK) || defined (CATA)    
+    s = new at_ancient_leaf();
+    s->RegisterSelf();
+    s = new at_hot_on_the_trail();
+    s->RegisterSelf();
+#endif
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_childrens_week_spot";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_childrens_week_spot;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_coilfang_waterfall";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_coilfang_waterfall;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_legion_teleporter";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_legion_teleporter;
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_ravenholdt";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_ravenholdt;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_scent_larkorwi";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_scent_larkorwi;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "at_murkdeep";
+    //pNewScript->pAreaTrigger = &AreaTrigger_at_murkdeep;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/world/bosses_emerald_dragons.cpp b/src/modules/SD3/scripts/world/bosses_emerald_dragons.cpp
new file mode 100644
index 000000000..ee5fc8874
--- /dev/null
+++ b/src/modules/SD3/scripts/world/bosses_emerald_dragons.cpp
@@ -0,0 +1,654 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      bosses_emerald_dragons
+ * SD%Complete: 95
+ * SDComment:   Missing correct behaviour of used trigger NPCs, some spell issues, summon player NYI
+ * SDCategory:  Emerald Dragon Bosses
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * boss_emerald_dragon -- Superclass for the four dragons
+ * boss_emeriss
+ * boss_lethon
+ * npc_spirit_shade
+ * boss_taerar
+ * boss_ysondre
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+/*######
+## boss_emerald_dragon -- Superclass for the four dragons
+######*/
+
+enum
+{
+    SPELL_MARK_OF_NATURE_PLAYER     = 25040,
+    SPELL_MARK_OF_NATURE_AURA       = 25041,
+    SPELL_SEEPING_FOG_R             = 24813,                // Summons 15224 'Dream Fog'
+    SPELL_SEEPING_FOG_L             = 24814,
+    SPELL_DREAM_FOG                 = 24777,                // Used by summoned Adds
+    SPELL_NOXIOUS_BREATH            = 24818,
+    SPELL_TAILSWEEP                 = 15847,
+    SPELL_SUMMON_PLAYER             = 24776,                // NYI
+
+    NPC_DREAM_FOG                   = 15224,
+};
+
+//common AI part
+struct boss_emerald_dragonAI : public ScriptedAI
+{
+    boss_emerald_dragonAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+    uint32 m_uiEventCounter;
+
+    uint32 m_uiSeepingFogTimer;
+    uint32 m_uiNoxiousBreathTimer;
+    uint32 m_uiTailsweepTimer;
+
+    void Reset() override
+    {
+        m_uiEventCounter = 1;
+
+        m_uiSeepingFogTimer = urand(15000, 20000);
+        m_uiNoxiousBreathTimer = 8000;
+        m_uiTailsweepTimer = 4000;
+    }
+
+    void EnterCombat(Unit* pEnemy) override
+    {
+        DoCastSpellIfCan(m_creature, SPELL_MARK_OF_NATURE_AURA, CAST_TRIGGERED);
+
+        ScriptedAI::EnterCombat(pEnemy);
+    }
+
+    void KilledUnit(Unit* pVictim) override
+    {
+        // Mark killed players with Mark of Nature
+        if (pVictim->GetTypeId() == TYPEID_PLAYER)
+        {
+            pVictim->CastSpell(pVictim, SPELL_MARK_OF_NATURE_PLAYER, true, NULL, NULL, m_creature->GetObjectGuid());
+        }
+    }
+
+    void JustSummoned(Creature* pSummoned) override
+    {
+        if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
+        {
+            pSummoned->AI()->AttackStart(pTarget);
+        }
+
+        if (pSummoned->GetEntry() == NPC_DREAM_FOG)
+        {
+            pSummoned->CastSpell(pSummoned, SPELL_DREAM_FOG, true, NULL, NULL, m_creature->GetObjectGuid());
+        }
+    }
+
+    // Return true, if succeeded
+    virtual bool DoSpecialDragonAbility() = 0;
+
+    // Return true to handle shared timers and MeleeAttack
+    virtual bool UpdateDragonAI(const uint32 /*uiDiff*/) { return true; }
+
+    void UpdateAI(const uint32 uiDiff) override
+    {
+        // Return since we have no target
+        if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+        {
+            return;
+        }
+
+        // Trigger special ability function at 75, 50 and 25% health
+        if (m_creature->GetHealthPercent() < 100.0f - m_uiEventCounter * 25.0f && DoSpecialDragonAbility())
+        {
+            ++m_uiEventCounter;
+        }
+
+        // Call dragon specific virtual function
+        if (!UpdateDragonAI(uiDiff))
+        {
+            return;
+        }
+
+        if (m_uiSeepingFogTimer < uiDiff)
+        {
+            DoCastSpellIfCan(m_creature, SPELL_SEEPING_FOG_R, CAST_TRIGGERED);
+            DoCastSpellIfCan(m_creature, SPELL_SEEPING_FOG_L, CAST_TRIGGERED);
+            m_uiSeepingFogTimer = urand(120000, 150000);    // Rather Guesswork, but one Fog has 2min duration, hence a bit longer
+        }
+        else
+            { m_uiSeepingFogTimer -= uiDiff; }
+
+        if (m_uiNoxiousBreathTimer < uiDiff)
+        {
+            if (DoCastSpellIfCan(m_creature, SPELL_NOXIOUS_BREATH) == CAST_OK)
+            {
+                m_uiNoxiousBreathTimer = urand(14000, 20000);
+            }
+        }
+        else
+            { m_uiNoxiousBreathTimer -= uiDiff; }
+
+        if (m_uiTailsweepTimer < uiDiff)
+        {
+            if (DoCastSpellIfCan(m_creature, SPELL_TAILSWEEP) == CAST_OK)
+            {
+                m_uiTailsweepTimer = 2000;
+            }
+        }
+        else
+            { m_uiTailsweepTimer -= uiDiff; }
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+/*######
+## boss_emeriss
+######*/
+
+enum
+{
+    SAY_EMERISS_AGGRO           = -1000401,
+    SAY_CAST_CORRUPTION         = -1000402,
+
+    SPELL_VOLATILE_INFECTION    = 24928,
+    SPELL_CORRUPTION_OF_EARTH   = 24910,
+    SPELL_PUTRID_MUSHROOM       = 24904,                    // Summons a mushroom on killing a player
+};
+
+struct boss_emeriss : public CreatureScript
+{
+    boss_emeriss() : CreatureScript("boss_emeriss") {}
+
+    struct boss_emerissAI : public boss_emerald_dragonAI
+    {
+        boss_emerissAI(Creature* pCreature) : boss_emerald_dragonAI(pCreature) { }
+
+        uint32 m_uiVolatileInfectionTimer;
+
+        void Reset() override
+        {
+            boss_emerald_dragonAI::Reset();
+
+            m_uiVolatileInfectionTimer = 12000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_EMERISS_AGGRO, m_creature);
+        }
+
+        void KilledUnit(Unit* pVictim) override
+        {
+            // summon a mushroom on the spot the player dies
+            if (pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                pVictim->CastSpell(pVictim, SPELL_PUTRID_MUSHROOM, true, NULL, NULL, m_creature->GetObjectGuid());
+            }
+
+            boss_emerald_dragonAI::KilledUnit(pVictim);
+        }
+
+        // Corruption of Earth at 75%, 50% and 25%
+        bool DoSpecialDragonAbility() override
+        {
+            if (DoCastSpellIfCan(m_creature, SPELL_CORRUPTION_OF_EARTH) == CAST_OK)
+            {
+                DoScriptText(SAY_CAST_CORRUPTION, m_creature);
+
+                // Successfull cast
+                return true;
+            }
+
+            return false;
+        }
+
+        bool UpdateDragonAI(const uint32 uiDiff) override
+        {
+            // Volatile Infection Timer
+            if (m_uiVolatileInfectionTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0);
+                if (pTarget && DoCastSpellIfCan(pTarget, SPELL_VOLATILE_INFECTION) == CAST_OK)
+                {
+                    m_uiVolatileInfectionTimer = urand(7000, 12000);
+                }
+            }
+            else
+            {
+                m_uiVolatileInfectionTimer -= uiDiff;
+            }
+
+            return true;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_emerissAI(pCreature);
+    }
+};
+
+/*######
+## boss_lethon
+######*/
+
+enum
+{
+    SAY_LETHON_AGGRO            = -1000666,
+    SAY_DRAW_SPIRIT             = -1000667,
+
+    SPELL_SHADOW_BOLT_WIRL      = 24834,                    // Periodic aura
+    SPELL_DRAW_SPIRIT           = 24811,
+    SPELL_SUMMON_SPIRIT_SHADE   = 24810,                    // Summon spell was removed, was SPELL_EFFECT_SUMMON_DEMON
+
+    NPC_LETHON                  = 14888,
+    NPC_SPIRIT_SHADE            = 15261,                    // Add summoned by Lethon
+    SPELL_DARK_OFFERING         = 24804,
+    SPELL_SPIRIT_SHAPE_VISUAL   = 24809,
+};
+
+struct boss_lethon : public CreatureScript
+{
+    boss_lethon() : CreatureScript("boss_lethon") {}
+
+    struct boss_lethonAI : public boss_emerald_dragonAI
+    {
+        boss_lethonAI(Creature* pCreature) : boss_emerald_dragonAI(pCreature) {}
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_LETHON_AGGRO, m_creature);
+            // Shadow bolt wirl is a periodic aura which triggers a set of shadowbolts every 2 secs; may need some core tunning
+            DoCastSpellIfCan(m_creature, SPELL_SHADOW_BOLT_WIRL, CAST_TRIGGERED);
+        }
+
+        // Summon a spirit which moves toward the boss and heals him for each player hit by the spell; used at 75%, 50% and 25%
+        bool DoSpecialDragonAbility() override
+        {
+            if (DoCastSpellIfCan(m_creature, SPELL_DRAW_SPIRIT) == CAST_OK)
+            {
+                DoScriptText(SAY_DRAW_SPIRIT, m_creature);
+                return true;
+            }
+
+            return false;
+        }
+
+        // Need this code here, as SPELL_DRAW_SPIRIT has no Script- or Dummyeffect
+        void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override
+        {
+            // Summon a shade for each player hit
+            if (pTarget->GetTypeId() == TYPEID_PLAYER && pSpell->Id == SPELL_DRAW_SPIRIT)
+            {
+                // Summon this way, to be able to cast the shade visual spell with player as original caster
+                // This might not be supported currently by core, but this spell's visual should be dependend on the player
+                // Also possible that this was no problem due to the special way these NPCs had been summoned in classic times
+                if (Creature* pSummoned = pTarget->SummonCreature(NPC_SPIRIT_SHADE, 0.0f, 0.0f, 0.0f, pTarget->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 0))
+                {
+                    pSummoned->CastSpell(pSummoned, SPELL_SPIRIT_SHAPE_VISUAL, true, NULL, NULL, pTarget->GetObjectGuid());
+                }
+            }
+        }
+
+        void JustSummoned(Creature* pSummoned) override
+        {
+            // Move the shade to lethon
+            if (pSummoned->GetEntry() == NPC_SPIRIT_SHADE)
+            {
+                pSummoned->GetMotionMaster()->MoveFollow(m_creature, 0.0f, 0.0f);
+            }
+            else
+            {
+                boss_emerald_dragonAI::JustSummoned(pSummoned);
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_lethonAI(pCreature);
+    }
+};
+
+struct npc_spirit_shade : public CreatureScript
+{
+    npc_spirit_shade() : CreatureScript("npc_spirit_shade") {}
+
+    struct npc_spirit_shadeAI : public ScriptedAI
+    {
+        npc_spirit_shadeAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        bool m_bHasHealed;
+
+        void Reset() override
+        {
+            m_bHasHealed = false;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_bHasHealed && pWho->GetEntry() == NPC_LETHON && pWho->IsWithinDistInMap(m_creature, 3.0f))
+            {
+                if (DoCastSpellIfCan(pWho, SPELL_DARK_OFFERING) == CAST_OK)
+                {
+                    m_bHasHealed = true;
+                    m_creature->ForcedDespawn(1000);
+                }
+            }
+        }
+
+        void AttackStart(Unit* /*pWho*/) override { }
+
+        void UpdateAI(const uint32 /*uiDiff*/) override { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_spirit_shadeAI(pCreature);
+    }
+};
+
+/*######
+## boss_taerar
+######*/
+
+enum
+{
+    SAY_TAERAR_AGGRO        = -1000399,
+    SAY_SUMMONSHADE         = -1000400,
+
+    SPELL_ARCANE_BLAST      = 24857,
+    SPELL_BELLOWING_ROAR    = 22686,
+
+    SPELL_SUMMON_SHADE_1    = 24841,
+    SPELL_SUMMON_SHADE_2    = 24842,
+    SPELL_SUMMON_SHADE_3    = 24843,
+    SPELL_SELF_STUN         = 24883,                        // Stunns the main boss until the shades are dead or timer expires
+
+    NPC_SHADE_OF_TAERAR     = 15302,
+    SPELL_POSIONCLOUD       = 24840,
+    SPELL_POSIONBREATH      = 20667
+};
+
+struct boss_taerar : public CreatureScript
+{
+    boss_taerar() : CreatureScript("boss_taerar") {}
+
+    struct boss_taerarAI : public boss_emerald_dragonAI
+    {
+        boss_taerarAI(Creature* pCreature) : boss_emerald_dragonAI(pCreature) { }
+
+        uint32 m_uiArcaneBlastTimer;
+        uint32 m_uiBellowingRoarTimer;
+        uint32 m_uiShadesTimeoutTimer;
+        uint8 m_uiShadesDead;
+
+        void Reset() override
+        {
+            boss_emerald_dragonAI::Reset();
+
+            m_uiArcaneBlastTimer = 12000;
+            m_uiBellowingRoarTimer = 30000;
+            m_uiShadesTimeoutTimer = 0;                         // The time that Taerar is banished
+            m_uiShadesDead = 0;
+
+            // Remove Unselectable if needed
+            if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+            {
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            }
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_TAERAR_AGGRO, m_creature);
+        }
+
+        // Summon 3 Shades at 75%, 50% and 25% and Banish Self
+        bool DoSpecialDragonAbility()
+        {
+            if (DoCastSpellIfCan(m_creature, SPELL_SELF_STUN) == CAST_OK)
+            {
+                // Summon the shades at boss position
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_SHADE_1, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_SHADE_2, CAST_TRIGGERED);
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_SHADE_3, CAST_TRIGGERED);
+
+                // Make boss not selectable when banished
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+                DoScriptText(SAY_SUMMONSHADE, m_creature);
+                m_uiShadesTimeoutTimer = 60000;
+
+                return true;
+            }
+
+            return false;
+        }
+
+        void SummonedCreatureJustDied(Creature* pSummoned) override
+        {
+            if (pSummoned->GetEntry() == NPC_SHADE_OF_TAERAR)
+            {
+                ++m_uiShadesDead;
+
+                // If all shades are dead then unbanish the boss
+                if (m_uiShadesDead == 3)
+                {
+                    DoUnbanishBoss();
+                }
+            }
+        }
+
+        void DoUnbanishBoss()
+        {
+            m_creature->RemoveAurasDueToSpell(SPELL_SELF_STUN);
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+
+            m_uiShadesTimeoutTimer = 0;
+            m_uiShadesDead = 0;
+        }
+
+        bool UpdateDragonAI(const uint32 uiDiff) override
+        {
+            // Timer to unbanish the boss
+            if (m_uiShadesTimeoutTimer)
+            {
+                if (m_uiShadesTimeoutTimer <= uiDiff)
+                {
+                    DoUnbanishBoss();
+                }
+                else
+                {
+                    m_uiShadesTimeoutTimer -= uiDiff;
+                }
+
+                // Prevent further spells or timer handling while banished
+                return false;
+            }
+
+            // Arcane Blast Timer
+            if (m_uiArcaneBlastTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0);
+                if (pTarget && DoCastSpellIfCan(pTarget, SPELL_ARCANE_BLAST) == CAST_OK)
+                {
+                    m_uiArcaneBlastTimer = urand(7000, 12000);
+                }
+            }
+            else
+            {
+                m_uiArcaneBlastTimer -= uiDiff;
+            }
+
+            // Bellowing Roar Timer
+            if (m_uiBellowingRoarTimer < uiDiff)
+            {
+                if (DoCastSpellIfCan(m_creature, SPELL_BELLOWING_ROAR) == CAST_OK)
+                {
+                    m_uiBellowingRoarTimer = urand(20000, 30000);
+                }
+            }
+            else
+            {
+                m_uiBellowingRoarTimer -= uiDiff;
+            }
+
+            return true;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_taerarAI(pCreature);
+    }
+};
+
+/*######
+## boss_ysondre
+######*/
+
+enum
+{
+    SAY_YSONDRE_AGGRO       = -1000360,
+    SAY_SUMMON_DRUIDS       = -1000361,
+
+    SPELL_LIGHTNING_WAVE    = 24819,
+    SPELL_SUMMON_DRUIDS     = 24795,
+
+    // druid spells
+    SPELL_MOONFIRE          = 21669
+};
+
+// Ysondre script
+struct boss_ysondre : public CreatureScript
+{
+    boss_ysondre() : CreatureScript("boss_ysondre") {}
+
+    struct boss_ysondreAI : public boss_emerald_dragonAI
+    {
+        boss_ysondreAI(Creature* pCreature) : boss_emerald_dragonAI(pCreature) { }
+
+        uint32 m_uiLightningWaveTimer;
+
+        void Reset() override
+        {
+            boss_emerald_dragonAI::Reset();
+
+            m_uiLightningWaveTimer = 12000;
+        }
+
+        void Aggro(Unit* /*pWho*/) override
+        {
+            DoScriptText(SAY_YSONDRE_AGGRO, m_creature);
+        }
+
+        // Summon Druids - TODO FIXME (spell not understood)
+        bool DoSpecialDragonAbility() override
+        {
+            DoScriptText(SAY_SUMMON_DRUIDS, m_creature);
+
+            for (int i = 0; i < 10; ++i)
+            {
+                DoCastSpellIfCan(m_creature, SPELL_SUMMON_DRUIDS, CAST_TRIGGERED);
+            }
+
+            return true;
+        }
+
+        bool UpdateDragonAI(const uint32 uiDiff) override
+        {
+            // Lightning Wave Timer
+            if (m_uiLightningWaveTimer < uiDiff)
+            {
+                Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0);
+                if (pTarget && DoCastSpellIfCan(pTarget, SPELL_LIGHTNING_WAVE) == CAST_OK)
+                {
+                    m_uiLightningWaveTimer = urand(7000, 12000);
+                }
+            }
+            else
+            {
+                m_uiLightningWaveTimer -= uiDiff;
+            }
+
+            return true;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new boss_ysondreAI(pCreature);
+    }
+};
+
+void AddSC_bosses_emerald_dragons()
+{
+    Script* s;
+    s = new boss_emeriss();
+    s->RegisterSelf();
+    s = new boss_lethon();
+    s->RegisterSelf();
+    s = new npc_spirit_shade();
+    s->RegisterSelf();
+    s = new boss_taerar();
+    s->RegisterSelf();
+    s = new boss_ysondre();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_emeriss";
+    //pNewScript->GetAI = &GetAI_boss_emeriss;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_lethon";
+    //pNewScript->GetAI = &GetAI_boss_lethon;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_spirit_shade";
+    //pNewScript->GetAI = &GetAI_npc_spirit_shade;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_taerar";
+    //pNewScript->GetAI = &GetAI_boss_taerar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "boss_ysondre";
+    //pNewScript->GetAI = &GetAI_boss_ysondre;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/world/go_scripts.cpp b/src/modules/SD3/scripts/world/go_scripts.cpp
new file mode 100644
index 000000000..ff63e03b8
--- /dev/null
+++ b/src/modules/SD3/scripts/world/go_scripts.cpp
@@ -0,0 +1,535 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      GO_Scripts
+ * SD%Complete: 100
+ * SDComment:   Quest support: 5097, 5098, Barov_journal->Teaches spell 26089
+ * SDCategory:  Game Objects
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * go_barov_journal
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+ * go_ethereum_prison
+ * go_ethereum_stasis
+#endif
+#if defined (WOTLK) || defined (CATA)
+ * go_mysterious_snow_mound
+ * go_tele_to_dalaran_crystal
+ * go_tele_to_violet_stand
+#endif
+ * go_andorhal_tower
+#if defined (WOTLK) || defined (CATA)
+ * go_scourge_enclosure
+ * go_lab_work_reagents
+#endif
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+/*######
+## go_barov_journal
+######*/
+
+enum
+{
+    SPELL_TAILOR_FELCLOTH_BAG = 26086,
+    SPELL_LEARN_FELCLOTH_BAG  = 26095
+};
+
+struct go_barov_journal : public GameObjectScript
+{
+    go_barov_journal() : GameObjectScript("go_barov_journal") {}
+
+    bool OnUse(Player* pPlayer, GameObject* /*pGo*/) override
+    {
+        if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(SPELL_TAILOR_FELCLOTH_BAG))
+        {
+            pPlayer->CastSpell(pPlayer, SPELL_LEARN_FELCLOTH_BAG, false);
+        }
+        return true;
+    }
+};
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+/*######
+## go_ethereum_prison
+######*/
+
+enum
+{
+    FACTION_LC     = 1011,
+    FACTION_SHAT   = 935,
+    FACTION_CE     = 942,
+    FACTION_CON    = 933,
+    FACTION_KT     = 989,
+    FACTION_SPOR   = 970,
+
+    SPELL_REP_LC   = 39456,
+    SPELL_REP_SHAT = 39457,
+    SPELL_REP_CE   = 39460,
+    SPELL_REP_CON  = 39474,
+    SPELL_REP_KT   = 39475,
+    SPELL_REP_SPOR = 39476
+};
+
+const uint32 uiNpcPrisonEntry[] =
+{
+    22810, 22811, 22812, 22813, 22814, 22815,               // good guys
+    20783, 20784, 20785, 20786, 20788, 20789, 20790         // bad guys
+};
+
+struct go_ethereum_prison : public GameObjectScript
+{
+    go_ethereum_prison() : GameObjectScript("go_ethereum_prison") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        uint8 uiRandom = urand(0, countof(uiNpcPrisonEntry) - 1);
+
+        if (Creature* pCreature = pPlayer->SummonCreature(uiNpcPrisonEntry[uiRandom],
+            pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), pGo->GetAngle(pPlayer),
+            TEMPSUMMON_TIMED_OOC_DESPAWN, 30000))
+        {
+            if (!pCreature->IsHostileTo(pPlayer))
+            {
+                uint32 uiSpell = 0;
+
+                if (FactionTemplateEntry const* pFaction = pCreature->getFactionTemplateEntry())
+                {
+                    switch (pFaction->faction)
+                    {
+                    case FACTION_LC:   uiSpell = SPELL_REP_LC;   break;
+                    case FACTION_SHAT: uiSpell = SPELL_REP_SHAT; break;
+                    case FACTION_CE:   uiSpell = SPELL_REP_CE;   break;
+                    case FACTION_CON:  uiSpell = SPELL_REP_CON;  break;
+                    case FACTION_KT:   uiSpell = SPELL_REP_KT;   break;
+                    case FACTION_SPOR: uiSpell = SPELL_REP_SPOR; break;
+                    }
+
+                    if (uiSpell)
+                    {
+                        pCreature->CastSpell(pPlayer, uiSpell, false);
+                    }
+                    else
+                    {
+                        script_error_log("go_ethereum_prison summoned creature (entry %u) but faction (%u) are not expected by script.", pCreature->GetEntry(), pCreature->getFaction());
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+};
+
+/*######
+## go_ethereum_stasis
+######*/
+
+const uint32 uiNpcStasisEntry[] =
+{
+    22825, 20888, 22827, 22826, 22828
+};
+
+struct go_ethereum_stasis : public GameObjectScript
+{
+    go_ethereum_stasis() : GameObjectScript("go_ethereum_stasis") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        uint8 uiRandom = urand(0, countof(uiNpcStasisEntry) - 1);
+
+        pPlayer->SummonCreature(uiNpcStasisEntry[uiRandom],
+            pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), pGo->GetAngle(pPlayer),
+            TEMPSUMMON_TIMED_OOC_DESPAWN, 30000);
+
+        return false;
+    }
+};
+
+/*######
+## go_jump_a_tron
+######*/
+
+enum
+{
+    SPELL_JUMP_A_TRON = 33382,
+    NPC_JUMP_A_TRON   = 19041
+};
+
+struct go_jump_a_tron : public GameObjectScript
+{
+    go_jump_a_tron() : GameObjectScript("go_jump_a_tron") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        if (Creature* pCreature = GetClosestCreatureWithEntry(pGo, NPC_JUMP_A_TRON, INTERACTION_DISTANCE))
+        {
+            pCreature->CastSpell(pPlayer, SPELL_JUMP_A_TRON, false);
+        }
+
+        return false;
+    }
+};
+#endif
+#if defined (WOTLK) || defined (CATA)
+/*######
+## go_mysterious_snow_mound
+######*/
+
+struct go_mysterious_snow_mound : public GameObjectScript
+{
+    enum
+    {
+        SPELL_SUMMON_DEEP_JORMUNGAR = 66510,
+        SPELL_SUMMON_MOLE_MACHINE = 66492,
+        SPELL_SUMMON_MARAUDER = 66491,
+    };
+
+    go_mysterious_snow_mound() : GameObjectScript("go_mysterious_snow_mound") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        if (urand(0, 1))
+        {
+            pPlayer->CastSpell(pPlayer, SPELL_SUMMON_DEEP_JORMUNGAR, true);
+        }
+        else
+        {
+            // This is basically wrong, but added for support.
+            // Mole machine would summon, along with unkonwn GO (a GO trap?) and then
+            // the npc would summon with base of that location.
+            pPlayer->CastSpell(pPlayer, SPELL_SUMMON_MOLE_MACHINE, true);
+            pPlayer->CastSpell(pPlayer, SPELL_SUMMON_MARAUDER, true);
+        }
+
+        pGo->SetLootState(GO_JUST_DEACTIVATED);
+        return true;
+    }
+};
+
+/*######
+## go_tele_to_dalaran_crystal
+######*/
+
+enum
+{
+    QUEST_LEARN_LEAVE_RETURN = 12790,
+    QUEST_TELE_CRYSTAL_FLAG = 12845
+};
+
+struct go_tele_to_dalaran_crystal : public GameObjectScript
+{
+    go_tele_to_dalaran_crystal() : GameObjectScript("go_tele_to_dalaran_crystal") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        if (pPlayer->GetQuestRewardStatus(QUEST_TELE_CRYSTAL_FLAG))
+            return false;
+
+        // TODO: must send error message (what kind of message? On-screen?)
+        return true;
+    }
+};
+
+/*######
+## go_tele_to_violet_stand
+######*/
+
+struct go_tele_to_violet_stand : public GameObjectScript
+{
+    go_tele_to_violet_stand() : GameObjectScript("go_tele_to_violet_stand") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        if (pPlayer->GetQuestRewardStatus(QUEST_LEARN_LEAVE_RETURN) || pPlayer->GetQuestStatus(QUEST_LEARN_LEAVE_RETURN) == QUEST_STATUS_INCOMPLETE)
+            return false;
+
+        // TODO: must send error message (what kind of message? On-screen?)
+        return true;
+    }
+};
+#endif
+
+/*######
+## go_andorhal_tower
+######*/
+
+enum
+{
+    QUEST_ALL_ALONG_THE_WATCHTOWERS_ALLIANCE = 5097,
+    QUEST_ALL_ALONG_THE_WATCHTOWERS_HORDE    = 5098,
+    NPC_ANDORHAL_TOWER_1                     = 10902,
+    NPC_ANDORHAL_TOWER_2                     = 10903,
+    NPC_ANDORHAL_TOWER_3                     = 10904,
+    NPC_ANDORHAL_TOWER_4                     = 10905,
+    GO_ANDORHAL_TOWER_1                      = 176094,
+    GO_ANDORHAL_TOWER_2                      = 176095,
+    GO_ANDORHAL_TOWER_3                      = 176096,
+    GO_ANDORHAL_TOWER_4                      = 176097
+};
+
+struct go_andorhal_tower : public GameObjectScript
+{
+    go_andorhal_tower() : GameObjectScript("go_andorhal_tower") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_ALL_ALONG_THE_WATCHTOWERS_ALLIANCE) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_ALL_ALONG_THE_WATCHTOWERS_HORDE) == QUEST_STATUS_INCOMPLETE)
+        {
+            uint32 uiKillCredit = 0;
+            switch (pGo->GetEntry())
+            {
+            case GO_ANDORHAL_TOWER_1:
+                uiKillCredit = NPC_ANDORHAL_TOWER_1;
+                break;
+            case GO_ANDORHAL_TOWER_2:
+                uiKillCredit = NPC_ANDORHAL_TOWER_2;
+                break;
+            case GO_ANDORHAL_TOWER_3:
+                uiKillCredit = NPC_ANDORHAL_TOWER_3;
+                break;
+            case GO_ANDORHAL_TOWER_4:
+                uiKillCredit = NPC_ANDORHAL_TOWER_4;
+                break;
+            }
+            if (uiKillCredit)
+            {
+                pPlayer->KilledMonsterCredit(uiKillCredit);
+            }
+        }
+        return true;
+    }
+};
+
+#if defined (CLASSIC) || defined (TBC)
+enum 
+{
+    GOSSIP_TABLE_THEKA = 1653,
+    QUEST_SPIDER_GOD = 2936
+};
+
+struct go_table_theka : public GameObjectScript
+{
+    go_table_theka() : GameObjectScript("go_table_theka") {}
+
+    bool OnGossipHello(Player* pPlayer, GameObject* pGo) override
+    {
+        if (pPlayer->GetQuestStatus(QUEST_SPIDER_GOD) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->AreaExploredOrEventHappens(QUEST_SPIDER_GOD);
+
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_TABLE_THEKA, pGo->GetObjectGuid());
+
+        return true;
+    }
+};
+#endif
+
+#if defined (WOTLK) || defined (CATA)
+/*######
+## go_scourge_enclosure
+######*/
+
+enum
+{
+    SPELL_GYMER_LOCK_EXPLOSION      = 55529,
+    NPC_GYMER_LOCK_DUMMY            = 29928
+};
+
+struct go_scourge_enclosure : public GameObjectScript
+{
+    go_scourge_enclosure() : GameObjectScript("go_scourge_enclosure") {}
+
+    bool OnUse(Player* pPlayer, GameObject* pGo) override
+    {
+        std::list<Creature*> m_lResearchersList;
+        GetCreatureListWithEntryInGrid(m_lResearchersList, pGo, NPC_GYMER_LOCK_DUMMY, 15.0f);
+        if (!m_lResearchersList.empty())
+        {
+            for (std::list<Creature*>::iterator itr = m_lResearchersList.begin(); itr != m_lResearchersList.end(); ++itr)
+            {
+                (*itr)->CastSpell((*itr), SPELL_GYMER_LOCK_EXPLOSION, true);
+            }
+        }
+        pPlayer->KilledMonsterCredit(NPC_GYMER_LOCK_DUMMY);
+        return true;
+    }
+};
+
+/*######
+## go_lab_work_reagents
+######*/
+
+enum
+{
+    QUEST_LAB_WORK                          = 12557,
+
+    SPELL_WIRHERED_BATWING_KILL_CREDIT      = 51226,
+    SPELL_MUDDY_MIRE_MAGGOT_KILL_CREDIT     = 51227,
+    SPELL_AMBERSEED_KILL_CREDIT             = 51228,
+    SPELL_CHILLED_SERPENT_MUCUS_KILL_CREDIT = 51229,
+
+    GO_AMBERSEED                            = 190459,
+    GO_CHILLED_SERPENT_MUCUS                = 190462,
+    GO_WITHERED_BATWING                     = 190473,
+    GO_MUDDY_MIRE_MAGGOTS                   = 190478,
+};
+
+struct go_lab_work_reagents : public GameObjectScript
+{
+    go_lab_work_reagents() : GameObjectScript("go_lab_work_reagents") {}
+
+    bool GOUse_go_lab_work_reagents(Player* pPlayer, GameObject* pGo)
+    {
+        if (pPlayer->GetQuestStatus(QUEST_LAB_WORK) == QUEST_STATUS_INCOMPLETE)
+        {
+            uint32 uiCreditSpellId = 0;
+            switch (pGo->GetEntry())
+            {
+            case GO_AMBERSEED:              uiCreditSpellId = SPELL_AMBERSEED_KILL_CREDIT; break;
+            case GO_CHILLED_SERPENT_MUCUS:  uiCreditSpellId = SPELL_CHILLED_SERPENT_MUCUS_KILL_CREDIT; break;
+            case GO_WITHERED_BATWING:       uiCreditSpellId = SPELL_WIRHERED_BATWING_KILL_CREDIT; break;
+            case GO_MUDDY_MIRE_MAGGOTS:     uiCreditSpellId = SPELL_MUDDY_MIRE_MAGGOT_KILL_CREDIT; break;
+            }
+
+            if (uiCreditSpellId)
+                pPlayer->CastSpell(pPlayer, uiCreditSpellId, true);
+        }
+
+        return false;
+    }
+};
+#endif
+
+void AddSC_go_scripts()
+{
+    Script* s;
+    s = new go_barov_journal();
+    s->RegisterSelf();
+    s = new go_andorhal_tower();
+    s->RegisterSelf();
+
+#if defined (CLASSIC) || defined (TBC)
+    s = new go_table_theka();
+    s->RegisterSelf();
+#endif
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    s = new go_ethereum_prison();
+    s->RegisterSelf();
+
+    s = new go_ethereum_stasis();
+    s->RegisterSelf();
+
+    s = new go_jump_a_tron();
+    s->RegisterSelf();
+#endif
+
+#if defined (WOTLK) || defined (CATA)    
+    s = new go_mysterious_snow_mound();
+    s->RegisterSelf();
+
+    s = new go_tele_to_dalaran_crystal();
+    s->RegisterSelf();
+
+    s = new go_tele_to_violet_stand();
+    s->RegisterSelf();
+
+    s = new go_scourge_enclosure();
+    s->RegisterSelf();
+
+    s = new go_lab_work_reagents();
+    s->RegisterSelf();
+#endif
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_barov_journal";
+    //pNewScript->pGOUse =          &GOUse_go_barov_journal;
+    //pNewScript->RegisterSelf();
+
+//#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_ethereum_prison";
+    //pNewScript->pGOUse =          &GOUse_go_ethereum_prison;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_ethereum_stasis";
+    //pNewScript->pGOUse =          &GOUse_go_ethereum_stasis;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_jump_a_tron";
+    //pNewScript->pGOUse =          &GOUse_go_jump_a_tron;
+    //pNewScript->RegisterSelf();
+//#endif
+//#if defined (WOTLK) || defined (CATA)
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_mysterious_snow_mound";
+    //pNewScript->pGOUse =          &GOUse_go_mysterious_snow_mound;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_tele_to_dalaran_crystal";
+    //pNewScript->pGOUse =          &GOUse_go_tele_to_dalaran_crystal;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_tele_to_violet_stand";
+    //pNewScript->pGOUse =          &GOUse_go_tele_to_violet_stand;
+    //pNewScript->RegisterSelf();
+//#endif
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_andorhal_tower";
+    //pNewScript->pGOUse =          &GOUse_go_andorhal_tower;
+    //pNewScript->RegisterSelf();
+
+//#if defined (CLASSIC) || defined (TBC)
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_table_theka";
+    //pNewScript->pGossipHelloGO =  &GossipHelloGO_table_theka;
+    //pNewScript->RegisterSelf();
+//#endif
+
+//#if defined (WOTLK) || defined (CATA)
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_scourge_enclosure";
+    //pNewScript->pGOUse =          &GOUse_go_scourge_enclosure;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "go_lab_work_reagents";
+    //pNewScript->pGOUse =          &GOUse_go_lab_work_reagents;
+    //pNewScript->RegisterSelf();
+//#endif
+}
diff --git a/src/modules/SD3/scripts/world/guards.cpp b/src/modules/SD3/scripts/world/guards.cpp
new file mode 100644
index 000000000..e99c73b45
--- /dev/null
+++ b/src/modules/SD3/scripts/world/guards.cpp
@@ -0,0 +1,280 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Guards
+ * SD%Complete: 100
+ * SDComment:   Zone guards
+ * SDCategory:  Guards
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+ * guard_azuremyst
+#endif
+ * guard_bluffwatcher
+ * guard_contested
+ * guard_darnassus
+ * guard_dunmorogh
+ * guard_durotar
+ * guard_elwynnforest
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+ * guard_eversong
+ * guard_exodar
+#endif
+ * guard_ironforge
+ * guard_mulgore
+ * guard_orgrimmar
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+ * guard_shattrath
+ * guard_shattrath_aldor
+ * guard_shattrath_scryer
+ * guard_silvermoon
+#endif
+ * guard_stormwind
+ * guard_teldrassil
+ * guard_tirisfal
+ * guard_undercity
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#include "guard_ai.h"
+
+struct guard_generic : public CreatureScript
+{
+    guard_generic() : CreatureScript("guard_generic") {}
+
+    CreatureAI* GetAI(Creature *pCreature) override
+    {
+        return new guardAI(pCreature);
+    }
+};
+
+struct guard_orgrimmar : public CreatureScript
+{
+    guard_orgrimmar() : CreatureScript("guard_orgrimmar") {}
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new guardAI_orgrimmar(pCreature);
+    }
+};
+
+struct guard_stormwind : public CreatureScript
+{
+    guard_stormwind() : CreatureScript("guard_stormwind") {}
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new guardAI_stormwind(pCreature);
+    }
+};
+
+// common AI Part
+struct guard_shattrath_asAI : public guardAI
+{
+    guard_shattrath_asAI(Creature* pCreature, uint32 aura) : guardAI(pCreature), m_uiAuraBanished(aura) {}
+
+    uint32 m_uiExile_Timer;
+    uint32 m_uiBanish_Timer;
+    uint32 m_uiAuraBanished;
+    ObjectGuid m_playerGuid;
+    bool m_bCanTeleport;
+
+    void Reset() override
+    {
+        m_uiBanish_Timer = 5000;
+        m_uiExile_Timer = 8500;
+        m_playerGuid.Clear();
+        m_bCanTeleport = false;
+    }
+
+    void UpdateAI(const uint32 uiDiff) override
+    {
+        if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+        {
+            return;
+        }
+
+        if (m_bCanTeleport)
+        {
+            if (m_uiExile_Timer < uiDiff)
+            {
+                if (Player* pTarget = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                {
+                    pTarget->CastSpell(pTarget, SPELL_EXILE, true);
+                    pTarget->CastSpell(pTarget, SPELL_BANISH_TELEPORT, true);
+                }
+
+                m_playerGuid.Clear();
+                m_uiExile_Timer = 8500;
+                m_bCanTeleport = false;
+            }
+            else
+            {
+                m_uiExile_Timer -= uiDiff;
+            }
+        }
+        else if (m_uiBanish_Timer < uiDiff)
+        {
+            Unit* pVictim = m_creature->getVictim();
+
+            if (pVictim && pVictim->GetTypeId() == TYPEID_PLAYER)
+            {
+                DoCastSpellIfCan(pVictim, m_uiAuraBanished);
+                m_uiBanish_Timer = 9000;
+                m_playerGuid = pVictim->GetObjectGuid();
+                m_bCanTeleport = true;
+            }
+        }
+        else
+        {
+            m_uiBanish_Timer -= uiDiff;
+        }
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+
+struct guard_shattrath_aldor : public CreatureScript
+{
+    guard_shattrath_aldor() : CreatureScript("guard_shattrath_aldor") {}
+
+    struct guard_shattrath_aldorAI : public guard_shattrath_asAI
+    {
+        guard_shattrath_aldorAI(Creature* pCreature) : guard_shattrath_asAI(pCreature, SPELL_BANISHED_SHATTRATH_A) { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new guard_shattrath_aldorAI(pCreature);
+    }
+};
+
+struct guard_shattrath_scryer : public CreatureScript
+{
+    guard_shattrath_scryer() : CreatureScript("guard_shattrath_scryer") {}
+
+    struct guard_shattrath_scryerAI : public guard_shattrath_asAI
+    {
+        guard_shattrath_scryerAI(Creature* pCreature) : guard_shattrath_asAI(pCreature, SPELL_BANISHED_SHATTRATH_S) { }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new guard_shattrath_scryerAI(pCreature);
+    }
+};
+#endif
+
+void AddSC_guards()
+{
+    Script* s;
+    s = new guard_generic();
+    s->RegisterSelf();
+    s = new guard_orgrimmar();
+    s->RegisterSelf();
+    s = new guard_stormwind();
+    s->RegisterSelf();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    s = new guard_shattrath_aldor();
+    s->RegisterSelf();
+    s = new guard_shattrath_scryer();
+    s->RegisterSelf();
+#endif
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "guard_azuremyst";
+    //pNewScript->GetAI = &GetAI_guard_azuremyst;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "guard_contested";
+    //pNewScript->GetAI = &GetAI_guard_contested;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "guard_darnassus";
+    //pNewScript->GetAI = &GetAI_guard_darnassus;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "guard_dunmorogh";
+    //pNewScript->GetAI = &GetAI_guard_dunmorogh;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "guard_durotar";
+    //pNewScript->GetAI = &GetAI_guard_durotar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "guard_elwynnforest";
+    //pNewScript->GetAI = &GetAI_guard_elwynnforest;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "guard_ironforge";
+    //pNewScript->GetAI = &GetAI_guard_ironforge;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "guard_eversong";
+    //pNewScript->GetAI = &GetAI_guard_eversong;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "guard_exodar";
+    //pNewScript->GetAI = &GetAI_guard_exodar;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "guard_stormwind";
+    //pNewScript->GetAI = &GetAI_guard_stormwind;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "guard_teldrassil";
+    //pNewScript->GetAI = &GetAI_guard_teldrassil;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "guard_tirisfal";
+    //pNewScript->GetAI = &GetAI_guard_tirisfal;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "guard_shattrath";
+    //pNewScript->GetAI = &GetAI_guard_shattrath;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/world/item_scripts.cpp b/src/modules/SD3/scripts/world/item_scripts.cpp
new file mode 100644
index 000000000..9ac11b8b7
--- /dev/null
+++ b/src/modules/SD3/scripts/world/item_scripts.cpp
@@ -0,0 +1,254 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Item_Scripts
+ * SD%Complete: 100
+ * SDComment: Items for a range of different items. See content below (in script)
+ * SDCategory:  Items
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+ * item_arcane_charges                 Prevent use if player is not flying (cannot cast while on ground)
+ * item_flying_machine(i34060,i34061)  Engineering crafted flying machines
+ * item_gor_dreks_ointment(i30175)     Protecting Our Own(q10488)
+ * item_ogre_brew                       Prevent use if player not in 3522 area
+#endif
+ * EndContentData
+ */
+
+#include "precompiled.h"
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+#include "Spell.h"
+
+/*#####
+# item_ogre_brew
+#####*/
+
+enum
+{
+    BLUE_OGRE_BREW  = 32783,
+    RED_OGRE_BREW   = 32784,
+    TRANCHANTES     = 3522
+};
+
+struct item_ogre_brew : public ItemScript
+{
+    item_ogre_brew() : ItemScript("item_ogre_brew") {}
+
+    bool OnUse(Player* pPlayer, Item* pItem, const SpellCastTargets&) override
+    {
+    uint32 itemId = pItem->GetEntry();
+    uint32 pZoneId = pPlayer->GetZoneId();
+
+    if (itemId == BLUE_OGRE_BREW || itemId == RED_OGRE_BREW)    //an excessive check of DB sanity, may be dropped
+    {
+        if (pZoneId == TRANCHANTES)
+        {
+            return false;   // allowing cast, i.e. this script did not handle it
+        }
+
+        debug_log("SD3: Player attempt to use item %u, but did not meet zone requirement : %u", itemId, pZoneId);
+        if (const SpellEntry* pSpellInfo = GetSpellStore()->LookupEntry(pItem->GetProto()->Spells[0].SpellId))
+        {
+            Spell::SendCastResult(pPlayer, pSpellInfo, 1, SPELL_FAILED_NOT_HERE);
+        }
+    }
+    return true;
+    }
+};
+
+/*#####
+# item_arcane_charges
+#####*/
+
+enum
+{
+    SPELL_ARCANE_CHARGES    = 45072
+};
+
+struct item_arcane_charges : public ItemScript
+{
+    item_arcane_charges() : ItemScript("item_arcane_charges") {}
+
+    bool OnUse(Player* pPlayer, Item* pItem, const SpellCastTargets& /*pTargets*/) override
+    {
+        if (pPlayer->IsTaxiFlying())
+        {
+            return false;
+        }
+
+        pPlayer->SendEquipError(EQUIP_ERR_NONE, pItem, NULL);
+
+        if (const SpellEntry* pSpellInfo = GetSpellStore()->LookupEntry(SPELL_ARCANE_CHARGES))
+        {
+            Spell::SendCastResult(pPlayer, pSpellInfo, 1, SPELL_FAILED_ERROR);
+        }
+        return true;
+    }
+};
+
+/*#####
+# item_flying_machine
+#####*/
+
+struct item_flying_machine : public ItemScript
+{
+    item_flying_machine() : ItemScript("item_flying_machine") {}
+
+    bool OnUse(Player* pPlayer, Item* pItem, const SpellCastTargets& /*pTargets*/) override
+    {
+        uint32 itemId = pItem->GetEntry();
+
+        if (itemId == 34060)
+        if (pPlayer->GetBaseSkillValue(SKILL_RIDING) >= 225)
+        {
+            return false;
+        }
+
+        if (itemId == 34061)
+        if (pPlayer->GetBaseSkillValue(SKILL_RIDING) == 300)
+        {
+            return false;
+        }
+
+        debug_log("SD3: Player attempt to use item %u, but did not meet riding requirement", itemId);
+        pPlayer->SendEquipError(EQUIP_ERR_CANT_EQUIP_SKILL, pItem, NULL);
+        return true;
+    }
+};
+
+/*#####
+# item_gor_dreks_ointment
+#####*/
+
+enum
+{
+    NPC_TH_DIRE_WOLF        = 20748,
+    SPELL_GORDREKS_OINTMENT = 32578
+};
+
+struct item_gor_dreks_ointment : public ItemScript
+{
+    item_gor_dreks_ointment() : ItemScript("item_gor_dreks_ointment") {}
+
+    bool OnUse(Player* pPlayer, Item* pItem, const SpellCastTargets& pTargets) override
+    {
+        if (pTargets.getUnitTarget() && pTargets.getUnitTarget()->GetTypeId() == TYPEID_UNIT && pTargets.getUnitTarget()->HasAura(SPELL_GORDREKS_OINTMENT))
+        {
+            pPlayer->SendEquipError(EQUIP_ERR_NONE, pItem, NULL);
+
+            if (const SpellEntry* pSpellInfo = GetSpellStore()->LookupEntry(SPELL_GORDREKS_OINTMENT))
+            {
+                Spell::SendCastResult(pPlayer, pSpellInfo, 1, SPELL_FAILED_TARGET_AURASTATE);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+};
+#endif
+#if defined (WOTLK) || defined (CATA)
+/*#####
+# item_petrov_cluster_bombs
+#####*/
+
+struct item_petrov_cluster_bombs : public ItemScript
+{
+    item_petrov_cluster_bombs() : ItemScript("item_petrov_cluster_bombs") {}
+
+    enum
+    {
+        SPELL_PETROV_BOMB = 42406,
+        AREA_ID_SHATTERED_STRAITS = 4064,
+        ZONE_ID_HOWLING = 495
+    };
+
+    bool ItemUse_item_petrov_cluster_bombs(Player* pPlayer, Item* pItem, const SpellCastTargets& /*pTargets*/)
+    {
+        if (pPlayer->GetZoneId() != ZONE_ID_HOWLING)
+            return false;
+
+        if (!pPlayer->GetTransport() || pPlayer->GetAreaId() != AREA_ID_SHATTERED_STRAITS)
+        {
+            pPlayer->SendEquipError(EQUIP_ERR_NONE, pItem, NULL);
+
+            if (const SpellEntry* pSpellInfo = GetSpellStore()->LookupEntry(SPELL_PETROV_BOMB))
+                Spell::SendCastResult(pPlayer, pSpellInfo, 1, SPELL_FAILED_NOT_HERE);
+
+            return true;
+        }
+
+        return false;
+    }
+};
+#endif
+
+void AddSC_item_scripts()
+{
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    Script* s;
+    
+    s = new item_ogre_brew();
+    s->RegisterSelf();
+    s = new item_arcane_charges();
+    s->RegisterSelf();
+    s = new item_flying_machine();
+    s->RegisterSelf();
+    s = new item_gor_dreks_ointment();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "item_arcane_charges";
+    //pNewScript->pItemUse = &ItemUse_item_arcane_charges;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "item_flying_machine";
+    //pNewScript->pItemUse = &ItemUse_item_flying_machine;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "item_gor_dreks_ointment";
+    //pNewScript->pItemUse = &ItemUse_item_gor_dreks_ointment;
+    //pNewScript->RegisterSelf();
+#endif
+#if defined (WOTLK) || defined (CATA)
+    s = new item_petrov_cluster_bombs();
+    s->RegisterSelf();
+
+//    pNewScript = new Script;
+//    pNewScript->Name = "item_petrov_cluster_bombs";
+//    pNewScript->pItemUse = &ItemUse_item_petrov_cluster_bombs;
+//    pNewScript->RegisterSelf();
+#endif
+}
diff --git a/src/modules/SD3/scripts/world/mob_generic_creature.cpp b/src/modules/SD3/scripts/world/mob_generic_creature.cpp
new file mode 100644
index 000000000..eec4f7a6c
--- /dev/null
+++ b/src/modules/SD3/scripts/world/mob_generic_creature.cpp
@@ -0,0 +1,198 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Generic_Creature
+ * SD%Complete: 80
+ * SDComment:   Should be replaced with core based AI
+ * SDCategory:  Creatures
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+#define GENERIC_CREATURE_COOLDOWN   5000
+
+struct generic_creature : public CreatureScript
+{
+    generic_creature() : CreatureScript("generic_creature") {}
+
+    struct generic_creatureAI : public ScriptedAI
+    {
+        generic_creatureAI(Creature* pCreature) : ScriptedAI(pCreature) {}
+
+        uint32 GlobalCooldown;      // This variable acts like the global cooldown that players have (1.5 seconds)
+        uint32 BuffTimer;           // This variable keeps track of buffs
+        bool IsSelfRooted;
+
+        void Reset() override
+        {
+            GlobalCooldown = 0;
+            BuffTimer = 0;          // Rebuff as soon as we can
+            IsSelfRooted = false;
+        }
+
+        void Aggro(Unit* who) override
+        {
+            if (!m_creature->CanReachWithMeleeAttack(who))
+            {
+                IsSelfRooted = true;
+            }
+        }
+
+        void UpdateAI(const uint32 diff) override
+        {
+            // Always decrease our global cooldown first
+            if (GlobalCooldown > diff)
+            {
+                GlobalCooldown -= diff;
+            }
+            else { GlobalCooldown = 0; }
+
+            // Buff timer (only buff when we are alive and not in combat
+            if (!m_creature->IsInCombat() && m_creature->IsAlive())
+            {
+                if (BuffTimer < diff)
+                {
+                    // Find a spell that targets friendly and applies an aura (these are generally buffs)
+                    SpellEntry const* info = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_AURA);
+
+                    if (info && !GlobalCooldown)
+                    {
+                        // Cast the buff spell
+                        DoCastSpell(m_creature, info);
+
+                        // Set our global cooldown
+                        GlobalCooldown = GENERIC_CREATURE_COOLDOWN;
+
+                        // Set our timer to 10 minutes before rebuff
+                        BuffTimer = 600000;
+                    }// Try agian in 30 seconds
+                    else { BuffTimer = 30000; }
+                }
+                else { BuffTimer -= diff; }
+            }
+
+            // Return since we have no target
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            // Return if we already cast a spell
+            if (m_creature->IsNonMeleeSpellCasted(false))
+            {
+                return;
+            }
+
+            // If we are within range melee the target
+            if (m_creature->CanReachWithMeleeAttack(m_creature->getVictim()))
+            {
+                // Make sure our attack is ready
+                if (m_creature->isAttackReady())
+                {
+                    bool Healing = false;
+                    SpellEntry const* info = NULL;
+
+                    // Select a healing spell if less than 30% hp
+                    if (m_creature->GetHealthPercent() < 30.0f)
+                    {
+                        info = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING);
+                    }
+
+                    // No healing spell available, select a hostile spell
+                    if (info) { Healing = true; }
+                    else { info = SelectSpell(m_creature->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE); }
+
+                    // 50% chance if elite or higher, 20% chance if not, to replace our white hit with a spell
+                    if (info && (rand() % (m_creature->GetCreatureInfo()->Rank > 1 ? 2 : 5) == 0) && !GlobalCooldown)
+                    {
+                        // Cast the spell
+                        if (Healing) { DoCastSpell(m_creature, info); }
+                        else { DoCastSpell(m_creature->getVictim(), info); }
+
+                        // Set our global cooldown
+                        GlobalCooldown = GENERIC_CREATURE_COOLDOWN;
+                    }
+                    else { m_creature->AttackerStateUpdate(m_creature->getVictim()); }
+
+                    m_creature->resetAttackTimer();
+                }
+            }
+            else
+            {
+                bool Healing = false;
+                SpellEntry const* info = NULL;
+
+                // Select a healing spell if less than 30% hp ONLY 33% of the time
+                if (m_creature->GetHealthPercent() < 30.0f && !urand(0, 2))
+                {
+                    info = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING);
+                }
+
+                // No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DISTANCE)
+                if (info) { Healing = true; }
+                else { info = SelectSpell(m_creature->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, ATTACK_DISTANCE, 0, SELECT_EFFECT_DONTCARE); }
+
+                // Found a spell, check if we arn't on cooldown
+                if (info && !GlobalCooldown)
+                {
+                    // If we are currently moving stop us and set the movement generator
+                    if (!IsSelfRooted)
+                    {
+                        IsSelfRooted = true;
+                    }
+
+                    // Cast spell
+                    if (Healing) { DoCastSpell(m_creature, info); }
+                    else { DoCastSpell(m_creature->getVictim(), info); }
+
+                    // Set our global cooldown
+                    GlobalCooldown = GENERIC_CREATURE_COOLDOWN;
+                }// If no spells available and we arn't moving run to target
+                else if (IsSelfRooted)
+                {
+                    // Cancel our current spell and then allow movement agian
+                    m_creature->InterruptNonMeleeSpells(false);
+                    IsSelfRooted = false;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new generic_creatureAI(pCreature);
+    }
+};
+void AddSC_generic_creature()
+{
+    return; //TODO why was it removed for some ACID EAI?
+    Script *s;
+    s = new generic_creature();
+    s->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/world/npc_professions.cpp b/src/modules/SD3/scripts/world/npc_professions.cpp
new file mode 100644
index 000000000..840789a23
--- /dev/null
+++ b/src/modules/SD3/scripts/world/npc_professions.cpp
@@ -0,0 +1,1210 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Npc_Professions
+ * SD%Complete: 80
+ * SDComment: Provides learn/unlearn/relearn-options for professions. Not supported: Unlearn engineering, re-learn engineering, re-learn leatherworking.
+ * SDCategory:  NPCs
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+
+/**
+ * Notes
+ *
+ * - A full implementation of gossip for GO's is required. They must have the
+ *   same scripting capabilities as creatures. Basically, there is no difference
+ *   here (except that default text is chosen with `gameobject_template`.`data3`
+ *   (for GO type2, different dataN for a few others).
+ * - It's possible blacksmithing still requires some tweaks and adjustments due
+ *   to the way we _have_ to use reputation.
+ */
+
+/*
+-- UPDATE `gameobject_template` SET `ScriptName` = 'go_soothsaying_for_dummies' WHERE `entry` = 177226;
+*/
+
+/*###
+# to be removed from here (->ncp_text). This is data for database projects.
+###*/
+#define TALK_MUST_UNLEARN_WEAPON    "You must forget your weapon type specialty before I can help you. Go to Everlook in Winterspring and seek help there."
+
+#define TALK_HAMMER_LEARN           "Ah, a seasoned veteran you once were. I know you are capable, you merely need to ask and I shall teach you the way of the hammersmith."
+#define TALK_AXE_LEARN              "Ah, a seasoned veteran you once were. I know you are capable, you merely need to ask and I shall teach you the way of the axesmith."
+#define TALK_SWORD_LEARN            "Ah, a seasoned veteran you once were. I know you are capable, you merely need to ask and I shall teach you the way of the swordsmith."
+
+#define TALK_HAMMER_UNLEARN         "Forgetting your Hammersmithing skill is not something to do lightly. If you choose to abandon it you will forget all recipes that require Hammersmithing to create!"
+#define TALK_AXE_UNLEARN            "Forgetting your Axesmithing skill is not something to do lightly. If you choose to abandon it you will forget all recipes that require Axesmithing to create!"
+#define TALK_SWORD_UNLEARN          "Forgetting your Swordsmithing skill is not something to do lightly. If you choose to abandon it you will forget all recipes that require Swordsmithing to create!"
+
+/*###
+# generic defines
+###*/
+
+#define GOSSIP_SENDER_LEARN         50
+#define GOSSIP_SENDER_UNLEARN       51
+#define GOSSIP_SENDER_CHECK         52
+
+/*###
+# gossip item and box texts
+###*/
+
+#define GOSSIP_WEAPON_LEARN         "Please teach me how to become a Weaponsmith"
+#define GOSSIP_WEAPON_UNLEARN       "I wish to unlearn the art of Weaponsmithing"
+#define GOSSIP_ARMOR_LEARN          "Please teach me how to become a Armorsmith"
+#define GOSSIP_ARMOR_UNLEARN        "I wish to unlearn the art of Armorsmithing"
+
+#define GOSSIP_UNLEARN_SMITH_SPEC   "I wish to unlearn my blacksmith specialty"
+#define BOX_UNLEARN_ARMORORWEAPON   "Do you really want to unlearn your blacksmith specialty and lose all associated recipes? \n Cost: "
+
+#define GOSSIP_LEARN_HAMMER         "Please teach me how to become a Hammersmith, Lilith"
+#define GOSSIP_UNLEARN_HAMMER       "I wish to unlearn Hammersmithing"
+#define GOSSIP_LEARN_AXE            "Please teach me how to become a Axesmith, Kilram"
+#define GOSSIP_UNLEARN_AXE          "I wish to unlearn Axesmithing"
+#define GOSSIP_LEARN_SWORD          "Please teach me how to become a Swordsmith, Seril"
+#define GOSSIP_UNLEARN_SWORD        "I wish to unlearn Swordsmithing"
+
+#define BOX_UNLEARN_WEAPON_SPEC     "Do you really want to unlearn your weaponsmith specialty and lose all associated recipes? \n Cost: "
+
+#define GOSSIP_LEARN_DRAGON         "I am absolutely certain that i want to learn dragonscale leatherworking"
+#define GOSSIP_UNLEARN_DRAGON       "I wish to unlearn Dragonscale Leatherworking"
+#define GOSSIP_LEARN_ELEMENTAL      "I am absolutely certain that i want to learn elemental leatherworking"
+#define GOSSIP_UNLEARN_ELEMENTAL    "I wish to unlearn Elemental Leatherworking"
+#define GOSSIP_LEARN_TRIBAL         "I am absolutely certain that i want to learn tribal leatherworking"
+#define GOSSIP_UNLEARN_TRIBAL       "I wish to unlearn Tribal Leatherworking"
+
+#define BOX_UNLEARN_LEATHER_SPEC    "Do you really want to unlearn your leatherworking specialty and lose all associated recipes? \n Cost: "
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+#define GOSSIP_LEARN_SPELLFIRE      "Please teach me how to become a Spellcloth tailor"
+#define GOSSIP_UNLEARN_SPELLFIRE    "I wish to unlearn Spellfire Tailoring"
+#define GOSSIP_LEARN_MOONCLOTH      "Please teach me how to become a Mooncloth tailor"
+#define GOSSIP_UNLEARN_MOONCLOTH    "I wish to unlearn Mooncloth Tailoring"
+#define GOSSIP_LEARN_SHADOWEAVE     "Please teach me how to become a Shadoweave tailor"
+#define GOSSIP_UNLEARN_SHADOWEAVE   "I wish to unlearn Shadoweave Tailoring"
+
+#define BOX_UNLEARN_TAILOR_SPEC     "Do you really want to unlearn your tailoring specialty and lose all associated recipes? \n Cost: "
+#endif
+#define GOSSIP_LEARN_GOBLIN         "I am absolutely certain that i want to learn Goblin engineering"
+#define GOSSIP_LEARN_GNOMISH        "I am absolutely certain that i want to learn Gnomish engineering"
+
+/*###
+# spells defines
+###*/
+
+#define S_WEAPON                9787
+#define S_ARMOR                 9788
+#define S_HAMMER                17040
+#define S_AXE                   17041
+#define S_SWORD                 17039
+
+#define S_LEARN_WEAPON          9789
+#define S_LEARN_ARMOR           9790
+#define S_LEARN_HAMMER          39099
+#define S_LEARN_AXE             39098
+#define S_LEARN_SWORD           39097
+
+#define S_UNLEARN_WEAPON        36436
+#define S_UNLEARN_ARMOR         36435
+#define S_UNLEARN_HAMMER        36441
+#define S_UNLEARN_AXE           36439
+#define S_UNLEARN_SWORD         36438
+
+#define S_REP_ARMOR             17451
+#define S_REP_WEAPON            17452
+
+#define REP_ARMOR               46
+#define REP_WEAPON              289
+#define REP_HAMMER              569
+#define REP_AXE                 570
+#define REP_SWORD               571
+
+#define S_DRAGON                10656
+#define S_ELEMENTAL             10658
+#define S_TRIBAL                10660
+
+#define S_LEARN_DRAGON          10657
+#define S_LEARN_ELEMENTAL       10659
+#define S_LEARN_TRIBAL          10661
+
+#define S_UNLEARN_DRAGON        36434
+#define S_UNLEARN_ELEMENTAL     36328
+#define S_UNLEARN_TRIBAL        36433
+
+#define S_GOBLIN                20222
+#define S_GNOMISH               20219
+
+#define S_LEARN_GOBLIN          20221
+#define S_LEARN_GNOMISH         20220
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+#define S_SPELLFIRE             26797
+#define S_MOONCLOTH             26798
+#define S_SHADOWEAVE            26801
+
+#define S_LEARN_SPELLFIRE       26796
+#define S_LEARN_MOONCLOTH       26799
+#define S_LEARN_SHADOWEAVE      26800
+
+#define S_UNLEARN_SPELLFIRE     41299
+#define S_UNLEARN_MOONCLOTH     41558
+#define S_UNLEARN_SHADOWEAVE    41559
+#endif
+/*###
+# formulas to calculate unlearning cost
+###*/
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+int32 GetLearningCost(Player* /*pPlayer*/)                      // tailor, alchemy
+{
+    return 200000;
+}
+
+int32 GetUnlearnCostHigh(Player* /*pPlayer*/)                   // tailor, alchemy
+{
+    return 1500000;
+}
+#endif
+
+int32 GetUnlearnCostMedium(Player* pPlayer)                 // blacksmith, leatherwork
+{
+    uint32 level = pPlayer->getLevel();
+
+    if (level < 51)
+    {
+        return 250000;
+    }
+    else if (level < 66)
+    {
+        return 500000;
+    }
+    else
+    {
+        return 1000000;
+    }
+}
+
+int32 GetUnlearnCostLow(Player* pPlayer)                    // blacksmith
+{
+    if (pPlayer->getLevel() < 66)
+    {
+        return 50000;
+    }
+    else
+    {
+        return 100000;
+    }
+}
+
+/*###
+# unlearning related profession spells
+###*/
+
+bool EquippedOk(Player* pPlayer, uint32 spellId)
+{
+    SpellEntry const* spell = GetSpellStore()->LookupEntry(spellId);
+
+    if (!spell)
+    {
+        return false;
+    }
+
+    for (int i = 0; i < 3; ++i)
+    {
+#if defined(CATA)
+        SpellEffectEntry const* pSpellEffect = spell->GetSpellEffect(SpellEffectIndex(i));
+        if (!pSpellEffect)
+            continue;
+
+        uint32 reqSpell = pSpellEffect->EffectTriggerSpell;
+#else
+        uint32 reqSpell = spell->EffectTriggerSpell[i];
+#endif
+        if (!reqSpell)
+        {
+            continue;
+        }
+
+        Item* pItem;
+        for (int j = EQUIPMENT_SLOT_START; j < EQUIPMENT_SLOT_END; ++j)
+        {
+            pItem = pPlayer->GetItemByPos(INVENTORY_SLOT_BAG_0, j);
+            if (pItem)
+                if (pItem->GetProto()->RequiredSpell == reqSpell)
+                {
+                    // pPlayer has item equipped that require specialty. Not allow to unlearn, player has to unequip first
+                    debug_log("SD3: player attempt to unlearn spell %u, but item %u is equipped.", reqSpell, pItem->GetProto()->ItemId);
+                    return false;
+                }
+        }
+    }
+    return true;
+}
+
+void ProfessionUnlearnSpells(Player* pPlayer, uint32 type)
+{
+    switch (type)
+    {
+        case 36436:                                         // S_UNLEARN_WEAPON
+            pPlayer->removeSpell(36125);                    // Light Earthforged Blade
+            pPlayer->removeSpell(36128);                    // Light Emberforged Hammer
+            pPlayer->removeSpell(36126);                    // Light Skyforged Axe
+            break;
+        case 36435:                                         // S_UNLEARN_ARMOR
+            pPlayer->removeSpell(36122);                    // Earthforged Leggings
+            pPlayer->removeSpell(36129);                    // Heavy Earthforged Breastplate
+            pPlayer->removeSpell(36130);                    // Stormforged Hauberk
+            pPlayer->removeSpell(34533);                    // Breastplate of Kings
+            pPlayer->removeSpell(34529);                    // Nether Chain Shirt
+            pPlayer->removeSpell(34534);                    // Bulwark of Kings
+            pPlayer->removeSpell(36257);                    // Bulwark of the Ancient Kings
+            pPlayer->removeSpell(36256);                    // Embrace of the Twisting Nether
+            pPlayer->removeSpell(34530);                    // Twisting Nether Chain Shirt
+            pPlayer->removeSpell(36124);                    // Windforged Leggings
+            break;
+        case 36441:                                         // S_UNLEARN_HAMMER
+            pPlayer->removeSpell(36262);                    // Dragonstrike
+            pPlayer->removeSpell(34546);                    // Dragonmaw
+            pPlayer->removeSpell(34545);                    // Drakefist Hammer
+            pPlayer->removeSpell(36136);                    // Lavaforged Warhammer
+            pPlayer->removeSpell(34547);                    // Thunder
+            pPlayer->removeSpell(34567);                    // Deep Thunder
+            pPlayer->removeSpell(36263);                    // Stormherald
+            pPlayer->removeSpell(36137);                    // Great Earthforged Hammer
+            break;
+        case 36439:                                         // S_UNLEARN_AXE
+            pPlayer->removeSpell(36260);                    // Wicked Edge of the Planes
+            pPlayer->removeSpell(34562);                    // Black Planar Edge
+            pPlayer->removeSpell(34541);                    // The Planar Edge
+            pPlayer->removeSpell(36134);                    // Stormforged Axe
+            pPlayer->removeSpell(36135);                    // Skyforged Great Axe
+            pPlayer->removeSpell(36261);                    // Bloodmoon
+            pPlayer->removeSpell(34543);                    // Lunar Crescent
+            pPlayer->removeSpell(34544);                    // Mooncleaver
+            break;
+        case 36438:                                         // S_UNLEARN_SWORD
+            pPlayer->removeSpell(36258);                    // Blazefury
+            pPlayer->removeSpell(34537);                    // Blazeguard
+            pPlayer->removeSpell(34535);                    // Fireguard
+            pPlayer->removeSpell(36131);                    // Windforged Rapier
+            pPlayer->removeSpell(36133);                    // Stoneforged Claymore
+            pPlayer->removeSpell(34538);                    // Lionheart Blade
+            pPlayer->removeSpell(34540);                    // Lionheart Champion
+            pPlayer->removeSpell(36259);                    // Lionheart Executioner
+            break;
+        case 36434:                                         // S_UNLEARN_DRAGON
+            pPlayer->removeSpell(36076);                    // Dragonstrike Leggings
+            pPlayer->removeSpell(36079);                    // Golden Dragonstrike Breastplate
+            pPlayer->removeSpell(35576);                    // Ebon Netherscale Belt
+            pPlayer->removeSpell(35577);                    // Ebon Netherscale Bracers
+            pPlayer->removeSpell(35575);                    // Ebon Netherscale Breastplate
+            pPlayer->removeSpell(35582);                    // Netherstrike Belt
+            pPlayer->removeSpell(35584);                    // Netherstrike Bracers
+            pPlayer->removeSpell(35580);                    // Netherstrike Breastplate
+            break;
+        case 36328:                                         // S_UNLEARN_ELEMENTAL
+            pPlayer->removeSpell(36074);                    // Blackstorm Leggings
+            pPlayer->removeSpell(36077);                    // Primalstorm Breastplate
+            pPlayer->removeSpell(35590);                    // Primalstrike Belt
+            pPlayer->removeSpell(35591);                    // Primalstrike Bracers
+            pPlayer->removeSpell(35589);                    // Primalstrike Vest
+            break;
+        case 36433:                                         // S_UNLEARN_TRIBAL
+            pPlayer->removeSpell(35585);                    // Windhawk Hauberk
+            pPlayer->removeSpell(35587);                    // Windhawk Belt
+            pPlayer->removeSpell(35588);                    // Windhawk Bracers
+            pPlayer->removeSpell(36075);                    // Wildfeather Leggings
+            pPlayer->removeSpell(36078);                    // Living Crystal Breastplate
+            break;
+        case 41299:                                         // S_UNLEARN_SPELLFIRE
+            pPlayer->removeSpell(26752);                    // Spellfire Belt
+            pPlayer->removeSpell(26753);                    // Spellfire Gloves
+            pPlayer->removeSpell(26754);                    // Spellfire Robe
+            break;
+        case 41558:                                         // S_UNLEARN_MOONCLOTH
+            pPlayer->removeSpell(26760);                    // Primal Mooncloth Belt
+            pPlayer->removeSpell(26761);                    // Primal Mooncloth Shoulders
+            pPlayer->removeSpell(26762);                    // Primal Mooncloth Robe
+            break;
+        case 41559:                                         // S_UNLEARN_SHADOWEAVE
+            pPlayer->removeSpell(26756);                    // Frozen Shadoweave Shoulders
+            pPlayer->removeSpell(26757);                    // Frozen Shadoweave Boots
+            pPlayer->removeSpell(26758);                    // Frozen Shadoweave Robe
+            break;
+    }
+}
+
+/*###
+# start menues blacksmith
+###*/
+
+struct npc_prof_blacksmith : public CreatureScript
+{
+    npc_prof_blacksmith() : CreatureScript("npc_prof_blacksmith") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+        if (pCreature->IsVendor())
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+        }
+        if (pCreature->IsTrainer())
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
+        }
+
+        uint32 eCreature = pCreature->GetEntry();
+        // WEAPONSMITH & ARMORSMITH
+        if (pPlayer->GetBaseSkillValue(SKILL_BLACKSMITHING) >= 225)
+        {
+            switch (eCreature)
+            {
+            case 11145:                                     // Myolor Sunderfury
+            case 11176:                                     // Krathok Moltenfist
+                if (!pPlayer->HasSpell(S_ARMOR) && !pPlayer->HasSpell(S_WEAPON) && pPlayer->GetReputationRank(REP_ARMOR) == REP_FRIENDLY)
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARMOR_LEARN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                }
+                if (!pPlayer->HasSpell(S_WEAPON) && !pPlayer->HasSpell(S_ARMOR) && pPlayer->GetReputationRank(REP_WEAPON) == REP_FRIENDLY)
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEAPON_LEARN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+                }
+                break;
+            case 11146:                                     // Ironus Coldsteel
+            case 11178:                                     // Borgosh Corebender
+                if (pPlayer->HasSpell(S_WEAPON))
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEAPON_UNLEARN, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 3);
+                }
+                break;
+            case 5164:                                      // Grumnus Steelshaper
+            case 11177:                                     // Okothos Ironrager
+                if (pPlayer->HasSpell(S_ARMOR))
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARMOR_UNLEARN, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 4);
+                }
+                break;
+            }
+        }
+        // WEAPONSMITH SPEC
+        if (pPlayer->HasSpell(S_WEAPON) && pPlayer->getLevel() > 49 && pPlayer->GetBaseSkillValue(SKILL_BLACKSMITHING) >= 250)
+        {
+            switch (eCreature)
+            {
+            case 11191:                                     // Lilith the Lithe
+                if (!HasWeaponSub(pPlayer))
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 5);
+                }
+                if (pPlayer->HasSpell(S_HAMMER))
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 8);
+                }
+                break;
+            case 11192:                                     // Kilram
+                if (!HasWeaponSub(pPlayer))
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 6);
+                }
+                if (pPlayer->HasSpell(S_AXE))
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 9);
+                }
+                break;
+            case 11193:                                     // Seril Scourgebane
+                if (!HasWeaponSub(pPlayer))
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 7);
+                }
+                if (pPlayer->HasSpell(S_SWORD))
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 10);
+                }
+                break;
+            }
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiSender)
+        {
+        case GOSSIP_SENDER_MAIN:
+            SendActionMenu_npc_prof_blacksmith(pPlayer, pCreature, uiAction);
+            break;
+        case GOSSIP_SENDER_LEARN:
+            SendConfirmLearn_npc_prof_blacksmith(pPlayer, pCreature, uiAction);
+            break;
+        case GOSSIP_SENDER_UNLEARN:
+            SendConfirmUnlearn_npc_prof_blacksmith(pPlayer, pCreature, uiAction);
+            break;
+        case GOSSIP_SENDER_CHECK:
+            SendActionMenu_npc_prof_blacksmith(pPlayer, pCreature, uiAction);
+            break;
+        }
+        return true;
+    }
+
+private:
+    void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 uiAction)
+    {
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_TRADE:
+            pPlayer->SEND_VENDORLIST(pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_TRAIN:
+            pPlayer->SEND_TRAINERLIST(pCreature->GetObjectGuid());
+            break;
+            // Learn Armor/Weapon
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            if (!pPlayer->HasSpell(S_ARMOR))
+            {
+                pPlayer->CastSpell(pPlayer, S_LEARN_ARMOR, true);
+                // pCreature->CastSpell(pPlayer, S_REP_ARMOR, true);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            if (!pPlayer->HasSpell(S_WEAPON))
+            {
+                pPlayer->CastSpell(pPlayer, S_LEARN_WEAPON, true);
+                // pCreature->CastSpell(pPlayer, S_REP_WEAPON, true);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+            // Unlearn Armor/Weapon
+        case GOSSIP_ACTION_INFO_DEF + 3:
+            if (HasWeaponSub(pPlayer))
+            {
+                // unknown textID (TALK_MUST_UNLEARN_WEAPON)
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+            }
+            else if (EquippedOk(pPlayer, S_UNLEARN_WEAPON))
+            {
+                if (pPlayer->GetMoney() >= uint32(GetUnlearnCostLow(pPlayer)))
+                {
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_WEAPON, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_WEAPON);
+                    pPlayer->ModifyMoney(-GetUnlearnCostLow(pPlayer));
+                    pCreature->CastSpell(pPlayer, S_REP_ARMOR, true);
+                    pPlayer->CLOSE_GOSSIP_MENU();
+                }
+                else
+                {
+                    pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
+                }
+            }
+            else
+            {
+                pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+                pPlayer->CLOSE_GOSSIP_MENU();
+            }
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 4:
+            if (EquippedOk(pPlayer, S_UNLEARN_ARMOR))
+            {
+                if (pPlayer->GetMoney() >= uint32(GetUnlearnCostLow(pPlayer)))
+                {
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_ARMOR, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_ARMOR);
+                    pPlayer->ModifyMoney(-GetUnlearnCostLow(pPlayer));
+                    pCreature->CastSpell(pPlayer, S_REP_WEAPON, true);
+                }
+                else
+                {
+                    pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
+                }
+            }
+            else
+            {
+                pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+            // Learn Hammer/Axe/Sword
+        case GOSSIP_ACTION_INFO_DEF + 5:
+            pPlayer->CastSpell(pPlayer, S_LEARN_HAMMER, true);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 6:
+            pPlayer->CastSpell(pPlayer, S_LEARN_AXE, true);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 7:
+            pPlayer->CastSpell(pPlayer, S_LEARN_SWORD, true);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+            // Unlearn Hammer/Axe/Sword
+        case GOSSIP_ACTION_INFO_DEF + 8:
+            if (EquippedOk(pPlayer, S_UNLEARN_HAMMER))
+            {
+                if (pPlayer->GetMoney() >= uint32(GetUnlearnCostMedium(pPlayer)))
+                {
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_HAMMER, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_HAMMER);
+                    pPlayer->ModifyMoney(-GetUnlearnCostMedium(pPlayer));
+                }
+                else
+                {
+                    pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
+                }
+            }
+            else
+            {
+                pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 9:
+            if (EquippedOk(pPlayer, S_UNLEARN_AXE))
+            {
+                if (pPlayer->GetMoney() >= uint32(GetUnlearnCostMedium(pPlayer)))
+                {
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_AXE, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_AXE);
+                    pPlayer->ModifyMoney(-GetUnlearnCostMedium(pPlayer));
+                }
+                else
+                {
+                    pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
+                }
+            }
+            else
+            {
+                pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 10:
+            if (EquippedOk(pPlayer, S_UNLEARN_SWORD))
+            {
+                if (pPlayer->GetMoney() >= uint32(GetUnlearnCostMedium(pPlayer)))
+                {
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_SWORD, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SWORD);
+                    pPlayer->ModifyMoney(-GetUnlearnCostMedium(pPlayer));
+                }
+                else
+                {
+                    pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
+                }
+            }
+            else
+            {
+                pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        }
+    }
+
+    void SendConfirmLearn_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 uiAction)
+    {
+        if (uiAction)
+        {
+            uint32 eCreature = pCreature->GetEntry();
+            switch (eCreature)
+            {
+            case 11191:
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction);
+                // unknown textID (TALK_HAMMER_LEARN)
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            case 11192:
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE, GOSSIP_SENDER_CHECK, uiAction);
+                // unknown textID (TALK_AXE_LEARN)
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            case 11193:
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction);
+                // unknown textID (TALK_SWORD_LEARN)
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            }
+        }
+    }
+
+    void SendConfirmUnlearn_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 uiAction)
+    {
+        if (uiAction)
+        {
+            uint32 eCreature = pCreature->GetEntry();
+            switch (eCreature)
+            {
+            case 11146:                                     // Ironus Coldsteel
+            case 11178:                                     // Borgosh Corebender
+            case 5164:                                      // Grumnus Steelshaper
+            case 11177:                                     // Okothos Ironrager
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ARMORORWEAPON, GetUnlearnCostLow(pPlayer), false);
+                // unknown textID (TALK_UNLEARN_AXEORWEAPON)
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+
+            case 11191:
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, GetUnlearnCostMedium(pPlayer), false);
+                // unknown textID (TALK_HAMMER_UNLEARN)
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            case 11192:
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, GetUnlearnCostMedium(pPlayer), false);
+                // unknown textID (TALK_AXE_UNLEARN)
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            case 11193:
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, GetUnlearnCostMedium(pPlayer), false);
+                // unknown textID (TALK_SWORD_UNLEARN)
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            }
+        }
+    }
+
+    bool HasWeaponSub(Player* pPlayer)
+    {
+        if (pPlayer->HasSpell(S_HAMMER) || pPlayer->HasSpell(S_AXE) || pPlayer->HasSpell(S_SWORD))
+        {
+            return true;
+        }
+        return false;
+    }
+};
+
+/*bool QuestComplete_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, const Quest* pQuest)
+{
+    if ((pQuest->GetQuestId() == 5283) || (pQuest->GetQuestId() == 5301))             // armorsmith
+        pCreature->CastSpell(pPlayer, 17451, true);
+
+    if ((pQuest->GetQuestId() == 5284) || (pQuest->GetQuestId() == 5302))             // weaponsmith
+        pCreature->CastSpell(pPlayer, 17452, true);
+
+    return true;
+}*/
+
+/*###
+# start menues leatherworking
+###*/
+
+struct npc_prof_leather : public CreatureScript
+{
+    npc_prof_leather() : CreatureScript("npc_prof_leather") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+        if (pCreature->IsVendor())
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+        }
+        if (pCreature->IsTrainer())
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
+        }
+
+        uint32 eCreature = pCreature->GetEntry();
+
+        if (pPlayer->HasSkill(SKILL_LEATHERWORKING) && pPlayer->GetBaseSkillValue(SKILL_LEATHERWORKING) >= 250 && pPlayer->getLevel() > 49)
+        {
+            switch (eCreature)
+            {
+            case 7866:                                      // Peter Galen
+            case 7867:                                      // Thorkaf Dragoneye
+                if (pPlayer->HasSpell(S_DRAGON))
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 1);
+                }
+                break;
+            case 7868:                                      // Sarah Tanner
+            case 7869:                                      // Brumn Winterhoof
+                if (pPlayer->HasSpell(S_ELEMENTAL))
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 2);
+                }
+                break;
+            case 7870:                                      // Caryssia Moonhunter
+            case 7871:                                      // Se'Jib
+                if (pPlayer->HasSpell(S_TRIBAL))
+                {
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 3);
+                }
+                break;
+            }
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiSender)
+        {
+        case GOSSIP_SENDER_MAIN:
+            SendActionMenu_npc_prof_leather(pPlayer, pCreature, uiAction);
+            break;
+        case GOSSIP_SENDER_UNLEARN:
+            SendConfirmUnlearn_npc_prof_leather(pPlayer, pCreature, uiAction);
+            break;
+        case GOSSIP_SENDER_CHECK:
+            SendActionMenu_npc_prof_leather(pPlayer, pCreature, uiAction);
+            break;
+        }
+        return true;
+    }
+
+private:
+    void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint32 uiAction)
+    {
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_TRADE:
+            pPlayer->SEND_VENDORLIST(pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_TRAIN:
+            pPlayer->SEND_TRAINERLIST(pCreature->GetObjectGuid());
+            break;
+            // Unlearn Leather
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            if (EquippedOk(pPlayer, S_UNLEARN_DRAGON))
+            {
+                if (pPlayer->GetMoney() >= uint32(GetUnlearnCostMedium(pPlayer)))
+                {
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_DRAGON, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_DRAGON);
+                    pPlayer->ModifyMoney(-GetUnlearnCostMedium(pPlayer));
+                }
+                else
+                {
+                    pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
+                }
+            }
+            else
+            {
+                pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            if (EquippedOk(pPlayer, S_UNLEARN_ELEMENTAL))
+            {
+                if (pPlayer->GetMoney() >= uint32(GetUnlearnCostMedium(pPlayer)))
+                {
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_ELEMENTAL, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_ELEMENTAL);
+                    pPlayer->ModifyMoney(-GetUnlearnCostMedium(pPlayer));
+                }
+                else
+                {
+                    pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
+                }
+            }
+            else
+            {
+                pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 3:
+            if (EquippedOk(pPlayer, S_UNLEARN_TRIBAL))
+            {
+                if (pPlayer->GetMoney() >= uint32(GetUnlearnCostMedium(pPlayer)))
+                {
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_TRIBAL, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_TRIBAL);
+                    pPlayer->ModifyMoney(-GetUnlearnCostMedium(pPlayer));
+                }
+                else
+                {
+                    pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
+                }
+            }
+            else
+            {
+                pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        }
+    }
+
+    void SendConfirmUnlearn_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint32 uiAction)
+    {
+        if (uiAction)
+        {
+            uint32 eCreature = pCreature->GetEntry();
+            switch (eCreature)
+            {
+            case 7866:                                      // Peter Galen
+            case 7867:                                      // Thorkaf Dragoneye
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, GetUnlearnCostMedium(pPlayer), false);
+                // unknown textID ()
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            case 7868:                                      // Sarah Tanner
+            case 7869:                                      // Brumn Winterhoof
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, GetUnlearnCostMedium(pPlayer), false);
+                // unknown textID ()
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            case 7870:                                      // Caryssia Moonhunter
+            case 7871:                                      // Se'Jib
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, GetUnlearnCostMedium(pPlayer), false);
+                // unknown textID ()
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            }
+        }
+    }
+};
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+/*###
+# start menues tailoring
+###*/
+
+struct npc_prof_tailor : public CreatureScript
+{
+    npc_prof_tailor() : CreatureScript("npc_prof_tailor") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        if (pCreature->IsQuestGiver())
+        {
+            pPlayer->PrepareQuestMenu(pCreature->GetObjectGuid());
+        }
+        if (pCreature->IsVendor())
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+        }
+        if (pCreature->IsTrainer())
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
+        }
+
+        uint32 eCreature = pCreature->GetEntry();
+        // TAILORING SPEC
+        if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 350 && pPlayer->getLevel() > 59)
+        {
+            if (pPlayer->GetQuestRewardStatus(10831) || pPlayer->GetQuestRewardStatus(10832) || pPlayer->GetQuestRewardStatus(10833))
+            {
+                switch (eCreature)
+                {
+                case 22213:                                 // Gidge Spellweaver
+                    if (!HasTailorSpell(pPlayer))
+                    {
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 1);
+                    }
+                    if (pPlayer->HasSpell(S_SPELLFIRE))
+                    {
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 4);
+                    }
+                    break;
+                case 22208:                                 // Nasmara Moonsong
+                    if (!HasTailorSpell(pPlayer))
+                    {
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 2);
+                    }
+                    if (pPlayer->HasSpell(S_MOONCLOTH))
+                    {
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 5);
+                    }
+                    break;
+                case 22212:                                 // Andrion Darkspinner
+                    if (!HasTailorSpell(pPlayer))
+                    {
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE, GOSSIP_SENDER_LEARN, GOSSIP_ACTION_INFO_DEF + 3);
+                    }
+                    if (pPlayer->HasSpell(S_SHADOWEAVE))
+                    {
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 6);
+                    }
+                    break;
+                }
+            }
+        }
+
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiSender)
+        {
+        case GOSSIP_SENDER_MAIN:    SendActionMenu_npc_prof_tailor(pPlayer, pCreature, uiAction); break;
+        case GOSSIP_SENDER_LEARN:   SendConfirmLearn_npc_prof_tailor(pPlayer, pCreature, uiAction); break;
+        case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_tailor(pPlayer, pCreature, uiAction); break;
+        case GOSSIP_SENDER_CHECK:   SendActionMenu_npc_prof_tailor(pPlayer, pCreature, uiAction); break;
+        }
+        return true;
+    }
+
+private:
+    void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 uiAction)
+    {
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_TRADE:
+            pPlayer->SEND_VENDORLIST(pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_TRAIN:
+            pPlayer->SEND_TRAINERLIST(pCreature->GetObjectGuid());
+            break;
+            // Learn Tailor
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            if (!pPlayer->HasSpell(S_SPELLFIRE) && pPlayer->GetMoney() >= uint32(GetLearningCost(pPlayer)))
+            {
+                pPlayer->CastSpell(pPlayer, S_LEARN_SPELLFIRE, true);
+                pPlayer->ModifyMoney(-GetLearningCost(pPlayer));
+            }
+            else
+            {
+                pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            if (!pPlayer->HasSpell(S_MOONCLOTH) && pPlayer->GetMoney() >= uint32(GetLearningCost(pPlayer)))
+            {
+                pPlayer->CastSpell(pPlayer, S_LEARN_MOONCLOTH, true);
+                pPlayer->ModifyMoney(-GetLearningCost(pPlayer));
+            }
+            else
+            {
+                pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 3:
+            if (!pPlayer->HasSpell(S_SHADOWEAVE) && pPlayer->GetMoney() >= uint32(GetLearningCost(pPlayer)))
+            {
+                pPlayer->CastSpell(pPlayer, S_LEARN_SHADOWEAVE, true);
+                pPlayer->ModifyMoney(-GetLearningCost(pPlayer));
+            }
+            else
+            {
+                pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+            // Unlearn Tailor
+        case GOSSIP_ACTION_INFO_DEF + 4:
+            if (EquippedOk(pPlayer, S_UNLEARN_SPELLFIRE))
+            {
+                if (pPlayer->GetMoney() >= uint32(GetUnlearnCostHigh(pPlayer)))
+                {
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_SPELLFIRE, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SPELLFIRE);
+                    pPlayer->ModifyMoney(-GetUnlearnCostHigh(pPlayer));
+                }
+                else
+                {
+                    pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
+                }
+            }
+            else
+            {
+                pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 5:
+            if (EquippedOk(pPlayer, S_UNLEARN_MOONCLOTH))
+            {
+                if (pPlayer->GetMoney() >= uint32(GetUnlearnCostHigh(pPlayer)))
+                {
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_MOONCLOTH, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_MOONCLOTH);
+                    pPlayer->ModifyMoney(-GetUnlearnCostHigh(pPlayer));
+                }
+                else
+                {
+                    pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
+                }
+            }
+            else
+            {
+                pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 6:
+            if (EquippedOk(pPlayer, S_UNLEARN_SHADOWEAVE))
+            {
+                if (pPlayer->GetMoney() >= uint32(GetUnlearnCostHigh(pPlayer)))
+                {
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_SHADOWEAVE, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SHADOWEAVE);
+                    pPlayer->ModifyMoney(-GetUnlearnCostHigh(pPlayer));
+                }
+                else
+                {
+                    pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
+                }
+            }
+            else
+            {
+                pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
+            }
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+        }
+    }
+
+    void SendConfirmLearn_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 uiAction)
+    {
+        if (uiAction)
+        {
+            uint32 eCreature = pCreature->GetEntry();
+            switch (eCreature)
+            {
+            case 22213:
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction);
+                // unknown textID ()
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            case 22208:
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction);
+                // unknown textID ()
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            case 22212:
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction);
+                // unknown textID ()
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            }
+        }
+    }
+
+    void SendConfirmUnlearn_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 uiAction)
+    {
+        if (uiAction)
+        {
+            uint32 eCreature = pCreature->GetEntry();
+            switch (eCreature)
+            {
+            case 22213:                                     // Gidge Spellweaver
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, GetUnlearnCostHigh(pPlayer), false);
+                // unknown textID ()
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            case 22208:                                     // Nasmara Moonsong
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, GetUnlearnCostHigh(pPlayer), false);
+                // unknown textID ()
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            case 22212:                                     // Andrion Darkspinner
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, GetUnlearnCostHigh(pPlayer), false);
+                // unknown textID ()
+                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid());
+                break;
+            }
+        }
+    }
+
+    bool HasTailorSpell(Player* pPlayer)
+    {
+        if (pPlayer->HasSpell(S_MOONCLOTH) || pPlayer->HasSpell(S_SHADOWEAVE) || pPlayer->HasSpell(S_SPELLFIRE))
+        {
+            return true;
+        }
+        return false;
+    }
+};
+#endif
+/*###
+# start menues for GO (engineering and leatherworking)
+###*/
+
+/*bool GOUse_go_soothsaying_for_dummies(Player* pPlayer, GameObject* pGo)
+{
+    pPlayer->PlayerTalkClass->GetGossipMenu()->AddMenuItem(0,GOSSIP_LEARN_DRAGON, GOSSIP_SENDER_INFO, GOSSIP_ACTION_INFO_DEF, "", 0);
+
+    pPlayer->SEND_GOSSIP_MENU(5584, pGo->GetObjectGuid());
+
+    return true;
+}*/
+
+/*###
+#
+###*/
+
+void AddSC_npc_professions()
+{
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+    Script* s;
+
+    s = new npc_prof_blacksmith();
+    s->RegisterSelf();
+    s = new npc_prof_leather();
+    s->RegisterSelf();
+#endif
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+    s = new npc_prof_tailor();
+    s->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_prof_blacksmith";
+    //pNewScript->pGossipHello =  &GossipHello_npc_prof_blacksmith;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_prof_blacksmith;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_prof_leather";
+    //pNewScript->pGossipHello =  &GossipHello_npc_prof_leather;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_prof_leather;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_prof_tailor";
+    //pNewScript->pGossipHello =  &GossipHello_npc_prof_tailor;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_prof_tailor;
+    //pNewScript->RegisterSelf();
+#endif
+
+    /*pNewScript = new Script;
+    pNewScript->Name = "go_soothsaying_for_dummies";
+    pNewScript->pGOUse =  &GOUse_go_soothsaying_for_dummies;
+    // pNewScript->pGossipSelect = &GossipSelect_go_soothsaying_for_dummies;
+    pNewScript->RegisterSelf();*/
+}
diff --git a/src/modules/SD3/scripts/world/npcs_special.cpp b/src/modules/SD3/scripts/world/npcs_special.cpp
new file mode 100644
index 000000000..fe9ebcd9e
--- /dev/null
+++ b/src/modules/SD3/scripts/world/npcs_special.cpp
@@ -0,0 +1,1722 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Npcs_Special
+ * SD%Complete: 100
+ * SDComment:   To be used for special NPCs that are located globally.
+ * SDCategory:  NPCs
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "escort_ai.h"
+#include "pet_ai.h"
+#include "ObjectMgr.h"
+#include "GameEventMgr.h"
+
+/**
+ * ContentData
+ * npc_chicken_cluck          100%    support for quest 3861 (Cluck!)
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+ * npc_air_force_bots          80%    support for misc (invisible) guard bots in areas where player allowed to fly. Summon guards after a preset time if tagged by spell
+ * npc_dancing_flames         100%    midsummer event NPC
+ * npc_guardian               100%    guardianAI used to prevent players from accessing off-limits areas. Not in use by SD3
+#endif
+ * npc_garments_of_quests     100%    NPC's related to all Garments of-quests 5621, 5624, 5625, 5648, 5650
+ * npc_injured_patient         80%    patients for triage-quests (6622 and 6624)
+ * npc_doctor                 100%    Gustaf Vanhowzen and Gregory Victor, quest 6622 and 6624 (Triage)
+ * npc_innkeeper               25%    ScriptName not assigned. Innkeepers in general.
+#if defined (WOTLK) || defined (CATA)
+ * npc_spring_rabbit            1%    Used for pet "Spring Rabbit" of Noblegarden
+#endif
+ * npc_redemption_target      100%    Used for the paladin quests: 1779,1781,9600,9685
+ * EndContentData
+ */
+ 
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+/*########
+# npc_air_force_bots
+#########*/
+
+enum SpawnType
+{
+    SPAWNTYPE_TRIPWIRE_ROOFTOP,                             // no warning, summon creature at smaller range
+    SPAWNTYPE_ALARMBOT                                      // cast guards mark and summon npc - if player shows up with that buff duration < 5 seconds attack
+};
+
+struct SpawnAssociation
+{
+    uint32 m_uiThisCreatureEntry;
+    uint32 m_uiSpawnedCreatureEntry;
+    SpawnType m_SpawnType;
+};
+
+enum
+{
+    SPELL_GUARDS_MARK               = 38067,
+    AURA_DURATION_TIME_LEFT         = 5000
+};
+
+const float RANGE_TRIPWIRE          = 15.0f;
+const float RANGE_GUARDS_MARK       = 50.0f;
+
+SpawnAssociation m_aSpawnAssociations[] =
+{
+    {2614,  15241, SPAWNTYPE_ALARMBOT},                     // Air Force Alarm Bot (Alliance)
+    {2615,  15242, SPAWNTYPE_ALARMBOT},                     // Air Force Alarm Bot (Horde)
+    {21974, 21976, SPAWNTYPE_ALARMBOT},                     // Air Force Alarm Bot (Area 52)
+    {21993, 15242, SPAWNTYPE_ALARMBOT},                     // Air Force Guard Post (Horde - Bat Rider)
+    {21996, 15241, SPAWNTYPE_ALARMBOT},                     // Air Force Guard Post (Alliance - Gryphon)
+    {21997, 21976, SPAWNTYPE_ALARMBOT},                     // Air Force Guard Post (Goblin - Area 52 - Zeppelin)
+    {21999, 15241, SPAWNTYPE_TRIPWIRE_ROOFTOP},             // Air Force Trip Wire - Rooftop (Alliance)
+    {22001, 15242, SPAWNTYPE_TRIPWIRE_ROOFTOP},             // Air Force Trip Wire - Rooftop (Horde)
+    {22002, 15242, SPAWNTYPE_TRIPWIRE_ROOFTOP},             // Air Force Trip Wire - Ground (Horde)
+    {22003, 15241, SPAWNTYPE_TRIPWIRE_ROOFTOP},             // Air Force Trip Wire - Ground (Alliance)
+    {22063, 21976, SPAWNTYPE_TRIPWIRE_ROOFTOP},             // Air Force Trip Wire - Rooftop (Goblin - Area 52)
+    {22065, 22064, SPAWNTYPE_ALARMBOT},                     // Air Force Guard Post (Ethereal - Stormspire)
+    {22066, 22067, SPAWNTYPE_ALARMBOT},                     // Air Force Guard Post (Scryer - Dragonhawk)
+    {22068, 22064, SPAWNTYPE_TRIPWIRE_ROOFTOP},             // Air Force Trip Wire - Rooftop (Ethereal - Stormspire)
+    {22069, 22064, SPAWNTYPE_ALARMBOT},                     // Air Force Alarm Bot (Stormspire)
+    {22070, 22067, SPAWNTYPE_TRIPWIRE_ROOFTOP},             // Air Force Trip Wire - Rooftop (Scryer)
+    {22071, 22067, SPAWNTYPE_ALARMBOT},                     // Air Force Alarm Bot (Scryer)
+    {22078, 22077, SPAWNTYPE_ALARMBOT},                     // Air Force Alarm Bot (Aldor)
+    {22079, 22077, SPAWNTYPE_ALARMBOT},                     // Air Force Guard Post (Aldor - Gryphon)
+    {22080, 22077, SPAWNTYPE_TRIPWIRE_ROOFTOP},             // Air Force Trip Wire - Rooftop (Aldor)
+    {22086, 22085, SPAWNTYPE_ALARMBOT},                     // Air Force Alarm Bot (Sporeggar)
+    {22087, 22085, SPAWNTYPE_ALARMBOT},                     // Air Force Guard Post (Sporeggar - Spore Bat)
+    {22088, 22085, SPAWNTYPE_TRIPWIRE_ROOFTOP},             // Air Force Trip Wire - Rooftop (Sporeggar)
+    {22090, 22089, SPAWNTYPE_ALARMBOT},                     // Air Force Guard Post (Toshley's Station - Flying Machine)
+    {22124, 22122, SPAWNTYPE_ALARMBOT},                     // Air Force Alarm Bot (Cenarion)
+    {22125, 22122, SPAWNTYPE_ALARMBOT},                     // Air Force Guard Post (Cenarion - Stormcrow)
+    {22126, 22122, SPAWNTYPE_ALARMBOT}                      // Air Force Trip Wire - Rooftop (Cenarion Expedition)
+};
+
+struct npc_air_force_bots : public CreatureScript
+{
+    npc_air_force_bots() : CreatureScript("npc_air_force_bots") {}
+
+    struct npc_air_force_botsAI : public ScriptedAI
+    {
+        npc_air_force_botsAI(Creature* pCreature) : ScriptedAI(pCreature)
+        {
+            m_pSpawnAssoc = NULL;
+
+            // find the correct spawnhandling
+            for (uint8 i = 0; i < countof(m_aSpawnAssociations); ++i)
+            {
+                if (m_aSpawnAssociations[i].m_uiThisCreatureEntry == pCreature->GetEntry())
+                {
+                    m_pSpawnAssoc = &m_aSpawnAssociations[i];
+                    break;
+                }
+            }
+
+            if (!m_pSpawnAssoc)
+            {
+                error_db_log("SD3: Creature template entry %u has ScriptName npc_air_force_bots, but it's not handled by that script", pCreature->GetEntry());
+            }
+            else
+            {
+                CreatureInfo const* spawnedTemplate = GetCreatureTemplateStore(m_pSpawnAssoc->m_uiSpawnedCreatureEntry);
+
+                if (!spawnedTemplate)
+                {
+                    error_db_log("SD3: Creature template entry %u does not exist in DB, which is required by npc_air_force_bots", m_pSpawnAssoc->m_uiSpawnedCreatureEntry);
+                    m_pSpawnAssoc = NULL;
+                    return;
+                }
+            }
+        }
+
+        SpawnAssociation* m_pSpawnAssoc;
+        ObjectGuid m_spawnedGuid;
+
+        Creature* SummonGuard()
+        {
+            Creature* pSummoned = m_creature->SummonCreature(m_pSpawnAssoc->m_uiSpawnedCreatureEntry, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 300000);
+
+            if (pSummoned)
+            {
+                m_spawnedGuid = pSummoned->GetObjectGuid();
+            }
+            else
+            {
+                error_db_log("SD3: npc_air_force_bots: wasn't able to spawn creature %u", m_pSpawnAssoc->m_uiSpawnedCreatureEntry);
+                m_pSpawnAssoc = NULL;
+            }
+
+            return pSummoned;
+        }
+
+        void Reset() override {}
+
+        Creature* GetSummonedGuard()
+        {
+            Creature* pCreature = m_creature->GetMap()->GetCreature(m_spawnedGuid);
+
+            if (pCreature && pCreature->IsAlive())
+            {
+                return pCreature;
+            }
+
+            return NULL;
+        }
+
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (!m_pSpawnAssoc)
+            {
+                return;
+            }
+
+            if (pWho->IsTargetableForAttack() && m_creature->IsHostileTo(pWho))
+            {
+                Player* pPlayerTarget = pWho->GetTypeId() == TYPEID_PLAYER ? (Player*)pWho : NULL;
+
+                // airforce guards only spawn for players
+                if (!pPlayerTarget)
+                {
+                    return;
+                }
+
+                Creature* pLastSpawnedGuard = m_spawnedGuid ? GetSummonedGuard() : NULL;
+
+                // prevent calling GetCreature at next MoveInLineOfSight call - speedup
+                if (!pLastSpawnedGuard)
+                {
+                    m_spawnedGuid.Clear();
+                }
+
+                switch (m_pSpawnAssoc->m_SpawnType)
+                {
+                case SPAWNTYPE_ALARMBOT:
+                {
+                    if (!pWho->IsWithinDistInMap(m_creature, RANGE_GUARDS_MARK))
+                    {
+                        return;
+                    }
+
+                    Aura* pMarkAura = pWho->GetAura(SPELL_GUARDS_MARK, EFFECT_INDEX_0);
+                    if (pMarkAura)
+                    {
+                        // the target wasn't able to move out of our range within 25 seconds
+                        if (!pLastSpawnedGuard)
+                        {
+                            pLastSpawnedGuard = SummonGuard();
+
+                            if (!pLastSpawnedGuard)
+                            {
+                                return;
+                            }
+                        }
+
+                        if (pMarkAura->GetAuraDuration() < AURA_DURATION_TIME_LEFT)
+                        {
+                            if (!pLastSpawnedGuard->getVictim())
+                            {
+                                pLastSpawnedGuard->AI()->AttackStart(pWho);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if (!pLastSpawnedGuard)
+                        {
+                            pLastSpawnedGuard = SummonGuard();
+                        }
+
+                        if (!pLastSpawnedGuard)
+                        {
+                            return;
+                        }
+
+                        pLastSpawnedGuard->CastSpell(pWho, SPELL_GUARDS_MARK, true);
+                    }
+                    break;
+                }
+                case SPAWNTYPE_TRIPWIRE_ROOFTOP:
+                {
+                    if (!pWho->IsWithinDistInMap(m_creature, RANGE_TRIPWIRE))
+                    {
+                        return;
+                    }
+
+                    if (!pLastSpawnedGuard)
+                    {
+                        pLastSpawnedGuard = SummonGuard();
+                    }
+
+                    if (!pLastSpawnedGuard)
+                    {
+                        return;
+                    }
+
+                    // ROOFTOP only triggers if the player is on the ground
+                    if (!pPlayerTarget->IsFlying())
+                    {
+                        if (!pLastSpawnedGuard->getVictim())
+                        {
+                            pLastSpawnedGuard->AI()->AttackStart(pWho);
+                        }
+                    }
+                    break;
+                }
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_air_force_botsAI(pCreature);
+    }
+};
+#endif
+
+/*########
+# npc_chicken_cluck
+#########*/
+
+enum
+{
+    EMOTE_A_HELLO           = -1000204,
+    EMOTE_H_HELLO           = -1000205,
+    EMOTE_CLUCK_TEXT2       = -1000206,
+
+    QUEST_CLUCK             = 3861,
+    FACTION_FRIENDLY        = 35,
+    FACTION_CHICKEN         = 31
+};
+
+struct npc_chicken_cluck : public CreatureScript
+{
+    npc_chicken_cluck() : CreatureScript("npc_chicken_cluck") {}
+
+    struct npc_chicken_cluckAI : public ScriptedAI
+    {
+        npc_chicken_cluckAI(Creature* pCreature) : ScriptedAI(pCreature) {}
+
+        uint32 m_uiResetFlagTimer;
+
+        void Reset() override
+        {
+            m_uiResetFlagTimer = 120000;
+
+            m_creature->setFaction(FACTION_CHICKEN);
+            m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+        }
+
+        void ReceiveEmote(Player* pPlayer, uint32 uiEmote) override
+        {
+            if (uiEmote == TEXTEMOTE_CHICKEN)
+            {
+                if (!urand(0, 29))
+                {
+                    if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE)
+                    {
+                        m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                        m_creature->setFaction(FACTION_FRIENDLY);
+
+                        DoScriptText(EMOTE_A_HELLO, m_creature);
+
+                        /* are there any difference in texts, after 3.x ?
+                        if (pPlayer->GetTeam() == HORDE)
+                        DoScriptText(EMOTE_H_HELLO, m_creature);
+                        else
+                        DoScriptText(EMOTE_A_HELLO, m_creature);
+                        */
+                    }
+                }
+            }
+
+            if (uiEmote == TEXTEMOTE_CHEER)
+            {
+                if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_COMPLETE)
+                {
+                    m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                    m_creature->setFaction(FACTION_FRIENDLY);
+                    DoScriptText(EMOTE_CLUCK_TEXT2, m_creature);
+                }
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // Reset flags after a certain time has passed so that the next player has to start the 'event' again
+            if (m_creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER))
+            {
+                if (m_uiResetFlagTimer < uiDiff)
+                {
+                    EnterEvadeMode();
+                }
+                else
+                {
+                    m_uiResetFlagTimer -= uiDiff;
+                }
+            }
+
+            if (m_creature->SelectHostileTarget() && m_creature->getVictim())
+            {
+                DoMeleeAttackIfReady();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_chicken_cluckAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* /*pPlayer*/, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_CLUCK)
+        {
+            if (npc_chicken_cluckAI* pChickenAI = dynamic_cast<npc_chicken_cluckAI*>(pCreature->AI()))
+            {
+                pChickenAI->Reset();
+            }
+        }
+
+        return true;
+    }
+
+    bool OnQuestRewarded(Player* /*pPlayer*/, Creature* pCreature, const Quest* pQuest) override
+    {
+        if (pQuest->GetQuestId() == QUEST_CLUCK)
+        {
+            if (npc_chicken_cluckAI* pChickenAI = dynamic_cast<npc_chicken_cluckAI*>(pCreature->AI()))
+            {
+                pChickenAI->Reset();
+            }
+        }
+
+        return true;
+    }
+};
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+/*######
+## npc_dancing_flames
+######*/
+
+enum
+{
+    SPELL_FIERY_SEDUCTION = 47057
+};
+
+struct npc_dancing_flames : public CreatureScript
+{
+    npc_dancing_flames() : CreatureScript("npc_dancing_flames") {}
+
+    struct npc_dancing_flamesAI : public ScriptedAI
+    {
+        npc_dancing_flamesAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        void ReceiveEmote(Player* pPlayer, uint32 uiEmote) override
+        {
+            m_creature->SetFacingToObject(pPlayer);
+
+            if (pPlayer->HasAura(SPELL_FIERY_SEDUCTION))
+            {
+                pPlayer->RemoveAurasDueToSpell(SPELL_FIERY_SEDUCTION);
+            }
+
+            if (pPlayer->IsMounted())
+            {
+                pPlayer->Unmount();                             // doesnt remove mount aura
+                pPlayer->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
+            }
+
+            switch (uiEmote)
+            {
+            case TEXTEMOTE_DANCE: DoCastSpellIfCan(pPlayer, SPELL_FIERY_SEDUCTION); break;// dance -> cast SPELL_FIERY_SEDUCTION
+            case TEXTEMOTE_WAVE:  m_creature->HandleEmote(EMOTE_ONESHOT_WAVE);      break;// wave -> wave
+            case TEXTEMOTE_JOKE:  m_creature->HandleEmote(EMOTE_STATE_LAUGH);       break;// silly -> laugh(with sound)
+            case TEXTEMOTE_BOW:   m_creature->HandleEmote(EMOTE_ONESHOT_BOW);       break;// bow -> bow
+            case TEXTEMOTE_KISS:  m_creature->HandleEmote(TEXTEMOTE_CURTSEY);       break;// kiss -> curtsey
+            }
+        }
+
+        void Reset() override {}
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_dancing_flamesAI(pCreature);
+    }
+};
+#endif
+
+/*######
+## Triage quest
+######*/
+
+enum
+{
+    SAY_DOC1                    = -1000201,
+    SAY_DOC2                    = -1000202,
+    SAY_DOC3                    = -1000203,
+
+    QUEST_TRIAGE_H              = 6622,
+    QUEST_TRIAGE_A              = 6624,
+
+    DOCTOR_ALLIANCE             = 12939,
+    DOCTOR_HORDE                = 12920,
+    ALLIANCE_COORDS             = 7,
+    HORDE_COORDS                = 6
+};
+
+struct Location
+{
+    float x, y, z, o;
+};
+
+static Location AllianceCoords[] =
+{
+    { -3757.38f, -4533.05f, 14.16f, 3.62f},                 // Top-far-right bunk as seen from entrance
+    { -3754.36f, -4539.13f, 14.16f, 5.13f},                 // Top-far-left bunk
+    { -3749.54f, -4540.25f, 14.28f, 3.34f},                 // Far-right bunk
+    { -3742.10f, -4536.85f, 14.28f, 3.64f},                 // Right bunk near entrance
+    { -3755.89f, -4529.07f, 14.05f, 0.57f},                 // Far-left bunk
+    { -3749.51f, -4527.08f, 14.07f, 5.26f},                 // Mid-left bunk
+    { -3746.37f, -4525.35f, 14.16f, 5.22f},                 // Left bunk near entrance
+};
+
+// alliance run to where
+#define A_RUNTOX -3742.96f
+#define A_RUNTOY -4531.52f
+#define A_RUNTOZ 11.91f
+
+static Location HordeCoords[] =
+{
+    { -1013.75f, -3492.59f, 62.62f, 4.34f},                 // Left, Behind
+    { -1017.72f, -3490.92f, 62.62f, 4.34f},                 // Right, Behind
+    { -1015.77f, -3497.15f, 62.82f, 4.34f},                 // Left, Mid
+    { -1019.51f, -3495.49f, 62.82f, 4.34f},                 // Right, Mid
+    { -1017.25f, -3500.85f, 62.98f, 4.34f},                 // Left, front
+    { -1020.95f, -3499.21f, 62.98f, 4.34f}                  // Right, Front
+};
+
+// horde run to where
+#define H_RUNTOX -1016.44f
+#define H_RUNTOY -3508.48f
+#define H_RUNTOZ 62.96f
+
+const uint32 AllianceSoldierId[3] =
+{
+    12938,                                                  // 12938 Injured Alliance Soldier
+    12936,                                                  // 12936 Badly injured Alliance Soldier
+    12937                                                   // 12937 Critically injured Alliance Soldier
+};
+
+const uint32 HordeSoldierId[3] =
+{
+    12923,                                                  // 12923 Injured Soldier
+    12924,                                                  // 12924 Badly injured Soldier
+    12925                                                   // 12925 Critically injured Soldier
+};
+
+/*######
+## npc_doctor (handles both Gustaf Vanhowzen and Gregory Victor)
+######*/
+
+struct npc_doctor : public CreatureScript
+{
+    npc_doctor() : CreatureScript("npc_doctor") {}
+
+    struct npc_doctorAI : public ScriptedAI
+    {
+        npc_doctorAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_playerGuid;
+
+        uint32 m_uiSummonPatientTimer;
+        uint32 m_uiSummonPatientCount;
+        uint32 m_uiPatientDiedCount;
+        uint32 m_uiPatientSavedCount;
+
+        bool m_bIsEventInProgress;
+
+        GuidList m_lPatientGuids;
+        std::vector<Location*> m_vPatientSummonCoordinates;
+
+        void Reset() override
+        {
+            m_playerGuid.Clear();
+
+            m_uiSummonPatientTimer = 10000;
+            m_uiSummonPatientCount = 0;
+            m_uiPatientDiedCount = 0;
+            m_uiPatientSavedCount = 0;
+
+            m_lPatientGuids.clear();
+            if (!m_vPatientSummonCoordinates.empty())
+            {
+                for (std::vector<Location*>::iterator itr = m_vPatientSummonCoordinates.begin(); itr != m_vPatientSummonCoordinates.end(); ++itr)
+                    delete (*itr);
+                m_vPatientSummonCoordinates.clear();
+            }
+
+            m_bIsEventInProgress = false;
+
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void BeginEvent(Player* pPlayer)
+        {
+            m_playerGuid = pPlayer->GetObjectGuid();
+
+            m_uiSummonPatientTimer = 10000;
+            m_uiSummonPatientCount = 0;
+            m_uiPatientDiedCount = 0;
+            m_uiPatientSavedCount = 0;
+
+            switch (m_creature->GetEntry())
+            {
+            case DOCTOR_ALLIANCE:
+                for (uint8 i = 0; i < ALLIANCE_COORDS; ++i)
+                {
+                    m_vPatientSummonCoordinates.push_back(new Location(AllianceCoords[i]));
+                }
+                break;
+            case DOCTOR_HORDE:
+                for (uint8 i = 0; i < HORDE_COORDS; ++i)
+                {
+                    m_vPatientSummonCoordinates.push_back(new Location(HordeCoords[i]));
+                }
+                break;
+            }
+
+            m_bIsEventInProgress = true;
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        }
+
+        void PatientDied(Location* pPoint)
+        {
+            Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid);
+
+            if (pPlayer && (pPlayer->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE))
+            {
+                ++m_uiPatientDiedCount;
+
+                if (m_uiPatientDiedCount > 5 && m_bIsEventInProgress)
+                {
+                    if (pPlayer->GetQuestStatus(QUEST_TRIAGE_A) == QUEST_STATUS_INCOMPLETE)
+                    {
+                        pPlayer->FailQuest(QUEST_TRIAGE_A);
+                    }
+                    else if (pPlayer->GetQuestStatus(QUEST_TRIAGE_H) == QUEST_STATUS_INCOMPLETE)
+                    {
+                        pPlayer->FailQuest(QUEST_TRIAGE_H);
+                    }
+
+                    Reset();
+                    return;
+                }
+
+                m_vPatientSummonCoordinates.push_back(pPoint);
+            }
+            else
+                // If no player or player abandon quest in progress
+            {
+                Reset();
+            }
+        }
+
+        void PatientSaved(Creature* /*soldier*/, Player* pPlayer, Location* pPoint)
+        {
+            if (pPlayer && m_playerGuid == pPlayer->GetObjectGuid())
+            {
+                if (pPlayer->GetQuestStatus(QUEST_TRIAGE_A) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_TRIAGE_H) == QUEST_STATUS_INCOMPLETE)
+                {
+                    ++m_uiPatientSavedCount;
+
+                    if (m_uiPatientSavedCount == 15)
+                    {
+                        for (GuidList::const_iterator itr = m_lPatientGuids.begin(); itr != m_lPatientGuids.end(); ++itr)
+                        {
+                            if (Creature* Patient = m_creature->GetMap()->GetCreature(*itr))
+                            {
+                                Patient->SetDeathState(JUST_DIED);
+                            }
+                        }
+
+                        if (pPlayer->GetQuestStatus(QUEST_TRIAGE_A) == QUEST_STATUS_INCOMPLETE)
+                        {
+                            pPlayer->GroupEventHappens(QUEST_TRIAGE_A, m_creature);
+                        }
+                        else if (pPlayer->GetQuestStatus(QUEST_TRIAGE_H) == QUEST_STATUS_INCOMPLETE)
+                        {
+                            pPlayer->GroupEventHappens(QUEST_TRIAGE_H, m_creature);
+                        }
+
+                        Reset();
+                        return;
+                    }
+
+                    m_vPatientSummonCoordinates.push_back(pPoint);
+                }
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            Location *loc = new Location();
+            loc->x = pSender->GetPositionX();
+            loc->y = pSender->GetPositionY();
+            loc->z = pSender->GetPositionZ();
+            loc->o = pSender->GetOrientation();
+            if (eventType == AI_EVENT_CUSTOM_A && pInvoker->GetTypeId() == TYPEID_PLAYER)
+            {
+                PatientSaved(pSender, pInvoker->ToPlayer(), loc);
+            }
+            else if (eventType == AI_EVENT_CUSTOM_B && pInvoker == pSender)
+            {
+                PatientDied(loc);
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_bIsEventInProgress && m_uiSummonPatientCount >= 20)
+            {
+                Reset();
+                return;
+            }
+
+            if (m_bIsEventInProgress && !m_vPatientSummonCoordinates.empty())
+            {
+                if (m_uiSummonPatientTimer < uiDiff)
+                {
+                    std::vector<Location*>::iterator itr = m_vPatientSummonCoordinates.begin() + urand(0, m_vPatientSummonCoordinates.size() - 1);
+                    uint32 patientEntry = 0;
+
+                    switch (m_creature->GetEntry())
+                    {
+                    case DOCTOR_ALLIANCE:
+                        patientEntry = AllianceSoldierId[urand(0, 2)];
+                        break;
+                    case DOCTOR_HORDE:
+                        patientEntry = HordeSoldierId[urand(0, 2)];
+                        break;
+                    default:
+                        script_error_log("Invalid entry for Triage doctor. Please check your database");
+                        return;
+                    }
+
+                    if (Creature* Patient = m_creature->SummonCreature(patientEntry, (*itr)->x, (*itr)->y, (*itr)->z, (*itr)->o, TEMPSUMMON_TIMED_OOC_DESPAWN, 5000))
+                    {
+#if defined (CLASSIC) || defined (TBC)
+                        // 2.4.3, this flag appear to be required for client side item->spell to work (TARGET_SINGLE_FRIEND)
+                        Patient->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP);
+#endif
+#if defined (WOTLK) || defined (CATA)
+                // 303, this flag appear to be required for client side item->spell to work (TARGET_SINGLE_FRIEND)
+                Patient->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
+#endif
+
+                        m_lPatientGuids.push_back(Patient->GetObjectGuid());
+
+                        if (CreatureAI* pPatientAI = Patient->AI())
+                        {
+                            SendAIEvent(AI_EVENT_CUSTOM_A, m_creature, Patient);
+                            //pPatientAI->m_doctorGuid = m_creature->GetObjectGuid();
+                            //pPatientAI->m_pCoord = *itr;
+                            delete (*itr);
+                            m_vPatientSummonCoordinates.erase(itr);
+                        }
+                    }
+                    m_uiSummonPatientTimer = 10000;
+                    ++m_uiSummonPatientCount;
+                }
+                else
+                {
+                    m_uiSummonPatientTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_doctorAI(pCreature);
+    }
+
+    bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) override
+    {
+        if ((pQuest->GetQuestId() == QUEST_TRIAGE_A) || (pQuest->GetQuestId() == QUEST_TRIAGE_H))
+        {
+            if (npc_doctorAI* pDocAI = dynamic_cast<npc_doctorAI*>(pCreature->AI()))
+            {
+                pDocAI->BeginEvent(pPlayer);
+            }
+        }
+
+        return true;
+    }
+};
+
+/*#####
+## npc_injured_patient (handles all the patients, no matter Horde or Alliance)
+#####*/
+
+struct npc_injured_patient : public CreatureScript
+{
+    npc_injured_patient() : CreatureScript("npc_injured_patient") {}
+
+    struct npc_injured_patientAI : public ScriptedAI
+    {
+        npc_injured_patientAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        ObjectGuid m_doctorGuid;
+        Location* m_pCoord;
+
+        void Reset() override
+        {
+            m_doctorGuid.Clear();
+            m_pCoord = NULL;
+
+            // no select
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            // no regen health
+            m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
+            // to make them lay with face down
+            m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+
+            switch (m_creature->GetEntry())
+            {
+                // lower max health
+            case 12923:
+            case 12938:                                     // Injured Soldier
+                m_creature->SetHealth(uint32(m_creature->GetMaxHealth()*.75));
+                break;
+            case 12924:
+            case 12936:                                     // Badly injured Soldier
+                m_creature->SetHealth(uint32(m_creature->GetMaxHealth()*.50));
+                break;
+            case 12925:
+            case 12937:                                     // Critically injured Soldier
+                m_creature->SetHealth(uint32(m_creature->GetMaxHealth()*.25));
+                break;
+            }
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pCaster->GetTypeId() == TYPEID_PLAYER && m_creature->IsAlive() && pSpell->Id == 20804)
+            {
+                Player* pPlayer = static_cast<Player*>(pCaster);
+                if (pPlayer->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)
+                {
+                    if (Creature* pDoctor = m_creature->GetMap()->GetCreature(m_doctorGuid))
+                    {
+                        if (CreatureAI* pDocAI = pDoctor->AI())
+                        {
+                            SendAIEvent(AI_EVENT_CUSTOM_A, pPlayer, pDoctor);
+                            //pDocAI->PatientSaved(m_creature, pPlayer, m_pCoord);
+                        }
+                    }
+                }
+
+                // quick boost to health to prevent death before next tick can occur
+                m_creature->SetHealth(uint32(m_creature->GetMaxHealth()*0.20));
+
+                // make not selectable
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                // regen health
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
+                // stand up
+                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+
+                switch (urand(0, 2))
+                {
+                case 0:
+                    DoScriptText(SAY_DOC1, m_creature);
+                    break;
+                case 1:
+                    DoScriptText(SAY_DOC2, m_creature);
+                    break;
+                case 2:
+                    DoScriptText(SAY_DOC3, m_creature);
+                    break;
+                }
+
+                m_creature->SetWalk(false);
+
+                switch (m_creature->GetEntry())
+                {
+                case 12923:
+                case 12924:
+                case 12925:
+                    m_creature->GetMotionMaster()->MovePoint(0, H_RUNTOX, H_RUNTOY, H_RUNTOZ);
+                    break;
+                case 12936:
+                case 12937:
+                case 12938:
+                    m_creature->GetMotionMaster()->MovePoint(0, A_RUNTOX, A_RUNTOY, A_RUNTOZ);
+                    break;
+                }
+            }
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && (pSender->GetEntry() == DOCTOR_ALLIANCE || pSender->GetEntry() == DOCTOR_HORDE))
+            {
+                if (!m_pCoord)
+                    m_pCoord = new Location();
+                m_pCoord->x = m_creature->GetPositionX();
+                m_pCoord->y = m_creature->GetPositionY();
+                m_pCoord->z = m_creature->GetPositionZ();
+                m_pCoord->o = m_creature->GetOrientation();
+                m_doctorGuid = pSender->GetObjectGuid();
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            // lower HP on every world tick makes it a useful counter, not officlone though
+            uint32 uiHPLose = uint32(0.03f * uiDiff);
+            if (m_creature->IsAlive() && m_creature->GetHealth() > 1 + uiHPLose)
+            {
+                m_creature->SetHealth(m_creature->GetHealth() - uiHPLose);
+            }
+
+            if (m_creature->IsAlive() && m_creature->GetHealth() <= 1 + uiHPLose)
+            {
+                m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
+                m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                m_creature->SetDeathState(JUST_DIED);
+                m_creature->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
+
+                if (Creature* pDoctor = m_creature->GetMap()->GetCreature(m_doctorGuid))
+                {
+                    if (CreatureAI* pDocAI = pDoctor->AI())
+                    {
+                        SendAIEvent(AI_EVENT_CUSTOM_B, m_creature, pDoctor);
+                        //pDocAI->PatientDied(m_pCoord);
+                    }
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_injured_patientAI(pCreature);
+    }
+};
+
+/*######
+## npc_garments_of_quests
+######*/
+
+enum
+{
+    SPELL_LESSER_HEAL_R2    = 2052,
+    SPELL_FORTITUDE_R1      = 1243,
+
+    QUEST_MOON              = 5621,
+    QUEST_LIGHT_1           = 5624,
+    QUEST_LIGHT_2           = 5625,
+    QUEST_SPIRIT            = 5648,
+    QUEST_DARKNESS          = 5650,
+
+    ENTRY_SHAYA             = 12429,
+    ENTRY_ROBERTS           = 12423,
+    ENTRY_DOLF              = 12427,
+    ENTRY_KORJA             = 12430,
+    ENTRY_DG_KEL            = 12428,
+
+    SAY_COMMON_HEALED       = -1000231,
+    SAY_DG_KEL_THANKS       = -1000232,
+    SAY_DG_KEL_GOODBYE      = -1000233,
+    SAY_ROBERTS_THANKS      = -1000256,
+    SAY_ROBERTS_GOODBYE     = -1000257,
+    SAY_KORJA_THANKS        = -1000258,
+    SAY_KORJA_GOODBYE       = -1000259,
+    SAY_DOLF_THANKS         = -1000260,
+    SAY_DOLF_GOODBYE        = -1000261,
+    SAY_SHAYA_THANKS        = -1000262,
+    SAY_SHAYA_GOODBYE       = -1000263,
+};
+
+struct npc_garments_of_quests : public CreatureScript
+{
+    npc_garments_of_quests() : CreatureScript("npc_garments_of_quests") {}
+
+    struct npc_garments_of_questsAI : public npc_escortAI
+    {
+        npc_garments_of_questsAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+        ObjectGuid m_playerGuid;
+
+        bool m_bIsHealed;
+        bool m_bCanRun;
+
+        uint32 m_uiRunAwayTimer;
+
+        void Reset() override
+        {
+            m_playerGuid.Clear();
+
+            m_bIsHealed = false;
+            m_bCanRun = false;
+
+            m_uiRunAwayTimer = 5000;
+
+            m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
+            // expect database to have RegenHealth=0
+            m_creature->SetHealth(int(m_creature->GetMaxHealth() * 0.7));
+            m_creature->SetPvP(true);   // allow the mob to be healed by player
+        }
+
+        void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override
+        {
+            if (pSpell->Id == SPELL_LESSER_HEAL_R2 || pSpell->Id == SPELL_FORTITUDE_R1)
+            {
+                // not while in combat
+                if (m_creature->IsInCombat())
+                {
+                    return;
+                }
+
+                // nothing to be done now
+                if (m_bIsHealed && m_bCanRun)
+                {
+                    return;
+                }
+
+                if (pCaster->GetTypeId() == TYPEID_PLAYER)
+                {
+                    switch (m_creature->GetEntry())
+                    {
+                    case ENTRY_SHAYA:
+                        if (((Player*)pCaster)->GetQuestStatus(QUEST_MOON) == QUEST_STATUS_INCOMPLETE)
+                        {
+                            if (m_bIsHealed && !m_bCanRun && pSpell->Id == SPELL_FORTITUDE_R1)
+                            {
+                                DoScriptText(SAY_SHAYA_THANKS, m_creature, pCaster);
+                                m_bCanRun = true;
+                            }
+                            else if (!m_bIsHealed && pSpell->Id == SPELL_LESSER_HEAL_R2)
+                            {
+                                m_playerGuid = pCaster->GetObjectGuid();
+                                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                                DoScriptText(SAY_COMMON_HEALED, m_creature, pCaster);
+                                m_bIsHealed = true;
+                            }
+                        }
+                        break;
+                    case ENTRY_ROBERTS:
+                        if (((Player*)pCaster)->GetQuestStatus(QUEST_LIGHT_1) == QUEST_STATUS_INCOMPLETE)
+                        {
+                            if (m_bIsHealed && !m_bCanRun && pSpell->Id == SPELL_FORTITUDE_R1)
+                            {
+                                DoScriptText(SAY_ROBERTS_THANKS, m_creature, pCaster);
+                                m_bCanRun = true;
+                            }
+                            else if (!m_bIsHealed && pSpell->Id == SPELL_LESSER_HEAL_R2)
+                            {
+                                m_playerGuid = pCaster->GetObjectGuid();
+                                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                                DoScriptText(SAY_COMMON_HEALED, m_creature, pCaster);
+                                m_bIsHealed = true;
+                            }
+                        }
+                        break;
+                    case ENTRY_DOLF:
+                        if (((Player*)pCaster)->GetQuestStatus(QUEST_LIGHT_2) == QUEST_STATUS_INCOMPLETE)
+                        {
+                            if (m_bIsHealed && !m_bCanRun && pSpell->Id == SPELL_FORTITUDE_R1)
+                            {
+                                DoScriptText(SAY_DOLF_THANKS, m_creature, pCaster);
+                                m_bCanRun = true;
+                            }
+                            else if (!m_bIsHealed && pSpell->Id == SPELL_LESSER_HEAL_R2)
+                            {
+                                m_playerGuid = pCaster->GetObjectGuid();
+                                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                                DoScriptText(SAY_COMMON_HEALED, m_creature, pCaster);
+                                m_bIsHealed = true;
+                            }
+                        }
+                        break;
+                    case ENTRY_KORJA:
+                        if (((Player*)pCaster)->GetQuestStatus(QUEST_SPIRIT) == QUEST_STATUS_INCOMPLETE)
+                        {
+                            if (m_bIsHealed && !m_bCanRun && pSpell->Id == SPELL_FORTITUDE_R1)
+                            {
+                                DoScriptText(SAY_KORJA_THANKS, m_creature, pCaster);
+                                m_bCanRun = true;
+                            }
+                            else if (!m_bIsHealed && pSpell->Id == SPELL_LESSER_HEAL_R2)
+                            {
+                                m_playerGuid = pCaster->GetObjectGuid();
+                                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                                DoScriptText(SAY_COMMON_HEALED, m_creature, pCaster);
+                                m_bIsHealed = true;
+                            }
+                        }
+                        break;
+                    case ENTRY_DG_KEL:
+                        if (((Player*)pCaster)->GetQuestStatus(QUEST_DARKNESS) == QUEST_STATUS_INCOMPLETE)
+                        {
+                            if (m_bIsHealed && !m_bCanRun && pSpell->Id == SPELL_FORTITUDE_R1)
+                            {
+                                DoScriptText(SAY_DG_KEL_THANKS, m_creature, pCaster);
+                                m_bCanRun = true;
+                            }
+                            else if (!m_bIsHealed && pSpell->Id == SPELL_LESSER_HEAL_R2)
+                            {
+                                m_playerGuid = pCaster->GetObjectGuid();
+                                m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                                DoScriptText(SAY_COMMON_HEALED, m_creature, pCaster);
+                                m_bIsHealed = true;
+                            }
+                        }
+                        break;
+                    }
+
+                    // give quest credit, not expect any special quest objectives
+                    if (m_bCanRun)
+                    {
+                        ((Player*)pCaster)->TalkedToCreature(m_creature->GetEntry(), m_creature->GetObjectGuid());
+                    }
+                }
+            }
+        }
+
+        void WaypointReached(uint32 /*uiPointId*/) override {}
+
+        void UpdateEscortAI(const uint32 uiDiff) override
+        {
+            if (m_bCanRun && !m_creature->IsInCombat())
+            {
+                if (m_uiRunAwayTimer <= uiDiff)
+                {
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                    {
+                        switch (m_creature->GetEntry())
+                        {
+                        case ENTRY_SHAYA:
+                            DoScriptText(SAY_SHAYA_GOODBYE, m_creature, pPlayer);
+                            break;
+                        case ENTRY_ROBERTS:
+                            DoScriptText(SAY_ROBERTS_GOODBYE, m_creature, pPlayer);
+                            break;
+                        case ENTRY_DOLF:
+                            DoScriptText(SAY_DOLF_GOODBYE, m_creature, pPlayer);
+                            break;
+                        case ENTRY_KORJA:
+                            DoScriptText(SAY_KORJA_GOODBYE, m_creature, pPlayer);
+                            break;
+                        case ENTRY_DG_KEL:
+                            DoScriptText(SAY_DG_KEL_GOODBYE, m_creature, pPlayer);
+                            break;
+                        }
+
+                        Start(true);
+                    }
+                    else
+                    {
+                        EnterEvadeMode();    // something went wrong
+                    }
+
+                    m_uiRunAwayTimer = 30000;
+                }
+                else
+                {
+                    m_uiRunAwayTimer -= uiDiff;
+                }
+            }
+
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            DoMeleeAttackIfReady();
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_garments_of_questsAI(pCreature);
+    }
+};
+
+/*######
+## npc_guardian
+######*/
+
+#define SPELL_DEATHTOUCH                5
+
+struct npc_guardian : public CreatureScript
+{
+    npc_guardian() : CreatureScript("npc_guardian") {}
+
+    struct npc_guardianAI : public ScriptedAI
+    {
+        npc_guardianAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+        void Reset() override
+        {
+        }
+
+        void UpdateAI(const uint32 /*diff*/) override
+        {
+            if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
+            {
+                return;
+            }
+
+            if (m_creature->isAttackReady())
+            {
+                m_creature->CastSpell(m_creature->getVictim(), SPELL_DEATHTOUCH, true);
+                m_creature->resetAttackTimer();
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_guardianAI(pCreature);
+    }
+};
+
+/*########
+# npc_innkeeper
+#########*/
+
+// Script applied to all innkeepers by npcflag.
+// Are there any known innkeepers that does not hape the options in the below?
+// (remember gossipHello is not called unless npcflag|1 is present)
+
+enum
+{
+    TEXT_ID_WHAT_TO_DO              = 1853,
+
+    SPELL_TRICK_OR_TREAT            = 24751,                // create item or random buff
+    SPELL_TRICK_OR_TREATED          = 24755,                // buff player get when tricked or treated
+};
+//TODO prepare for localisation
+#define GOSSIP_ITEM_TRICK_OR_TREAT  "Trick or Treat!"
+#define GOSSIP_ITEM_WHAT_TO_DO      "What can I do at an Inn?"
+
+struct npc_innkeeper : public CreatureScript
+{
+    npc_innkeeper() : CreatureScript("npc_innkeeper") {}
+
+    bool OnGossipHello(Player* pPlayer, Creature* pCreature) override
+    {
+        pPlayer->PrepareGossipMenu(pCreature, pPlayer->GetDefaultGossipMenuForSource(pCreature));
+
+        if (IsHolidayActive(HOLIDAY_HALLOWS_END) && !pPlayer->HasAura(SPELL_TRICK_OR_TREATED, EFFECT_INDEX_0))
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TRICK_OR_TREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+        }
+
+        // Should only apply to innkeeper close to start areas.
+        if (AreaTableEntry const* pAreaEntry = GetAreaEntryByAreaID(pCreature->GetAreaId()))
+        {
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+            // Note: this area flag doesn't exist in 1.12.1. The behavior of this gossip require additional research
+        if (pAreaEntry->flags & AREA_FLAG_LOWLEVEL)
+#endif
+            {
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_WHAT_TO_DO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            }
+        }
+
+        pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetObjectGuid());
+        pPlayer->SendPreparedGossip(pCreature);
+        return true;
+    }
+
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) override
+    {
+        pPlayer->PlayerTalkClass->ClearMenus();
+        switch (uiAction)
+        {
+        case GOSSIP_ACTION_INFO_DEF + 1:
+            pPlayer->SEND_GOSSIP_MENU(TEXT_ID_WHAT_TO_DO, pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_ACTION_INFO_DEF + 2:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pCreature->CastSpell(pPlayer, SPELL_TRICK_OR_TREAT, true);
+            break;
+        case GOSSIP_OPTION_VENDOR:
+            pPlayer->SEND_VENDORLIST(pCreature->GetObjectGuid());
+            break;
+        case GOSSIP_OPTION_INNKEEPER:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->SetBindPoint(pCreature->GetObjectGuid());
+            break;
+        }
+
+        return true;
+    }
+};
+
+#if defined (WOTLK) || defined (CATA)
+/*######
+## npc_spring_rabbit
+## ATTENTION: This is actually a "fun" script, entirely done without proper source!
+######*/
+
+enum
+{
+    NPC_SPRING_RABBIT           = 32791,
+
+    SPELL_SPRING_RABBIT_JUMP    = 61724,
+    SPELL_SPRING_RABBIT_WANDER  = 61726,
+    SEPLL_SUMMON_BABY_BUNNY     = 61727,
+    SPELL_SPRING_RABBIT_IN_LOVE = 61728,
+    SPELL_SPRING_FLING          = 61875,
+};
+
+static const float DIST_START_EVENT = 15.0f;                // Guesswork
+
+struct npc_spring_rabbit : public CreatureScript
+{
+    npc_spring_rabbit() : CreatureScript("npc_spring_rabbit") {}
+
+    struct  npc_spring_rabbitAI : public ScriptedPetAI
+    {
+        npc_spring_rabbitAI(Creature* pCreature) : ScriptedPetAI(pCreature) { }
+
+        ObjectGuid m_partnerGuid;
+        uint32 m_uiStep;
+        uint32 m_uiStepTimer;
+        float m_fMoveAngle;
+
+        void Reset() override
+        {
+            m_uiStep = 0;
+            m_uiStepTimer = 0;
+            m_partnerGuid.Clear();
+            m_fMoveAngle = 0.0f;
+        }
+
+        bool CanStartWhatRabbitsDo() { return !m_partnerGuid && !m_uiStepTimer; }
+
+        void StartWhatRabbitsDo(Creature* pPartner)
+        {
+            m_partnerGuid = pPartner->GetObjectGuid();
+            m_uiStep = 1;
+            m_uiStepTimer = 30000;
+            // Calculate meeting position
+            float m_fMoveAngle = m_creature->GetAngle(pPartner);
+            float fDist = m_creature->GetDistance(pPartner);
+            float fX, fY, fZ;
+            m_creature->GetNearPoint(m_creature, fX, fY, fZ, m_creature->GetObjectBoundingRadius(), fDist * 0.5f, m_fMoveAngle);
+
+            m_creature->GetMotionMaster()->Clear();
+            m_creature->GetMotionMaster()->MovePoint(1, fX, fY, fZ);
+        }
+
+        // Helper to get the Other Bunnies AI
+        npc_spring_rabbitAI* GetPartnerAI(Creature* pBunny = NULL)
+        {
+            if (!pBunny)
+                pBunny = m_creature->GetMap()->GetAnyTypeCreature(m_partnerGuid);
+
+            if (!pBunny)
+                return NULL;
+
+            return dynamic_cast<npc_spring_rabbitAI*>(pBunny->AI());
+        }
+
+        // Event Starts when two rabbits see each other
+        void MoveInLineOfSight(Unit* pWho) override
+        {
+            if (m_creature->getVictim())
+                return;
+
+            if (pWho->GetTypeId() == TYPEID_UNIT && pWho->GetEntry() == NPC_SPRING_RABBIT && CanStartWhatRabbitsDo() && m_creature->IsFriendlyTo(pWho) && m_creature->IsWithinDistInMap(pWho, DIST_START_EVENT, true))
+            {
+                if (npc_spring_rabbitAI* pOtherBunnyAI = GetPartnerAI((Creature*)pWho))
+                {
+                    if (pOtherBunnyAI->CanStartWhatRabbitsDo())
+                    {
+                        StartWhatRabbitsDo((Creature*)pWho);
+                        pOtherBunnyAI->StartWhatRabbitsDo(m_creature);
+                    }
+                }
+                return;
+            }
+
+            ScriptedPetAI::MoveInLineOfSight(pWho);
+        }
+
+        bool ReachedMeetingPlace()
+        {
+            if (m_uiStep == 3)                                  // Already there
+            {
+                m_uiStepTimer = 3000;
+                m_uiStep = 2;
+                return true;
+            }
+            else
+                return false;
+        }
+
+        void MovementInform(uint32 uiMovementType, uint32 uiData) override
+        {
+            if (uiMovementType != POINT_MOTION_TYPE || uiData != 1)
+                return;
+
+            if (!m_partnerGuid)
+                return;
+
+            m_uiStep = 3;
+            if (npc_spring_rabbitAI* pOtherBunnyAI = GetPartnerAI())
+            {
+                if (pOtherBunnyAI->ReachedMeetingPlace())
+                {
+                    m_creature->SetFacingTo(pOtherBunnyAI->m_creature->GetOrientation());
+                    m_uiStepTimer = 3000;
+                }
+                else
+                    m_creature->SetFacingTo(m_fMoveAngle + M_PI_F * 0.5f);
+            }
+
+            // m_creature->GetMotionMaster()->MoveRandom(); // does not move around current position, hence not usefull right now
+            m_creature->GetMotionMaster()->MoveIdle();
+        }
+
+        // Overwrite ScriptedPetAI::UpdateAI, to prevent re-following while the event is active!
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (!m_partnerGuid || !m_uiStepTimer)
+            {
+                ScriptedPetAI::UpdateAI(uiDiff);
+                return;
+            }
+
+            if (m_uiStep == 6)
+                ScriptedPetAI::UpdateAI(uiDiff);                // Event nearly finished, do normal following
+
+            if (m_uiStepTimer <= uiDiff)
+            {
+                switch (m_uiStep)
+                {
+                case 1:                                     // Timer expired, before reached meeting point. Reset.
+                    Reset();
+                    break;
+
+                case 2:                                     // Called for the rabbit first reached meeting point
+                    if (Creature* pBunny = m_creature->GetMap()->GetAnyTypeCreature(m_partnerGuid))
+                        pBunny->CastSpell(pBunny, SPELL_SPRING_RABBIT_IN_LOVE, false);
+
+                    DoCastSpellIfCan(m_creature, SPELL_SPRING_RABBIT_IN_LOVE);
+                    // no break here
+                case 3:
+                    m_uiStepTimer = 5000;
+                    m_uiStep += 2;
+                    break;
+
+                case 4:                                     // Called for the rabbit first reached meeting point
+                    DoCastSpellIfCan(m_creature, SEPLL_SUMMON_BABY_BUNNY);
+                    // no break here
+                case 5:
+                    // Let owner cast achievement related spell
+                    if (Unit* pOwner = m_creature->GetCharmerOrOwner())
+                        pOwner->CastSpell(pOwner, SPELL_SPRING_FLING, true);
+
+                    m_uiStep = 6;
+                    m_uiStepTimer = 30000;
+                    break;
+                case 6:
+                    m_creature->RemoveAurasDueToSpell(SPELL_SPRING_RABBIT_IN_LOVE);
+                    Reset();
+                    break;
+                }
+            }
+            else
+                m_uiStepTimer -= uiDiff;
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_spring_rabbitAI(pCreature);
+    }
+};
+#endif
+
+/*######
+## npc_redemption_target
+######*/
+
+enum
+{
+    SAY_HEAL                    = -1000187,
+
+    SPELL_SYMBOL_OF_LIFE        = 8593,
+    SPELL_SHIMMERING_VESSEL     = 31225,    //TODO [-Zero]? no such spell
+    SPELL_REVIVE_SELF           = 32343,
+
+    NPC_FURBOLG_SHAMAN          = 17542,        // draenei side
+    NPC_BLOOD_KNIGHT            = 17768,        // blood elf side
+};
+
+struct npc_redemption_target : public CreatureScript
+{
+    npc_redemption_target() : CreatureScript("npc_redemption_target") {}
+
+    struct npc_redemption_targetAI : public ScriptedAI
+    {
+        npc_redemption_targetAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+        uint32 m_uiEvadeTimer;
+        uint32 m_uiHealTimer;
+
+        ObjectGuid m_playerGuid;
+
+        void Reset() override
+        {
+            m_uiEvadeTimer = 0;
+            m_uiHealTimer = 0;
+
+            m_creature->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
+            m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
+        }
+
+        void DoReviveSelf(ObjectGuid m_guid)
+        {
+            // Wait until he resets again
+            if (m_uiEvadeTimer)
+            {
+                return;
+            }
+
+            DoCastSpellIfCan(m_creature, SPELL_REVIVE_SELF);
+            m_creature->SetDeathState(JUST_ALIVED);
+            m_playerGuid = m_guid;
+            m_uiHealTimer = 2000;
+        }
+
+        void ReceiveAIEvent(AIEventType eventType, Creature* pSender, Unit* pInvoker, uint32 /*uiMiscValue*/) override
+        {
+            if (eventType == AI_EVENT_CUSTOM_A && pSender == m_creature)
+            {
+                DoReviveSelf(pInvoker->GetObjectGuid());
+            }
+        }
+
+        void UpdateAI(const uint32 uiDiff) override
+        {
+            if (m_uiHealTimer)
+            {
+                if (m_uiHealTimer <= uiDiff)
+                {
+                    if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_playerGuid))
+                    {
+                        DoScriptText(SAY_HEAL, m_creature, pPlayer);
+
+                        // Quests 9600 and 9685 requires kill credit
+                        if (m_creature->GetEntry() == NPC_FURBOLG_SHAMAN || m_creature->GetEntry() == NPC_BLOOD_KNIGHT)
+                        {
+                            pPlayer->KilledMonsterCredit(m_creature->GetEntry(), m_creature->GetObjectGuid());
+                        }
+                    }
+
+                    m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
+                    m_creature->SetStandState(UNIT_STAND_STATE_STAND);
+                    m_uiHealTimer = 0;
+                    m_uiEvadeTimer = 2 * MINUTE * IN_MILLISECONDS;
+                }
+                else
+                {
+                    m_uiHealTimer -= uiDiff;
+                }
+            }
+
+            if (m_uiEvadeTimer)
+            {
+                if (m_uiEvadeTimer <= uiDiff)
+                {
+                    EnterEvadeMode();
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+                m_uiEvadeTimer = 0;
+#endif
+                }
+                else
+                {
+                    m_uiEvadeTimer -= uiDiff;
+                }
+            }
+        }
+    };
+
+    CreatureAI* GetAI(Creature* pCreature) override
+    {
+        return new npc_redemption_targetAI(pCreature);
+    }
+};
+
+#if defined (CLASSIC)
+struct spell_npc_redemption_target : public SpellScript
+{
+    spell_npc_redemption_target() : SpellScript("spell_npc_redemption_target") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pCreatureTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if ((uiSpellId == SPELL_SYMBOL_OF_LIFE || uiSpellId == SPELL_SHIMMERING_VESSEL) && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (CreatureAI* pTargetAI = pCreatureTarget->ToCreature()->AI())
+            {
+                pTargetAI->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pCreatureTarget->ToCreature());//>DoReviveSelf(pCaster->GetObjectGuid());
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+#endif
+#if defined(TBC) || defined(WOTLK)
+struct spell_symbol_of_life : public SpellScript
+{
+    spell_symbol_of_life() : SpellScript("spell_symbol_of_life") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        // always check spellid and effectindex
+        if ((uiSpellId == SPELL_SYMBOL_OF_LIFE || uiSpellId == SPELL_SHIMMERING_VESSEL) && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (CreatureAI* pTargetAI = pTarget->ToCreature()->AI())
+            {
+                pTargetAI->SendAIEvent(AI_EVENT_CUSTOM_A, pCaster, pTarget->ToCreature());//>DoReviveSelf(pCaster->GetObjectGuid());
+            }
+
+            // always return true when we are handling this spell and effect
+            return true;
+        }
+
+        return false;
+    }
+};
+#endif
+void AddSC_npcs_special()
+{
+    Script* s;
+    s = new npc_chicken_cluck();
+    s->RegisterSelf();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    s = new npc_air_force_bots();
+    s->RegisterSelf();
+    s = new npc_dancing_flames();
+    s->RegisterSelf();
+#endif
+
+    s = new npc_doctor();
+    s->RegisterSelf();
+    s = new npc_injured_patient();
+    s->RegisterSelf();
+    s = new npc_garments_of_quests();
+    s->RegisterSelf();
+    s = new npc_guardian();
+    s->RegisterSelf();
+    s = new npc_innkeeper();
+    s->RegisterSelf(false);
+    s = new npc_redemption_target();
+    s->RegisterSelf();
+#if defined(CLASSIC)
+    s = new spell_npc_redemption_target();
+    s->RegisterSelf();
+#endif
+#if defined(TBC) || defined(WOTLK)
+    s = new spell_symbol_of_life();
+    s->RegisterSelf();
+#endif
+#if defined (WOTLK) || defined (CATA) 
+    s = new npc_spring_rabbit();
+    s->RegisterSelf();
+#endif
+
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_chicken_cluck";
+    //pNewScript->GetAI = &GetAI_npc_chicken_cluck;
+    //pNewScript->pQuestAcceptNPC =   &QuestAccept_npc_chicken_cluck;
+    //pNewScript->pQuestRewardedNPC = &QuestRewarded_npc_chicken_cluck;
+    //pNewScript->RegisterSelf();
+
+//#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_dancing_flames";
+    //pNewScript->GetAI = &GetAI_npc_dancing_flames;
+    //pNewScript->RegisterSelf();
+//#endif
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_injured_patient";
+    //pNewScript->GetAI = &GetAI_npc_injured_patient;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_doctor";
+    //pNewScript->GetAI = &GetAI_npc_doctor;
+    //pNewScript->pQuestAcceptNPC = &QuestAccept_npc_doctor;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_garments_of_quests";
+    //pNewScript->GetAI = &GetAI_npc_garments_of_quests;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_guardian";
+    //pNewScript->GetAI = &GetAI_npc_guardian;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_innkeeper";
+    //pNewScript->pGossipHello = &GossipHello_npc_innkeeper;
+    //pNewScript->pGossipSelect = &GossipSelect_npc_innkeeper;
+    //pNewScript->RegisterSelf(false);                        // script and error report disabled, but script can be used for custom needs, adding ScriptName
+
+//#if defined (WOTLK) || defined (CATA)
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_spring_rabbit";
+    //pNewScript->GetAI = &GetAI_npc_spring_rabbit;
+    //pNewScript->RegisterSelf();
+//#endif
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "npc_redemption_target";
+    //pNewScript->GetAI = &GetAI_npc_redemption_target;
+    //pNewScript->pEffectDummyNPC = &EffectDummyCreature_npc_redemption_target;
+    //pNewScript->RegisterSelf();
+}
diff --git a/src/modules/SD3/scripts/world/spell_scripts.cpp b/src/modules/SD3/scripts/world/spell_scripts.cpp
new file mode 100644
index 000000000..3f81bcb49
--- /dev/null
+++ b/src/modules/SD3/scripts/world/spell_scripts.cpp
@@ -0,0 +1,1229 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      Spell_Scripts
+ * SD%Complete: 100
+ * SDComment:   Spell scripts for dummy effects (if script need access/interaction with parts of other AI or instance, add it in related source files).
+ * SDCategory:  Spell
+ * EndScriptData
+ */
+
+/**
+ * ContentData
+ * Spell 8913:  Sacred Cleansing
+#if defined (CLASSIC)
+ * Spell 10848: Shroud of Death
+ * Spell 17327: Spirit Particles
+#endif
+ * Spell 19512: Apply Salve
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+ * spell 21014
+#endif
+ * Spell 21050: Melodious Rapture
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+ * spell 29528
+ * spell 29866
+ * spell 34665
+ * spell 37136
+ * spell 39246
+ #if defined (WOTLK) || defined (CATA)
+ * spell 43340
+ #endif
+ * spell 44935
+ * spell 45109
+ * spell 45111
+#endif
+#if defined (WOTLK) || defined (CATA)
+ * spell 46023
+ * spell 46770
+ * spell 47575
+ * spell 50706
+ * spell 51331
+ * spell 51332
+ * spell 51366
+ * spell 52090
+ * spell 56099
+#endif
+ * EndContentData
+ */
+
+#include "precompiled.h"
+
+/**
+ * When you make a spell effect:
+ * - always check spell id and effect index
+ * - always return true when the spell is handled by script
+ */
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+enum
+{
+    // quest 9452
+    SPELL_CAST_FISHING_NET      = 29866,
+    GO_RED_SNAPPER              = 181616,
+    NPC_ANGRY_MURLOC            = 17102,
+    ITEM_RED_SNAPPER            = 23614,
+    // SPELL_SUMMON_TEST           = 49214                  // ! Just wrong spell name? It summon correct creature (17102)but does not appear to be used.
+ #if defined (WOTLK) || defined (CATA)
+    // quest 11472
+    SPELL_ANUNIAQS_NET          = 21014,
+    GO_TASTY_REEF_FISH          = 186949,
+    NPC_REEF_SHARK              = 24637,
+    ITEM_TASTY_REEF_FISH        = 34127,
+ #endif
+};
+
+struct spell_cast_fishing_net : public SpellScript
+{
+    spell_cast_fishing_net() : SpellScript("spell_cast_fishing_net") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+ #if defined (WOTLK) || defined (CATA)
+        if (uiSpellId == SPELL_ANUNIAQS_NET)
+        {
+            GameObject* pGOTarget = pTarget->ToGameObject();
+            if (uiEffIndex == EFFECT_INDEX_0)
+            {
+                if (pGOTarget->GetRespawnTime() != 0 || pGOTarget->GetEntry() != GO_TASTY_REEF_FISH || pCaster->GetTypeId() != TYPEID_PLAYER)
+                    return true;
+
+                if (urand(0, 3))
+                {
+                    if (Item* pItem = ((Player*)pCaster)->StoreNewItemInInventorySlot(ITEM_TASTY_REEF_FISH, 1))
+                        ((Player*)pCaster)->SendNewItem(pItem, 1, true, false);
+                }
+                else
+                {
+                    if (Creature* pShark = pCaster->SummonCreature(NPC_REEF_SHARK, pGOTarget->GetPositionX(), pGOTarget->GetPositionY(), pGOTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000))
+                        pShark->AI()->AttackStart(pCaster);
+                }
+
+                pGOTarget->SetLootState(GO_JUST_DEACTIVATED);
+                return true;
+            }
+            return true;
+        }
+ #endif
+        if (uiSpellId == SPELL_CAST_FISHING_NET)
+        {
+            GameObject* pGOTarget = pTarget->ToGameObject();
+            if (uiEffIndex == EFFECT_INDEX_0)
+            {
+                if (pGOTarget->GetRespawnTime() != 0 || pGOTarget->GetEntry() != GO_RED_SNAPPER || pCaster->GetTypeId() != TYPEID_PLAYER)
+                {
+                    return true;
+                }
+
+                if (urand(0, 2))
+                {
+                    if (Creature* pMurloc = pCaster->SummonCreature(NPC_ANGRY_MURLOC, pCaster->GetPositionX(), pCaster->GetPositionY() + 20.0f, pCaster->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 10000))
+                    {
+                        pMurloc->AI()->AttackStart(pCaster);
+                    }
+                }
+                else
+                {
+                    if (Item* pItem = ((Player*)pCaster)->StoreNewItemInInventorySlot(ITEM_RED_SNAPPER, 1))
+                    {
+                        ((Player*)pCaster)->SendNewItem(pItem, 1, true, false);
+                    }
+                }
+
+                pGOTarget->SetLootState(GO_JUST_DEACTIVATED);
+                return true;
+            }
+            return true;
+        }
+
+        return false;
+    }
+};
+#endif
+
+enum
+{
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    // quest 9629
+    SPELL_TAG_MURLOC                    = 30877,
+    SPELL_TAG_MURLOC_PROC               = 30875,
+    NPC_BLACKSILT_MURLOC                = 17326,
+    NPC_TAGGED_MURLOC                   = 17654,
+
+    // quest 9447
+    SPELL_HEALING_SALVE                 = 29314,
+    SPELL_HEALING_SALVE_DUMMY           = 29319,
+    NPC_MAGHAR_GRUNT                    = 16846,
+
+    // quest 10190
+    SPELL_RECHARGING_BATTERY            = 34219,
+    NPC_DRAINED_PHASE_HUNTER            = 19595,
+
+    // target hulking helboar
+    SPELL_ADMINISTER_ANTIDOTE           = 34665,
+    NPC_HELBOAR                         = 16880,
+    NPC_DREADTUSK                       = 16992,
+#endif
+
+    // quest 6124/6129
+    SPELL_APPLY_SALVE                   = 19512,
+    SPELL_SICKLY_AURA                   = 19502,
+
+    NPC_SICKLY_DEER                     = 12298,
+    NPC_SICKLY_GAZELLE                  = 12296,
+
+    NPC_CURED_DEER                      = 12299,
+    NPC_CURED_GAZELLE                   = 12297,
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+    // quest 12906/13422
+    SPELL_DISCIPLINING_ROD              = 56033,
+    SAY_RAND_WORK1                      = -1000555,
+    SAY_RAND_WORK2                      = -1000556,
+    SAY_RAND_WORK3                      = -1000557,
+    SAY_RAND_ATTACK1                    = -1000558,
+    SAY_RAND_ATTACK2                    = -1000559,
+    SAY_RAND_ATTACK3                    = -1000560,
+#endif
+
+    // target morbent fel
+    SPELL_SACRED_CLEANSING              = 8913,
+    NPC_MORBENT                         = 1200,
+    NPC_WEAKENED_MORBENT                = 24782,
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    // quest 11515
+    SPELL_FEL_SIPHON_DUMMY              = 44936,
+    NPC_FELBLOOD_INITIATE               = 24918,
+    NPC_EMACIATED_FELBLOOD              = 24955,
+
+    // target nestlewood owlkin
+    SPELL_INOCULATE_OWLKIN              = 29528,
+    NPC_OWLKIN                          = 16518,
+    NPC_OWLKIN_INOC                     = 16534,
+
+ #if defined (WOTLK) || defined (CATA)
+    // target for quest 12166)
+    SPELL_LIQUID_FIRE                   = 46770,
+    SPELL_LIQUID_FIRE_AURA              = 47972,
+
+    NPC_ELK                             = 26616,
+    NPC_GRIZZLY                         = 26643,
+
+    NPC_ELK_BUNNY                       = 27111,
+    NPC_GRIZZLY_BUNNY                   = 27112,
+
+    // for quest 12516
+    SPELL_MODIFIED_MOJO                 = 50706,
+
+    NPC_PROPHET_OF_SSERATUS             = 28068,
+    NPC_WEAK_PROPHET_OF_SSERATUS        = 28151,
+
+    // for quest 12459
+    SPELL_SEEDS_OF_NATURES_WRATH        = 49587,
+
+    NPC_REANIMATED_FROSTWYRM            = 26841,
+    NPC_TURGID                          = 27808,
+    NPC_DEATHGAZE                       = 27122,
+
+    NPC_WEAK_REANIMATED_FROSTWYRM       = 27821,
+    NPC_WEAK_TURGID                     = 27809,
+    NPC_WEAK_DEATHGAZE                  = 27807,
+
+    // quest 11982
+    SPELL_THROW_BOULDER                 = 47005,
+    SPELL_BOULBER_IMPACT                = 47007,
+    SPELL_BOULDER_TOSS_CREDIT           = 47009,
+
+    NPC_IRON_RUNESHAPER                 = 26270,
+    NPC_RUNE_REAVER                     = 26268,
+
+    // for quest 11730
+    SPELL_ULTRASONIC_SCREWDRIVER        = 46023,
+    SPELL_REPROGRAM_KILL_CREDIT         = 46027,
+
+    NPC_COLLECT_A_TRON                  = 25793,
+    SPELL_SUMMON_COLLECT_A_TRON         = 46034,
+
+    NPC_DEFENDO_TANK                    = 25758,
+    SPELL_SUMMON_DEFENDO_TANK           = 46058,
+
+    NPC_SCAVENGE_A8                     = 25752,
+    SPELL_SUMMON_SCAVENGE_A8            = 46063,
+
+    NPC_SCAVENGE_B6                     = 25792,
+    SPELL_SUMMON_SCAVENGE_B6            = 46066,
+
+    NPC_SENTRY_BOT                      = 25753,
+    SPELL_SUMMON_SENTRY_BOT             = 46068,
+
+    // target woodlands walker
+    SPELL_STRENGTH_ANCIENTS             = 47575,
+    SPELL_CREATE_BARK_WALKERS           = 47550,
+    FACTION_HOSTILE                     = 16,
+
+    EMOTE_AGGRO                         = -1000551,
+    EMOTE_CREATE                        = -1000552,
+
+    SAY_SPECIMEN                        = -1000581,
+    NPC_NEXUS_DRAKE_HATCHLING           = 26127,
+    SPELL_RAELORASZ_FIREBALL            = 46704,
+ #endif
+
+    // Quest "Disrupt the Greengill Coast" (11541)
+    SPELL_ORB_OF_MURLOC_CONTROL         = 45109,
+    SPELL_GREENGILL_SLAVE_FREED         = 45110,
+    SPELL_ENRAGE                        = 45111,
+    NPC_FREED_GREENGILL_SLAVE           = 25085,
+    NPC_DARKSPINE_MYRMIDON              = 25060,
+    NPC_DARKSPINE_SIREN                 = 25073,
+
+ #if defined (WOTLK) || defined (CATA)
+    // quest 14107
+    SPELL_BLESSING_OF_PEACE             = 66719,
+    NPC_FALLEN_HERO_SPIRIT              = 32149,
+    NPC_FALLEN_HERO_SPIRIT_PROXY        = 35055,
+    SAY_BLESS_1                         = -1000594,
+    SAY_BLESS_2                         = -1000595,
+    SAY_BLESS_3                         = -1000596,
+    SAY_BLESS_4                         = -1000597,
+    SAY_BLESS_5                         = -1000598,
+ #endif
+
+    // quest "The Big Bone Worm" 10930
+    SPELL_FUMPING                       = 39246,
+    SPELL_SUMMON_HAISHULUD              = 39248,
+    NPC_SAND_GNOME                      = 22483,
+    NPC_MATURE_BONE_SIFTER              = 22482,
+
+ #if defined (WOTLK) || defined (CATA)
+    // quest 12813, by item 40587
+    SPELL_DARKMENDER_TINCTURE           = 52741,
+    SPELL_SUMMON_CORRUPTED_SCARLET      = 54415,
+    NPC_CORPSES_RISE_CREDIT_BUNNY       = 29398,
+
+    // quest 12659, item 38731
+    SPELL_AHUNAES_KNIFE                 = 52090,
+    NPC_SCALPS_KILL_CREDIT_BUNNY        = 28622,
+
+    // quest 13549
+    SPELL_TAILS_UP_GENDER_MASTER        = 62110,
+    SPELL_TAILS_UP_AURA                 = 62109,
+    SPELL_FORCE_LEOPARD_SUMMON          = 62117,
+    SPELL_FORCE_BEAR_SUMMON             = 62118,
+    NPC_FROST_LEOPARD                   = 29327,
+    NPC_ICEPAW_BEAR                     = 29319,
+    NPC_LEOPARD_KILL_CREDIT             = 33005,
+    NPC_BEAR_KILL_CREDIT                = 33006,
+    SAY_ITS_FEMALE                      = -1000642,
+    SAY_ITS_MALE                        = -1000643,
+ #endif
+
+    // quest 9849, item 24501
+    SPELL_THROW_GORDAWG_BOULDER         = 32001,
+    NPC_MINION_OF_GUROK                 = 18181,
+#endif
+#if defined (WOTLK) || defined (CATA)
+    // quest 12589
+    SPELL_HIT_APPLE                     = 51331,
+    SPELL_MISS_APPLE                    = 51332,
+    SPELL_MISS_APPLE_HIT_BIRD           = 51366,
+    SPELL_APPLE_FALLS_TO_GROUND         = 51371,
+    NPC_APPLE                           = 28053,
+    NPC_LUCKY_WILHELM                   = 28054,
+    NPC_DROSTAN                         = 28328,
+    SAY_LUCKY_HIT_1                     = -1000644,
+    SAY_LUCKY_HIT_2                     = -1000645,
+    SAY_LUCKY_HIT_3                     = -1000646,
+    SAY_LUCKY_HIT_APPLE                 = -1000647,
+    SAY_DROSTAN_GOT_LUCKY_1             = -1000648,
+    SAY_DROSTAN_GOT_LUCKY_2             = -1000649,
+    SAY_DROSTAN_HIT_BIRD_1              = -1000650,
+    SAY_DROSTAN_HIT_BIRD_2              = -1000651,
+
+    // quest 11314, item 33606
+    SPELL_LURIELLES_PENDANT             = 43340,
+    NPC_CHILL_NYMPH                     = 23678,
+    NPC_LURIELLE                        = 24117,
+    FACTION_FRIENDLY                    = 35,
+    SAY_FREE_1                          = -1000781,
+    SAY_FREE_2                          = -1000782,
+    SAY_FREE_3                          = -1000783,
+#endif
+    // npcs that are only interactable while dead
+    SPELL_SHROUD_OF_DEATH               = 10848,
+    SPELL_SPIRIT_PARTICLES              = 17327,
+    NPC_FRANCLORN_FORGEWRIGHT           = 8888,
+    NPC_GAERIYAN                        = 9299,
+#if defined (WOTLK) || defined (CATA)
+    NPC_GANJO                           = 26924,
+#endif
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    // quest 11521
+    SPELL_EXPOSE_RAZORTHORN_ROOT        = 44935,
+    SPELL_SUMMON_RAZORTHORN_ROOT        = 44941,
+    NPC_RAZORTHORN_RAVAGER              = 24922,
+    GO_RAZORTHORN_DIRT_MOUND            = 187073,
+
+    //  for quest 10584
+    SPELL_PROTOVOLTAIC_MAGNETO_COLLECTOR = 37136,
+    NPC_ENCASED_ELECTROMENTAL           = 21731,
+#endif
+
+    // quest 6661
+    SPELL_MELODIOUS_RAPTURE             = 21050,
+    SPELL_MELODIOUS_RAPTURE_VISUAL      = 21051,
+    NPC_DEEPRUN_RAT                     = 13016,
+    NPC_ENTHRALLED_DEEPRUN_RAT          = 13017,
+#if defined (WOTLK) || defined (CATA)
+    // quest 12981
+    SPELL_THROW_ICE                     = 56099,
+    SPELL_FROZEN_IRON_SCRAP             = 56101,
+    NPC_SMOLDERING_SCRAP_BUNNY          = 30169,
+    GO_SMOLDERING_SCRAP                 = 192124,
+#endif
+};
+
+struct aura_spirit_particles : public AuraScript
+{
+    aura_spirit_particles() : AuraScript("aura_spirit_particles") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        switch (pAura->GetId())
+        {
+            case SPELL_SHROUD_OF_DEATH:
+            case SPELL_SPIRIT_PARTICLES:
+            {
+                Creature* pCreature = (Creature*)pAura->GetTarget();
+
+                if (!pCreature || (pCreature->GetEntry() != NPC_FRANCLORN_FORGEWRIGHT && pCreature->GetEntry() != NPC_GAERIYAN))
+                {
+                    return false;
+                }
+
+                if (bApply)
+                {
+                    pCreature->m_AuraFlags |= UNIT_AURAFLAG_ALIVE_INVISIBLE;
+                }
+                else
+                {
+                    pCreature->m_AuraFlags &= ~UNIT_AURAFLAG_ALIVE_INVISIBLE;
+                }
+
+                return false;   //TODO why? true
+            }
+        }
+        return false;
+    }
+};
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+struct aura_healing_salve : public AuraScript
+{
+    aura_healing_salve() : AuraScript("aura_healing_salve") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() != SPELL_HEALING_SALVE || pAura->GetEffIndex() != EFFECT_INDEX_0)
+        {
+            return true;
+        }
+
+        if (bApply)
+        {
+            if (Unit* pCaster = pAura->GetCaster())
+            {
+                pCaster->CastSpell(pAura->GetTarget(), SPELL_HEALING_SALVE_DUMMY, true);
+            }
+        }
+        return true;
+    }
+};
+
+struct aura_healing_salve_dummy : public AuraScript
+{
+    aura_healing_salve_dummy() : AuraScript("aura_healing_salve_dummy") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() != SPELL_HEALING_SALVE_DUMMY || pAura->GetEffIndex() != EFFECT_INDEX_0)
+        {
+            return true;
+        }
+
+        if (!bApply)
+        {
+            Creature* pCreature = (Creature*)pAura->GetTarget();
+
+            pCreature->UpdateEntry(NPC_MAGHAR_GRUNT);
+
+            if (pCreature->getStandState() == UNIT_STAND_STATE_KNEEL)
+            {
+                pCreature->SetStandState(UNIT_STAND_STATE_STAND);
+            }
+
+            pCreature->ForcedDespawn(60 * IN_MILLISECONDS);
+        }
+        return true;
+    }
+};
+
+struct aura_recharging_battery : public AuraScript
+{
+    aura_recharging_battery() : AuraScript("aura_recharging_battery") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() != SPELL_RECHARGING_BATTERY || pAura->GetEffIndex() != EFFECT_INDEX_0)
+            return true;
+
+        if (!bApply)
+        {
+            if (pAura->GetTarget()->HasAuraState(AURA_STATE_HEALTHLESS_20_PERCENT))
+            {
+                ((Creature*)pAura->GetTarget())->UpdateEntry(NPC_DRAINED_PHASE_HUNTER);
+            }
+        }
+
+        return true;
+    }
+};
+
+struct aura_tag_murloc : public AuraScript
+{
+    aura_tag_murloc() : AuraScript("aura_tag_murloc") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() != SPELL_TAG_MURLOC || pAura->GetEffIndex() != EFFECT_INDEX_0)
+        {
+            return true;
+        }
+
+        Creature* pCreature = (Creature*)pAura->GetTarget();
+
+        if (bApply)
+        {
+            if (pCreature->GetEntry() == NPC_BLACKSILT_MURLOC)
+            {
+                if (Unit* pCaster = pAura->GetCaster())
+                {
+                    pCaster->CastSpell(pCreature, SPELL_TAG_MURLOC_PROC, true);
+                }
+            }
+        }
+        else
+        {
+            if (pCreature->GetEntry() == NPC_TAGGED_MURLOC)
+            {
+                pCreature->ForcedDespawn();
+            }
+        }
+
+        return true;
+    }
+};
+
+struct aura_enrage_45111 : public AuraScript
+{
+    aura_enrage_45111() : AuraScript("aura_enrage_45111") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() != SPELL_ENRAGE || !bApply || pAura->GetTarget()->GetTypeId() != TYPEID_UNIT)
+        {
+            return false;
+        }
+
+        Creature* pTarget = (Creature*)pAura->GetTarget();
+
+        if (Creature* pCreature = GetClosestCreatureWithEntry(pTarget, NPC_DARKSPINE_MYRMIDON, 25.0f))
+        {
+            pTarget->AI()->AttackStart(pCreature);
+            return true;
+        }
+
+        if (Creature* pCreature = GetClosestCreatureWithEntry(pTarget, NPC_DARKSPINE_SIREN, 25.0f))
+        {
+            pTarget->AI()->AttackStart(pCreature);
+            return true;
+        }
+
+        return false;
+    }
+};
+
+struct aura_photovoltaic_magneto_collector : public AuraScript
+{
+    aura_photovoltaic_magneto_collector() : AuraScript("aura_photovoltaic_magneto_collector") {}
+
+    bool OnDummyApply(const Aura* pAura, bool bApply) override
+    {
+        if (pAura->GetId() != SPELL_PROTOVOLTAIC_MAGNETO_COLLECTOR || pAura->GetEffIndex() != EFFECT_INDEX_0)
+        {
+            return true;
+        }
+
+        Unit* pTarget = pAura->GetTarget();
+        if (bApply && pTarget->GetTypeId() == TYPEID_UNIT)
+        {
+            ((Creature*)pTarget)->UpdateEntry(NPC_ENCASED_ELECTROMENTAL);
+        }
+        return true;
+    }
+};
+#endif
+
+struct spell_apply_salve : public SpellScript
+{
+    spell_apply_salve() : SpellScript("spell_apply_salve") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_APPLY_SALVE && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (pCaster->GetTypeId() != TYPEID_PLAYER)
+            {
+                return true;
+            }
+
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            if (pCreatureTarget->GetEntry() != NPC_SICKLY_DEER && pCreatureTarget->GetEntry() != NPC_SICKLY_GAZELLE)
+            {
+                return true;
+            }
+
+            // Update entry, remove aura, set the kill credit and despawn
+            uint32 uiUpdateEntry = pCreatureTarget->GetEntry() == NPC_SICKLY_DEER ? NPC_CURED_DEER : NPC_CURED_GAZELLE;
+            pCreatureTarget->RemoveAurasDueToSpell(SPELL_SICKLY_AURA);
+            pCreatureTarget->UpdateEntry(uiUpdateEntry);
+            ((Player*)pCaster)->KilledMonsterCredit(uiUpdateEntry);
+            pCreatureTarget->ForcedDespawn(20000);
+        }
+        return true;
+    }
+};
+
+struct spell_sacred_cleansing : public SpellScript
+{
+    spell_sacred_cleansing() : SpellScript("spell_sacred_cleansing") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_SACRED_CLEANSING && uiEffIndex == EFFECT_INDEX_1)
+        {
+            if (pTarget->ToCreature() && pTarget->GetEntry() != NPC_MORBENT)
+            {
+                return true;
+            }
+            pTarget->ToCreature()->UpdateEntry(NPC_WEAKENED_MORBENT);
+        }
+        return true;
+    }
+};
+
+struct spell_melodious_rapture : public SpellScript
+{
+    spell_melodious_rapture() : SpellScript("spell_melodious_rapture") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_MELODIOUS_RAPTURE && uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            if (pCaster->GetTypeId() != TYPEID_PLAYER && pCreatureTarget->GetEntry() != NPC_DEEPRUN_RAT)
+            {
+                return true;
+            }
+
+            pCreatureTarget->UpdateEntry(NPC_ENTHRALLED_DEEPRUN_RAT);
+            pCreatureTarget->CastSpell(pCreatureTarget, SPELL_MELODIOUS_RAPTURE_VISUAL, false);
+            pCreatureTarget->GetMotionMaster()->MoveFollow(pCaster, frand(0.5f, 3.0f), frand(M_PI_F * 0.8f, M_PI_F * 1.2f));
+
+            ((Player*)pCaster)->KilledMonsterCredit(NPC_ENTHRALLED_DEEPRUN_RAT);
+        }
+        return true;
+    }
+};
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+struct spell_administer_antidote : public SpellScript
+{
+    spell_administer_antidote() : SpellScript("spell_administer_antidote") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_ADMINISTER_ANTIDOTE && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (pTarget->GetEntry() != NPC_HELBOAR)
+            {
+                return true;
+            }
+
+            // possible needs check for quest state, to not have any effect when quest really complete
+            //TODO implement it as a DB condition for CheckCast()
+
+            pTarget->ToCreature()->UpdateEntry(NPC_DREADTUSK);
+            return true;
+        }
+        return true;
+    }
+};
+
+struct spell_inoculate_owlkin : public SpellScript
+{
+    spell_inoculate_owlkin() : SpellScript("spell_inoculate_owlkin") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_INOCULATE_OWLKIN && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (pTarget->GetEntry() != NPC_OWLKIN)
+            {
+                return true;
+            }
+
+            pTarget->ToCreature()->UpdateEntry(NPC_OWLKIN_INOC);
+            ((Player*)pCaster)->KilledMonsterCredit(NPC_OWLKIN_INOC);
+
+            // set despawn timer, since we want to remove creature after a short time
+            pTarget->ToCreature()->ForcedDespawn(15000);
+
+            return true;
+        }
+        return true;
+    }
+};
+
+ //#if defined (WOTLK) || defined (CATA)
+ //       case SPELL_LIQUID_FIRE:
+ //       {
+ //           if (uiEffIndex == EFFECT_INDEX_0)
+ //           {
+ //               if (pCaster->GetTypeId() == TYPEID_PLAYER)
+ //               {
+ //                   if (pCreatureTarget->HasAura(SPELL_LIQUID_FIRE_AURA))
+ //                       return true;
+
+ //                   if (pCreatureTarget->GetEntry() == NPC_ELK)
+ //                   {
+ //                       pCreatureTarget->CastSpell(pCreatureTarget, SPELL_LIQUID_FIRE_AURA, true);
+ //                       ((Player*)pCaster)->KilledMonsterCredit(NPC_ELK_BUNNY);
+ //                   }
+ //                   else if (pCreatureTarget->GetEntry() == NPC_GRIZZLY)
+ //                   {
+ //                       pCreatureTarget->CastSpell(pCreatureTarget, SPELL_LIQUID_FIRE_AURA, true);
+ //                       ((Player*)pCaster)->KilledMonsterCredit(NPC_GRIZZLY_BUNNY);
+ //                   }
+ //               }
+ //               return true;
+ //           }
+ //           return true;
+ //       }
+ //       case SPELL_MODIFIED_MOJO:
+ //       {
+ //           if (uiEffIndex == EFFECT_INDEX_0)
+ //           {
+ //               if (pCreatureTarget->GetEntry() != NPC_PROPHET_OF_SSERATUS)
+ //                   return true;
+
+ //               // Apparently done before updateEntry, so need to make a way to handle that
+ //               // "Mmm, more mojo"
+ //               // "%s drinks the Mojo"
+ //               // "NOOOOOOOOOOOOooooooo...............!"
+
+ //               pCreatureTarget->UpdateEntry(NPC_WEAK_PROPHET_OF_SSERATUS);
+ //               return true;
+ //           }
+ //           return true;
+ //       }
+ //#endif    
+struct spell_fel_siphon_dummy : public SpellScript
+{
+    spell_fel_siphon_dummy() : SpellScript("spell_fel_siphon_dummy") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_FEL_SIPHON_DUMMY && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (pTarget->GetEntry() != NPC_FELBLOOD_INITIATE)
+            {
+                return true;
+            }
+
+            pTarget->ToCreature()->UpdateEntry(NPC_EMACIATED_FELBLOOD);
+            return true;
+        }
+        return true;
+
+    }
+};
+#endif
+//#if defined (WOTLK) || defined (CATA)
+//        case SPELL_SEEDS_OF_NATURES_WRATH:
+//        {
+//            if (uiEffIndex == EFFECT_INDEX_0)
+//            {
+//                uint32 uiNewEntry = 0;
+//
+//                switch (pCreatureTarget->GetEntry())
+//                {
+//                    case NPC_REANIMATED_FROSTWYRM:  uiNewEntry = NPC_WEAK_REANIMATED_FROSTWYRM; break;
+//                    case NPC_TURGID:                uiNewEntry = NPC_WEAK_TURGID; break;
+//                    case NPC_DEATHGAZE:             uiNewEntry = NPC_WEAK_DEATHGAZE; break;
+//                }
+//
+//                if (uiNewEntry)
+//                    pCreatureTarget->UpdateEntry(uiNewEntry);
+//
+//                return true;
+//            }
+//            return true;
+//        }
+//        case SPELL_STRENGTH_ANCIENTS:
+//        {
+//            if (uiEffIndex == EFFECT_INDEX_0)
+//            {
+//                if (pCaster->GetTypeId() == TYPEID_PLAYER)
+//                {
+//                    if (urand(0, 1))
+//                    {
+//                        DoScriptText(EMOTE_AGGRO, pCreatureTarget);
+//                        pCreatureTarget->setFaction(FACTION_HOSTILE);
+//                        pCreatureTarget->AI()->AttackStart(pCaster);
+//                    }
+//                    else
+//                    {
+//                        DoScriptText(EMOTE_CREATE, pCreatureTarget);
+//                        pCaster->CastSpell(pCaster, SPELL_CREATE_BARK_WALKERS, true);
+//                        pCreatureTarget->ForcedDespawn(5000);
+//                    }
+//                }
+//                return true;
+//            }
+//            return true;
+//        }
+//
+//#endif
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+struct spell_tag_murloc_proc : public SpellScript
+{
+    spell_tag_murloc_proc() : SpellScript("spell_tag_murloc_proc") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_TAG_MURLOC_PROC && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (pTarget->GetEntry() == NPC_BLACKSILT_MURLOC)
+            {
+                pTarget->ToCreature()->UpdateEntry(NPC_TAGGED_MURLOC);
+            }
+        }
+        return true;
+    }
+};
+#endif
+ //#if defined (WOTLK) || defined (CATA)
+ //       case SPELL_THROW_BOULDER:
+ //       {
+ //           if (uiEffIndex == EFFECT_INDEX_0)
+ //           {
+ //               if (pCaster->GetTypeId() != TYPEID_PLAYER)
+ //                   return true;
+
+ //               if (pCreatureTarget->GetEntry() != NPC_IRON_RUNESHAPER && pCreatureTarget->GetEntry() != NPC_RUNE_REAVER)
+ //                   return true;
+
+ //               pCreatureTarget->CastSpell(pCreatureTarget, SPELL_BOULBER_IMPACT, true);
+ //               pCaster->CastSpell(pCaster, SPELL_BOULDER_TOSS_CREDIT, true);
+
+ //               return true;
+ //           }
+ //           return true;
+ //       }
+ //       case SPELL_ULTRASONIC_SCREWDRIVER:
+ //       {
+ //           if (uiEffIndex == EFFECT_INDEX_0)
+ //           {
+ //               if (pCreatureTarget->IsCorpse())
+ //               {
+ //                   uint32 newSpellId = 0;
+
+ //                   switch (pCreatureTarget->GetEntry())
+ //                   {
+ //                       case NPC_COLLECT_A_TRON:    newSpellId = SPELL_SUMMON_COLLECT_A_TRON; break;
+ //                       case NPC_DEFENDO_TANK:      newSpellId = SPELL_SUMMON_DEFENDO_TANK; break;
+ //                       case NPC_SCAVENGE_A8:       newSpellId = SPELL_SUMMON_SCAVENGE_A8; break;
+ //                       case NPC_SCAVENGE_B6:       newSpellId = SPELL_SUMMON_SCAVENGE_B6; break;
+ //                       case NPC_SENTRY_BOT:        newSpellId = SPELL_SUMMON_SENTRY_BOT; break;
+ //                   }
+
+ //                   if (const SpellEntry* pSpell = GetSpellStore()->LookupEntry(newSpellId))
+ //                   {
+ //                       pCaster->CastSpell(pCreatureTarget, pSpell->Id, true);
+
+ //                       if (Pet* pPet = pCaster->FindGuardianWithEntry(pSpell->EffectMiscValue[uiEffIndex]))
+ //                           pPet->CastSpell(pCaster, SPELL_REPROGRAM_KILL_CREDIT, true);
+
+ //                       pCreatureTarget->ForcedDespawn();
+ //                   }
+ //               }
+ //               return true;
+ //           }
+ //           return true;
+ //       }
+ //   };
+
+ //#endif
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+struct spell_orb_of_murloc_control : public SpellScript
+{
+    spell_orb_of_murloc_control() : SpellScript("spell_orb_of_murloc_control") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override //SPELL_ORB_OF_MURLOC_CONTROL
+    {
+        Creature* pCreatureTarget = pTarget->ToCreature();
+        pCreatureTarget->CastSpell(pCaster, SPELL_GREENGILL_SLAVE_FREED, true);
+
+        // Freed Greengill Slave
+        pCreatureTarget->UpdateEntry(NPC_FREED_GREENGILL_SLAVE);
+
+        pCreatureTarget->CastSpell(pCreatureTarget, SPELL_ENRAGE, true);
+
+        return true;
+    }
+};
+
+struct spell_fumping : public SpellScript
+{
+    spell_fumping() : SpellScript("spell_fumping") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        Creature *pCreatureTarget = pTarget->ToCreature();
+        if (uiSpellId == SPELL_FUMPING && uiEffIndex == EFFECT_INDEX_2)
+        {
+            switch (urand(0, 2))
+            {
+            case 0:
+                pCaster->CastSpell(pCreatureTarget, SPELL_SUMMON_HAISHULUD, true);
+                break;
+            case 1:
+                for (int i = 0; i < 2; ++i)
+                {
+                    if (Creature* pSandGnome = pCaster->SummonCreature(NPC_SAND_GNOME, pCreatureTarget->GetPositionX(), pCreatureTarget->GetPositionY(), pCreatureTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000))
+                    {
+                        pSandGnome->AI()->AttackStart(pCaster);
+                    }
+                }
+                break;
+            case 2:
+                for (int i = 0; i < 2; ++i)
+                {
+                    if (Creature* pMatureBoneSifter = pCaster->SummonCreature(NPC_MATURE_BONE_SIFTER, pCreatureTarget->GetPositionX(), pCreatureTarget->GetPositionY(), pCreatureTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OOC_DESPAWN, 30000))
+                    {
+                        pMatureBoneSifter->AI()->AttackStart(pCaster);
+                    }
+                }
+                break;
+            }
+            pCreatureTarget->ForcedDespawn();
+        }
+        return true;
+    }
+};
+#endif
+
+ //#if defined (WOTLK) || defined (CATA)
+ //       case SPELL_AHUNAES_KNIFE:
+ //       {
+ //           if (uiEffIndex == EFFECT_INDEX_0)
+ //           {
+ //               if (pCaster->GetTypeId() != TYPEID_PLAYER)
+ //                   return true;
+
+ //               ((Player*)pCaster)->KilledMonsterCredit(NPC_SCALPS_KILL_CREDIT_BUNNY);
+ //               pCreatureTarget->ForcedDespawn();
+ //               return true;
+ //           }
+ //           return true;
+ //       }
+ //       case SPELL_TAILS_UP_GENDER_MASTER:
+ //       {
+ //           if (uiEffIndex == EFFECT_INDEX_0)
+ //           {
+ //               bool isMale = urand(0, 1);
+ //               Player* pPlayer = pCreatureTarget->GetLootRecipient();
+
+ //               if (isMale)
+ //                   DoScriptText(SAY_ITS_MALE, pCreatureTarget, pPlayer);
+ //               else
+ //                   DoScriptText(SAY_ITS_FEMALE, pCreatureTarget, pPlayer);
+
+ //               switch (pCreatureTarget->GetEntry())
+ //               {
+ //                   case NPC_FROST_LEOPARD:
+ //                   {
+ //                       if (isMale)
+ //                           pCreatureTarget->CastSpell(pCreatureTarget, SPELL_TAILS_UP_AURA, true);
+ //                       else
+ //                       {
+ //                           pPlayer->KilledMonsterCredit(NPC_LEOPARD_KILL_CREDIT, pCreatureTarget->GetObjectGuid());
+ //                           pCreatureTarget->CastSpell(pPlayer, SPELL_FORCE_LEOPARD_SUMMON, true);
+ //                           pCreatureTarget->ForcedDespawn();
+ //                       }
+
+ //                       break;
+ //                   }
+ //                   case NPC_ICEPAW_BEAR:
+ //                   {
+ //                       if (isMale)
+ //                           pCreatureTarget->CastSpell(pCreatureTarget, SPELL_TAILS_UP_AURA, true);
+ //                       else
+ //                       {
+ //                           pPlayer->KilledMonsterCredit(NPC_BEAR_KILL_CREDIT, pCreatureTarget->GetObjectGuid());
+ //                           pCreatureTarget->CastSpell(pPlayer, SPELL_FORCE_BEAR_SUMMON, true);
+ //                           pCreatureTarget->ForcedDespawn();
+ //                       }
+
+ //                       break;
+ //                   }
+ //               }
+ //               return true;
+ //           }
+ //           return true;
+ //       }
+ //#endif
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+struct spell_throw_gordawg_boulder : public SpellScript
+{
+    spell_throw_gordawg_boulder() : SpellScript("spell_throw_gordawg_boulder") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        Creature *pCreatureTarget = pTarget->ToCreature();
+        if (uiSpellId == SPELL_THROW_GORDAWG_BOULDER && uiEffIndex == EFFECT_INDEX_0)
+        {
+            for (int i = 0; i < 3; ++i)
+            {
+                if (irand(i, 2))                        // 2-3 summons
+                {
+                    pCreatureTarget->SummonCreature(NPC_MINION_OF_GUROK, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 5000);
+                }
+            }
+
+            if (pCreatureTarget->getVictim())
+            {
+                pCaster->DealDamage(pCreatureTarget, pCreatureTarget->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                return true;
+            }
+
+            // If not in combat, no xp or loot
+            pCreatureTarget->SetDeathState(JUST_DIED);
+            pCreatureTarget->SetHealth(0);
+            return true;
+        }
+        return true;
+    }
+};
+#endif
+//#if defined (WOTLK) || defined (CATA)
+ //       case SPELL_HIT_APPLE:
+ //       {
+ //           if (uiEffIndex == EFFECT_INDEX_0)
+ //           {
+ //               if (pCaster->GetTypeId() == TYPEID_PLAYER)
+ //                   ((Player*)pCaster)->KilledMonsterCredit(pCreatureTarget->GetEntry(), pCreatureTarget->GetObjectGuid());
+
+ //               pCreatureTarget->CastSpell(pCreatureTarget, SPELL_APPLE_FALLS_TO_GROUND, false);
+
+ //               if (Creature* pLuckyWilhelm = GetClosestCreatureWithEntry(pCreatureTarget, NPC_LUCKY_WILHELM, 2 * INTERACTION_DISTANCE))
+ //                   DoScriptText(SAY_LUCKY_HIT_APPLE, pLuckyWilhelm);
+ //           }
+ //           return true;
+ //       }
+ //       case SPELL_MISS_APPLE:
+ //       {
+ //           if (uiEffIndex == EFFECT_INDEX_0)
+ //           {
+ //               switch (urand(1, 3))
+ //               {
+ //                   case 1: DoScriptText(SAY_LUCKY_HIT_1, pCreatureTarget); break;
+ //                   case 2: DoScriptText(SAY_LUCKY_HIT_2, pCreatureTarget); break;
+ //                   case 3: DoScriptText(SAY_LUCKY_HIT_3, pCreatureTarget); break;
+ //               }
+
+ //               if (Creature* pDrostan = GetClosestCreatureWithEntry(pCreatureTarget, NPC_DROSTAN, 4 * INTERACTION_DISTANCE))
+ //                   DoScriptText(urand(0, 1) ? SAY_DROSTAN_GOT_LUCKY_1 : SAY_DROSTAN_GOT_LUCKY_2, pDrostan);
+ //           }
+ //           return true;
+ //       }
+ //       case SPELL_MISS_APPLE_HIT_BIRD:
+ //       {
+ //           if (uiEffIndex == EFFECT_INDEX_0)
+ //           {
+ //               if (Creature* pDrostan = GetClosestCreatureWithEntry(pCreatureTarget, NPC_DROSTAN, 5 * INTERACTION_DISTANCE))
+ //                   DoScriptText(urand(0, 1) ? SAY_DROSTAN_HIT_BIRD_1 : SAY_DROSTAN_HIT_BIRD_2, pDrostan);
+
+ //               pCreatureTarget->DealDamage(pCreatureTarget, pCreatureTarget->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+ //           }
+ //           return true;
+ //       }
+ //       case SPELL_LURIELLES_PENDANT:
+ //       {
+ //           if (uiEffIndex == EFFECT_INDEX_0)
+ //           {
+ //               if (pCreatureTarget->GetEntry() != NPC_CHILL_NYMPH || pCaster->GetTypeId() != TYPEID_PLAYER)
+ //                   return true;
+
+ //               switch (urand(0, 2))
+ //               {
+ //                   case 0: DoScriptText(SAY_FREE_1, pCreatureTarget); break;
+ //                   case 1: DoScriptText(SAY_FREE_2, pCreatureTarget); break;
+ //                   case 2: DoScriptText(SAY_FREE_3, pCreatureTarget); break;
+ //               }
+
+ //               ((Player*)pCaster)->KilledMonsterCredit(NPC_LURIELLE);
+ //               pCreatureTarget->SetFactionTemporary(FACTION_FRIENDLY, TEMPFACTION_RESTORE_RESPAWN);
+ //               pCreatureTarget->DeleteThreatList();
+ //               pCreatureTarget->AttackStop(true);
+ //               pCreatureTarget->GetMotionMaster()->MoveFleeing(pCaster, 7);
+ //               pCreatureTarget->ForcedDespawn(7 * IN_MILLISECONDS);
+ //           }
+ //           return true;
+ //       }
+ //#endif
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+struct spell_expose_rathorthorn_root : public SpellScript
+{
+    spell_expose_rathorthorn_root() : SpellScript("spell_expose_rathorthorn_root") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiSpellId == SPELL_EXPOSE_RAZORTHORN_ROOT && uiEffIndex == EFFECT_INDEX_0)
+        {
+            if (pTarget->GetEntry() != NPC_RAZORTHORN_RAVAGER)
+            {
+                return true;
+            }
+
+            if (GameObject* pMound = GetClosestGameObjectWithEntry(pTarget->ToCreature(), GO_RAZORTHORN_DIRT_MOUND, 20.0f))
+            {
+                if (pMound->GetRespawnTime() != 0)
+                {
+                    return true;
+                }
+
+                pTarget->ToCreature()->CastSpell(pTarget->ToCreature(), SPELL_SUMMON_RAZORTHORN_ROOT, true);
+                pMound->SetLootState(GO_JUST_DEACTIVATED);
+            }
+        }
+        return true;
+    }
+};
+#endif
+#if defined (WOTLK) || defined (CATA)
+struct spell_throw_ice : public SpellScript
+{
+    spell_throw_ice() : SpellScript("spell_throw_ice") {}
+
+    bool EffectDummy(Unit* pCaster, uint32 uiSpellId, SpellEffectIndex uiEffIndex, Object* pTarget, ObjectGuid /*originalCasterGuid*/) override
+    {
+        if (uiEffIndex == EFFECT_INDEX_0)
+        {
+            Creature *pCreatureTarget = pTarget->ToCreature();
+            if (pCreatureTarget->GetEntry() != NPC_SMOLDERING_SCRAP_BUNNY)
+                return true;
+
+            if (GameObject* pScrap = GetClosestGameObjectWithEntry(pCreatureTarget, GO_SMOLDERING_SCRAP, 5.0f))
+            {
+                if (pScrap->GetRespawnTime() != 0)
+                    return true;
+
+                pCreatureTarget->CastSpell(pCreatureTarget, SPELL_FROZEN_IRON_SCRAP, true);
+                pScrap->SetLootState(GO_JUST_DEACTIVATED);
+                pCreatureTarget->ForcedDespawn(1000);
+            }
+        }
+        return true;
+    }
+};
+#endif
+
+void AddSC_spell_scripts()
+{
+    Script* s;
+    s = new aura_spirit_particles();
+    s->RegisterSelf();
+    s = new spell_apply_salve();
+    s->RegisterSelf();
+    s = new spell_sacred_cleansing();
+    s->RegisterSelf();
+    s = new spell_melodious_rapture();
+    s->RegisterSelf();
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    s = new spell_cast_fishing_net();
+    s->RegisterSelf();
+    s = new aura_healing_salve();
+    s->RegisterSelf();
+    s = new aura_healing_salve_dummy();
+    s->RegisterSelf();
+    s = new aura_recharging_battery();
+    s->RegisterSelf();
+    s = new aura_tag_murloc();
+    s->RegisterSelf();
+    s = new aura_enrage_45111();
+    s->RegisterSelf();
+    s = new aura_photovoltaic_magneto_collector();
+    s->RegisterSelf();
+    s = new spell_administer_antidote();
+    s->RegisterSelf();
+    s = new spell_inoculate_owlkin();
+    s->RegisterSelf();
+    s = new spell_fel_siphon_dummy();
+    s->RegisterSelf();
+    s = new spell_tag_murloc_proc();
+    s->RegisterSelf();
+    s = new spell_orb_of_murloc_control();
+    s->RegisterSelf();
+    s = new spell_fumping();
+    s->RegisterSelf();
+    s = new spell_throw_gordawg_boulder();
+    s->RegisterSelf();
+    s = new spell_expose_rathorthorn_root();
+    s->RegisterSelf();
+#endif
+#if defined (WOTLK) || defined (CATA)
+    s = new spell_throw_ice();
+    s->RegisterSelf();
+#endif
+}
diff --git a/src/modules/SD3/scripts/world/world_map_scripts.cpp b/src/modules/SD3/scripts/world/world_map_scripts.cpp
new file mode 100644
index 000000000..2d6b4a390
--- /dev/null
+++ b/src/modules/SD3/scripts/world/world_map_scripts.cpp
@@ -0,0 +1,281 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+/**
+ * ScriptData
+ * SDName:      world_map_scripts
+ * SD%Complete: 100
+ * SDComment:   Quest support: 4740, 11538
+ * SDCategory:  World Map Scripts
+ * EndScriptData
+ */
+
+#include "precompiled.h"
+#include "world_map_scripts.h"
+
+// for non-instantiable maps, ZoneScript provides excessive mechanic, but nevertheless
+
+/* *********************************************************
+ *                  EASTERN KINGDOMS
+ */
+struct map_eastern_kingdoms : public ZoneScript
+{
+    map_eastern_kingdoms() : ZoneScript("world_map_eastern_kingdoms") {}
+
+    struct world_map_eastern_kingdoms : public ScriptedMap
+    {
+        world_map_eastern_kingdoms(Map* pMap) : ScriptedMap(pMap) {}
+
+        void OnCreatureCreate(Creature* pCreature)
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_JONATHAN:
+            case NPC_WRYNN:
+            case NPC_BOLVAR:
+            case NPC_PRESTOR:
+            case NPC_WINDSOR:
+                m_mNpcEntryGuidStore[pCreature->GetEntry()] = pCreature->GetObjectGuid();
+            }
+        }
+
+        void SetData(uint32 /*uiType*/, uint32 /*uiData*/) {}
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new world_map_eastern_kingdoms(pMap);
+    }
+};
+
+/* *********************************************************
+ *                     KALIMDOR
+ */
+struct map_kalimdor : public ZoneScript
+{
+    map_kalimdor() : ZoneScript("world_map_kalimdor") {}
+
+    struct world_map_kalimdor : public ScriptedMap
+    {
+        world_map_kalimdor(Map* pMap) : ScriptedMap(pMap) { Initialize(); }
+
+        uint8 m_uiMurkdeepAdds_KilledAddCount;
+
+        void Initialize()
+        {
+            m_uiMurkdeepAdds_KilledAddCount = 0;
+        }
+
+        void OnCreatureCreate(Creature* pCreature)
+        {
+            if (pCreature->GetEntry() == NPC_MURKDEEP)
+            {
+                m_mNpcEntryGuidStore[NPC_MURKDEEP] = pCreature->GetObjectGuid();
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature)
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_GREYMIST_COASTRUNNNER:
+                if (pCreature->IsTemporarySummon())         // Only count the ones summoned for Murkdeep quest
+                {
+                    ++m_uiMurkdeepAdds_KilledAddCount;
+
+                    // If all 3 coastrunners are killed, summon 2 warriors
+                    if (m_uiMurkdeepAdds_KilledAddCount == 3)
+                    {
+                        float fX, fY, fZ;
+                        for (uint8 i = 0; i < 2; ++i)
+                        {
+                            pCreature->GetRandomPoint(aSpawnLocations[POS_IDX_MURKDEEP_SPAWN][0], aSpawnLocations[POS_IDX_MURKDEEP_SPAWN][1], aSpawnLocations[POS_IDX_MURKDEEP_SPAWN][2], 5.0f, fX, fY, fZ);
+
+                            if (Creature* pTemp = pCreature->SummonCreature(NPC_GREYMIST_WARRIOR, fX, fY, fZ, aSpawnLocations[POS_IDX_MURKDEEP_SPAWN][3], TEMPSUMMON_DEAD_DESPAWN, 0))
+                            {
+                                pTemp->SetWalk(false);
+                                pTemp->GetRandomPoint(aSpawnLocations[POS_IDX_MURKDEEP_MOVE][0], aSpawnLocations[POS_IDX_MURKDEEP_MOVE][1], aSpawnLocations[POS_IDX_MURKDEEP_MOVE][2], 5.0f, fX, fY, fZ);
+                                pTemp->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                            }
+                        }
+
+                        m_uiMurkdeepAdds_KilledAddCount = 0;
+                    }
+                }
+                break;
+            case NPC_GREYMIST_WARRIOR:
+                if (pCreature->IsTemporarySummon())         // Only count the ones summoned for Murkdeep quest
+                {
+                    ++m_uiMurkdeepAdds_KilledAddCount;
+
+                    // After the 2 warriors are killed, Murkdeep spawns, along with a hunter
+                    if (m_uiMurkdeepAdds_KilledAddCount == 2)
+                    {
+                        float fX, fY, fZ;
+                        for (uint8 i = 0; i < 2; ++i)
+                        {
+                            pCreature->GetRandomPoint(aSpawnLocations[POS_IDX_MURKDEEP_SPAWN][0], aSpawnLocations[POS_IDX_MURKDEEP_SPAWN][1], aSpawnLocations[POS_IDX_MURKDEEP_SPAWN][2], 5.0f, fX, fY, fZ);
+
+                            if (Creature* pTemp = pCreature->SummonCreature(!i ? NPC_MURKDEEP : NPC_GREYMIST_HUNTER, fX, fY, fZ, aSpawnLocations[POS_IDX_MURKDEEP_SPAWN][3], TEMPSUMMON_DEAD_DESPAWN, 0))
+                            {
+                                pTemp->SetWalk(false);
+                                pTemp->GetRandomPoint(aSpawnLocations[POS_IDX_MURKDEEP_MOVE][0], aSpawnLocations[POS_IDX_MURKDEEP_MOVE][1], aSpawnLocations[POS_IDX_MURKDEEP_MOVE][2], 5.0f, fX, fY, fZ);
+                                pTemp->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
+                            }
+                        }
+
+                        m_uiMurkdeepAdds_KilledAddCount = 0;
+                    }
+                }
+                break;
+            }
+        }
+
+        void SetData(uint32 /*uiType*/, uint32 /*uiData*/) {}
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new world_map_kalimdor(pMap);
+    }
+};
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+/* *********************************************************
+ *                     OUTLAND
+ */
+struct map_outland : public ZoneScript
+{
+    map_outland() : ZoneScript("world_map_outland") {}
+
+    struct world_map_outland : public ScriptedMap
+    {
+        world_map_outland(Map* pMap) : ScriptedMap(pMap) { Initialize(); }
+
+        uint8 m_uiEmissaryOfHate_KilledAddCount;
+
+        void Initialize()
+        {
+            m_uiEmissaryOfHate_KilledAddCount = 0;
+        }
+
+        void OnCreatureCreate(Creature* pCreature)
+        {
+            if (pCreature->GetEntry() == NPC_EMISSARY_OF_HATE)
+            {
+                m_mNpcEntryGuidStore[NPC_EMISSARY_OF_HATE] = pCreature->GetObjectGuid();
+            }
+        }
+
+        void OnCreatureDeath(Creature* pCreature)
+        {
+            switch (pCreature->GetEntry())
+            {
+            case NPC_IRESPEAKER:
+            case NPC_UNLEASHED_HELLION:
+                if (!GetSingleCreatureFromStorage(NPC_EMISSARY_OF_HATE, true))
+                {
+                    ++m_uiEmissaryOfHate_KilledAddCount;
+                    if (m_uiEmissaryOfHate_KilledAddCount == 6)
+                    {
+                        pCreature->SummonCreature(NPC_EMISSARY_OF_HATE, aSpawnLocations[POS_IDX_EMISSARY_SPAWN][0], aSpawnLocations[POS_IDX_EMISSARY_SPAWN][1], aSpawnLocations[POS_IDX_EMISSARY_SPAWN][2], aSpawnLocations[POS_IDX_EMISSARY_SPAWN][3], TEMPSUMMON_DEAD_DESPAWN, 0);
+                        m_uiEmissaryOfHate_KilledAddCount = 0;
+                    }
+                }
+                break;
+            }
+        }
+
+        void SetData(uint32 /*uiType*/, uint32 /*uiData*/) {}
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new world_map_outland(pMap);
+    }
+};
+#endif
+#if defined (WOTLK) || defined (CATA)
+/* *********************************************************
+ *                     NORTHREND
+ */
+struct  map_northrend : public ZoneScript
+{
+    map_northrend() : ZoneScript("world_map_northrend") {}
+
+    struct world_map_northrend : public ScriptedMap
+    {
+        world_map_northrend(Map* pMap) : ScriptedMap(pMap) {}
+
+        void SetData(uint32 /*uiType*/, uint32 /*uiData*/) {}
+    };
+
+    InstanceData* GetInstanceData(Map* pMap) override
+    {
+        return new world_map_northrend(pMap);
+    }
+};
+#endif
+
+void AddSC_world_map_scripts()
+{
+    Script* s;
+    s = new map_eastern_kingdoms();
+    s->RegisterSelf();
+    s = new map_kalimdor();
+    s->RegisterSelf();
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    s = new map_outland();
+    s->RegisterSelf();
+#endif
+#if defined (WOTLK) || defined (CATA)
+    s = new map_northrend();
+    s->RegisterSelf();
+#endif
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "world_map_eastern_kingdoms";
+    //pNewScript->GetInstanceData = &GetInstanceData_world_map_eastern_kingdoms;
+    //pNewScript->RegisterSelf();
+
+    //pNewScript = new Script;
+    //pNewScript->Name = "world_map_kalimdor";
+    //pNewScript->GetInstanceData = &GetInstanceData_world_map_kalimdor;
+    //pNewScript->RegisterSelf();
+
+//#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    //pNewScript = new Script;
+    //pNewScript->Name = "world_map_outland";
+    //pNewScript->GetInstanceData = &GetInstanceData_world_map_outland;
+    //pNewScript->RegisterSelf();
+//#endif
+//#if defined (WOTLK) || defined (CATA)
+    //pNewScript = new Script;
+    //pNewScript->Name = "world_map_northrend";
+    //pNewScript->GetInstanceData = &GetInstanceData_world_map_northrend;
+    //pNewScript->RegisterSelf();
+//#endif
+}
diff --git a/src/modules/SD3/scripts/world/world_map_scripts.h b/src/modules/SD3/scripts/world/world_map_scripts.h
new file mode 100644
index 000000000..92c1ec46c
--- /dev/null
+++ b/src/modules/SD3/scripts/world/world_map_scripts.h
@@ -0,0 +1,71 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef DEF_WORLD_MAP_SCRIPTS_H
+#define DEF_WORLD_MAP_SCRIPTS_H
+
+enum
+{
+    // Quest 4740
+    NPC_GREYMIST_COASTRUNNNER   = 2202,
+    NPC_GREYMIST_WARRIOR        = 2205,
+    NPC_GREYMIST_HUNTER         = 2206,
+    NPC_MURKDEEP                = 10323,
+    QUEST_WANTED_MURKDEEP       = 4740,
+
+    // Quest 6403
+    NPC_JONATHAN                = 466,
+    NPC_WRYNN                   = 1747,
+    NPC_BOLVAR                  = 1748,
+    NPC_PRESTOR                 = 1749,
+#if defined (CLASSIC)
+    NPC_WINDSOR                 = 12580
+#endif
+    // Quest 11538
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+    NPC_WINDSOR                 = 12580,
+    NPC_EMISSARY_OF_HATE        = 25003,
+    NPC_IRESPEAKER              = 24999,
+    NPC_UNLEASHED_HELLION       = 25002,
+#endif
+};
+
+enum SpawnIndexes
+{
+    POS_IDX_EMISSARY_SPAWN      = 0,                        // Not used in Classic, but keep here for code change simplification
+    POS_IDX_MURKDEEP_SPAWN      = 1,
+    POS_IDX_MURKDEEP_MOVE       = 2,
+    POS_IDX_MAX                 = 3
+};
+
+static const float aSpawnLocations[POS_IDX_MAX][4] =
+{
+    {12583.019f, -6916.194f,  4.601f, 6.18f},               // Emissary of Hate, guesswork
+    {4981.031f,    597.955f, -1.361f, 4.82f},               // Murkdeep spawn, guesswork
+    {4988.970f,    547.002f,  5.379f, 0.0f},                // Murkdeep move, guesswork
+};
+
+#endif
diff --git a/src/modules/SD3/system/ScriptDevMgr.cpp b/src/modules/SD3/system/ScriptDevMgr.cpp
new file mode 100644
index 000000000..d3c7f5f69
--- /dev/null
+++ b/src/modules/SD3/system/ScriptDevMgr.cpp
@@ -0,0 +1,611 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#include "precompiled.h"
+#include "Config/Config.h"
+#include "SystemConfig.h"
+#include "Database/DatabaseEnv.h"
+#include "DBCStores.h"
+#include "ObjectMgr.h"
+#include "ProgressBar.h"
+#include "system/ScriptLoader.h"
+#include "system/system.h"
+#include "ScriptDevMgr.h"
+
+typedef std::vector<Script*> SDScriptVec;
+int num_sc_scripts;
+SDScriptVec m_scripts;
+
+Config SD3Config;
+
+void FillSpellSummary();
+
+void LoadSD3Bindings()
+{
+    pSystemMgr.LoadScriptTexts();
+    pSystemMgr.LoadScriptTextsCustom();
+    pSystemMgr.LoadScriptGossipTexts();
+    pSystemMgr.LoadScriptWaypoints();
+}
+
+struct TSpellSummary
+{
+    uint8 Targets;                                          // set of enum SelectTarget
+    uint8 Effects;                                          // set of enum SelectEffect
+} extern* SpellSummary;
+
+//*********************************
+//*** Functions used globally ***
+
+/**
+    * Function that does script text
+    *
+    * @param iTextEntry Entry of the text, stored in SD3-database
+    * @param pSource Source of the text
+    * @param pTarget Can be NULL (depending on CHAT_TYPE of iTextEntry). Possible target for the text
+    */
+void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
+{
+    if (!pSource)
+    {
+        script_error_log("DoScriptText entry %i, invalid Source pointer.", iTextEntry);
+        return;
+    }
+
+    if (iTextEntry >= 0)
+    {
+        script_error_log("DoScriptText with source entry %u (TypeId=%u, guid=%u) attempts to process text entry %i, but text entry must be negative.",
+                            pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), iTextEntry);
+
+        return;
+    }
+
+    DoDisplayText(pSource, iTextEntry, pTarget);
+    // TODO - maybe add some call-stack like error output if above function returns false
+}
+
+/**
+    * Function that either simulates or does script text for a map
+    *
+    * @param iTextEntry Entry of the text, stored in SD3-database, only type CHAT_TYPE_ZONE_YELL supported
+    * @param uiCreatureEntry Id of the creature of whom saying will be simulated
+    * @param pMap Given Map on which the map-wide text is displayed
+    * @param pCreatureSource Can be NULL. If pointer to Creature is given, then the creature does the map-wide text
+    * @param pTarget Can be NULL. Possible target for the text
+    */
+void DoOrSimulateScriptTextForMap(int32 iTextEntry, uint32 uiCreatureEntry, Map* pMap, Creature* pCreatureSource /*=NULL*/, Unit* pTarget /*=NULL*/)
+{
+    if (!pMap)
+    {
+        script_error_log("DoOrSimulateScriptTextForMap entry %i, invalid Map pointer.", iTextEntry);
+        return;
+    }
+
+    if (iTextEntry >= 0)
+    {
+        script_error_log("DoOrSimulateScriptTextForMap with source entry %u for map %u attempts to process text entry %i, but text entry must be negative.", uiCreatureEntry, pMap->GetId(), iTextEntry);
+        return;
+    }
+
+    CreatureInfo const* pInfo = GetCreatureTemplateStore(uiCreatureEntry);
+    if (!pInfo)
+    {
+        script_error_log("DoOrSimulateScriptTextForMap has invalid source entry %u for map %u.", uiCreatureEntry, pMap->GetId());
+        return;
+    }
+
+    MangosStringLocale const* pData = GetMangosStringData(iTextEntry);
+    if (!pData)
+    {
+        script_error_log("DoOrSimulateScriptTextForMap with source entry %u for map %u could not find text entry %i.", uiCreatureEntry, pMap->GetId(), iTextEntry);
+        return;
+    }
+
+    debug_log("[SD3]: DoOrSimulateScriptTextForMap: text entry=%i, Sound=%u, Type=%u, Language=%u, Emote=%u",
+                iTextEntry, pData->SoundId, pData->Type, pData->LanguageId, pData->Emote);
+
+    if (pData->Type != CHAT_TYPE_ZONE_YELL)
+    {
+        script_error_log("DoSimulateScriptTextForMap entry %i has not supported chat type %u.", iTextEntry, pData->Type);
+        return;
+    }
+
+    if (pData->SoundId)
+    {
+        pMap->PlayDirectSoundToMap(pData->SoundId);
+    }
+
+    if (pCreatureSource)                                // If provided pointer for sayer, use direct version
+    {
+        pMap->MonsterYellToMap(pCreatureSource->GetObjectGuid(), iTextEntry, pData->LanguageId, pTarget);
+    }
+    else                                                // Simulate yell
+    {
+        pMap->MonsterYellToMap(pInfo, iTextEntry, pData->LanguageId, pTarget);
+    }
+}
+
+//*********************************
+//*** Functions used internally ***
+
+void Script::RegisterSelf(bool bReportError)
+{
+    if (uint32 id = GetScriptId(Name.c_str()))
+    {
+        m_scripts[id] = this;
+        ++num_sc_scripts;
+    }
+    else
+    {
+        if (bReportError)
+        {
+            script_error_log("Script registering but ScriptName %s is not assigned in database. Script will not be used.", Name.c_str());
+        }
+
+        delete this;
+    }
+}
+
+//************************************
+//*** Functions to be used by core ***
+
+void SD3::FreeScriptLibrary()
+{
+    // Free Spell Summary
+    delete []SpellSummary;
+
+    // Free resources before library unload
+    for (SDScriptVec::const_iterator itr = m_scripts.begin(); itr != m_scripts.end(); ++itr)
+    {
+        delete *itr;
+    }
+
+    m_scripts.clear();
+
+    num_sc_scripts = 0;
+
+    setScriptLibraryErrorFile(NULL, NULL);
+}
+
+void SD3::InitScriptLibrary()
+{
+    // ScriptDev3 startup
+    outstring_log("   ___         _      _   ___            ____");
+    outstring_log("  / __| __ _ _(_)_ __| |_|   \\ _____ __ |__ /");
+    outstring_log("  \\__ \\/ _| '_| | '_ \\  _| |) / -_) V /  |_ \\");
+    outstring_log("  |___/\\__|_| |_| .__/\\__|___/\\___|\\_/  |___/");
+    outstring_log("                |_|                          ");
+    outstring_log("                     https://getmangos.eu/\n");
+
+    // Get configuration file
+    bool configFailure = false;
+    if (!SD3Config.SetSource(MANGOSD_CONFIG_LOCATION))
+    {
+        configFailure = true;
+    }
+    else
+    {
+        outstring_log("[SD3]: Using configuration file %s", MANGOSD_CONFIG_LOCATION);
+    }
+
+    // Set SD3 Error Log File
+    std::string SD3LogFile = sConfig.GetStringDefault("SD3ErrorLogFile", "scriptdev3-errors.log");
+    setScriptLibraryErrorFile(SD3LogFile.c_str(), "SD3");
+
+    if (configFailure)
+    {
+        script_error_log("[SD3]: Unable to open configuration file. Configuration values will use default.");
+    }
+
+    outstring_log("\n");
+
+    // Load SD3 Script Bindings from the database
+    LoadSD3Bindings();
+
+    outstring_log("[SD3]: Loading C++ scripts");
+    BarGoLink bar(1);
+    bar.step();
+
+    // Resize script ids to needed ammount of assigned ScriptNames (from core)
+    m_scripts.resize(GetScriptIdsCount(), NULL);
+
+    FillSpellSummary();
+
+    AddScripts();
+
+    // Check existance scripts for all registered by core script names
+    for (uint32 i = 1; i < GetScriptIdsCount(); ++i)
+    {
+        if (!m_scripts[i])
+        {
+            script_error_log("[SD3]: No script found for ScriptName '%s'.", GetScriptName(i));
+        }
+    }
+
+    outstring_log(">> Loaded %i C++ Scripts.", num_sc_scripts);
+}
+
+char const* SD3::GetScriptLibraryVersion()
+{
+    return "[SD3] for MaNGOS";
+}
+
+bool SD3::GossipHello(Player* pPlayer, Creature* pCreature)
+{
+    Script* pTempScript = m_scripts[pCreature->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToCreatureScript())
+    {
+        return false;
+    }
+
+    //pPlayer->PlayerTalkClass->ClearMenus();
+
+    return pTempScript->ToCreatureScript()->OnGossipHello(pPlayer, pCreature);
+}
+
+bool SD3::GOGossipHello(Player* pPlayer, GameObject* pGo)
+{
+    Script* pTempScript = m_scripts[pGo->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToGameObjectScript())
+    {
+        return false;
+    }
+
+    //pPlayer->PlayerTalkClass->ClearMenus();
+
+    return pTempScript->ToGameObjectScript()->OnGossipHello(pPlayer, pGo);
+}
+
+bool SD3::GossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
+{
+    debug_log("[SD3]: Gossip selection, sender: %u, action: %u", uiSender, uiAction);
+
+    Script* pTempScript = m_scripts[pCreature->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToCreatureScript())
+    {
+        return false;
+    }
+
+    return pTempScript->ToCreatureScript()->OnGossipSelect(pPlayer, pCreature, uiSender, uiAction);
+}
+
+bool SD3::GOGossipSelect(Player* pPlayer, GameObject* pGo, uint32 uiSender, uint32 uiAction)
+{
+    debug_log("[SD3]: GO Gossip selection, sender: %u, action: %u", uiSender, uiAction);
+
+    Script* pTempScript = m_scripts[pGo->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToGameObjectScript())
+    {
+        return false;
+    }
+
+    return pTempScript->ToGameObjectScript()->OnGossipSelect(pPlayer, pGo, uiSender, uiAction);
+}
+
+bool SD3::GossipSelectWithCode(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction, const char* sCode)
+{
+    debug_log("[SD3]: Gossip selection with code, sender: %u, action: %u", uiSender, uiAction);
+
+    Script* pTempScript = m_scripts[pCreature->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToCreatureScript())
+    {
+        return false;
+    }
+
+    return pTempScript->ToCreatureScript()->OnGossipSelectWithCode(pPlayer, pCreature, uiSender, uiAction, sCode);
+}
+
+bool SD3::GOGossipSelectWithCode(Player* pPlayer, GameObject* pGo, uint32 uiSender, uint32 uiAction, const char* sCode)
+{
+    debug_log("[SD3]: GO Gossip selection with code, sender: %u, action: %u", uiSender, uiAction);
+
+    Script* pTempScript = m_scripts[pGo->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToGameObjectScript())
+    {
+        return false;
+    }
+
+    return pTempScript->ToGameObjectScript()->OnGossipSelectWithCode(pPlayer, pGo, uiSender, uiAction, sCode);
+}
+
+bool SD3::QuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest)
+{
+    Script* pTempScript = m_scripts[pCreature->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToCreatureScript())
+    {
+        return false;
+    }
+
+    //pPlayer->PlayerTalkClass->ClearMenus();
+
+    return pTempScript->ToCreatureScript()->OnQuestAccept(pPlayer, pCreature, pQuest);
+}
+
+bool SD3::QuestRewarded(Player* pPlayer, Creature* pCreature, Quest const* pQuest)
+{
+    Script* pTempScript = m_scripts[pCreature->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToCreatureScript())
+    {
+        return false;
+    }
+
+    //pPlayer->PlayerTalkClass->ClearMenus();
+
+    return pTempScript->ToCreatureScript()->OnQuestRewarded(pPlayer, pCreature, pQuest);
+}
+
+uint32 SD3::GetNPCDialogStatus(Player* pPlayer, Creature* pCreature)
+{
+    Script* pTempScript = m_scripts[pCreature->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToCreatureScript())
+    {
+        return DIALOG_STATUS_UNDEFINED;
+    }
+
+    //pPlayer->PlayerTalkClass->ClearMenus();
+
+    return pTempScript->ToCreatureScript()->OnDialogEnd(pPlayer, pCreature);
+}
+
+uint32 SD3::GetGODialogStatus(Player* pPlayer, GameObject* pGo)
+{
+    Script* pTempScript = m_scripts[pGo->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToGameObjectScript())
+    {
+        return DIALOG_STATUS_UNDEFINED;
+    }
+
+    //pPlayer->PlayerTalkClass->ClearMenus();
+
+    return pTempScript->ToGameObjectScript()->OnDialogEnd(pPlayer, pGo);
+}
+
+bool SD3::ItemQuestAccept(Player* pPlayer, Item* pItem, Quest const* pQuest)
+{
+    Script* pTempScript = m_scripts[pItem->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToItemScript())
+    {
+        return false;
+    }
+
+    //pPlayer->PlayerTalkClass->ClearMenus();
+
+    return pTempScript->ToItemScript()->OnQuestAccept(pPlayer, pItem, pQuest);
+}
+
+bool SD3::GOUse(Player* pPlayer, GameObject* pGo)
+{
+    Script* pTempScript = m_scripts[pGo->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToGameObjectScript())
+    {
+        return false;
+    }
+
+    return pTempScript->ToGameObjectScript()->OnUse(pPlayer, pGo);
+}
+
+bool SD3::GOQuestAccept(Player* pPlayer, GameObject* pGo, const Quest* pQuest)
+{
+    Script* pTempScript = m_scripts[pGo->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToGameObjectScript())
+    {
+        return false;
+    }
+
+    //pPlayer->PlayerTalkClass->ClearMenus();
+
+    return pTempScript->ToGameObjectScript()->OnQuestAccept(pPlayer, pGo, pQuest);
+}
+
+bool SD3::GOQuestRewarded(Player* pPlayer, GameObject* pGo, Quest const* pQuest)
+{
+    Script* pTempScript = m_scripts[pGo->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToGameObjectScript())
+    {
+        return false;
+    }
+
+    //pPlayer->PlayerTalkClass->ClearMenus();
+
+    return pTempScript->ToGameObjectScript()->OnQuestRewarded(pPlayer, pGo, pQuest);
+}
+
+bool SD3::AreaTrigger(Player* pPlayer, AreaTriggerEntry const* atEntry)
+{
+    Script* pTempScript = m_scripts[sScriptMgr.GetBoundScriptId(SCRIPTED_AREATRIGGER, atEntry->id)];
+
+    if (!pTempScript || !pTempScript->ToAreaTriggerScript())
+    {
+        return false;
+    }
+
+    return pTempScript->ToAreaTriggerScript()->OnTrigger(pPlayer, atEntry);
+}
+
+#if defined (WOTLK) || defined (CATA)
+bool SD3::NpcSpellClick(Player* pPlayer, Creature* pClickedCreature, uint32 uiSpellId)
+{
+    Script* pTempScript = m_scripts[pClickedCreature->GetScriptId()];
+    
+    if (!pTempScript || !pTempScript->ToCreatureScript())
+        return false;
+    
+    return pTempScript->ToCreatureScript()->OnSpellClick(pPlayer, pClickedCreature, uiSpellId);
+}
+#endif
+//the analogous method OnMapEvent exists also in the ZoneScript class and there it should have a higher priority. TODO
+bool SD3::ProcessEvent(uint32 uiEventId, Object* pSource, Object* pTarget, bool bIsStart)
+{
+    Script* pTempScript = m_scripts[sScriptMgr.GetBoundScriptId(SCRIPTED_MAPEVENT, uiEventId)];
+
+    if (!pTempScript || !pTempScript->ToMapEventScript())
+    {
+        return false;
+    }
+
+    // bIsStart may be false, when event is from taxi node events (arrival=false, departure=true)
+    return pTempScript->ToMapEventScript()->OnReceived(uiEventId, pSource, pTarget, bIsStart);
+}
+
+CreatureAI* SD3::GetCreatureAI(Creature* pCreature)
+{
+    Script* pTempScript = m_scripts[pCreature->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToCreatureScript())
+    {
+        return NULL;
+    }
+
+    CreatureAI* ai = pTempScript->ToCreatureScript()->GetAI(pCreature);
+    if (ai)
+        ai->Reset();
+
+    return ai;
+}
+
+bool SD3::ItemUse(Player* pPlayer, Item* pItem, SpellCastTargets const& targets)
+{
+    Script* pTempScript = m_scripts[pItem->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToItemScript())
+    {
+        return false;
+    }
+
+    return pTempScript->ToItemScript()->OnUse(pPlayer, pItem, targets);
+}
+
+bool SD3::ItemEquip(Player* pPlayer, Item* pItem, bool on)
+{
+    Script* pTempScript = m_scripts[pItem->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToItemScript())
+    {
+        return false;
+    }
+
+    return pTempScript->ToItemScript()->OnEquip(pPlayer, pItem, on);
+}
+
+bool SD3::ItemDelete(Player* pPlayer, Item* pItem)
+{
+    Script* pTempScript = m_scripts[pItem->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToItemScript())
+    {
+        return false;
+    }
+
+    return pTempScript->ToItemScript()->OnDelete(pPlayer, pItem);
+}
+
+// NOTE! test if sScriptMgr is allowed here, or else add script id on upper level to the parameters
+bool SD3::EffectDummyUnit(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Unit* pTarget, ObjectGuid originalCasterGuid)
+{
+    Script* pTempScript = m_scripts[sScriptMgr.GetBoundScriptId(SCRIPTED_SPELL, spellId | effIndex << 24)];
+
+    if (!pTempScript || !pTempScript->ToSpellScript())
+    {
+        return false;
+    }
+
+    return pTempScript->ToSpellScript()->EffectDummy(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
+}
+
+bool SD3::EffectDummyGameObject(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, GameObject* pTarget, ObjectGuid originalCasterGuid)
+{
+    Script* pTempScript = m_scripts[sScriptMgr.GetBoundScriptId(SCRIPTED_SPELL, spellId | effIndex << 24)];
+
+    if (!pTempScript || !pTempScript->ToSpellScript())
+    {
+        return false;
+    }
+
+    return pTempScript->ToSpellScript()->EffectDummy(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
+}
+
+bool SD3::EffectDummyItem(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Item* pTarget, ObjectGuid originalCasterGuid)
+{
+    Script* pTempScript = m_scripts[sScriptMgr.GetBoundScriptId(SCRIPTED_SPELL, spellId | effIndex << 24)];
+
+    if (!pTempScript || !pTempScript->ToSpellScript())
+    {
+        return false;
+    }
+
+    return pTempScript->ToSpellScript()->EffectDummy(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
+}
+
+bool SD3::EffectScriptEffectUnit(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Unit* pTarget, ObjectGuid originalCasterGuid)
+{
+    Script* pTempScript = m_scripts[sScriptMgr.GetBoundScriptId(SCRIPTED_SPELL, spellId | effIndex << 24)];
+
+    if (!pTempScript || !pTempScript->ToSpellScript())
+    {
+        return false;
+    }
+
+    return pTempScript->ToSpellScript()->EffectScriptEffect(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
+}
+
+bool SD3::AuraDummy(Aura const* pAura, bool bApply)
+{
+    Script* pTempScript = m_scripts[sScriptMgr.GetBoundScriptId(SCRIPTED_AURASPELL, pAura->GetId() | pAura->GetEffIndex() << 24)];
+
+    if (!pTempScript || !pTempScript->ToAuraScript())
+    {
+        return false;
+    }
+
+    return pTempScript->ToAuraScript()->OnDummyApply(pAura, bApply);
+}
+// END Note!
+
+InstanceData* SD3::CreateInstanceData(Map* pMap)
+{
+    Script* pTempScript = m_scripts[pMap->GetScriptId()];
+
+    if (!pTempScript || !pTempScript->ToInstanceScript())
+    {
+        return NULL;
+    }
+
+    return pTempScript->ToInstanceScript()->GetInstanceData(pMap);
+}
diff --git a/src/modules/SD3/system/ScriptDevMgr.h b/src/modules/SD3/system/ScriptDevMgr.h
new file mode 100644
index 000000000..045103218
--- /dev/null
+++ b/src/modules/SD3/system/ScriptDevMgr.h
@@ -0,0 +1,285 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef SC_SCRIPTMGR_H
+#define SC_SCRIPTMGR_H
+
+#include "Common.h"
+#include "DBCStructure.h"
+#include "ScriptMgr.h"
+
+class Player;
+class Creature;
+class CreatureAI;
+class InstanceData;
+class Quest;
+class Item;
+class GameObject;
+class SpellCastTargets;
+class Map;
+class Unit;
+class WorldObject;
+class Aura;
+class Object;
+class ObjectGuid;
+
+// *********************************************************
+// **************** Functions used by core *****************
+
+class SD3
+{
+public:
+    static void FreeScriptLibrary();
+    static void InitScriptLibrary();
+    static char const* GetScriptLibraryVersion();
+
+    static CreatureAI* GetCreatureAI(Creature* pCreature);
+    static InstanceData* CreateInstanceData(Map* pMap);
+
+    static bool GossipHello(Player*, Creature*);
+    static bool GOGossipHello(Player*, GameObject*);
+    static bool GossipSelect(Player*, Creature*, uint32, uint32);
+    static bool GOGossipSelect(Player*, GameObject*, uint32, uint32);
+    static bool GossipSelectWithCode(Player*, Creature*, uint32, uint32, const char*);
+    static bool GOGossipSelectWithCode(Player*, GameObject*, uint32, uint32, const char*);
+    static bool QuestAccept(Player*, Creature*, Quest const*);
+    static bool GOQuestAccept(Player*, GameObject*, Quest const*);
+    static bool ItemQuestAccept(Player*, Item*, Quest const*);
+    static bool QuestRewarded(Player*, Creature*, Quest const*);
+    static bool GOQuestRewarded(Player*, GameObject*, Quest const*);
+    static uint32 GetNPCDialogStatus(Player*, Creature*);
+    static uint32 GetGODialogStatus(Player*, GameObject*);
+    static bool GOUse(Player*, GameObject*);
+    static bool ItemUse(Player*, Item*, SpellCastTargets const&);
+    static bool ItemEquip(Player*, Item*, bool);    //new TODO
+    static bool ItemDelete(Player*, Item*);         //new TODO
+    static bool AreaTrigger(Player*, AreaTriggerEntry const*);
+#if defined (WOTLK) || defined (CATA)
+    static bool NpcSpellClick(Player* pPlayer, Creature* pClickedCreature, uint32 uiSpellId);
+#endif
+    static bool ProcessEvent(uint32, Object*, Object*, bool);
+    static bool EffectDummyUnit(Unit*, uint32, SpellEffectIndex, Unit*, ObjectGuid);
+    static bool EffectDummyGameObject(Unit*, uint32, SpellEffectIndex, GameObject*, ObjectGuid);
+    static bool EffectDummyItem(Unit*, uint32, SpellEffectIndex, Item*, ObjectGuid);
+    static bool EffectScriptEffectUnit(Unit*, uint32, SpellEffectIndex, Unit*, ObjectGuid);
+    static bool AuraDummy(Aura const *, bool);
+    //static bool AuraDummyTick(Aura const*);         [-ZERO:] no dummy ticks. TODO
+};
+
+// *********************************************************
+// ************** Some defines used globally ***************
+
+// Basic defines
+#define VISIBLE_RANGE       (166.0f)                        // MAX visible range (size of grid)
+#define DEFAULT_TEXT        "<ScriptDev3 Text Entry Missing!>"
+
+/* Escort Factions
+ * TODO: find better namings and definitions.
+ * N=Neutral, A=Alliance, H=Horde.
+ * NEUTRAL or FRIEND = Hostility to player surroundings (not a good definition)
+ * ACTIVE or PASSIVE = Hostility to environment surroundings.
+ */
+enum EscortFaction
+{
+    FACTION_ESCORT_A_NEUTRAL_PASSIVE    = 10,
+    FACTION_ESCORT_H_NEUTRAL_PASSIVE    = 33,
+    FACTION_ESCORT_N_NEUTRAL_PASSIVE    = 113,
+
+    FACTION_ESCORT_A_NEUTRAL_ACTIVE     = 231,
+    FACTION_ESCORT_H_NEUTRAL_ACTIVE     = 232,
+    FACTION_ESCORT_N_NEUTRAL_ACTIVE     = 250,
+
+    FACTION_ESCORT_N_FRIEND_PASSIVE     = 290,
+    FACTION_ESCORT_N_FRIEND_ACTIVE      = 495,
+
+    FACTION_ESCORT_A_PASSIVE            = 774,
+    FACTION_ESCORT_H_PASSIVE            = 775,
+
+    FACTION_ESCORT_N_ACTIVE             = 1986,
+    FACTION_ESCORT_H_ACTIVE             = 2046
+};
+
+// *********************************************************
+// ************* Some structures used globally *************
+struct CreatureScript;
+struct GameObjectScript;
+struct ItemScript;
+struct AreaTriggerScript;
+struct MapEventScript;
+struct ZoneScript;
+struct OutdoorPvPScript;
+struct BattleGroundScript;
+struct InstanceScript;
+struct SpellScript;
+struct AuraScript;
+struct ConditionScript;
+struct AchievementScript;
+
+struct Script
+{
+    std::string Name;
+    ScriptedObjectType Type;
+
+    void RegisterSelf(bool bReportError = true);
+    virtual bool IsValid() { return true; }
+
+    Script() : Name(""), Type(SCRIPTED_MAX_TYPE) {}
+    Script(ScriptedObjectType type, const char* name) : Name(name), Type(type) {}
+
+    CreatureScript* ToCreatureScript() { return Type == SCRIPTED_UNIT && IsValid() ? (CreatureScript*)this : NULL; }
+    GameObjectScript* ToGameObjectScript() { return Type == SCRIPTED_GAMEOBJECT && IsValid() ? (GameObjectScript*)this : NULL; }
+    ItemScript* ToItemScript() { return Type == SCRIPTED_ITEM && IsValid() ? (ItemScript*)this : NULL; }
+    AreaTriggerScript* ToAreaTriggerScript() { return Type == SCRIPTED_AREATRIGGER && IsValid() ? (AreaTriggerScript*)this : NULL; }
+    MapEventScript* ToMapEventScript() { return Type == SCRIPTED_MAPEVENT && IsValid() ? (MapEventScript*)this : NULL; }
+    ZoneScript* ToZoneScript() { return Type == SCRIPTED_MAP && IsValid() ? (ZoneScript*)this : NULL; }
+    OutdoorPvPScript* ToOutdoorPvPScript() { return Type == SCRIPTED_PVP_ZONE && IsValid() ? (OutdoorPvPScript*)this : NULL; }
+    BattleGroundScript* ToBattleGroundScript() { return Type == SCRIPTED_BATTLEGROUND && IsValid() ? (BattleGroundScript*)this : NULL; }
+    InstanceScript* ToInstanceScript() { return Type == SCRIPTED_INSTANCE && IsValid() ? (InstanceScript*)this : NULL; }
+    SpellScript* ToSpellScript() { return Type == SCRIPTED_SPELL && IsValid() ? (SpellScript*)this : NULL; }
+    AuraScript* ToAuraScript() { return Type == SCRIPTED_AURASPELL && IsValid() ? (AuraScript*)this : NULL; }
+    ConditionScript* ToConditionScript() { return Type == SCRIPTED_CONDITION && IsValid() ? (ConditionScript*)this : NULL; }
+    AchievementScript* ToAchievementScript() { return Type == SCRIPTED_ACHIEVEMENT && IsValid() ? (AchievementScript*)this : NULL; }
+};
+
+struct CreatureScript : public Script
+{
+    CreatureScript(const char* name) : Script(SCRIPTED_UNIT, name) {}
+
+    virtual bool OnGossipHello(Player*, Creature*) { return false; }
+    virtual bool OnGossipSelect(Player*, Creature*, uint32, uint32) { return false; }
+    virtual bool OnGossipSelectWithCode(Player*, Creature*, uint32, uint32, const char*) { return false; }
+    virtual uint32 OnDialogEnd(Player*, Creature*) { return 0; }
+    virtual bool OnQuestAccept(Player*, Creature*, Quest const*) { return false; }
+    virtual bool OnQuestRewarded(Player*, Creature*, Quest const*) { return false; }
+#if defined (WOTLK) || defined (CATA)
+    virtual bool OnSpellClick(Player*, Creature*, uint32) { return false; }
+#endif
+
+    virtual CreatureAI* GetAI(Creature*) { return NULL; }
+};
+
+struct GameObjectScript : public Script
+{
+    GameObjectScript(const char* name) : Script(SCRIPTED_GAMEOBJECT, name) {}
+
+    virtual bool OnGossipHello(Player*, GameObject*) { return false; }
+    virtual bool OnGossipSelect(Player*, GameObject*, uint32, uint32) { return false; }
+    virtual bool OnGossipSelectWithCode(Player*, GameObject*, uint32, uint32, const char*) { return false; }
+    virtual uint32 OnDialogEnd(Player*, GameObject*) { return 0; }
+    virtual bool OnQuestAccept(Player*, GameObject*, Quest const*) { return false; }
+    virtual bool OnQuestRewarded(Player*, GameObject*, Quest const*) { return false; }
+    virtual bool OnUse(Player*, GameObject*) { return false; }
+};
+
+struct ItemScript : public Script
+{
+    ItemScript(const char* name) : Script(SCRIPTED_ITEM, name) {}
+
+    virtual bool OnQuestAccept(Player*, Item*, Quest const*) { return false; }
+    virtual bool OnUse(Player*, Item*, SpellCastTargets const&) { return false; }
+    virtual bool OnEquip(Player*, Item*, bool on) { return false; }
+    virtual bool OnDelete(Player*, Item*) { return false; }
+};
+
+struct AreaTriggerScript : public Script
+{
+    AreaTriggerScript(const char* name) : Script(SCRIPTED_AREATRIGGER, name) {}
+
+    virtual bool OnTrigger(Player*, AreaTriggerEntry const*) { return false; }
+};
+
+struct MapEventScript : public Script
+{
+    MapEventScript(const char *name) : Script(SCRIPTED_MAPEVENT, name) {}
+
+    virtual bool OnReceived(uint32, Object*, Object*, bool) { return false; }
+};
+
+struct ZoneScript : public Script
+{
+    ZoneScript(const char* name) : Script(SCRIPTED_MAP, name) {}
+    ZoneScript(const char* name, ScriptedObjectType type) : Script(type, name) {}
+
+    virtual bool OnMapEvent(uint32, Object*, Object*, bool) { return false; }
+
+    virtual InstanceData* GetInstanceData(Map*) { return NULL; }
+};
+
+struct OutdoorPvPScript : public ZoneScript
+{
+    OutdoorPvPScript(const char* name) : ZoneScript(name, SCRIPTED_PVP_ZONE) {}
+};
+
+struct BattleGroundScript : public ZoneScript
+{
+    BattleGroundScript(const char* name) : ZoneScript(name, SCRIPTED_BATTLEGROUND) {}
+    //bool IsValid() override { return map && map->IsBattleGround(); }
+};
+
+struct InstanceScript : public ZoneScript
+{
+    InstanceScript(const char* name) : ZoneScript(name, SCRIPTED_INSTANCE) {}
+    //bool IsValid() override { return map && map->IsDungeon(); }
+};
+
+struct SpellScript : public Script
+{
+    SpellScript(const char* name) : Script(SCRIPTED_SPELL, name) {}
+    //bool IsValid() override { return bool(sSpellStore.LookupEntry(spellID)); }
+
+    virtual bool EffectDummy(Unit*, uint32, SpellEffectIndex, Object*, ObjectGuid) { return false; }
+    virtual bool EffectScriptEffect(Unit*, uint32, SpellEffectIndex, Unit*, ObjectGuid) { return false; }
+};
+
+struct AuraScript : public Script
+{
+    AuraScript(const char* name) : Script(SCRIPTED_AURASPELL, name) {}
+    //bool IsValid() override { return bool(sSpellStore.LookupEntry(spellID)); }
+
+    virtual bool OnDummyApply(const Aura*, bool) { return false; }
+#if defined (TBC) || defined (WOTLK) || defined (CATA)
+    virtual bool OnDummyTick(const Aura*) { return false; }
+#endif
+};
+
+struct ConditionScript : public Script
+{
+    ConditionScript(const char* name) : Script(SCRIPTED_CONDITION, name) {}
+};
+
+struct AchievementScript : public Script
+{
+    AchievementScript(const char* name) : Script(SCRIPTED_ACHIEVEMENT, name) {}
+};
+
+// *********************************************************
+// ************* Some functions used globally **************
+
+// Generic scripting text function
+void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget = NULL);
+void DoOrSimulateScriptTextForMap(int32 iTextEntry, uint32 uiCreatureEntry, Map* pMap, Creature* pCreatureSource = NULL, Unit* pTarget = NULL);
+
+#endif
diff --git a/src/modules/SD3/system/ScriptLoader.cpp b/src/modules/SD3/system/ScriptLoader.cpp
new file mode 100644
index 000000000..65d791843
--- /dev/null
+++ b/src/modules/SD3/system/ScriptLoader.cpp
@@ -0,0 +1,1124 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#include "precompiled.h"
+
+// eastern kingdoms
+void AddSC_blackrock_depths();                       // blackrock_depths
+void AddSC_boss_ambassador_flamelash();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+void AddSC_boss_coren_direbrew();
+#endif
+void AddSC_boss_draganthaurissan();
+void AddSC_boss_general_angerforge();
+void AddSC_boss_high_interrogator_gerstahn();
+void AddSC_instance_blackrock_depths();
+void AddSC_boss_overlordwyrmthalak();                // blackrock_spire
+void AddSC_boss_pyroguard_emberseer();
+void AddSC_boss_gyth();
+void AddSC_instance_blackrock_spire();
+void AddSC_boss_razorgore();                         // blackwing_lair
+void AddSC_boss_vaelastrasz();
+void AddSC_boss_broodlord();
+void AddSC_boss_firemaw();
+void AddSC_boss_ebonroc();
+void AddSC_boss_flamegor();
+void AddSC_boss_chromaggus();
+void AddSC_boss_nefarian();
+void AddSC_boss_victor_nefarius();
+void AddSC_instance_blackwing_lair();
+void AddSC_boss_mr_smite();                          // deadmines
+void AddSC_deadmines();
+void AddSC_instance_deadmines();
+void AddSC_gnomeregan();                             // gnomeregan
+void AddSC_boss_thermaplugg();
+void AddSC_instance_gnomeregan();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+void AddSC_boss_attumen();                           // karazhan
+void AddSC_boss_curator();
+void AddSC_boss_maiden_of_virtue();
+void AddSC_boss_shade_of_aran();
+void AddSC_boss_netherspite();
+void AddSC_boss_nightbane();
+void AddSC_boss_prince_malchezaar();
+void AddSC_boss_terestian_illhoof();
+void AddSC_boss_moroes();
+void AddSC_bosses_opera();
+void AddSC_chess_event();
+void AddSC_instance_karazhan();
+void AddSC_karazhan();
+void AddSC_boss_felblood_kaelthas();                 // magisters_terrace
+void AddSC_boss_selin_fireheart();
+void AddSC_boss_vexallus();
+void AddSC_boss_priestess_delrissa();
+void AddSC_instance_magisters_terrace();
+void AddSC_magisters_terrace();
+#endif  
+
+void AddSC_boss_lucifron();                          // molten_core
+void AddSC_boss_magmadar();
+void AddSC_boss_gehennas();
+void AddSC_boss_garr();
+void AddSC_boss_baron_geddon();
+void AddSC_boss_shazzrah();
+void AddSC_boss_golemagg();
+void AddSC_boss_sulfuron();
+void AddSC_boss_majordomo();
+void AddSC_boss_ragnaros();
+void AddSC_instance_molten_core();
+void AddSC_molten_core();
+
+#if defined (CLASSIC) || defined (TBC)
+void AddSC_boss_anubrekhan();                        // naxxramas
+void AddSC_boss_four_horsemen();
+void AddSC_boss_faerlina();
+void AddSC_boss_gluth();
+void AddSC_boss_gothik();
+void AddSC_boss_grobbulus();
+void AddSC_boss_kelthuzad();
+void AddSC_boss_loatheb();
+void AddSC_boss_maexxna();
+void AddSC_boss_noth();
+void AddSC_boss_heigan();
+void AddSC_boss_patchwerk();
+void AddSC_boss_razuvious();
+void AddSC_boss_sapphiron();
+void AddSC_boss_thaddius();
+void AddSC_instance_naxxramas();
+#endif
+
+#if defined (WOTLK) || defined (CATA)
+void AddSC_ebon_hold();                              // scarlet_enclave
+#endif
+void AddSC_boss_arcanist_doan();                     // scarlet_monastery
+void AddSC_boss_herod();
+void AddSC_boss_mograine_and_whitemane();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+void AddSC_boss_headless_horseman();
+#endif  
+
+void AddSC_instance_scarlet_monastery();
+void AddSC_boss_darkmaster_gandling();               // scholomance
+void AddSC_boss_jandicebarov();
+void AddSC_instance_scholomance();
+#if defined (WOTLK) || defined (CATA)
+void AddSC_boss_hummel();                            // shadowfang_keep
+#endif
+void AddSC_shadowfang_keep();                        // shadowfang_keep
+void AddSC_instance_shadowfang_keep();
+void AddSC_boss_maleki_the_pallid();                 // stratholme
+void AddSC_boss_cannon_master_willey();
+void AddSC_boss_baroness_anastari();
+void AddSC_boss_dathrohan_balnazzar();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+void AddSC_boss_order_of_silver_hand();
+#endif
+
+void AddSC_instance_stratholme();
+void AddSC_stratholme();
+void AddSC_instance_sunken_temple();                 // sunken_temple
+void AddSC_sunken_temple();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+void AddSC_boss_brutallus();                         // sunwell_plateau
+void AddSC_boss_eredar_twins();
+void AddSC_boss_felmyst();
+void AddSC_boss_kalecgos();
+void AddSC_boss_kiljaeden();
+void AddSC_boss_muru();
+void AddSC_instance_sunwell_plateau();
+#endif
+
+void AddSC_boss_archaedas();                         // uldaman
+void AddSC_instance_uldaman();
+void AddSC_uldaman();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+void AddSC_boss_akilzon();                           // zulaman
+void AddSC_boss_halazzi();
+void AddSC_boss_janalai();
+void AddSC_boss_malacrass();
+void AddSC_boss_nalorakk();
+void AddSC_instance_zulaman();
+void AddSC_zulaman();
+void AddSC_boss_zuljin();
+#endif  
+
+void AddSC_boss_arlokk();                            // zulgurub
+void AddSC_boss_hakkar();
+void AddSC_boss_hazzarah();
+void AddSC_boss_jeklik();
+void AddSC_boss_jindo();
+void AddSC_boss_mandokir();
+void AddSC_boss_marli();
+void AddSC_boss_ouro();
+void AddSC_boss_renataki();
+void AddSC_boss_thekal();
+void AddSC_boss_venoxis();
+void AddSC_instance_zulgurub();
+
+void AddSC_alterac_mountains();
+void AddSC_arathi_highlands();
+void AddSC_blasted_lands();
+
+#if defined (CLASSIC)  
+void AddSC_boss_kazzakAI();
+#endif
+void AddSC_burning_steppes();
+void AddSC_dun_morogh();
+void AddSC_eastern_plaguelands();
+void AddSC_elwynn_forest();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+void AddSC_eversong_woods();
+void AddSC_ghostlands();
+#endif  
+
+void AddSC_hinterlands();
+void AddSC_ironforge();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+void AddSC_isle_of_queldanas();
+#endif
+
+void AddSC_loch_modan();
+void AddSC_redridge_mountains();
+void AddSC_searing_gorge();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+void AddSC_silvermoon_city();
+#endif
+
+void AddSC_silverpine_forest();
+void AddSC_stormwind_city();
+void AddSC_stranglethorn_vale();
+void AddSC_swamp_of_sorrows();
+void AddSC_tirisfal_glades();
+void AddSC_undercity();
+void AddSC_western_plaguelands();
+void AddSC_westfall();
+void AddSC_wetlands();
+
+void AddEasternKingdomsScripts()
+{
+    AddSC_blackrock_depths();                               // blackrock_depths
+    AddSC_boss_ambassador_flamelash();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    AddSC_boss_coren_direbrew();
+#endif
+
+    AddSC_boss_draganthaurissan();
+    AddSC_boss_general_angerforge();
+    AddSC_boss_high_interrogator_gerstahn();
+    AddSC_instance_blackrock_depths();
+    AddSC_boss_overlordwyrmthalak();                        // blackrock_spire
+    AddSC_boss_pyroguard_emberseer();
+    AddSC_boss_gyth();
+    AddSC_instance_blackrock_spire();
+    AddSC_boss_razorgore();                                 // blackwing_lair
+    AddSC_boss_vaelastrasz();
+    AddSC_boss_broodlord();
+    AddSC_boss_firemaw();
+    AddSC_boss_ebonroc();
+    AddSC_boss_flamegor();
+    AddSC_boss_chromaggus();
+    AddSC_boss_nefarian();
+    AddSC_boss_victor_nefarius();
+    AddSC_instance_blackwing_lair();
+    AddSC_deadmines();                                      // deadmines
+    AddSC_boss_mr_smite();
+    AddSC_instance_deadmines();
+    AddSC_gnomeregan();                                     // gnomeregan
+    AddSC_boss_thermaplugg();
+    AddSC_instance_gnomeregan();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    AddSC_boss_attumen();                                   // karazhan
+    AddSC_boss_curator();
+    AddSC_boss_maiden_of_virtue();
+    AddSC_boss_shade_of_aran();
+    AddSC_boss_netherspite();
+    AddSC_boss_nightbane();
+    AddSC_boss_prince_malchezaar();
+    AddSC_boss_terestian_illhoof();
+    AddSC_boss_moroes();
+    AddSC_bosses_opera();
+    AddSC_chess_event();
+    AddSC_instance_karazhan();
+    AddSC_karazhan();
+    AddSC_boss_felblood_kaelthas();                         // magisters_terrace
+    AddSC_boss_selin_fireheart();
+    AddSC_boss_vexallus();
+    AddSC_boss_priestess_delrissa();
+    AddSC_instance_magisters_terrace();
+    AddSC_magisters_terrace();
+#endif
+
+    AddSC_boss_lucifron();                                  // molten_core
+    AddSC_boss_magmadar();
+    AddSC_boss_gehennas();
+    AddSC_boss_garr();
+    AddSC_boss_baron_geddon();
+    AddSC_boss_shazzrah();
+    AddSC_boss_golemagg();
+    AddSC_boss_sulfuron();
+    AddSC_boss_majordomo();
+    AddSC_boss_ragnaros();
+    AddSC_instance_molten_core();
+    AddSC_molten_core();
+#if defined (WOTLK) || defined (CATA)
+    AddSC_ebon_hold();                                      // scarlet_enclave
+#endif
+#if defined (CLASSIC) || defined (TBC)
+    AddSC_boss_anubrekhan();                                // naxxramas
+    AddSC_boss_four_horsemen();
+    AddSC_boss_faerlina();
+    AddSC_boss_gluth();
+    AddSC_boss_gothik();
+    AddSC_boss_grobbulus();
+    AddSC_boss_kelthuzad();
+    AddSC_boss_loatheb();
+    AddSC_boss_maexxna();
+    AddSC_boss_noth();
+    AddSC_boss_heigan();
+    AddSC_boss_patchwerk();
+    AddSC_boss_razuvious();
+    AddSC_boss_sapphiron();
+    AddSC_boss_thaddius();
+    AddSC_instance_naxxramas();
+#endif
+    AddSC_boss_arcanist_doan();                             // scarlet_monastery
+    AddSC_boss_herod();
+    AddSC_boss_mograine_and_whitemane();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    AddSC_boss_headless_horseman();
+#endif
+
+    AddSC_instance_scarlet_monastery();
+    AddSC_boss_darkmaster_gandling();                       // scholomance
+    AddSC_boss_jandicebarov();
+    AddSC_instance_scholomance();
+#if defined (WOTLK) || defined (CATA)
+    AddSC_boss_hummel();                                    // shadowfang_keep
+#endif
+    AddSC_shadowfang_keep();                                // shadowfang_keep
+    AddSC_instance_shadowfang_keep();
+    AddSC_boss_maleki_the_pallid();                         // stratholme
+    AddSC_boss_cannon_master_willey();
+    AddSC_boss_baroness_anastari();
+    AddSC_boss_dathrohan_balnazzar();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    AddSC_boss_order_of_silver_hand();
+#endif
+
+    AddSC_instance_stratholme();
+    AddSC_stratholme();
+    AddSC_instance_sunken_temple();                         // sunken_temple
+    AddSC_sunken_temple();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    AddSC_boss_brutallus();                                 // sunwell_plateau
+    AddSC_boss_eredar_twins();
+    AddSC_boss_felmyst();
+    AddSC_boss_kalecgos();
+    AddSC_boss_kiljaeden();
+    AddSC_boss_muru();
+    AddSC_instance_sunwell_plateau();
+#endif
+
+    AddSC_boss_archaedas();                                 // uldaman
+    AddSC_instance_uldaman();
+    AddSC_uldaman();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    AddSC_boss_akilzon();                                   // zulaman
+    AddSC_boss_halazzi();
+    AddSC_boss_janalai();
+    AddSC_boss_malacrass();
+    AddSC_boss_nalorakk();
+    AddSC_instance_zulaman();
+    AddSC_zulaman();
+    AddSC_boss_zuljin();
+#endif
+
+    AddSC_boss_arlokk();                                    // zulgurub
+    AddSC_boss_hakkar();
+    AddSC_boss_hazzarah();
+    AddSC_boss_jeklik();
+    AddSC_boss_jindo();
+    AddSC_boss_mandokir();
+    AddSC_boss_marli();
+    AddSC_boss_ouro();
+    AddSC_boss_renataki();
+    AddSC_boss_thekal();
+    AddSC_boss_venoxis();
+    AddSC_instance_zulgurub();
+
+    AddSC_alterac_mountains();
+    AddSC_arathi_highlands();
+    AddSC_blasted_lands();
+
+#if defined (CLASSIC)  
+    AddSC_boss_kazzakAI();
+#endif
+
+    AddSC_burning_steppes();
+    AddSC_dun_morogh();
+    AddSC_eastern_plaguelands();
+    AddSC_elwynn_forest();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    AddSC_eversong_woods();
+    AddSC_ghostlands();
+#endif
+
+    AddSC_hinterlands();
+    AddSC_ironforge();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    AddSC_isle_of_queldanas();
+#endif
+
+    AddSC_loch_modan();
+    AddSC_redridge_mountains();
+    AddSC_searing_gorge();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)    
+    AddSC_silvermoon_city();
+#endif
+
+    AddSC_silverpine_forest();
+    AddSC_stormwind_city();
+    AddSC_stranglethorn_vale();
+    AddSC_swamp_of_sorrows();
+    AddSC_tirisfal_glades();
+    AddSC_undercity();
+    AddSC_western_plaguelands();
+    AddSC_westfall();
+    AddSC_wetlands();
+}
+
+// kalimdor
+void AddSC_instance_blackfathom_deeps();             // blackfathom_deeps
+void AddSC_blackfathom_deeps();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+void AddSC_boss_aeonus();                            // COT, dark_portal
+void AddSC_boss_chrono_lord_deja();
+void AddSC_boss_temporus();
+void AddSC_dark_portal();
+void AddSC_instance_dark_portal();
+void AddSC_hyjal();                                  // COT, hyjal
+void AddSC_boss_archimonde();
+void AddSC_instance_mount_hyjal();
+void AddSC_instance_old_hillsbrad();                 // COT, old_hillsbrad
+void AddSC_old_hillsbrad();
+#endif
+#if defined (WOTLK) || defined (CATA)
+void AddSC_culling_of_stratholme();                  // COT, culling_of_stratholme
+void AddSC_instance_culling_of_stratholme();
+#endif
+void AddSC_dire_maul();                              // dire_maul
+void AddSC_instance_dire_maul();
+void AddSC_boss_noxxion();                           // maraudon
+void AddSC_boss_onyxia();                            // onyxias_lair
+void AddSC_instance_onyxias_lair();
+void AddSC_npc_onyxian_warder();
+void AddSC_instance_razorfen_downs();                // razorfen_downs
+void AddSC_razorfen_downs();
+void AddSC_instance_razorfen_kraul();                // razorfen_kraul
+void AddSC_razorfen_kraul();
+void AddSC_boss_ayamiss();                           // ruins_of_ahnqiraj
+void AddSC_boss_buru();
+void AddSC_boss_kurinnaxx();
+void AddSC_boss_ossirian();
+void AddSC_boss_moam();
+void AddSC_boss_rajaxx();
+void AddSC_ruins_of_ahnqiraj();
+void AddSC_instance_ruins_of_ahnqiraj();
+void AddSC_boss_cthun();                             // temple_of_ahnqiraj
+void AddSC_boss_fankriss();
+void AddSC_boss_huhuran();
+void AddSC_bug_trio();
+void AddSC_boss_sartura();
+void AddSC_boss_skeram();
+void AddSC_boss_twinemperors();
+void AddSC_boss_viscidus();
+void AddSC_mob_anubisath_sentinel();
+void AddSC_instance_temple_of_ahnqiraj();
+void AddSC_instance_wailing_caverns();               // wailing_caverns
+void AddSC_wailing_caverns();
+void AddSC_boss_zumrah();                            // zulfarrak
+void AddSC_instance_zulfarrak();
+void AddSC_zulfarrak();
+
+void AddSC_ashenvale();
+void AddSC_azshara();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+void AddSC_azuremyst_isle();
+void AddSC_bloodmyst_isle();
+#endif
+
+void AddSC_boss_azuregos();
+void AddSC_darkshore();
+void AddSC_desolace();
+void AddSC_durotar();
+void AddSC_dustwallow_marsh();
+void AddSC_felwood();
+void AddSC_feralas();
+void AddSC_moonglade();
+void AddSC_mulgore();
+void AddSC_orgrimmar();
+void AddSC_silithus();
+void AddSC_stonetalon_mountains();
+void AddSC_tanaris();
+void AddSC_teldrassil();
+void AddSC_the_barrens();
+void AddSC_thousand_needles();
+void AddSC_thunder_bluff();
+void AddSC_ungoro_crater();
+void AddSC_winterspring();
+
+void AddKalimdorScripts()
+{
+    AddSC_instance_blackfathom_deeps();                     // blackfathom deeps
+    AddSC_blackfathom_deeps();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    AddSC_boss_aeonus();                                    // CoT, dark_portal
+    AddSC_boss_chrono_lord_deja();
+    AddSC_boss_temporus();
+    AddSC_dark_portal();
+    AddSC_instance_dark_portal();
+    AddSC_hyjal();                                          // CoT, hyjal
+    AddSC_boss_archimonde();
+    AddSC_instance_mount_hyjal();
+    AddSC_instance_old_hillsbrad();                         // CoT, old_hillsbrand
+    AddSC_old_hillsbrad();
+#endif
+#if defined (WOTLK) || defined (CATA)
+    AddSC_culling_of_stratholme();                          // CoT, culling_of_stratholme
+    AddSC_instance_culling_of_stratholme();
+#endif
+    AddSC_dire_maul();                                      // dire_maul
+    AddSC_instance_dire_maul();
+    AddSC_boss_noxxion();                                   // maraudon
+    AddSC_boss_onyxia();                                    // onyxias_lair
+    AddSC_instance_onyxias_lair();
+    AddSC_npc_onyxian_warder();
+    AddSC_instance_razorfen_downs();                        // razorfen_downs
+    AddSC_razorfen_downs();
+    AddSC_instance_razorfen_kraul();                        // razorfen_kraul
+    AddSC_razorfen_kraul();
+    AddSC_boss_ayamiss();                                   // ruins_of_ahnqiraj
+    AddSC_boss_buru();
+    AddSC_boss_kurinnaxx();
+    AddSC_boss_ossirian();
+    AddSC_boss_moam();
+    AddSC_boss_rajaxx();
+    AddSC_ruins_of_ahnqiraj();
+    AddSC_instance_ruins_of_ahnqiraj();
+    AddSC_boss_cthun();                                     // temple_of_ahnqiraj
+    AddSC_boss_fankriss();
+    AddSC_boss_huhuran();
+    AddSC_bug_trio();
+    AddSC_boss_sartura();
+    AddSC_boss_skeram();
+    AddSC_boss_twinemperors();
+    AddSC_boss_viscidus();
+    AddSC_mob_anubisath_sentinel();
+    AddSC_instance_temple_of_ahnqiraj();
+    AddSC_instance_wailing_caverns();                       // wailing_caverns
+    AddSC_wailing_caverns();
+    AddSC_boss_zumrah();                                    // zulfarrak
+    AddSC_zulfarrak();
+    AddSC_instance_zulfarrak();
+
+    AddSC_ashenvale();
+    AddSC_azshara();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    AddSC_azuremyst_isle();
+    AddSC_bloodmyst_isle();
+#endif
+
+    AddSC_boss_azuregos();
+    AddSC_darkshore();
+    AddSC_desolace();
+    AddSC_durotar();
+    AddSC_dustwallow_marsh();
+    AddSC_felwood();
+    AddSC_feralas();
+    AddSC_moonglade();
+    AddSC_mulgore();
+    AddSC_orgrimmar();
+    AddSC_silithus();
+    AddSC_stonetalon_mountains();
+    AddSC_tanaris();
+    AddSC_teldrassil();
+    AddSC_the_barrens();
+    AddSC_thousand_needles();
+    AddSC_thunder_bluff();
+    AddSC_ungoro_crater();
+    AddSC_winterspring();
+}
+
+#if defined (WOTLK) || defined (CATA)
+// northrend
+void AddSC_boss_amanitar();                          // azjol-nerub, ahnkahet
+void AddSC_boss_jedoga();
+void AddSC_boss_nadox();
+void AddSC_boss_taldaram();
+void AddSC_boss_volazj();
+void AddSC_instance_ahnkahet();
+void AddSC_boss_anubarak();                          // azjol-nerub, azjol-nerub
+void AddSC_boss_hadronox();
+void AddSC_boss_krikthir();
+void AddSC_instance_azjol_nerub();
+void AddSC_trial_of_the_champion();                  // CC, trial_of_the_champion
+void AddSC_boss_grand_champions();
+void AddSC_instance_trial_of_the_champion();
+void AddSC_boss_anubarak_trial();                    // CC, trial_of_the_crusader
+void AddSC_boss_faction_champions();
+void AddSC_boss_jaraxxus();
+void AddSC_instance_trial_of_the_crusader();
+void AddSC_northrend_beasts();
+void AddSC_trial_of_the_crusader();
+void AddSC_twin_valkyr();
+void AddSC_boss_novos();                             // draktharon_keep
+void AddSC_boss_tharonja();
+void AddSC_boss_trollgore();
+void AddSC_instance_draktharon_keep();
+void AddSC_boss_colossus();                          // gundrak
+void AddSC_boss_eck();
+void AddSC_boss_galdarah();
+void AddSC_boss_moorabi();
+void AddSC_boss_sladran();
+void AddSC_instance_gundrak();
+void AddSC_boss_bronjahm();                          // ICC, forge_of_souls
+void AddSC_boss_devourer_of_souls();
+void AddSC_instance_forge_of_souls();
+void AddSC_boss_falric();                            // ICC, halls_of_reflection
+void AddSC_boss_lich_king();
+void AddSC_boss_marwyn();
+void AddSC_halls_of_reflection();
+void AddSC_instance_halls_of_reflection();
+void AddSC_boss_garfrost();                          // ICC, pit_of_saron
+void AddSC_boss_krick_and_ick();
+void AddSC_boss_tyrannus();
+void AddSC_instance_pit_of_saron();
+void AddSC_pit_of_saron();
+void AddSC_blood_prince_council();                   // ICC, icecrown_citadel
+void AddSC_boss_blood_queen_lanathel();
+void AddSC_boss_deathbringer_saurfang();
+void AddSC_boss_festergut();
+void AddSC_boss_lady_deathwhisper();
+void AddSC_boss_lord_marrowgar();
+void AddSC_boss_professor_putricide();
+void AddSC_boss_rotface();
+void AddSC_boss_sindragosa();
+void AddSC_boss_the_lich_king();
+void AddSC_boss_valithria_dreamwalker();
+void AddSC_gunship_battle();
+void AddSC_instance_icecrown_citadel();
+void AddSC_boss_anubrekhan();                        // naxxramas
+void AddSC_boss_four_horsemen();
+void AddSC_boss_faerlina();
+void AddSC_boss_gluth();
+void AddSC_boss_gothik();
+void AddSC_boss_grobbulus();
+void AddSC_boss_kelthuzad();
+void AddSC_boss_loatheb();
+void AddSC_boss_maexxna();
+void AddSC_boss_noth();
+void AddSC_boss_heigan();
+void AddSC_boss_patchwerk();
+void AddSC_boss_razuvious();
+void AddSC_boss_sapphiron();
+void AddSC_boss_thaddius();
+void AddSC_instance_naxxramas();
+void AddSC_boss_malygos();                           // nexus, eye_of_eternity
+void AddSC_instance_eye_of_eternity();
+void AddSC_boss_anomalus();                          // nexus, nexus
+void AddSC_boss_keristrasza();
+void AddSC_boss_ormorok();
+void AddSC_boss_telestra();
+void AddSC_instance_nexus();
+void AddSC_boss_eregos();                            // nexus, oculus
+void AddSC_boss_urom();
+void AddSC_boss_varos();
+void AddSC_instance_oculus();
+void AddSC_oculus();
+void AddSC_boss_sartharion();                        // obsidian_sanctum
+void AddSC_instance_obsidian_sanctum();
+void AddSC_boss_baltharus();                         // ruby_sanctum
+void AddSC_boss_halion();
+void AddSC_boss_saviana();
+void AddSC_boss_zarithrian();
+void AddSC_instance_ruby_sanctum();
+void AddSC_boss_bjarngrim();                         // ulduar, halls_of_lightning
+void AddSC_boss_ionar();
+void AddSC_boss_loken();
+void AddSC_boss_volkhan();
+void AddSC_instance_halls_of_lightning();
+void AddSC_boss_maiden_of_grief();                   // ulduar, halls_of_stone
+void AddSC_boss_sjonnir();
+void AddSC_halls_of_stone();
+void AddSC_instance_halls_of_stone();
+void AddSC_boss_assembly_of_iron();                  // ulduar, ulduar
+void AddSC_boss_algalon();
+void AddSC_boss_auriaya();
+void AddSC_boss_flame_leviathan();
+void AddSC_boss_freya();
+void AddSC_boss_general_vezax();
+void AddSC_boss_hodir();
+void AddSC_boss_ignis();
+void AddSC_boss_kologarn();
+void AddSC_boss_mimiron();
+void AddSC_boss_razorscale();
+void AddSC_boss_thorim();
+void AddSC_boss_xt_002();
+void AddSC_boss_yogg_saron();
+void AddSC_instance_ulduar();
+void AddSC_ulduar();
+void AddSC_boss_ingvar();                            // utgarde_keep, utgarde_keep
+void AddSC_boss_keleseth();
+void AddSC_boss_skarvald_and_dalronn();
+void AddSC_instance_utgarde_keep();
+void AddSC_utgarde_keep();
+void AddSC_boss_gortok();                           // utgarde_keep, utgarde_pinnacle
+void AddSC_boss_skadi();
+void AddSC_boss_svala();
+void AddSC_boss_ymiron();
+void AddSC_instance_pinnacle();
+void AddSC_boss_archavon();                          // vault_of_archavon
+void AddSC_boss_emalon();
+void AddSC_boss_koralon();
+void AddSC_boss_toravon();
+void AddSC_instance_vault_of_archavon();
+void AddSC_boss_erekem();                            // violet_hold
+void AddSC_boss_ichoron();
+void AddSC_instance_violet_hold();
+void AddSC_violet_hold();
+
+void AddSC_borean_tundra();
+void AddSC_dalaran();
+void AddSC_dragonblight();
+void AddSC_grizzly_hills();
+void AddSC_howling_fjord();
+void AddSC_icecrown();
+void AddSC_sholazar_basin();
+void AddSC_storm_peaks();
+void AddSC_zuldrak();
+#endif
+
+// outland
+void AddSC_boss_exarch_maladaar();                   // auchindoun, auchenai_crypts
+void AddSC_boss_shirrak();
+void AddSC_boss_nexusprince_shaffar();               // auchindoun, mana_tombs
+void AddSC_boss_pandemonius();
+void AddSC_boss_anzu();                              // auchindoun, sethekk_halls
+void AddSC_boss_darkweaver_syth();
+void AddSC_boss_talon_king_ikiss();
+void AddSC_instance_sethekk_halls();
+void AddSC_boss_ambassador_hellmaw();                // auchindoun, shadow_labyrinth
+void AddSC_boss_blackheart_the_inciter();
+void AddSC_boss_grandmaster_vorpil();
+void AddSC_boss_murmur();
+void AddSC_instance_shadow_labyrinth();
+void AddSC_black_temple();                           // black_temple
+void AddSC_boss_illidan();
+void AddSC_boss_shade_of_akama();
+void AddSC_boss_supremus();
+void AddSC_boss_gurtogg_bloodboil();
+void AddSC_boss_mother_shahraz();
+void AddSC_boss_reliquary_of_souls();
+void AddSC_boss_teron_gorefiend();
+void AddSC_boss_najentus();
+void AddSC_boss_illidari_council();
+void AddSC_instance_black_temple();
+void AddSC_boss_fathomlord_karathress();             // CR, serpent_shrine
+void AddSC_boss_hydross_the_unstable();
+void AddSC_boss_lady_vashj();
+void AddSC_boss_leotheras_the_blind();
+void AddSC_boss_morogrim_tidewalker();
+void AddSC_boss_the_lurker_below();
+void AddSC_instance_serpentshrine_cavern();
+void AddSC_boss_ahune();                             // CR, slave_pens
+void AddSC_boss_hydromancer_thespia();               // CR, steam_vault
+void AddSC_boss_mekgineer_steamrigger();
+void AddSC_boss_warlord_kalithresh();
+void AddSC_instance_steam_vault();
+void AddSC_boss_hungarfen();                         // CR, Underbog
+void AddSC_boss_gruul();                             // gruuls_lair
+void AddSC_boss_high_king_maulgar();
+void AddSC_instance_gruuls_lair();
+void AddSC_boss_broggok();                           // HC, blood_furnace
+void AddSC_boss_kelidan_the_breaker();
+void AddSC_boss_the_maker();
+void AddSC_instance_blood_furnace();
+void AddSC_boss_nazan_and_vazruden();                // HC, hellfire_ramparts
+void AddSC_boss_omor_the_unscarred();
+void AddSC_boss_watchkeeper_gargolmar();
+void AddSC_instance_ramparts();
+void AddSC_boss_magtheridon();                       // HC, magtheridons_lair
+void AddSC_instance_magtheridons_lair();
+void AddSC_boss_grand_warlock_nethekurse();          // HC, shattered_halls
+void AddSC_boss_warbringer_omrogg();
+void AddSC_boss_warchief_kargath_bladefist();
+void AddSC_instance_shattered_halls();
+void AddSC_arcatraz();                               // TK, arcatraz
+void AddSC_boss_dalliah();
+void AddSC_boss_harbinger_skyriss();
+void AddSC_boss_soccothrates();
+void AddSC_instance_arcatraz();
+void AddSC_boss_high_botanist_freywinn();            // TK, botanica
+void AddSC_boss_laj();
+void AddSC_boss_warp_splinter();
+void AddSC_boss_alar();                              // TK, the_eye
+void AddSC_boss_high_astromancer_solarian();
+void AddSC_boss_kaelthas();
+void AddSC_boss_void_reaver();
+void AddSC_instance_the_eye();
+void AddSC_boss_nethermancer_sepethrea();            // TK, the_mechanar
+void AddSC_boss_pathaleon_the_calculator();
+void AddSC_instance_mechanar();
+
+void AddSC_blades_edge_mountains();
+void AddSC_boss_doomlordkazzak();
+void AddSC_boss_doomwalker();
+void AddSC_hellfire_peninsula();
+void AddSC_nagrand();
+void AddSC_netherstorm();
+void AddSC_shadowmoon_valley();
+void AddSC_shattrath_city();
+void AddSC_terokkar_forest();
+void AddSC_zangarmarsh();
+
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+// outland
+void AddOutlandsScripts()
+{
+    AddSC_boss_exarch_maladaar();                           // auchindoun, auchenai_crypts
+    AddSC_boss_shirrak();
+    AddSC_boss_nexusprince_shaffar();                       // auchindoun, mana_tombs
+    AddSC_boss_pandemonius();
+    AddSC_boss_anzu();                                      // auchindoun, sethekk_halls
+    AddSC_boss_darkweaver_syth();
+    AddSC_boss_talon_king_ikiss();
+    AddSC_instance_sethekk_halls();
+    AddSC_boss_ambassador_hellmaw();                        // auchindoun, shadow_labyrinth
+    AddSC_boss_blackheart_the_inciter();
+    AddSC_boss_grandmaster_vorpil();
+    AddSC_boss_murmur();
+    AddSC_instance_shadow_labyrinth();
+    AddSC_black_temple();                                   // black_temple
+    AddSC_boss_illidan();
+    AddSC_boss_shade_of_akama();
+    AddSC_boss_supremus();
+    AddSC_boss_gurtogg_bloodboil();
+    AddSC_boss_mother_shahraz();
+    AddSC_boss_reliquary_of_souls();
+    AddSC_boss_teron_gorefiend();
+    AddSC_boss_najentus();
+    AddSC_boss_illidari_council();
+    AddSC_instance_black_temple();
+    AddSC_boss_fathomlord_karathress();                     // CR, serpent_shrine
+    AddSC_boss_hydross_the_unstable();
+    AddSC_boss_lady_vashj();
+    AddSC_boss_leotheras_the_blind();
+    AddSC_boss_morogrim_tidewalker();
+    AddSC_boss_the_lurker_below();
+    AddSC_instance_serpentshrine_cavern();
+    AddSC_boss_ahune();                                     // CR, slave_pens
+    AddSC_boss_hydromancer_thespia();                       // CR, steam_vault
+    AddSC_boss_mekgineer_steamrigger();
+    AddSC_boss_warlord_kalithresh();
+    AddSC_instance_steam_vault();
+    AddSC_boss_hungarfen();                                 // CR, Underbog
+    AddSC_boss_gruul();                                     // gruuls_lair
+    AddSC_boss_high_king_maulgar();
+    AddSC_instance_gruuls_lair();
+    AddSC_boss_broggok();                                   // HC, blood_furnace
+    AddSC_boss_kelidan_the_breaker();
+    AddSC_boss_the_maker();
+    AddSC_instance_blood_furnace();
+    AddSC_boss_nazan_and_vazruden();                        // HC, hellfire_ramparts
+    AddSC_boss_omor_the_unscarred();
+    AddSC_boss_watchkeeper_gargolmar();
+    AddSC_instance_ramparts();
+    AddSC_boss_magtheridon();                               // HC, magtheridons_lair
+    AddSC_instance_magtheridons_lair();
+    AddSC_boss_grand_warlock_nethekurse();                  // HC, shattered_halls
+    AddSC_boss_warbringer_omrogg();
+    AddSC_boss_warchief_kargath_bladefist();
+    AddSC_instance_shattered_halls();
+    AddSC_arcatraz();                                       // TK, arcatraz
+    AddSC_boss_dalliah();
+    AddSC_boss_harbinger_skyriss();
+    AddSC_boss_soccothrates();
+    AddSC_instance_arcatraz();
+    AddSC_boss_high_botanist_freywinn();                    // TK, botanica
+    AddSC_boss_laj();
+    AddSC_boss_warp_splinter();
+    AddSC_boss_alar();                                      // TK, the_eye
+    AddSC_boss_high_astromancer_solarian();
+    AddSC_boss_kaelthas();
+    AddSC_boss_void_reaver();
+    AddSC_instance_the_eye();
+    AddSC_boss_nethermancer_sepethrea();                    // TK, the_mechanar
+    AddSC_boss_pathaleon_the_calculator();
+    AddSC_instance_mechanar();
+
+    AddSC_blades_edge_mountains();
+    AddSC_boss_doomlordkazzak();
+    AddSC_boss_doomwalker();
+    AddSC_hellfire_peninsula();
+    AddSC_nagrand();
+    AddSC_netherstorm();
+    AddSC_shadowmoon_valley();
+    AddSC_shattrath_city();
+    AddSC_terokkar_forest();
+    AddSC_zangarmarsh();
+}
+#endif
+#if defined (WOTLK) || defined (CATA)
+// Northrend
+void AddNorthrendScripts()
+{
+    // northrend
+    AddSC_boss_amanitar();                                  // azjol-nerub, ahnkahet
+    AddSC_boss_jedoga();
+    AddSC_boss_nadox();
+    AddSC_boss_taldaram();
+    AddSC_boss_volazj();
+    AddSC_instance_ahnkahet();
+    AddSC_boss_anubarak();                                  // azjol-nerub, azjol-nerub
+    AddSC_boss_hadronox();
+    AddSC_boss_krikthir();
+    AddSC_instance_azjol_nerub();
+    AddSC_boss_grand_champions();                           // CC, trial_of_the_champion
+    AddSC_instance_trial_of_the_champion();
+    AddSC_trial_of_the_champion();
+    AddSC_boss_anubarak_trial();                            // CC, trial_of_the_crusader
+    AddSC_boss_faction_champions();
+    AddSC_boss_jaraxxus();
+    AddSC_instance_trial_of_the_crusader();
+    AddSC_northrend_beasts();
+    AddSC_trial_of_the_crusader();
+    AddSC_twin_valkyr();
+    AddSC_boss_novos();                                     // draktharon_keep
+    AddSC_boss_tharonja();
+    AddSC_boss_trollgore();
+    AddSC_instance_draktharon_keep();
+    AddSC_boss_colossus();                                  // gundrak
+    AddSC_boss_eck();
+    AddSC_boss_galdarah();
+    AddSC_boss_moorabi();
+    AddSC_boss_sladran();
+    AddSC_instance_gundrak();
+    AddSC_boss_bronjahm();                                  // ICC, FH, forge_of_souls
+    AddSC_boss_devourer_of_souls();
+    AddSC_instance_forge_of_souls();
+    AddSC_boss_falric();                                    // ICC, FH, halls_of_reflection
+    AddSC_boss_lich_king();
+    AddSC_boss_marwyn();
+    AddSC_halls_of_reflection();
+    AddSC_instance_halls_of_reflection();
+    AddSC_boss_garfrost();                                  // ICC, FH, pit_of_saron
+    AddSC_boss_krick_and_ick();
+    AddSC_boss_tyrannus();
+    AddSC_instance_pit_of_saron();
+    AddSC_pit_of_saron();
+    AddSC_blood_prince_council();                           // ICC, icecrown_citadel
+    AddSC_boss_blood_queen_lanathel();
+    AddSC_boss_deathbringer_saurfang();
+    AddSC_boss_festergut();
+    AddSC_boss_lady_deathwhisper();
+    AddSC_boss_lord_marrowgar();
+    AddSC_boss_professor_putricide();
+    AddSC_boss_rotface();
+    AddSC_boss_sindragosa();
+    AddSC_boss_the_lich_king();
+    AddSC_boss_valithria_dreamwalker();
+    AddSC_gunship_battle();
+    AddSC_instance_icecrown_citadel();
+    AddSC_boss_anubrekhan();                                // naxxramas
+    AddSC_boss_four_horsemen();
+    AddSC_boss_faerlina();
+    AddSC_boss_gluth();
+    AddSC_boss_gothik();
+    AddSC_boss_grobbulus();
+    AddSC_boss_kelthuzad();
+    AddSC_boss_loatheb();
+    AddSC_boss_maexxna();
+    AddSC_boss_noth();
+    AddSC_boss_heigan();
+    AddSC_boss_patchwerk();
+    AddSC_boss_razuvious();
+    AddSC_boss_sapphiron();
+    AddSC_boss_thaddius();
+    AddSC_instance_naxxramas();
+    AddSC_boss_malygos();                                   // nexus, eye_of_eternity
+    AddSC_instance_eye_of_eternity();
+    AddSC_boss_anomalus();                                  // nexus, nexus
+    AddSC_boss_keristrasza();
+    AddSC_boss_ormorok();
+    AddSC_boss_telestra();
+    AddSC_instance_nexus();
+    AddSC_boss_eregos();                                    // nexus, oculus
+    AddSC_boss_urom();
+    AddSC_boss_varos();
+    AddSC_instance_oculus();
+    AddSC_oculus();
+    AddSC_boss_sartharion();                                // obsidian_sanctum
+    AddSC_instance_obsidian_sanctum();
+    AddSC_boss_baltharus();                                 // ruby_sanctum
+    AddSC_boss_halion();
+    AddSC_boss_saviana();
+    AddSC_boss_zarithrian();
+    AddSC_instance_ruby_sanctum();
+    AddSC_boss_bjarngrim();                                 // ulduar, halls_of_lightning
+    AddSC_boss_ionar();
+    AddSC_boss_loken();
+    AddSC_boss_volkhan();
+    AddSC_instance_halls_of_lightning();
+    AddSC_boss_maiden_of_grief();                           // ulduar, halls_of_stone
+    AddSC_boss_sjonnir();
+    AddSC_halls_of_stone();
+    AddSC_instance_halls_of_stone();
+    AddSC_boss_assembly_of_iron();                          // ulduar, ulduar
+    AddSC_boss_algalon();
+    AddSC_boss_auriaya();
+    AddSC_boss_flame_leviathan();
+    AddSC_boss_freya();
+    AddSC_boss_general_vezax();
+    AddSC_boss_hodir();
+    AddSC_boss_ignis();
+    AddSC_boss_kologarn();
+    AddSC_boss_mimiron();
+    AddSC_boss_razorscale();
+    AddSC_boss_thorim();
+    AddSC_boss_xt_002();
+    AddSC_boss_yogg_saron();
+    AddSC_instance_ulduar();
+    AddSC_ulduar();
+    AddSC_boss_ingvar();                                    // UK, utgarde_keep
+    AddSC_boss_keleseth();
+    AddSC_boss_skarvald_and_dalronn();
+    AddSC_instance_utgarde_keep();
+    AddSC_utgarde_keep();
+    AddSC_boss_gortok();                                    // UK, utgarde_pinnacle
+    AddSC_boss_skadi();
+    AddSC_boss_svala();
+    AddSC_boss_ymiron();
+    AddSC_instance_pinnacle();
+    AddSC_boss_archavon();                                  // vault_of_archavon
+    AddSC_boss_emalon();
+    AddSC_boss_koralon();
+    AddSC_boss_toravon();
+    AddSC_instance_vault_of_archavon();
+    AddSC_boss_erekem();                                    // violet_hold
+    AddSC_boss_ichoron();
+    AddSC_instance_violet_hold();
+    AddSC_violet_hold();
+
+    AddSC_borean_tundra();
+    AddSC_dalaran();
+    AddSC_dragonblight();
+    AddSC_grizzly_hills();
+    AddSC_howling_fjord();
+    AddSC_icecrown();
+    AddSC_sholazar_basin();
+    AddSC_storm_peaks();
+    AddSC_zuldrak();
+}
+#endif
+
+// world
+void AddSC_areatrigger_scripts();
+void AddSC_bosses_emerald_dragons();
+void AddSC_generic_creature();
+void AddSC_go_scripts();
+void AddSC_guards();
+void AddSC_item_scripts();
+void AddSC_npc_professions();
+void AddSC_npcs_special();
+void AddSC_spell_scripts();
+void AddSC_world_map_scripts();
+#if defined (WOTLK) || defined (CATA)
+void AddSC_world_map_ebon_hold();
+#endif
+
+void AddWorldScripts()
+{
+    AddSC_areatrigger_scripts();
+    AddSC_bosses_emerald_dragons();
+    AddSC_generic_creature();
+    AddSC_go_scripts();
+    AddSC_guards();
+    AddSC_item_scripts();
+    AddSC_npc_professions();
+    AddSC_npcs_special();
+    AddSC_spell_scripts();
+    AddSC_world_map_scripts();
+#if defined (WOTLK) || defined (CATA)
+    AddSC_world_map_ebon_hold();
+#endif
+}
+
+// battlegrounds
+void AddSC_battleground();
+
+void AddBattlegroundScripts()
+{
+    AddSC_battleground();
+}
+
+// initialize scripts
+void AddScripts()
+{
+    AddWorldScripts();
+    AddEasternKingdomsScripts();
+    AddKalimdorScripts();
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+    AddOutlandsScripts();
+#endif
+
+#if defined (WOTLK) || defined (CATA)
+    AddNorthrendScripts();
+#endif    
+
+    AddBattlegroundScripts();
+}
diff --git a/src/modules/SD3/system/ScriptLoader.h b/src/modules/SD3/system/ScriptLoader.h
new file mode 100644
index 000000000..520341288
--- /dev/null
+++ b/src/modules/SD3/system/ScriptLoader.h
@@ -0,0 +1,42 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef SC_SCRIPTLOADER_H
+#define SC_SCRIPTLOADER_H
+
+void AddScripts();
+void AddEasternKingdomsScripts();
+void AddKalimdorScripts();
+#if defined (TBC) || defined (WOTLK) || defined (CATA)  
+void AddOutlandsScripts();
+#endif
+#if defined (WOTLK) || defined (CATA)
+void AddNorthrendScripts();
+#endif
+void AddWorldScripts();
+void AddBattlegroundScripts();
+
+#endif
diff --git a/src/modules/SD3/system/system.cpp b/src/modules/SD3/system/system.cpp
new file mode 100644
index 000000000..57c01fee9
--- /dev/null
+++ b/src/modules/SD3/system/system.cpp
@@ -0,0 +1,125 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#include "precompiled.h"
+#include "system.h"
+#include "ProgressBar.h"
+#include "ObjectMgr.h"
+#include "Database/DatabaseEnv.h"
+
+SystemMgr::SystemMgr() { }
+
+SystemMgr& SystemMgr::Instance()
+{
+    static SystemMgr pSysMgr;
+    return pSysMgr;
+}
+
+void SystemMgr::LoadScriptTexts()
+{
+    outstring_log("[SD3]: Loading Script Texts...");
+    LoadMangosStrings(WorldDatabase, "script_texts", TEXT_SOURCE_TEXT_START, TEXT_SOURCE_TEXT_END, true);
+}
+
+void SystemMgr::LoadScriptTextsCustom()
+{
+    outstring_log("[SD3]: Loading Custom Texts...");
+    LoadMangosStrings(WorldDatabase, "custom_texts", TEXT_SOURCE_CUSTOM_START, TEXT_SOURCE_CUSTOM_END, true);
+}
+
+void SystemMgr::LoadScriptGossipTexts()
+{
+    outstring_log("[SD3]: Loading Gossip Texts...");
+    LoadMangosStrings(WorldDatabase, "gossip_texts", TEXT_SOURCE_GOSSIP_START, TEXT_SOURCE_GOSSIP_END);
+}
+
+void SystemMgr::LoadScriptWaypoints()
+{
+    // Drop Existing Waypoint list
+    m_mPointMoveMap.clear();
+
+    uint64 uiCreatureCount = 0;
+
+    // Load Waypoints
+    QueryResult* pResult = WorldDatabase.PQuery("SELECT COUNT(entry) FROM script_waypoint GROUP BY entry");
+    if (pResult)
+    {
+        uiCreatureCount = pResult->GetRowCount();
+        delete pResult;
+    }
+
+    outstring_log("[SD3]: Loading Script Waypoints for " UI64FMTD " creature(s)...", uiCreatureCount);
+
+    pResult = WorldDatabase.PQuery("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid");
+
+    if (pResult)
+    {
+        BarGoLink bar(pResult->GetRowCount());
+        uint32 uiNodeCount = 0;
+
+        do
+        {
+            bar.step();
+            Field* pFields = pResult->Fetch();
+            ScriptPointMove pTemp;
+
+            pTemp.uiCreatureEntry   = pFields[0].GetUInt32();
+            uint32 uiEntry          = pTemp.uiCreatureEntry;
+            pTemp.uiPointId         = pFields[1].GetUInt32();
+            pTemp.fX                = pFields[2].GetFloat();
+            pTemp.fY                = pFields[3].GetFloat();
+            pTemp.fZ                = pFields[4].GetFloat();
+            pTemp.uiWaitTime        = pFields[5].GetUInt32();
+
+            CreatureInfo const* pCInfo = GetCreatureTemplateStore(pTemp.uiCreatureEntry);
+
+            if (!pCInfo)
+            {
+                error_db_log("[SD3]: DB table script_waypoint has waypoint for nonexistent creature entry %u", pTemp.uiCreatureEntry);
+                continue;
+            }
+
+            if (!sScriptMgr.GetBoundScriptId(SCRIPTED_UNIT, pCInfo->Entry))
+            {
+                error_db_log("[SD3]: DB table script_waypoint has waypoint for creature entry %u, but creature does not have ScriptName defined and then useless.", pTemp.uiCreatureEntry);
+            }
+
+            m_mPointMoveMap[uiEntry].push_back(pTemp);
+            ++uiNodeCount;
+        }
+        while (pResult->NextRow());
+
+        delete pResult;
+
+        outstring_log(">> Loaded %u Script Waypoint nodes.", uiNodeCount);
+    }
+    else
+    {
+        BarGoLink bar(1);
+        bar.step();
+        outstring_log(">> Loaded 0 Script Waypoints.");
+    }
+}
diff --git a/src/modules/SD3/system/system.h b/src/modules/SD3/system/system.h
new file mode 100644
index 000000000..130a2326e
--- /dev/null
+++ b/src/modules/SD3/system/system.h
@@ -0,0 +1,87 @@
+/**
+ * ScriptDev3 is an extension for mangos providing enhanced features for
+ * area triggers, creatures, game objects, instances, items, and spells beyond
+ * the default database scripting in mangos.
+ *
+ * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
+ * Copyright (C) 2014-2016  MaNGOS  <https://getmangos.eu>
+ *
+ * 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
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef SC_SYSTEM_H
+#define SC_SYSTEM_H
+
+#define TEXT_SOURCE_RANGE -1000000                          // the amount of entries each text source has available
+
+#define TEXT_SOURCE_TEXT_START      TEXT_SOURCE_RANGE
+#define TEXT_SOURCE_TEXT_END        TEXT_SOURCE_RANGE*2 + 1
+
+#define TEXT_SOURCE_CUSTOM_START    TEXT_SOURCE_RANGE*2
+#define TEXT_SOURCE_CUSTOM_END      TEXT_SOURCE_RANGE*3 + 1
+
+#define TEXT_SOURCE_GOSSIP_START    TEXT_SOURCE_RANGE*3
+#define TEXT_SOURCE_GOSSIP_END      TEXT_SOURCE_RANGE*4 + 1
+
+struct ScriptPointMove
+{
+    uint32 uiCreatureEntry;
+    uint32 uiPointId;
+    float  fX;
+    float  fY;
+    float  fZ;
+    uint32 uiWaitTime;
+};
+
+class SystemMgr
+{
+    public:
+        SystemMgr();
+        ~SystemMgr() {}
+
+        static SystemMgr& Instance();
+
+        typedef UNORDERED_MAP<uint32, std::vector<ScriptPointMove> > PointMoveMap;
+
+        // SD3 Database Bindings
+        void LoadScriptTexts();
+        void LoadScriptTextsCustom();
+        void LoadScriptGossipTexts();
+        void LoadScriptWaypoints();
+
+        std::vector<ScriptPointMove> const& GetPointMoveList(uint32 uiCreatureEntry) const
+        {
+            static std::vector<ScriptPointMove> vEmpty;
+
+            PointMoveMap::const_iterator itr = m_mPointMoveMap.find(uiCreatureEntry);
+
+            if (itr == m_mPointMoveMap.end())
+            {
+                return vEmpty;
+            }
+
+            return itr->second;
+        }
+
+    protected:
+        PointMoveMap    m_mPointMoveMap;                    // coordinates for waypoints
+};
+
+#define pSystemMgr SystemMgr::Instance()
+
+#endif
diff --git a/src/tools/Movemap-Generator/TerrainBuilder.cpp b/src/tools/Movemap-Generator/TerrainBuilder.cpp
index 0d8db71ea..c5f64a34b 100644
--- a/src/tools/Movemap-Generator/TerrainBuilder.cpp
+++ b/src/tools/Movemap-Generator/TerrainBuilder.cpp
@@ -600,7 +600,7 @@ namespace MMAP
                 bool isM2 = instance.name.find(".m2") != instance.name.npos || instance.name.find(".M2") != instance.name.npos;
 
                 // transform data
-                float scale = instance.iScale;
+                float Scale = instance.iScale;
                 G3D::Matrix3 rotation = G3D::Matrix3::fromEulerAnglesXYZ(G3D::pi() * instance.iRot.z / -180.f, G3D::pi() * instance.iRot.x / -180.f, G3D::pi() * instance.iRot.y / -180.f);
                 Vector3 position = instance.iPos;
                 position.x -= 32 * GRID_SIZE;
@@ -616,7 +616,7 @@ namespace MMAP
                     (*it).getMeshData(tempVertices, tempTriangles, liquid);
 
                     // first handle collision mesh
-                    transform(tempVertices, transformedVertices, scale, rotation, position);
+                    transform(tempVertices, transformedVertices, Scale, rotation, position);
 
                     int offset = meshData.solidVerts.size() / 3;
 
@@ -663,7 +663,7 @@ namespace MMAP
                             for (uint32 y = 0; y < vertsY; ++y)
                             {
                                 vert = Vector3(corner.x + x * GRID_PART_SIZE, corner.y + y * GRID_PART_SIZE, data[y * vertsX + x]);
-                                vert = vert * rotation * scale + position;
+                                vert = vert * rotation * Scale + position;
                                 vert.x *= -1.f;
                                 vert.y *= -1.f;
                                 liqVerts.push_back(vert);
@@ -713,12 +713,12 @@ namespace MMAP
     }
 
     /**************************************************************************/
-    void TerrainBuilder::transform(vector<Vector3>& source, vector<Vector3>& transformedVertices, float scale, G3D::Matrix3& rotation, Vector3& position)
+    void TerrainBuilder::transform(vector<Vector3>& source, vector<Vector3>& transformedVertices, float Scale, G3D::Matrix3& rotation, Vector3& position)
     {
         for (vector<Vector3>::iterator it = source.begin(); it != source.end(); ++it)
         {
             // apply tranform, then mirror along the horizontal axes
-            Vector3 v((*it) * rotation * scale + position);
+            Vector3 v((*it) * rotation * Scale + position);
             v.x *= -1.f;
             v.y *= -1.f;
             transformedVertices.push_back(v);
diff --git a/src/tools/Movemap-Generator/TerrainBuilder.h b/src/tools/Movemap-Generator/TerrainBuilder.h
index 69bca62b8..b19824692 100644
--- a/src/tools/Movemap-Generator/TerrainBuilder.h
+++ b/src/tools/Movemap-Generator/TerrainBuilder.h
@@ -101,7 +101,7 @@ namespace MMAP
 
             // vert and triangle methods
             static void transform(vector<G3D::Vector3>& original, vector<G3D::Vector3>& transformed,
-                                  float scale, G3D::Matrix3& rotation, G3D::Vector3& position);
+                                  float Scale, G3D::Matrix3& rotation, G3D::Vector3& position);
             static void copyVertices(vector<G3D::Vector3>& source, G3D::Array<float>& dest);
             static void copyIndices(vector<VMAP::MeshTriangle>& source, G3D::Array<int>& dest, int offest, bool flip);
             static void copyIndices(G3D::Array<int>& src, G3D::Array<int>& dest, int offset);
diff --git a/src/tools/vmap-extractor/model.cpp b/src/tools/vmap-extractor/model.cpp
index a7349f1f1..04140a25a 100644
--- a/src/tools/vmap-extractor/model.cpp
+++ b/src/tools/vmap-extractor/model.cpp
@@ -151,9 +151,9 @@ ModelInstance::ModelInstance(MPQFile& f, const char* ModelInstName, uint32 mapID
     pos = fixCoords(Vec3D(ff[0], ff[1], ff[2]));
     f.read(ff, 12);
     rot = Vec3D(ff[0], ff[1], ff[2]);
-    f.read(&scale, 4);
-    // scale factor - divide by 1024. blizzard devs must be on crack, why not just use a float?
-    sc = scale / 1024.0f;
+    f.read(&Scale, 4);
+    // Scale factor - divide by 1024. blizzard devs must be on crack, why not just use a float?
+    sc = Scale / 1024.0f;
 
     char tempname[512];
     sprintf(tempname, "%s/%s", szWorkDirWmo, ModelInstName);
diff --git a/src/tools/vmap-extractor/model.h b/src/tools/vmap-extractor/model.h
index 483372068..d3854f04d 100644
--- a/src/tools/vmap-extractor/model.h
+++ b/src/tools/vmap-extractor/model.h
@@ -72,7 +72,7 @@ class ModelInstance
 
         uint32 id;
         Vec3D pos, rot;
-        unsigned int d1, scale;
+        unsigned int d1, Scale;
         float w, sc;
 
         ModelInstance() {}
diff --git a/src/tools/vmap-extractor/wmo.cpp b/src/tools/vmap-extractor/wmo.cpp
index 47c4e718c..d5a9088e9 100644
--- a/src/tools/vmap-extractor/wmo.cpp
+++ b/src/tools/vmap-extractor/wmo.cpp
@@ -542,7 +542,7 @@ WMOInstance::WMOInstance(MPQFile& f, const char* WmoInstName, uint32 mapID, uint
     pos2 = fixCoords(pos2);
     pos3 = fixCoords(pos3);
 
-    float scale = 1.0f;
+    float Scale = 1.0f;
     uint32 flags = MOD_HAS_BOUND;
     if (tileX == 65 && tileY == 65) flags |= MOD_WORLDSPAWN;
     //write mapID, tileX, tileY, Flags, ID, Pos, Rot, Scale, Bound_lo, Bound_hi, name
@@ -554,7 +554,7 @@ WMOInstance::WMOInstance(MPQFile& f, const char* WmoInstName, uint32 mapID, uint
     fwrite(&id, sizeof(uint32), 1, pDirfile);
     fwrite(&pos, sizeof(float), 3, pDirfile);
     fwrite(&rot, sizeof(float), 3, pDirfile);
-    fwrite(&scale, sizeof(float), 1, pDirfile);
+    fwrite(&Scale, sizeof(float), 1, pDirfile);
     fwrite(&pos2, sizeof(float), 3, pDirfile);
     fwrite(&pos3, sizeof(float), 3, pDirfile);
     uint32 nlen = strlen(WmoInstName);