Merge pull request: The Val'kyr Twins Clean up and Implements from 'Drethek/master'

7 files changed, 277 insertions, 75 deletions

diff --git a/sql/updates/world/2011_09_01_02_spell_script_names.sql b/sql/updates/world/2011_09_01_02_spell_script_names.sql
new file mode 100644
index 00000000000..b7b6907b7f1
--- /dev/null
+++ b/sql/updates/world/2011_09_01_02_spell_script_names.sql
@@ -0,0 +1,10 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (65879,65916,67244,67245,67246,67248,67249,67250);
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(65879, 'spell_power_of_the_twins'),
+(65916, 'spell_power_of_the_twins'),
+(67244, 'spell_power_of_the_twins'),
+(67245, 'spell_power_of_the_twins'),
+(67246, 'spell_power_of_the_twins'),
+(67248, 'spell_power_of_the_twins'),
+(67249, 'spell_power_of_the_twins'),
+(67250, 'spell_power_of_the_twins');
diff --git a/sql/updates/world/2011_09_03_00_world_spell_script_names.sql b/sql/updates/world/2011_09_03_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..6cec12b63fd
--- /dev/null
+++ b/sql/updates/world/2011_09_03_00_world_spell_script_names.sql
@@ -0,0 +1,15 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (67590,67602,67603,67604,65684,67176,67177,67178,65686,67222,67223,67224);
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`)
+VALUES
+(67590, 'spell_powering_up'),
+(67602, 'spell_powering_up'),
+(67603, 'spell_powering_up'),
+(67604, 'spell_powering_up'),
+(65684, 'spell_valkyr_essences'),
+(67176, 'spell_valkyr_essences'),
+(67177, 'spell_valkyr_essences'),
+(67178, 'spell_valkyr_essences'),
+(67222, 'spell_valkyr_essences'),
+(65686, 'spell_valkyr_essences'),
+(67223, 'spell_valkyr_essences'),
+(67224, 'spell_valkyr_essences');
\ No newline at end of file
diff --git a/sql/updates/world/2011_09_03_01_world_conditions.sql b/sql/updates/world/2011_09_03_01_world_conditions.sql
new file mode 100644
index 00000000000..c830d3ad18e
--- /dev/null
+++ b/sql/updates/world/2011_09_03_01_world_conditions.sql
@@ -0,0 +1,10 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `ConditionTypeOrReference` = 18 AND `SourceEntry` IN (65875,67303,67304,67305,65876,67306,67307,67308) ;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 0, 65875, 0, 18, 1, 34497, 2, 0, '', 'Twins Pact - Dark'),
+(13, 0, 67303, 0, 18, 1, 34497, 2, 0, '', 'Twins Pact - Dark'),
+(13, 0, 67304, 0, 18, 1, 34497, 2, 0, '', 'Twins Pact - Dark'),
+(13, 0, 67305, 0, 18, 1, 34497, 2, 0, '', 'Twins Pact - Dark'),
+(13, 0, 65876, 0, 18, 1, 34496, 2, 0, '', 'Twins Pact - Light'),
+(13, 0, 67306, 0, 18, 1, 34496, 2, 0, '', 'Twins Pact - Light'),
+(13, 0, 67307, 0, 18, 1, 34496, 2, 0, '', 'Twins Pact - Light'),
+(13, 0, 67308, 0, 18, 1, 34496, 2, 0, '', 'Twins Pact - Light');
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
index 44385ea83e2..6d1c2b5d991 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -25,8 +25,7 @@ EndScriptData */
 
 // Known bugs:
 //    - They should be floating but they aren't respecting the floor =(
-//    - Lacks the powering up effect that leads to Empowering
-//    - There's a workaround for the shared life effect
+//    - Hardcoded bullets spawner
 
 #include "ScriptPCH.h"
 #include "trial_of_the_crusader.h"
@@ -48,26 +47,26 @@ enum Yells
 
 enum Equipment
 {
-    EQUIP_MAIN_1         = 49303,
-    EQUIP_OFFHAND_1      = 47146,
-    EQUIP_RANGED_1       = 47267,
-    EQUIP_MAIN_2         = 45990,
-    EQUIP_OFFHAND_2      = 47470,
-    EQUIP_RANGED_2       = 47267,
-    EQUIP_DONE           = EQUIP_NO_CHANGE,
+    EQUIP_MAIN_1         = 9423,
+    EQUIP_MAIN_2         = 37377,
 };
 
 enum Summons
 {
-    NPC_DARK_ESSENCE     = 34567,
-    NPC_LIGHT_ESSENCE    = 34568,
-
     NPC_UNLEASHED_DARK   = 34628,
     NPC_UNLEASHED_LIGHT  = 34630,
+
+    // Future Development
+    NPC_BULLET_CONTROLLER        = 34743, // Npc controller for all bullets
+
+    NPC_BULLET_STALKER_DARK      = 34704, // Npc spawner for dark bullets
+    NPC_BULLET_STALKER_LIGHT     = 34720, // Npc spawner for light bullets
 };
 
 enum BossSpells
 {
+    SPELL_CONTROLLER_PERIODIC    = 66149, // Future Development
+
     SPELL_LIGHT_TWIN_SPIKE      = 66075,
     SPELL_LIGHT_SURGE           = 65766,
     SPELL_LIGHT_SHIELD          = 65858,
@@ -79,6 +78,7 @@ enum BossSpells
     SPELL_DARK_SURGE            = 65768,
     SPELL_DARK_SHIELD           = 65874,
     SPELL_DARK_TWIN_PACT        = 65875,
+    SPELL_POWER_TWINS           = 65879,
     SPELL_DARK_VORTEX           = 66058,
     SPELL_DARK_TOUCH            = 67282,
 
@@ -93,12 +93,19 @@ enum BossSpells
 
     SPELL_UNLEASHED_DARK        = 65808,
     SPELL_UNLEASHED_LIGHT       = 65795,
-    //PowerUp 67604
+
+    SPELL_TWIN_EMPATHY_1        = 66132,
+    SPELL_TWIN_EMPATHY_2        = 66133,
+
+    SPELL_POWERING_UP           = 67590,
+    SPELL_SURGE_OF_SPEED        = 65828,
 };
 
 #define SPELL_DARK_ESSENCE_HELPER RAID_MODE<uint32>(65684, 67176, 67177, 67178)
 #define SPELL_LIGHT_ESSENCE_HELPER RAID_MODE<uint32>(65686, 67222, 67223, 67224)
 
+#define SPELL_POWERING_UP_HELPER RAID_MODE(67590, 67602, 67603, 67604)
+
 #define SPELL_EMPOWERED_DARK_HELPER RAID_MODE<uint32>(65724,67213,67214,67215)
 #define SPELL_EMPOWERED_LIGHT_HELPER RAID_MODE<uint32>(65748, 67216, 67217, 67218)
 
@@ -122,9 +129,12 @@ struct boss_twin_baseAI : public ScriptedAI
     InstanceScript* m_pInstance;
     SummonList Summons;
 
+    AuraStateType  m_uiAuraState;
+
     uint8  m_uiStage;
     bool   m_bIsBerserk;
     uint8  m_uiWaveCount;
+    uint32 m_uiWeapon;
     uint32 m_uiColorballsTimer;
     uint32 m_uiSpecialAbilityTimer;
     uint32 m_uiSpikeTimer;
@@ -135,6 +145,7 @@ struct boss_twin_baseAI : public ScriptedAI
     int32 m_uiVortexEmote;
     uint32 m_uiSisterNpcId;
     uint32 m_uiColorballNpcId;
+    uint32 m_uiMyEmphatySpellId;
     uint32 m_uiEssenceNpcId;
     uint32 m_uiMyEssenceSpellId;
     uint32 m_uiOtherEssenceSpellId;
@@ -152,6 +163,7 @@ struct boss_twin_baseAI : public ScriptedAI
     void Reset() {
         me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
         me->SetReactState(REACT_PASSIVE);
+        me->ModifyAuraState(m_uiAuraState, true);
         /* Uncomment this once that they are flying above the ground
         me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
         me->SetFlying(true); */
@@ -172,7 +184,6 @@ struct boss_twin_baseAI : public ScriptedAI
         if (m_pInstance)
         {
             m_pInstance->SetData(TYPE_VALKIRIES, FAIL);
-            m_pInstance->SetData(DATA_HEALTH_TWIN_SHARED, me->GetMaxHealth());
         }
         me->DespawnOrUnsummon();
     }
@@ -190,7 +201,6 @@ struct boss_twin_baseAI : public ScriptedAI
             case 1:
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
                 me->SetReactState(REACT_AGGRESSIVE);
-                me->SetInCombatWithZone();
                 break;
         }
     }
@@ -223,45 +233,16 @@ struct boss_twin_baseAI : public ScriptedAI
         {
             case NPC_LIGHT_ESSENCE:
                 m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_LIGHT_ESSENCE_HELPER);
+                m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_POWERING_UP_HELPER);
                 break;
             case NPC_DARK_ESSENCE:
                 m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_DARK_ESSENCE_HELPER);
+                m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_POWERING_UP_HELPER);
                 break;
         }
         Summons.Despawn(summoned);
     }
 
-    void DamageTaken(Unit* pDoneBy, uint32 &uiDamage)
-    {
-        if (!me || !me->isAlive())
-            return;
-
-        if (pDoneBy->GetGUID() == me->GetGUID())
-            return;
-
-        if (pDoneBy->GetTypeId() == TYPEID_PLAYER)
-        {
-            if (pDoneBy->HasAura(m_uiOtherEssenceSpellId))
-                uiDamage += uiDamage/2;
-            if (pDoneBy->HasAura(m_uiEmpoweredWeaknessSpellId))
-                uiDamage += uiDamage;
-            else
-                if (pDoneBy->HasAura(m_uiMyEssenceSpellId))
-                    uiDamage /= 2;
-        }
-
-        if (m_pInstance)
-            m_pInstance->SetData(DATA_HEALTH_TWIN_SHARED, me->GetHealth() >= uiDamage ? me->GetHealth() - uiDamage : 0);
-    }
-
-    void SpellHit(Unit* caster, const SpellInfo* spell)
-    {
-        if (caster->ToCreature() == me)
-            if (spell->Effects[0].Effect == 136) //Effect Heal
-                if (m_pInstance)
-                    m_pInstance->SetData(DATA_HEALTH_TWIN_SHARED, me->GetHealth() + me->CountPctFromMaxHealth(spell->Effects[EFFECT_0].CalcValue()));
-    }
-
     void SummonColorballs(uint8 quantity)
     {
         float x0 = ToCCommonLoc[1].GetPositionX(), y0 = ToCCommonLoc[1].GetPositionY(), r = 47.0f;
@@ -282,7 +263,6 @@ struct boss_twin_baseAI : public ScriptedAI
         DoScriptText(SAY_DEATH, me);
         if (m_pInstance)
         {
-            m_pInstance->SetData(DATA_HEALTH_TWIN_SHARED, 0);
             if (Creature* pSister = GetSister())
             {
                 if (!pSister->isAlive())
@@ -307,8 +287,10 @@ struct boss_twin_baseAI : public ScriptedAI
         me->SetInCombatWithZone();
         if (m_pInstance)
         {
+            if (Creature* pSister = GetSister())
+                me->AddAura(m_uiMyEmphatySpellId, pSister);
+
             m_pInstance->SetData(TYPE_VALKIRIES, IN_PROGRESS);
-            m_pInstance->SetData(DATA_HEALTH_TWIN_SHARED, me->GetMaxHealth());
         }
         if (me->isAlive())
         {
@@ -333,16 +315,18 @@ struct boss_twin_baseAI : public ScriptedAI
         }
     }
 
+    void EnableDualWield(bool mode)
+    {
+        SetEquipmentSlots(false, m_uiWeapon, mode ? m_uiWeapon : EQUIP_UNEQUIP, EQUIP_UNEQUIP);
+        me->SetCanDualWield(mode);
+        me->UpdateDamagePhysical(mode ? OFF_ATTACK : BASE_ATTACK);
+    }
+
     void UpdateAI(const uint32 uiDiff)
     {
         if (!m_pInstance || !UpdateVictim())
             return;
 
-        if (m_pInstance->GetData(DATA_HEALTH_TWIN_SHARED) != 0)
-            me->SetHealth(m_pInstance->GetData(DATA_HEALTH_TWIN_SHARED));
-        else
-            me->SetHealth(1);
-
         switch (m_uiStage)
         {
             case 0:
@@ -364,10 +348,13 @@ struct boss_twin_baseAI : public ScriptedAI
             case 2: // Shield+Pact
                 if (m_uiSpecialAbilityTimer <= uiDiff)
                 {
-                    if (Creature* pSister = GetSister())
-                        pSister->AI()->DoAction(ACTION_PACT);
                     DoScriptText(EMOTE_SHIELD, me);
                     DoScriptText(SAY_SHIELD, me);
+                    if (Creature* pSister = GetSister())
+                    {
+                        pSister->AI()->DoAction(ACTION_PACT);
+                        pSister->CastSpell(pSister, SPELL_POWER_TWINS, false);
+                    }
                     DoCast(me, m_uiShieldSpellId);
                     DoCast(me, m_uiTwinPactSpellId);
                     m_uiStage = 0;
@@ -447,13 +434,16 @@ public:
 
         void Reset() {
             boss_twin_baseAI::Reset();
-            SetEquipmentSlots(false, EQUIP_MAIN_1, EQUIP_OFFHAND_1, EQUIP_RANGED_1);
+            SetEquipmentSlots(false, EQUIP_MAIN_1, EQUIP_UNEQUIP, EQUIP_NO_CHANGE);
             m_uiStage = 0;
+            m_uiWeapon = EQUIP_MAIN_1;
+            m_uiAuraState = AURA_STATE_UNKNOWN22;
             m_uiVortexEmote = EMOTE_LIGHT_VORTEX;
             m_uiVortexSay = SAY_LIGHT_VORTEX;
             m_uiSisterNpcId = NPC_DARKBANE;
             m_uiColorballNpcId = NPC_UNLEASHED_LIGHT;
             m_uiEssenceNpcId = NPC_LIGHT_ESSENCE;
+            m_uiMyEmphatySpellId = SPELL_TWIN_EMPATHY_1;
             m_uiMyEssenceSpellId = SPELL_LIGHT_ESSENCE_HELPER;
             m_uiOtherEssenceSpellId = SPELL_DARK_ESSENCE_HELPER;
             m_uiEmpoweredWeaknessSpellId = SPELL_EMPOWERED_DARK_HELPER;
@@ -506,13 +496,16 @@ public:
 
         void Reset() {
             boss_twin_baseAI::Reset();
-            SetEquipmentSlots(false, EQUIP_MAIN_2, EQUIP_OFFHAND_2, EQUIP_RANGED_2);
+            SetEquipmentSlots(false, EQUIP_MAIN_2, EQUIP_UNEQUIP, EQUIP_NO_CHANGE);
             m_uiStage = 1;
+            m_uiWeapon = EQUIP_MAIN_2;
+            m_uiAuraState = AURA_STATE_UNKNOWN19;
             m_uiVortexEmote = EMOTE_DARK_VORTEX;
             m_uiVortexSay = SAY_DARK_VORTEX;
             m_uiSisterNpcId = NPC_LIGHTBANE;
             m_uiColorballNpcId = NPC_UNLEASHED_DARK;
             m_uiEssenceNpcId = NPC_DARK_ESSENCE;
+            m_uiMyEmphatySpellId = SPELL_TWIN_EMPATHY_2;
             m_uiMyEssenceSpellId = SPELL_DARK_ESSENCE_HELPER;
             m_uiOtherEssenceSpellId = SPELL_LIGHT_ESSENCE_HELPER;
             m_uiEmpoweredWeaknessSpellId = SPELL_EMPOWERED_LIGHT_HELPER;
@@ -654,6 +647,12 @@ public:
             }
             else m_uiRangeCheckTimer -= uiDiff;
         }
+
+        void SpellHitTarget(Unit* who, const SpellInfo* spell)
+        {
+            if (who->HasAura(SPELL_DARK_ESSENCE_HELPER))
+                who->CastSpell(who, SPELL_POWERING_UP, true);
+        }
     };
 
 };
@@ -687,10 +686,173 @@ public:
             }
             else m_uiRangeCheckTimer -= uiDiff;
         }
+
+        void SpellHitTarget(Unit* who, const SpellInfo* spell)
+        {
+            if (who->HasAura(SPELL_LIGHT_ESSENCE_HELPER))
+                who->CastSpell(who, SPELL_POWERING_UP, true);
+        }
     };
 
 };
 
+class spell_powering_up : public SpellScriptLoader
+{
+    public:
+        spell_powering_up() : SpellScriptLoader("spell_powering_up") { }
+
+        class spell_powering_up_AuraScript : public AuraScript
+        {
+            PrepareAuraScript(spell_powering_up_AuraScript);
+
+            void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+            {
+                if (Unit* target = GetTarget())
+                {
+                    if (Aura* pAura = target->GetAura(GetId()))
+                    {
+                        if (pAura->GetStackAmount() == 100)
+                        {
+                            if(target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2206, EFFECT_1))
+                                target->CastSpell(target, SPELL_EMPOWERED_DARK, true);
+
+                            if(target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2845, EFFECT_1))
+                                target->CastSpell(target, SPELL_EMPOWERED_LIGHT, true);
+
+                            target->RemoveAurasDueToSpell(GetId());
+                        }
+                    }
+                }
+            }
+
+            void Register()
+            {
+                OnEffectApply += AuraEffectApplyFn(spell_powering_up_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
+            }
+        };
+
+        AuraScript* GetAuraScript() const
+        {
+            return new spell_powering_up_AuraScript();
+        }
+
+        class spell_powering_up_SpellScript : public SpellScript
+        {
+            public:
+                PrepareSpellScript(spell_powering_up_SpellScript)
+
+            uint32 spellId;
+
+            bool Validate(SpellEntry const * /*spellEntry*/)
+            {
+                spellId = sSpellMgr->GetSpellIdForDifficulty(SPELL_SURGE_OF_SPEED, GetCaster());
+                if (!sSpellMgr->GetSpellInfo(spellId))
+                    return false;
+                return true;
+            }
+
+            void HandleScriptEffect(SpellEffIndex /*effIndex*/)
+            {
+                if (Unit* target = GetTargetUnit())
+                    if (urand(0, 99) < 15)
+                        target->CastSpell(target, spellId, true);
+            }
+
+            void Register()
+            {
+                OnEffect += SpellEffectFn(spell_powering_up_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
+            }
+        };
+
+        SpellScript* GetSpellScript() const
+        {
+            return new spell_powering_up_SpellScript();
+        }
+};
+
+class spell_valkyr_essences : public SpellScriptLoader
+{
+    public:
+        spell_valkyr_essences() : SpellScriptLoader("spell_valkyr_essences") { }
+
+        class spell_valkyr_essences_AuraScript : public AuraScript
+        {
+            PrepareAuraScript(spell_valkyr_essences_AuraScript);
+
+            uint32 spellId;
+
+            bool Load()
+            {
+                spellId = sSpellMgr->GetSpellIdForDifficulty(SPELL_SURGE_OF_SPEED, GetCaster());
+                if (!sSpellMgr->GetSpellInfo(spellId))
+                    return false;
+                return true;
+            }
+
+            void Absorb(AuraEffect * /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & /*absorbAmount*/)
+            {
+                if (urand(0, 99) < 5)
+                    GetTarget()->CastSpell(GetTarget(), spellId, true);
+            }
+
+            void Register()
+            {
+                OnEffectAbsorb += AuraEffectAbsorbFn(spell_valkyr_essences_AuraScript::Absorb, EFFECT_0);
+            }
+        };
+
+        AuraScript *GetAuraScript() const
+        {
+            return new spell_valkyr_essences_AuraScript();
+        }
+};
+
+class spell_power_of_the_twins : public SpellScriptLoader
+{
+    public:
+        spell_power_of_the_twins() : SpellScriptLoader("spell_power_of_the_twins") { }
+
+        class spell_power_of_the_twins_AuraScript : public AuraScript
+        {
+            PrepareAuraScript(spell_power_of_the_twins_AuraScript);
+
+            bool Load()
+            {
+                return GetCaster()->GetTypeId() == TYPEID_UNIT;
+            }
+
+            void HandleEffectApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
+            {
+                if (InstanceScript* instance = GetCaster()->GetInstanceScript())
+                {
+                    if (Creature* Valk = ObjectAccessor::GetCreature(*GetCaster(), instance->GetData64(GetCaster()->GetEntry())))
+                        CAST_AI(boss_twin_baseAI, Valk->AI())->EnableDualWield(true);
+                }
+            }
+
+            void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+            {
+                if (InstanceScript* instance = GetCaster()->GetInstanceScript())
+                {
+                    if (Creature* Valk = ObjectAccessor::GetCreature(*GetCaster(), instance->GetData64(GetCaster()->GetEntry())))
+                        CAST_AI(boss_twin_baseAI, Valk->AI())->EnableDualWield(false);
+                }
+            }
+
+            void Register()
+            {
+                AfterEffectApply += AuraEffectApplyFn(spell_power_of_the_twins_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
+                AfterEffectRemove += AuraEffectRemoveFn(spell_power_of_the_twins_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
+
+            }
+        };
+
+        AuraScript *GetAuraScript() const
+        {
+            return new spell_power_of_the_twins_AuraScript();
+        }
+};
+
 void AddSC_boss_twin_valkyr()
 {
     new boss_fjola();
@@ -698,4 +860,7 @@ void AddSC_boss_twin_valkyr()
     new mob_unleashed_light();
     new mob_unleashed_dark();
     new mob_essence_of_twin();
+    new spell_powering_up();
+    new spell_valkyr_essences();
+    new spell_power_of_the_twins();
 }
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
index e4d7d051676..91cd8dee55c 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
@@ -44,10 +44,6 @@ class instance_trial_of_the_crusader : public InstanceMapScript
             std::string SaveDataBuffer;
             bool   NeedSave;
 
-            uint32 DataDamageTwin;
-            uint32 FjolaCasting;
-            uint32 EydisCasting;
-
             uint64 BarrentGUID;
             uint64 TirionGUID;
             uint64 FizzlebangGUID;
@@ -368,11 +364,6 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                                 break;
                         }
                         break;
-                    case DATA_HEALTH_TWIN_SHARED:
-                        DataDamageTwin = data;
-                        data = NOT_STARTED;
-                        break;
-
                     //Achievements
                     case DATA_SNOBOLD_COUNT:
                         if (data == INCREASE)
@@ -584,8 +575,6 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                                 break;
                         };
                         return EventNPCId;
-                    case DATA_HEALTH_TWIN_SHARED:
-                        return DataDamageTwin;
                     default:
                         break;
                 }
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index bdccc540bb6..34c065f5649 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -745,24 +745,36 @@ class npc_tirion_toc : public CreatureScript
                             break;
                         case 4010:
                             DoScriptText(SAY_STAGE_3_02, me);
-                            m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
+                            if(Creature* pTemp = me->SummonCreature(NPC_LIGHTBANE, ToCCommonLoc[3].GetPositionX(), ToCCommonLoc[3].GetPositionY(), ToCCommonLoc[3].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME))
+                            {
+                                pTemp->SetVisible(false);
+                                pTemp->SetReactState(REACT_PASSIVE);
+                                pTemp->SummonCreature(NPC_LIGHT_ESSENCE, TwinValkyrsLoc[0].GetPositionX(), TwinValkyrsLoc[0].GetPositionY(), TwinValkyrsLoc[0].GetPositionZ());
+                                pTemp->SummonCreature(NPC_LIGHT_ESSENCE, TwinValkyrsLoc[1].GetPositionX(), TwinValkyrsLoc[1].GetPositionY(), TwinValkyrsLoc[1].GetPositionZ());
+                            }
+                            if(Creature* pTemp = me->SummonCreature(NPC_DARKBANE, ToCCommonLoc[4].GetPositionX(), ToCCommonLoc[4].GetPositionY(), ToCCommonLoc[4].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME))
+                            {
+                                pTemp->SetVisible(false);
+                                pTemp->SetReactState(REACT_PASSIVE);
+                                pTemp->SummonCreature(NPC_DARK_ESSENCE, TwinValkyrsLoc[2].GetPositionX(), TwinValkyrsLoc[2].GetPositionY(), TwinValkyrsLoc[2].GetPositionZ());
+                                pTemp->SummonCreature(NPC_DARK_ESSENCE, TwinValkyrsLoc[3].GetPositionX(), TwinValkyrsLoc[3].GetPositionY(), TwinValkyrsLoc[3].GetPositionZ());
+                            }
                             m_uiUpdateTimer = 3000;
                             m_pInstance->SetData(TYPE_EVENT, 4015);
                             break;
                         case 4015:
-                            me->SummonCreature(NPC_LIGHTBANE, ToCCommonLoc[3].GetPositionX(), ToCCommonLoc[3].GetPositionY(), ToCCommonLoc[3].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
+                            m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR));
                             if (Creature* pTemp = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_LIGHTBANE)))
                             {
                                 pTemp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[6].GetPositionX(), ToCCommonLoc[6].GetPositionY(), ToCCommonLoc[6].GetPositionZ());
                                 pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
-                                me->SetReactState(REACT_PASSIVE);
+                                pTemp->SetVisible(true);
                             }
-                            me->SummonCreature(NPC_DARKBANE, ToCCommonLoc[4].GetPositionX(), ToCCommonLoc[4].GetPositionY(), ToCCommonLoc[4].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
                             if (Creature* pTemp = Unit::GetCreature((*me), m_pInstance->GetData64(NPC_DARKBANE)))
                             {
                                 pTemp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[7].GetPositionX(), ToCCommonLoc[7].GetPositionY(), ToCCommonLoc[7].GetPositionZ());
                                 pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
-                                me->SetReactState(REACT_PASSIVE);
+                                pTemp->SetVisible(true);
                             }
                             m_uiUpdateTimer = 5000;
                             m_pInstance->SetData(TYPE_EVENT, 4016);
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
index ab9087c0ca8..a0ee721a26a 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
@@ -22,8 +22,6 @@ enum
     TYPE_EVENT_NPC              = 102,
     TYPE_NORTHREND_BEASTS       = 103,
 
-    DATA_HEALTH_TWIN_SHARED     = 201,
-
     DATA_SNOBOLD_COUNT                   = 301,
     DATA_MISTRESS_OF_PAIN_COUNT          = 302,
     DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE = 303,
@@ -210,6 +208,9 @@ enum eCreature
     NPC_LIGHTBANE               = 34497,
     NPC_DARKBANE                = 34496,
 
+    NPC_DARK_ESSENCE            = 34567,
+    NPC_LIGHT_ESSENCE           = 34568,
+
     NPC_ANUBARAK                = 34564,
 };