Scripts/HoL/HoS: changed some bosses to optional, doors are always open

3 files changed, 0 insertions, 21 deletions

diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
index 6baf5dc6d93..c45d3704d5d 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
@@ -21,7 +21,6 @@
 
 DoorData const doorData[] =
 {
-    { GO_BJARNGRIM_DOOR,    DATA_BJARNGRIM, DOOR_TYPE_PASSAGE,  BOUNDARY_NONE },
     { GO_VOLKHAN_DOOR,      DATA_VOLKHAN,   DOOR_TYPE_PASSAGE,  BOUNDARY_NONE },
     { GO_IONAR_DOOR,        DATA_IONAR,     DOOR_TYPE_PASSAGE,  BOUNDARY_NONE },
     { GO_LOKEN_DOOR,        DATA_LOKEN,     DOOR_TYPE_PASSAGE,  BOUNDARY_NONE },
@@ -73,7 +72,6 @@ class instance_halls_of_lightning : public InstanceMapScript
             {
                 switch (go->GetEntry())
                 {
-                    case GO_BJARNGRIM_DOOR:
                     case GO_VOLKHAN_DOOR:
                     case GO_IONAR_DOOR:
                     case GO_LOKEN_DOOR:
@@ -91,7 +89,6 @@ class instance_halls_of_lightning : public InstanceMapScript
             {
                 switch (go->GetEntry())
                 {
-                    case GO_BJARNGRIM_DOOR:
                     case GO_VOLKHAN_DOOR:
                     case GO_IONAR_DOOR:
                     case GO_LOKEN_DOOR:
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
index 0d14f337ab3..f4ea3ff556c 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
@@ -90,14 +90,6 @@ public:
 
             if (instance)
             {
-                /*
-                if (GameObject* pDoor = instance->instance->GetGameObject(instance->GetData64(DATA_MAIDEN_DOOR)))
-                    if (pDoor->GetGoState() == GO_STATE_READY)
-                    {
-                        EnterEvadeMode();
-                        return;
-                    }
-                */
                 instance->SetBossState(DATA_MAIDEN_OF_GRIEF, IN_PROGRESS);
                 instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT);
             }
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
index 6b0f5dfd9e9..2a899d26d5a 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
@@ -23,8 +23,6 @@
 
 DoorData const doorData[] =
 {
-    { GO_MAIDEN_DOOR,   DATA_KRYSTALLUS,        DOOR_TYPE_PASSAGE,  BOUNDARY_NONE },
-    { GO_BRANN_DOOR,    DATA_MAIDEN_OF_GRIEF,   DOOR_TYPE_PASSAGE,  BOUNDARY_NONE },
     { GO_SJONNIR_DOOR,  DATA_BRANN_EVENT,       DOOR_TYPE_PASSAGE,  BOUNDARY_NONE },
     { 0,                0,                      DOOR_TYPE_ROOM,     BOUNDARY_NONE } // END
 };
@@ -113,8 +111,6 @@ class instance_halls_of_stone : public InstanceMapScript
                     case GO_TRIBUNAL_SKY_FLOOR:
                         TribunalSkyFloorGUID = go->GetGUID();
                         break;
-                    case GO_MAIDEN_DOOR:
-                    case GO_BRANN_DOOR:
                     case GO_SJONNIR_DOOR:
                         AddDoor(go, true);
                         break;
@@ -127,8 +123,6 @@ class instance_halls_of_stone : public InstanceMapScript
             {
                 switch (go->GetEntry())
                 {
-                    case GO_MAIDEN_DOOR:
-                    case GO_BRANN_DOOR:
                     case GO_SJONNIR_DOOR:
                         AddDoor(go, false);
                         break;
@@ -198,10 +192,6 @@ class instance_halls_of_stone : public InstanceMapScript
 
                 switch (bossId)
                 {
-                    case DATA_MAIDEN_OF_GRIEF:
-                        if (GetBossState(DATA_KRYSTALLUS) != DONE)
-                            return false;
-                        break;
                     case DATA_SJONNIR:
                         if (GetBossState(DATA_BRANN_EVENT) != DONE)
                             return false;