lovefancy88
diff --git a/‎scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_twin_valkyr.cpp‎
Lines changed: 7 additions & 0 deletions b/‎scripts/northrend/crusaders_coliseum/trial_of_the_crusader/boss_twin_valkyr.cpp‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/halls_of_reflection.h‎
Lines changed: 9 additions & 4 deletions b/‎scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/halls_of_reflection.h‎
Lines changed: 9 additions & 4 deletions
diff --git a/‎scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp‎
Lines changed: 4 additions & 1 deletion b/‎scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎sd2_revision_nr.h‎
Lines changed: 1 addition & 1 deletion b/‎sd2_revision_nr.h‎
Lines changed: 1 addition & 1 deletion
@@ -184,13 +184,15 @@ struct boss_fjolaAI : public ScriptedAI
         {
             uiSpell = m_bIsLightTwin ? SPELL_LIGHT_VORTEX : SPELL_DARK_VORTEX;
             pCaster->CastSpell(pCaster, uiSpell, false);
+            DoScriptText(m_bIsLightTwin ? SAY_TO_WHITE : SAY_TO_BLACK, pCaster);
         }
         else
         {
             uiSpell = m_bIsLightTwin ? SPELL_TWINS_PACT_LIGHT : SPELL_TWINS_PACT_DARK;
             uiShieldSpell = m_bIsLightTwin ? SPELL_SHIELD_OF_LIGHTS : SPELL_SHIELD_OF_DARKNESS;
             pCaster->CastSpell(pCaster, uiSpell, false);
             pCaster->CastSpell(pCaster, uiShieldSpell, true);
+            DoScriptText(SAY_COLORSWITCH, pCaster);
         }
 
         m_bIsVortex = urand(0, 1) ? true : false;
@@ -232,8 +234,13 @@ struct boss_fjolaAI : public ScriptedAI
                     if (m_pInstance)
                     {
                         if (Creature* pEydis = m_pInstance->GetSingleCreatureFromStorage(NPC_EYDIS))
+                        {
                             pEydis->CastSpell(pEydis, SPELL_BERSERK, true);
+                            DoScriptText(SAY_BERSERK, pEydis);
+                        }
                     }
+
+                    DoScriptText(SAY_BERSERK, m_creature);
                     m_uiBerserkTimer = 0;
                 }
             }
 
@@ -15,7 +15,8 @@ enum
 
     NPC_FALRIC                      = 38112,
     NPC_MARWYN                      = 38113,
-    NPC_LICH_KING                   = 37226,
+    NPC_LICH_KING                   = 36954,
+    NPC_FROSTSWORN_GENERAL          = 36723,                    // miniboss between Marwyn and Lich King
 
     NPC_JAINA_PART1                 = 37221,
     NPC_JAINA_PART2                 = 36955,
@@ -28,16 +29,16 @@ enum
 
     // intro related npcs
     NPC_UTHER                       = 37225,
-    NPC_LICH_KING_INTRO             = 36954,
+    NPC_LICH_KING_INTRO             = 37226,
     NPC_FROSTMOURNE_ALTER_BUNNY     = 37704,                    // dummy trigger for Quel'Delar
     NPC_QUEL_DELAR                  = 37158,
 
     // spirit event creatures
-    NPC_SPECTRAL_FOOTMAN            = 38173,
-    NPC_SHADOWY_MERCENARY           = 38177,
     NPC_PHANTOM_MAGE                = 38172,
+    NPC_SPECTRAL_FOOTMAN            = 38173,
     NPC_GHOSTLY_PRIEST              = 38175,
     NPC_TORTURED_RIFLEMAN           = 38176,
+    NPC_SHADOWY_MERCENARY           = 38177,
 
     // escape event creatures
     NPC_RAGING_GHOUL                = 36940,
@@ -67,6 +68,10 @@ enum
     // world states
     WORLD_STATE_SPIRIT_WAVES        = 4884,
     WORLD_STATE_SPIRIT_WAVES_COUNT  = 4882,
+
+    // area triggers
+    AREATRIGGER_FROSTMOURNE_ALTAR   = 5697,
+    AREATRIGGER_LICH_KING_ROOM      = 5605,
 };
 
 struct EventNpcLocations
 
@@ -72,10 +72,13 @@ void instance_halls_of_reflection::OnObjectCreate(GameObject* pGo)
 {
     switch (pGo->GetEntry())
     {
+        case GO_IMPENETRABLE_DOOR:
+            if (m_auiEncounter[TYPE_MARWYN] == DONE)
+                pGo->SetGoState(GO_STATE_ACTIVE);
+            break;
         case GO_FROSTMOURNE:
         case GO_FROSTMOURNE_ALTAR:
         case GO_ICECROWN_DOOR_ENTRANCE:
-        case GO_IMPENETRABLE_DOOR:
         case GO_ICECROWN_DOOR_LK_ENTRANCE:
         case GO_ICECROWN_DOOR_LK_EXIT:
         case GO_CAVE_IN:
 
@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "3135"
+ #define SD2_REVISION_NR "3136"
 #endif // __SD2_REVISION_NR_H__
Original file line number	Diff line number	Diff line change
@@ -184,13 +184,15 @@ struct boss_fjolaAI : public ScriptedAI
184	184	{
185	185	uiSpell = m_bIsLightTwin ? SPELL_LIGHT_VORTEX : SPELL_DARK_VORTEX;
186	186	pCaster->CastSpell(pCaster, uiSpell, false);
	187	+ DoScriptText(m_bIsLightTwin ? SAY_TO_WHITE : SAY_TO_BLACK, pCaster);
187	188	}
188	189	else
189	190	{
190	191	uiSpell = m_bIsLightTwin ? SPELL_TWINS_PACT_LIGHT : SPELL_TWINS_PACT_DARK;
191	192	uiShieldSpell = m_bIsLightTwin ? SPELL_SHIELD_OF_LIGHTS : SPELL_SHIELD_OF_DARKNESS;
192	193	pCaster->CastSpell(pCaster, uiSpell, false);
193	194	pCaster->CastSpell(pCaster, uiShieldSpell, true);
	195	+ DoScriptText(SAY_COLORSWITCH, pCaster);
194	196	}
195	197
196	198	m_bIsVortex = urand(0, 1) ? true : false;
@@ -232,8 +234,13 @@ struct boss_fjolaAI : public ScriptedAI
232	234	if (m_pInstance)
233	235	{
234	236	if (Creature* pEydis = m_pInstance->GetSingleCreatureFromStorage(NPC_EYDIS))
	237	+ {
235	238	pEydis->CastSpell(pEydis, SPELL_BERSERK, true);
	239	+ DoScriptText(SAY_BERSERK, pEydis);
	240	+ }
236	241	}
	242	+
	243	+ DoScriptText(SAY_BERSERK, m_creature);
237	244	m_uiBerserkTimer = 0;
238	245	}
239	246	}