Merge remote-tracking branch 'upstream/event_rewrite' into event_rewrite

src/servers/sapphire_zone/Actor/Actor.h

@@ -16,7 +16,6 @@ namespace Entity {
 \class Actor
 \brief Base class for all actors
 
-\author Mordred
 */
 class Actor : public boost::enable_shared_from_this< Actor >
 {

src/servers/sapphire_zone/Event/Director.h

@@ -12,14 +12,30 @@ namespace Event {
 \class Director
 \brief Base class for all Directors implements sequence and variables
 
-\author Mordred
 */
 
 class Director
 {
+
+public:
+   enum DirectorType
+   {
+      InstanceContent = 0x8003, // used for dungeons/raids
+      CompanyLeve = 0x8007,
+      QuestBattle = 0x8006,
+      GatheringLeve = 0x8002,
+      BattleLeve = 0x8001,
+      GoldSaucer = 0x800A,
+      Fate = 0x801A,
+      DpsChallange = 0x800D
+   };
+
 private:
-   /*! Id of the director */
-   uint32_t m_id;
+   /*! Id of the content of the director */
+   uint16_t m_id;
+
+   /*! DirectorType | ContentId */
+   uint32_t m_directorId;
 
    /*! currect sequence */
    uint8_t m_sequence;
@@ -30,9 +46,14 @@ private:
    /*! raw storage for flags/vars */
    uint8_t m_unionData[10];
 
-public:
-   uint8_t getId() const;
+   /*! type of the director */
+   DirectorType m_type;
+
+   uint32_t getDirectorId() const;
+   uint16_t getContentId() const;
+   DirectorType getType() const;
    uint8_t getSequence() const;
+   uint8_t getBranch() const;
 
 };
 

src/servers/sapphire_zone/Forwards.h

@@ -36,6 +36,7 @@ namespace Core
 
    namespace Event
    {
+      TYPE_FORWARD( Director );
       TYPE_FORWARD( EventHandler );
    }
 

src/servers/sapphire_zone/Zone/InstanceContent.cpp

@@ -0,0 +1 @@
+#include "InstanceContent.h"

src/servers/sapphire_zone/Zone/InstanceContent.h

@@ -0,0 +1,22 @@
+#ifndef SAPPHIRE_INSTANCECONTENT_H
+#define SAPPHIRE_INSTANCECONTENT_H
+
+#include "Zone.h"
+#include "Forwards.h"
+
+namespace Core
+{
+
+class InstanceContent : public Zone
+{
+public:
+   InstanceContent( uint32_t instanceContentId, uint32_t guid );
+   virtual ~InstanceContent();
+
+private:
+   Event::DirectorPtr m_pDirector;
+
+};
+
+}
+#endif //SAPPHIRE_INSTANCECONTENT_H

src/servers/sapphire_zone/Zone/TerritoryMgr.cpp

@@ -120,7 +120,7 @@ bool Core::TerritoryMgr::createDefaultTerritories()
 
       InstanceIdToZonePtrMap instanceMap;
       instanceMap[guid] = pZone;
-
+      m_instanceIdToZonePtrMap[guid] = pZone;
       m_territoryInstanceMap[territoryId] = instanceMap;
 
    }
@@ -218,8 +218,6 @@ Core::ZonePtr Core::TerritoryMgr::getZoneByTerriId( uint32_t territoryId ) const
 
    // TODO: actually select the proper one
    return zoneMap->second.begin()->second;
-
-   return nullptr;
 }
 
 void Core::TerritoryMgr::updateTerritoryInstances( uint32_t currentTime )
@@ -229,7 +227,22 @@ void Core::TerritoryMgr::updateTerritoryInstances( uint32_t currentTime )
       for( auto zone : zoneMap.second )
          zone.second->runZoneLogic( currentTime );
    }
+}
 
+Core::TerritoryMgr::InstanceIdList Core::TerritoryMgr::getInstanceContentIdList( uint16_t instanceContentId ) const
+{
+   std::vector< uint32_t > idList;
+   auto zoneMap = m_instanceContentToInstanceMap.find( instanceContentId );
+   if( zoneMap == m_instanceContentToInstanceMap.end() )
+      return idList;
+
+   for( auto& entry : zoneMap->second )
+   {
+      idList.push_back( entry.first );
+   }
+
+   return idList;
 }
 
 
+

src/servers/sapphire_zone/Zone/TerritoryMgr.h

@@ -87,18 +87,15 @@ namespace Core
       /*! removes instance by instanceId, return true if successful */
       bool removeTerritoryInstance( uint32_t territoryTypeId );
 
+      /*! returns a ZonePtr to the instance or nullptr if not found */
+      ZonePtr getTerritoryZonePtr( uint32_t instanceId ) const;
+
       /*! returns the cached detail of a territory, nullptr if not found */
       Data::TerritoryTypePtr getTerritoryDetail( uint32_t territoryTypeId ) const;
 
       /*! loop for processing territory logic, iterating all existing instances */
       void updateTerritoryInstances( uint32_t currentTime );
 
-      /*! pushes a new instances onto the handling map */
-      bool addInstance( ZonePtr pInstance );
-
-      /*! returns a ZonePtr to the instance or nullptr if not found */
-      ZonePtr getInstance( uint32_t instanceId ) const;
-
       /*! returns a ZonePositionPtr if found, else nullptr */
       ZonePositionPtr getTerritoryPosition( uint32_t territoryPositionId ) const;
 
@@ -110,22 +107,33 @@ namespace Core
       using TerritoryTypeDetailCache = std::unordered_map< uint16_t, Data::TerritoryTypePtr >;
       using InstanceIdToZonePtrMap = std::unordered_map< uint32_t, ZonePtr >;
       using TerritoryIdToInstanceMap = std::unordered_map< uint16_t, InstanceIdToZonePtrMap >;
+      using InstanceContentIdToInstanceMap = std::unordered_map< uint16_t, InstanceIdToZonePtrMap >;
+      using PlayerIdToInstanceIdMap = std::unordered_map< uint32_t, uint32_t >;
       using PositionMap = std::unordered_map< int32_t, ZonePositionPtr >;
+      using InstanceIdList = std::vector< uint32_t >;
 
       /*! map holding details for territory templates */
       TerritoryTypeDetailCache m_territoryTypeDetailCacheMap;
 
-      /*! map holding actual instances of territories */
+      /*! map holding actual instances of default territories */
       TerritoryIdToInstanceMap m_territoryInstanceMap;
 
+      /*! map holding actual instances of InstanceContent */
+      InstanceContentIdToInstanceMap m_instanceContentToInstanceMap;
+
+      /*! flat map for easier lookup of instances by guid */
+      InstanceIdToZonePtrMap m_instanceIdToZonePtrMap;
+
       /*! map holding positions for zonelines */
       PositionMap m_territoryPositionMap;
 
-      /*! internal counter for instanceIds
-          TODO: it should be ensured that this does not overflow if the server runs for a loooong time
-          ( as if that will ever happen ;) ) */
+      /*! internal counter for instanceIds */
       uint32_t m_lastInstanceId;
 
+   public:
+      /*! returns a list of instanceContent InstanceIds currently active */
+      InstanceIdList getInstanceContentIdList( uint16_t instanceContentId ) const;
+
    };
 
 }