Scripts/Kalimdor: BlackFathomDeep

* Code Standardizations.
- Removed SD2 hieroglyphics.
- Removed Hungarian Notations.
- Fixed Enums in Defines.

5 files changed, 130 insertions, 135 deletions

diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
index 29029803369..878116ad476 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
@@ -43,7 +43,6 @@ public:
             player->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, player);
         return true;
     }
-
 };
 
 class go_blackfathom_fire : public GameObjectScript
@@ -64,7 +63,6 @@ public:
         }
         return false;
     }
-
 };
 
 class npc_blackfathom_deeps_event : public CreatureScript
@@ -92,9 +90,9 @@ public:
 
         InstanceScript* instance;
 
-        uint32 uiRavageTimer;
-        uint32 uiFrostNovaTimer;
-        uint32 uiFrostBoltVolleyTimer;
+        uint32 ravageTimer;
+        uint32 frostNovaTimer;
+        uint32 frostBoltVolleyTimer;
 
         bool bFlee;
 
@@ -102,9 +100,9 @@ public:
         {
             bFlee = false;
 
-            uiRavageTimer           = urand(5000, 8000);
-            uiFrostNovaTimer        = urand(9000, 12000);
-            uiFrostBoltVolleyTimer  = urand(2000, 4000);
+            ravageTimer           = urand(5000, 8000);
+            frostNovaTimer        = urand(9000, 12000);
+            frostBoltVolleyTimer  = urand(2000, 4000);
         }
 
         void AttackPlayer()
@@ -131,7 +129,7 @@ public:
             }
         }
 
-        void UpdateAI(const uint32 uiDiff)
+        void UpdateAI(const uint32 diff)
         {
             if (!UpdateVictim())
                 return;
@@ -140,11 +138,11 @@ public:
             {
                 case NPC_AKU_MAI_SNAPJAW:
                 {
-                    if (uiRavageTimer <= uiDiff)
+                    if (ravageTimer <= diff)
                     {
                         DoCast(me->getVictim(), SPELL_RAVAGE);
-                        uiRavageTimer = urand(9000, 14000);
-                    } else uiRavageTimer -= uiDiff;
+                        ravageTimer = urand(9000, 14000);
+                    } else ravageTimer -= diff;
                     break;
                 }
                 case NPC_MURKSHALLOW_SOFTSHELL:
@@ -159,20 +157,23 @@ public:
                 }
                 case NPC_AKU_MAI_SERVANT:
                 {
-                    if (uiFrostBoltVolleyTimer <= uiDiff)
+                    if (frostBoltVolleyTimer <= diff)
                     {
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         {
                             if (target)
                                 DoCast(target, SPELL_FROST_BOLT_VOLLEY);
                         }
-                        uiFrostBoltVolleyTimer = urand(5000, 8000);
-                    } else uiFrostBoltVolleyTimer -= uiDiff;
-                    if (uiFrostNovaTimer <= uiDiff)
+                        frostBoltVolleyTimer = urand(5000, 8000);
+                    } 
+                    else frostBoltVolleyTimer -= diff;
+                    
+                    if (frostNovaTimer <= diff)
                     {
                         DoCastAOE(SPELL_FROST_NOVA, false);
-                        uiFrostNovaTimer = urand(25000, 30000);
-                    } else uiFrostNovaTimer -= uiDiff;
+                        frostNovaTimer = urand(25000, 30000);
+                    } 
+                    else frostNovaTimer -= diff;
                     break;
                 }
             }
@@ -187,7 +188,6 @@ public:
                     instance->SetData(DATA_EVENT, instance->GetData(DATA_EVENT) + 1);
         }
     };
-
 };
 
 enum eMorridune
@@ -201,12 +201,12 @@ class npc_morridune : public CreatureScript
 public:
     npc_morridune() : CreatureScript("npc_morridune") { }
 
-    bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction)
+    bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*Sender*/, uint32 action)
     {
         player->PlayerTalkClass->ClearMenus();
-        switch (uiAction)
+        switch (action)
         {
-            case GOSSIP_ACTION_INFO_DEF+1:
+            case GOSSIP_ACTION_INFO_DEF + 1:
                 player->TeleportTo(1, 9952.239f, 2284.277f, 1341.394f, 1.595f);
                 player->CLOSE_GOSSIP_MENU();
                 break;
@@ -216,7 +216,7 @@ public:
 
     bool OnGossipHello(Player* player, Creature* creature)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MORRIDUNE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MORRIDUNE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
 
         player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
         return true;
@@ -250,7 +250,6 @@ public:
             }
         }
     };
-
 };
 
 void AddSC_blackfathom_deeps()
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
index 87e8478532d..32a6bcbde77 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
@@ -36,19 +36,19 @@ public:
 
     struct boss_aku_maiAI : public ScriptedAI
     {
-        boss_aku_maiAI(Creature* c) : ScriptedAI(c)
+        boss_aku_maiAI(Creature* creature) : ScriptedAI(creature)
         {
-            instance = c->GetInstanceScript();
+            instance = creature->GetInstanceScript();
         }
 
-        uint32 uiPoisonCloudTimer;
+        uint32 poisonCloudTimer;
         bool bIsEnraged;
 
         InstanceScript* instance;
 
         void Reset()
         {
-            uiPoisonCloudTimer = urand(5000, 9000);
+            poisonCloudTimer = urand(5000, 9000);
             bIsEnraged = false;
             if (instance)
                 instance->SetData(TYPE_AKU_MAI, NOT_STARTED);
@@ -71,11 +71,11 @@ public:
             if (!UpdateVictim())
                 return;
 
-            if (uiPoisonCloudTimer < diff)
+            if (poisonCloudTimer < diff)
             {
                 DoCastVictim(SPELL_POISON_CLOUD);
-                uiPoisonCloudTimer = urand(25000, 50000);
-            } else uiPoisonCloudTimer -= diff;
+                poisonCloudTimer = urand(25000, 50000);
+            } else poisonCloudTimer -= diff;
 
             if (!bIsEnraged && HealthBelowPct(30))
             {
@@ -86,7 +86,6 @@ public:
             DoMeleeAttackIfReady();
         }
     };
-
 };
 
 void AddSC_boss_aku_mai()
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
index e7822a6edb3..5a60a849b75 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
@@ -35,18 +35,18 @@ public:
 
     struct boss_gelihastAI : public ScriptedAI
     {
-        boss_gelihastAI(Creature* c) : ScriptedAI(c)
+        boss_gelihastAI(Creature* creature) : ScriptedAI(creature)
         {
-            instance = c->GetInstanceScript();
+            instance = creature->GetInstanceScript();
         }
 
-        uint32 uiNetTimer;
+        uint32 netTimer;
 
         InstanceScript* instance;
 
         void Reset()
         {
-            uiNetTimer = urand(2000, 4000);
+            netTimer = urand(2000, 4000);
             if (instance)
                 instance->SetData(TYPE_GELIHAST, NOT_STARTED);
         }
@@ -68,16 +68,15 @@ public:
             if (!UpdateVictim())
                 return;
 
-            if (uiNetTimer < diff)
+            if (netTimer < diff)
             {
                 DoCastVictim(SPELL_NET);
-                uiNetTimer = urand(4000, 7000);
-            } else uiNetTimer -= diff;
+                netTimer = urand(4000, 7000);
+            } else netTimer -= diff;
 
             DoMeleeAttackIfReady();
         }
     };
-
 };
 
 void AddSC_boss_gelihast()
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
index 5823ed15ed5..7ee17172102 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
@@ -44,20 +44,20 @@ public:
 
     struct boss_kelrisAI : public ScriptedAI
     {
-        boss_kelrisAI(Creature* c) : ScriptedAI(c)
+        boss_kelrisAI(Creature* creature) : ScriptedAI(creature)
         {
-            instance = c->GetInstanceScript();
+            instance = creature->GetInstanceScript();
         }
 
-        uint32 uiMindBlastTimer;
-        uint32 uiSleepTimer;
+        uint32 mindBlastTimer;
+        uint32 sleepTimer;
 
         InstanceScript* instance;
 
         void Reset()
         {
-            uiMindBlastTimer = urand(2000, 5000);
-            uiSleepTimer = urand(9000, 12000);
+            mindBlastTimer = urand(2000, 5000);
+            sleepTimer = urand(9000, 12000);
             if (instance)
                 instance->SetData(TYPE_KELRIS, NOT_STARTED);
         }
@@ -81,26 +81,25 @@ public:
             if (!UpdateVictim())
                 return;
 
-            if (uiMindBlastTimer < diff)
+            if (mindBlastTimer < diff)
             {
                 DoCastVictim(SPELL_MIND_BLAST);
-                uiMindBlastTimer = urand(7000, 9000);
-            } else uiMindBlastTimer -= diff;
+                mindBlastTimer = urand(7000, 9000);
+            } else mindBlastTimer -= diff;
 
-            if (uiSleepTimer < diff)
+            if (sleepTimer < diff)
             {
                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 {
                     DoScriptText(SAY_SLEEP, me);
                     DoCast(target, SPELL_SLEEP);
                 }
-                uiSleepTimer = urand(15000, 20000);
-            } else uiSleepTimer -= diff;
+                sleepTimer = urand(15000, 20000);
+            } else sleepTimer -= diff;
 
             DoMeleeAttackIfReady();
         }
     };
-
 };
 
 void AddSC_boss_kelris()
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
index 8dd4e60f281..ea33499a960 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
@@ -65,33 +65,33 @@ public:
     {
         instance_blackfathom_deeps_InstanceMapScript(Map* map) : InstanceScript(map) {}
 
-        uint64 m_uiTwilightLordKelrisGUID;
-        uint64 m_uiShrine1GUID;
-        uint64 m_uiShrine2GUID;
-        uint64 m_uiShrine3GUID;
-        uint64 m_uiShrine4GUID;
-        uint64 m_uiShrineOfGelihastGUID;
-        uint64 m_uiAltarOfTheDeepsGUID;
-        uint64 m_uiMainDoorGUID;
+        uint64 twilightLordKelrisGUID;
+        uint64 shrine1GUID;
+        uint64 shrine2GUID;
+        uint64 shrine3GUID;
+        uint64 shrine4GUID;
+        uint64 shrineOfGelihastGUID;
+        uint64 altarOfTheDeepsGUID;
+        uint64 mainDoorGUID;
 
-        uint8 m_auiEncounter[MAX_ENCOUNTER];
-        uint8 m_uiCountFires;
-        uint8 uiDeathTimes;
+        uint8 encounter[MAX_ENCOUNTER];
+        uint8 countFires;
+        uint8 deathTimes;
 
         void Initialize()
         {
-            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+            memset(&encounter, 0, sizeof(encounter));
 
-            m_uiTwilightLordKelrisGUID = 0;
-            m_uiShrine1GUID = 0;
-            m_uiShrine2GUID = 0;
-            m_uiShrine3GUID = 0;
-            m_uiShrine4GUID = 0;
-            m_uiShrineOfGelihastGUID = 0;
-            m_uiAltarOfTheDeepsGUID = 0;
-            m_uiMainDoorGUID = 0;
-            m_uiCountFires = 0;
-            uiDeathTimes = 0;
+            twilightLordKelrisGUID = 0;
+            shrine1GUID = 0;
+            shrine2GUID = 0;
+            shrine3GUID = 0;
+            shrine4GUID = 0;
+            shrineOfGelihastGUID = 0;
+            altarOfTheDeepsGUID = 0;
+            mainDoorGUID = 0;
+            countFires = 0;
+            deathTimes = 0;
         }
 
         void OnCreatureCreate(Creature* creature)
@@ -99,7 +99,7 @@ public:
             switch (creature->GetEntry())
             {
                 case NPC_TWILIGHT_LORD_KELRIS:
-                    m_uiTwilightLordKelrisGUID = creature->GetGUID();
+                    twilightLordKelrisGUID = creature->GetGUID();
                     break;
                 case NPC_LORGUS_JETT:
                     creature->SetHomePosition(LorgusPosition[urand(0, 3)]);
@@ -112,150 +112,149 @@ public:
             switch (go->GetEntry())
             {
                 case GO_FIRE_OF_AKU_MAI_1:
-                    m_uiShrine1GUID = go->GetGUID();
+                    shrine1GUID = go->GetGUID();
                     break;
                 case GO_FIRE_OF_AKU_MAI_2:
-                    m_uiShrine2GUID = go->GetGUID();
+                    shrine2GUID = go->GetGUID();
                     break;
                 case GO_FIRE_OF_AKU_MAI_3:
-                    m_uiShrine3GUID = go->GetGUID();
+                    shrine3GUID = go->GetGUID();
                     break;
                 case GO_FIRE_OF_AKU_MAI_4:
-                    m_uiShrine4GUID = go->GetGUID();
+                    shrine4GUID = go->GetGUID();
                     break;
                 case GO_SHRINE_OF_GELIHAST:
-                    m_uiShrineOfGelihastGUID = go->GetGUID();
-                    if (m_auiEncounter[0] != DONE)
+                    shrineOfGelihastGUID = go->GetGUID();
+                    if (encounter[0] != DONE)
                         go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
                     break;
                 case GO_ALTAR_OF_THE_DEEPS:
-                    m_uiAltarOfTheDeepsGUID = go->GetGUID();
-                    if (m_auiEncounter[3] != DONE)
+                    altarOfTheDeepsGUID = go->GetGUID();
+                    if (encounter[3] != DONE)
                         go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
                     break;
                 case GO_AKU_MAI_DOOR:
-                    if (m_auiEncounter[2] == DONE)
+                    if (encounter[2] == DONE)
                         HandleGameObject(0, true, go);
-                    m_uiMainDoorGUID = go->GetGUID();
+                    mainDoorGUID = go->GetGUID();
                     break;
             }
         }
 
-        void SetData(uint32 uiType, uint32 uiData)
+        void SetData(uint32 type, uint32 data)
         {
-            switch (uiType)
+            switch (type)
             {
                 case TYPE_GELIHAST:
-                    m_auiEncounter[0] = uiData;
-                    if (uiData == DONE)
-                        if (GameObject* go = instance->GetGameObject(m_uiShrineOfGelihastGUID))
+                    encounter[0] = data;
+                    if (data == DONE)
+                        if (GameObject* go = instance->GetGameObject(shrineOfGelihastGUID))
                             go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
                     break;
                 case TYPE_AKU_MAI:
-                    m_auiEncounter[3] = uiData;
-                    if (uiData == DONE)
-                        if (GameObject* go = instance->GetGameObject(m_uiAltarOfTheDeepsGUID))
+                    encounter[3] = data;
+                    if (data == DONE)
+                        if (GameObject* go = instance->GetGameObject(altarOfTheDeepsGUID))
                         {
                             go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
                             go->SummonCreature(NPC_MORRIDUNE, SpawnsLocation[4], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
                         }
                     break;
                 case DATA_FIRE:
-                    m_uiCountFires = uiData;
-                    switch (m_uiCountFires)
+                    countFires = data;
+                    switch (countFires)
                     {
                         case 1:
-                            if (GameObject* pGO = instance->GetGameObject(m_uiShrine1GUID))
+                            if (GameObject* go = instance->GetGameObject(shrine1GUID))
                             {
-                                pGO->SummonCreature(NPC_AKU_MAI_SNAPJAW, SpawnsLocation[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
-                                pGO->SummonCreature(NPC_AKU_MAI_SNAPJAW, SpawnsLocation[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
-                                pGO->SummonCreature(NPC_AKU_MAI_SNAPJAW, SpawnsLocation[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
-                                pGO->SummonCreature(NPC_AKU_MAI_SNAPJAW, SpawnsLocation[3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                                go->SummonCreature(NPC_AKU_MAI_SNAPJAW, SpawnsLocation[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                                go->SummonCreature(NPC_AKU_MAI_SNAPJAW, SpawnsLocation[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                                go->SummonCreature(NPC_AKU_MAI_SNAPJAW, SpawnsLocation[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                                go->SummonCreature(NPC_AKU_MAI_SNAPJAW, SpawnsLocation[3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
                             }
                             break;
                         case 2:
-                            if (GameObject* pGO = instance->GetGameObject(m_uiShrine1GUID))
+                            if (GameObject* go = instance->GetGameObject(shrine1GUID))
                             {
                                 for (uint8 i = 0; i < 2; ++i)
                                 {
-                                    pGO->SummonCreature(NPC_MURKSHALLOW_SOFTSHELL, SpawnsLocation[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
-                                    pGO->SummonCreature(NPC_MURKSHALLOW_SOFTSHELL, SpawnsLocation[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
-                                    pGO->SummonCreature(NPC_MURKSHALLOW_SOFTSHELL, SpawnsLocation[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
-                                    pGO->SummonCreature(NPC_MURKSHALLOW_SOFTSHELL, SpawnsLocation[3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                                    go->SummonCreature(NPC_MURKSHALLOW_SOFTSHELL, SpawnsLocation[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                                    go->SummonCreature(NPC_MURKSHALLOW_SOFTSHELL, SpawnsLocation[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                                    go->SummonCreature(NPC_MURKSHALLOW_SOFTSHELL, SpawnsLocation[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                                    go->SummonCreature(NPC_MURKSHALLOW_SOFTSHELL, SpawnsLocation[3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
                                 }
                             }
                             break;
                         case 3:
-                            if (GameObject* pGO = instance->GetGameObject(m_uiShrine1GUID))
+                            if (GameObject* go = instance->GetGameObject(shrine1GUID))
                             {
-                                pGO->SummonCreature(NPC_AKU_MAI_SERVANT, SpawnsLocation[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
-                                pGO->SummonCreature(NPC_AKU_MAI_SERVANT, SpawnsLocation[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                                go->SummonCreature(NPC_AKU_MAI_SERVANT, SpawnsLocation[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                                go->SummonCreature(NPC_AKU_MAI_SERVANT, SpawnsLocation[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
                             }
                             break;
                         case 4:
-                            if (GameObject* pGO = instance->GetGameObject(m_uiShrine1GUID))
+                            if (GameObject* go = instance->GetGameObject(shrine1GUID))
                             {
-                                pGO->SummonCreature(NPC_BARBED_CRUSTACEAN, SpawnsLocation[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
-                                pGO->SummonCreature(NPC_BARBED_CRUSTACEAN, SpawnsLocation[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
-                                pGO->SummonCreature(NPC_BARBED_CRUSTACEAN, SpawnsLocation[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
-                                pGO->SummonCreature(NPC_BARBED_CRUSTACEAN, SpawnsLocation[3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                                go->SummonCreature(NPC_BARBED_CRUSTACEAN, SpawnsLocation[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                                go->SummonCreature(NPC_BARBED_CRUSTACEAN, SpawnsLocation[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                                go->SummonCreature(NPC_BARBED_CRUSTACEAN, SpawnsLocation[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
+                                go->SummonCreature(NPC_BARBED_CRUSTACEAN, SpawnsLocation[3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
                             }
                             break;
                     }
                     break;
                 case DATA_EVENT:
-                    uiDeathTimes = uiData;
-                    if (uiDeathTimes == 18)
-                        HandleGameObject(m_uiMainDoorGUID, true);
+                    deathTimes = data;
+                    if (deathTimes == 18)
+                        HandleGameObject(mainDoorGUID, true);
                     break;
             }
         }
 
-        uint32 GetData(uint32 uiType)
+        uint32 GetData(uint32 type)
         {
-            switch (uiType)
+            switch (type)
             {
                 case TYPE_GELIHAST:
-                    return m_auiEncounter[0];
+                    return encounter[0];
                 case TYPE_KELRIS:
-                    return m_auiEncounter[1];
+                    return encounter[1];
                 case TYPE_SHRINE:
-                    return m_auiEncounter[2];
+                    return encounter[2];
                 case TYPE_AKU_MAI:
-                    return m_auiEncounter[3];
+                    return encounter[3];
                 case DATA_FIRE:
-                    return m_uiCountFires;
+                    return countFires;
                 case DATA_EVENT:
-                    return uiDeathTimes;
+                    return deathTimes;
             }
 
             return 0;
         }
 
-        uint64 GetData64(uint32 uiData)
+        uint64 GetData64(uint32 data)
         {
-            switch (uiData)
+            switch (data)
             {
                 case DATA_TWILIGHT_LORD_KELRIS:
-                    return m_uiTwilightLordKelrisGUID;
+                    return twilightLordKelrisGUID;
                 case DATA_SHRINE1:
-                    return m_uiShrine1GUID;
+                    return shrine1GUID;
                 case DATA_SHRINE2:
-                    return m_uiShrine2GUID;
+                    return shrine2GUID;
                 case DATA_SHRINE3:
-                    return m_uiShrine3GUID;
+                    return shrine3GUID;
                 case DATA_SHRINE4:
-                    return m_uiShrine4GUID;
+                    return shrine4GUID;
                 case DATA_SHRINE_OF_GELIHAST:
-                    return m_uiShrineOfGelihastGUID;
+                    return shrineOfGelihastGUID;
                 case DATA_MAINDOOR:
-                    return m_uiMainDoorGUID;
+                    return mainDoorGUID;
             }
 
             return 0;
         }
     };
-
 };
 
 void AddSC_instance_blackfathom_deeps()