[2804] Add placeholder for Varos Cloudstrider - Oculus

Also improve Oculus instance script by fixing Eregos spawn exploit and allow better handling of the Centrifuge Constructs in case of server restart

Author: xfurry

VC100/100ScriptDev2.vcxproj

@@ -512,6 +512,7 @@
     <ClCompile Include="..\scripts\northrend\nexus\nexus\instance_nexus.cpp" />
     <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_eregos.cpp" />
     <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_urom.cpp" />
+    <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_varos.cpp" />
     <ClCompile Include="..\scripts\northrend\nexus\oculus\instance_oculus.cpp" />
     <ClCompile Include="..\scripts\northrend\obsidian_sanctum\boss_sartharion.cpp" />
     <ClCompile Include="..\scripts\northrend\obsidian_sanctum\instance_obsidian_sanctum.cpp" />

VC100/100ScriptDev2.vcxproj.filters

@@ -1128,6 +1128,9 @@
     <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_urom.cpp">
       <Filter>scripts\northrend\nexus\oculus</Filter>
     </ClCompile>
+    <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_varos.cpp">
+      <Filter>scripts\northrend\nexus\oculus</Filter>
+    </ClCompile>
     <ClCompile Include="..\scripts\northrend\nexus\oculus\instance_oculus.cpp">
       <Filter>scripts\northrend\nexus\oculus</Filter>
     </ClCompile>

VC110/110ScriptDev2.vcxproj

@@ -517,6 +517,7 @@
     <ClCompile Include="..\scripts\northrend\nexus\nexus\instance_nexus.cpp" />
     <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_eregos.cpp" />
     <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_urom.cpp" />
+    <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_varos.cpp" />
     <ClCompile Include="..\scripts\northrend\nexus\oculus\instance_oculus.cpp" />
     <ClCompile Include="..\scripts\northrend\obsidian_sanctum\boss_sartharion.cpp" />
     <ClCompile Include="..\scripts\northrend\obsidian_sanctum\instance_obsidian_sanctum.cpp" />

VC110/110ScriptDev2.vcxproj.filters

@@ -1128,6 +1128,9 @@
     <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_urom.cpp">
       <Filter>scripts\northrend\nexus\oculus</Filter>
     </ClCompile>
+    <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_varos.cpp">
+      <Filter>scripts\northrend\nexus\oculus</Filter>
+    </ClCompile>
     <ClCompile Include="..\scripts\northrend\nexus\oculus\instance_oculus.cpp">
       <Filter>scripts\northrend\nexus\oculus</Filter>
     </ClCompile>

VC90/90ScriptDev2.vcproj

@@ -1853,6 +1853,10 @@
 							RelativePath="..\scripts\northrend\nexus\oculus\boss_urom.cpp"
 							>
 						</File>
+						<File
+							RelativePath="..\scripts\northrend\nexus\oculus\boss_varos.cpp"
+							>
+						</File>
 						<File
 							RelativePath="..\scripts\northrend\nexus\oculus\instance_oculus.cpp"
 							>

scripts/northrend/nexus/oculus/boss_varos.cpp

@@ -0,0 +1,29 @@
+/* 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: boss_varos
+SD%Complete: 0
+SDComment: Placeholder
+SDCategory: Oculus
+EndScriptData */
+
+#include "precompiled.h"
+
+void AddSC_boss_varos()
+{
+
+}

scripts/northrend/nexus/oculus/instance_oculus.cpp

@@ -17,15 +17,14 @@
 /* ScriptData
 SDName: instance_oculus
 SD%Complete: 50
-SDComment: Spawn instance bosses and handle Varos pre event; Dialogue NYI
+SDComment: Spawn instance bosses and handle Varos pre event; Dialogue handled by DBScripts
 SDCategory: Oculus
 EndScriptData */
 
 #include "precompiled.h"
 #include "oculus.h"
 
-instance_oculus::instance_oculus(Map* pMap) : ScriptedInstance(pMap),
-    m_uiConstructsDead(0)
+instance_oculus::instance_oculus(Map* pMap) : ScriptedInstance(pMap)
 {
     Initialize();
 }
@@ -37,7 +36,16 @@ void instance_oculus::Initialize()
 
 void instance_oculus::OnPlayerEnter(Player* pPlayer)
 {
+    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 instance_oculus::OnCreatureCreate(Creature* pCreature)
@@ -80,12 +88,12 @@ void instance_oculus::SetData(uint32 uiType, uint32 uiData)
                 for (GuidList::const_iterator itr = m_lCageDoorGUIDs.begin(); itr != m_lCageDoorGUIDs.end(); ++itr)
                     DoUseDoorOrButton(*itr);
 
-                // Notes: There should also be a small dialogue here involving Belgaristrasz and Varos
-                // Also the Centrifuge Constructs and the related npcs should be summoned
+                // 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
+                // Activate the world state - the Centrifuge contructs should be loaded by now
                 DoUpdateWorldState(WORLD_STATE_CONSTRUCTS, 1);
-                DoUpdateWorldState(WORLD_STATE_CONSTRUCTS_COUNT, MAX_CONSTRUCTS);
+                DoUpdateWorldState(WORLD_STATE_CONSTRUCTS_COUNT, m_sConstructsAliveGUIDSet.size());
 
                 DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_EREGOS_ID);
             }
@@ -94,22 +102,26 @@ void instance_oculus::SetData(uint32 uiType, uint32 uiData)
             m_auiEncounter[TYPE_VAROS] = uiData;
             if (uiData == DONE)
             {
-                // Note: Image of Belgaristrasz teleports here after the boss is dead and does some dialogue
+                // 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 teleports to this boss after it's killed and does some dialogue; Right after this, Eregos appears
+            // 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
+            // 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;
     }
 
@@ -135,6 +147,24 @@ uint32 instance_oculus::GetData(uint32 uiType) const
     return 0;
 }
 
+void instance_oculus::SetData64(uint32 uiData, uint64 uiGuid)
+{
+    // 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 (uiData == 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());
+    }
+}
+
 void instance_oculus::OnCreatureEnterCombat(Creature* pCreature)
 {
     switch (pCreature->GetEntry())
@@ -160,10 +190,10 @@ void instance_oculus::OnCreatureDeath(Creature* pCreature)
         case NPC_DRAKOS: SetData(TYPE_DRAKOS, DONE); break;
         case NPC_VAROS:  SetData(TYPE_VAROS,  DONE); break;
         case NPC_CENTRIFUGE_CONSTRUCT:
-            ++m_uiConstructsDead;
-            DoUpdateWorldState(WORLD_STATE_CONSTRUCTS_COUNT, MAX_CONSTRUCTS - m_uiConstructsDead);
+            m_sConstructsAliveGUIDSet.erase(pCreature->GetObjectGuid());
+            DoUpdateWorldState(WORLD_STATE_CONSTRUCTS_COUNT, m_sConstructsAliveGUIDSet.size());
 
-            if (m_uiConstructsDead == MAX_CONSTRUCTS)
+            if (m_sConstructsAliveGUIDSet.empty())
             {
                 if (Creature* pVaros = GetSingleCreatureFromStorage(NPC_VAROS))
                     pVaros->InterruptNonMeleeSpells(false);

scripts/northrend/nexus/oculus/oculus.h

@@ -15,13 +15,14 @@
 enum
 {
     MAX_ENCOUNTER                   = 4,
-    MAX_CONSTRUCTS                  = 10,
 
     TYPE_DRAKOS                     = 0,
     TYPE_VAROS                      = 1,
     TYPE_UROM                       = 2,
     TYPE_EREGOS                     = 3,
 
+    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,
@@ -78,6 +79,8 @@ class MANGOS_DLL_DECL instance_oculus : public ScriptedInstance
         void SetData(uint32 uiType, uint32 uiData) override;
         uint32 GetData(uint32 uiType) const override;
 
+        void SetData64(uint32 uiType, uint64 uiGuid) override;
+
         const char* Save() const override { return strInstData.c_str(); }
         void Load(const char* chrIn) override;
 
@@ -87,9 +90,8 @@ class MANGOS_DLL_DECL instance_oculus : public ScriptedInstance
         uint32 m_auiEncounter[MAX_ENCOUNTER];
         std::string strInstData;
 
-        uint8 m_uiConstructsDead;
-
         GuidList m_lCageDoorGUIDs;
+        GuidSet m_sConstructsAliveGUIDSet;
 };
 
 #endif

sd2_revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "2803"
+ #define SD2_REVISION_NR "2804"
 #endif // __SD2_REVISION_NR_H__

system/ScriptLoader.cpp

@@ -317,6 +317,7 @@ extern void AddSC_boss_telestra();
 extern void AddSC_instance_nexus();
 extern void AddSC_boss_eregos();                            // nexus, oculus
 extern void AddSC_boss_urom();
+extern void AddSC_boss_varos();
 extern void AddSC_instance_oculus();
 extern void AddSC_boss_sartharion();                        // obsidian_sanctum
 extern void AddSC_instance_obsidian_sanctum();
@@ -778,6 +779,7 @@ void AddScripts()
     AddSC_instance_nexus();
     AddSC_boss_eregos();                                    // nexus, oculus
     AddSC_boss_urom();
+    AddSC_boss_varos();
     AddSC_instance_oculus();
     AddSC_boss_sartharion();                                // obsidian_sanctum
     AddSC_instance_obsidian_sanctum();