Merge pull request #15 from NotAdam/housing

Housing

src/common/Exd/ExdDataGenerated.cpp

@@ -2909,6 +2909,10 @@ Sapphire::Data::HousingFurniture::HousingFurniture( uint32_t row_id, Sapphire::D
 Sapphire::Data::HousingMapMarkerInfo::HousingMapMarkerInfo( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
    auto row = exdData->m_HousingMapMarkerInfoDat.get_row( row_id, subRow );
+   x = exdData->getField< float >( row, 0 );
+   y = exdData->getField< float >( row, 1 );
+   z = exdData->getField< float >( row, 2 );
+   plotNumberDistance = exdData->getField< float >( row, 3 );
    map = exdData->getField< uint16_t >( row, 4 );
 }
 

src/common/Exd/ExdDataGenerated.h

@@ -3048,6 +3048,10 @@ struct HousingFurniture
 struct HousingMapMarkerInfo
 {
    uint16_t map;
+   float x;
+   float y;
+   float z;
+   float plotNumberDistance;
 
    HousingMapMarkerInfo( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };

src/common/Network/PacketDef/Zone/ServerZoneDef.h

@@ -1794,7 +1794,7 @@ struct FFXIVIpcObjectSpawn :
   int16_t unknown24b;
   uint16_t unknown28a;
   int16_t unknown28c;
-  uint32_t unknown2C;
+  uint32_t housingLink;
   Common::FFXIVARR_POSITION3 position;
   int16_t unknown3C;
   int16_t unknown3E;

src/servers/Scripts/common/CmnDefHousingSignboard.cpp

@@ -1,8 +1,8 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
-#include <Zone/Zone.h>
+#include <Territory/Zone.h>
-#include <Zone/HousingZone.h>
+#include <Territory/HousingZone.h>
-#include <Zone/HousingMgr.h>
+#include <Manager/HousingMgr.h>
 #include <Network/PacketWrappers/ActorControlPacket143.h>
 #include <Network/CommonActorControl.h>
 #include "Framework.h"
@@ -12,6 +12,7 @@ using namespace Sapphire;
 using namespace Network;
 using namespace Packets;
 using namespace Server;
+using namespace Sapphire::World::Manager;
 
 class CmnDefHousingSignboard : public Sapphire::ScriptAPI::EventScript
 {
@@ -35,7 +36,7 @@ public:
 
         auto pTerritory = player.getCurrentZone();
         auto pHousing = std::dynamic_pointer_cast< HousingZone >( pTerritory );
-        auto pHouMgr = pFw->get< Sapphire::HousingMgr >();
+        auto pHouMgr = pFw->get< HousingMgr >();
 
         LandPurchaseResult res = pHouMgr->purchaseLand( player, activeLand.plot,
                                                         static_cast< uint8_t >( result.param2 ) );

src/servers/Scripts/common/aethernet/HousingAethernet.cpp

@@ -3,7 +3,7 @@
 
 #include <Framework.h>
 #include <Exd/ExdDataGenerated.h>
-#include <Zone/Zone.h>
+#include <Territory/Zone.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/common/eobj/HousingEstateEntrance.cpp

@@ -0,0 +1,30 @@
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+
+#include "Actor/EventObject.h"
+
+using namespace Sapphire;
+
+class HousingEstateEntrance :
+  public Sapphire::ScriptAPI::EventObjectScript
+{
+public:
+  HousingEstateEntrance() :
+    Sapphire::ScriptAPI::EventObjectScript( 2002737 )
+  {
+  }
+
+  void onTalk( uint32_t eventId, Entity::Player& player, Entity::EventObject& eobj ) override
+  {
+    player.sendDebug( "Found plot entrance for plot: " + std::to_string( eobj.getHousingLink() >> 8 ) );
+
+    player.playScene( eventId, 0, 0, []( Entity::Player& player, const Event::SceneResult& result )
+    {
+      if( result.param2 != 1 )
+        return;
+
+      // param2 == 1, zone into instance
+
+    } );
+  }
+};

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/AlaMhigo.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/BardamsMettle.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/CastrumAbania.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/CopperbellMines.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/CuttersCry.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/DomaCastle.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/Halatali.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/HalataliHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/HaukkeManor.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/HellsLid.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/KuganeCastle.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/Neverreap.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/PharosSirius.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/Sastasha.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 #include <Actor/Player.h>
 
 using namespace Sapphire;

src/servers/Scripts/instances/dungeons/SastashaHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/Snowcloak.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/SohmAl.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/SohmAlHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/SohrKhai.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheAery.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheAntitower.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheAurumVale.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/ThePraetorium.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheVault.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/dungeons/Xelphatol.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/events/TheHauntedManor.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/events/TheValentionesCeremony.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;
 

src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp

@@ -1,5 +1,5 @@
 #include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
+#include <Territory/InstanceContent.h>
 
 using namespace Sapphire;