merge instance def and useful warptaxi

src/scripts/common/warptaxi/WarpTaxi131146.cpp

@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+
+#include <Network/GamePacket.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+
+using namespace Sapphire;
+using namespace Sapphire::Network::Packets;
+using namespace Sapphire::Network::Packets::Server;
+
+class WarpTaxi131146 : public Sapphire::ScriptAPI::EventScript
+{
+public:
+  WarpTaxi131146() :
+    Sapphire::ScriptAPI::EventScript( 131146 )
+  {
+  }
+
+  void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+  {
+    player.eventFinish( getId(), 1 );
+    player.setPosAndSendActorMove( 565, -1.7, -253, -0.83 );
+  }
+};
+
+EXPOSE_SCRIPT( WarpTaxi131146 );

src/scripts/common/warptaxi/WarpTaxi131147.cpp

@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+
+#include <Network/GamePacket.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+
+using namespace Sapphire;
+using namespace Sapphire::Network::Packets;
+using namespace Sapphire::Network::Packets::Server;
+
+class WarpTaxi131147 : public Sapphire::ScriptAPI::EventScript
+{
+public:
+  WarpTaxi131147() :
+    Sapphire::ScriptAPI::EventScript( 131147 )
+  {
+  }
+
+  void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+  {
+    player.eventFinish( getId(), 1 );
+    player.setPosAndSendActorMove( 574, -1.9, -264, 2.62 );
+  }
+};
+
+EXPOSE_SCRIPT( WarpTaxi131147 );

src/scripts/common/warptaxi/WarpTaxi131306.cpp

@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+
+#include <Network/GamePacket.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+
+using namespace Sapphire;
+using namespace Sapphire::Network::Packets;
+using namespace Sapphire::Network::Packets::Server;
+
+class WarpTaxi131306 : public Sapphire::ScriptAPI::EventScript
+{
+public:
+  WarpTaxi131306() :
+    Sapphire::ScriptAPI::EventScript( 131306 )
+  {
+  }
+
+  void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+  {
+    player.eventFinish( getId(), 1 );
+    player.setPosAndSendActorMove( -466, 107.7, 107.7, -2 );
+  }
+};
+
+EXPOSE_SCRIPT( WarpTaxi131306 );

src/scripts/common/warptaxi/WarpTaxi131315.cpp

@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+
+#include <Network/GamePacket.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+
+using namespace Sapphire;
+using namespace Sapphire::Network::Packets;
+using namespace Sapphire::Network::Packets::Server;
+
+class WarpTaxi131315 : public Sapphire::ScriptAPI::EventScript
+{
+public:
+  WarpTaxi131315() :
+    Sapphire::ScriptAPI::EventScript( 131315 )
+  {
+  }
+
+  void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+  {
+    player.eventFinish( getId(), 1 );
+    player.enterPredefinedPrivateInstance( 844 );
+  }
+};
+
+EXPOSE_SCRIPT( WarpTaxi131315 );

src/scripts/common/warptaxi/WarpTaxi131330.cpp

@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+
+#include <Network/GamePacket.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+
+using namespace Sapphire;
+using namespace Sapphire::Network::Packets;
+using namespace Sapphire::Network::Packets::Server;
+
+class WarpTaxi131330 : public Sapphire::ScriptAPI::EventScript
+{
+public:
+  WarpTaxi131330() :
+    Sapphire::ScriptAPI::EventScript( 131330 )
+  {
+  }
+
+  void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+  {
+    player.eventFinish( getId(), 1 );
+    player.forceZoneing( 814, -464, 361.72, 14.84, -3.14, false );
+  }
+};
+
+EXPOSE_SCRIPT( WarpTaxi131330 );

src/world/Manager/TerritoryMgr.cpp

@@ -103,15 +103,15 @@ bool Sapphire::World::Manager::TerritoryMgr::isInstanceContentTerritory( uint32_
   auto intendedUse = pTeri->territoryIntendedUse;
 
   return intendedUse == TerritoryIntendedUse::AllianceRaid ||
-         intendedUse == TerritoryIntendedUse::BeforeTrialDung ||
+    intendedUse == TerritoryIntendedUse::BeforeTrialDung ||
-         intendedUse == TerritoryIntendedUse::Trial ||
+    intendedUse == TerritoryIntendedUse::Trial ||
-         intendedUse == TerritoryIntendedUse::Dungeon ||
+    intendedUse == TerritoryIntendedUse::Dungeon ||
-         intendedUse == TerritoryIntendedUse::OpenWorldInstanceBattle ||
+    intendedUse == TerritoryIntendedUse::OpenWorldInstanceBattle ||
-         intendedUse == TerritoryIntendedUse::PalaceOfTheDead ||
+    intendedUse == TerritoryIntendedUse::PalaceOfTheDead ||
-         intendedUse == TerritoryIntendedUse::RaidFights ||
+    intendedUse == TerritoryIntendedUse::RaidFights ||
-         intendedUse == TerritoryIntendedUse::Raids ||
+    intendedUse == TerritoryIntendedUse::Raids ||
-         intendedUse == TerritoryIntendedUse::TreasureMapInstance ||
+    intendedUse == TerritoryIntendedUse::TreasureMapInstance ||
-         intendedUse == TerritoryIntendedUse::EventTrial;
+    intendedUse == TerritoryIntendedUse::EventTrial;
 }
 
 bool Sapphire::World::Manager::TerritoryMgr::isPrivateTerritory( uint32_t territoryTypeId ) const
@@ -122,9 +122,9 @@ bool Sapphire::World::Manager::TerritoryMgr::isPrivateTerritory( uint32_t territ
     return false;
 
   return pTeri->territoryIntendedUse == TerritoryIntendedUse::OpeningArea ||
-         pTeri->territoryIntendedUse == TerritoryIntendedUse::Inn ||
+    pTeri->territoryIntendedUse == TerritoryIntendedUse::Inn ||
-         pTeri->territoryIntendedUse == TerritoryIntendedUse::JailArea ||
+    pTeri->territoryIntendedUse == TerritoryIntendedUse::JailArea ||
-         pTeri->territoryIntendedUse == TerritoryIntendedUse::MSQPrivateArea;
+    pTeri->territoryIntendedUse == TerritoryIntendedUse::MSQPrivateArea;
 }
 
 bool Sapphire::World::Manager::TerritoryMgr::isInternalEstateTerritory( uint32_t territoryTypeId ) const
@@ -145,11 +145,11 @@ bool Sapphire::World::Manager::TerritoryMgr::isDefaultTerritory( uint32_t territ
     return false;
 
   return pTeri->territoryIntendedUse == TerritoryIntendedUse::Inn ||
-         pTeri->territoryIntendedUse == TerritoryIntendedUse::Town ||
+    pTeri->territoryIntendedUse == TerritoryIntendedUse::Town ||
-         pTeri->territoryIntendedUse == TerritoryIntendedUse::OpenWorld ||
+    pTeri->territoryIntendedUse == TerritoryIntendedUse::OpenWorld ||
-         pTeri->territoryIntendedUse == TerritoryIntendedUse::OpeningArea ||
+    pTeri->territoryIntendedUse == TerritoryIntendedUse::OpeningArea ||
-         pTeri->territoryIntendedUse == TerritoryIntendedUse::GoldSaucer ||
+    pTeri->territoryIntendedUse == TerritoryIntendedUse::GoldSaucer ||
-         pTeri->territoryIntendedUse == TerritoryIntendedUse::ChocoboSquare;
+    pTeri->territoryIntendedUse == TerritoryIntendedUse::ChocoboSquare;
 }
 
 bool Sapphire::World::Manager::TerritoryMgr::isHousingTerritory( uint32_t territoryTypeId ) const
@@ -190,13 +190,13 @@ bool Sapphire::World::Manager::TerritoryMgr::createDefaultTerritories()
     bool hasNaviMesh = pZone->getNaviProvider() != nullptr;
 
     Logger::info( "{0}\t{1}\t{2}\t{3:<10}\t{4}\t{5}\t{6}",
-                  territoryTypeId,
+      territoryTypeId,
-                  guid,
+      guid,
-                  territoryInfo->territoryIntendedUse,
+      territoryInfo->territoryIntendedUse,
-                  territoryInfo->name,
+      territoryInfo->name,
-                  ( isPrivateTerritory( territoryTypeId ) ? "PRIVATE" : "PUBLIC" ),
+      ( isPrivateTerritory( territoryTypeId ) ? "PRIVATE" : "PUBLIC" ),
-                  hasNaviMesh ? "NAVI" : "",
+      hasNaviMesh ? "NAVI" : "",
-                  pPlaceName->name );
+      pPlaceName->name );
 
     InstanceIdToTerritoryPtrMap instanceMap;
     instanceMap[ guid ] = pZone;
@@ -233,12 +233,12 @@ bool Sapphire::World::Manager::TerritoryMgr::createHousingTerritories()
       uint32_t guid = getNextInstanceId();
 
       Logger::info( "{0}\t{1}\t{2}\t{3:<10}\tHOUSING\t\t{4}#{5}",
-                    territoryTypeId,
+        territoryTypeId,
-                    guid,
+        guid,
-                    territoryInfo->territoryIntendedUse,
+        territoryInfo->territoryIntendedUse,
-                    territoryInfo->name,
+        territoryInfo->name,
-                    pPlaceName->name,
+        pPlaceName->name,
-                    wardNum );
+        wardNum );
 
       auto pHousingZone = make_HousingZone( wardNum, territoryTypeId, guid, territoryInfo->name, pPlaceName->name );
       pHousingZone->init();
@@ -261,9 +261,9 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createTerritoryIn
   if( !isValidTerritory( territoryTypeId ) )
     return nullptr;
 
-//  nb: disabled for now because there's not a real reason to have this constraint, makes testing some stuff easier too
+  //  nb: disabled for now because there's not a real reason to have this constraint, makes testing some stuff easier too
-//  if( isInstanceContentTerritory( territoryTypeId ) )
+  //  if( isInstanceContentTerritory( territoryTypeId ) )
-//    return nullptr;
+  //    return nullptr;
 
   auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
   auto pTeri = getTerritoryDetail( territoryTypeId );
@@ -317,7 +317,7 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createQuestBattle
   Logger::debug( "Starting instance for QuestBattle id: {0} ({1})", questBattleId, pQuestInfo->name );
 
   auto pZone = make_QuestBattle( pQuestBattleInfo, pContentFinderCondition->territoryType, getNextInstanceId(),
-                                 pTeri->name, pQuestInfo->name, questBattleId );
+    pTeri->name, pQuestInfo->name, questBattleId );
   pZone->init();
 
   m_questBattleIdToInstanceMap[ questBattleId ][ pZone->getGuId() ] = pZone;
@@ -351,7 +351,7 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createInstanceCon
   Logger::debug( "Starting instance for InstanceContent id: {0} ({1})", instanceContentId, pContentFinderCondition->name );
 
   auto pZone = make_InstanceContent( pInstanceContent, pContentFinderCondition->territoryType, getNextInstanceId(),
-                                     pTeri->name, pContentFinderCondition->name, instanceContentId );
+    pTeri->name, pContentFinderCondition->name, instanceContentId );
   pZone->init();
 
   m_instanceContentIdToInstanceMap[ instanceContentId ][ pZone->getGuId() ] = pZone;
@@ -377,7 +377,7 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::findOrCreateHousi
 
   auto parentZone = std::dynamic_pointer_cast< HousingZone >(
     getZoneByLandSetId( housingMgr.toLandSetId( static_cast< uint16_t >( landIdent.territoryTypeId ),
-                                                 static_cast< uint8_t >( landIdent.wardNum ) ) ) );
+      static_cast< uint8_t >( landIdent.wardNum ) ) ) );
 
   if( !parentZone )
     return nullptr;
@@ -422,8 +422,8 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::findOrCreateHousi
     return nullptr;
 
   auto zone = World::Territory::Housing::make_HousingInteriorTerritory( landIdent, territoryTypeId,
-                                                                        getNextInstanceId(), terriInfo->name,
+    getNextInstanceId(), terriInfo->name,
-                                                                        house->getHouseName() );
+    house->getHouseName() );
 
   zone->init();
 
@@ -577,7 +577,7 @@ void Sapphire::World::Manager::TerritoryMgr::updateTerritoryInstances( uint64_t
 }
 
 Sapphire::World::Manager::TerritoryMgr::InstanceIdList
-  Sapphire::World::Manager::TerritoryMgr::getInstanceContentIdList( uint16_t instanceContentId ) const
+Sapphire::World::Manager::TerritoryMgr::getInstanceContentIdList( uint16_t instanceContentId ) const
 {
   std::vector< uint32_t > idList;
   auto zoneMap = m_instanceContentIdToInstanceMap.find( instanceContentId );
@@ -727,7 +727,14 @@ std::unordered_map< uint32_t, Sapphire::World::Manager::TerritoryMgr::InstanceSp
   { 727, { { -454, 383, -127 }, 1.578 } },
   { 738, { { 0, -2, 55 }, -3.14 } },
   { 737, { { 250, 122, -346 }, -3.14 } },
-  { 744, { { 0, 0, 0 }, 0 } },
+  { 744, { { 0, 0, 0 }, -3.14 } },
+  { 786, { { 0, -8, 43.5 }, 3.14 } },
+  { 829, { { -500, 107.7, 161.6 }, 2.75 } },
+  { 842, { { -66.5, 4.32, 72.36 }, 2.53 } },
+  { 877, { { 442.5, 4.95, 274 }, 0.85 } },
+  { 844, { { 0, 0, 0 }, -3.14 } },
+  { 880, { { 100, 0, 100 }, 3.14 } },
+  { 881, { { 100, 0, 100 }, 0 } },
 };
 
 std::unordered_map< uint32_t, uint32_t > Sapphire::World::Manager::TerritoryMgr::instanceExitEvent =
@@ -756,4 +763,11 @@ std::unordered_map< uint32_t, uint32_t > Sapphire::World::Manager::TerritoryMgr:
   { 131286, 738 },
   { 131289, 737 },
   { 131294, 744 },
+  { 131296, 786 },
+  { 131305, 829 },
+  { 131323, 842 },
+  //{ 0, 877 }, no exit
+  { 131311, 844 },
+  { 131326, 880 },
+  { 131327, 881 },
 };